vidibus-inheritance 0.3.9 → 0.3.10

data/Rakefile

@@ -1,8 +1,8 @@
-require 'rubygems'
-require 'rake'
+require "rubygems"
+require "rake"
 
 begin
-  require 'jeweler'
+  require "jeweler"
   Jeweler::Tasks.new do |gem|
     gem.name = "vidibus-inheritance"
     gem.summary = %Q{Provides inheritance for models.}
@@ -12,8 +12,8 @@ begin
     gem.authors = ["Andre Pankratz"]
     gem.add_development_dependency "rspec", ">= 1.2.9"
     gem.add_development_dependency "relevance-rcov"
-    gem.add_development_dependency "mongoid", "= 2.0.0.beta.15"
     gem.add_development_dependency "rr"
+    gem.add_development_dependency "mongoid", "= 2.0.0.beta.15"
     gem.add_dependency "vidibus-core_extensions"
     gem.add_dependency "vidibus-uuid"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
@@ -23,16 +23,16 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-require 'spec/rake/spectask'
+require "spec/rake/spectask"
 Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
+  spec.libs << "lib" << "spec"
+  spec.spec_files = FileList["spec/**/*_spec.rb"]
 end
 
 Spec::Rake::SpecTask.new(:rcov) do |t|
-  t.spec_files = FileList['spec/vidibus/**/*_spec.rb']
+  t.spec_files = FileList["spec/vidibus/**/*_spec.rb"]
   t.rcov = true
-  t.rcov_opts = ['--exclude', '^spec,/gems/']
+  t.rcov_opts = ["--exclude", "^spec,/gems/"]
 end
 
 task :spec => :check_dependencies

data/VERSION

@@ -1 +1 @@
-0.3.9
+0.3.10

data/lib/vidibus/inheritance/mongoid.rb

@@ -74,7 +74,7 @@ module Vidibus
     
       # Setter for ancestor.
       def ancestor=(obj)
-        self.ancestor_uuid = obj.uuid
+        self.ancestor_uuid = obj ? obj.uuid : nil
         @ancestor = obj
       end
     
@@ -129,11 +129,15 @@ module Vidibus
       end
       
       # Creates a sibling with identical inheritable attributes.
-      # Applies inheritance on new object.
+      # First it inherits from self and then applies ancestry of self.
       def clone!
-        exceptions = ACQUIRED_ATTRIBUTES - ["ancestor_uuid"]
-        attrs = attributes.except(*exceptions)
-        self.class.create!(attrs)
+        clone = self.class.new
+        clone.inherit_from!(self)
+        clone.ancestor = ancestor
+        clone.mutated_attributes = mutated_attributes
+        clone.inherited_attributes = inherited_attributes
+        clone.save!
+        clone
       end
 
       private
@@ -164,13 +168,16 @@ module Vidibus
           # embeds_many
           if inheritable.is_a?(Array)
             collection = new_record? ? self.send(association) : self.reload.send(association)
-            existing_ids = collection.map do |a| 
-              begin
-                a._reference_id
-              rescue
-              end
-            end
+            existing_ids = collection.map { |a| a.try!(:_reference_id) }
             
+            obsolete = (existing_ids - inheritable.map { |i| i._id }).compact
+            obsolete -= collection.select do |c| 
+              obsolete.include?(c.try!(:_reference_id)) and c.try!(:mutated?) # Exclude mutated items
+            end.map { |c| c.try!(:_reference_id) }
+            if obsolete.any?
+              collection.delete_all(:conditions => { :_reference_id.in => obsolete })
+            end
+
             for obj in inheritable
               attrs = inheritable_document_attributes(obj)
               if existing_ids.include?(obj._id)
@@ -180,10 +187,6 @@ module Vidibus
                 doc = collection.create!(attrs)
               end
             end
-            obsolete = (existing_ids - inheritable.map { |i| i._id }).compact
-            if obsolete.any?
-              collection.delete_all(:conditions => { :_reference_id.in => obsolete })
-            end
           
           # embeds_one
           else

data/spec/vidibus/inheritance/cloning_spec.rb

@@ -0,0 +1,92 @@
+require "spec_helper"
+
+describe "Cloning" do
+  let(:ancestor) { Model.create }
+  let(:inheritor) { Model.new }
+  let(:anna) { Model.create!(:name => "Anna", :age => 35) }
+  let(:leah) { Model.create!(:name => "Leah", :age => 30) }
+  
+  it "should create a sibling" do
+    twin = anna.clone!
+    twin.should_not eql(anna)
+    twin.name.should eql(anna.name)
+    twin.age.should eql(anna.age)
+  end
+  
+  it "should set no ancestor if original did not have one" do
+    anna.ancestor_uuid.should be_nil
+    anna.ancestor.should be_nil
+    twin = anna.clone!
+    twin.reload
+    twin.ancestor_uuid.should be_nil
+    twin.ancestor.should be_nil
+  end
+  
+  context "with ancestor" do
+    before { anna.inherit_from!(ancestor) }
+    let(:twin) { anna.clone! }
+    
+    it "should preserve ancestor relation" do
+      twin.ancestor.should eql(ancestor)
+    end
+
+    it "should not clone inheritors (should it?)" do
+      twin.inheritors.should be_empty
+    end
+    
+    it "should set ancestor of orginal" do
+      twin.reload.ancestor.should eql(ancestor)
+    end
+
+    it "should clone mutated_attributes" do
+      twin.reload.mutated_attributes.should eql(anna.mutated_attributes)
+    end
+  end
+  
+  context "with embedded documents" do
+    before { anna.children.create(:name => "Lisa") }
+    
+    it "should work for collections" do
+      twin = anna.clone!
+      twin.children.should have(1).child
+    end
+
+    it "should work for single documents" do
+      anna.create_location(:name => "Bathroom")
+      twin = anna.clone!
+      twin.location.name.should eql("Bathroom")
+    end
+    
+    it "should set unique _ids" do
+      twin = anna.clone!
+      twin.children.first._id.should_not eql(anna.children.first._id)
+    end
+    
+    it "should clone children of embedded documents" do
+      lisa = anna.children.first
+      lisa.puppets.create(:name => "Gonzo")
+      twin = anna.clone!
+      lisa_twin = twin.children.first
+      lisa_twin.puppets.should have(1).puppet
+    end
+    
+    it "should set unique _id on children of embedded documents" do
+      pending("This is really hard to do! Is it inevitable?")
+      lisa = anna.children.first
+      lisa.puppets.create(:name => "Gonzo")
+      twin = anna.clone!
+      lisa_twin = twin.children.first
+      lisa_twin.puppets.first._id.should_not eql(lisa_twin.puppets.first._id)
+    end
+    
+    context "and ancestor" do
+      let(:eva) { Model.create!(:ancestor => anna) }
+      let(:twin) { eva.clone!.reload }
+      
+      it "should maintain correct _reference_id" do
+        eva.children.first._reference_id.should eql(anna.children.first._id)
+        twin.children.first._reference_id.should eql(anna.children.first._id)
+      end
+    end
+  end
+end

data/spec/vidibus/inheritance/inheritance_spec.rb

@@ -4,6 +4,7 @@ describe "Inheritance" do
   let(:ancestor) { Model.create }
   let(:inheritor) { Model.new }
   let(:anna) { Model.create!(:name => "Anna", :age => 35) }
+  let(:leah) { Model.create!(:name => "Leah", :age => 30) }
   
   it "should happen when creating objects" do
     ancestor # trigger object creation before mocking
@@ -199,6 +200,32 @@ describe "Inheritance" do
       inheritor.reload
       inheritor.children.first.puppets.should have(1).puppet
     end
+    
+    context "switching the ancestor" do
+      it "should remove previously inherited subobjects" do
+        inheritor.inherit_from!(leah)
+        inheritor.children.should have(0).children
+      end
+      
+      it "should keep previously inherited subobjects if they have been mutated" do
+        inheritor.children.first.update_attributes(:mutated => true)
+        inheritor.inherit_from!(leah)
+        inheritor.children.should have(1).child
+      end
+      
+      it "should keep own subobjects" do
+        inheritor.children.create(:name => "Ronja")
+        inheritor.inherit_from!(leah)
+        inheritor.children.should have(1).child
+      end
+
+      it "should add subobjects of new ancestor" do
+        leah.children.create(:name => "Luke")
+        inheritor.inherit_from!(leah)
+        inheritor.children.should have(1).child
+        inheritor.children.first.name.should eql("Luke")
+      end
+    end
   end
   
   context "with embedded items" do
@@ -393,4 +420,5 @@ describe "Inheritance" do
       end
     end
   end
+
 end

data/spec/vidibus/inheritance/mongoid_spec.rb

@@ -211,45 +211,7 @@ describe "Vidibus::Inheritance::Mongoid" do
   end
   
   describe "#clone!" do
-    it "should create a sibling" do
-      twin = anna.clone!
-      twin.should_not eql(anna)
-      twin.name.should eql(anna.name)
-      twin.age.should eql(anna.age)
-    end
-    
-    it "should preserve ancestor relation" do
-      anna.inherit_from!(ancestor)
-      twin = anna.clone!
-      twin.ancestor.should eql(ancestor)
-    end
-    
-    it "should not clone inheritors (should it?)" do
-      anna.inherit_from!(ancestor)
-      twin = ancestor.clone!
-      twin.inheritors.should be_empty
-    end
-    
-    it "should clone embedded documents" do
-      anna.children.create(:name => "Lisa")
-      twin = anna.clone!
-      twin.children.should have(1).child
-    end
-    
-    it "should clone a single embedded document" do
-      anna.create_location(:name => "Bathroom")
-      twin = anna.clone!
-      twin.location.name.should eql("Bathroom")
-    end
-    
-    it "should clone children of embedded documents" do
-      lisa = anna.children.create(:name => "Lisa")
-      lisa.puppets.create(:name => "Gonzo")
-      twin = anna.clone!
-      lisa_twin = twin.children.first
-      lisa_twin.puppets.should have(1).puppet
-      # lisa_twin.puppets.first._id.should_not eql(lisa_twin.puppets.first._id)
-    end
+    # see cloning_spec.rb
   end
   
   describe ".inheritable_documents" do

data/vidibus-inheritance.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{vidibus-inheritance}
-  s.version = "0.3.9"
+  s.version = "0.3.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andre Pankratz"]
-  s.date = %q{2010-08-11}
+  s.date = %q{2010-08-16}
   s.description = %q{This gem allows inheritance of objects for Rails 3 with Mongoid. It will update all attributes and embedded documents of inheritors when ancestor gets changed.}
   s.email = %q{andre@vidibus.com}
   s.extra_rdoc_files = [
@@ -33,6 +33,7 @@ Gem::Specification.new do |s|
      "spec/models.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb",
+     "spec/vidibus/inheritance/cloning_spec.rb",
      "spec/vidibus/inheritance/inheritance_spec.rb",
      "spec/vidibus/inheritance/mongoid_spec.rb",
      "spec/vidibus/inheritance/validators/ancestor_validator_spec.rb",
@@ -46,6 +47,7 @@ Gem::Specification.new do |s|
   s.test_files = [
     "spec/models.rb",
      "spec/spec_helper.rb",
+     "spec/vidibus/inheritance/cloning_spec.rb",
      "spec/vidibus/inheritance/inheritance_spec.rb",
      "spec/vidibus/inheritance/mongoid_spec.rb",
      "spec/vidibus/inheritance/validators/ancestor_validator_spec.rb"
@@ -58,23 +60,23 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_development_dependency(%q<relevance-rcov>, [">= 0"])
-      s.add_development_dependency(%q<mongoid>, ["= 2.0.0.beta.15"])
       s.add_development_dependency(%q<rr>, [">= 0"])
+      s.add_development_dependency(%q<mongoid>, ["= 2.0.0.beta.15"])
       s.add_runtime_dependency(%q<vidibus-core_extensions>, [">= 0"])
       s.add_runtime_dependency(%q<vidibus-uuid>, [">= 0"])
     else
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_dependency(%q<relevance-rcov>, [">= 0"])
-      s.add_dependency(%q<mongoid>, ["= 2.0.0.beta.15"])
       s.add_dependency(%q<rr>, [">= 0"])
+      s.add_dependency(%q<mongoid>, ["= 2.0.0.beta.15"])
       s.add_dependency(%q<vidibus-core_extensions>, [">= 0"])
       s.add_dependency(%q<vidibus-uuid>, [">= 0"])
     end
   else
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
     s.add_dependency(%q<relevance-rcov>, [">= 0"])
-    s.add_dependency(%q<mongoid>, ["= 2.0.0.beta.15"])
     s.add_dependency(%q<rr>, [">= 0"])
+    s.add_dependency(%q<mongoid>, ["= 2.0.0.beta.15"])
     s.add_dependency(%q<vidibus-core_extensions>, [">= 0"])
     s.add_dependency(%q<vidibus-uuid>, [">= 0"])
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vidibus-inheritance
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 3
-  - 9
-  version: 0.3.9
+  - 10
+  version: 0.3.10
 platform: ruby
 authors: 
 - Andre Pankratz
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-11 00:00:00 +02:00
+date: 2010-08-16 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,35 +49,35 @@ dependencies:
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: mongoid
+  name: rr
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 62196477
+        hash: 3
         segments: 
-        - 2
-        - 0
         - 0
-        - beta
-        - 15
-        version: 2.0.0.beta.15
+        version: "0"
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rr
+  name: mongoid
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 62196477
         segments: 
+        - 2
         - 0
-        version: "0"
+        - 0
+        - beta
+        - 15
+        version: 2.0.0.beta.15
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -134,6 +134,7 @@ files:
 - spec/models.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- spec/vidibus/inheritance/cloning_spec.rb
 - spec/vidibus/inheritance/inheritance_spec.rb
 - spec/vidibus/inheritance/mongoid_spec.rb
 - spec/vidibus/inheritance/validators/ancestor_validator_spec.rb
@@ -175,6 +176,7 @@ summary: Provides inheritance for models.
 test_files: 
 - spec/models.rb
 - spec/spec_helper.rb
+- spec/vidibus/inheritance/cloning_spec.rb
 - spec/vidibus/inheritance/inheritance_spec.rb
 - spec/vidibus/inheritance/mongoid_spec.rb
 - spec/vidibus/inheritance/validators/ancestor_validator_spec.rb