norr-couchrest 0.33.02 → 0.33.06

data/spec/couchrest/more/extended_doc_spec.rb

@@ -1,6 +1,7 @@
 require File.expand_path("../../../spec_helper", __FILE__)
 require File.join(FIXTURE_PATH, 'more', 'article')
 require File.join(FIXTURE_PATH, 'more', 'course')
+require File.join(FIXTURE_PATH, 'more', 'cat')
 
 
 describe "ExtendedDocument" do
@@ -17,8 +18,11 @@ describe "ExtendedDocument" do
   end
   
   class WithCallBacks < CouchRest::ExtendedDocument
+    include ::CouchRest::Validation
     use_database TEST_SERVER.default_database
     property :name
+    property :run_before_validate
+    property :run_after_validate
     property :run_before_save
     property :run_after_save
     property :run_before_create
@@ -26,24 +30,56 @@ describe "ExtendedDocument" do
     property :run_before_update
     property :run_after_update
     
-    save_callback :before do |object| 
+    before_validate do |object|
+      object.run_before_validate = true
+    end
+    after_validate do |object| 
+      object.run_after_validate = true
+    end
+    before_save do |object| 
       object.run_before_save = true
     end
-    save_callback :after do |object| 
+    after_save do |object| 
       object.run_after_save = true
     end
-    create_callback :before do |object| 
+    before_create do |object| 
       object.run_before_create = true
     end
-    create_callback :after do |object| 
+    after_create do |object| 
       object.run_after_create = true
     end
-    update_callback :before do |object| 
+    before_update do |object| 
       object.run_before_update = true
     end
-    update_callback :after do |object| 
+    after_update do |object| 
       object.run_after_update = true
     end
+    
+    property :run_one
+    property :run_two
+    property :run_three
+    
+    before_save :run_one_method, :run_two_method do |object| 
+      object.run_three = true
+    end
+    def run_one_method
+      self.run_one = true
+    end
+    def run_two_method
+      self.run_two = true
+    end
+    
+    attr_accessor :run_it
+    property :conditional_one
+    property :conditional_two
+    
+    before_save :conditional_one_method, :conditional_two_method, :if => proc { self.run_it }
+    def conditional_one_method
+      self.conditional_one = true
+    end
+    def conditional_two_method
+      self.conditional_two = true
+    end
   end
   
   class WithTemplateAndUniqueID < CouchRest::ExtendedDocument
@@ -85,15 +121,12 @@ describe "ExtendedDocument" do
   end
   
   describe "a new model" do
-    it "should be a new_record" do
-      @obj = Basic.new
-      @obj.rev.should be_nil
-      @obj.should be_a_new_record
-    end
-    it "should be a new_document" do
+    it "should be a new document" do
       @obj = Basic.new
       @obj.rev.should be_nil
-      @obj.should be_a_new_document
+      @obj.should be_new
+      @obj.should be_new_document
+      @obj.should be_new_record
     end
   end
   
@@ -101,7 +134,7 @@ describe "ExtendedDocument" do
     it "should instantialize and save a document" do
       article = Article.create(:title => 'my test')
       article.title.should == 'my test'
-      article.should_not be_new_document 
+      article.should_not be_new
     end 
     
     it "should trigger the create callbacks" do
@@ -125,6 +158,27 @@ describe "ExtendedDocument" do
       @art.update_attributes_without_saving('date' => Time.now, :title => "super danger")
       @art['title'].should == "super danger"
     end
+    it "should silently ignore _id" do
+      @art.update_attributes_without_saving('_id' => 'foobar')
+      @art['_id'].should_not == 'foobar'
+    end
+    it "should silently ignore _rev" do
+      @art.update_attributes_without_saving('_rev' => 'foobar')
+      @art['_rev'].should_not == 'foobar'
+    end
+    it "should silently ignore created_at" do
+      @art.update_attributes_without_saving('created_at' => 'foobar')
+      @art['created_at'].should_not == 'foobar'
+    end
+    it "should silently ignore updated_at" do
+      @art.update_attributes_without_saving('updated_at' => 'foobar')
+      @art['updated_at'].should_not == 'foobar'
+    end
+    it "should also work using attributes= alias" do
+      @art.respond_to?(:attributes=).should be_true
+      @art.attributes = {'date' => Time.now, :title => "something else"}
+      @art['title'].should == "something else"
+    end
     
     it "should flip out if an attribute= method is missing" do
       lambda {
@@ -419,7 +473,7 @@ describe "ExtendedDocument" do
     end
     
     it "should be a new document" do
-      @art.should be_a_new_document
+      @art.should be_new
       @art.title.should be_nil
     end
     
@@ -527,12 +581,46 @@ describe "ExtendedDocument" do
       @doc = WithCallBacks.new
     end
     
+    
+    describe "validate" do
+      it "should run before_validate before validating" do
+        @doc.run_before_validate.should be_nil
+        @doc.should be_valid
+        @doc.run_before_validate.should be_true
+      end
+      it "should run after_validate after validating" do
+        @doc.run_after_validate.should be_nil
+        @doc.should be_valid
+        @doc.run_after_validate.should be_true
+      end
+    end
     describe "save" do
       it "should run the after filter after saving" do
         @doc.run_after_save.should be_nil
         @doc.save.should be_true
         @doc.run_after_save.should be_true
       end
+      it "should run the grouped callbacks before saving" do
+        @doc.run_one.should be_nil
+        @doc.run_two.should be_nil
+        @doc.run_three.should be_nil
+        @doc.save.should be_true
+        @doc.run_one.should be_true
+        @doc.run_two.should be_true
+        @doc.run_three.should be_true
+      end
+      it "should not run conditional callbacks" do
+        @doc.run_it = false
+        @doc.save.should be_true
+        @doc.conditional_one.should be_nil
+        @doc.conditional_two.should be_nil
+      end
+      it "should run conditional callbacks" do
+        @doc.run_it = true
+        @doc.save.should be_true
+        @doc.conditional_one.should be_true
+        @doc.conditional_two.should be_true
+      end
     end
     describe "create" do
       it "should run the before save filter when creating" do
@@ -585,4 +673,49 @@ describe "ExtendedDocument" do
       @doc.other_arg.should == "foo-foo"
     end
   end
+  
+  describe "recursive validation on an extended document" do
+    before :each do
+      reset_test_db!
+      @cat = Cat.new(:name => 'Sockington')
+    end
+    
+    it "should not save if a nested casted model is invalid" do
+      @cat.favorite_toy = CatToy.new
+      @cat.should_not be_valid
+      @cat.save.should be_false
+      lambda{@cat.save!}.should raise_error
+    end
+    
+    it "should save when nested casted model is valid" do
+      @cat.favorite_toy = CatToy.new(:name => 'Squeaky')
+      @cat.should be_valid
+      @cat.save.should be_true
+      lambda{@cat.save!}.should_not raise_error
+    end
+    
+    it "should not save when nested collection contains an invalid casted model" do
+      @cat.toys = [CatToy.new(:name => 'Feather'), CatToy.new]
+      @cat.should_not be_valid
+      @cat.save.should be_false
+      lambda{@cat.save!}.should raise_error
+    end
+    
+    it "should save when nested collection contains valid casted models" do
+      @cat.toys = [CatToy.new(:name => 'feather'), CatToy.new(:name => 'ball-o-twine')]
+      @cat.should be_valid
+      @cat.save.should be_true
+      lambda{@cat.save!}.should_not raise_error
+    end
+    
+    it "should not fail if the nested casted model doesn't have validation" do
+      Cat.property :trainer, :cast_as => 'Person'
+      Cat.validates_present :name
+      cat = Cat.new(:name => 'Mr Bigglesworth')
+      cat.trainer = Person.new
+      cat.trainer.validatable?.should be_false
+      cat.should be_valid
+      cat.save.should be_true
+    end
+  end
 end

data/spec/couchrest/more/extended_doc_view_spec.rb

@@ -348,12 +348,19 @@ describe "ExtendedDocument views" do
   describe "with a collection" do
     before(:all) do
       reset_test_db!
-      @titles = ["very uniq one", "really interesting", "some fun",
+      titles = ["very uniq one", "really interesting", "some fun",
         "really awesome", "crazy bob", "this rocks", "super rad"]
-      @titles.each_with_index do |title,i|
+      titles.each_with_index do |title,i|
         a = Article.new(:title => title, :date => Date.today)
         a.save
       end
+
+      titles = ["yesterday very uniq one", "yesterday really interesting", "yesterday some fun",
+        "yesterday really awesome", "yesterday crazy bob", "yesterday this rocks"]
+      titles.each_with_index do |title,i|
+        a = Article.new(:title => title, :date => Date.today - 1)
+        a.save
+      end
     end 
     require 'date'
     it "should return a proxy that looks like an array of 7 Article objects" do
@@ -373,10 +380,6 @@ describe "ExtendedDocument views" do
         a.should_not be_nil
       end
     end 
-    it "should have the amount of paginated pages" do
-      articles = Article.by_date :key => Date.today
-      articles.paginate(:per_page => 3).amount_pages.should == 3
-    end
     it "should provide a class method to access the collection directly" do
       articles = Article.collection_proxy_for('Article', 'by_date', :descending => true,
         :key => Date.today, :include_docs => true)
@@ -421,6 +424,14 @@ describe "ExtendedDocument views" do
       lambda{Article.collection_proxy_for('Article', nil)}.should raise_error
       lambda{Article.paginate(:design_doc => 'Article')}.should raise_error
     end
+    it "should be able to span multiple keys" do
+      articles = Article.by_date :startkey => Date.today, :endkey => Date.today - 1
+      articles.paginate(:page => 1, :per_page => 3).size.should == 3
+      articles.paginate(:page => 2, :per_page => 3).size.should == 3
+      articles.paginate(:page => 3, :per_page => 3).size.should == 3
+      articles.paginate(:page => 4, :per_page => 3).size.should == 3
+      articles.paginate(:page => 5, :per_page => 3).size.should == 1
+    end
   end
 
 end

data/spec/couchrest/more/property_spec.rb

@@ -4,6 +4,7 @@ require File.join(FIXTURE_PATH, 'more', 'card')
 require File.join(FIXTURE_PATH, 'more', 'invoice')
 require File.join(FIXTURE_PATH, 'more', 'service')
 require File.join(FIXTURE_PATH, 'more', 'event')
+require File.join(FIXTURE_PATH, 'more', 'cat')
 
 
 describe "ExtendedDocument properties" do
@@ -94,7 +95,7 @@ describe "ExtendedDocument properties" do
       @invoice.location = nil
       @invoice.should_not be_valid
       @invoice.save.should be_false
-      @invoice.should be_new_document
+      @invoice.should be_new
     end
   end
   
@@ -191,5 +192,69 @@ describe "ExtendedDocument properties" do
     end
 
   end
+end
+
+describe "a newly created casted model" do
+  before(:each) do
+    reset_test_db!
+    @cat = Cat.new(:name => 'Toonces')
+    @squeaky_mouse = CatToy.new(:name => 'Squeaky')
+  end
+  
+  describe "assigned assigned to a casted property" do
+    it "should have casted_by set to its parent" do
+      @squeaky_mouse.casted_by.should be_nil
+      @cat.favorite_toy = @squeaky_mouse
+      @squeaky_mouse.casted_by.should === @cat
+    end
+  end
+  
+  describe "appended to a casted collection" do
+    it "should have casted_by set to its parent" do
+      @squeaky_mouse.casted_by.should be_nil
+      @cat.toys << @squeaky_mouse
+      @squeaky_mouse.casted_by.should === @cat
+      @cat.save
+      @cat.toys.first.casted_by.should === @cat
+    end
+  end
   
+  describe "list assigned to a casted collection" do
+    it "should have casted_by set on all elements" do
+      toy1 = CatToy.new(:name => 'Feather')
+      toy2 = CatToy.new(:name => 'Mouse')
+      @cat.toys = [toy1, toy2]
+      toy1.casted_by.should === @cat
+      toy2.casted_by.should === @cat
+      @cat.save
+      @cat = Cat.get(@cat.id)
+      @cat.toys[0].casted_by.should === @cat
+      @cat.toys[1].casted_by.should === @cat
+    end
+  end
 end
+
+describe "a casted model retrieved from the database" do
+  before(:each) do
+    reset_test_db!
+    @cat = Cat.new(:name => 'Stimpy')
+    @cat.favorite_toy = CatToy.new(:name => 'Stinky')
+    @cat.toys << CatToy.new(:name => 'Feather')
+    @cat.toys << CatToy.new(:name => 'Mouse')
+    @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
+      @cat.toys[1].casted_by.should === @cat
+    end
+  end
+end

data/spec/fixtures/more/article.rb

@@ -26,9 +26,9 @@ class Article < CouchRest::ExtendedDocument
 
   timestamps!
   
-  save_callback :before, :generate_slug_from_title
+  before_save :generate_slug_from_title
   
   def generate_slug_from_title
-    self['slug'] = title.downcase.gsub(/[^a-z0-9]/,'-').squeeze('-').gsub(/^\-|\-$/,'') if new_document?
+    self['slug'] = title.downcase.gsub(/[^a-z0-9]/,'-').squeeze('-').gsub(/^\-|\-$/,'') if new?
   end
 end

data/spec/fixtures/more/cat.rb

@@ -6,6 +6,7 @@ class Cat < CouchRest::ExtendedDocument
 
   property :name
   property :toys, :cast_as => ['CatToy'], :default => []
+  property :favorite_toy, :cast_as => 'CatToy'
 end
 
 class CatToy < Hash

data/spec/fixtures/more/person.rb

@@ -1,6 +1,7 @@
 class Person < Hash
   include ::CouchRest::CastedModel
   property :name
+  property :pet, :cast_as => 'Cat'
   
   def last_name
     name.last

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: norr-couchrest
 version: !ruby/object:Gem::Version 
-  version: 0.33.02
+  version: 0.33.06
 platform: ruby
 authors: 
 - J. Chris Anderson
@@ -172,7 +172,6 @@ files:
 - utils/subset.rb
 has_rdoc: false
 homepage: http://github.com/jchris/couchrest
-licenses: 
 post_install_message: 
 rdoc_options: []
 
@@ -193,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 3
 summary: Lean and RESTful interface to CouchDB.