mini_auth 0.3.2 → 1.0.0.rc

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 1.0.0.rc1 (2012-11-26)
+* Extract RandomToken module from MiniAuth module.
+
 ## 0.3.2 (2012-11-08)
 * Don't protect all columns from mass assignment by default.
 

data/Gemfile

@@ -7,13 +7,13 @@ if rails_version == "edge"
 elsif rails_version && rails_version.strip != ""
   gem "rails", rails_version
 else
-  gem "rails", ">= 3.2.8"
+  gem "rails", ">= 3.2.9"
 end
 
 gem "bcrypt-ruby", "~> 3.0.1"
 
 group :test do
-  gem "rspec-rails", "~> 2.11.4"
+  gem "rspec-rails", "~> 2.12.0"
   gem "sqlite3", "~> 1.3.6"
   gem "database_cleaner", "~> 0.9.1"
 end

data/README.md

@@ -236,12 +236,12 @@ For more information about mass assignment security, please refer to the
 
 ### Random token
 
-`MiniAuth` module provides an easy way to generate a random token and verify it. 
+`MiniAuth::RandomToken` module provides an easy way to generate a random token and verify it.
 
 The class method `token` takes a list of names and defines "generate\_#{name}\_token" and "verify\_#{name}\_token" methods dynamically.
 
     class User < ActiveRecord::Base
-      include MiniAuth
+      include MiniAuth::RandomToken
       
       attr_accessible :name, :address, :phone
       token :auto_login, :mail_confirmation

data/lib/mini_auth/random_token.rb

@@ -0,0 +1,25 @@
+require "mini_auth/version"
+require "bcrypt"
+
+module MiniAuth
+  module RandomToken
+    extend ActiveSupport::Concern
+    module ClassMethods
+      def token(*names)
+        names.each do |name|
+          self.class_eval <<-METHOD, __FILE__, __LINE__ + 1
+            def generate_#{name}_token
+              send("#{name}_token=", SecureRandom.hex)
+            end
+          METHOD
+
+          self.class_eval <<-METHOD, __FILE__, __LINE__ + 1
+            def verify_#{name}_token(token)
+              token && token == self.send("#{name}_token")
+            end
+          METHOD
+        end
+      end
+    end
+  end
+end

data/lib/mini_auth/version.rb

@@ -1,3 +1,3 @@
 module MiniAuth
-  VERSION = "0.3.2"
+  VERSION = "1.0.0.rc"
 end

data/lib/mini_auth.rb

@@ -1,4 +1,5 @@
 require "mini_auth/version"
+require "mini_auth/random_token"
 require "bcrypt"
 
 module MiniAuth
@@ -64,22 +65,6 @@ module MiniAuth
   end
   
   module ClassMethods
-    def token(*names)
-      names.each do |name|
-        self.class_eval <<-METHOD, __FILE__, __LINE__ + 1
-          def generate_#{name}_token
-            send("#{name}_token=", SecureRandom.hex)
-          end
-        METHOD
-        
-        self.class_eval <<-METHOD, __FILE__, __LINE__ + 1
-          def verify_#{name}_token(token)
-            token && token == self.send("#{name}_token")
-          end
-        METHOD
-      end
-    end
-
     def attributes_protected_by_default
       super + [ 'password_digest', 'changing_password', 'setting_password' ]
     end

data/mini_auth.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency "rails", ">= 3.1.8"
   s.add_runtime_dependency "bcrypt-ruby", "~> 3.0.1"
-  s.add_development_dependency "rspec-rails", "~> 2.11.4"
+  s.add_development_dependency "rspec-rails", "~> 2.12.0"
   s.add_development_dependency "sqlite3", "~> 1.3.6"
   s.add_development_dependency "database_cleaner", "~> 0.9.1"
 end

data/spec/fake_app.rb

@@ -27,6 +27,11 @@ class CreateAllTables < ActiveRecord::Migration
       t.string :password_digest
       t.boolean :deleted
     end
+
+    create_table(:emails) do |t|
+      t.string :address
+      t.string :confirmation_token
+    end
   end
 end
 
@@ -38,8 +43,9 @@ migration.change
 # Models
 class User < ActiveRecord::Base
   include MiniAuth
+  include MiniAuth::RandomToken
   
-  token :auto_login, :mail_confirmation
+  token :auto_login
 end
 
 class Member < ActiveRecord::Base
@@ -51,3 +57,9 @@ class Administrator < ActiveRecord::Base
   include MiniAuth
   attr_protected :deleted
 end
+
+class Email < ActiveRecord::Base
+  include MiniAuth::RandomToken
+
+  token :confirmation
+end

data/spec/mini_auth/token_spec.rb

@@ -1,9 +1,8 @@
 require 'spec_helper'
 
-describe "MiniAuth.token" do
-  let(:user) do
-    User.create!(:name => 'alice')
-  end
+describe "MiniAuth::Token.token" do
+  let(:user) { User.create!(:name => 'alice') }
+  let(:email) { Email.create!(:address => 'alice@example.com') }
   
   it "should generate auto_login_token" do
     expect {
@@ -14,13 +13,13 @@ describe "MiniAuth.token" do
     user.auto_login_token.length.should == 32
   end
   
-  it "should generate mail_confirmation_token" do
+  it "should generate confirmation_token" do
     expect {
-      user.generate_mail_confirmation_token
-    }.to change { user.mail_confirmation_token }
+      email.generate_confirmation_token
+    }.to change { email.confirmation_token }
     
-    user.mail_confirmation_token.should_not be_nil
-    user.mail_confirmation_token.length.should == 32
+    email.confirmation_token.should_not be_nil
+    email.confirmation_token.length.should == 32
   end
   
   it "should verify auto_login_token" do

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: mini_auth
 version: !ruby/object:Gem::Version
-  version: 0.3.2
-  prerelease: 
+  version: 1.0.0.rc
+  prerelease: 6
 platform: ruby
 authors:
 - Tsutomu Kuroda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-08 00:00:00.000000000 Z
+date: 2012-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.11.4
+        version: 2.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.11.4
+        version: 2.12.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -105,6 +105,7 @@ files:
 - README.md
 - Rakefile
 - lib/mini_auth.rb
+- lib/mini_auth/random_token.rb
 - lib/mini_auth/version.rb
 - mini_auth.gemspec
 - spec/fake_app.rb
@@ -131,12 +132,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: mini_auth
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A minimal authentication module for Rails