wristband 1.0.2 → 1.0.4

data/Gemfile

@@ -1,8 +1,8 @@
 source 'http://rubygems.org'
 
-gem 'rails', '3.0.3'
-gem 'haml', '3.0.25'
-gem 'formatted_form', '1.0.0'
+gem 'rails', '>=3.0.4'
+gem 'haml', '>=3.0.25'
+gem 'formatted_form'
 
 group :development, :test do
   gem 'sqlite3'

data/Gemfile.lock

@@ -2,37 +2,37 @@ GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.3)
-      actionpack (= 3.0.3)
-      mail (~> 2.2.9)
-    actionpack (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
+    actionmailer (3.0.4)
+      actionpack (= 3.0.4)
+      mail (~> 2.2.15)
+    actionpack (3.0.4)
+      activemodel (= 3.0.4)
+      activesupport (= 3.0.4)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
       i18n (~> 0.4)
       rack (~> 1.2.1)
       rack-mount (~> 0.6.13)
-      rack-test (~> 0.5.6)
+      rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.3)
-      activesupport (= 3.0.3)
+    activemodel (3.0.4)
+      activesupport (= 3.0.4)
       builder (~> 2.1.2)
       i18n (~> 0.4)
-    activerecord (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
+    activerecord (3.0.4)
+      activemodel (= 3.0.4)
+      activesupport (= 3.0.4)
       arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-    activesupport (3.0.3)
-    arel (2.0.7)
+    activeresource (3.0.4)
+      activemodel (= 3.0.4)
+      activesupport (= 3.0.4)
+    activesupport (3.0.4)
+    arel (2.0.8)
     builder (2.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    faker (0.9.4)
+    faker (0.9.5)
       i18n (~> 0.4)
     formatted_form (1.0.0)
     git (1.2.5)
@@ -42,7 +42,7 @@ GEM
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
-    mail (2.2.14)
+    mail (2.2.15)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -54,17 +54,17 @@ GEM
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.3)
-      actionmailer (= 3.0.3)
-      actionpack (= 3.0.3)
-      activerecord (= 3.0.3)
-      activeresource (= 3.0.3)
-      activesupport (= 3.0.3)
+    rails (3.0.4)
+      actionmailer (= 3.0.4)
+      actionpack (= 3.0.4)
+      activerecord (= 3.0.4)
+      activeresource (= 3.0.4)
+      activesupport (= 3.0.4)
       bundler (~> 1.0)
-      railties (= 3.0.3)
-    railties (3.0.3)
-      actionpack (= 3.0.3)
-      activesupport (= 3.0.3)
+      railties (= 3.0.4)
+    railties (3.0.4)
+      actionpack (= 3.0.4)
+      activesupport (= 3.0.4)
       rake (>= 0.8.7)
       thor (~> 0.14.4)
     rake (0.8.7)
@@ -80,9 +80,9 @@ PLATFORMS
 
 DEPENDENCIES
   faker
-  formatted_form (= 1.0.0)
-  haml (= 3.0.25)
+  formatted_form
+  haml (>= 3.0.25)
   jeweler
-  rails (= 3.0.3)
+  rails (>= 3.0.4)
   sqlite3
   test_dummy

data/Rakefile

@@ -12,7 +12,7 @@ begin
     gem.email       = 'jack@theworkinggroup.ca'
     gem.homepage    = 'http://github.com/twg/wristband'
     gem.authors     = ['Jack Neto', 'The Working Group Inc']
-    gem.add_dependency('rails', '>=3.0.3')
+    gem.add_dependency('rails', '>=3.0.4')
     gem.add_dependency('haml', '>=3.0.25')
     gem.add_dependency('formatted_form', '>=1.0.0')
   end

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.0.4

data/app/controllers/sessions_controller.rb

@@ -8,7 +8,7 @@ class SessionsController < ApplicationController
       login(@session_user)
       redirect_to(user_path(current_user), :notice => "Welcome, you are now logged in.")
     else
-      flash[:alert] = 'Login failed. Did you mistype?'
+      flash.now[:alert] = 'Login failed. Did you mistype?'
       render :action => :new
     end
   end

data/app/models/user.rb

@@ -20,12 +20,13 @@ class User < ActiveRecord::Base
       :with => /^([\w.%-+]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i, 
       :message => 'The email address you entered is not valid'
     },
-    :uniqueness => true
+    :uniqueness => {:message => 'This email has already been taken'}
     
   validates :password,
     :length => {
       :within => 4..40,
-      :too_short => "The password you entered is too short (minimum is 4 characters)"
+      :too_short => "The password you entered is too short (minimum is 4 characters)",
+      :if => :password_required?
     },
     :presence => { 
       :message => 'Please choose a password',

data/config/routes.rb

@@ -1,8 +1,10 @@
-Rails.application.routes.draw do
-  post '/login' => 'sessions#create'
-  get '/login' => 'sessions#new'
-  get '/logout' => 'sessions#destroy'
+if defined?(Wristband::Application)
+  Rails.application.routes.draw do
+    post  '/login' => 'sessions#create'
+    get   '/login' => 'sessions#new'
+    get   '/logout' => 'sessions#destroy'
 
-  resources :users  
-  resources :passwords, :only => [:new, :create, :edit, :update]
-end
+    resources :users  
+    resources :passwords, :only => [:new, :create, :edit, :update]
+  end
+end

data/wristband.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{wristband}
-  s.version = "1.0.2"
+  s.version = "1.0.4"
 
   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-01-25}
+  s.date = %q{2011-02-15}
   s.description = %q{Provides a starting point for user authentication}
   s.email = %q{jack@theworkinggroup.ca}
   s.extra_rdoc_files = [
@@ -92,31 +92,31 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rails>, ["= 3.0.3"])
-      s.add_runtime_dependency(%q<haml>, ["= 3.0.25"])
-      s.add_runtime_dependency(%q<formatted_form>, ["= 1.0.0"])
+      s.add_runtime_dependency(%q<rails>, [">= 3.0.4"])
+      s.add_runtime_dependency(%q<haml>, [">= 3.0.25"])
+      s.add_runtime_dependency(%q<formatted_form>, [">= 0"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_runtime_dependency(%q<rails>, [">= 3.0.3"])
+      s.add_runtime_dependency(%q<rails>, [">= 3.0.4"])
       s.add_runtime_dependency(%q<haml>, [">= 3.0.25"])
       s.add_runtime_dependency(%q<formatted_form>, [">= 1.0.0"])
     else
-      s.add_dependency(%q<rails>, ["= 3.0.3"])
-      s.add_dependency(%q<haml>, ["= 3.0.25"])
-      s.add_dependency(%q<formatted_form>, ["= 1.0.0"])
+      s.add_dependency(%q<rails>, [">= 3.0.4"])
+      s.add_dependency(%q<haml>, [">= 3.0.25"])
+      s.add_dependency(%q<formatted_form>, [">= 0"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<rails>, [">= 3.0.3"])
+      s.add_dependency(%q<rails>, [">= 3.0.4"])
       s.add_dependency(%q<haml>, [">= 3.0.25"])
       s.add_dependency(%q<formatted_form>, [">= 1.0.0"])
     end
   else
-    s.add_dependency(%q<rails>, ["= 3.0.3"])
-    s.add_dependency(%q<haml>, ["= 3.0.25"])
-    s.add_dependency(%q<formatted_form>, ["= 1.0.0"])
+    s.add_dependency(%q<rails>, [">= 3.0.4"])
+    s.add_dependency(%q<haml>, [">= 3.0.25"])
+    s.add_dependency(%q<formatted_form>, [">= 0"])
     s.add_dependency(%q<sqlite3>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<rails>, [">= 3.0.3"])
+    s.add_dependency(%q<rails>, [">= 3.0.4"])
     s.add_dependency(%q<haml>, [">= 3.0.25"])
     s.add_dependency(%q<formatted_form>, [">= 1.0.0"])
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 4
+  version: 1.0.4
 platform: ruby
 authors: 
 - Jack Neto
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-25 00:00:00 -05:00
+date: 2011-02-15 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,13 +23,13 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 3
         - 0
-        - 3
-        version: 3.0.3
+        - 4
+        version: 3.0.4
   type: :runtime
   prerelease: false
   version_requirements: *id001
@@ -38,7 +38,7 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 3
@@ -53,13 +53,11 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 1
         - 0
-        - 0
-        version: 1.0.0
+        version: "0"
   type: :runtime
   prerelease: false
   version_requirements: *id003
@@ -99,8 +97,8 @@ dependencies:
         segments: 
         - 3
         - 0
-        - 3
-        version: 3.0.3
+        - 4
+        version: 3.0.4
   type: :runtime
   prerelease: false
   version_requirements: *id006
@@ -211,7 +209,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1436971957664611674
+      hash: -600781172638808744
       segments: 
       - 0
       version: "0"