mongoid_token 2.0.1 → 2.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjI5OGI0MDMxODMzNjQwOTQyZTJjZDdlN2JmYmI0NmQ1Y2EyZjQyNQ==
+    NzAzMmIyYTMyMzIwMTkxZDk2NTI4OTU1NWQ5MDYwMDgzNmYwYTBiOQ==
   data.tar.gz: !binary |-
-    MzhmM2JjY2ViNjNkYjUwYjQwNmMyMzQzYjMyMTc1ZjBkMDA5MjY0Mg==
+    MjZiZDAzN2MyM2UxMjQ1Zjg5MWJhMWRhZDBiN2ZmMDczMDUzMDJjYg==
 SHA512:
   metadata.gz: !binary |-
-    ZjFlNjMxM2Q2MTE4NmI1YzNiN2ZiYjI5NzJmYzA1ZjEzNmRiYzU5NjZkYjYy
-    ZjU3Y2RmZDJhZDhlOTJlMmFlNWNiMmQ5NTA2NzhiZDk0MmMwMzAwYWYwMjdm
-    NmYzODcxM2QwYTE5YmI3YTdiYWY2Y2YwYzQ4ZjBmMWU1ZjQxMDY=
+    NDQ3YjNiYjFmMWIyYWFlYjRiODdjYmRhNzRhOTIyNjEyOTVjM2Y5ZDk2ZTg5
+    MWEzYTEyYjA5MTFmMGE4NGM4ZDFlNWMwODcwMzNkNzliZDRkYTE3NzJjYmIy
+    OGMyOTkxOTE3M2JkNDNiNGZiZTFjN2VkZGY2MGQ1ZGI5MWQxNWQ=
   data.tar.gz: !binary |-
-    MGM4YjYyYWFmZDU0MjA4MmRkNjQ4ZTk3YjM0YzYwNWY4OTc4MzdlZjZlYTY5
-    M2NmNzRmMDJjNDRiNDE3MDhiY2RkZjM5NjI1NzI3NmNmMGZiZGJmNjI0MzZm
-    ZDQ4MjE2MDVkNjcwNmU2NDZlNmFiMGFmOWMxOTZmZmY1NTExNzg=
+    NGYzN2NlZjlhZWIzYmNjZWEyNDJhZjcxMGIzMDgyYWVlZDhmMDhiMWVhYzMw
+    ZDE3NDIwZGMwY2Q0MzU2Y2NhM2IxZWMwZjBmYzBlMTMyMzU0NGUyNjM3YTFl
+    YTdmZjVlZTU0NmQwNzYwYjc5MWMxMjFkMjExNzk5MmVhNjVjNjg=

data/lib/mongoid/token/collisions.rb

@@ -12,6 +12,8 @@ module Mongoid
               retry
             end
             raise_collision_retries_exceeded_error resolver.field_name, resolver.retry_count
+          else
+            raise e
           end
         end
       end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module MongoidToken
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 end

data/spec/mongoid/token/collisions_spec.rb

@@ -1,5 +1,7 @@
 require File.join(File.dirname(__FILE__), %w[.. .. spec_helper])
 
+require 'pp'
+
 describe Mongoid::Token::Collisions do
   let(:document) { Object.new }
   describe "#resolve_token_collisions" do
@@ -39,6 +41,15 @@ describe Mongoid::Token::Collisions do
           expect(attempts).to eq 4
         end
       end
+
+      context "and a different index is violated" do
+        it "should bubble the operation failure" do
+          document.stub(:is_duplicate_token_error?).and_return(false)
+          resolver.stub(:retry_count).and_return(3)
+          e = Moped::Errors::OperationFailure.new("command", {:details => "nope"})
+          expect{document.resolve_token_collisions(resolver) { raise e }}.to raise_error(e)
+        end
+      end
     end
   end
 

data/spec/mongoid/token_spec.rb

@@ -209,10 +209,28 @@ describe Mongoid::Token do
       end
     end
 
-    it "should not raise a custom error if an operation failure is thrown for another reason" do
+    it "should not raise a custom error if another error is thrown during saving" do
       document_class.send(:field, :name)
       document_class.send(:validates_presence_of, :name)
-      expect{document_class.create!}.to_not raise_exception(Mongoid::Token::CollisionRetriesExceeded)
+      document_class.any_instance.stub(:generate_token).and_return("1234")
+      document_class.stub(:model_name).and_return(ActiveModel::Name.new(document_class, nil, "temp"))
+      expect{document_class.create!}.to raise_exception(Mongoid::Errors::Validations)
+    end
+
+    context "with other unique indexes present" do
+      before(:each) do
+        document_class.send(:field, :name)
+        document_class.send(:index, {:name => 1}, {:unique => true})
+        document_class.create_indexes
+      end
+
+      context "when violating the other index" do
+        it "should raise an operation failure" do
+          duplicate_name = "Got Duped."
+          document_class.create!(:name => duplicate_name)
+          expect{ document_class.create!(:name => duplicate_name) }.to raise_exception(Moped::Errors::OperationFailure)
+        end
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_token
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Nicholas Bruning
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-06 00:00:00.000000000 Z
+date: 2013-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid