simply_stored 0.3.1 → 0.3.2

data/CHANGELOG.md

@@ -1,6 +1,9 @@
 Changelog
 =============
 
+- Introduce :ignore option to has_many :dependent option. If :dependent is set to :ignore, 
+  dependent objects will not be deleted or nullified but just ignored.
+
 0.3.0
 =============
 

data/lib/simply_stored/couch/find_by.rb

@@ -0,0 +1,114 @@
+module SimplyStored
+  module Couch
+    module FindBy
+      def _define_find_by(name, *args)
+        keys = name.to_s.gsub(/^find_by_/, "").split("_and_")
+        view_name = name.to_s.gsub(/^find_/, "").to_sym
+        view_keys = keys.length == 1 ? keys.first : keys
+        without_deleted_view_name = "#{view_name}_withoutdeleted"
+        without_deleted_view_keys = keys + [:deleted_at]
+        
+        unless respond_to?(view_name)
+          puts "Warning: Defining view #{self.name}##{view_name} with keys #{view_keys.inspect} at call time, please add it to the class body. (Called from #{caller[0]})"
+          view(view_name, :key => view_keys)
+        end
+        
+        if !respond_to?(without_deleted_view_name) && soft_deleting_enabled?
+          puts "Warning: Defining view #{self.name}##{without_deleted_view_name} with keys #{without_deleted_view_keys.inspect} at call time, please add it to the class body. (Called from #{caller[0]})"
+          view(without_deleted_view_name, :key => without_deleted_view_keys)
+        end
+        
+        (class << self; self end).instance_eval do
+          define_method(name) do |*key_args|
+            options = key_args.last.is_a?(Hash) ? key_args.pop : {}
+            options.assert_valid_keys(:with_deleted)
+            with_deleted = options.delete(:with_deleted)
+            
+            raise ArgumentError, "Too many or too few arguments, require #{keys.inspect}" unless keys.size == key_args.size            
+            
+            if soft_deleting_enabled? && !with_deleted
+              key_args = key_args + [nil] # deleted_at
+              CouchPotato.database.view(send(without_deleted_view_name, :key => (key_args.size == 1 ? key_args.first : key_args), :limit => 1, :include_docs => true)).first
+            else
+              CouchPotato.database.view(send(view_name, :key => (key_args.size == 1 ? key_args.first : key_args), :limit => 1, :include_docs => true)).first
+            end
+          end
+        end
+        
+        send(name, *args)
+      end
+      
+      def _define_find_all_by(name, *args)
+        keys = name.to_s.gsub(/^find_all_by_/, "").split("_and_")
+        view_name = name.to_s.gsub(/^find_all_/, "").to_sym
+        view_keys = keys.length == 1 ? keys.first : keys
+        without_deleted_view_name = "#{view_name}_withoutdeleted"
+        without_deleted_view_keys = keys + [:deleted_at]
+        
+        unless respond_to?(view_name)
+          puts "Warning: Defining view #{self.name}##{view_name} with keys #{view_keys.inspect} at call time, please add it to the class body. (Called from #{caller[0]})"
+          view(view_name, :key => view_keys)
+        end
+        
+        if !respond_to?(without_deleted_view_name) && soft_deleting_enabled?
+          puts "Warning: Defining view #{self.name}##{without_deleted_view_name} with keys #{without_deleted_view_keys.inspect} at call time, please add it to the class body. (Called from #{caller[0]})"
+          view(without_deleted_view_name, :key => without_deleted_view_keys)
+        end
+        
+        (class << self; self end).instance_eval do
+          define_method(name) do |*key_args|
+            options = key_args.last.is_a?(Hash) ? key_args.pop : {}
+            options.assert_valid_keys(:with_deleted)
+            with_deleted = options.delete(:with_deleted)
+            
+            raise ArgumentError, "Too many or too few arguments, require #{keys.inspect}" unless keys.size == key_args.size            
+            
+            if soft_deleting_enabled? && !with_deleted
+              key_args = key_args + [nil] # deleted_at
+              CouchPotato.database.view(send(without_deleted_view_name, :key => (key_args.size == 1 ? key_args.first : key_args), :include_docs => true))
+            else
+              CouchPotato.database.view(send(view_name, :key => (key_args.size == 1 ? key_args.first : key_args), :include_docs => true))
+            end
+          end
+        end
+        send(name, *args)
+      end
+      
+      def _define_count_by(name, *args)
+        keys = name.to_s.gsub(/^count_by_/, "").split("_and_")
+        view_name = name.to_s.gsub(/^count_/, "").to_sym
+        view_keys = keys.length == 1 ? keys.first : keys
+        without_deleted_view_name = "#{view_name}_withoutdeleted"
+        without_deleted_view_keys = keys + [:deleted_at]
+        
+        unless respond_to?(view_name)
+          puts "Warning: Defining view #{self.name}##{view_name} with keys #{view_keys.inspect} at call time, please add it to the class body. (Called from #{caller[0]})"
+          view(view_name, :key => view_keys)
+        end
+        
+        if !respond_to?(without_deleted_view_name) && soft_deleting_enabled?
+          puts "Warning: Defining view #{self.name}##{without_deleted_view_name} with keys #{without_deleted_view_keys.inspect} at call time, please add it to the class body. (Called from #{caller[0]})"
+          view(without_deleted_view_name, :key => without_deleted_view_keys)
+        end
+        
+        (class << self; self end).instance_eval do
+          define_method("#{name}") do |*key_args|
+            options = key_args.last.is_a?(Hash) ? key_args.pop : {}
+            options.assert_valid_keys(:with_deleted)
+            with_deleted = options.delete(:with_deleted)
+            
+            if soft_deleting_enabled? && !with_deleted
+              key_args = key_args + [nil] # deleted_at
+              CouchPotato.database.view(send(without_deleted_view_name, :key => (key_args.size == 1 ? key_args.first : key_args), :reduce => true))
+            else
+              CouchPotato.database.view(send(view_name, :key => (key_args.size == 1 ? key_args.first : key_args), :reduce => true))
+            end
+            
+          end
+        end
+      
+        send(name, *args)
+      end
+    end
+  end
+end

data/lib/simply_stored/couch/finders.rb

@@ -0,0 +1,56 @@
+module SimplyStored
+  module Couch
+    module Finders
+      def find(*args)
+        what = args.shift
+        options = args.last.is_a?(Hash) ? args.last : {}
+        if options && order = options.delete(:order)
+          options[:descending] = true if order == :desc
+        end
+        
+        with_deleted = options.delete(:with_deleted)
+        
+        case what
+        when :all
+          if with_deleted || !soft_deleting_enabled?
+            CouchPotato.database.view(all_documents(*args))
+          else
+            CouchPotato.database.view(all_documents_without_deleted(options.update(:key => nil)))
+          end
+        when :first
+          if with_deleted || !soft_deleting_enabled?
+            CouchPotato.database.view(all_documents(:limit => 1)).first
+          else
+            CouchPotato.database.view(all_documents_without_deleted(:key => nil, :limit => 1)).first
+          end
+        else          
+          raise SimplyStored::Error, "Can't load record without an id" if what.nil?
+          document = CouchPotato.database.load_document(what)
+          if document.nil? or !document.is_a?(self) or (document.deleted? && !with_deleted)
+            raise(SimplyStored::RecordNotFound, "#{self.name} could not be found with #{what.inspect}")
+          end
+          document
+        end
+      end
+      
+      def all(*args)
+        find(:all, *args)
+      end
+      
+      def first(*args)
+        find(:first, *args)
+      end
+      
+      def count(options = {})
+        options.assert_valid_keys(:with_deleted)
+        with_deleted = options[:with_deleted]
+        
+        if with_deleted || !soft_deleting_enabled?
+          CouchPotato.database.view(all_documents(:reduce => true))
+        else
+          CouchPotato.database.view(all_documents_without_deleted(:reduce => true, :key => nil))
+        end
+      end
+    end
+  end
+end

data/lib/simply_stored/couch/has_many.rb

@@ -84,12 +84,14 @@ module SimplyStored
           klass = self.class.get_class_from_name(name)
           raise ArgumentError, "expected #{klass} got #{value.class}" unless value.is_a?(klass)
           raise ArgumentError, "cannot remove not mine" unless value.send(self.class.foreign_key.to_sym) == id
-          
+
           if self.class._find_property(name).options[:dependent] == :destroy
             value.destroy
-          else
+          elsif self.class._find_property(name).options[:dependent] == :ignore
+            # skip
+          else # nullify
             value.send("#{self.class.foreign_key}=", nil) 
-            value.save
+            value.save(false)
           end
           
           cached_results = send("_get_cached_#{name}")[:all]

data/lib/simply_stored/couch.rb

@@ -4,6 +4,8 @@ require 'active_support'
 
 require File.expand_path(File.dirname(__FILE__) + '/../simply_stored')
 require 'simply_stored/couch/validations'
+require 'simply_stored/couch/finders'
+require 'simply_stored/couch/find_by'
 require 'simply_stored/couch/belongs_to'
 require 'simply_stored/couch/has_many'
 require 'simply_stored/couch/has_one'
@@ -34,6 +36,8 @@ module SimplyStored
       include SimplyStored::Couch::BelongsTo
       include SimplyStored::Couch::HasMany
       include SimplyStored::Couch::HasOne
+      include SimplyStored::Couch::Finders
+      include SimplyStored::Couch::FindBy
       include SimplyStored::Storage::ClassMethods
       
       def create(attributes = {}, &blk)
@@ -48,57 +52,6 @@ module SimplyStored
         instance
       end
       
-      def find(*args)
-        what = args.shift
-        options = args.last.is_a?(Hash) ? args.last : {}
-        if options && order = options.delete(:order)
-          options[:descending] = true if order == :desc
-        end
-        
-        with_deleted = options.delete(:with_deleted)
-        
-        case what
-        when :all
-          if with_deleted || !soft_deleting_enabled?
-            CouchPotato.database.view(all_documents(*args))
-          else
-            CouchPotato.database.view(all_documents_without_deleted(options.update(:key => nil)))
-          end
-        when :first
-          if with_deleted || !soft_deleting_enabled?
-            CouchPotato.database.view(all_documents(:limit => 1)).first
-          else
-            CouchPotato.database.view(all_documents_without_deleted(:key => nil, :limit => 1)).first
-          end
-        else          
-          raise SimplyStored::Error, "Can't load record without an id" if what.nil?
-          document = CouchPotato.database.load_document(what)
-          if document.nil? or !document.is_a?(self) or (document.deleted? && !with_deleted)
-            raise(SimplyStored::RecordNotFound, "#{self.name} could not be found with #{what.inspect}")
-          end
-          document
-        end
-      end
-      
-      def all(*args)
-        find(:all, *args)
-      end
-      
-      def first(*args)
-        find(:first, *args)
-      end
-      
-      def count(options = {})
-        options.assert_valid_keys(:with_deleted)
-        with_deleted = options[:with_deleted]
-        
-        if with_deleted || !soft_deleting_enabled?
-          CouchPotato.database.view(all_documents(:reduce => true))
-        else
-          CouchPotato.database.view(all_documents_without_deleted(:reduce => true, :key => nil))
-        end
-      end
-      
       def enable_soft_delete(property_name = :deleted_at)
         @_soft_delete_attribute = property_name.to_sym
         property property_name, :type => Time
@@ -149,116 +102,7 @@ module SimplyStored
         options.update(:with => valid_regex)
         validates_format_of(attr, options)
       end
-      
-      def _define_find_by(name, *args)
-        keys = name.to_s.gsub(/^find_by_/, "").split("_and_")
-        view_name = name.to_s.gsub(/^find_/, "").to_sym
-        view_keys = keys.length == 1 ? keys.first : keys
-        without_deleted_view_name = "#{view_name}_withoutdeleted"
-        without_deleted_view_keys = keys + [:deleted_at]
-        
-        unless respond_to?(view_name)
-          puts "Warning: Defining view #{self.name}##{view_name} with keys #{view_keys.inspect} at call time, please add it to the class body. (Called from #{caller[0]})"
-          view(view_name, :key => view_keys)
-        end
-        
-        if !respond_to?(without_deleted_view_name) && soft_deleting_enabled?
-          puts "Warning: Defining view #{self.name}##{without_deleted_view_name} with keys #{without_deleted_view_keys.inspect} at call time, please add it to the class body. (Called from #{caller[0]})"
-          view(without_deleted_view_name, :key => without_deleted_view_keys)
-        end
-        
-        (class << self; self end).instance_eval do
-          define_method(name) do |*key_args|
-            options = key_args.last.is_a?(Hash) ? key_args.pop : {}
-            options.assert_valid_keys(:with_deleted)
-            with_deleted = options.delete(:with_deleted)
-            
-            raise ArgumentError, "Too many or too few arguments, require #{keys.inspect}" unless keys.size == key_args.size            
-            
-            if soft_deleting_enabled? && !with_deleted
-              key_args = key_args + [nil] # deleted_at
-              CouchPotato.database.view(send(without_deleted_view_name, :key => (key_args.size == 1 ? key_args.first : key_args), :limit => 1, :include_docs => true)).first
-            else
-              CouchPotato.database.view(send(view_name, :key => (key_args.size == 1 ? key_args.first : key_args), :limit => 1, :include_docs => true)).first
-            end
-          end
-        end
-        
-        send(name, *args)
-      end
-      
-      def _define_find_all_by(name, *args)
-        keys = name.to_s.gsub(/^find_all_by_/, "").split("_and_")
-        view_name = name.to_s.gsub(/^find_all_/, "").to_sym
-        view_keys = keys.length == 1 ? keys.first : keys
-        without_deleted_view_name = "#{view_name}_withoutdeleted"
-        without_deleted_view_keys = keys + [:deleted_at]
-        
-        unless respond_to?(view_name)
-          puts "Warning: Defining view #{self.name}##{view_name} with keys #{view_keys.inspect} at call time, please add it to the class body. (Called from #{caller[0]})"
-          view(view_name, :key => view_keys)
-        end
-        
-        if !respond_to?(without_deleted_view_name) && soft_deleting_enabled?
-          puts "Warning: Defining view #{self.name}##{without_deleted_view_name} with keys #{without_deleted_view_keys.inspect} at call time, please add it to the class body. (Called from #{caller[0]})"
-          view(without_deleted_view_name, :key => without_deleted_view_keys)
-        end
-        
-        (class << self; self end).instance_eval do
-          define_method(name) do |*key_args|
-            options = key_args.last.is_a?(Hash) ? key_args.pop : {}
-            options.assert_valid_keys(:with_deleted)
-            with_deleted = options.delete(:with_deleted)
-            
-            raise ArgumentError, "Too many or too few arguments, require #{keys.inspect}" unless keys.size == key_args.size            
-            
-            if soft_deleting_enabled? && !with_deleted
-              key_args = key_args + [nil] # deleted_at
-              CouchPotato.database.view(send(without_deleted_view_name, :key => (key_args.size == 1 ? key_args.first : key_args), :include_docs => true))
-            else
-              CouchPotato.database.view(send(view_name, :key => (key_args.size == 1 ? key_args.first : key_args), :include_docs => true))
-            end
-          end
-        end
-        send(name, *args)
-      end
-      
-      def _define_count_by(name, *args)
-        keys = name.to_s.gsub(/^count_by_/, "").split("_and_")
-        view_name = name.to_s.gsub(/^count_/, "").to_sym
-        view_keys = keys.length == 1 ? keys.first : keys
-        without_deleted_view_name = "#{view_name}_withoutdeleted"
-        without_deleted_view_keys = keys + [:deleted_at]
-        
-        unless respond_to?(view_name)
-          puts "Warning: Defining view #{self.name}##{view_name} with keys #{view_keys.inspect} at call time, please add it to the class body. (Called from #{caller[0]})"
-          view(view_name, :key => view_keys)
-        end
-        
-        if !respond_to?(without_deleted_view_name) && soft_deleting_enabled?
-          puts "Warning: Defining view #{self.name}##{without_deleted_view_name} with keys #{without_deleted_view_keys.inspect} at call time, please add it to the class body. (Called from #{caller[0]})"
-          view(without_deleted_view_name, :key => without_deleted_view_keys)
-        end
-        
-        (class << self; self end).instance_eval do
-          define_method("#{name}") do |*key_args|
-            options = key_args.last.is_a?(Hash) ? key_args.pop : {}
-            options.assert_valid_keys(:with_deleted)
-            with_deleted = options.delete(:with_deleted)
-            
-            if soft_deleting_enabled? && !with_deleted
-              key_args = key_args + [nil] # deleted_at
-              CouchPotato.database.view(send(without_deleted_view_name, :key => (key_args.size == 1 ? key_args.first : key_args), :reduce => true))
-            else
-              CouchPotato.database.view(send(view_name, :key => (key_args.size == 1 ? key_args.first : key_args), :reduce => true))
-            end
-            
-          end
-        end
-      
-        send(name, *args)
-      end
-      
+
       def method_missing(name, *args)
         if name.to_s =~ /^find_by/
           _define_find_by(name, *args)

data/lib/simply_stored/instance_methods.rb

@@ -152,7 +152,10 @@ module SimplyStored
             case property.options[:dependent]
             when :destroy
               dependent.destroy
-            else
+            when :ignore
+              # skip
+            else 
+              # nullify
               unless dependent.class.soft_deleting_enabled?
                 dependent.send("#{self.class.foreign_property}=", nil)
                 dependent.save(false)

data/lib/simply_stored.rb

@@ -4,7 +4,7 @@ require File.expand_path(File.dirname(__FILE__) + '/simply_stored/storage')
 require File.expand_path(File.dirname(__FILE__) + '/simply_stored/class_methods_base')
 
 module SimplyStored
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
   class Error < RuntimeError; end
   class RecordNotFound < RuntimeError; end
 end

data/test/fixtures/couch.rb

@@ -179,4 +179,16 @@ class Spot
   include SimplyStored::Couch
   
   has_one :hemorrhoid
+end
+
+class Master
+  include SimplyStored::Couch
+  
+  has_many :servants, :dependent => :ignore
+end
+
+class Servant
+  include SimplyStored::Couch
+  
+  belongs_to :master
 end

data/test/simply_stored_couch_test.rb

@@ -700,6 +700,22 @@ class CouchTest < Test::Unit::TestCase
             assert_equal [], Tag.find(:all)
           end
           
+          should "not nullify or delete dependents if the options is set to :ignore when removing" do
+            master = Master.create
+            master_id = master.id
+            servant = Servant.create(:master => master)
+            master.remove_servant(servant)
+            assert_equal master_id, servant.reload.master_id
+          end
+          
+          should "not nullify or delete dependents if the options is set to :ignore when deleting" do
+            master = Master.create
+            master_id = master.id
+            servant = Servant.create(:master => master)
+            master.destroy
+            assert_equal master_id, servant.reload.master_id
+          end
+          
         end
         
         context "when removing all items" do

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: simply_stored
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Mathias Meyer, Jonathan Weiss
@@ -9,49 +14,61 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-12 00:00:00 +02:00
+date: 2010-05-14 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rest-client
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 4
+        - 2
         version: 1.4.2
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: couch_potato
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 2
+        - 15
         version: 0.2.15
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: mattmatt-validatable
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id004
 description: Convenience layer for CouchDB and SimpleDB. Requires CouchPotato and RightAWS library respectively.
 email: info@peritor.com
 executables: []
@@ -70,6 +87,8 @@ files:
 - lib/simply_stored/couch.rb
 - lib/simply_stored/couch/belongs_to.rb
 - lib/simply_stored/couch/ext/couch_potato.rb
+- lib/simply_stored/couch/find_by.rb
+- lib/simply_stored/couch/finders.rb
 - lib/simply_stored/couch/has_many.rb
 - lib/simply_stored/couch/has_one.rb
 - lib/simply_stored/couch/validations.rb
@@ -96,18 +115,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Convenience layer for CouchDB and SimpleDB