wristband 2.0.0 → 2.1.0

data/Gemfile

@@ -1,8 +1,6 @@
 source 'http://rubygems.org'
 
 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

@@ -36,9 +36,7 @@ GEM
     erubis (2.7.0)
     faker (1.0.0)
       i18n (~> 0.4)
-    formatted_form (1.0.2)
     git (1.2.5)
-    haml (3.1.3)
     hike (1.2.1)
     i18n (0.6.0)
     jeweler (1.6.4)
@@ -96,8 +94,6 @@ PLATFORMS
 
 DEPENDENCIES
   faker
-  formatted_form (>= 1.0.2)
-  haml (>= 3.1.3)
   jeweler
   rails (>= 3.1.0)
   sqlite3

data/VERSION

@@ -1 +1 @@
-2.0.0
+2.1.0

data/app/views/passwords/edit.html.erb

@@ -0,0 +1,7 @@
+<h1>Enter a new Password</h1>
+
+<%= form_for @user, :url => { :action => :update, :id => params[:id] } do |form| %>
+  <%= form.password_field :password, :autocomplete => :off %>
+  <%= form.password_field :password_confirmation, :label => 'Password Confim' %>
+  <%= form.submit 'Update' %>
+<% end %>

data/app/views/passwords/new.html.erb

@@ -0,0 +1,7 @@
+<h1>Reset your password</h1>
+
+<%= form_tag passwords_path do %>
+  <label>Email</label>
+  <%= text_field_tag :email %>
+  <%= submit_tag 'Send Reset Password Email' %>
+<% end %> 

data/app/views/sessions/new.html.erb

@@ -0,0 +1,13 @@
+<h1>Login</h1>
+
+<%= form_for @session_user, :url => login_path do |f| %>
+  <label>email</label><%= f.text_field :email %>
+  <label>password</label><%= f.password_field :password %>
+  <label>remember_me</label><%= f.check_box :remember_me %>
+  <%= f.submit 'Log In' %>
+<% end %>
+
+<p>
+  Did you forget your password?
+  <%= link_to 'Recover it here.', new_password_path %>
+</p>

data/app/views/user_mailer/password_reset.html.erb

@@ -0,0 +1,5 @@
+<p>Hi</p>
+
+<p>A new password was requested for this email address. Please ignore this if you think this email is sent to you in error.</p>
+
+<p><%= link_to 'Reset your password', edit_password_url(:id => @user.perishable_token) %></p>

data/app/views/user_mailer/{password_reset.text.haml → password_reset.text.erb}

@@ -3,4 +3,4 @@ Hi,
 A new password was requested for this email address. Please ignore this if you think this email is sent to you in error.
 
 To reset your password please follow this link:
-= edit_password_url(:id => @user.perishable_token)
+<%= edit_password_url(:id => @user.perishable_token) %>

data/app/views/users/show.html.erb

@@ -0,0 +1 @@
+<h1><%= "Hi #{current_user.email}" %></h1>

data/wristband.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{wristband}
-  s.version = "2.0.0"
+  s.version = "2.1.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-25}
+  s.date = %q{2011-09-29}
   s.description = %q{Provides a starting point for user authentication}
   s.email = %q{jack@theworkinggroup.ca}
   s.extra_rdoc_files = [
@@ -26,17 +26,16 @@ Gem::Specification.new do |s|
     "app/controllers/passwords_controller.rb",
     "app/controllers/sessions_controller.rb",
     "app/controllers/users_controller.rb",
-    "app/helpers/form_helper.rb",
     "app/mailers/user_mailer.rb",
     "app/models/session_user.rb",
     "app/models/user.rb",
     "app/views/layouts/application.html.erb",
-    "app/views/passwords/edit.html.haml",
-    "app/views/passwords/new.html.haml",
-    "app/views/sessions/new.html.haml",
-    "app/views/user_mailer/password_reset.html.haml",
-    "app/views/user_mailer/password_reset.text.haml",
-    "app/views/users/show.html.haml",
+    "app/views/passwords/edit.html.erb",
+    "app/views/passwords/new.html.erb",
+    "app/views/sessions/new.html.erb",
+    "app/views/user_mailer/password_reset.html.erb",
+    "app/views/user_mailer/password_reset.text.erb",
+    "app/views/users/show.html.erb",
     "config.ru",
     "config/application.rb",
     "config/boot.rb",
@@ -45,12 +44,10 @@ Gem::Specification.new do |s|
     "config/environments/development.rb",
     "config/environments/production.rb",
     "config/environments/test.rb",
-    "config/initializers/formatted_form_builder.rb",
     "config/initializers/wristband.rb",
     "config/locales/en.yml",
     "config/routes.rb",
     "db/migrate/01_create_users_table.rb",
-    "db/schema.rb",
     "lib/generators/wristband/.DS_Store",
     "lib/generators/wristband/wristband_generator.rb",
     "lib/wristband.rb",
@@ -81,8 +78,6 @@ 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<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.1.0"])
@@ -90,8 +85,6 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<formatted_form>, [">= 1.0.2"])
     else
       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.1.0"])
@@ -100,8 +93,6 @@ Gem::Specification.new do |s|
     end
   else
     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.1.0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wristband
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,12 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-25 00:00:00.000000000 -04:00
+date: 2011-09-29 00:00:00.000000000 -04:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2169255100 !ruby/object:Gem::Requirement
+  requirement: &2153453920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,32 +23,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2169255100
-- !ruby/object:Gem::Dependency
-  name: haml
-  requirement: &2169254620 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.1.3
-  type: :runtime
-  prerelease: false
-  version_requirements: *2169254620
-- !ruby/object:Gem::Dependency
-  name: formatted_form
-  requirement: &2169254140 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.2
-  type: :runtime
-  prerelease: false
-  version_requirements: *2169254140
+  version_requirements: *2153453920
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2169253660 !ruby/object:Gem::Requirement
+  requirement: &2153452700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +34,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2169253660
+  version_requirements: *2153452700
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2169253180 !ruby/object:Gem::Requirement
+  requirement: &2153449360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +45,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2169253180
+  version_requirements: *2153449360
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2169252700 !ruby/object:Gem::Requirement
+  requirement: &2153446300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +56,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2169252700
+  version_requirements: *2153446300
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &2169252220 !ruby/object:Gem::Requirement
+  requirement: &2153432960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +67,10 @@ dependencies:
         version: 3.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *2169252220
+  version_requirements: *2153432960
 - !ruby/object:Gem::Dependency
   name: formatted_form
-  requirement: &2169251740 !ruby/object:Gem::Requirement
+  requirement: &2153430720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,7 +78,7 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *2169251740
+  version_requirements: *2153430720
 description: Provides a starting point for user authentication
 email: jack@theworkinggroup.ca
 executables: []
@@ -118,17 +96,16 @@ files:
 - app/controllers/passwords_controller.rb
 - app/controllers/sessions_controller.rb
 - app/controllers/users_controller.rb
-- app/helpers/form_helper.rb
 - app/mailers/user_mailer.rb
 - app/models/session_user.rb
 - app/models/user.rb
 - app/views/layouts/application.html.erb
-- app/views/passwords/edit.html.haml
-- app/views/passwords/new.html.haml
-- app/views/sessions/new.html.haml
-- app/views/user_mailer/password_reset.html.haml
-- app/views/user_mailer/password_reset.text.haml
-- app/views/users/show.html.haml
+- app/views/passwords/edit.html.erb
+- app/views/passwords/new.html.erb
+- app/views/sessions/new.html.erb
+- app/views/user_mailer/password_reset.html.erb
+- app/views/user_mailer/password_reset.text.erb
+- app/views/users/show.html.erb
 - config.ru
 - config/application.rb
 - config/boot.rb
@@ -137,12 +114,10 @@ files:
 - config/environments/development.rb
 - config/environments/production.rb
 - config/environments/test.rb
-- config/initializers/formatted_form_builder.rb
 - config/initializers/wristband.rb
 - config/locales/en.yml
 - config/routes.rb
 - db/migrate/01_create_users_table.rb
-- db/schema.rb
 - lib/generators/wristband/.DS_Store
 - lib/generators/wristband/wristband_generator.rb
 - lib/wristband.rb
@@ -177,7 +152,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4047135453176872071
+      hash: -1620791451856764861
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/app/helpers/form_helper.rb

@@ -1,8 +0,0 @@
-module FormHelper  
-  def formatted_form_for(record_or_name_or_array, *args, &proc)
-    options = args.extract_options!
-    options.merge!(:builder => FormattedFormBuilder)
-    (options[:html] ||= { }).merge!(:class => "#{options[:html][:class]} formatted")
-    form_for(record_or_name_or_array, *(args << options), &proc)
-  end
-end

data/app/views/passwords/edit.html.haml

@@ -1,7 +0,0 @@
-%h1 Enter a new Password
-
-= formatted_form_for @user, :url => { :action => :update, :id => params[:id] } do |form|
-  = form.error_messages
-  = form.password_field :password, :autocomplete => :off
-  = form.password_field :password_confirmation, :label => 'Password Confim'
-  = form.submit 'Update'

data/app/views/passwords/new.html.haml

@@ -1,15 +0,0 @@
-%h1 Reset your password
-
-= form_tag passwords_path, :class => 'formatted' do
-  .form_element.text_field_element
-    .label Email
-    .value= text_field_tag :email
-  
-  .form_element.submit_element
-    = submit_tag 'Send Reset Password Email'
-    
-    
-    
-%p
-  Already have an account?
-  = link_to 'Login', login_path

data/app/views/sessions/new.html.haml

@@ -1,11 +0,0 @@
-%h1 Login
-
-= formatted_form_for @session_user, :url => login_path do |f|
-  = f.text_field :email, :label => 'Email address'
-  = f.password_field :password
-  = f.check_box :remember_me, :label => 'Remember me when I come back'
-  = f.submit 'Log In'
-
-%p
-  Did you forget your password?
-  = link_to 'Recover it here.', new_password_path

data/app/views/user_mailer/password_reset.html.haml

@@ -1,7 +0,0 @@
-%p
-  Hi
-%p
-  A new password was requested for this email address. Please ignore this if you think this email is sent to you in error.
-
-%h2
-  = link_to 'Reset your password', edit_password_url(:id => @user.perishable_token)

data/app/views/users/show.html.haml

@@ -1,6 +0,0 @@
-%h1= "Hi #{current_user.email}"
-
-- if logged_in?
-  = link_to 'Logout', logout_path
-- else
-  = link_to 'Login', login_path

data/config/initializers/formatted_form_builder.rb

@@ -1,141 +0,0 @@
-class FormattedFormBuilder < ActionView::Helpers::FormBuilder
-  
-  %w[ date_select text_field password_field text_area file_field datetime_select ].each do |selector|
-    src = <<-end_src
-      def #{selector}(method, options = {})
-        if (options[:simple] == true)
-          super(method, options)
-        else
-          options.merge!(:size=> '') if #{%w{text_field password_field}.include?(selector)}
-          standard_field('#{selector}', method, options) { super(method, options) } 
-        end
-      end
-    end_src
-    class_eval src, __FILE__, __LINE__
-  end
-  
-  def standard_field(type, method, options={}, &block)
-    description = options.delete(:desc)
-    content = options.delete(:content)
-    prev_content = options.delete(:prev_content)
-    label = label_for(method, options)
-    required = options.delete(:required)
-    check_box_details = options.delete(:check_box_details)
-    text_snippet = options.delete(:text_snippet)
-    %{
-      <div class='form_element #{type}_element'>
-        #{"<div class='text_snippet'>"+text_snippet+"</div>" if text_snippet}
-        <div class='label'>
-          #{description(description) || '&nbsp;' if type == 'check_box' }
-          #{label if type != 'check_box' }
-          #{@template.content_tag(:span, '*', :class => 'required_ind') if required }
-        </div>
-        <div class='value'>
-          #{prev_content}#{yield}#{content}
-          #{error_messages_for(method)}
-          #{description(description) if type != 'check_box'}
-          #{description(check_box_details) if type == 'check_box'}
-        </div>
-      </div>
-    }.html_safe
-  end
-
-  # generic container for all things form
-  def element(label = '&nbsp;', value = '', type = 'text_field', &block)
-    value += @template.capture(&block) if block_given?
-    %{
-      <div class='form_element #{type}_element'>
-        <div class='label'>
-          #{label}
-        </div>
-        <div class='value'>
-          #{value}
-        </div>
-      </div>
-    }.html_safe
-  end
-  
-  def check_box(method, options = {}, checked_value = "1", unchecked_value = "0")
-    options[:content] = label_for(method, options)
-    options[:label] = ''
-    standard_field('check_box', method, options) { super(method, options, checked_value, unchecked_value) }     
-  end
-  
-  def radio_button(method, tag_value, options = {})
-    if options && options[:choices]
-      radios = options.delete(:choices).collect{|choice| %{<div class="radio_button">}+super(method, choice[0], options) + %{<label for="#{object_name.to_s.gsub(']', '').gsub('[', '_')}_#{method}_#{choice[0]}">#{choice[1]}</label></div>}}.join.html_safe
-      standard_field('radio_button', method, options) { radios }
-    elsif options && options[:value_name]
-        standard_field('radio_button', method, options) { super(method, tag_value) + %{<label for="#{object_name}_#{method}_#{tag_value}">#{options[:value_name]}</label><div class="clearfloat"></div>}.html_safe}
-    else
-      standard_field('radio_button', method, options) { super(method, tag_value, options = {}) }
-    end
-  end
-  
-  def select(method, choices, options = {}, html_options = {})
-    standard_field('select', method, options) { super(method, choices, options, html_options) } 
-  end
-    
-  def hidden_field(method, options = {}, html_options = {})
-    super(method, options)
-  end
-  
-  def submit(value, options={}, &block)
-    cancel_link = @template.capture(&block) if block_given?
-    cancel_link ||= options[:cancel_url] ? ' or ' + options.delete(:cancel_url) : ''
-    if options[:show_ajax_loader]
-      options[:onclick] = "$(this).parent().next().css('display', 'block');$(this).parent().hide();"
-    end
-    if options[:image_button] == true
-      submit_id = Time.now.usec
-      out = @template.content_tag(:div,
-        %{
-          #{super(value, options.merge(:style=>'visibility:hidden;position: absolute', :id => submit_id)).html_safe}
-          <a class="red_button" href="" onclick="$('##{submit_id}').closest('form').submit();return false"><span>#{value}</span></a>
-          #{cancel_link.html_safe}
-        }.html_safe, :class => 'form_element submit_element').html_safe
-      
-    else
-      out = @template.content_tag(:div, super(value, options) + cancel_link.html_safe, :class => 'form_element submit_element').html_safe
-    end
-    
-    if options[:show_ajax_loader]
-      out << %{
-        <div class="form_element submit_element" style="display:none">
-          <div class="submit_ajax_loader">#{options[:show_ajax_loader]}</div>
-        </div>
-      }.html_safe
-    end
-    out.html_safe
-  end
-  
-  def label_for(method, options)
-    label = options.delete(:label) || method.to_s.titleize.capitalize
-    "<label for=\"#{object_name}_#{method}\">#{label}</label>"
-  end  
-  
-  def description(description)
-    "<div class='description'>#{description}</div>" unless description.nil?
-  end
-  
-  def error_messages
-    if object && !object.errors.empty?
-      message = object.errors[:base].present? ? object.errors[:base]: 'There were some problems submitting this form. Please correct all the highlighted fields and try again'
-      @template.content_tag(:div, message, :class => 'form_error')
-    end
-  end
-  
-  def error_messages_for(method)
-    if (object and object.respond_to?(:errors) and errors = object.errors[method])
-      "<div class='errors'>#{errors.is_a?(Array) ? errors.first : errors}</div>"
-    else
-      ''
-    end
-  end
-  
-  def formatted_fields_for(record_or_name_or_array, *args, &block)
-    options = args.extract_options!
-    options.merge!(:builder => FormattedFormBuilder)
-    fields_for(record_or_name_or_array, *(args << options), &block)
-  end
-end

data/db/schema.rb

@@ -1,30 +0,0 @@
-# This file is auto-generated from the current state of the database. Instead
-# of editing this file, please use the migrations feature of Active Record to
-# incrementally modify your database, and then regenerate this schema definition.
-#
-# Note that this schema.rb definition is the authoritative source for your
-# database schema. If you need to create the application database on another
-# system, you should be using db:schema:load, not running all the migrations
-# from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
-#
-# It's strongly recommended to check this file into your version control system.
-
-ActiveRecord::Schema.define(:version => 1) do
-
-  create_table "users", :force => true do |t|
-    t.string   "email"
-    t.string   "password_hash",    :limit => 40
-    t.string   "password_salt",    :limit => 40
-    t.string   "perishable_token"
-    t.string   "remember_token"
-    t.string   "role"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "users", ["email"], :name => "index_users_on_email"
-  add_index "users", ["perishable_token"], :name => "index_users_on_perishable_token"
-  add_index "users", ["remember_token"], :name => "index_users_on_remember_token"
-
-end