wristband 2.1.1 → 2.3.0

data/Gemfile

@@ -1,6 +1,7 @@
 source 'http://rubygems.org'
 
 gem 'rails', '>=3.1.0'
+gem 'bcrypt-ruby', :require => 'bcrypt'
 
 group :development, :test do
   gem 'sqlite3'

data/Gemfile.lock

@@ -93,6 +93,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  bcrypt-ruby
   faker
   jeweler
   rails (>= 3.1.0)

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2010-2011 Jack Neto, Scott Tadman, The Working Group Inc
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,40 +1,49 @@
 # Wristband
-Author: [The Working Group](http://www.theworkinggroup.ca)
 
----
-
-## What is it?
+A lightweight solution for two major pains: **User authentication** and **Permissions**.
 
-Wristband provides a starting point for user authentication.
-
-It handles:
+Summary:
 
 * Login and logout
-* Password storage with encryption
+* Password storage with bcrypt
 * Password recovery
-* Remember me functionality
+* Remember me
 * Authority definitions
+* Convert from old MD5 passwords
+* Extra : easy to use sample models and controlers to get you started!
+
+---
   
-  
-## Usage
+## Quick start
 
 ### 1. Add gem definition to your Gemfile:
     
     config.gem 'wristband'
     
-### 2. From withing your Rails project run:
+### 2. From within your Rails project run:
     
     bundle install
 
-## Configuration
-
 
-### In your User model
+### 3. In your User model
 
     class User < ActiveRecord::Base
-      wristband [options]
+      wristband
     end
 
+### 4. Run the generator for the sample models and controllers
+
+    rails g wristband
+
+### 4. Run the migrations
+
+    rake db:migrate
+
+
+---
+
+## Configuration
+
 ### Options:
 
 **:login_with** - Array of fields you want to authenticate the user with. *Default: `:email`*
@@ -55,7 +64,7 @@ It handles:
   
     wristband :roles => [:regular_user, :admin]
   
-  will generate `user.is_regular_user?` and `user.is_admin?`
+This will give you `user.is_regular_user?` and `user.is_admin?`
 
 
 **:has_authorities** - The different user authorities are defined in a separate class so as to reduce clutter in the User model itself. *Default: `false`*
@@ -64,14 +73,21 @@ It handles:
 
 Look for more details below.
 
-## Notes
+**:legacy_password** - Helps you convert from old legacy passwords to proper encryption passwords. *Default: `[]`*
+
+Indicate the name of the column with the old passwords and the encryption type.
+
+    wristband :legacy_password => {:column_name => :old_password, :encryption => :md5}
+
 
-1. **Remember me** - If you want to automatically login a user when he comes back to your site, add `before_filter :login_from_cookie` to your AplicationController.
-2. **Authority Definitions** - Checkout the documentation on wristband/authority_check_rb
+**:encryption_type** - Allows you to use the less secure SHA1 instead of BCRYPT for backwards compatibility. *Default: `:bcrypt`*
 
+    wristband :encryption_type => :sha1
 
 
-## Personalization
+---
+
+## Generators
   
 Wristband comes with a generator that provides you with all the files you need to get started
 
@@ -87,14 +103,14 @@ This will output something like:
     create  app/controllers/sessions_controller.rb
     create  app/controllers/passwords_controller.rb
     == Views ==
-    create  app/views/users/show.html.haml
-    create  app/views/sessions/new.html.haml
-    create  app/views/passwords/new.html.haml
-    create  app/views/passwords/edit.html.haml
+    create  app/views/users/show.html.erb
+    create  app/views/sessions/new.html.erb
+    create  app/views/passwords/new.html.erb
+    create  app/views/passwords/edit.html.erb
     == User Mailer ==
     create  app/mailers/user_mailer.rb
-    create  app/views/user_mailer/password_reset.html.haml
-    create  app/views/user_mailer/password_reset.text.haml
+    create  app/views/user_mailer/password_reset.html.erb
+    create  app/views/user_mailer/password_reset.text.erb
     == Test helper and Dummies ==
     create  test/test_helper.rb
     create  test/dummy/user.rb
@@ -114,7 +130,7 @@ The basic columns are defined as such:
 
     create_table :users do |t|
       t.string :email
-      t.string :password_hash, :limit => 40
+      t.string :encrypted_password, :limit => 40
       t.string :password_salt,  :limit => 40
       t.string :perishable_token
       t.string :remember_token
@@ -123,6 +139,7 @@ The basic columns are defined as such:
     end
 
 
+---
 # AuthorityCheck
 
 First you need to tell Wristband that you you want to define permissions for your user:
@@ -193,4 +210,10 @@ example:
   
 In this case, the 'allow_if_admin!` method will be called before any checks are performed. If the `allow!` method is executed, all subsequent tests are halted and the check is considered to have passed.
 
-Have fun!!
+Have fun!!
+
+--- 
+
+Wristband is released under the MIT license
+
+Copyright 2009-2011 Jack Neto, Scott Tadman, [The Working Group](http://www.theworkinggroup.ca)

data/VERSION

@@ -1 +1 @@
-2.1.1
+2.3.0

data/app/controllers/application_controller.rb

@@ -1,4 +1,13 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
 
+  before_filter :login_from_cookie
+  before_filter :login_required
+
+protected
+
+  def login_required
+    redirect_to login_path unless logged_in?
+  end
+
 end

data/app/controllers/passwords_controller.rb

@@ -1,4 +1,5 @@
 class PasswordsController < ApplicationController
+  skip_before_filter :login_required
   before_filter :redirect_if_logged_in, :only => [ :new, :create ]
   before_filter :load_user_by_perishable_token, :only => [:edit, :update]
   

data/app/controllers/sessions_controller.rb

@@ -1,5 +1,5 @@
 class SessionsController < ApplicationController
-  before_filter :login_required,  :only => :destroy
+  skip_before_filter :login_required,  :except => :destroy
   before_filter :redirect_if_logged_in, :only => [ :new, :create ]
   before_filter :build_user_session,  :only => [ :new, :create ]
   
@@ -26,8 +26,4 @@ protected
   def redirect_if_logged_in
     redirect_to user_path(current_user) if logged_in?
   end
-  
-  def login_required
-    redirect_to login_path unless logged_in?
-  end
 end

data/app/controllers/users_controller.rb

@@ -1,9 +1,3 @@
 class UsersController < ApplicationController
-  before_filter :login_required
-  
-protected
-  def login_required
-    redirect_to login_path unless logged_in?
-  end
 
 end

data/app/models/user.rb

@@ -14,7 +14,7 @@ class User < ActiveRecord::Base
     :presence => {:message => 'Please enter your email address'},
     :length => {
       :within => 6..100,
-      :too_short => "The email address you entered is to short"
+      :too_short => "The email address you entered is too short"
     },
     :format => {
       :with => /^([\w.%-+]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i, 

data/db/migrate/01_create_users_table.rb

@@ -2,10 +2,10 @@ class CreateUsersTable < ActiveRecord::Migration
   def self.up
     create_table :users do |t|
       t.string :email
-      t.string :password_hash, :limit => 40
-      t.string :password_salt,  :limit => 40
+      t.string :encrypted_password
+      t.string :password_salt
+      t.string :session_token
       t.string :perishable_token
-      t.string :remember_token
       t.string :role
       t.timestamps
       # --- Other useful fields ---
@@ -19,7 +19,7 @@ class CreateUsersTable < ActiveRecord::Migration
     end
     add_index :users, :email
     add_index :users, :perishable_token
-    add_index :users, :remember_token
+    add_index :users, :session_token
   end
   
   def self.down

data/lib/generators/wristband/wristband_generator.rb

@@ -11,6 +11,7 @@ class WristbandGenerator < Rails::Generators::Base
 
   def generate_controllers
     puts "\t== Controllers =="
+    copy_file 'app/controllers/application_controller.rb', 'app/controllers/application_controller.rb'
     copy_file 'app/controllers/users_controller.rb', 'app/controllers/users_controller.rb'
     copy_file 'app/controllers/sessions_controller.rb', 'app/controllers/sessions_controller.rb'
     copy_file 'app/controllers/passwords_controller.rb', 'app/controllers/passwords_controller.rb'
@@ -18,17 +19,17 @@ class WristbandGenerator < Rails::Generators::Base
 
   def generate_views
     puts "\t== Views =="
-    copy_file 'app/views/users/show.html.haml', 'app/views/users/show.html.haml'
-    copy_file 'app/views/sessions/new.html.haml', 'app/views/sessions/new.html.haml'
-    copy_file 'app/views/passwords/new.html.haml', 'app/views/passwords/new.html.haml'
-    copy_file 'app/views/passwords/edit.html.haml', 'app/views/passwords/edit.html.haml'
+    copy_file 'app/views/users/show.html.erb', 'app/views/users/show.html.erb'
+    copy_file 'app/views/sessions/new.html.erb', 'app/views/sessions/new.html.erb'
+    copy_file 'app/views/passwords/new.html.erb', 'app/views/passwords/new.html.erb'
+    copy_file 'app/views/passwords/edit.html.erb', 'app/views/passwords/edit.html.erb'
   end
   
   def generate_user_mailer
     puts "\t== User Mailer =="
     copy_file 'app/mailers/user_mailer.rb', 'app/mailers/user_mailer.rb'
-    copy_file'app/views/user_mailer/password_reset.html.haml', 'app/views/user_mailer/password_reset.html.haml'
-    copy_file 'app/views/user_mailer/password_reset.text.haml', 'app/views/user_mailer/password_reset.text.haml'
+    copy_file'app/views/user_mailer/password_reset.html.erb', 'app/views/user_mailer/password_reset.html.erb'
+    copy_file 'app/views/user_mailer/password_reset.text.erb', 'app/views/user_mailer/password_reset.text.erb'
   end
 
   def generate_tests

data/lib/wristband/application_extensions.rb

@@ -18,15 +18,15 @@ module Wristband
       def login_as_user(user, remember_me=false, cookie_expires_at = 2.weeks.from_now.utc)
         self.current_user = user
         if remember_me
-          token = Support.encrypt_with_salt(user.id.to_s, Time.now.to_f.to_s)
+          token = Support.encrypt_with_salt(user.id.to_s, Wristband::Support.random_salt, ::User.wristband[:encryption_type])
           cookies[:login_token] = { :value => token, :expires => cookie_expires_at}
-          user.update_attribute(:remember_token, token)
+          user.update_attribute(:session_token, token)
         end
       end
   
-      # Logs a user out and deletes the remember_token.
+      # Logs a user out and deletes the session_token.
       def logout
-        current_user.update_attribute(:remember_token, nil) if current_user
+        current_user.update_attribute(:session_token, nil) if current_user
         self.current_user = nil
         cookies.delete(:login_token)    
         reset_session
@@ -53,7 +53,7 @@ module Wristband
       # You can use this function as a before filter on your controllers.
       def login_from_cookie
         return if (logged_in? or !cookies[:login_token])
-        self.current_user = ::User.find_by_remember_token(cookies[:login_token])
+        self.current_user = ::User.where(:session_token => cookies[:login_token]).first
       end
     
       # You can use this function as a before filter on your controllers that require autentication.

data/lib/wristband/engine.rb

@@ -0,0 +1,5 @@
+module Wristband
+  class Engine < ::Rails::Engine
+    # ...
+  end
+end

data/lib/wristband/support.rb

@@ -1,3 +1,5 @@
+require 'bcrypt'
+
 module Wristband
   module Support
     CONSONANTS = %w( b c d f g h j k l m n p qu r s t v w x z ch cr fr nd ng nk nt ph pr rd sh sl sp st th tr )
@@ -10,19 +12,38 @@ module Wristband
     end
     module_function :random_string
   
-    def encrypt_with_salt(password, salt)
+    def encrypt_with_salt(password, salt, encryption_type = :bcrypt)
       return password unless (salt and !salt.empty?)
-    
-      Digest::SHA1.hexdigest([ password, salt ].join)
+
+      case encryption_type
+      when :bcrypt
+        BCrypt::Engine.hash_secret([password, salt].join, salt)
+      when :sha1
+        Digest::SHA1.hexdigest([ password, salt ].join)
+      end
     end
     module_function :encrypt_with_salt
   
-    def random_salt(length = nil)
-      salt = Digest::SHA1.hexdigest([ rand, rand, random_string(64), rand, rand ].join)
+    def random_salt(length = nil, encryption_type = :bcrypt)
+      salt = case encryption_type
+      when :bcrypt
+        BCrypt::Engine.generate_salt
+      when :sha1
+        Digest::SHA1.hexdigest([ rand, rand, random_string(64), rand, rand ].join)
+      end
     
       length ? salt[0, length] : salt
     end
     module_function :random_salt
   
+    def matches?(attempt, password, salt, encryption_type = :bcrypt)
+      case encryption_type
+      when :bcrypt
+        BCrypt::Password.new(password) == [attempt, salt].join
+      when :sha1
+        Digest::SHA1.hexdigest([ attempt, salt ].join) == password
+      end
+    end
+    module_function :matches?
   end
 end

data/lib/wristband/user_extensions.rb

@@ -11,7 +11,7 @@ module Wristband
         self.execute_authentication_chain(self, self.wristband[:before_authentication_chain]) == false and return
         user = nil
         wristband[:login_with_fields].find do |field|
-          user = send("find_by_#{field}", email) 
+          user = self.where(field => email).first
         end
         (user and user.password_match?(password)) || return
         self.execute_authentication_chain(user, self.wristband[:after_authentication_chain]) == false  and return
@@ -46,29 +46,29 @@ module Wristband
       end
 
       def initialize_salt
-        self.password_salt = Wristband::Support.random_salt
+        self.password_salt = Wristband::Support.random_salt(nil, self.class.wristband[:encryption_type])
       end
 
       def initialize_token
-        self.remember_token = Wristband::Support.random_salt(16)
+        self.session_token = Wristband::Support.random_salt(16, self.class.wristband[:encryption_type])
       end
     
       def encrypt_password
-        initialize_salt if new_record?
         return if self.password.blank?
-        self.send("#{self.class.wristband[:password_column]}=", Wristband::Support.encrypt_with_salt(self.password, self.password_salt))
+        initialize_salt if new_record?
+        self.send("#{self.class.wristband[:password_column]}=", Wristband::Support.encrypt_with_salt(self.password, self.password_salt, self.class.wristband[:encryption_type]))
       end
     
-      # 231badb19b93e44f47da1bd64a8147f2
-      def password_match?(string)
-        if matches_legacy_password?(string)
-          self.password = string
+      def password_match?(password_attempt)
+        if matches_legacy_password?(password_attempt)
+          self.password = password_attempt
           initialize_salt
           encrypt_password
           self.send("#{self.class.wristband[:legacy_password][:column_name]}=", nil)
           self.save
         else
-          self.send(self.class.wristband[:password_column]) == Wristband::Support.encrypt_with_salt(string, self.password_salt)
+          current_pwd = self.send(self.class.wristband[:password_column])
+          Wristband::Support.matches?(password_attempt, current_pwd, self.password_salt, self.class.wristband[:encryption_type])
         end
       end
       
@@ -83,15 +83,15 @@ module Wristband
         end
       end
     
-      def password_hash=(value)
-        if (value != read_attribute(:password_hash))
+      def encrypted_password=(value)
+        if (value != read_attribute(:encrypted_password))
           initialize_token
         end
-        write_attribute(:password_hash, value)
+        write_attribute(:encrypted_password, value)
       end
       
       def reset_perishable_token!
-        update_attribute(:perishable_token, Wristband::Support.random_salt.gsub(/[^A-Za-z0-9]/,''))
+        update_attribute(:perishable_token, Wristband::Support.random_salt(nil, self.class.wristband[:encryption_type]).gsub(/[^A-Za-z0-9]/,''))
       end
     end
   end

data/lib/wristband.rb

@@ -1,14 +1,16 @@
+if defined?(Rails)
+  require File.expand_path('wristband/engine', File.dirname(__FILE__))
+end
+
+
 require 'wristband/user_extensions'
 require 'wristband/support'
 require 'wristband/application_extensions'
 require 'wristband/authority_check'
+require 'active_record'
 
 module Wristband
-
-  VERSION = "1.0.5"
-
-  class Engine < ::Rails::Engine; end
-
+  
   class << self
     def included base #:nodoc:
       base.extend ClassMethods
@@ -23,18 +25,19 @@ module Wristband
       options[:has_authorities]       ||= false
       options[:roles]                 ||= []
       options[:legacy_password]       ||= {}
+      options[:encryption_type]       ||= :bcrypt
 
       class_eval do
         include Wristband::UserExtensions
         
-        options[:password_column] ||= :password_hash
+        options[:password_column] ||= :encrypted_password
         
         # These two are used on the login form
         attr_accessor :password
         attr_accessor :password_confirmation
         
         before_save :encrypt_password
-          
+        
         # Add roles
         unless options[:roles].blank?
           options[:roles].each do |role|
@@ -55,7 +58,8 @@ module Wristband
         :after_authentication_chain   => [options[:after_authentication]].flatten,
         :password_column              => options[:password_column],
         :roles                        => options[:roles],
-        :legacy_password              => options[:legacy_password]
+        :legacy_password              => options[:legacy_password],
+        :encryption_type              => options[:encryption_type]
       }
       
       if options[:has_authorities]
@@ -81,6 +85,8 @@ module Wristband
   
 end
 
-
 ActiveRecord::Base.send(:extend, Wristband::ClassMethods)
-ActionController::Base.send(:include, Wristband::ApplicationExtensions)
+
+if defined?(ActionController)
+  ActionController::Base.send(:include, Wristband::ApplicationExtensions)
+end

data/test/functional/sessions_controller_test.rb

@@ -77,7 +77,7 @@ class SessionsControllerTest < ActionController::TestCase
     assert_nil cookies[:login_token]
     assert_nil session[:user_id]
     @regular_user.reload
-    assert_nil @regular_user.remember_token
+    assert_nil @regular_user.session_token
     assert !@controller.logged_in?
     assert_nil @controller.current_user
   end
@@ -87,8 +87,8 @@ class SessionsControllerTest < ActionController::TestCase
   def test_remember_me
     post :create, :session_user => { :email => @regular_user.email, :password => @regular_user.password , :remember_me => '1' }
     assert_equal request.session[:user_id], @regular_user.id
-    assert_not_nil assigns(:session_user).user.remember_token
-    assert_equal assigns(:session_user).user.remember_token, cookies['login_token']
+    assert_not_nil assigns(:session_user).user.session_token
+    assert_not_nil cookies['login_token']
   end
   
 end

data/test/test_helper.rb

@@ -62,7 +62,7 @@ class ActiveSupport::TestCase
     end
 
     session[:user_id] = user.id
-    token = Wristband::Support.encrypt_with_salt(user.id.to_s, Time.now.to_f.to_s)
+    token = Wristband::Support.encrypt_with_salt(user.id.to_s, Wristband::Support.random_salt)
     cookies[:login_token] = {
       :value => token,
       :expires => 2.weeks.from_now.utc

data/test/unit/has_authorities_test.rb

@@ -32,7 +32,7 @@ class NewUser
   extend Wristband::ClassMethods
   
   attr_accessor :email
-  attr_accessor :password_hash
+  attr_accessor :encrypted_password
   attr_accessor :password_salt
   attr_accessor :role
 
@@ -41,7 +41,7 @@ class NewUser
   def initialize(params = {})
     if params
       @email = params[:email]
-      @password_hash = params[:password_hash]
+      @encrypted_password = params[:encrypted_password]
       @password_salt = params[:password_salt]
       @role = params[:role]
     end

data/test/unit/session_user_test.rb

@@ -31,9 +31,9 @@ class SessionUserTest < ActiveSupport::TestCase
       :password => user.password
     )
     assert session_user.valid?
-    assert_equal session_user.email, user.email
-    assert_equal session_user.password, user.password
-    assert_equal session_user.user, user
+    assert_equal user.email, session_user.email
+    assert_equal user.password, session_user.password
+    assert_equal user, session_user.user
   end
   
   def test_failed_authentication

data/test/unit/user_test.rb

@@ -19,7 +19,7 @@ class UserTest < ActiveSupport::TestCase
     assert_errors_on user, :email, :password, :role
     assert user.errors[:email].include?("Please enter your email address")
     assert user.errors[:email].include?("The email address you entered is not valid")
-    assert user.errors[:email].include?("The email address you entered is to short")
+    assert user.errors[:email].include?("The email address you entered is too short")
     assert user.errors[:password].include?("Please choose a password")
     assert user.errors[:password].include?("The password you entered is too short (minimum is 4 characters)")
     assert user.errors[:role].include?("can't be blank")

data/test/unit/wristband_test.rb

@@ -10,9 +10,9 @@ class WristbandTest < ActiveSupport::TestCase
       initialize_salt
       initialize_token
       encrypt_password
+      encrypted_password=
       password_match?
       matches_legacy_password?
-      password_hash=
       is_admin?
       is_regular_user?
     }.each do |method|
@@ -45,9 +45,10 @@ class WristbandTest < ActiveSupport::TestCase
     assert_equal User.wristband[:login_with_fields], [:email]
     assert_equal User.wristband[:before_authentication_chain], []
     assert_equal User.wristband[:after_authentication_chain], []
-    assert_equal User.wristband[:password_column], :password_hash
+    assert_equal User.wristband[:password_column], :encrypted_password
     assert_equal User.wristband[:roles], ['admin', 'regular_user']
     assert_equal User.wristband[:legacy_password], {}
+    assert_equal User.wristband[:encryption_type], :bcrypt
   end
   
   def test_authentication_by_email

data/wristband.gemspec

@@ -5,20 +5,22 @@
 
 Gem::Specification.new do |s|
   s.name = %q{wristband}
-  s.version = "2.1.1"
+  s.version = "2.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jack Neto", "The Working Group Inc"]
-  s.date = %q{2011-09-29}
+  s.date = %q{2011-10-31}
   s.description = %q{Provides a starting point for user authentication}
   s.email = %q{jack@theworkinggroup.ca}
   s.extra_rdoc_files = [
+    "LICENSE",
     "README.md"
   ]
   s.files = [
     ".DS_Store",
     "Gemfile",
     "Gemfile.lock",
+    "LICENSE",
     "README.md",
     "Rakefile",
     "VERSION",
@@ -53,6 +55,7 @@ Gem::Specification.new do |s|
     "lib/wristband.rb",
     "lib/wristband/application_extensions.rb",
     "lib/wristband/authority_check.rb",
+    "lib/wristband/engine.rb",
     "lib/wristband/support.rb",
     "lib/wristband/user_extensions.rb",
     "public/robots.txt",
@@ -78,17 +81,20 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rails>, [">= 3.1.0"])
+      s.add_runtime_dependency(%q<bcrypt-ruby>, [">= 0"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_runtime_dependency(%q<rails>, [">= 3.1.0"])
     else
       s.add_dependency(%q<rails>, [">= 3.1.0"])
+      s.add_dependency(%q<bcrypt-ruby>, [">= 0"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<rails>, [">= 3.1.0"])
     end
   else
     s.add_dependency(%q<rails>, [">= 3.1.0"])
+    s.add_dependency(%q<bcrypt-ruby>, [">= 0"])
     s.add_dependency(%q<sqlite3>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<rails>, [">= 3.1.0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wristband
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,12 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-29 00:00:00.000000000 -04:00
+date: 2011-10-31 00:00:00.000000000 -04:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2160747880 !ruby/object:Gem::Requirement
+  requirement: &2159686220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,21 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2160747880
+  version_requirements: *2159686220
+- !ruby/object:Gem::Dependency
+  name: bcrypt-ruby
+  requirement: &2159684840 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2159684840
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2160744800 !ruby/object:Gem::Requirement
+  requirement: &2159684020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +45,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160744800
+  version_requirements: *2159684020
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2160725280 !ruby/object:Gem::Requirement
+  requirement: &2159683300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +56,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160725280
+  version_requirements: *2159683300
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2160723000 !ruby/object:Gem::Requirement
+  requirement: &2159682800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,17 +67,19 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2160723000
+  version_requirements: *2159682800
 description: Provides a starting point for user authentication
 email: jack@theworkinggroup.ca
 executables: []
 extensions: []
 extra_rdoc_files:
+- LICENSE
 - README.md
 files:
 - .DS_Store
 - Gemfile
 - Gemfile.lock
+- LICENSE
 - README.md
 - Rakefile
 - VERSION
@@ -101,6 +114,7 @@ files:
 - lib/wristband.rb
 - lib/wristband/application_extensions.rb
 - lib/wristband/authority_check.rb
+- lib/wristband/engine.rb
 - lib/wristband/support.rb
 - lib/wristband/user_extensions.rb
 - public/robots.txt
@@ -130,7 +144,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -138399135928241561
+      hash: 2613277751533457790
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: