Assets

Gemfile

@@ -1,50 +1,61 @@
 source 'http://rubygems.org'
 
 gem 'rails', '3.1.3'
-
 gem 'rake'
-
 gem 'mysql2'
-
-gem 'json'
-
 gem 'addressable'
+gem 'devise'
+gem 'whenever'
+gem 'capistrano'
+gem 'active_scaffold'
+gem 'haml'
+gem 'jquery-rails'
+gem 'sass-rails'
+gem 'coffee-rails'
 
 gem 'recaptcha',
   :require => 'recaptcha/rails'
 
-gem 'devise'
-
 gem 'exception_notification',
   :git => "git@github.com:rails/exception_notification.git",
   :require => 'exception_notifier'
 
-gem 'whenever'
-
-gem 'capistrano'
-
-gem 'active_scaffold'
-
-gem 'haml'
-
 gem 'transitions',
   :require => ["transitions", "active_record/transitions"]
 
 gem 'will_paginate', '~> 3.0.pre2'
 
+# OTP toolbox
 gem 'rotp', '~> 1.3.0'
 
+# QR Code generation
 gem 'qrencoder'
 
+# IBAN format validations
 gem 'iban-tools'
 
 gem 'delayed_job'
 
-gem 'rack'
+# CSS toolbox
+gem 'blueprint-rails'
+gem 'bourbon'
+
+# File attachment with database storage support
+gem 'paperclip', 
+  :git => 'https://github.com/patshaughnessy/paperclip.git'
 
-gem 'uglifier'
+# Apple push notifications
+gem 'apn_on_rails',
+  :git => 'https://github.com/natescherer/apn_on_rails.git',
+  :branch => 'rails3'
 
 group :test do
   gem 'mocha', :require => false
   gem 'factory_girl_rails'
 end
+
+group :assets do
+  gem 'uglifier'
+  gem 'execjs'
+  gem 'therubyracer'
+end

Gemfile.lock

@@ -4,6 +4,22 @@ GIT
   specs:
     exception_notification (1.0.0)
 
+GIT
+  remote: https://github.com/natescherer/apn_on_rails.git
+  revision: 18f5d37397e3f003152c51b257d9da939b70438f
+  branch: rails3
+  specs:
+    apn_on_rails (0.3.1rails3)
+      configatron
+
+GIT
+  remote: https://github.com/patshaughnessy/paperclip.git
+  revision: 942a2b43383fd04c0434ca4b27379a114cb28a50
+  specs:
+    paperclip (2.3.6)
+      activerecord
+      activesupport
+
 GEM
   remote: http://rubygems.org/
   specs:
@@ -21,7 +37,7 @@ GEM
       rack-mount (~> 0.8.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.0.3)
-    active_scaffold (3.1.12)
+    active_scaffold (3.1.13)
       rails (~> 3.1.0)
     activemodel (3.1.3)
       activesupport (= 3.1.3)
@@ -40,6 +56,11 @@ GEM
     addressable (2.2.6)
     arel (2.2.1)
     bcrypt-ruby (3.0.1)
+    blueprint-rails (0.1.2)
+      railties (~> 3.0)
+      thor (~> 0.14)
+    bourbon (1.2.0)
+      sass (>= 3.1)
     builder (3.0.0)
     capistrano (2.9.0)
       highline
@@ -49,6 +70,15 @@ GEM
       net-ssh-gateway (>= 1.1.0)
     chronic (0.6.6)
     chunky_png (1.2.5)
+    coffee-rails (3.1.1)
+      coffee-script (>= 2.2.0)
+      railties (~> 3.1.0)
+    coffee-script (2.2.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.2.0)
+    configatron (2.9.0)
+      yamler (>= 0.1.0)
     daemons (1.1.5)
     delayed_job (2.1.4)
       activesupport (~> 3.0)
@@ -58,7 +88,7 @@ GEM
       orm_adapter (~> 0.0.3)
       warden (~> 1.1)
     erubis (2.7.0)
-    execjs (1.2.12)
+    execjs (1.2.13)
       multi_json (~> 1.0)
     factory_girl (2.3.2)
       activesupport
@@ -70,7 +100,11 @@ GEM
     hike (1.2.1)
     i18n (0.6.0)
     iban-tools (0.0.6)
+    jquery-rails (1.0.19)
+      railties (~> 3.0)
+      thor (~> 0.14)
     json (1.6.3)
+    libv8 (3.3.10.4)
     mail (2.3.0)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -121,13 +155,21 @@ GEM
       json (~> 1.4)
     recaptcha (0.3.4)
     rotp (1.3.2)
+    sass (3.1.12)
+    sass-rails (3.1.5)
+      actionpack (~> 3.1.0)
+      railties (~> 3.1.0)
+      sass (~> 3.1.10)
+      tilt (~> 1.3.2)
     sprockets (2.0.3)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
+    therubyracer (0.9.9)
+      libv8 (~> 3.3.10)
     thor (0.14.6)
     tilt (1.3.3)
-    transitions (0.0.12)
+    transitions (0.0.13)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
@@ -137,33 +179,41 @@ GEM
       multi_json (>= 1.0.2)
     warden (1.1.0)
       rack (>= 1.0)
-    whenever (0.7.0)
+    whenever (0.7.2)
       activesupport (>= 2.3.4)
       chronic (~> 0.6.3)
     will_paginate (3.0.2)
+    yamler (0.1.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   active_scaffold
   addressable
+  apn_on_rails!
+  blueprint-rails
+  bourbon
   capistrano
+  coffee-rails
   delayed_job
   devise
   exception_notification!
+  execjs
   factory_girl_rails
   haml
   iban-tools
-  json
+  jquery-rails
   mocha
   mysql2
+  paperclip!
   qrencoder
-  rack
   rails (= 3.1.3)
   rake
   recaptcha
   rotp (~> 1.3.0)
+  sass-rails
+  therubyracer
   transitions
   uglifier
   whenever

app/assets/javascripts/application.js

@@ -1,18 +1,13 @@
-//= require controls.js
-//= require excanvas.js
-//= require jquery.js
+//= require jquery
+//= require jquery_ujs
 //= require jquery-ui.js
+//= require excanvas.js
 //= require jqplot.js
 //= require jqplot.dateAxisRenderer.js
 //= require jqplot.highlighter.js
 //= require jquery.countdown.js
 //= require jquery.fancybox.js
-//= require rails.js
-//= require active_scaffold/default/active_scaffold.js
-//= require active_scaffold/default/date_picker_bridge.js
-//= require active_scaffold/default/jquery.editinplace.js
-//= require active_scaffold/default/tiny_mce_bridge.js
-
+//= require active_scaffold
 
 $(document).ready(function() {
     /* Trade order creation form */
@@ -132,4 +127,4 @@ function updateDisplayedFields() {
     $("#trade_order_ppc").parent("div").hide()
     $("#total").parent("div").hide()
   }
-}
+}