couchbase-model-relationship 0.1.13 → 0.1.14

data/lib/couchbase/model/relationship/child.rb

@@ -2,6 +2,7 @@ module Couchbase
   class Model
     module Relationship
       module Child
+
         extend ::ActiveSupport::Concern
 
         def create_with_parent_id(options = {})
@@ -9,8 +10,28 @@ module Couchbase
             @id = prefixed_id(parent.id)
           end
 
-          create_without_parent_id(options)
+          # Should this only fire if we had a parent and assigned the id?
+          retried = false
+          begin
+            create_without_parent_id(options)
+          rescue Couchbase::Error::KeyExists => error
+            if !retried && ok_to_merge_on_key_exists_error?
+              retried = true
+              on_key_exists_merge_from_db!
+
+              retry
+            end
+
+            raise error
+          end
+        end
+
+        def ok_to_merge_on_key_exists_error?
+          respond_to?(:on_key_exists_merge_from_db!) &&
+            parent.present? &&
+            id == prefixed_id(parent.id)
         end
+        private :ok_to_merge_on_key_exists_error?
 
         module ClassMethods
           def has_parent

data/lib/couchbase/model/relationship/version.rb

@@ -1,7 +1,7 @@
 module Couchbase
   class Model
     module Relationship
-      VERSION = "0.1.13"
+      VERSION = "0.1.14"
     end
   end
 end

data/spec/child_spec.rb

@@ -4,6 +4,13 @@ class ChildTest < Couchbase::Model
   has_parent
 end
 
+class ChildMergeTest < Couchbase::Model
+  has_parent
+
+  def on_key_exists_merge_from_db!
+  end
+end
+
 class ChildTestParent < Couchbase::Model
   child :child_test
 end
@@ -29,5 +36,67 @@ describe "children" do
 
       subject.id.should eq("child_test:1234")
     end
+
+    describe "with collisions" do
+      let(:collider) { ChildMergeTest.new(parent: parent) }
+      let(:bucket) { stub }
+
+      before do
+        parent.id = "parent:#{Time.now.to_i}"
+        ChildMergeTest.stubs(bucket: bucket)
+      end
+
+      it "just fails if no merge method" do
+        bucket.expects(:add).raises(Couchbase::Error::KeyExists)
+        ChildTest.stubs(bucket: bucket)
+
+        expect { subject.save }.to raise_error(Couchbase::Error::KeyExists)
+      end
+      
+      it "just fails with no parent" do
+        bucket.expects(:add).raises(Couchbase::Error::KeyExists)
+
+        collider.parent = nil
+        collider.expects(:on_key_exists_merge_from_db!).never
+
+        expect { collider.save }.to raise_error(Couchbase::Error::KeyExists)
+      end
+
+      it "just fails with a parent and a non-parent derived id" do
+        collider.instance_variable_set(:@id, "abc123:1234")
+        bucket.expects(:add).raises(Couchbase::Error::KeyExists)
+        collider.expects(:on_key_exists_merge_from_db!).never
+
+        expect { collider.save }.to raise_error(Couchbase::Error::KeyExists)
+      end
+
+      # These should really exercise a real backend
+      it "retries if mergable" do
+        seq = sequence("collision")
+        bucket.expects(:add).raises(Couchbase::Error::KeyExists).in_sequence(seq)
+        bucket.expects(:add).returns(true).in_sequence(seq)
+
+        collider.expects(:on_key_exists_merge_from_db!)
+
+        expect { collider.save }.to_not raise_error
+        collider.should be_persisted
+      end
+
+      it "fails is merging fails" do
+        bucket.expects(:add).raises(Couchbase::Error::KeyExists)
+
+        collider.expects(:on_key_exists_merge_from_db!).raises(ArgumentError)
+        
+        expect { collider.save }.to raise_error(ArgumentError)
+      end
+
+      it "only retries once" do
+        bucket.expects(:add).raises(Couchbase::Error::KeyExists).twice
+
+        collider.expects(:on_key_exists_merge_from_db!)
+
+        expect { collider.save }.to raise_error(Couchbase::Error::KeyExists)
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: couchbase-model-relationship
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-29 00:00:00.000000000 Z
+date: 2014-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -218,7 +218,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -924479147595009082
+      hash: -1698513283546959422
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -227,7 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -924479147595009082
+      hash: -1698513283546959422
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24