mongoid_token 1.0.0 → 1.1.0

data/.travis.yml

@@ -0,0 +1,9 @@
+script: "bundle exec rspec spec"
+language: ruby
+rvm:
+  - 1.9.3
+gemfile:
+  - Gemfile
+notifications:
+  recipients:
+    - nicholas@bruning.com.au

data/Gemfile

@@ -1,15 +1,9 @@
 source "http://rubygems.org"
 
-# Specify your gem's dependencies in mongoid_token.gemspec
 gemspec
 
 group :test do
-  gem 'activesupport', '~> 3.0'
   gem 'database_cleaner'
-  gem 'rspec', '2.5.0'
   gem 'autotest'
-  gem 'autotest-growl'
-  gem 'mongoid', '2.0.0'
-  gem 'bson_ext'
-  gem 'mongoid-rspec'
+  gem 'mongoid-rspec', '1.5.1'
 end

data/README.md

@@ -1,16 +1,18 @@
 # Mongoid::Token - Short snappy tokens for Mongoid documents
 
+[![Build Status](https://secure.travis-ci.org/thetron/mongoid_token.png)](http://travis-ci.org/thetron/mongoid_token)
+
 This library is a quick and simple way to generate unique, random tokens
 for your mongoid documents, in the cases where you can't, or don't want
 to use slugs, or the default MongoDB IDs.
 
 Mongoid::Token can help turn this:
 
-    http://bestwebappever.com/video/4dcfbb3c6a4f1d4c4a000012/edit
+    http://myawesomewebapp.com/video/4dcfbb3c6a4f1d4c4a000012/edit
 
 Into something more like this:
 
-    http://bestwebappever.com/video/83xQ3r/edit
+    http://myawesomewebapp.com/video/83xQ3r/edit
 
 
 ## Getting started

data/lib/mongoid_token.rb

@@ -11,10 +11,14 @@ module Mongoid
         options[:retry] ||= 3
         options[:contains] ||= :alphanumeric
         options[:field_name] ||= :token
+        #options[:key] ||= false
 
         self.field options[:field_name].to_sym, :type => String
-        self.index options[:field_name].to_sym, :unique => true
-        # should validate token presence? Should this be enforced?
+        self.index({ options[:field_name].to_sym => 1 }, { :unique => true })
+
+        #if options[:key]
+        #  self.key options[:field_name].to_sym
+        #end
 
         set_callback(:create, :before) do |document|
           document.create_token(options[:length], options[:contains])
@@ -32,8 +36,8 @@ module Mongoid
         end
 
         if options[:retry] > 0
-          alias_method_chain :save, :safety
-          alias_method_chain :save!, :safety
+          alias_method_chain :insert, :safety
+          alias_method_chain :upsert, :safety
         end
 
         self.class_variable_set :@@token_field_name, options[:field_name]
@@ -41,7 +45,7 @@ module Mongoid
 
       def find_by_token(token)
         field_name = self.class_variable_get :@@token_field_name
-        self.first(:conditions => {field_name.to_sym => token})
+        self.find_by(field_name.to_sym => token)
       end
     end
 
@@ -50,12 +54,12 @@ module Mongoid
     end
 
     protected
-    def save_with_safety(args = {}, &block)
+
+    def resolve_token_collisions
       retries = @max_collision_retries
       begin
-       # puts "Attempt: #{retries}"
-        safely.save_without_safety(args, &block)
-      rescue Mongo::OperationFailure => e
+        yield
+      rescue Moped::Errors::OperationFailure => e
         if (retries -= 1) > 0
           self.create_token(@token_length, @token_contains)
           retry
@@ -66,25 +70,16 @@ module Mongoid
       end
     end
 
-    def save_with_safety!(args = {}, &block)
-      retries = @max_collision_retries
-      begin
-        #puts "Attempt: #{retries}"
-        safely.save_without_safety!(args, &block)
-      rescue Mongo::OperationFailure => e
-        if (retries -= 1) > 0
-          self.create_token(@token_length, @token_contains)
-          retry
-        else
-          Rails.logger.warn "[Mongoid::Token] Warning: Maximum to generation retries (#{@max_collision_retries}) exceeded." if defined?(Rails) && Rails.env == 'development'
-          raise Mongoid::Token::CollisionRetriesExceeded.new(self, @max_collision_retries)
-        end
-      end
+    def insert_with_safety(options = {})
+      resolve_token_collisions { with(:safe => true).insert_without_safety(options) }
+    end
+
+    def upsert_with_safety(options = {})
+      resolve_token_collisions { with(:safe => true).upsert_without_safety(options) }
     end
 
     def create_token(length, characters)
       self.send(:"#{@token_field_name}=", self.generate_token(length, characters))
-      #puts "Set #{@token_field_name.to_s} to #{self.send(@token_field_name.to_sym)}"
     end
 
     def create_token_if_nil(length, characters)

data/lib/version.rb

@@ -1,3 +1,3 @@
 module MongoidToken
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/mongoid_token.gemspec

@@ -13,7 +13,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 'activesupport', '>= 3.0'
+  s.add_dependency 'mongoid', '~> 3.0'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/spec/mongoid.yml

@@ -0,0 +1,8 @@
+test:
+  sessions:
+    default:
+      database: mongoid_token_test
+      hosts:
+        - localhost:27017
+      options:
+        consistency: :strong

data/spec/mongoid/token_spec.rb

@@ -84,7 +84,7 @@ describe Mongoid::Token do
     Link.create_indexes
     1000.times do
       @link = Link.create(:url => "http://involved.com.au")
-      Link.count(:conditions => {:token => @link.token}).should == 1
+      Link.where(:token => @link.token).count.should == 1
     end
   end
 
@@ -150,33 +150,38 @@ describe Mongoid::Token do
     Link.create_indexes
 
     @first_link = Link.create(:url => "http://involved.com.au")
+    Link.any_instance.stub(:generate_token).and_return(@first_link.token)
     @link = Link.new(:url => "http://fail.com")
-    def @link.create_token(l,c) # override to always generate a duplicate
-      super
-      self.token = Link.first.token
-    end
 
-    lambda{ @link.save }.should raise_error(Mongoid::Token::CollisionRetriesExceeded)
+    #lambda{ @link.save! }.should raise_error(Mongoid::Token::CollisionRetriesExceeded)
+    expect { @link.save! }.to raise_error(Mongoid::Token::CollisionRetriesExceeded)
+
     Link.count.should == 1
     Link.where(:token => @first_link.token).count.should == 1
   end
 
+  it "tries to resolve collisions when instantiated with create!" do
+    link = Link.create!(url: "http://example.com/1")
+
+    Link.any_instance.stub(:generate_token).and_return(link.token)
+
+    expect { Link.create!(url: "http://example.com/2") }
+    .to raise_error(Mongoid::Token::CollisionRetriesExceeded)
+  end
+
   it "should not raise a custom exception if retries are set to zero" do
     FailLink.destroy_all
     FailLink.create_indexes
 
     @first_link = FailLink.create(:url => "http://involved.com.au")
+    Link.any_instance.stub(:generate_token).and_return(@first_link.token)
     @link = FailLink.new(:url => "http://fail.com")
-    def @link.create_token(l,c) # override to always generate a duplicate
-      super
-      self.token = FailLink.first.token
-    end
 
     lambda{ @link.save }.should_not raise_error(Mongoid::Token::CollisionRetriesExceeded)
   end
 
   it "should create unique indexes on embedded documents" do
-    @cluster = Cluster.new(:name => "CLUSTER_001")
+    @cluster = Cluster.create(:name => "CLUSTER_001")
     5.times do |index|
       @cluster.nodes.create!(:name => "NODE_#{index.to_s.rjust(3, '0')}")
     end

data/spec/spec_helper.rb

@@ -6,6 +6,8 @@ require 'mongoid-rspec'
 require 'mongoid_token'
 require 'mongoid/token/exceptions'
 
+ENV['MONGOID_ENV'] = "test"
+
 RSpec.configure do |config|
   config.include Mongoid::Matchers
   config.before(:suite) do
@@ -14,18 +16,8 @@ RSpec.configure do |config|
 
   config.after(:each) do
     DatabaseCleaner.clean
-
-    # Added dropping collection to ensure indexes are removed
-    Mongoid.master.collections.select do |collection|
-      include = collection.name !~ /system/
-      include
-    end.each(&:drop)
+    Mongoid.purge!
   end
 end
 
-Mongoid.configure do |config|
-  config.master = Mongo::Connection.new.db("mongoid_token_test")
-  config.autocreate_indexes = true
-  config.persist_in_safe_mode = true
-end
-
+Mongoid.load!( File.join(File.dirname(__FILE__), 'mongoid.yml') )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_token
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,19 +9,19 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-08 00:00:00.000000000 Z
+date: 2012-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: &2162530960 !ruby/object:Gem::Requirement
+  name: mongoid
+  requirement: &70226827473880 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2162530960
+  version_requirements: *70226827473880
 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:
@@ -33,6 +33,7 @@ files:
 - .autotest
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - README.md
 - Rakefile
@@ -41,6 +42,7 @@ files:
 - lib/mongoid_token.rb
 - lib/version.rb
 - mongoid_token.gemspec
+- spec/mongoid.yml
 - spec/mongoid/token_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/thetron/mongoid_token
@@ -63,10 +65,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: mongoid_token
-rubygems_version: 1.8.7
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: A little random, unique token generator for Mongoid documents.
 test_files:
+- spec/mongoid.yml
 - spec/mongoid/token_spec.rb
 - spec/spec_helper.rb