tokens 0.2.0.beta.1 → 0.2.0.beta.3

data/Rakefile

@@ -1,3 +1,4 @@
+require "rspec/core/rake_task"
 require "lib/tokens/version"
 
 begin
@@ -8,7 +9,7 @@ begin
     gem.email = "fnando.vieira@gmail.com"
     gem.homepage = "http://github.com/fnando/has_tokens"
     gem.authors = ["Nando Vieira"]
-    gem.version = SimplesIdeias::Tokens::Version::STRING + ".beta.1"
+    gem.version = SimplesIdeias::Tokens::Version::STRING + ".beta.3"
     gem.summary = "Generate named tokens on your ActiveRecord models."
     gem.files =  FileList["README.rdoc", "init.rb", "{lib,spec,source}/**/*", "Rakefile"]
   end
@@ -17,3 +18,7 @@ begin
 rescue LoadError => e
   puts "[JEWELER] You can't build a gem until you install jeweler with `gem install jeweler`"
 end
+
+RSpec::Core::RakeTask.new do |t|
+  t.ruby_opts = %[ -rubygems -Ilib -Ispec ]
+end

data/lib/tokens.rb

@@ -18,15 +18,15 @@ module Tokens
       include InstanceMethods
     end
 
-    # Generate token using seed and size.
+    # Generate token with specified length.
     #
-    #   User.generate_token("abc", 10)
+    #   User.generate_token(10)
     #
-    def generate_token(seed, size)
+    def generate_token(size)
       validity = Proc.new {|token| Token.where(:token => token).first.nil?}
 
       begin
-        seed = Digest::SHA1.hexdigest(seed)
+        seed = "--#{rand}--#{Time.now}--#{rand}--"
         token = Digest::SHA1.hexdigest(seed)[0, size]
       end while validity[token] == false
 
@@ -35,13 +35,13 @@ module Tokens
 
     # Find a token
     #
-    #   User.find_token(:activation, 'abcdefg')
-    #   User.find_token(:name => activation, :token => 'abcdefg')
-    #   User.find_token(:name => activation, :token => 'abcdefg', :tokenizable_id => 1)
+    #   User.find_token(:activation, "abcdefg")
+    #   User.find_token(:name => activation, :token => "abcdefg")
+    #   User.find_token(:name => activation, :token => "abcdefg", :tokenizable_id => 1)
     #
     def find_token(*args)
       if args.first.kind_of?(Hash)
-        args.first
+        options = args.first
       else
         options = {
           :name => args.first,
@@ -50,12 +50,12 @@ module Tokens
       end
 
       options.merge!(:name => options[:name].to_s, :tokenizable_type => self.name)
-      Token.where(options).include(:tokenizable).first
+      Token.where(options).includes(:tokenizable).first
     end
 
     # Find object by token.
     #
-    #   User.find_by_token(:activation, 'abcdefg')
+    #   User.find_by_token(:activation, "abcdefg")
     #
     def find_by_token(name, hash)
       token = find_token(:name => name.to_s, :token => hash)
@@ -65,19 +65,27 @@ module Tokens
 
     # Find object by valid token (same name, same hash, not expired).
     #
-    #   User.find_by_valid_token(:activation, 'abcdefg')
+    #   User.find_by_valid_token(:activation, "abcdefg")
     #
     def find_by_valid_token(name, hash)
       token = find_token(:name => name.to_s, :token => hash)
-      return nil if !token || t.expired?
-      t.tokenizable
+      return nil if !token || token.expired?
+      token.tokenizable
     end
   end
 
   module InstanceMethods
+    # Verify if given token is valid.
+    #
+    #   @user.valid_token?(:active, "abcdefg")
+    #
+    def valid_token?(name, hash)
+      self.tokens.where(:name => name.to_s, :token => hash.to_s).first != nil
+    end
+
     # Find a token.
     #
-    #   @user.find_token(:activation, 'abcdefg')
+    #   @user.find_token(:activation, "abcdefg")
     #
     def find_token(name, token)
       self.class.find_token(
@@ -115,15 +123,14 @@ module Tokens
       })
 
       remove_token(name)
-
-      seed = "--#{rand}--#{self.object_id}--#{Time.now}--"
-
-      self.tokens.create(
-        :name => name.to_s,
-        :token => self.class.generate_token(seed, options[:size]),
+      attrs = {
+        :name       => name.to_s,
+        :token      => self.class.generate_token(options[:size]),
         :expires_at => options[:expires_at],
-        :data => options[:data]
-      )
+        :data       => options[:data]
+      }
+
+      self.tokens.create!(attrs)
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,5 +1,3 @@
-$LOAD_PATH.unshift File.dirname(__FILE__) + "/../lib"
-
 require "rspec"
 require "active_record"
 require "tokens"
@@ -7,3 +5,7 @@ require "tokens"
 ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
 
 load("schema.rb")
+
+RSpec.configure do |c|
+  c.color_enabled = true
+end

data/spec/tokens_spec.rb

@@ -9,156 +9,156 @@ class Post < ActiveRecord::Base
 end
 
 describe "has_tokens" do
-  before(:each) do
+  before do
     User.delete_all
     Post.delete_all
-    
+
     @user = User.create(:name => "Homer")
     @another_user = User.create(:name => "Bart")
     @post = Post.create(:title => "How to make donuts")
     @expire = 3.days.from_now
   end
-  
+
   describe "- token" do
     it "should be created" do
       expect { @user.add_token(:uid) }.to change(Token, :count)
     end
-    
+
     it "should be created for different users" do
       @user.add_token(:uid).should be_valid
       @another_user.add_token(:uid).should be_valid
     end
-    
+
     it "should be created with expiration date" do
       @user.add_token(:uid, :expires_at => @expire).expires_at.should == @expire
     end
-    
+
     it "should be created with additional data" do
-      @user.add_token(:uid, :data => 'some value').data.should == 'some value'
+      @user.add_token(:uid, :data => "some value").data.should == "some value"
     end
-    
+
     it "should be created with custom size" do
       @user.add_token(:uid, :size => 6).hash.size.should == 6
     end
-    
+
     it "should find token by its name" do
       token = @user.add_token(:uid)
       @user.find_token_by_name(:uid).should == token
     end
-    
+
     it "should be nil when no token is found" do
-      @user.find_token(:uid, 'abcdef').should be_nil
+      @user.find_token(:uid, "abcdef").should be_nil
       @user.find_token_by_name(:uid).should be_nil
     end
-    
+
     it "should be a valid token" do
       token = @user.add_token(:uid)
       @user.valid_token?(:uid, token.hash).should be_true
     end
-    
+
     it "should not be a valid token" do
-      @user.valid_token?(:uid, 'invalid').should be_false
+      @user.valid_token?(:uid, "invalid").should be_false
     end
-    
+
     it "should find token by its name and hash" do
       token = @user.add_token(:uid)
       @user.find_token(:uid, token.hash).should == token
     end
-    
+
     it "should not be expired when have no expiration date" do
       @user.add_token(:uid).should_not be_expired
     end
-    
+
     it "should not be expired when have a future expiration date" do
       @user.add_token(:uid, :expires_at => 3.days.from_now).should_not be_expired
     end
-    
+
     it "should be expired" do
       @user.add_token(:uid, :expires_at => 3.days.ago).should be_expired
     end
-    
+
     it "should remove token" do
       @user.add_token(:uid)
-      @user.remove_token(:uid).should > 0
+      @user.remove_token(:uid).should be_true
     end
-    
+
     it "should not remove other users tokens" do
       @user.add_token(:uid)
       @another_user.add_token(:uid)
-      
+
       @user.remove_token(:uid)
-      
+
       @user.find_token_by_name(:uid).should be_nil
       @another_user.find_token_by_name(:uid).should be_an_instance_of(Token)
     end
-    
+
     it "should not be duplicated" do
       @user.add_token(:uid)
       @user.add_token(:uid)
-      
-      @user.tokens.find_all_by_name('uid').size.should == 1
+
+      @user.tokens.find_all_by_name("uid").size.should == 1
     end
   end
-  
+
   it "should have tokens association" do
     expect { @user.tokens }.to_not raise_error
   end
-  
+
   it "should remove all expired tokens" do
     expect {
       %w(uid activation_code reset_password_code).each do |name|
         @user.add_token(name, :expires_at => 3.days.ago)
       end
     }.to change(Token, :count).by(3)
-    
-    Token.delete_expired.should == 3
+
+    Token.clean.should == 3
   end
-  
+
   it "should generate token without saving it" do
     expect {
-      User.generate_token(Time.now.to_s, 32)
+      User.generate_token(32)
     }.to_not change(Token, :count)
   end
-  
+
   it "should generate token with custom size" do
-    User.generate_token(Time.now.to_s, 8).size.should == 8
+    User.generate_token(8).size.should == 8
   end
-  
+
   it "should alias token method" do
     token = @user.add_token(:uid)
     token.hash.should == token.token
   end
-  
+
   it "should find user by token" do
     token = @user.add_token(:uid)
     User.find_by_token(:uid, token.hash).should == @user
   end
-  
+
   it "should return user by its valid token without expiration time" do
     token = @user.add_token(:uid)
     User.find_by_valid_token(:uid, token.hash).should == @user
   end
-  
+
   it "should return user by its valid token with expiration time" do
     token = @user.add_token(:uid, :expires_at => @expire)
     User.find_by_valid_token(:uid, token.hash).should == @user
   end
-  
+
   it "should find token using class method with one argument (hash only)" do
     token = @user.add_token(:uid)
     User.find_token(:name => :uid, :token => token.hash).should == token
   end
-  
+
   it "should not conflict with other models" do
     user_token = @user.add_token(:uid)
     post_token = @post.add_token(:uid)
-    
+
     User.find_token(post_token.to_s).should == nil
     User.find_token(:name => :uid)
   end
-  
+
   it "to_s should return hash" do
     token = @user.add_token(:uid)
     token.to_s.should == token.hash
   end
-end
+end

metadata

@@ -1,15 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tokens
 version: !ruby/object:Gem::Version 
-  hash: 62196353
-  prerelease: true
-  segments: 
-  - 0
-  - 2
-  - 0
-  - beta
-  - 1
-  version: 0.2.0.beta.1
+  version: 0.2.0.beta.3
 platform: ruby
 authors: 
 - Nando Vieira
@@ -48,29 +40,21 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
       version: 1.3.1
+  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Generate named tokens on your ActiveRecord models.