king_tokens 2.0.2 → 2.1.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ODQ1YmFkYjM1YmEyYzE2MzQxNDc3Y2M5MmYyNTVjMzJkNDQ0ZmQ5MQ==
-  data.tar.gz: !binary |-
-    Y2E3MzgwMjA3YTBhYmIwMzQ5NjEzZmNkODdjOWQ1ZDA2MTVlNGE2Ng==
+SHA1:
+  metadata.gz: fde13af97629a259470fa2f1f7f3b2512288d40d
+  data.tar.gz: 6ace3d4f8524a39b05fabbaedd0475ab117271cd
 SHA512:
-  metadata.gz: !binary |-
-    N2E3NzY3Mjg4MzIzNWZmNzE2NDUwODc4ZDk0NTAyNGUwZjIwY2UzMjM5ZmM5
-    MzNkNWYxZjA5ZDljMmU0NTMyZTUzMjE1Y2NjMGI3NGUxNWQ1MDI3NWE5ODAy
-    MWFjMTVkMmRhZmIwNzk1NzJkNDdmNDFmODQxOWQ5M2MyY2IxYmU=
-  data.tar.gz: !binary |-
-    ZjE3ZWM0MmQ3OTAzZmZmOTEwNmJmOTJjNjYyOWVhM2ExMjRjOGU3OWQwOWYw
-    ZGU5NTkxN2ZhYzJjMjcwZjk5ZTc2MWMxNGJiZGRmZTQyYzUyZTMwYmMzNTI3
-    MjMyMzVmMGJjZTA5YmE0NTgyYmNhYzlmMDc3ODJiMmJiMDNlY2M=
+  metadata.gz: 01d2068e532465a0a1c9853276ce0c3ed6d0cfbadca48dcc7e8aabf5aa9267ffa7f4cbdd3dfbbfe30a847597068203f8d3979780e561a30e6897e9487ece525c
+  data.tar.gz: 3ae598c3c81d66199d572a272f7ecdc8d2b6fe46d93e07d6e7b478de6ae370c705081ea838994a6c6dd3d877ee15f863e733d2c08a0bf07d98690f9cb6f4d39d

data/Gemfile

@@ -1,3 +1,2 @@
-source :rubygems
-
+source 'https://rubygems.org'
 gemspec

data/README.md

@@ -1,6 +1,6 @@
 # KingTokens
 
-Tokens are a usefull way to give users access to an application. This can be for a limited time or just once.
+Tokens are a useful way to give users access to an application. This can be for a limited time or just once.
 Just think of password resets, changing email, protected rss feed urls, timed out private links, .. KingTokens are your easy way out in such cases
 
 This plugin consists of two parts:
@@ -12,16 +12,16 @@ KingTokens map polymorphic to other objects, through the can_has_tokens :a_token
 
 ## Install
 
-Get it as gem (hosted on gemcutter.org)
-  gem install king_tokens
+Get it as gem
 
-Or download it from github and use it as rails plugin
+    gem install king_tokens
 
-setup your token db like defined in the test schema => test/schema.rb
+Setup your token database tables like defined in the test schema => test/schema.rb
 
 ## Example
 
 Define a token on a model
+
 ```ruby
   class User
     can_has_tokens :forgot_password

data/lib/king_tokens/token_code.rb

@@ -56,6 +56,10 @@ class TokenCode < ActiveRecord::Base
     delete_all ["valid_until IS NOT NULL AND valid_until < ? ", Time.now]
   end
 
+  def self.find_token(token)
+    where(token: token).first
+  end
+
   private
 
   # Generate a token with a default length of 12.
@@ -75,7 +79,7 @@ class TokenCode < ActiveRecord::Base
    end
 
   def set_token
-    self.token = generate_token { |token| TokenCode.find_by_token(token).nil? }
+    self.token = generate_token { |token| TokenCode.find_token(token).nil? }
   end
 
 end

data/lib/king_tokens/tokenizer.rb

@@ -52,8 +52,8 @@ module KingTokens
       #
       # ==== Returns
       # Object:: the object to which the token belongs
-      def find_token(args={})
-        TokenCode.find(:first, :conditions => args)
+      def find_token(args = {})
+        TokenCode.where(args).first
       end
 
       # Find an object by its token.
@@ -64,7 +64,7 @@ module KingTokens
       #
       # ==== Returns
       # Object:: the object to which the token belongs
-      def find_by_token(name,token)
+      def find_by_token(name, token)
         token = find_token(:name => "#{name}", :token => token)
         token.object if token
       end
@@ -78,7 +78,7 @@ module KingTokens
       # ==== Returns
       # Object:: the object to which the token belongs
       def find_by_valid_token(name, token)
-        token = find_token(:name => "#{name}", :token => token)
+        token = find_token(:name => name.to_s, :token => token)
         return token.object if token && token.valid_for_use?
       end
     end
@@ -98,7 +98,7 @@ module KingTokens
           self.token(name).destroy
         end
         args[:name] = "#{name}"
-        args[:valid_until] ||= ( args.delete(:valid) || 5.days ).from_now
+        args[:valid_until] ||= (args.delete(:valid) || 5.days).from_now
         self.token_codes.create(args)
       end
 
@@ -106,10 +106,10 @@ module KingTokens
       # ==== Parameter
       # name<String/Symbol>:: The name of the token
       def token(name)
-        self.token_codes.find_by_name("#{name}")
+        self.token_codes.where(name: name.to_s).first
       end
 
     end
 
   end #module
-end # namespace
+end # namespace

data/lib/king_tokens/version.rb

@@ -1,3 +1,3 @@
 module KingTokens
-  VERSION= '2.0.2'
+  VERSION= '2.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: king_tokens
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0
 platform: ruby
 authors:
 - Georg Leciejewski
@@ -15,84 +15,84 @@ dependencies:
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Tokens are a usefull way to give users access to an application. This
@@ -104,7 +104,7 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - MIT-LICENSE
 - README.md
@@ -127,12 +127,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []