diff --git a/lib/couchrest/model/property.rb b/lib/couchrest/model/property.rb index fd2e104..abefaab 100644 --- a/lib/couchrest/model/property.rb +++ b/lib/couchrest/model/property.rb @@ -33,7 +33,7 @@ module CouchRest::Model data.keys.sort.each do |k| value << data[k] end - elsif value.class != Array + elsif !value.is_a?(Array) raise "Expecting an array or keyed hash for property #{parent.class.name}##{self.name}" end arr = value.collect { |data| cast_value(parent, data) } @@ -72,12 +72,12 @@ module CouchRest::Model def parse_type(type) if type.nil? @casted = false - @type = nil + @type = nil @type_class = nil else base = type.is_a?(Array) ? type.first : type base = Object if base.nil? - raise "Defining a property type as a #{type.class.name.humanize} is not supported in CouchRest Model!" if base.class != Class + raise "Defining a property type as a #{type.class.name.humanize} is not supported in CouchRest Model!" if base.class != Class @type_class = base @type = type end diff --git a/spec/couchrest/casted_model_spec.rb b/spec/couchrest/casted_model_spec.rb index 60fb3e0..dd4da5b 100644 --- a/spec/couchrest/casted_model_spec.rb +++ b/spec/couchrest/casted_model_spec.rb @@ -31,11 +31,11 @@ class WithCastedCallBackModel < Hash property :name property :run_before_validate property :run_after_validate - + before_validate do |object| object.run_before_validate = true end - after_validate do |object| + after_validate do |object| object.run_after_validate = true end end @@ -47,7 +47,7 @@ class CastedCallbackDoc < CouchRest::Model::Base end describe CouchRest::Model::CastedModel do - + describe "A non hash class including CastedModel" do it "should fail raising and include error" do lambda do @@ -55,27 +55,27 @@ describe CouchRest::Model::CastedModel do include CouchRest::CastedModel property :name end - + end.should raise_error end end - + describe "isolated" do before(:each) do @obj = WithCastedModelMixin.new end it "should automatically include the property mixin and define getters and setters" do @obj.name = 'Matt' - @obj.name.should == 'Matt' + @obj.name.should == 'Matt' end - + it "should allow override of default" do @obj = WithCastedModelMixin.new(:name => 'Eric', :details => {'color' => 'orange'}) @obj.name.should == 'Eric' @obj.details['color'].should == 'orange' end end - + describe "casted as an attribute, but without a value" do before(:each) do @obj = DummyModel.new @@ -99,22 +99,22 @@ describe CouchRest::Model::CastedModel do @obj.sub_models.first.title.should eql('test') end end - + describe "casted as attribute" do before(:each) do casted = {:name => 'not whatever'} @obj = DummyModel.new(:casted_attribute => {:name => 'whatever', :casted_attribute => casted}) @casted_obj = @obj.casted_attribute end - + it "should be available from its parent" do @casted_obj.should be_an_instance_of(WithCastedModelMixin) end - + it "should have the getters defined" do @casted_obj.name.should == 'whatever' end - + it "should know who casted it" do @casted_obj.casted_by.should == @obj end @@ -126,11 +126,11 @@ describe CouchRest::Model::CastedModel do it "should return nil for the unknown attribute" do @casted_obj["unknown"].should be_nil end - + it "should return {} for the hash attribute" do @casted_obj.details.should == {} end - + it "should cast its own attributes" do @casted_obj.casted_attribute.should be_instance_of(WithCastedModelMixin) end @@ -140,18 +140,18 @@ describe CouchRest::Model::CastedModel do expect { @casted_obj.casted_attribute.update_attributes(:name => "Fubar") }.to raise_error(NoMethodError) end end - + describe "casted as an array of a different type" do before(:each) do @obj = DummyModel.new(:keywords => ['couch', 'sofa', 'relax', 'canapé']) end - + it "should cast the array properly" do @obj.keywords.should be_an_instance_of(Array) @obj.keywords.first.should == 'couch' end end - + describe "update attributes without saving" do before(:each) do @question = Question.new(:q => "What is your quest?", :a => "To seek the Holy Grail") @@ -163,20 +163,20 @@ describe CouchRest::Model::CastedModel do @question['q'].should == "What is your favorite color?" @question.a.should == "Blue" end - + it "should also work for attributes= alias" do @question.respond_to?(:attributes=).should be_true @question.attributes = {:q => "What is your favorite color?", 'a' => "Blue"} @question['q'].should == "What is your favorite color?" @question.a.should == "Blue" end - + it "should flip out if an attribute= method is missing" do lambda { @q.update_attributes_without_saving('foo' => "something", :a => "No green") }.should raise_error(NoMethodError) end - + it "should not change any attributes if there is an error" do lambda { @q.update_attributes_without_saving('foo' => "something", :a => "No green") @@ -186,7 +186,7 @@ describe CouchRest::Model::CastedModel do end end - + describe "saved document with casted models" do before(:each) do reset_test_db! @@ -194,24 +194,24 @@ describe CouchRest::Model::CastedModel do @obj.save.should be_true @obj = DummyModel.get(@obj.id) end - + it "should be able to load with the casted models" do casted_obj = @obj.casted_attribute casted_obj.should_not be_nil casted_obj.should be_an_instance_of(WithCastedModelMixin) end - + it "should have defined getters for the casted model" do casted_obj = @obj.casted_attribute casted_obj.name.should == "whatever" end - + it "should have defined setters for the casted model" do casted_obj = @obj.casted_attribute casted_obj.name = "test" casted_obj.name.should == "test" end - + it "should retain an override of a casted model attribute's default" do casted_obj = @obj.casted_attribute casted_obj.details['color'] = 'orange' @@ -219,7 +219,7 @@ describe CouchRest::Model::CastedModel do casted_obj = DummyModel.get(@obj.id).casted_attribute casted_obj.details['color'].should == 'orange' end - + end describe "saving document with array of casted models and validation" do @@ -244,7 +244,7 @@ describe CouchRest::Model::CastedModel do @cat.should_not be_valid @cat.save.should be_false end - + it "should not fail if the casted model doesn't have validation" do Cat.property :masters, [Person], :default => [] Cat.validates_presence_of :name @@ -254,7 +254,7 @@ describe CouchRest::Model::CastedModel do cat.should be_valid end end - + describe "calling valid?" do before :each do @cat = Cat.new @@ -265,7 +265,7 @@ describe CouchRest::Model::CastedModel do @cat.toys << @toy2 @cat.toys << @toy3 end - + describe "on the top document" do it "should put errors on all invalid casted models" do @cat.should_not be_valid @@ -274,10 +274,10 @@ describe CouchRest::Model::CastedModel do @toy2.errors.should_not be_empty @toy3.errors.should_not be_empty end - + it "should not put errors on valid casted models" do @toy1.name = "Feather" - @toy2.name = "Twine" + @toy2.name = "Twine" @cat.should_not be_valid @cat.errors.should_not be_empty @toy1.errors.should be_empty @@ -285,7 +285,7 @@ describe CouchRest::Model::CastedModel do @toy3.errors.should_not be_empty end end - + describe "on a casted model property" do it "should only validate itself" do @toy1.should_not be_valid @@ -295,7 +295,7 @@ describe CouchRest::Model::CastedModel do @toy3.errors.should be_empty end end - + describe "on a casted model inside a casted collection" do it "should only validate itself" do @toy2.should_not be_valid @@ -306,7 +306,7 @@ describe CouchRest::Model::CastedModel do end end end - + describe "calling new? on a casted model" do before :each do reset_test_db! @@ -315,18 +315,18 @@ describe CouchRest::Model::CastedModel do @cat.favorite_toy = @favorite_toy @cat.toys << CatToy.new(:name => 'Fuzzy Stick') end - + it "should be true on new" do CatToy.new.should be_new CatToy.new.new_record?.should be_true end - + it "should be true after assignment" do @cat.should be_new @cat.favorite_toy.should be_new @cat.toys.first.should be_new end - + it "should not be true after create or save" do @cat.create @cat.save @@ -334,14 +334,14 @@ describe CouchRest::Model::CastedModel do @cat.toys.first.casted_by.should eql(@cat) @cat.toys.first.should_not be_new end - + it "should not be true after get from the database" do @cat.save @cat = Cat.get(@cat.id) @cat.favorite_toy.should_not be_new @cat.toys.first.should_not be_new end - + it "should still be true after a failed create or save" do @cat.name = nil @cat.create.should be_false @@ -350,7 +350,7 @@ describe CouchRest::Model::CastedModel do @cat.toys.first.should be_new end end - + describe "calling base_doc from a nested casted model" do before :each do @course = Course.new(:title => 'Science 101') @@ -363,7 +363,15 @@ describe CouchRest::Model::CastedModel do @cat.favorite_toy = @toy1 @cat.toys << @toy2 end - + + it 'should let you copy over casted arrays' do + question = Question.new + @course.questions << question + new_course = Course.new + new_course.questions = @course.questions + new_course.questions.should include(question) + end + it "should reference the top document for" do @course.base_doc.should === @course @professor.casted_by.should === @course @@ -372,19 +380,19 @@ describe CouchRest::Model::CastedModel do @toy1.base_doc.should === @course @toy2.base_doc.should === @course end - + it "should call setter on top document" do @toy1.base_doc.should_not be_nil @toy1.base_doc.title = 'Tom Foolery' @course.title.should == 'Tom Foolery' end - + it "should return nil if not yet casted" do person = Person.new person.base_doc.should == nil end end - + describe "calling base_doc.save from a nested casted model" do before :each do reset_test_db! @@ -392,13 +400,13 @@ describe CouchRest::Model::CastedModel do @toy = CatToy.new @cat.favorite_toy = @toy end - + it "should not save parent document when casted model is invalid" do @toy.should_not be_valid @toy.base_doc.save.should be_false lambda{@toy.base_doc.save!}.should raise_error end - + it "should save parent document when nested casted model is valid" do @toy.name = "Mr Squeaks" @toy.should be_valid @@ -406,14 +414,14 @@ describe CouchRest::Model::CastedModel do lambda{@toy.base_doc.save!}.should_not raise_error end end - + describe "callbacks" do before(:each) do @doc = CastedCallbackDoc.new @model = WithCastedCallBackModel.new @doc.callback_model = @model end - + describe "validate" do it "should run before_validate before validating" do @model.run_before_validate.should be_nil @@ -424,7 +432,7 @@ describe CouchRest::Model::CastedModel do @model.run_after_validate.should be_nil @model.should be_valid @model.run_after_validate.should be_true - end + end end end end