simply_stored 0.3.6 → 0.3.7

data/test/couchdb/couch_soft_deletable_test.rb

@@ -0,0 +1,457 @@
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../fixtures/couch')
+
+class CouchSoftDeletableTest < Test::Unit::TestCase
+  context "when using soft deletable" do
+    setup do
+      CouchPotato::Config.database_name = 'simply_stored_test'
+      recreate_db
+    end
+    should "know when it is enabled" do
+      assert Hemorrhoid.soft_deleting_enabled?
+      assert !User.soft_deleting_enabled?
+    end
+    
+    should "define a :deleted_at attribute" do
+      h = Hemorrhoid.new
+      assert h.respond_to?(:deleted_at)
+      assert h.respond_to?(:deleted_at=)
+      assert_equal :deleted_at, Hemorrhoid.soft_delete_attribute
+    end
+    
+    should "define a hard delete methods" do
+      h = Hemorrhoid.new
+      assert h.respond_to?(:destroy!)
+      assert h.respond_to?(:delete!)
+    end
+    
+    context "when deleting" do
+      setup do
+        @user = User.new(:name => 'BigT', :title => 'Dr.')
+        @user.save!
+        @hemorrhoid = Hemorrhoid.new
+        @hemorrhoid.user = @user
+        @hemorrhoid.save!
+      end
+      
+      should "not delete the object but populate the soft_delete_attribute" do
+        now = Time.now
+        Time.stubs(:now).returns(now)
+        assert_nil @hemorrhoid.deleted_at
+        assert @hemorrhoid.delete
+        assert_equal now, @hemorrhoid.deleted_at
+      end
+      
+      should "survive reloads with the new attribute" do
+        assert_nil @hemorrhoid.deleted_at
+        assert @hemorrhoid.delete
+        @hemorrhoid.reload
+        assert_not_nil @hemorrhoid.deleted_at
+      end
+      
+      should "know when it is deleted" do
+        assert !@hemorrhoid.deleted?
+        @hemorrhoid.delete
+        assert @hemorrhoid.deleted?
+      end
+      
+      should "not consider objects without soft-deleted as deleted" do
+        assert !@user.deleted?
+        @user.delete
+        assert !@user.deleted?
+      end
+      
+      should "not delete in DB" do
+        CouchPotato.database.expects(:destroy_document).never
+        @hemorrhoid.destroy
+      end
+      
+      should "really delete if asked to" do
+        CouchPotato.database.expects(:destroy_document).with(@hemorrhoid)
+        @hemorrhoid.destroy!
+      end
+      
+      context "callbacks" do
+      
+        should "still fire the callbacks" do
+          @hemorrhoid = Hemorrhoid.create
+          $before = nil
+          $after = nil
+          def @hemorrhoid.before_destroy_callback
+            $before = "now"
+          end
+        
+          def @hemorrhoid.after_destroy_callback
+            $after = "now"
+          end
+        
+          @hemorrhoid.destroy
+        
+          assert_not_nil $before
+          assert_not_nil $after
+        end
+      
+        should "not fire the callbacks on the real destroy if the object is already deleted" do
+          @hemorrhoid = Hemorrhoid.create
+          def @hemorrhoid.before_destroy_callback
+            raise "Callback called even though #{skip_callbacks.inspect}"
+          end
+        
+          def @hemorrhoid.after_destroy_callback
+            raise "Callback called even though #{skip_callbacks.inspect}"
+          end
+        
+          def @hemorrhoid.deleted?
+            true
+          end
+          
+          assert_nothing_raised do
+            @hemorrhoid.destroy!
+          end
+        end
+        
+        should "not fire the callbacks on the real destroy if the object is not deleted" do
+          @hemorrhoid = Hemorrhoid.create
+          $before = nil
+          $after = nil
+          def @hemorrhoid.before_destroy_callback
+            $before = "now"
+          end
+        
+          def @hemorrhoid.after_destroy_callback
+            $after = "now"
+          end
+        
+          @hemorrhoid.destroy!
+        
+          assert_not_nil $before
+          assert_not_nil $after
+        end
+      end
+      
+      context "when handling the dependent objects" do
+        setup do
+          @sub = SubHemorrhoid.new
+          @sub.hemorrhoid = @hemorrhoid
+          @sub.save!
+          
+          @easy_sub = EasySubHemorrhoid.new
+          @easy_sub.hemorrhoid = @hemorrhoid
+          @easy_sub.save!
+          
+          @rash = Rash.new
+          @rash.hemorrhoid = @hemorrhoid
+          @rash.save!
+          
+          @hemorrhoid.reload
+        end
+        
+        should "delete them" do
+          @hemorrhoid.delete
+          @sub.reload
+          assert @sub.deleted?
+          assert_raise(SimplyStored::RecordNotFound) do
+            EasySubHemorrhoid.find(@easy_sub.id, :with_deleted => true)
+          end
+          @rash = Rash.find(@rash.id)
+          assert_nil @rash.hemorrhoid_id
+        end
+      
+        should "really delete them if the parent is really deleted" do
+          @hemorrhoid.delete!
+          assert_raise(SimplyStored::RecordNotFound) do
+            EasySubHemorrhoid.find(@sub.id, :with_deleted => true)
+          end
+          
+          assert_raise(SimplyStored::RecordNotFound) do
+            EasySubHemorrhoid.find(@easy_sub.id, :with_deleted => true)
+          end
+          
+          @rash = Rash.find(@rash.id)
+          assert_nil @rash.hemorrhoid_id
+        end
+        
+        should "not nullify dependents if they are soft-deletable" do
+          small_rash = SmallRash.create(:hemorrhoid => @hemorrhoid)
+          @hemorrhoid.reload
+          @hemorrhoid.destroy
+          small_rash = SmallRash.find(small_rash.id)
+          assert_not_nil small_rash.hemorrhoid_id
+          assert_equal @hemorrhoid.id, small_rash.hemorrhoid_id
+        end
+      end
+      
+    end
+    
+    context "when loading" do
+      setup do
+        @user = User.new(:name => 'BigT', :title => 'Dr.')
+        @user.save!
+        @hemorrhoid = Hemorrhoid.new
+        @hemorrhoid.user = @user
+        @hemorrhoid.save!
+      end
+      
+      context "by id" do
+        should "not be found by default" do
+          @hemorrhoid.destroy            
+          assert_raise(SimplyStored::RecordNotFound) do
+            Hemorrhoid.find(@hemorrhoid.id)
+          end
+        end
+        
+        should "be found if supplied with :with_deleted" do
+          @hemorrhoid.destroy
+          
+          assert_not_nil Hemorrhoid.find(@hemorrhoid.id, :with_deleted => true)
+        end
+        
+        should "not be found if it is really gone" do
+          old_id = @hemorrhoid.id
+          @hemorrhoid.destroy!
+          
+          assert_raise(SimplyStored::RecordNotFound) do
+            Hemorrhoid.find(old_id)
+          end
+        end
+        
+        should "always reload" do
+          @hemorrhoid.destroy
+          assert_nothing_raised do
+            @hemorrhoid.reload
+          end
+          assert_not_nil @hemorrhoid.deleted_at
+        end
+      end
+      
+      context "all" do
+        setup do
+          recreate_db
+          @hemorrhoid = Hemorrhoid.create
+          assert @hemorrhoid.destroy
+          assert @hemorrhoid.reload.deleted?
+        end
+        
+        should "not load deleted" do
+          assert_equal [], Hemorrhoid.find(:all)
+          assert_equal [], Hemorrhoid.find(:all, :with_deleted => false)
+        end
+        
+        should "load non-deleted" do
+          hemorrhoid = Hemorrhoid.create
+          assert_not_equal [], Hemorrhoid.find(:all)
+          assert_not_equal [], Hemorrhoid.find(:all, :with_deleted => false)
+        end
+        
+        should "load deleted if asked to" do
+          assert_equal [@hemorrhoid.id], Hemorrhoid.find(:all, :with_deleted => true).map(&:id)
+        end
+      end
+      
+      context "first" do
+        setup do
+          recreate_db
+          @hemorrhoid = Hemorrhoid.create
+          assert @hemorrhoid.destroy
+          assert @hemorrhoid.reload.deleted?
+        end
+        
+        should "not load deleted" do
+          assert_nil Hemorrhoid.find(:first)
+          assert_nil Hemorrhoid.find(:first, :with_deleted => false)
+        end
+        
+        should "load non-deleted" do
+          hemorrhoid = Hemorrhoid.create
+          assert_not_nil Hemorrhoid.find(:first)
+          assert_not_nil Hemorrhoid.find(:first, :with_deleted => false)
+        end
+        
+        should "load deleted if asked to" do
+          assert_equal @hemorrhoid, Hemorrhoid.find(:first, :with_deleted => true)
+        end
+      end
+      
+      context "find_by and find_all_by" do
+        setup do
+          recreate_db
+          @hemorrhoid = Hemorrhoid.create(:nickname => 'Claas', :size => 3)
+          @hemorrhoid.destroy
+        end
+        
+        context "find_by" do
+          should "not load deleted" do
+            assert_nil Hemorrhoid.find_by_nickname('Claas')
+            assert_nil Hemorrhoid.find_by_nickname('Claas', :with_deleted => false)
+            
+            assert_nil Hemorrhoid.find_by_nickname_and_size('Claas', 3)
+            assert_nil Hemorrhoid.find_by_nickname_and_size('Claas', 3, :with_deleted => false)
+          end
+          
+          should "load non-deleted" do
+            hemorrhoid = Hemorrhoid.create(:nickname => 'OtherNick', :size => 3)
+            assert_equal hemorrhoid.id, Hemorrhoid.find_by_nickname('OtherNick', :with_deleted => true).id
+            assert_equal hemorrhoid.id, Hemorrhoid.find_by_nickname('OtherNick').id
+          end
+        
+          should "load deleted if asked to" do
+            assert_not_nil Hemorrhoid.find_by_nickname('Claas', :with_deleted => true)
+            assert_equal @hemorrhoid.id, Hemorrhoid.find_by_nickname('Claas', :with_deleted => true).id
+            
+            assert_not_nil Hemorrhoid.find_by_nickname_and_size('Claas', 3, :with_deleted => true)
+            assert_equal @hemorrhoid.id, Hemorrhoid.find_by_nickname_and_size('Claas', 3, :with_deleted => true).id
+          end
+        end
+        
+        context "find_all_by" do
+          should "not load deleted" do
+            assert_equal [], Hemorrhoid.find_all_by_nickname('Claas')
+            assert_equal [], Hemorrhoid.find_all_by_nickname('Claas', :with_deleted => false)
+            
+            assert_equal [], Hemorrhoid.find_all_by_nickname_and_size('Claas', 3)
+            assert_equal [], Hemorrhoid.find_all_by_nickname_and_size('Claas', 3, :with_deleted => false)
+          end
+          
+          should "load non-deleted" do
+            hemorrhoid = Hemorrhoid.create(:nickname => 'Lampe', :size => 4)
+            assert_equal [hemorrhoid.id], Hemorrhoid.find_all_by_nickname('Lampe').map(&:id)
+          end
+        
+          should "load deleted if asked to" do
+            assert_equal [@hemorrhoid.id], Hemorrhoid.find_all_by_nickname('Claas', :with_deleted => true).map(&:id)
+            assert_equal [@hemorrhoid.id], Hemorrhoid.find_all_by_nickname_and_size('Claas', 3, :with_deleted => true).map(&:id)
+          end
+        end
+        
+        should "reuse the same view - when find_all_by is called first" do
+          assert_equal [], Hemorrhoid.find_all_by_nickname('Claas')
+          assert_nil Hemorrhoid.find_by_nickname('Claas')
+        end
+        
+        should "reuse the same view - when find_by is called first" do
+          assert_nil Hemorrhoid.find_by_nickname('Claas')
+          assert_equal [], Hemorrhoid.find_all_by_nickname('Claas')
+        end
+      end
+      
+      context "by relation" do
+        setup do
+          @hemorrhoid.destroy
+        end
+        
+        context "has_many" do
+          should "not load deleted by default" do
+            assert_equal [], @user.hemorrhoids
+          end
+        
+          should "load deleted if asked to" do
+            assert_equal [@hemorrhoid.id], @user.hemorrhoids(:with_deleted => true).map(&:id)
+          end
+        end
+        
+        context "has_many :through" do
+          setup do
+            @user = User.create(:name => 'BigT', :title => 'Dr.')
+            @pain = Pain.create
+            
+            @hemorrhoid = Hemorrhoid.new
+            @hemorrhoid.user = @user
+            @hemorrhoid.pain = @pain
+            @hemorrhoid.save!
+            
+            @hemorrhoid.destroy
+          end
+          
+          should "not load deleted by default" do
+            assert_equal [], @user.pains
+          end
+        
+          should "load deleted if asked to" do
+            assert_equal [@pain.id], @user.pains(:with_deleted => true).map(&:id)
+          end
+        end
+        
+        context "has_one" do
+          setup do
+            @spot = Spot.create
+            
+            @hemorrhoid = Hemorrhoid.new
+            @hemorrhoid.spot = @spot
+            @hemorrhoid.save!
+            
+            @hemorrhoid.destroy
+          end
+          
+          should "not load deleted by default" do
+            assert_nil @spot.hemorrhoid
+          end
+        
+          should "load deleted if asked to" do
+            assert_equal @hemorrhoid.id, @spot.hemorrhoid(:with_deleted => true).id
+          end
+        end
+        
+        context "belongs_to" do
+          setup do              
+            @hemorrhoid = Hemorrhoid.new
+            @hemorrhoid.save!
+            
+            @sub = SubHemorrhoid.new
+            @sub.hemorrhoid = @hemorrhoid
+            @sub.save!
+            
+            @hemorrhoid.destroy
+          end
+          
+          should "not load deleted by default" do
+            @sub.reload
+            assert_raise(SimplyStored::RecordNotFound) do
+              assert_nil @sub.hemorrhoid
+            end
+          end
+        
+          should "load deleted if asked to" do
+            @sub.reload
+            assert_equal @hemorrhoid.id, @sub.hemorrhoid(:with_deleted => true).id
+          end
+        end
+        
+      end
+      
+    end
+    
+    context "when counting" do
+      setup do
+        @hemorrhoid = Hemorrhoid.create(:nickname => 'Claas')
+        assert @hemorrhoid.destroy
+        assert @hemorrhoid.reload.deleted?
+      end
+      
+      should "not count deleted" do
+        assert_equal 0, Hemorrhoid.count
+        assert_equal 0, Hemorrhoid.count(:with_deleted => false)
+      end
+      
+      should "count non-deleted" do
+        hemorrhoid = Hemorrhoid.create(:nickname => 'Claas')
+        assert_equal 1, Hemorrhoid.count
+        assert_equal 1, Hemorrhoid.count(:with_deleted => false)
+      end
+      
+      should "count deleted if asked to" do
+        assert_equal 1, Hemorrhoid.count(:with_deleted => true)
+      end      
+      
+      context "count_by" do
+        should "not count deleted" do
+          assert_equal 0, Hemorrhoid.count_by_nickname('Claas')
+          assert_equal 0, Hemorrhoid.count_by_nickname('Claas', :with_deleted => false)
+        end
+
+        should "count deleted if asked to" do
+          assert_equal 1, Hemorrhoid.count_by_nickname('Claas', :with_deleted => true)
+        end
+      end  
+    end
+  end
+end

data/test/couchdb/couch_validations_test.rb

@@ -0,0 +1,142 @@
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../fixtures/couch')
+
+class CouchValidationsTest < Test::Unit::TestCase
+  context "with additional validations" do
+    setup do
+      CouchPotato::Config.database_name = 'simply_stored_test'
+      recreate_db
+    end
+
+    context "with validates_inclusion_of" do
+      should "validate inclusion of an attribute in an array" do
+        category = Category.new(:name => "other")
+        assert !category.save
+      end
+    
+      should "validate when the attribute is an array" do
+        category = Category.new(:name => ['drinks', 'food'])
+        assert_nothing_raised do
+          category.save!
+        end
+      end
+    
+      should "add an error message" do
+        category = Category.new(:name => "other")
+        category.valid?
+        assert_match(/must be one or more of food, drinks, party/, category.errors.full_messages.first)
+      end
+    
+      should "allow blank" do
+        category = Category.new(:name => nil)
+        assert category.valid?
+      end
+    end
+    
+    context "with validates_format_of" do
+      class ValidatedUser
+        include SimplyStored::Couch
+        property :name
+        validates_format_of :name, :with => /Paul/
+      end
+      
+      should 'validate the format and fail when not matched' do
+        user = ValidatedUser.new(:name => "John")
+        assert !user.valid?
+      end
+      
+      should 'succeed when matched' do
+        user = ValidatedUser.new(:name => "Paul")
+        assert user.valid?
+      end
+      
+      should 'fail when empty' do
+        user = ValidatedUser.new(:name => nil)
+        assert !user.valid?
+      end
+      
+      context "with allow_blank" do
+        class ValidatedBlankUser
+          include SimplyStored::Couch
+          property :name
+          validates_format_of :name, :with => /Paul/, :allow_blank => true
+        end
+        
+        should 'not fail when nil' do
+          user = ValidatedBlankUser.new(:name => nil)
+          assert user.valid?
+        end
+
+        should 'not fail when empty string' do
+          user = ValidatedBlankUser.new(:name => '')
+          assert user.valid?
+        end
+
+        should 'fail when not matching' do
+          user = ValidatedBlankUser.new(:name => 'John')
+          assert !user.valid?
+        end
+
+        should 'not fail when matching' do
+          user = ValidatedBlankUser.new(:name => 'Paul')
+          assert user.valid?
+        end
+
+      end
+    end
+
+    context "with validates_uniqueness_of" do
+      should "add a view on the unique attribute" do
+        assert UniqueUser.by_name
+      end
+      
+      should "set an error when a different with the same instance exists" do
+        assert UniqueUser.create(:name => "Host Master")
+        user = UniqueUser.create(:name => "Host Master")
+        assert !user.valid?
+      end
+      
+      should "not have an error when we're the only one around" do
+        user = UniqueUser.create(:name => "Host Master")
+        assert !user.new_record?
+      end
+      
+      should "not have an error when it's the same instance" do
+        user = UniqueUser.create(:name => "Host Master")
+        user = UniqueUser.find(user.id)
+        assert user.valid?
+      end
+      
+      should 'have a nice error message' do
+        assert UniqueUser.create(:name => "Host Master")
+        user = UniqueUser.create(:name => "Host Master")
+        assert_equal "Name is already taken", user.errors.on(:name)
+      end
+      
+      should 'create a view to check with' do
+        assert UniqueUser.respond_to?(:by_name)
+        assert_equal :name, UniqueUser.by_name.send(:options)[:key]
+      end
+
+      should 'not overwrite the view when a custom one already exists' do
+        assert_equal :email, UniqueUserWithAView.by_name.send(:options)[:key]
+      end
+    end
+    
+    context "equality" do
+      should "know when two objects are equal" do
+        user = UniqueUser.create(:name => "Host Master")
+        other_user = UniqueUser.create(:name => "The other one")
+        assert user == user
+        assert user != other_user
+      end
+      
+      should "not bail when comparing with non-SimplyStored objects" do
+        user = UniqueUser.create(:name => "Host Master")
+        assert 5 != user
+        assert user != 5
+      end
+    end
+    
+  end
+end

data/test/{custom_views_test.rb → couchdb/custom_views_test.rb}

@@ -1,5 +1,5 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper')
-require File.expand_path(File.dirname(__FILE__) + '/fixtures/couch')
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../fixtures/couch')
 
 class CustomViewUser
   include SimplyStored::Couch
@@ -30,4 +30,4 @@ class CustomViewsTest < Test::Unit::TestCase
       end
     end
   end
-end
+end

data/test/simply_stored_simpledb_test.rb

@@ -1310,7 +1310,7 @@ class SimplyStoredTest < Test::Unit::TestCase
             @log_item._s3_options[:log_data][:location] = :us
             @log_item._s3_options[:log_data][:permissions] = 'private'
             @log_item.save
-            assert @log_item.log_data_url.include?("https://bucket-for-monsieur.s3.amazonaws.com:443/#{@log_item.s3_attachment_key(:log_data)}")
+            assert @log_item.log_data_url.gsub("%2F", '/').include?("https://bucket-for-monsieur.s3.amazonaws.com:443/#{@log_item.s3_attachment_key(:log_data)}")
             assert @log_item.log_data_url.include?("Signature=")
             assert @log_item.log_data_url.include?("Expires=")
           end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simply_stored
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 3
-  - 6
-  version: 0.3.6
+  - 7
+  version: 0.3.7
 platform: ruby
 authors: 
 - Mathias Meyer, Jonathan Weiss
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-15 00:00:00 +02:00
+date: 2010-09-23 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -111,7 +111,18 @@ files:
 - lib/simply_stored/simpledb/storag.rb
 - lib/simply_stored/simpledb/validations.rb
 - lib/simply_stored/storage.rb
-- test/custom_views_test.rb
+- test/couchdb/couch_active_model_compatibility_test.rb
+- test/couchdb/couch_belongs_to_test.rb
+- test/couchdb/couch_conflict_handling_test.rb
+- test/couchdb/couch_finder_test.rb
+- test/couchdb/couch_has_many_test.rb
+- test/couchdb/couch_has_one_test.rb
+- test/couchdb/couch_instance_lifecycle_test.rb
+- test/couchdb/couch_mass_assignment_protection_test.rb
+- test/couchdb/couch_s3_test.rb
+- test/couchdb/couch_soft_deletable_test.rb
+- test/couchdb/couch_validations_test.rb
+- test/couchdb/custom_views_test.rb
 - test/fixtures/couch.rb
 - test/fixtures/simpledb/item.rb
 - test/fixtures/simpledb/item_daddy.rb
@@ -119,7 +130,6 @@ files:
 - test/fixtures/simpledb/namespace_bar.rb
 - test/fixtures/simpledb/namespace_foo.rb
 - test/fixtures/simpledb/protected_item.rb
-- test/simply_stored_couch_test.rb
 - test/simply_stored_simpledb_test.rb
 - test/test_helper.rb
 - test/vendor/dhaka-2.2.1/lib/dhaka/dot/dot.rb
@@ -249,7 +259,18 @@ signing_key:
 specification_version: 3
 summary: Convenience layer for CouchDB and SimpleDB
 test_files: 
-- test/custom_views_test.rb
+- test/couchdb/couch_active_model_compatibility_test.rb
+- test/couchdb/couch_belongs_to_test.rb
+- test/couchdb/couch_conflict_handling_test.rb
+- test/couchdb/couch_finder_test.rb
+- test/couchdb/couch_has_many_test.rb
+- test/couchdb/couch_has_one_test.rb
+- test/couchdb/couch_instance_lifecycle_test.rb
+- test/couchdb/couch_mass_assignment_protection_test.rb
+- test/couchdb/couch_s3_test.rb
+- test/couchdb/couch_soft_deletable_test.rb
+- test/couchdb/couch_validations_test.rb
+- test/couchdb/custom_views_test.rb
 - test/fixtures/couch.rb
 - test/fixtures/simpledb/item.rb
 - test/fixtures/simpledb/item_daddy.rb
@@ -257,7 +278,6 @@ test_files:
 - test/fixtures/simpledb/namespace_bar.rb
 - test/fixtures/simpledb/namespace_foo.rb
 - test/fixtures/simpledb/protected_item.rb
-- test/simply_stored_couch_test.rb
 - test/simply_stored_simpledb_test.rb
 - test/test_helper.rb
 - test/vendor/dhaka-2.2.1/lib/dhaka/dot/dot.rb