fixes #2 and #12

awesomefoundation · Aug 19, 2013 · 636627d · 636627d
1 parent 78d6f16
commit 636627d
Show file tree

Hide file tree

Showing 12 changed files with 267 additions and 167 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,19 +1,19 @@
 source 'http://rubygems.org'
 
-gem 'rake', '~> 0.9'
+gem 'rake'
 gem 'rack' #, '1.2.1'
-gem 'rails', '3.0.17'
-gem 'mysql2', '< 0.3'
+gem 'rails', '3.2.14'
+gem 'mysql2'
 
-gem 'activemerchant', '1.9.4'
+gem 'activemerchant'
 gem 'andand'
 gem 'bluecloth'
-gem 'devise', '1.4.5'
+gem 'devise'
+gem 'devise-encryptable'
 gem 'devise_invitable'
 gem 'exception_notification', '2.4.1'
 gem 'gravtastic'
 gem 'ledermann-rails-settings', :require => 'rails-settings'
-gem 'jquery-rails'
 gem 'json'
 gem 'haml', '<4.0'
 gem 'nokogiri'
@@ -23,8 +23,24 @@ gem 'paperclip'
 gem 'paypal_adaptive',  :path => 'vendor/gems/paypal_adaptive'
 gem 'psych'
 gem 'sass'
+gem 'rails_autolink'
+
+group :assets do
+  gem 'sass-rails', " ~> 3.2.3"
+  gem 'coffee-rails', " ~> 3.2.1"
+  gem 'uglifier', " >= 1.0.3"
+end
+
+gem 'jquery-rails'
 
-#gem "factory_girl_rails", "~> 2.0"
-#gem "factory_girl_rails"
-#gem 'mocha'
+group :development do
+  gem 'pry'
+  gem 'pry-rails'
+  gem 'pry-debugger'
+  gem 'awesome_print'
+end
 
+group :test do
+  gem "factory_girl_rails"
+  gem 'mocha'
+end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -9,85 +9,122 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    abstract (1.0.0)
-    actionmailer (3.0.17)
-      actionpack (= 3.0.17)
-      mail (~> 2.2.19)
-    actionpack (3.0.17)
-      activemodel (= 3.0.17)
-      activesupport (= 3.0.17)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.5.0)
-      rack (~> 1.2.5)
-      rack-mount (~> 0.6.14)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemerchant (1.9.4)
-      activesupport (>= 2.3.2)
-      braintree (>= 2.0.0)
+    actionmailer (3.2.14)
+      actionpack (= 3.2.14)
+      mail (~> 2.5.4)
+    actionpack (3.2.14)
+      activemodel (= 3.2.14)
+      activesupport (= 3.2.14)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.5)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.2.1)
+    active_utils (2.0.0)
+      activesupport (>= 2.3.11)
+      i18n
+    activemerchant (1.34.0)
+      active_utils (>= 1.0.2)
+      activesupport (>= 2.3.14)
       builder (>= 2.0.0)
-    activemodel (3.0.17)
-      activesupport (= 3.0.17)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.17)
-      activemodel (= 3.0.17)
-      activesupport (= 3.0.17)
-      arel (~> 2.0.10)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.17)
-      activemodel (= 3.0.17)
-      activesupport (= 3.0.17)
-    activesupport (3.0.17)
+      i18n
+      json (>= 1.5.1)
+      money
+      nokogiri
+    activemodel (3.2.14)
+      activesupport (= 3.2.14)
+      builder (~> 3.0.0)
+    activerecord (3.2.14)
+      activemodel (= 3.2.14)
+      activesupport (= 3.2.14)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.14)
+      activemodel (= 3.2.14)
+      activesupport (= 3.2.14)
+    activesupport (3.2.14)
+      i18n (~> 0.6, >= 0.6.4)
+      multi_json (~> 1.0)
     addressable (2.3.5)
     andand (1.3.3)
-    arel (2.0.10)
+    arel (3.0.2)
+    awesome_print (1.1.0)
     bcrypt-ruby (3.1.1)
     bluecloth (2.2.0)
-    braintree (2.24.0)
-      builder (>= 2.0.0)
-    builder (2.1.2)
+    builder (3.0.4)
     climate_control (0.0.3)
       activesupport (>= 3.0)
     cocaine (0.5.1)
       climate_control (>= 0.0.3, < 1.0)
-    devise (1.4.5)
+    coderay (1.0.9)
+    coffee-rails (3.2.2)
+      coffee-script (>= 2.2.0)
+      railties (~> 3.2.0)
+    coffee-script (2.2.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.6.3)
+    columnize (0.3.6)
+    debugger (1.6.1)
+      columnize (>= 0.3.1)
+      debugger-linecache (~> 1.2.0)
+      debugger-ruby_core_source (~> 1.2.3)
+    debugger-linecache (1.2.0)
+    debugger-ruby_core_source (1.2.3)
+    devise (3.0.3)
       bcrypt-ruby (~> 3.0)
-      orm_adapter (~> 0.0.3)
-      warden (~> 1.0.3)
-    devise_invitable (0.5.7)
-      devise (~> 1.4.1)
-      rails (>= 3.0.0, < 3.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
+      orm_adapter (~> 0.1)
+      railties (>= 3.2.6, < 5)
+      warden (~> 1.2.3)
+    devise-encryptable (0.1.2)
+      devise (>= 2.1.0)
+    devise_invitable (1.1.8)
+      actionmailer (~> 3.0)
+      devise (>= 2.1.2)
+      railties (~> 3.0)
+    erubis (2.7.0)
     exception_notification (2.4.1)
+    execjs (1.4.0)
+      multi_json (~> 1.0)
+    factory_girl (4.2.0)
+      activesupport (>= 3.0.0)
+    factory_girl_rails (4.2.1)
+      factory_girl (~> 4.2.0)
+      railties (>= 3.0.0)
     faraday (0.7.6)
       addressable (~> 2.2)
       multipart-post (~> 1.1)
       rack (~> 1.1)
     gravtastic (3.2.6)
     haml (3.1.8)
     hashie (2.0.5)
-    i18n (0.5.0)
+    hike (1.2.3)
+    i18n (0.6.5)
+    journey (1.0.4)
     jquery-rails (3.0.4)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.8.0)
     jsonschema (2.0.2)
-    ledermann-rails-settings (1.2.1)
-      activerecord (>= 2.3)
-    mail (2.2.20)
-      activesupport (>= 2.3.6)
-      i18n (>= 0.4.0)
+    ledermann-rails-settings (2.0.3)
+      activerecord (~> 3.1)
+    mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.23)
+    metaclass (0.0.1)
+    method_source (0.8.2)
+    mime-types (1.24)
     mini_portile (0.5.1)
+    mocha (0.14.0)
+      metaclass (~> 0.0.1)
+    money (5.1.1)
+      i18n (~> 0.6.0)
     multi_json (1.0.4)
     multi_xml (0.4.4)
     multipart-post (1.2.0)
-    mysql2 (0.2.20)
+    mysql2 (0.3.13)
     nokogiri (1.6.0)
       mini_portile (~> 0.5.0)
     oa-core (0.3.2)
@@ -105,68 +142,107 @@ GEM
     omniauth (1.1.4)
       hashie (>= 1.2, < 3)
       rack
-    orm_adapter (0.0.7)
+    orm_adapter (0.4.0)
     paperclip (3.5.1)
       activemodel (>= 3.0.0)
       activesupport (>= 3.0.0)
       cocaine (~> 0.5.0)
       mime-types
     polyglot (0.3.3)
+    pry (0.9.12.2)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+    pry-debugger (0.2.2)
+      debugger (~> 1.3)
+      pry (~> 0.9.10)
+    pry-rails (0.3.2)
+      pry (>= 0.9.10)
     psych (2.0.0)
-    rack (1.2.8)
-    rack-mount (0.6.14)
-      rack (>= 1.0.0)
-    rack-test (0.5.7)
+    rack (1.4.5)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.3)
+      rack
+    rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.0.17)
-      actionmailer (= 3.0.17)
-      actionpack (= 3.0.17)
-      activerecord (= 3.0.17)
-      activeresource (= 3.0.17)
-      activesupport (= 3.0.17)
+    rails (3.2.14)
+      actionmailer (= 3.2.14)
+      actionpack (= 3.2.14)
+      activerecord (= 3.2.14)
+      activeresource (= 3.2.14)
+      activesupport (= 3.2.14)
       bundler (~> 1.0)
-      railties (= 3.0.17)
-    railties (3.0.17)
-      actionpack (= 3.0.17)
-      activesupport (= 3.0.17)
+      railties (= 3.2.14)
+    rails_autolink (1.1.0)
+      rails (> 3.1)
+    railties (3.2.14)
+      actionpack (= 3.2.14)
+      activesupport (= 3.2.14)
+      rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (~> 0.14.4)
-    rake (0.9.6)
+      thor (>= 0.14.6, < 2.0)
+    rake (10.1.0)
     rdoc (3.12.2)
       json (~> 1.4)
     sass (3.2.10)
-    thor (0.14.6)
-    treetop (1.4.14)
+    sass-rails (3.2.6)
+      railties (~> 3.2.0)
+      sass (>= 3.1.10)
+      tilt (~> 1.3)
+    slop (3.4.6)
+    sprockets (2.2.2)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    thor (0.18.1)
+    tilt (1.4.1)
+    treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.37)
-    warden (1.0.6)
+    uglifier (2.1.2)
+      execjs (>= 0.3.0)
+      multi_json (~> 1.0, >= 1.0.2)
+    warden (1.2.3)
       rack (>= 1.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activemerchant (= 1.9.4)
+  activemerchant
   andand
+  awesome_print
   bluecloth
-  devise (= 1.4.5)
+  coffee-rails (~> 3.2.1)
+  devise
+  devise-encryptable
   devise_invitable
   exception_notification (= 2.4.1)
+  factory_girl_rails
   gravtastic
   haml (< 4.0)
   jquery-rails
   json
   ledermann-rails-settings
-  mysql2 (< 0.3)
+  mocha
+  mysql2
   nokogiri
   oa-oauth
   omniauth
   paperclip
   paypal_adaptive!
+  pry
+  pry-debugger
+  pry-rails
   psych
   rack
-  rails (= 3.0.17)
-  rake (~> 0.9)
+  rails (= 3.2.14)
+  rails_autolink
+  rake
   sass
+  sass-rails (~> 3.2.3)
+  uglifier (>= 1.0.3)