wristband 1.1.0 → 2.0.0

data/Gemfile

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

data/Gemfile.lock

@@ -1,88 +1,104 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    abstract (1.0.0)
-    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)
+    actionmailer (3.1.0)
+      actionpack (= 3.1.0)
+      mail (~> 2.3.0)
+    actionpack (3.1.0)
+      activemodel (= 3.1.0)
+      activesupport (= 3.1.0)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6)
+      rack (~> 1.3.2)
+      rack-cache (~> 1.0.3)
+      rack-mount (~> 0.8.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.0.0)
+    activemodel (3.1.0)
+      activesupport (= 3.1.0)
+      bcrypt-ruby (~> 3.0.0)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.0)
+      activemodel (= 3.1.0)
+      activesupport (= 3.1.0)
+      arel (~> 2.2.1)
+      tzinfo (~> 0.3.29)
+    activeresource (3.1.0)
+      activemodel (= 3.1.0)
+      activesupport (= 3.1.0)
+    activesupport (3.1.0)
+      multi_json (~> 1.0)
+    arel (2.2.1)
+    bcrypt-ruby (3.0.1)
+    builder (3.0.0)
+    erubis (2.7.0)
+    faker (1.0.0)
       i18n (~> 0.4)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.13)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.4)
-      activesupport (= 3.0.4)
-      builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activerecord (3.0.4)
-      activemodel (= 3.0.4)
-      activesupport (= 3.0.4)
-      arel (~> 2.0.2)
-      tzinfo (~> 0.3.23)
-    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.5)
-      i18n (~> 0.4)
-    formatted_form (1.0.0)
+    formatted_form (1.0.2)
     git (1.2.5)
-    haml (3.0.25)
-    i18n (0.5.0)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
+    haml (3.1.3)
+    hike (1.2.1)
+    i18n (0.6.0)
+    jeweler (1.6.4)
+      bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    mail (2.2.15)
-      activesupport (>= 2.3.6)
+    mail (2.3.0)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
-    polyglot (0.3.1)
-    rack (1.2.1)
-    rack-mount (0.6.13)
+    multi_json (1.0.3)
+    polyglot (0.3.2)
+    rack (1.3.3)
+    rack-cache (1.0.3)
+      rack (>= 0.4)
+    rack-mount (0.8.3)
       rack (>= 1.0.0)
-    rack-test (0.5.7)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.0.4)
-      actionmailer (= 3.0.4)
-      actionpack (= 3.0.4)
-      activerecord (= 3.0.4)
-      activeresource (= 3.0.4)
-      activesupport (= 3.0.4)
+    rails (3.1.0)
+      actionmailer (= 3.1.0)
+      actionpack (= 3.1.0)
+      activerecord (= 3.1.0)
+      activeresource (= 3.1.0)
+      activesupport (= 3.1.0)
       bundler (~> 1.0)
-      railties (= 3.0.4)
-    railties (3.0.4)
-      actionpack (= 3.0.4)
-      activesupport (= 3.0.4)
+      railties (= 3.1.0)
+    railties (3.1.0)
+      actionpack (= 3.1.0)
+      activesupport (= 3.1.0)
+      rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
-      thor (~> 0.14.4)
-    rake (0.8.7)
-    sqlite3 (1.3.3)
-    test_dummy (0.2.6)
+      rdoc (~> 3.4)
+      thor (~> 0.14.6)
+    rake (0.9.2)
+    rdoc (3.9.4)
+    sprockets (2.0.0)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (!= 1.3.0, ~> 1.1)
+    sqlite3 (1.3.4)
+    test_dummy (0.2.7)
     thor (0.14.6)
-    treetop (1.4.9)
+    tilt (1.3.3)
+    treetop (1.4.10)
+      polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.24)
+    tzinfo (0.3.29)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   faker
-  formatted_form
-  haml (>= 3.0.25)
+  formatted_form (>= 1.0.2)
+  haml (>= 3.1.3)
   jeweler
-  rails (>= 3.0.4)
+  rails (>= 3.1.0)
   sqlite3
   test_dummy

data/Rakefile

@@ -12,9 +12,9 @@ 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.4')
-    gem.add_dependency('haml', '>=3.0.25')
-    gem.add_dependency('formatted_form', '>=1.0.0')
+    gem.add_dependency('rails', '>=3.1.0')
+    gem.add_dependency('haml', '>=3.1.3')
+    gem.add_dependency('formatted_form', '>=1.0.2')
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-1.1.0
+2.0.0

data/config/boot.rb

@@ -1,13 +1,6 @@
 require 'rubygems'
 
 # Set up gems listed in the Gemfile.
-gemfile = File.expand_path('../../Gemfile', __FILE__)
-begin
-  ENV['BUNDLE_GEMFILE'] = gemfile
-  require 'bundler'
-  Bundler.setup
-rescue Bundler::GemNotFound => e
-  STDERR.puts e.message
-  STDERR.puts "Try running `bundle install`."
-  exit!
-end if File.exist?(gemfile)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+
+require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])

data/config/environments/development.rb

@@ -1,9 +1,9 @@
-Wristband::Application.configure do
+defined?(Wristband::Application) && Wristband::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
   # In the development environment your application's code is reloaded on
   # every request.  This slows down response time but is perfect for development
-  # since you don't have to restart the webserver when you make code changes.
+  # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
 
   # Log error messages when you accidentally call methods on nil.
@@ -11,7 +11,6 @@ Wristband::Application.configure do
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
-  config.action_view.debug_rjs             = true
   config.action_controller.perform_caching = false
 
   # Don't care if the mailer can't send
@@ -22,5 +21,10 @@ Wristband::Application.configure do
 
   # Only use best-standards-support built into browsers
   config.action_dispatch.best_standards_support = :builtin
-end
 
+  # Do not compress assets
+  config.assets.compress = false
+
+  # Expands the lines which load the assets
+  config.assets.debug = true
+end

data/config/environments/production.rb

@@ -1,7 +1,6 @@
-Wristband::Application.configure do
+defined?(Wristband::Application) && Wristband::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
-  # The production environment is meant for finished, "live" apps.
   # Code is not reloaded between requests
   config.cache_classes = true
 
@@ -9,14 +8,27 @@ Wristband::Application.configure do
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true
 
-  # Specifies the header that your server uses for sending files
-  config.action_dispatch.x_sendfile_header = "X-Sendfile"
+  # Disable Rails's static asset server (Apache or nginx will already do this)
+  config.serve_static_assets = false
+
+  # Compress JavaScripts and CSS
+  config.assets.compress = true
+
+  # Don't fallback to assets pipeline if a precompiled asset is missed
+  config.assets.compile = false
+
+  # Generate digests for assets URLs
+  config.assets.digest = true
 
-  # For nginx:
-  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect'
+  # Defaults to Rails.root.join("public/assets")
+  # config.assets.manifest = YOUR_PATH
 
-  # If you have no front-end server that supports something like X-Sendfile,
-  # just comment this out and Rails will serve the files
+  # Specifies the header that your server uses for sending files
+  # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
+
+  # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
+  # config.force_ssl = true
 
   # See everything in the log (default is :info)
   # config.log_level = :debug
@@ -27,13 +39,12 @@ Wristband::Application.configure do
   # Use a different cache store in production
   # config.cache_store = :mem_cache_store
 
-  # Disable Rails's static asset server
-  # In production, Apache or nginx will already do this
-  config.serve_static_assets = false
-
-  # Enable serving of images, stylesheets, and javascripts from an asset server
+  # Enable serving of images, stylesheets, and JavaScripts from an asset server
   # config.action_controller.asset_host = "http://assets.example.com"
 
+  # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
+  # config.assets.precompile += %w( search.js )
+
   # Disable delivery errors, bad email addresses will be ignored
   # config.action_mailer.raise_delivery_errors = false
 

data/config/environments/test.rb

@@ -1,4 +1,4 @@
-Wristband::Application.configure do
+defined?(Wristband::Application) && Wristband::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
   # The test environment is used exclusively to run your application's
@@ -7,7 +7,11 @@ Wristband::Application.configure do
   # and recreated between test runs.  Don't rely on the data there!
   config.cache_classes = true
 
-  # Log error messages when you accidentally call methods on nil.
+  # Configure static asset server for tests with Cache-Control for performance
+  config.serve_static_assets = true
+  config.static_cache_control = "public, max-age=3600"
+
+  # Log error messages when you accidentally call methods on nil
   config.whiny_nils = true
 
   # Show full error reports and disable caching
@@ -32,4 +36,7 @@ Wristband::Application.configure do
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
+
+  # Allow pass debug_assets=true as a query parameter to load pages with unpackaged assets
+  config.assets.allow_debugging = true
 end

data/config/routes.rb

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

data/test/unit/has_authorities_test.rb

@@ -26,19 +26,27 @@ class NewUserAuthorityCheck < AuthorityCheck
   
 end
 
-class NewUser < ActiveRecord::Base
-  def self.columns() @columns ||= []; end
-
-  def self.column(name, sql_type = nil, default = nil, null = true)
-    columns << ActiveRecord::ConnectionAdapters::Column.new(name.to_s, default, sql_type.to_s, null)
-  end
-
-  column :email
-  column :password_hash
-  column :password_salt
-  column :role
+class NewUser
+  include ActiveModel::Validations
+  include ActiveRecord::Callbacks
+  extend Wristband::ClassMethods
+  
+  attr_accessor :email
+  attr_accessor :password_hash
+  attr_accessor :password_salt
+  attr_accessor :role
 
   wristband :has_authorities => true
+  
+  def initialize(params = {})
+    if params
+      @email = params[:email]
+      @password_hash = params[:password_hash]
+      @password_salt = params[:password_salt]
+      @role = params[:role]
+    end
+  end
+  
 end
 
 

data/wristband.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{wristband}
-  s.version = "1.1.0"
+  s.version = "2.0.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-13}
+  s.date = %q{2011-09-25}
   s.description = %q{Provides a starting point for user authentication}
   s.email = %q{jack@theworkinggroup.ca}
   s.extra_rdoc_files = [
@@ -75,49 +75,38 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.6.2}
   s.summary = %q{An authentication engine}
-  s.test_files = [
-    "test/dummy/user.rb",
-    "test/functional/passwords_controller_test.rb",
-    "test/functional/sessions_controller_test.rb",
-    "test/test_helper.rb",
-    "test/unit/has_authorities_test.rb",
-    "test/unit/session_user_test.rb",
-    "test/unit/user_mailer_test.rb",
-    "test/unit/user_test.rb",
-    "test/unit/wristband_test.rb"
-  ]
 
   if s.respond_to? :specification_version then
     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.4"])
-      s.add_runtime_dependency(%q<haml>, [">= 3.0.25"])
-      s.add_runtime_dependency(%q<formatted_form>, [">= 0"])
+      s.add_runtime_dependency(%q<rails>, [">= 3.1.0"])
+      s.add_runtime_dependency(%q<haml>, [">= 3.1.3"])
+      s.add_runtime_dependency(%q<formatted_form>, [">= 1.0.2"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 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>, [">= 1.0.0"])
+      s.add_runtime_dependency(%q<rails>, [">= 3.1.0"])
+      s.add_runtime_dependency(%q<haml>, [">= 3.1.3"])
+      s.add_runtime_dependency(%q<formatted_form>, [">= 1.0.2"])
     else
-      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<rails>, [">= 3.1.0"])
+      s.add_dependency(%q<haml>, [">= 3.1.3"])
+      s.add_dependency(%q<formatted_form>, [">= 1.0.2"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
-      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"])
+      s.add_dependency(%q<rails>, [">= 3.1.0"])
+      s.add_dependency(%q<haml>, [">= 3.1.3"])
+      s.add_dependency(%q<formatted_form>, [">= 1.0.2"])
     end
   else
-    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<rails>, [">= 3.1.0"])
+    s.add_dependency(%q<haml>, [">= 3.1.3"])
+    s.add_dependency(%q<formatted_form>, [">= 1.0.2"])
     s.add_dependency(%q<sqlite3>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
-    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"])
+    s.add_dependency(%q<rails>, [">= 3.1.0"])
+    s.add_dependency(%q<haml>, [">= 3.1.3"])
+    s.add_dependency(%q<formatted_form>, [">= 1.0.2"])
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wristband
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,45 +10,45 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-13 00:00:00.000000000 -04:00
+date: 2011-09-25 00:00:00.000000000 -04:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2168802080 !ruby/object:Gem::Requirement
+  requirement: &2169255100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.4
+        version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2168802080
+  version_requirements: *2169255100
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &2168801260 !ruby/object:Gem::Requirement
+  requirement: &2169254620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.25
+        version: 3.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *2168801260
+  version_requirements: *2169254620
 - !ruby/object:Gem::Dependency
   name: formatted_form
-  requirement: &2168800540 !ruby/object:Gem::Requirement
+  requirement: &2169254140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *2168800540
+  version_requirements: *2169254140
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2168799800 !ruby/object:Gem::Requirement
+  requirement: &2169253660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168799800
+  version_requirements: *2169253660
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2168799280 !ruby/object:Gem::Requirement
+  requirement: &2169253180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,40 +67,40 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168799280
+  version_requirements: *2169253180
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2168798720 !ruby/object:Gem::Requirement
+  requirement: &2169252700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.4
+        version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2168798720
+  version_requirements: *2169252700
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &2168798060 !ruby/object:Gem::Requirement
+  requirement: &2169252220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.25
+        version: 3.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *2168798060
+  version_requirements: *2169252220
 - !ruby/object:Gem::Dependency
   name: formatted_form
-  requirement: &2168797340 !ruby/object:Gem::Requirement
+  requirement: &2169251740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *2168797340
+  version_requirements: *2169251740
 description: Provides a starting point for user authentication
 email: jack@theworkinggroup.ca
 executables: []
@@ -177,7 +177,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2843623027733758625
+      hash: 4047135453176872071
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -190,13 +190,4 @@ rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: An authentication engine
-test_files:
-- test/dummy/user.rb
-- test/functional/passwords_controller_test.rb
-- test/functional/sessions_controller_test.rb
-- test/test_helper.rb
-- test/unit/has_authorities_test.rb
-- test/unit/session_user_test.rb
-- test/unit/user_mailer_test.rb
-- test/unit/user_test.rb
-- test/unit/wristband_test.rb
+test_files: []