mongoid_token 3.0.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c76063246f7bcb7225d68d373cfbc1b1ec569e1
-  data.tar.gz: cb1d18edee2bd3c1b201d51345c0d28bf0bdecf0
+  metadata.gz: e750cdbf69b5f26f50a338219aad4efc71cb3dbb
+  data.tar.gz: 13de3c6572824b74fee06ad087549468a84d8d8a
 SHA512:
-  metadata.gz: 7f5e3b6924961274b881d0e9fa74fb524fad4eb622135d2668e4756ffc97c1ff28700d19db3d046aaaba22a9ed5a688efaf95cc1e361fb279b2aeebf74c1778a
-  data.tar.gz: f801efb0a8d8541b08d0b15c9dc777bbb821a37b6a4dfeac4a4b32096276e6a6117d3dabd9450995579e00262cdb01f68b9d756ae979566c602ae139c03ccf6d
+  metadata.gz: fcffc9de812baff70b946e745d43f09bd3994f6d34505cf6588cac2f9c7b6f876fcf25e212dae6f2fb3fdf6407ef7bf605feb7157784beb5f0b5848cb0705e57
+  data.tar.gz: 7b4760b632cefc19c3185537ea9365e044a949d29534c7b20cd498dbb0a1c666783ebe261a134e694b3b3c387cbd38f6bc927aece5cec73cd91c0261f1f38a3a

data/README.md

@@ -20,7 +20,13 @@ Into something more like this:
 
 In your gemfile, add:
 
-    gem 'mongoid_token', '~> 2.0.0'
+```ruby
+# For mongoid < 5
+gem 'mongoid_token', '~> 3.0.0'
+
+# For mongoid >= 5
+gem 'mongoid_token', '~> 4.0.0'
+```
 
 Then update your bundle
 

data/lib/mongoid/token/collisions.rb

@@ -5,7 +5,7 @@ module Mongoid
         retries = resolver.retry_count
         begin
           yield
-        rescue Moped::Errors::OperationFailure => e
+        rescue Mongo::Error::OperationFailure => e
           if is_duplicate_token_error?(e, self, resolver.field_name)
             if (retries -= 1) >= 0
               resolver.create_new_token_for(self)
@@ -24,9 +24,9 @@ module Mongoid
       end
 
       def is_duplicate_token_error?(err, document, field_name)
-        [11000, 11001].include?(err.details['code']) &&
-          err.details['err'] =~ /dup key/ &&
-          err.details['err'] =~ /"#{document.send(field_name)}"/
+        err.message =~ /(11000|11001)/ &&
+          err.message =~ /dup key/ &&
+          err.message =~ /"#{document.send(field_name)}"/
       end
     end
   end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module MongoidToken
-  VERSION = "3.0.0"
+  VERSION = "4.0.0"
 end

data/mongoid_token.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.description = %q{Mongoid token is a gem for creating random, unique tokens for mongoid documents. Highly configurable and great for making URLs a little more compact.}
 
   s.rubyforge_project = "mongoid_token"
-  s.add_dependency 'mongoid', '~> 4.0.0'
+  s.add_dependency 'mongoid', '~> 5.0.0'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/spec/mongoid/token/collisions_spec.rb

@@ -17,7 +17,7 @@ describe Mongoid::Token::Collisions do
         it "should raise an error after the first try" do
           resolver.stub(:retry_count).and_return(0)
           attempts = 0
-          expect{document.resolve_token_collisions(resolver) { attempts += 1; raise Moped::Errors::OperationFailure.new("","") }}.to raise_error Mongoid::Token::CollisionRetriesExceeded
+          expect{document.resolve_token_collisions(resolver) { attempts += 1; raise Mongo::Error::OperationFailure }}.to raise_error Mongoid::Token::CollisionRetriesExceeded
           expect(attempts).to eq 1
         end
       end
@@ -26,7 +26,7 @@ describe Mongoid::Token::Collisions do
         it "should raise an error after retrying once" do
           resolver.stub(:retry_count).and_return(1)
           attempts = 0
-          expect{document.resolve_token_collisions(resolver) { attempts += 1; raise Moped::Errors::OperationFailure.new("","") }}.to raise_error Mongoid::Token::CollisionRetriesExceeded
+          expect{document.resolve_token_collisions(resolver) { attempts += 1; raise Mongo::Error::OperationFailure }}.to raise_error Mongoid::Token::CollisionRetriesExceeded
           expect(attempts).to eq 2
         end
       end
@@ -35,7 +35,7 @@ describe Mongoid::Token::Collisions do
         it "should raise an error after retrying" do
           resolver.stub(:retry_count).and_return(3)
           attempts = 0
-          expect{document.resolve_token_collisions(resolver) { attempts += 1; raise Moped::Errors::OperationFailure.new("","") }}.to raise_error Mongoid::Token::CollisionRetriesExceeded
+          expect{document.resolve_token_collisions(resolver) { attempts += 1; raise Mongo::Error::OperationFailure }}.to raise_error Mongoid::Token::CollisionRetriesExceeded
           expect(attempts).to eq 4
         end
       end
@@ -44,7 +44,7 @@ describe Mongoid::Token::Collisions 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"})
+          e = Mongo::Error::OperationFailure.new("nope")
           expect{document.resolve_token_collisions(resolver) { raise e }}.to raise_error(e)
         end
       end
@@ -84,7 +84,7 @@ describe Mongoid::Token::Collisions do
     context "when there is a duplicate key error" do
       it "should return true" do
         document.stub("token").and_return("tokenvalue123")
-        err = double("Moped::Errors::OperationFailure")
+        err = double("Mongo::Error::OperationFailure")
         err.stub("details").and_return do
           {
             "err" => "E11000 duplicate key error index: mongoid_token_test.links.$token_1  dup key: { : \"tokenvalue123\" }",

data/spec/mongoid/token_spec.rb

@@ -255,7 +255,7 @@ describe Mongoid::Token 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)
+          expect{ document_class.create!(:name => duplicate_name) }.to raise_exception(Mongo::Error::OperationFailure)
         end
       end
     end

data/spec/spec_helper.rb

@@ -11,6 +11,8 @@ require 'mongoid_token'
 ENV['MONGOID_ENV'] = "test"
 
 RSpec.configure do |config|
+  Mongo::Logger.logger.level = Logger::ERROR
+
   config.include Mongoid::Matchers
   config.before(:suite) do
     DatabaseCleaner.strategy = :truncation
@@ -23,11 +25,5 @@ RSpec.configure do |config|
 end
 
 Mongoid.configure do |config|
-  config.sessions = {
-    default: {
-      database: "mongoid_token_test",
-      hosts: [ "localhost:#{ENV['BOXEN_MONGODB_PORT'] || 27017}" ],
-      options: {}
-    }
-  }
+  config.connect_to("mongoid_token_test", {})
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_token
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Nicholas Bruning
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-22 00:00:00.000000000 Z
+date: 2015-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 5.0.0
 description: Mongoid token is a gem for creating random, unique tokens for mongoid
   documents. Highly configurable and great for making URLs a little more compact.
 email:
@@ -78,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: mongoid_token
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A little random, unique token generator for Mongoid documents.