ar-tokens 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbf6514fb51c630818b049f9391e2c1332a8221e
-  data.tar.gz: 3e7734e2a023372a9f8324aa21a02d9a3a28ee0e
+  metadata.gz: f02a81709949a789c3adff05838e6fc9e7030f43
+  data.tar.gz: ff9afc616e4c4b7318f12ae30d710f8a89eebc3e
 SHA512:
-  metadata.gz: 0708d4e9f52437c54b5fd5746bf05f15ebe5095e29ec222beec02b50517830b562e1942bd10f28b8d4bc83846784cc92cdce33dec0b5750d2d7d1283bbcdc34b
-  data.tar.gz: db42c13c051e11d10daaa6f7cf90a9e8d061fd230fc488162669873c1c48f4e572a92526d93ff0fe3949e265959daaa5200bf574f9508f3bc8a87b9e8e0769bc
+  metadata.gz: c2231116bd1e5183d29ddb9a6f9863e97b1a594bd44341b81f9bc1635003d8e69917b6e7948d7f073f50ef9e57a0ee6df1a90ae6b6123321a6b09fbdfc98cb87
+  data.tar.gz: 6832ec43e3d7d21be05e2eeec14301708d456bc8c0ea6510f937407aca0a9b5ebfe65218870b58ac1090755abc361479362ed1252062030854a8c70a713b2c19

data/.travis.yml

@@ -2,3 +2,14 @@ language: ruby
 rvm:
   - 1.9.2
   - 1.9.3
+  - 2.0
+gemfile:
+  - gemfiles/Gemfile.activerecord-4.0.x
+  - gemfiles/Gemfile.activerecord-3.2.x
+  - gemfiles/Gemfile.activerecord-3.1.x
+matrix:
+  exclude:
+    - rvm: 1.9.2
+      gemfile: gemfiles/Gemfile.activerecord-4.0.x
+    - rvm: 2.0
+      gemfile: gemfiles/Gemfile.activerecord-3.1.x

data/README.markdown

@@ -1,6 +1,6 @@
 [![Build Status](https://travis-ci.org/spieker/tokens.png?branch=master)](https://travis-ci.org/spieker/tokens)
 
-For generating a token on an active record column you can use `generate_token`
+For generating a token on an active record column you can use `tokenize`
 
 Parameters
 ----------

data/ar-tokens.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.description = %q{This gem lets you easily generate tokens on ruby objects and provides additional methods on ActiveRecord::Base to generate tokens on records}
 
   s.rubyforge_project = "tokens"
-  
+
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }

data/gemfiles/Gemfile.activerecord-3.1.x

@@ -0,0 +1,11 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in tokens.gemspec
+gem 'rspec'
+gem 'sqlite3'
+gem 'activerecord', '~> 3.1.0'
+
+group :test do
+  gem 'rake'
+end
+

data/gemfiles/Gemfile.activerecord-3.2.x

@@ -0,0 +1,11 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in tokens.gemspec
+gem 'rspec'
+gem 'sqlite3'
+gem 'activerecord', '~> 3.2.0'
+
+group :test do
+  gem 'rake'
+end
+

data/gemfiles/Gemfile.activerecord-4.0.x

@@ -0,0 +1,11 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in tokens.gemspec
+gem 'rspec'
+gem 'sqlite3'
+gem 'activerecord', '~> 4.0.0'
+
+group :test do
+  gem 'rake'
+end
+

data/lib/active_record/mixin/token_generator.rb

@@ -33,9 +33,12 @@ module ActiveRecord
             :max_try    => 8,
             :characters => ('a'..'z').to_a+('A'..'Z').to_a+(0..9).to_a
           }.merge(args.extract_options!)
-          
+
           columns = [columns] unless columns.is_a?(Array)
-          
+          if options[:length].respond_to?(:call)
+            options[:length] = options[:length].call(self)
+          end
+
           result = {}
           token = nil
           columns.each do |column|
@@ -71,10 +74,10 @@ module ActiveRecord
 
           before_validation before_validation_options do |obj|
             obj.generate_token column, options
-          end  
+          end
         end
       end
-  
+
       def self.included(receiver)
         receiver.send :include, InstanceMethods
         receiver.extend ClassMethods

data/lib/object.rb

@@ -1,7 +1,7 @@
 # This provides a method for generating a random token of the given length.
 # The generated token is base58 encoded, so the token just contains numbers,
 # up- and down case characters.
-# 
+#
 # Example:
 #   Object.new_token(10) # => "S2Mq4mJBv6" (i.e.)
 # or
@@ -15,7 +15,7 @@ class Object
     end
     result
   end
-  
+
   def new_token(length=8, characters = ('a'..'z').to_a+('A'..'Z').to_a+(0..9).to_a)
     self.class.new_token(length, characters)
   end

data/lib/tokens/version.rb

@@ -1,3 +1,3 @@
 module Tokens
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/active_record_spec.rb

@@ -10,7 +10,7 @@ describe ActiveRecord::Mixin::TokenGenerator do
     @klass.tokenize :token
     @klass.create.token.should == 'aaaaaaaa'
   end
-  
+
   it "raises an exception if no free token is available" do
     SecureRandom.stub(:random_number).and_return(0)
     @klass.tokenize :token
@@ -26,7 +26,7 @@ describe ActiveRecord::Mixin::TokenGenerator do
     @klass.create.token.should == 'aaaaaaaa'
     @klass.create.token.should == 'aaaaaaaa'
   end
-  
+
   it "generates duplicate tokens in different scopes if allowed" do
     SecureRandom.stub(:random_number).and_return(0)
     @klass.tokenize :token, :scope => 'scope'
@@ -44,6 +44,14 @@ describe ActiveRecord::Mixin::TokenGenerator do
     end
   end
 
+  it "generates tokens with length specified by the return value of a given block" do
+    (6..32).each do |i|
+      @klass = TokenTest.dup
+      @klass.tokenize :token, :length => Proc.new { |m| i }
+      @klass.create.token.length.should == i
+    end
+  end
+
   it "generates different tokens for different columns" do
     @klass.tokenize [:token, :token_two]
     r = @klass.create!

data/spec/support/active_record.rb

@@ -9,5 +9,9 @@ ActiveRecord::Migration.create_table :token_tests do |t|
 end
 
 class TokenTest < ActiveRecord::Base
-  set_table_name 'token_tests'
+  if respond_to?(:set_table_name)
+    set_table_name 'token_tests'
+  else
+    self.table_name = 'token_tests'
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ar-tokens
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Paul Spieker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-25 00:00:00.000000000 Z
+date: 2014-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -39,6 +39,9 @@ files:
 - README.markdown
 - Rakefile
 - ar-tokens.gemspec
+- gemfiles/Gemfile.activerecord-3.1.x
+- gemfiles/Gemfile.activerecord-3.2.x
+- gemfiles/Gemfile.activerecord-4.0.x
 - lib/active_record/mixin/token_generator.rb
 - lib/ar-tokens.rb
 - lib/no_free_token.rb
@@ -76,3 +79,4 @@ test_files:
 - spec/object_spec.rb
 - spec/spec_helper.rb
 - spec/support/active_record.rb
+has_rdoc: