tokens 0.2.1 → 1.0.0

data/.gitignore

@@ -0,0 +1,4 @@
+pkg
+Gemfile.lock
+.bundle
+*.log

data/.rspec

@@ -0,0 +1 @@
+--color --format documentation

data/Gemfile

@@ -1,9 +1,2 @@
-source :gemcutter
-
-gem "rspec-rails", "2.0.0.rc"
-gem "rails", "3.0.0"
-gem "sqlite3-ruby"
-
-platforms :mri_19 do
-  gem "ruby-debug19", :require => "ruby-debug"
-end
+source :rubygems
+gemspec

data/Rakefile

@@ -1,24 +1,5 @@
-require "rspec/core/rake_task"
-require "./lib/tokens/version"
-
-begin
-  require "jeweler"
-
-  JEWEL = Jeweler::Tasks.new do |gem|
-    gem.name = "tokens"
-    gem.email = "fnando.vieira@gmail.com"
-    gem.homepage = "http://github.com/fnando/tokens"
-    gem.authors = ["Nando Vieira"]
-    gem.version = Tokens::Version::STRING
-    gem.summary = "Generate named tokens on your ActiveRecord models."
-    gem.files =  FileList["{Rakefile,README.rdoc,Gemfile,Gemfile.lock,tokens.gemspec}", "{lib,spec,templates}/**/*"]
-  end
+require "bundler"
+Bundler::GemHelper.install_tasks
 
-  Jeweler::GemcutterTasks.new
-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 = %[ -Ilib -Ispec ]
-end
+require "rspec/core/rake_task"
+RSpec::Core::RakeTask.new

data/lib/tokens.rb

@@ -1,5 +1,6 @@
 require "rails/railtie"
 require "active_record"
+require "securerandom"
 
 require "tokens/active_record"
 require "tokens/token"

data/lib/tokens/active_record.rb

@@ -24,8 +24,8 @@ module Tokens
         validity = Proc.new {|token| Token.where(:token => token).first.nil?}
 
         begin
-          seed = "--#{rand}--#{Time.now}--#{rand}--"
-          token = Digest::SHA1.hexdigest(seed)[0, size]
+          token = SecureRandom.hex(40)[0, size]
+          token = token.encode("UTF-8") if token.respond_to?(:encoding)
         end while validity[token] == false
 
         token
@@ -88,7 +88,8 @@ module Tokens
       def find_token(name, token)
         self.class.find_token(
           :tokenizable_id => self.id,
-          :name => name.to_s, :token => token
+          :name => name.to_s,
+          :token => token
         )
       end
 

data/lib/tokens/token.rb

@@ -2,12 +2,8 @@ class Token < ActiveRecord::Base
   belongs_to :tokenizable, :polymorphic => true
   serialize :data
 
-  def hash
-    token
-  end
-
   def to_s
-    hash
+    token
   end
 
   def expired?

data/lib/tokens/version.rb

@@ -1,8 +1,8 @@
 module Tokens
   module Version
-    MAJOR = 0
-    MINOR = 2
-    PATCH = 1
+    MAJOR = 1
+    MINOR = 0
+    PATCH = 0
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end
 end

data/spec/spec_helper.rb

@@ -4,7 +4,11 @@ require File.dirname(__FILE__) + "/support/config/boot"
 require "rspec/rails"
 
 # Load database schema
-load File.dirname(__FILE__) + "/schema.rb"
+begin
+  load File.dirname(__FILE__) + "/schema.rb"
+rescue Exception => e
+  p e
+end
 
 require "support/models"
 

data/spec/support/config/database.yml

@@ -1,3 +1,3 @@
 test:
   adapter: sqlite3
-  database: ":memory:"
+  database: ":memory:"

data/spec/tokens_spec.rb

@@ -37,27 +37,27 @@ describe Tokens do
 
   it "should alias token method" do
     token = @user.add_token(:uid)
-    token.hash.should == token.token
+    token.to_s.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
+    User.find_by_token(:uid, token.to_s).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
+    User.find_by_valid_token(:uid, token.to_s).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
+    User.find_by_valid_token(:uid, token.to_s).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
+    User.find_token(:name => :uid, :token => token.to_s).should == token
   end
 
   it "should not conflict with other models" do
@@ -70,7 +70,7 @@ describe Tokens do
 
   it "to_s should return hash" do
     token = @user.add_token(:uid)
-    token.to_s.should == token.hash
+    token.to_s.should == token.to_s
   end
 
   describe Token do
@@ -98,7 +98,7 @@ describe Tokens do
     end
 
     it "should be created with custom size" do
-      @user.add_token(:uid, :size => 6).hash.size.should == 6
+      @user.add_token(:uid, :size => 6).to_s.size.should == 6
     end
 
     it "should find token by its name" do
@@ -113,7 +113,7 @@ describe Tokens do
 
     it "should be a valid token" do
       token = @user.add_token(:uid)
-      @user.valid_token?(:uid, token.hash).should be_true
+      @user.valid_token?(:uid, token.to_s).should be_true
     end
 
     it "should not be a valid token" do
@@ -122,7 +122,7 @@ describe Tokens do
 
     it "should find token by its name and hash" do
       token = @user.add_token(:uid)
-      @user.find_token(:uid, token.hash).should == token
+      @user.find_token(:uid, token.to_s).should == token
     end
 
     it "should not be expired when have no expiration date" do

data/tokens.gemspec

@@ -1,61 +1,25 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "tokens/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{tokens}
-  s.version = "0.2.1"
+  s.name        = "tokens"
+  s.version     = Tokens::Version::STRING
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Nando Vieira"]
+  s.email       = ["fnando.vieira@gmail.com"]
+  s.homepage    = "http://rubygems.org/gems/tokens"
+  s.summary     = "Generate named tokens on your ActiveRecord models."
+  s.description = s.summary
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Nando Vieira"]
-  s.date = %q{2010-10-06}
-  s.email = %q{fnando.vieira@gmail.com}
-  s.extra_rdoc_files = [
-    "README.rdoc"
-  ]
-  s.files = [
-    "Gemfile",
-     "Gemfile.lock",
-     "README.rdoc",
-     "Rakefile",
-     "lib/tokens.rb",
-     "lib/tokens/active_record.rb",
-     "lib/tokens/generator.rb",
-     "lib/tokens/railtie.rb",
-     "lib/tokens/token.rb",
-     "lib/tokens/version.rb",
-     "spec/schema.rb",
-     "spec/spec_helper.rb",
-     "spec/support/config/boot.rb",
-     "spec/support/config/database.yml",
-     "spec/support/log/test.log",
-     "spec/support/models.rb",
-     "spec/tokens_spec.rb",
-     "templates/tokens.rb",
-     "tokens.gemspec"
-  ]
-  s.homepage = %q{http://github.com/fnando/tokens}
-  s.rdoc_options = ["--charset=UTF-8"]
+  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) }
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Generate named tokens on your ActiveRecord models.}
-  s.test_files = [
-    "spec/schema.rb",
-     "spec/spec_helper.rb",
-     "spec/support/config/boot.rb",
-     "spec/support/models.rb",
-     "spec/tokens_spec.rb"
-  ]
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-    else
-    end
-  else
-  end
+  s.add_development_dependency "rails"        , "~> 3.1"
+  s.add_development_dependency "rake"         , "~> 0.9"
+  s.add_development_dependency "rspec-rails"  , "~> 2.6"
+  s.add_development_dependency "sqlite3"      , "~> 1.3.4"
+  s.add_development_dependency "ruby-debug19" if RUBY_VERSION >= "1.9"
 end
-

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tokens
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 23
+  prerelease: 
   segments: 
-  - 0
-  - 2
   - 1
-  version: 0.2.1
+  - 0
+  - 0
+  version: 1.0.0
 platform: ruby
 authors: 
 - Nando Vieira
@@ -14,21 +15,82 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-06 00:00:00 -03:00
-default_executable: 
-dependencies: []
-
-description: 
-email: fnando.vieira@gmail.com
+date: 2011-08-31 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 3
+        - 1
+        version: "3.1"
+  prerelease: false
+  requirement: *id001
+  name: rails
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 9
+        version: "0.9"
+  prerelease: false
+  requirement: *id002
+  name: rake
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 6
+        version: "2.6"
+  prerelease: false
+  requirement: *id003
+  name: rspec-rails
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 3
+        - 4
+        version: 1.3.4
+  prerelease: false
+  requirement: *id004
+  name: sqlite3
+description: Generate named tokens on your ActiveRecord models.
+email: 
+- fnando.vieira@gmail.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
+- .gitignore
+- .rspec
 - Gemfile
-- Gemfile.lock
 - README.rdoc
 - Rakefile
 - lib/tokens.rb
@@ -41,18 +103,16 @@ files:
 - spec/spec_helper.rb
 - spec/support/config/boot.rb
 - spec/support/config/database.yml
-- spec/support/log/test.log
 - spec/support/models.rb
 - spec/tokens_spec.rb
 - templates/tokens.rb
 - tokens.gemspec
-has_rdoc: true
-homepage: http://github.com/fnando/tokens
+homepage: http://rubygems.org/gems/tokens
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -60,6 +120,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -68,13 +129,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Generate named tokens on your ActiveRecord models.
@@ -82,5 +144,6 @@ test_files:
 - spec/schema.rb
 - spec/spec_helper.rb
 - spec/support/config/boot.rb
+- spec/support/config/database.yml
 - spec/support/models.rb
 - spec/tokens_spec.rb

data/Gemfile.lock

@@ -1,102 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    abstract (1.0.0)
-    actionmailer (3.0.0)
-      actionpack (= 3.0.0)
-      mail (~> 2.2.5)
-    actionpack (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.4.1)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.12)
-      rack-test (~> 0.5.4)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.0)
-      activesupport (= 3.0.0)
-      builder (~> 2.1.2)
-      i18n (~> 0.4.1)
-    activerecord (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
-      arel (~> 1.0.0)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
-    activesupport (3.0.0)
-    archive-tar-minitar (0.5.2)
-    arel (1.0.1)
-      activesupport (~> 3.0.0)
-    builder (2.1.2)
-    columnize (0.3.1)
-    diff-lcs (1.1.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    i18n (0.4.1)
-    linecache19 (0.5.11)
-      ruby_core_source (>= 0.1.4)
-    mail (2.2.6.1)
-      activesupport (>= 2.3.6)
-      mime-types
-      treetop (>= 1.4.5)
-    mime-types (1.16)
-    polyglot (0.3.1)
-    rack (1.2.1)
-    rack-mount (0.6.13)
-      rack (>= 1.0.0)
-    rack-test (0.5.6)
-      rack (>= 1.0)
-    rails (3.0.0)
-      actionmailer (= 3.0.0)
-      actionpack (= 3.0.0)
-      activerecord (= 3.0.0)
-      activeresource (= 3.0.0)
-      activesupport (= 3.0.0)
-      bundler (~> 1.0.0)
-      railties (= 3.0.0)
-    railties (3.0.0)
-      actionpack (= 3.0.0)
-      activesupport (= 3.0.0)
-      rake (>= 0.8.4)
-      thor (~> 0.14.0)
-    rake (0.8.7)
-    rspec (2.0.0.rc)
-      rspec-core (= 2.0.0.rc)
-      rspec-expectations (= 2.0.0.rc)
-      rspec-mocks (= 2.0.0.rc)
-    rspec-core (2.0.0.rc)
-    rspec-expectations (2.0.0.rc)
-      diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0.rc)
-      rspec-core (= 2.0.0.rc)
-      rspec-expectations (= 2.0.0.rc)
-    rspec-rails (2.0.0.rc)
-      rspec (= 2.0.0.rc)
-    ruby-debug-base19 (0.11.24)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby_core_source (>= 0.1.4)
-    ruby-debug19 (0.11.6)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby-debug-base19 (>= 0.11.19)
-    ruby_core_source (0.1.4)
-      archive-tar-minitar (>= 0.5.2)
-    sqlite3-ruby (1.3.1)
-    thor (0.14.3)
-    treetop (1.4.8)
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.23)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  rails (= 3.0.0)
-  rspec-rails (= 2.0.0.rc)
-  ruby-debug19
-  sqlite3-ruby