Rails upgrade to 3.2 Part II.

huerlisi · Oct 1, 2012 · ec3a961 · ec3a961
1 parent 87a3c90
commit ec3a961
Show file tree

Hide file tree

Showing 98 changed files with 954 additions and 1,157 deletions.
diff --git a/.gitmodules b/.gitmodules
diff --git a/Gemfile b/Gemfile
@@ -4,11 +4,11 @@ source 'http://rubygems.org'
 
 # Rails
 # =====
-gem 'rails', '~> 2.3.10'
+gem 'rails'
 
 # Database
-gem 'sqlite3-ruby', :require => 'sqlite3'
-gem 'mysql2', '~> 0.2.18'
+gem 'sqlite3'
+gem 'mysql2'
 
 # Development
 # ===========
@@ -31,10 +31,10 @@ end
 gem 'haml'
 
 gem 'formtastic'
-gem 'will_paginate', '< 3.0'
-gem 'inherited_resources', '< 1.1'
+gem 'will_paginate'
+gem 'inherited_resources'
 gem 'has_scope'
-gem 'i18n_rails_helpers', '< 1.0'
+gem 'i18n_rails_helpers'
 gem 'show_for'
 
 # CyDoc
@@ -43,7 +43,13 @@ gem 'show_for'
 gem 'aasm'
 
 # Date/Time handling
-gem 'validates_timeliness', '< 3.0'
+gem 'validates_timeliness'
+
+# Addresses
+gem 'has_vcards'
+
+# Billing
+gem 'has_accounts'
 
 # Import
 gem 'fastercsv'
@@ -58,6 +64,9 @@ gem 'in_place_editing'
 # CRUD helpers
 gem 'inherited_resources_views'
 
+# Authentication
+gem 'devise'
+
 # Uploads
 gem 'carrierwave'
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,32 +1,50 @@
 GIT
   remote: https://github.com/prawnpdf/prawn.git
-  revision: 91164e49a29bb6d0e5b3635217349189a3ea0e91
+  revision: 1f381080683944b08f24721a8b3dcfe4826edd6f
   specs:
     prawn (1.0.0.rc1)
-      pdf-reader (>= 0.9.0)
+      pdf-reader (>= 0.9.0, < 2.0)
       ttfunk (~> 1.0.3)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    Ascii85 (1.0.1)
-    aasm (3.0.3)
-      activerecord
-    actionmailer (2.3.14)
-      actionpack (= 2.3.14)
-    actionpack (2.3.14)
-      activesupport (= 2.3.14)
-      rack (~> 1.1.0)
-    activerecord (2.3.14)
-      activesupport (= 2.3.14)
-    activerecord-sqlserver-adapter (2.3.24)
-      activerecord (~> 2.2)
-    activeresource (2.3.14)
-      activesupport (= 2.3.14)
-    activesupport (2.3.14)
-    builder (3.0.0)
+    Ascii85 (1.0.2)
+    aasm (3.0.9)
+    actionmailer (3.2.8)
+      actionpack (= 3.2.8)
+      mail (~> 2.4.4)
+    actionpack (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.1.3)
+    activemodel (3.2.8)
+      activesupport (= 3.2.8)
+      builder (~> 3.0.0)
+    activerecord (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activerecord-sqlserver-adapter (3.2.9)
+      activerecord (~> 3.2.0)
+    activeresource (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
+    activesupport (3.2.8)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    arel (3.0.2)
+    bcrypt-ruby (3.0.1)
+    builder (3.0.3)
     cap-recipes (0.3.39)
-    capistrano (2.11.2)
+    capistrano (2.13.4)
       highline
       net-scp (>= 1.0.0)
       net-sftp (>= 2.0.0)
@@ -35,83 +53,138 @@ GEM
     capistrano-ext (1.2.1)
       capistrano (>= 1.0.0)
     capistrano_colors (0.5.5)
-    capones_recipes (1.15.3)
+    capones_recipes (1.15.5)
       cap-recipes
       capistrano
       capistrano-ext
       capistrano_colors
-    carrierwave (0.4.10)
+    carrierwave (0.6.2)
+      activemodel (>= 3.2.0)
+      activesupport (>= 3.2.0)
     csv-mapper (0.5.1)
       fastercsv
-    cucumber (1.1.9)
+    cucumber (1.2.1)
       builder (>= 2.1.2)
-      diff-lcs (>= 1.1.2)
-      gherkin (~> 2.9.0)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.11.0)
       json (>= 1.4.6)
-      term-ansicolor (>= 1.0.6)
     cups (0.0.7)
+    devise (2.1.2)
+      bcrypt-ruby (~> 3.0)
+      orm_adapter (~> 0.1)
+      railties (~> 3.1)
+      warden (~> 1.2.1)
     diff-lcs (1.1.3)
-    fastercsv (1.5.4)
-    formtastic (1.2.4)
-      actionpack (>= 2.3.7)
-      activesupport (>= 2.3.7)
-      i18n (~> 0.4)
-    gherkin (2.9.0)
+    erubis (2.7.0)
+    fastercsv (1.5.5)
+    formtastic (2.2.1)
+      actionpack (>= 3.0)
+    gherkin (2.11.2)
       json (>= 1.4.6)
-    haml (3.1.4)
+    haml (3.1.7)
+    has_accounts (0.18.3)
+      has_vcards
+      inherited_resources
+      rails (~> 3.1)
+      validates_timeliness
     has_scope (0.5.1)
-    highline (1.6.11)
-    i18n (0.6.0)
-    i18n_rails_helpers (0.18.2)
-    in_place_editing (1.1.2)
-    inherited_resources (1.0.6)
+    has_vcards (0.17.1)
+      inherited_resources
+      rails (~> 3.0)
+    hashery (2.0.1)
+    highline (1.6.15)
+    hike (1.2.1)
+    i18n (0.6.1)
+    i18n_rails_helpers (1.0.7)
+    in_place_editing (1.2.0)
+    inherited_resources (1.3.1)
       has_scope (~> 0.5.0)
-      responders (~> 0.4.6)
+      responders (~> 0.6)
     inherited_resources_views (0.4.1)
       inherited_resources (>= 1.0)
-    json (1.6.5)
-    ledermann-rails-settings (1.0.1)
+    journey (1.0.4)
+    jruby-pageant (1.1.1)
+    json (1.7.5)
+    ledermann-rails-settings (1.2.0)
       activerecord (>= 2.3)
-    mysql2 (0.2.18)
+    mail (2.4.4)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.19)
+    multi_json (1.3.6)
+    mysql2 (0.3.11)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-sftp (2.0.5)
       net-ssh (>= 2.0.9)
-    net-ssh (2.3.0)
+    net-ssh (2.6.0)
+      jruby-pageant (>= 1.1.1)
     net-ssh-gateway (1.1.0)
       net-ssh (>= 1.99.1)
     nokogiri (1.5.5)
-    pdf-reader (1.0.0)
+    orm_adapter (0.4.0)
+    pdf-reader (1.2.0)
       Ascii85 (~> 1.0.0)
+      hashery (~> 2.0)
       ruby-rc4
-    prawnto (0.1.0)
+    polyglot (0.3.3)
+    prawnto (0.1.1)
       prawn
       rails (>= 2.1)
-    rack (1.1.3)
-    rails (2.3.14)
-      actionmailer (= 2.3.14)
-      actionpack (= 2.3.14)
-      activerecord (= 2.3.14)
-      activeresource (= 2.3.14)
-      activesupport (= 2.3.14)
-      rake (>= 0.8.3)
+    rack (1.4.1)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (3.2.8)
+      actionmailer (= 3.2.8)
+      actionpack (= 3.2.8)
+      activerecord (= 3.2.8)
+      activeresource (= 3.2.8)
+      activesupport (= 3.2.8)
+      bundler (~> 1.0)
+      railties (= 3.2.8)
+    railties (3.2.8)
+      actionpack (= 3.2.8)
+      activesupport (= 3.2.8)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
-    responders (0.4.8)
-    routing-filter (0.3.0)
+    responders (0.9.3)
+      railties (~> 3.1)
+    routing-filter (0.3.1)
       actionpack
     ruby-rc4 (0.1.5)
-    show_for (0.2.4)
-    sqlite3 (1.3.5)
-    sqlite3-ruby (1.3.3)
-      sqlite3 (>= 1.3.3)
-    term-ansicolor (1.0.7)
+    show_for (0.2.5)
+      actionpack (~> 3.0)
+      activemodel (~> 3.0)
+    sprockets (2.1.3)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sqlite3 (1.3.6)
+    thor (0.16.0)
+    tilt (1.3.3)
+    timeliness (0.3.6)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
     ttfunk (1.0.3)
+    tzinfo (0.3.33)
     use_db (0.2.0)
-    validates_timeliness (2.3.2)
-    vesr (0.12.4)
-    will_paginate (2.3.16)
+    validates_timeliness (3.0.14)
+      timeliness (~> 0.3.6)
+    vesr (0.12.6)
+    warden (1.2.1)
+      rack (>= 1.0)
+    will_paginate (3.0.3)
 
 PLATFORMS
   ruby
@@ -124,25 +197,28 @@ DEPENDENCIES
   csv-mapper
   cucumber
   cups
+  devise
   fastercsv
   formtastic
   haml
+  has_accounts
   has_scope
-  i18n_rails_helpers (< 1.0)
+  has_vcards
+  i18n_rails_helpers
   in_place_editing
-  inherited_resources (< 1.1)
+  inherited_resources
   inherited_resources_views
   ledermann-rails-settings
-  mysql2 (~> 0.2.18)
+  mysql2
   nokogiri
   prawn!
   prawnto
-  rails (~> 2.3.10)
+  rails
   rdoc
   routing-filter
   show_for
-  sqlite3-ruby
+  sqlite3
   use_db
-  validates_timeliness (< 3.0)
+  validates_timeliness
   vesr
-  will_paginate (< 3.0)
+  will_paginate
diff --git a/Rakefile b/Rakefile
@@ -1,9 +1,7 @@
+#!/usr/bin/env rake
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
-require(File.join(File.dirname(__FILE__), 'config', 'boot'))
+require File.expand_path('../config/application', __FILE__)
 
-require 'rake'
-require 'rake/testtask'
-
-require 'tasks/rails'
+CyDoc::Application.load_tasks
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
@@ -34,7 +34,7 @@ def show
   # POST /account/print/1
   def print
     @account = Account.find(params[:id])
-    @bookings = apply_scopes(Booking).by_account(@account)..all(:order => 'value_date, id')
+    @bookings = apply_scopes(Booking).by_account(@account).all(:order => 'value_date, id')
 
     respond_to do |format|
       format.html {