king_tokens 1.0.1 → 2.0.0

data/.gitignore

@@ -17,4 +17,7 @@ nbproject/*
 
 ## PROJECT::GENERAL
 rdoc
-pkg
+pkg
+Gemfile.lock
+vendor/
+coverage/

data/Gemfile

@@ -0,0 +1,3 @@
+source :rubygems
+
+gemspec

data/Rakefile

@@ -1,23 +1,8 @@
-require 'rubygems'
 require 'rake'
+require "bundler/gem_helper"
 require 'rake/testtask'
-require 'rake/rdoctask'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "king_tokens"
-    gem.summary = %Q{Access tokens for any active record object}
-    gem.description = %Q{Tokens are a usefull 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}
-    gem.email = "gl@salesking.eu"
-    gem.homepage = "http://github.com/schorsch/king_tokens"
-    gem.authors = ["Georg Leciejewski", "Michael Bumann"]
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
+require 'rdoc/task'
+Bundler::GemHelper.install_tasks
 
 desc 'Default: run unit tests.'
 task :default => :test

data/king_tokens.gemspec

@@ -1,59 +1,36 @@
-# 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 'king_tokens/version'
 
 Gem::Specification.new do |s|
   s.name = %q{king_tokens}
-  s.version = "1.0.1"
+  s.summary = %q{Access tokens for any active record object}
+  s.description = %q{Tokens are a usefull 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}
+  s.version = KingTokens::VERSION
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Georg Leciejewski", "Michael Bumann"]
   s.date = %q{2010-05-04}
-  s.description = %q{Tokens are a usefull 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}
   s.email = %q{gl@salesking.eu}
-  s.extra_rdoc_files = [
-    "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "MIT-LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "coverage/index.html",
-     "coverage/lib-token_code_rb.html",
-     "coverage/lib-tokenizer_rb.html",
-     "init.rb",
-     "king_tokens.gemspec",
-     "lib/king_tokens.rb",
-     "lib/king_tokens/token_code.rb",
-     "lib/king_tokens/tokenizer.rb",
-     "tasks/tokenizer_tasks.rake",
-     "test/schema.rb",
-     "test/test_helper.rb",
-     "test/tokenizer_test.rb"
-  ]
   s.homepage = %q{http://github.com/schorsch/king_tokens}
-  s.rdoc_options = ["--charset=UTF-8"]
+
+  s.extra_rdoc_files = ["README.rdoc"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{Access tokens for any active record object}
-  s.test_files = [
-    "test/schema.rb",
-     "test/test_helper.rb",
-     "test/tokenizer_test.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-    else
-    end
-  else
-  end
+
+  s.rubygems_version = %q{1.6.2}
+
+  s.executables   = nil
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+
+  s.require_paths = ["lib"]
+
+  s.add_development_dependency 'test-unit'
+  s.add_development_dependency 'activerecord'
+  s.add_development_dependency 'activesupport'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rdoc'
+  s.add_development_dependency 'sqlite3'
+
 end
 

data/lib/king_tokens/token_code.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "digest/sha1"
 
 # Class to handle polymorphic tokens
@@ -5,11 +6,11 @@ class TokenCode < ActiveRecord::Base
 
   belongs_to :object, :polymorphic => true
   before_create :set_token
-  
+
   validates_presence_of :name
   validates_format_of :name, :with => /^[a-zA-Z0-9\_\-]+$/
   validates_uniqueness_of :name, :scope => [:object_id, :object_type] #second not really needed if uuid
-  
+
   def to_s
     self.token
   end
@@ -42,17 +43,17 @@ class TokenCode < ActiveRecord::Base
   def valid_for_use?
     valid? && !used? && !expired?
   end
-  
+
   # Delete all tokens which have been used
   def self.delete_used
     delete_all "used_at IS NOT NULL"
   end
-  
+
   # Delete all tokens which are expired
   def self.delete_expired
-    delete_all ["valid_until IS NOT NULL AND valid_until < ? ", Time.now] 
+    delete_all ["valid_until IS NOT NULL AND valid_until < ? ", Time.now]
   end
-  
+
   private
 
   # Generate a token with a default length of 12.
@@ -66,7 +67,7 @@ class TokenCode < ActiveRecord::Base
     end while !validity.call(token) if block_given?
     token
   end
-  
+
   def secure_digest(*args)
      Digest::SHA1.hexdigest(args.flatten.join('--'))
    end
@@ -74,5 +75,5 @@ class TokenCode < ActiveRecord::Base
   def set_token
     self.token = generate_token { |token| TokenCode.find_by_token(token).nil? }
   end
-  
+
 end

data/lib/king_tokens/tokenizer.rb

@@ -1,11 +1,12 @@
+# encoding: utf-8
 module KingTokens
   # Module which adds the token methods to the including class
   module Tokenizer
-    
+
     def self.included(base)
       base.extend(ClassMethods)
     end
-    
+
     module ClassMethods
 
      # Define what kind of tokens the class should have
@@ -15,11 +16,8 @@ module KingTokens
       options = tokens.extract_options!
       options[:tokens] = tokens
       options[:days_valid] ||= 5
-      options[:object_type] = ActiveRecord::Base.send(:class_name_of_active_record_descendant, self).to_s
-      
-      class_inheritable_accessor :can_has_tokens_options
-      self.can_has_tokens_options = options
-      
+      options[:object_type] = self.base_class.name.to_s
+
       has_many :token_codes, :as => :object, :dependent => :destroy
 
       extend KingTokens::Tokenizer::SingletonMethods
@@ -42,23 +40,19 @@ module KingTokens
         end
       end
      end
-     
+
     end
-   
+
     module SingletonMethods
 
       # Find a token.
       #
       # ==== Parameter
       # args<Hash{Symbol=>}>:: arguments passed to the conditions of the TokenCode.find method
-      # ==== Options (args)
-      # :object_type<String>:: the name of the object tpye, normally the class name of the related object
-      # 
       #
       # ==== Returns
       # Object:: the object to which the token belongs
       def find_token(args={})
-        args.merge!({:object_type => can_has_tokens_options[:object_type]})
         TokenCode.find(:first, :conditions => args)
       end
 
@@ -88,7 +82,7 @@ module KingTokens
         return token.object if token && token.valid_for_use?
       end
     end
-   
+
     module InstanceMethods
       # Create a token
       # ==== Parameter
@@ -104,7 +98,7 @@ module KingTokens
           self.token(name).destroy
         end
         args[:name] = "#{name}"
-        args[:valid_until] ||= (args.delete(:valid) || self.can_has_tokens_options[:days_valid].days).from_now
+        args[:valid_until] ||= ( args.delete(:valid) || 5.days ).from_now
         self.token_codes.create(args)
       end
 
@@ -114,8 +108,8 @@ module KingTokens
       def token(name)
         self.token_codes.find_by_name("#{name}")
       end
-      
+
     end
-    
+
   end #module
 end # namespace

data/lib/king_tokens/version.rb

@@ -0,0 +1,3 @@
+module KingTokens
+  VERSION= '2.0.0'
+end

data/test/schema.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 ActiveRecord::Schema.define(:version => 0) do
 
   create_table :token_codes do |t|
@@ -6,7 +7,7 @@ ActiveRecord::Schema.define(:version => 0) do
     t.datetime :used_at, :valid_until
     t.timestamps
   end
-  
+
   create_table :users do |t|
     t.string        :name
   end

data/test/test_helper.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'test/unit'
 require 'rubygems'
 require 'active_record'
@@ -9,7 +10,8 @@ require 'active_support/test_case'
 #require 'active_support/testing/assertions'
 #require ActiveSupport::TestCase
 require "#{File.dirname(__FILE__)}/../lib/king_tokens"
-
+Encoding.default_external = Encoding::UTF_8
+Encoding.default_internal = Encoding::UTF_8
 ActiveRecord::Base.establish_connection({
     'adapter' => 'sqlite3',
     'database' => ':memory:'

data/test/tokenizer_test.rb

@@ -1,5 +1,8 @@
+# encoding: utf-8
 require(File.join(File.dirname(__FILE__), 'test_helper'))
+require 'logger'
 
+ActiveRecord::Base.logger = Logger.new(STDERR)
 # TODO:
 # - make some nice mock objects!
 # - Tests still mixed for two classes
@@ -16,7 +19,7 @@ class TokenizerTest < Test::Unit::TestCase
       assert_respond_to User.new, m
     end
   end
-  
+
   def test_should_set_the_token_automatically
     user = User.create(:name=>"joe")
     assert_difference "TokenCode.count" do
@@ -30,7 +33,7 @@ class TokenizerTest < Test::Unit::TestCase
     assert_equal false, user.forgot_password_token?
     user.set_forgot_password_token
     assert user.forgot_password_token?
-    
+
   end
 
   def test_unique_name_in_polymorphic_scope
@@ -40,7 +43,7 @@ class TokenizerTest < Test::Unit::TestCase
       user.set_forgot_password_token
     end
   end
-  
+
   def test_same_token_should_be_deleted
     user = User.create(:name=>"joe")
     user.set_forgot_password_token
@@ -58,7 +61,7 @@ class TokenizerTest < Test::Unit::TestCase
     user.set_forgot_password_token
     assert_in_delta user.token(:forgot_password).valid_until.to_i, 5.days.from_now.to_i, 10
   end
-  
+
   def test_token_to_string
     user = User.create(:name=>"joe")
     user.set_forgot_password_token(:valid=>2.days)
@@ -70,7 +73,7 @@ class TokenizerTest < Test::Unit::TestCase
     user.set_forgot_password_token(:valid=>2.days)
     assert_in_delta user.token(:forgot_password).valid_until.to_i, 2.days.from_now.to_i,10
   end
-  
+
   def test_should_use_and_return_unavailable
     user = User.create(:name=>"joe")
     user.set_forgot_password_token
@@ -136,6 +139,6 @@ class TokenizerTest < Test::Unit::TestCase
     assert_equal user, User.find_by_valid_token(:forgot_password, token.token)
   end
   def test_should_not_leak_token_options
-    
+
   end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: king_tokens
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 15
+  prerelease: 
   segments: 
-  - 1
+  - 2
+  - 0
   - 0
-  - 1
-  version: 1.0.1
+  version: 2.0.0
 platform: ruby
 authors: 
 - Georg Leciejewski
@@ -15,10 +16,92 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-04 00:00:00 +02:00
-default_executable: 
-dependencies: []
-
+date: 2010-05-04 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: test-unit
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: activerecord
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rdoc
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: sqlite3
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
 description: Tokens are a usefull 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
 email: gl@salesking.eu
 executables: []
@@ -28,55 +111,52 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
-- .document
 - .gitignore
+- Gemfile
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
-- VERSION
-- coverage/index.html
-- coverage/lib-token_code_rb.html
-- coverage/lib-tokenizer_rb.html
-- init.rb
 - king_tokens.gemspec
 - lib/king_tokens.rb
 - lib/king_tokens/token_code.rb
 - lib/king_tokens/tokenizer.rb
+- lib/king_tokens/version.rb
 - tasks/tokenizer_tasks.rake
 - test/schema.rb
 - test/test_helper.rb
 - test/tokenizer_test.rb
-has_rdoc: true
 homepage: http://github.com/schorsch/king_tokens
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+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"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Access tokens for any active record object
-test_files: 
-- test/schema.rb
-- test/test_helper.rb
-- test/tokenizer_test.rb
+test_files: []
+

data/.document

@@ -1,3 +0,0 @@
-README.rdoc
-lib/**/*.rb
-LICENSE

data/VERSION

@@ -1 +0,0 @@
-1.0.1

data/coverage/index.html

@@ -1,112 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang='en' xml:lang='en' xmlns='http://www.w3.org/1999/xhtml'>
-  <head>
-    <title>
-      C0 code coverage information
-    </title>
-    <style type='text/css'>
-      body { background-color: rgb(240, 240, 245); }
-    </style>
-    <style type='text/css'>
-      span.cross-ref-title { font-size: 140%; } span.cross-ref a {
-      text-decoration: none; } span.cross-ref { background-color:#f3f7fa;
-      border: 1px dashed #333; margin: 1em; padding: 0.5em; overflow: hidden; }
-      a.crossref-toggle { text-decoration: none; } span.marked0 {
-      background-color: rgb(185, 210, 200); display: block; } span.marked1 {
-      background-color: rgb(190, 215, 205); display: block; } span.inferred0 {
-      background-color: rgb(175, 200, 200); display: block; } span.inferred1 {
-      background-color: rgb(180, 205, 205); display: block; } span.uncovered0 {
-      background-color: rgb(225, 110, 110); display: block; } span.uncovered1 {
-      background-color: rgb(235, 120, 120); display: block; } span.overview {
-      border-bottom: 8px solid black; } div.overview { border-bottom: 8px solid
-      black; } body { font-family: verdana, arial, helvetica; } div.footer {
-      font-size: 68%; margin-top: 1.5em; } h1, h2, h3, h4, h5, h6 {
-      margin-bottom: 0.5em; } h5 { margin-top: 0.5em; } .hidden { display: none;
-      } div.separator { height: 10px; } /* Commented out for better readability,
-      esp. on IE */ /* table tr td, table tr th { font-size: 68%; } td.value
-      table tr td { font-size: 11px; } */ table.percent_graph { height: 12px;
-      border: #808080 1px solid; empty-cells: show; } table.percent_graph
-      td.covered { height: 10px; background: #00f000; } table.percent_graph
-      td.uncovered { height: 10px; background: #e00000; } table.percent_graph
-      td.NA { height: 10px; background: #eaeaea; } table.report {
-      border-collapse: collapse; width: 100%; } table.report td.heading {
-      background: #dcecff; border: #d0d0d0 1px solid; font-weight: bold;
-      text-align: center; } table.report td.heading:hover { background: #c0ffc0;
-      } table.report td.text { border: #d0d0d0 1px solid; } table.report
-      td.value, table.report td.lines_total, table.report td.lines_code {
-      text-align: right; border: #d0d0d0 1px solid; } table.report tr.light {
-      background-color: rgb(240, 240, 245); } table.report tr.dark {
-      background-color: rgb(230, 230, 235); } 
-    </style>
-    <script type='text/javascript'>
-       // <![CDATA[ function toggleCode( id ) { if ( document.getElementById )
-      elem = document.getElementById( id ); else if ( document.all ) elem =
-      eval( "document.all." + id ); else return false; elemStyle = elem.style;
-      if ( elemStyle.display != "block" ) { elemStyle.display = "block" } else {
-      elemStyle.display = "none" } return true; } // Make cross-references
-      hidden by default document.writeln( "<style
-      type=\"text/css\">span.cross-ref { display: none }</style>" ) // ]]> 
-    </script>
-  </head>
-  <body>
-    <h3>
-      C0 code coverage information
-    </h3>
-    <p>
-      Generated on Sun Dec 07 02:06:42 +0100 2008 with 
-      <a href='http://eigenclass.org/hiki/rcov'>
-        rcov 0.8.1.2
-      </a>
-    </p>
-    <hr />
-    <table class='report'> <thead> <tr> <td class='heading'> Name </td> <td
-    class='heading'> Total lines </td> <td class='heading'> Lines of code </td>
-    <td class='heading'> Total coverage </td> <td class='heading'> Code coverage
-    </td> </tr> </thead> <tbody> <tr class='light'> <td> TOTAL </td> <td
-    class='lines_total'> <tt> 201 </tt> </td> <td class='lines_code'> <tt> 109
-    </tt> </td> <td> <table cellspacing='0' align='right' cellpadding='0'> <tr>
-    <td> <tt class='coverage_total'> 100.0% </tt> &nbsp; </td> <td> <table
-    class='percent_graph' cellspacing='0' width='100' cellpadding='0'> <tr> <td
-    class='covered' width='100' /> <td class='uncovered' width='0' /> </tr>
-    </table> </td> </tr> </table> </td> <td> <table cellspacing='0'
-    align='right' cellpadding='0'> <tr> <td> <tt class='coverage_code'> 100.0%
-    </tt> &nbsp; </td> <td> <table class='percent_graph' cellspacing='0'
-    width='100' cellpadding='0'> <tr> <td class='covered' width='100' /> <td
-    class='uncovered' width='0' /> </tr> </table> </td> </tr> </table> </td>
-    </tr> <tr class='dark'> <td> <a href='lib-token_code_rb.html'>
-    lib/token_code.rb </a> </td> <td class='lines_total'> <tt> 80 </tt> </td>
-    <td class='lines_code'> <tt> 46 </tt> </td> <td> <table cellspacing='0'
-    align='right' cellpadding='0'> <tr> <td> <tt class='coverage_total'> 100.0%
-    </tt> &nbsp; </td> <td> <table class='percent_graph' cellspacing='0'
-    width='100' cellpadding='0'> <tr> <td class='covered' width='100' /> <td
-    class='uncovered' width='0' /> </tr> </table> </td> </tr> </table> </td>
-    <td> <table cellspacing='0' align='right' cellpadding='0'> <tr> <td> <tt
-    class='coverage_code'> 100.0% </tt> &nbsp; </td> <td> <table
-    class='percent_graph' cellspacing='0' width='100' cellpadding='0'> <tr> <td
-    class='covered' width='100' /> <td class='uncovered' width='0' /> </tr>
-    </table> </td> </tr> </table> </td> </tr> <tr class='light'> <td> <a
-    href='lib-tokenizer_rb.html'> lib/tokenizer.rb </a> </td> <td
-    class='lines_total'> <tt> 121 </tt> </td> <td class='lines_code'> <tt> 63
-    </tt> </td> <td> <table cellspacing='0' align='right' cellpadding='0'> <tr>
-    <td> <tt class='coverage_total'> 100.0% </tt> &nbsp; </td> <td> <table
-    class='percent_graph' cellspacing='0' width='100' cellpadding='0'> <tr> <td
-    class='covered' width='100' /> <td class='uncovered' width='0' /> </tr>
-    </table> </td> </tr> </table> </td> <td> <table cellspacing='0'
-    align='right' cellpadding='0'> <tr> <td> <tt class='coverage_code'> 100.0%
-    </tt> &nbsp; </td> <td> <table class='percent_graph' cellspacing='0'
-    width='100' cellpadding='0'> <tr> <td class='covered' width='100' /> <td
-    class='uncovered' width='0' /> </tr> </table> </td> </tr> </table> </td>
-    </tr> </tbody> </table>
-    <hr />
-    <p> Generated using the <a href='http://eigenclass.org/hiki.rb?rcov'> rcov
-    code coverage analysis tool for Ruby </a> version 0.8.1.2. </p>
-    <p>
-      <a href='http://validator.w3.org/check/referer'>
-        <img src='http://www.w3.org/Icons/valid-xhtml11' height='31' alt='Valid XHTML 1.1!' width='88' />
-      </a>
-      <a href='http://jigsaw.w3.org/css-validator/check/referer'>
-        <img src='http://jigsaw.w3.org/css-validator/images/vcss' alt='Valid CSS!' style='border:0;width:88px;height:31px' />
-      </a>
-    </p>
-  </body>
-</html>