has_token_on 1.0.3 → 1.0.4

data/has_token_on.gemspec

@@ -18,17 +18,17 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = ['README.md']
   s.require_paths = ['lib']
 
-  s.add_dependency 'railties', ['>= 3.0.0']
+  s.add_dependency 'railties', ['~> 3.0']
   s.add_development_dependency 'simple_uuid'
   s.add_development_dependency 'sqlite3', ['>= 0']
-  s.add_development_dependency 'rspec', ['>= 2.0.0']
-  s.add_development_dependency 'mocha', ['>= 0.9.8']
+  s.add_development_dependency 'rspec', ['~> 2.0']
+  s.add_development_dependency 'mocha', ['~> 0.9.8']
   s.add_development_dependency 'with_model', ['>= 0.1.4']
   s.add_development_dependency 'guard', ['>= 0.3.4']
   s.add_development_dependency 'guard-rspec', ['>= 0']
   s.add_development_dependency 'growl', ['>= 0']
   s.add_development_dependency 'rb-fsevent', ['>= 0']
   s.add_development_dependency 'ruby-debug19', ['>= 0']
-  s.add_development_dependency 'mongoid', ['>= 2']
+  s.add_development_dependency 'mongoid', ['~> 2.0']
   s.add_development_dependency 'bson_ext', ['>= 1.3.1']
 end

data/lib/has_token_on/models/base.rb

@@ -9,7 +9,7 @@ module HasTokenOn
     extend ActiveSupport::Concern
 
     included do
-      after_initialize { |record| create_tokens(record, :initialize) }
+      after_initialize { |record| create_tokens(record, :initialize) if record.new_record? }
       before_create { |record| create_tokens(record, :create) }
       before_update { |record| create_tokens(record, :update) }
     end
@@ -130,7 +130,7 @@ module HasTokenOn
     def tokens_to_build_on(callback)
       self.class.tokens.select{ |token, config|
         if config.has_key?(:on)
-          config[:on].include?(callback)
+          [config[:on]].flatten.include?(callback)
         else
           # if user didn't specify :on we set token before record create
           callback == :create

data/lib/has_token_on/version.rb

@@ -1,3 +1,3 @@
 module HasTokenOn
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 end

data/spec/has_token_on/base_spec.rb

@@ -31,8 +31,7 @@ describe HasTokenOn::Base, "instantiation" do
         has_token_on :tkn
       end
 
-      subject.tokens.size.should == 2
-      subject.tokens.keys == [:permalink, :tkn]
+      subject.tokens.keys.should include(:tkn)
     end
 
     it "should allow to set multiple tokens with hash syntax" do
@@ -40,8 +39,7 @@ describe HasTokenOn::Base, "instantiation" do
         has_token_on :tkn1 => { :length => 3 }, :tkn2 => { :length => 4 }
       end
 
-      subject.tokens.size.should == 4
-      subject.tokens.keys.should == [:permalink, :tkn, :tkn1, :tkn2]
+      subject.tokens.keys.should include(:tkn1, :tkn2)
     end
 
     it "should allow to set multiple tokens with array syntax (same configuration for all)" do
@@ -49,7 +47,6 @@ describe HasTokenOn::Base, "instantiation" do
         has_token_on [:tkn3, :tkn4], { :length => 10 }
       end
 
-      subject.tokens.size.should == 6
       subject.tokens.keys.should include(:tkn3, :tkn4)
     end
 
@@ -62,6 +59,7 @@ describe HasTokenOn::Base, "callbacks" do
   with_model :post do
     table do |t|
       t.string "permalink_init"
+      t.string "permalink_init_hash"
       t.string "permalink_create"
       t.string "permalink_update"
       t.string "permalink_none"
@@ -69,6 +67,7 @@ describe HasTokenOn::Base, "callbacks" do
 
     model do
       has_token_on :permalink_init, { :length => 3, :on => [:initialize] }
+      has_token_on :permalink_init_hash, { :length => 3, :on => :initialize }
       has_token_on :permalink_create, { :length => 3, :on => [:create] }
       has_token_on :permalink_update, { :length => 3, :on => [:update] }
       has_token_on :permalink_none, { :length => 3 }
@@ -77,6 +76,7 @@ describe HasTokenOn::Base, "callbacks" do
 
   it "should set token on initialize if specified" do
     subject.permalink_init.should_not be_nil
+    subject.permalink_init_hash.should_not be_nil
     subject.permalink_create.should be_nil
     subject.permalink_update.should be_nil
   end
@@ -101,6 +101,12 @@ describe HasTokenOn::Base, "callbacks" do
     subject.update_attribute(:permalink_init, "sup yo")
     subject.permalink_none.should_not be_nil
   end
+
+  it "should not regenerate tokens on :initialize if record is persisted" do
+    permalink = subject.permalink_init
+    subject.save
+    subject.reload.permalink_init.should == permalink
+  end
 end
 
 describe HasTokenOn::Base do
@@ -109,7 +115,7 @@ describe HasTokenOn::Base do
   with_model :post do
     table do |t|
       t.string "permalink"
-      t.string "test"
+      t.string "test_token"
       t.string "str"
       t.string "sixteen"
       t.string "proc_seed"
@@ -127,7 +133,7 @@ describe HasTokenOn::Base do
         :append => "bar",
         :on => [:initialize]
       },
-      :test => {
+      :test_token => {
         :length => 4,
         :prepend => "foo",
         :seed => :simplerandom,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: has_token_on
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-09 00:00:00.000000000 Z
+date: 2012-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: simple_uuid
   requirement: !ruby/object:Gem::Requirement
@@ -64,23 +64,23 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.8
   type: :development
@@ -88,7 +88,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.8
 - !ruby/object:Gem::Dependency
@@ -192,17 +192,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bson_ext
   requirement: !ruby/object:Gem::Requirement