has_token_on 1.0.2 → 1.0.3

data/README.md

@@ -17,20 +17,28 @@ Simple yet customizable token generator for Rails 3.
 
 * Single token
 
-        has_token_on :slug, :length => 3
+    ```ruby
+    has_token_on :slug, :length => 3
+    ```
 
 * Multiple tokens, same configuration
 
-         has_token_on [:slug, :permalink], :length => 3
+    ```ruby
+    has_token_on [:slug, :permalink], :length => 3
+    ```
 
 * Multiple tokens with individual configuration
 
-          has_token_on :slug, :length => 3
-          has_token_on :permalink, :length => 5
+    ```ruby
+    has_token_on :slug, :length => 3
+    has_token_on :permalink, :length => 5
+    ```
 
 * .. or using single hash
 
-          has_token_on :slug => { :length => 3 }, :permalink => { :length => 5 }
+    ```ruby
+    has_token_on :slug => { :length => 3 }, :permalink => { :length => 5 }
+    ```
 
 ## Options
 
@@ -38,44 +46,70 @@ Options are as follows:
 
 * :length - token length. Default - 16.
 
-          has_token_on :slug, length => 3
+    ```ruby
+    has_token_on :slug, length => 3
+    ```
 
 * :prepend - prepend something to the beginning of the token. Default - none.
 
-          has_token_on :slug, :prepend => "private"
+    ```ruby
+    has_token_on :slug, :prepend => "private"
+    ```
 
 * :append - append something to the back of the token. Default - none.
 
-          has_token_on :slug, :append => "ending"
+    ```ruby
+    has_token_on :slug, :append => "ending"
+    ```
 
 * :unique - ensure that tokens is unique (checking is performed in the app logic). Default - false.
 
-          has_token_on :slug, :unique => true
+    ```ruby
+    has_token_on :slug, :unique => true
+    ```
 
 * :if - generate token only if provided condition is met. Default - none.
 
-          has_token_on :slug, :if => lambda { |record| record.private? }
+    ```ruby
+    has_token_on :slug, :if => lambda { |record| record.private? }
+    ```
 
 * :on - generates token on certain time: :initialize, :create (default), :update.
 
-          has_token_on :slug, :on => :initialize
+    ```ruby
+    has_token_on :slug, :on => :initialize
+    ```
 
 * :seed - elements or functions that are used to generate hash. Options:
   * :securerandom - uses ActiveSupport::SecureRandom.hex (default)
 
-            has_token_on :slug, :seed => :securerandom
+    ```ruby
+    has_token_on :slug, :seed => :securerandom
+    ```
 
   * :guid - uses simple_uuid gem. You should add it to your Gemfile. 36 characters long GUID. Length param is ignored.
 
-            has_token_on :slug, :seed => :guid
+    ```ruby
+    has_token_on :slug, :seed => :guid
+    ```
 
   * ('a'..'z') - a Range. Mixes the range elements up to specified length.
 
-            has_token_on :slug, :seed => ('a'..'z')
+    ```ruby
+    has_token_on :slug, :seed => ('a'..'z')
+    ```
+
+  * ['a', 'b', 'c'] - an Array. Mixes the array elements up to specified length.
+
+    ```ruby
+    has_token_on :slug, :seed => ['a', 'b', 'c']
+    ```
 
   * lambda { 2 * 2 } - a Proc. Executes proc. Length param is ignored.
 
-            has_token_on :slug, :seed => lambda { 2 * 2 }
+    ```ruby
+    has_token_on :slug, :seed => lambda { 2 * 2 }
+    ```
 
 ## Generator
 

data/lib/has_token_on/models/base.rb

@@ -115,7 +115,7 @@ module HasTokenOn
               raise LibraryNotPresent, "Supporting library SimpleUUID is not present. Add it to your Gemfile?"
             end
           end
-        when Range
+        when Range, Array
           chars = config[:seed].to_a
           (0...config[:length]).collect { chars[Kernel.rand(chars.length)] }.join
         when Proc

data/lib/has_token_on/version.rb

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

data/spec/has_token_on/base_spec.rb

@@ -114,6 +114,7 @@ describe HasTokenOn::Base do
       t.string "sixteen"
       t.string "proc_seed"
       t.string "range_seed"
+      t.string "array_seed"
       t.string "guid_seed"
       t.boolean :check, :default => true
     end
@@ -150,6 +151,10 @@ describe HasTokenOn::Base do
         :seed => ('a'..'z'),
         :on => [:initialize]
       },
+      :array_seed => {
+        :seed => ['a', 'b', 'c'],
+        :on => [:initialize]
+      },
       :guid_seed => {
         :seed => :guid,
         :on => [:create]
@@ -205,6 +210,11 @@ describe HasTokenOn::Base do
       subject.range_seed.size.should == 16
     end
 
+    it "should allow :seed to be described as array" do
+      subject.array_seed.should =~ /\A[abc]*\Z/
+      subject.array_seed.size.should == 16
+    end
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: has_token_on
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-09 00:00:00.000000000 Z
+date: 2012-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70330988336260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70330988336260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: simple_uuid
-  requirement: &70330988335840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70330988335840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70330988335260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70330988335260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70330988334680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *70330988334680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70330988334200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: 0.9.8
   type: :development
   prerelease: false
-  version_requirements: *70330988334200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.8
 - !ruby/object:Gem::Dependency
   name: with_model
-  requirement: &70330988333720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: 0.1.4
   type: :development
   prerelease: false
-  version_requirements: *70330988333720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.4
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70330988333240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
         version: 0.3.4
   type: :development
   prerelease: false
-  version_requirements: *70330988333240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.4
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70330988332760 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +133,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70330988332760
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: growl
-  requirement: &70330988332280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +149,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70330988332280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70330988331800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +165,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70330988331800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70330988331280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +181,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70330988331280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70330988347140 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +197,15 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *70330988347140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70330988346460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,7 +213,12 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *70330988346460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.1
 description: Simple yet customizable token generator for Rails 3
 email:
 - saulius@ninja.lt
@@ -207,7 +272,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: has_token_on
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A token generator plugin for Rails 3