couchrest_model 1.0.0.beta7 → 1.0.0.beta8

data/spec/couchrest/attribute_protection_spec.rb

@@ -23,13 +23,13 @@ describe "Model Attributes" do
       user.name.should == "will"
       user.phone.should == "555-5555"
     end
-    
+
     it "should recreate from the database properly" do
       user = NoProtection.new
       user.name = "will"
       user.phone = "555-5555"
       user.save!
-      
+
       user = NoProtection.get(user.id)
       user.name.should == "will"
       user.phone.should == "555-5555"
@@ -43,6 +43,8 @@ describe "Model Attributes" do
       property :admin, :default => false
     end
 
+    it { expect { WithAccessible.new(nil) }.to_not raise_error }
+
     it "should recognize accessible properties" do
       props = WithAccessible.accessible_properties.map { |prop| prop.name}
       props.should include("name")
@@ -50,7 +52,7 @@ describe "Model Attributes" do
     end
 
     it "should protect non-accessible properties set through new" do
-      user = WithAccessible.new(:name => "will", :admin => true) 
+      user = WithAccessible.new(:name => "will", :admin => true)
 
       user.name.should == "will"
       user.admin.should == false
@@ -72,6 +74,8 @@ describe "Model Attributes" do
       property :admin, :default => false, :protected => true
     end
 
+    it { expect { WithProtected.new(nil) }.to_not raise_error }
+
     it "should recognize protected properties" do
       props = WithProtected.protected_properties.map { |prop| prop.name}
       props.should_not include("name")
@@ -79,7 +83,7 @@ describe "Model Attributes" do
     end
 
     it "should protect non-accessible properties set through new" do
-      user = WithProtected.new(:name => "will", :admin => true) 
+      user = WithProtected.new(:name => "will", :admin => true)
 
       user.name.should == "will"
       user.admin.should == false
@@ -94,15 +98,23 @@ describe "Model Attributes" do
     end
   end
 
-  describe "protected flag" do
-    class WithBoth < CouchRest::Model::Base
+  describe "Model Base", "mixing protected and accessible flags" do
+    class WithBothAndUnspecified < CouchRest::Model::Base
       use_database TEST_SERVER.default_database
       property :name, :accessible => true
       property :admin, :default => false, :protected => true
+      property :phone, :default => 'unset phone number'
     end
 
-    it "should raise an error when both are set" do
-      lambda { WithBoth.new }.should raise_error 
+    it { expect { WithBothAndUnspecified.new }.to_not raise_error }
+    it { expect { WithBothAndUnspecified.new(nil) }.to_not raise_error }
+
+    it 'should assume that any unspecified property is protected by default' do
+      user = WithBothAndUnspecified.new(:name => 'will', :admin => true, :phone => '555-1234')
+
+      user.name.should == 'will'
+      user.admin.should == false
+      user.phone.should == 'unset phone number'
     end
   end
 
@@ -113,7 +125,7 @@ describe "Model Attributes" do
       property :admin, :default => false, :protected => true
       view_by :name
     end
-    
+
     before(:each) do
       @user = WithProtected.new
       @user.name = "will"
@@ -128,12 +140,12 @@ describe "Model Attributes" do
 
     it "Base#get should not strip protected attributes" do
       reloaded = WithProtected.get( @user.id )
-      verify_attrs reloaded 
+      verify_attrs reloaded
     end
 
     it "Base#get! should not strip protected attributes" do
       reloaded = WithProtected.get!( @user.id )
-      verify_attrs reloaded 
+      verify_attrs reloaded
     end
 
     it "Base#all should not strip protected attributes" do
@@ -141,13 +153,13 @@ describe "Model Attributes" do
       docs = WithProtected.all(:key => @user.id)
       docs.size.should == 1
       reloaded = docs.first
-      verify_attrs reloaded 
+      verify_attrs reloaded
     end
 
     it "views should not strip protected attributes" do
       docs = WithProtected.by_name(:startkey => "will", :endkey => "will")
       reloaded = docs.first
-      verify_attrs reloaded 
+      verify_attrs reloaded
     end
   end
 end

data/spec/couchrest/inherited_spec.rb

@@ -21,14 +21,14 @@ begin
   class ExtendedChild < ExtendedParent
   end
 
-  describe "Using chained inheritance without CouchRest::ExtendedDocument" do
+  describe "Using chained inheritance without CouchRest::Model::Base" do
     it "should preserve inheritable attributes" do
       PlainParent.foo.should == :bar
       PlainChild.foo.should == :bar
     end
   end
 
-  describe "Using chained inheritance with CouchRest::ExtendedDocument" do
+  describe "Using chained inheritance with CouchRest::Model::Base" do
     it "should preserve inheritable attributes" do
       ExtendedParent.foo.should == :bar
       ExtendedChild.foo.should == :bar

data/spec/couchrest/property_spec.rb

@@ -11,36 +11,36 @@ require File.join(FIXTURE_PATH, 'more', 'course')
 
 
 describe "Model properties" do
-  
+
   before(:each) do
     reset_test_db!
     @card = Card.new(:first_name => "matt")
   end
-  
+
   it "should be accessible from the object" do
     @card.properties.should be_an_instance_of(Array)
     @card.properties.map{|p| p.name}.should include("first_name")
   end
-  
+
   it "should let you access a property value (getter)" do
     @card.first_name.should == "matt"
   end
-  
+
   it "should let you set a property value (setter)" do
     @card.last_name = "Aimonetti"
     @card.last_name.should == "Aimonetti"
   end
-  
+
   it "should not let you set a property value if it's read only" do
     lambda{@card.read_only_value = "test"}.should raise_error
   end
-  
+
   it "should let you use an alias for an attribute" do
     @card.last_name = "Aimonetti"
     @card.family_name.should == "Aimonetti"
     @card.family_name.should == @card.last_name
   end
-  
+
   it "should let you use an alias for a casted attribute" do
     @card.cast_alias = Person.new(:name => ["Aimonetti"])
     @card.cast_alias.name.should == ["Aimonetti"]
@@ -50,7 +50,7 @@ describe "Model properties" do
     card.calias.name.should == ["Aimonetti"]
   end
 
-  
+
   it "should be auto timestamped" do
     @card.created_at.should be_nil
     @card.updated_at.should be_nil
@@ -59,45 +59,57 @@ describe "Model properties" do
     @card.updated_at.should_not be_nil
   end
 
-  it "should let you use read_attribute method" do
-    @card.last_name = "Aimonetti"
-    @card.read_attribute(:last_name).should eql('Aimonetti')
-    @card.read_attribute('last_name').should eql('Aimonetti')
-    last_name_prop = @card.properties.find{|p| p.name == 'last_name'}
-    @card.read_attribute(last_name_prop).should eql('Aimonetti')
-  end
+  describe '#read_attribute' do
+    it "should let you use read_attribute method" do
+      @card.last_name = "Aimonetti"
+      @card.read_attribute(:last_name).should eql('Aimonetti')
+      @card.read_attribute('last_name').should eql('Aimonetti')
+      last_name_prop = @card.properties.find{|p| p.name == 'last_name'}
+      @card.read_attribute(last_name_prop).should eql('Aimonetti')
+    end
 
-  it "should let you use write_attribute method" do
-    @card.write_attribute(:last_name, 'Aimonetti 1')
-    @card.last_name.should eql('Aimonetti 1')
-    @card.write_attribute('last_name', 'Aimonetti 2')
-    @card.last_name.should eql('Aimonetti 2')
-    last_name_prop = @card.properties.find{|p| p.name == 'last_name'}
-    @card.write_attribute(last_name_prop, 'Aimonetti 3')
-    @card.last_name.should eql('Aimonetti 3')
+    it 'should raise an error if the property does not exist' do
+      expect { @card.read_attribute(:this_property_should_not_exist) }.to raise_error(ArgumentError)
+    end
   end
 
-  it "should let you use write_attribute on readonly properties" do
-    lambda {
-      @card.read_only_value = "foo"
-    }.should raise_error
-    @card.write_attribute(:read_only_value, "foo")
-    @card.read_only_value.should == 'foo'
-  end
+  describe '#write_attribute' do
+    it "should let you use write_attribute method" do
+      @card.write_attribute(:last_name, 'Aimonetti 1')
+      @card.last_name.should eql('Aimonetti 1')
+      @card.write_attribute('last_name', 'Aimonetti 2')
+      @card.last_name.should eql('Aimonetti 2')
+      last_name_prop = @card.properties.find{|p| p.name == 'last_name'}
+      @card.write_attribute(last_name_prop, 'Aimonetti 3')
+      @card.last_name.should eql('Aimonetti 3')
+    end
 
-  it "should cast via write_attribute" do
-    @card.write_attribute(:cast_alias, {:name => ["Sam", "Lown"]})
-    @card.cast_alias.class.should eql(Person)
-    @card.cast_alias.name.last.should eql("Lown")
-  end
+    it 'should raise an error if the property does not exist' do
+      expect { @card.write_attribute(:this_property_should_not_exist, 823) }.to raise_error(ArgumentError)
+    end
+
+    it "should let you use write_attribute on readonly properties" do
+      lambda {
+        @card.read_only_value = "foo"
+      }.should raise_error
+      @card.write_attribute(:read_only_value, "foo")
+      @card.read_only_value.should == 'foo'
+    end
+
+    it "should cast via write_attribute" do
+      @card.write_attribute(:cast_alias, {:name => ["Sam", "Lown"]})
+      @card.cast_alias.class.should eql(Person)
+      @card.cast_alias.name.last.should eql("Lown")
+    end
 
-  it "should not cast via write_attribute if property not casted" do
-    @card.write_attribute(:first_name, {:name => "Sam"})
-    @card.first_name.class.should eql(Hash)
-    @card.first_name[:name].should eql("Sam")
+    it "should not cast via write_attribute if property not casted" do
+      @card.write_attribute(:first_name, {:name => "Sam"})
+      @card.first_name.class.should eql(Hash)
+      @card.first_name[:name].should eql("Sam")
+    end
   end
 
-  
+
   describe "mass assignment protection" do
 
     it "should not store protected attribute using mass assignment" do
@@ -120,12 +132,12 @@ describe "Model properties" do
     end
 
   end
-  
+
   describe "validation" do
     before(:each) do
       @invoice = Invoice.new(:client_name => "matt", :employee_name => "Chris", :location => "San Diego, CA")
     end
-    
+
     it "should be able to be validated" do
       @card.valid?.should == true
     end
@@ -136,7 +148,7 @@ describe "Model properties" do
       @card.errors.should_not be_empty
       @card.errors[:first_name].should == ["can't be blank"]
     end
-    
+
     it "should let you look up errors for a field by a string name" do
       @card.first_name = nil
       @card.should_not be_valid
@@ -150,13 +162,13 @@ describe "Model properties" do
       @invoice.errors[:client_name].should == ["can't be blank"]
       @invoice.errors[:employee_name].should_not be_empty
     end
-    
+
     it "should let you set an error message" do
       @invoice.location = nil
       @invoice.valid?
       @invoice.errors[:location].should == ["Hey stupid!, you forgot the location"]
     end
-    
+
     it "should validate before saving" do
       @invoice.location = nil
       @invoice.should_not be_valid
@@ -164,7 +176,7 @@ describe "Model properties" do
       @invoice.should be_new
     end
   end
-  
+
   describe "casting" do
     before(:each) do
       @course = Course.new(:title => 'Relaxation')
@@ -188,14 +200,14 @@ describe "Model properties" do
         @course['started_on'].should be_an_instance_of(Date)
       end
     end
-    
+
     describe "when type primitive is a String" do
       it "keeps string value unchanged" do
         value = "1.0"
         @course.title = value
         @course['title'].should equal(value)
       end
-      
+
       it "it casts to string representation of the value" do
         @course.title = 1.0
         @course['title'].should eql("1.0")
@@ -584,7 +596,7 @@ describe "Model properties" do
         @course['klass'].should eql('NoClass')
       end
     end
-    
+
     describe 'when type primitive is a Boolean' do
 
       [ true, 'true', 'TRUE', '1', 1, 't', 'T' ].each do |value|
@@ -609,7 +621,7 @@ describe "Model properties" do
       end
 
       it "should respond to requests with ? modifier" do
-        @course.active = nil 
+        @course.active = nil
         @course.active?.should be_false
         @course.active = false
         @course.active?.should be_false
@@ -618,7 +630,7 @@ describe "Model properties" do
       end
 
       it "should respond to requests with ? modifier on TrueClass" do
-        @course.very_active = nil 
+        @course.very_active = nil
         @course.very_active?.should be_false
         @course.very_active = false
         @course.very_active?.should be_false
@@ -631,7 +643,7 @@ describe "Model properties" do
 end
 
 describe "properties of array of casted models" do
-  
+
   before(:each) do
     @course = Course.new :title => 'Test Course'
   end
@@ -691,13 +703,13 @@ describe "a casted model retrieved from the database" do
     @cat.save
     @cat = Cat.get(@cat.id)
   end
-  
+
   describe "as a casted property" do
     it "should already be casted_by its parent" do
       @cat.favorite_toy.casted_by.should === @cat
     end
   end
-  
+
   describe "from a casted collection" do
     it "should already be casted_by its parent" do
       @cat.toys[0].casted_by.should === @cat
@@ -789,7 +801,7 @@ describe "Property Class" do
     it "should set parent as casted_by object in CastedArray" do
       property = CouchRest::Model::Property.new(:test, [Object])
       parent = mock("FooObject")
-      property.cast(parent, ["2010-06-01", "2010-06-02"]).casted_by.should eql(parent)     
+      property.cast(parent, ["2010-06-01", "2010-06-02"]).casted_by.should eql(parent)
     end
 
     it "should set casted_by on new value" do

data/spec/couchrest/validations.rb

@@ -57,6 +57,7 @@ describe "Validations" do
         @obj.class.should_receive('view').and_return({'rows' => [ ]})
         @obj.valid?
       end
+
     end
  
     context "with a proxy parameter" do
@@ -65,6 +66,17 @@ describe "Validations" do
         proxy = @obj.should_receive('proxy').and_return(@obj.class)
         @obj.valid?.should be_true
       end
+
+      it "should allow specific view" do
+        @obj = WithUniqueValidationProxy.new(:title => 'test 7')
+        @obj.class.should_not_receive('view_by')
+        proxy = mock('Proxy')
+        @obj.should_receive('proxy').and_return(proxy)
+        proxy.should_receive('has_view?').and_return(true)
+        proxy.should_receive('view').and_return({'rows' => [ ]})
+        @obj.valid?
+      end
+
     end
 
  

data/spec/fixtures/more/client.rb

@@ -0,0 +1,6 @@
+class Client < CouchRest::Model::Base
+  use_database DB
+
+  property :name
+  property :tax_code
+end

data/spec/fixtures/more/sale_entry.rb

@@ -0,0 +1,9 @@
+class SaleEntry < CouchRest::Model::Base
+  use_database DB
+
+  property :description
+  property :price
+  
+  view_by :description
+  
+end

data/spec/fixtures/more/sale_invoice.rb

@@ -0,0 +1,13 @@
+require File.join(FIXTURE_PATH, 'more', 'client')
+require File.join(FIXTURE_PATH, 'more', 'sale_entry')
+class SaleInvoice < CouchRest::Model::Base  
+  use_database DB
+
+  belongs_to :client
+  belongs_to :alternate_client, :class_name => 'Client', :foreign_key => 'alt_client_id'
+
+  collection_of :entries, :class_name => 'SaleEntry'
+
+  property :date, Date
+  property :price, Integer 
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: couchrest_model
 version: !ruby/object:Gem::Version 
-  hash: -1848230057
+  hash: -1848230060
   prerelease: true
   segments: 
   - 1
   - 0
   - 0
-  - beta7
-  version: 1.0.0.beta7
+  - beta8
+  version: 1.0.0.beta8
 platform: ruby
 authors: 
 - J. Chris Anderson
@@ -20,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-21 00:00:00 -03:00
+date: 2010-08-22 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,15 +29,14 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31098193
+        hash: 23
         segments: 
         - 1
         - 0
         - 0
-        - beta
-        version: 1.0.0.beta
+        version: 1.0.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -46,7 +45,7 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 17
         segments: 
@@ -61,7 +60,7 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 9
         segments: 
@@ -77,7 +76,7 @@ dependencies:
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: -1848230024
         segments: 
@@ -88,6 +87,22 @@ dependencies:
         version: 3.0.0.beta4
   type: :runtime
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: tzinfo
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 3
+        - 22
+        version: 0.3.22
+  type: :runtime
+  version_requirements: *id005
 description: CouchRest Model provides aditional features to the standard CouchRest Document class such as properties, view designs, associations, callbacks, typecasting and validations.
 email: jchris@apache.org
 executables: []
@@ -103,7 +118,6 @@ files:
 - README.md
 - Rakefile
 - THANKS.md
-- examples/model/example.rb
 - history.txt
 - lib/couchrest/model.rb
 - lib/couchrest/model/associations.rb
@@ -130,7 +144,11 @@ files:
 - lib/couchrest/model/validations/locale/en.yml
 - lib/couchrest/model/validations/uniqueness.rb
 - lib/couchrest/model/views.rb
+- lib/couchrest/railtie.rb
 - lib/couchrest_model.rb
+- lib/rails/generators/couchrest_model.rb
+- lib/rails/generators/couchrest_model/model/model_generator.rb
+- lib/rails/generators/couchrest_model/model/templates/model.rb
 - spec/couchrest/assocations_spec.rb
 - spec/couchrest/attachment_spec.rb
 - spec/couchrest/attribute_protection_spec.rb
@@ -151,11 +169,14 @@ files:
 - spec/fixtures/more/article.rb
 - spec/fixtures/more/card.rb
 - spec/fixtures/more/cat.rb
+- spec/fixtures/more/client.rb
 - spec/fixtures/more/course.rb
 - spec/fixtures/more/event.rb
 - spec/fixtures/more/invoice.rb
 - spec/fixtures/more/person.rb
 - spec/fixtures/more/question.rb
+- spec/fixtures/more/sale_entry.rb
+- spec/fixtures/more/sale_invoice.rb
 - spec/fixtures/more/service.rb
 - spec/fixtures/more/user.rb
 - spec/fixtures/views/lib.js
@@ -165,8 +186,6 @@ files:
 - spec/fixtures/views/test_view/test-reduce.js
 - spec/spec.opts
 - spec/spec_helper.rb
-- utils/remap.rb
-- utils/subset.rb
 has_rdoc: true
 homepage: http://github.com/couchrest/couchrest_model
 licenses: []
@@ -221,12 +240,14 @@ test_files:
 - spec/fixtures/more/article.rb
 - spec/fixtures/more/card.rb
 - spec/fixtures/more/cat.rb
+- spec/fixtures/more/client.rb
 - spec/fixtures/more/course.rb
 - spec/fixtures/more/event.rb
 - spec/fixtures/more/invoice.rb
 - spec/fixtures/more/person.rb
 - spec/fixtures/more/question.rb
+- spec/fixtures/more/sale_entry.rb
+- spec/fixtures/more/sale_invoice.rb
 - spec/fixtures/more/service.rb
 - spec/fixtures/more/user.rb
 - spec/spec_helper.rb
-- examples/model/example.rb