Merge c5e86c9 into f8bde77

Gemfile.lock

@@ -1,5 +1,5 @@
 GEM
-  remote: https://rubygems.org/
+  remote: http://yarp.dev/
   specs:
     actionmailer (3.2.14)
       actionpack (= 3.2.14)
@@ -39,7 +39,10 @@ GEM
       json (~> 1.4)
       nokogiri (>= 1.4.4)
       uuidtools (~> 2.1)
-    backports (3.3.4)
+    axiom-types (0.0.5)
+      descendants_tracker (~> 0.0.1)
+      ice_nine (~> 0.9)
+    backports (3.3.5)
     bcrypt-ruby (3.1.2)
     better_errors (1.0.1)
       coderay (>= 1.0.0)
@@ -64,6 +67,9 @@ GEM
       ffi (~> 1.0, >= 1.0.11)
     chunky_png (1.2.8)
     coderay (1.0.9)
+    coercible (0.2.0)
+      backports (~> 3.0, >= 3.1.0)
+      descendants_tracker (~> 0.0.1)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
       railties (~> 3.2.0)
@@ -104,8 +110,8 @@ GEM
     database_cleaner (1.1.1)
     debug_inspector (0.0.2)
     default_value_for (2.0.3)
-    descendants_tracker (0.0.1)
-    devise (3.1.0)
+    descendants_tracker (0.0.3)
+    devise (3.2.1)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 3.2.6, < 5)
@@ -129,6 +135,7 @@ GEM
     em-websocket (0.5.0)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.5.3)
+    equalizer (0.0.7)
     erubis (2.7.0)
     eventmachine (1.0.3)
     execjs (2.0.1)
@@ -147,10 +154,10 @@ GEM
       railties (>= 3.2, < 5.0)
     formatador (0.2.4)
     fssm (0.2.10)
-    gettext (3.0.0)
+    gettext (3.0.2)
       locale (>= 2.0.5)
       text
-    gettext_i18n_rails (0.10.1)
+    gettext_i18n_rails (1.0.2)
       fast_gettext (>= 0.4.8)
     gherkin (2.12.1)
       multi_json (~> 1.3)
@@ -190,6 +197,7 @@ GEM
     httpauth (0.2.0)
     httpclient (2.3.4.1)
     i18n (0.6.5)
+    ice_nine (0.10.0)
     journey (1.0.4)
     jquery-rails (3.0.4)
       railties (>= 3.0, < 5.0)
@@ -214,7 +222,7 @@ GEM
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
       rb-kqueue (>= 0.2)
-    locale (2.0.8)
+    locale (2.0.9)
     lumberjack (1.0.4)
     machinist (2.0)
     mail (2.5.4)
@@ -223,8 +231,8 @@ GEM
     memcachier (0.0.2)
     method_source (0.8.2)
     mime-types (1.25)
-    mini_portile (0.5.1)
-    multi_json (1.8.0)
+    mini_portile (0.5.2)
+    multi_json (1.8.2)
     multi_test (0.0.2)
     multi_xml (0.5.5)
     multipart-post (1.2.0)
@@ -250,7 +258,7 @@ GEM
     omniauth-oauth2 (1.1.1)
       oauth2 (~> 0.8.0)
       omniauth (~> 1.0)
-    orm_adapter (0.4.0)
+    orm_adapter (0.5.0)
     pg (0.17.0)
     poltergeist (1.1.2)
       capybara (~> 2.0.1)
@@ -325,10 +333,10 @@ GEM
     redcarpet (3.0.0)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    roadie (2.4.1)
+    roadie (2.4.2)
       actionmailer (> 3.0.0, < 5.0.0)
       css_parser (~> 1.3.4)
-      nokogiri (> 1.5.0, < 1.7.0)
+      nokogiri (> 1.5.0)
       sprockets
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
@@ -417,9 +425,11 @@ GEM
     uuidtools (2.1.4)
     valium (0.5.0)
       activerecord (>= 3.0.2)
-    virtus (0.5.5)
-      backports (~> 3.3)
+    virtus (1.0.0)
+      axiom-types (~> 0.0.5)
+      coercible (~> 0.2)
       descendants_tracker (~> 0.0.1)
+      equalizer (~> 0.0.7)
     warden (1.2.3)
       rack (>= 1.0)
     websocket (1.0.7)

Rakefile

@@ -5,5 +5,6 @@
 require File.expand_path('../config/application', __FILE__)
 
 require 'rake_ext/raven'
+require 'gettext_i18n_rails/tasks'
 
 AppFab::Application.load_tasks

app/models/user/edit_form.rb

@@ -6,7 +6,7 @@
 # - http://pivotallabs.com/form-backing-objects-for-fun-and-profit/
 
 class User::EditForm
-  include Virtus
+  include Virtus.model
   extend Forwardable
   extend ActiveModel::Naming
   include ActiveModel::Conversion
@@ -89,4 +89,4 @@ def persist!
     end
   end
 
-end
+end