Update ecosystem for new devise

Gemfile

@@ -23,18 +23,20 @@ group :assets do
   #gem 'therubyracer', :platforms => :ruby
 
   gem 'uglifier', '>= 1.0.3'
-  gem 'mustache' #, :require => 'mustache/railtie'
+  #gem 'mustache' #, :require => 'mustache/railtie'
 end
 
 gem 'jquery-rails'
-gem 'haml-rails'
+gem 'jquery-ui-rails'
+gem 'ember-rails'
 gem 'slim-rails'
 #gem 'less-rails'
 
-gem 'couch_potato' , :git => 'git://github.com/bterkuile/couch_potato.git'
+gem 'couch_potato' , github: 'bterkuile/couch_potato'
-gem 'simply_stored' , :git => 'git://github.com/bterkuile/simply_stored.git'
+gem 'simply_stored' , github: 'bterkuile/simply_stored'
-gem 'devise', '2.0.4'
+gem 'orm_adapter', github: 'bterkuile/orm_adapter'
-gem 'devise_simply_stored'
+gem 'devise', '3.1.0' #, '2.0.4'
+gem 'devise_simply_stored', github: 'bterkuile/devise_simply_stored'
 gem 'simple_form'
 gem 'active_decorator' #, path: '/Users/bterkuile/companytools/development/rails/components/active_decorator'
 gem 'cmtool', github: 'bterkuile/cmtool'
@@ -50,17 +52,17 @@ gem 'mini_magick'
 # To use Jbuilder templates for JSON
 # gem 'jbuilder'
 group :development do
-  gem 'pry'
   #gem 'pry-remote'
   gem 'rspec-rails'
   gem 'guard-rspec'
   gem 'quiet_assets'
   gem 'letter_opener'
   gem 'thin'
+  gem 'faye'
+  gem 'pry-rails'
 end
 
 group :test do
-  gem 'pry'
   #gem 'steak'
   gem 'rspec-rails'
   gem 'cucumber-rails'
@@ -71,6 +73,7 @@ group :test do
   gem 'ruby_gntp'
   gem 'guard-rspec'
   gem 'factory_girl_rails'
+  gem 'pry-rails'
 end
 
 # Use unicorn as the app server

Gemfile.lock

@@ -1,17 +1,17 @@
 GIT
   remote: git://github.com/bterkuile/cmtool.git
-  revision: 370aa0369e1885dacaac57c911ebd6aded808eee
+  revision: fd158660ada56158796c91df162672ddc74799d8
   specs:
     cmtool (0.5.0)
       bourbon
       coffee-script
-      devise (= 2.0.4)
+      devise
       devise_simply_stored
       email_validator
       haml-rails
       jquery-rails
       paperclip
-      rails (~> 3.2.2)
+      rails (>= 3.2.2)
       sass-rails
       slim-rails
       tinymce-rails
@@ -25,9 +25,22 @@ GIT
       couchrest (>= 1.0.1)
       json (~> 1.6)
 
+GIT
+  remote: git://github.com/bterkuile/devise_simply_stored.git
+  revision: 8fdaed396a7e9566fe6cb59b64d950953c8506a6
+  specs:
+    devise_simply_stored (0.1.0)
+      devise
+
+GIT
+  remote: git://github.com/bterkuile/orm_adapter.git
+  revision: e0b5f652c8d1eda8c0f6636f3b3d17d598603450
+  specs:
+    orm_adapter (0.4.0)
+
 GIT
   remote: git://github.com/bterkuile/simply_stored.git
-  revision: fe749c792e303817f825fa4964936cc68a62b14b
+  revision: b62ce6c7a0e453230fe807075926c637ceefedc8
   specs:
     simply_stored (1.0.0)
       activesupport
@@ -51,6 +64,8 @@ GEM
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
     active_decorator (0.3.4)
+    active_model_serializers (0.8.1)
+      activemodel (>= 3.0)
     activemodel (3.2.13)
       activesupport (= 3.2.13)
       builder (~> 3.0.0)
@@ -65,12 +80,17 @@ GEM
     activesupport (3.2.13)
       i18n (= 0.6.1)
       multi_json (~> 1.0)
-    addressable (2.3.3)
+    addressable (2.3.5)
     arel (3.0.2)
-    bcrypt-ruby (3.0.1)
+    atomic (1.1.14)
-    bootstrap-sass (2.3.1.0)
+    barber (0.4.2)
+      ember-source
+      execjs
+      handlebars-source
+    bcrypt-ruby (3.1.2)
+    bootstrap-sass (2.3.2.2)
       sass (~> 3.2)
-    bourbon (3.1.2)
+    bourbon (3.1.8)
       sass (>= 3.2.0)
       thor
     builder (3.0.4)
@@ -85,6 +105,7 @@ GEM
     chunky_png (1.2.8)
     climate_control (0.0.3)
       activesupport (>= 3.0)
+    cliver (0.2.1)
     cocaine (0.5.1)
       climate_control (>= 0.0.3, < 1.0)
     coderay (1.0.9)
@@ -94,121 +115,158 @@ GEM
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.6.2)
+    coffee-script-source (1.6.3)
     compass (0.12.2)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
       sass (~> 3.1)
     compass-rails (1.0.3)
       compass (>= 0.12.2, < 0.14)
-    couchrest (1.1.3)
+    cookiejar (0.3.0)
+    couchrest (1.2.0)
       mime-types (~> 1.15)
       multi_json (~> 1.0)
       rest-client (~> 1.6.1)
-    cucumber (1.2.5)
+    cucumber (1.3.8)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
-      gherkin (~> 2.11.7)
+      gherkin (~> 2.12.1)
-      multi_json (~> 1.3)
+      multi_json (>= 1.7.5, < 2.0)
-    cucumber-rails (1.3.1)
+      multi_test (>= 0.0.2)
+    cucumber-rails (1.4.0)
       capybara (>= 1.1.2)
       cucumber (>= 1.2.0)
       nokogiri (>= 1.5.0)
-      rails (~> 3.0)
+      rails (>= 3.0.0)
     daemons (1.1.9)
-    database_cleaner (0.9.1)
+    database_cleaner (1.1.1)
-    devise (2.0.4)
+    devise (3.1.0)
       bcrypt-ruby (~> 3.0)
-      orm_adapter (~> 0.0.3)
+      orm_adapter (~> 0.1)
-      railties (~> 3.1)
+      railties (>= 3.2.6, < 5)
-      warden (~> 1.1.1)
+      thread_safe (~> 0.1)
-    devise_simply_stored (0.0.3)
+      warden (~> 1.2.3)
-      devise
+    diff-lcs (1.2.4)
-    diff-lcs (1.2.2)
+    em-http-request (1.1.0)
+      addressable (>= 2.3.4)
+      cookiejar
+      em-socksify (>= 0.3)
+      eventmachine (>= 1.0.3)
+      http_parser.rb (>= 0.6.0.beta.2)
+    em-socksify (0.3.0)
+      eventmachine (>= 1.0.0.beta.4)
     email_validator (1.4.0)
       activemodel
+    ember-data-source (0.14)
+      ember-source
+    ember-rails (0.13.0)
+      active_model_serializers
+      barber (>= 0.4.1)
+      ember-data-source
+      ember-source
+      execjs (>= 1.2)
+      handlebars-source
+      railties (>= 3.1)
+    ember-source (1.0.0)
+      handlebars-source (= 1.0.12)
     erubis (2.7.0)
     eventmachine (1.0.3)
-    execjs (1.4.0)
+    execjs (2.0.1)
-      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)
-    faye-websocket (0.4.7)
+    faye (0.8.9)
+      cookiejar (>= 0.3.0)
+      em-http-request (>= 0.3.0)
       eventmachine (>= 0.12.0)
-    ffi (1.6.0)
+      faye-websocket (>= 0.4.0)
+      rack (>= 1.0.0)
+      yajl-ruby (>= 1.0.0)
+    faye-websocket (0.7.0)
+      eventmachine (>= 0.12.0)
+      websocket-driver (>= 0.3.0)
+    ffi (1.9.0)
     formatador (0.2.4)
     fssm (0.2.10)
-    gherkin (2.11.8)
+    gherkin (2.12.1)
       multi_json (~> 1.3)
-    guard (1.7.0)
+    guard (1.8.2)
       formatador (>= 0.2.4)
-      listen (>= 0.6.0)
+      listen (>= 1.0.0)
       lumberjack (>= 1.0.2)
       pry (>= 0.9.10)
       thor (>= 0.14.6)
-    guard-rspec (2.5.2)
+    guard-rspec (3.0.3)
-      guard (>= 1.1)
+      guard (>= 1.8)
-      rspec (~> 2.11)
+      rspec (~> 2.13)
-    haml (4.0.2)
+    haml (4.0.3)
       tilt
     haml-rails (0.4)
       actionpack (>= 3.1, < 4.1)
       activesupport (>= 3.1, < 4.1)
       haml (>= 3.1, < 4.1)
       railties (>= 3.1, < 4.1)
-    hike (1.2.2)
+    handlebars-source (1.0.12)
-    http_parser.rb (0.5.3)
+    hike (1.2.3)
+    http_parser.rb (0.6.0.beta.2)
     i18n (0.6.1)
     journey (1.0.4)
-    jquery-rails (2.2.1)
+    jquery-rails (3.0.4)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    json (1.7.7)
+    jquery-ui-rails (4.0.4)
+      jquery-rails
+      railties (>= 3.1.0)
+    json (1.8.0)
     kaminari (0.14.1)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
-    launchy (2.2.0)
+    launchy (2.3.0)
       addressable (~> 2.3)
-    letter_opener (1.1.0)
+    letter_opener (1.1.2)
-      launchy (~> 2.2.0)
+      launchy (~> 2.2)
-    listen (0.7.3)
+    listen (1.3.1)
-    lumberjack (1.0.3)
+      rb-fsevent (>= 0.9.3)
-    mail (2.5.3)
+      rb-inotify (>= 0.9)
-      i18n (>= 0.4.0)
+      rb-kqueue (>= 0.2)
+    lumberjack (1.0.4)
+    mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    method_source (0.8.1)
+    method_source (0.8.2)
-    mime-types (1.22)
+    mime-types (1.25)
-    mini_magick (3.5.0)
+    mini_magick (3.6.0)
       subexec (~> 0.2.1)
-    multi_json (1.7.2)
+    mini_portile (0.5.1)
-    mustache (0.99.4)
+    multi_json (1.8.0)
-    nokogiri (1.5.9)
+    multi_test (0.0.2)
-    orm_adapter (0.0.7)
+    nokogiri (1.6.0)
-    paperclip (3.4.1)
+      mini_portile (~> 0.5.0)
+    paperclip (3.5.1)
       activemodel (>= 3.0.0)
-      activerecord (>= 3.0.0)
       activesupport (>= 3.0.0)
       cocaine (~> 0.5.0)
       mime-types
-    poltergeist (1.1.0)
+    poltergeist (1.4.1)
-      capybara (~> 2.0, >= 2.0.1)
+      capybara (~> 2.1.0)
-      faye-websocket (~> 0.4, >= 0.4.4)
+      cliver (~> 0.2.1)
-      http_parser.rb (~> 0.5.3)
+      multi_json (~> 1.0)
+      websocket-driver (>= 0.2.0)
     polyglot (0.3.3)
-    pry (0.9.12)
+    pry (0.9.12.2)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
+    pry-rails (0.3.2)
+      pry (>= 0.9.10)
     quiet_assets (1.0.2)
       railties (>= 3.1, < 5.0)
     rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-cors (0.2.7)
+    rack-cors (0.2.8)
       rack
     rack-ssl (1.3.3)
       rack
@@ -229,79 +287,87 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (10.0.4)
+    rake (10.1.0)
     rb-fsevent (0.9.3)
+    rb-inotify (0.9.2)
+      ffi (>= 0.5.0)
+    rb-kqueue (0.2.0)
+      ffi (>= 0.5.0)
     rdoc (3.12.2)
       json (~> 1.4)
     rest-client (1.6.7)
       mime-types (>= 1.16)
     rqrcode (0.4.2)
-    rspec (2.13.0)
+    rspec (2.14.1)
-      rspec-core (~> 2.13.0)
+      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.13.0)
+      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.13.0)
+      rspec-mocks (~> 2.14.0)
-    rspec-core (2.13.1)
+    rspec-core (2.14.5)
-    rspec-expectations (2.13.0)
+    rspec-expectations (2.14.2)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.1)
+    rspec-mocks (2.14.3)
-    rspec-rails (2.13.0)
+    rspec-rails (2.14.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 2.13.0)
+      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.13.0)
+      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.13.0)
+      rspec-mocks (~> 2.14.0)
     ruby_gntp (0.3.4)
     rubyzip (0.9.9)
-    sass (3.2.7)
+    sass (3.2.10)
     sass-rails (3.2.6)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    selenium-webdriver (2.32.0)
+    selenium-webdriver (2.35.1)
       childprocess (>= 0.2.5)
       multi_json (~> 1.0)
-      rubyzip
+      rubyzip (< 1.0.0)
       websocket (~> 1.0.4)
     simple_form (2.1.0)
       actionpack (~> 3.0)
       activemodel (~> 3.0)
-    slim (1.3.7)
+    slim (2.0.1)
-      temple (~> 0.6.3)
+      temple (~> 0.6.6)
-      tilt (~> 1.3.3)
+      tilt (>= 1.3.3, < 2.1)
-    slim-rails (1.1.1)
+    slim-rails (2.0.1)
       actionpack (>= 3.0, < 4.1)
       activesupport (>= 3.0, < 4.1)
       railties (>= 3.0, < 4.1)
-      slim (~> 1.3)
+      slim (~> 2.0)
-    slop (3.4.4)
+    slop (3.4.6)
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     subexec (0.2.3)
-    temple (0.6.3)
+    temple (0.6.6)
     thin (1.5.1)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
     thor (0.18.1)
-    tilt (1.3.7)
+    thread_safe (0.1.3)
-    tinymce-rails (3.5.8.1)
+      atomic
+    tilt (1.4.1)
+    tinymce-rails (4.0.6)
       railties (>= 3.1.1)
-    treetop (1.4.12)
+    treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.37)
-    uglifier (2.0.1)
+    uglifier (2.2.1)
       execjs (>= 0.3.0)
       multi_json (~> 1.0, >= 1.0.2)
-    warden (1.1.1)
+    warden (1.2.3)
       rack (>= 1.0)
     websocket (1.0.7)
+    websocket-driver (0.3.0)
     xpath (2.0.0)
       nokogiri (~> 1.3)
+    yajl-ruby (1.1.0)
 
 PLATFORMS
   ruby
@@ -316,18 +382,20 @@ DEPENDENCIES
   couch_potato!
   cucumber-rails
   database_cleaner
-  devise (= 2.0.4)
+  devise (= 3.1.0)
-  devise_simply_stored
+  devise_simply_stored!
+  ember-rails
   factory_girl_rails
+  faye
   guard-rspec
-  haml-rails
   jquery-rails
+  jquery-ui-rails
   kaminari
   letter_opener
   mini_magick
-  mustache
+  orm_adapter!
   poltergeist
-  pry
+  pry-rails
   quiet_assets
   rack-cors
   rails (= 3.2.13)

app/assets/javascripts/supplier/application.js

@@ -1,6 +1,6 @@
 //= require jquery
 //= require jquery_ujs
-//= require jquery-ui
+//= require jquery.ui.all
 //= require jquery.ui.datepicker-en
 //= require jquery.ui.datepicker-nl
 // require bootstrap-transition

app/assets/javascripts/theme1/application.js

@@ -12,7 +12,7 @@
 //
 //= require jquery
 //= require jquery_ujs
-//= require jquery-ui
+//= require jquery.ui.all
 //= require bootstrap
 // require twitter/bootstrap
 //= require_directory .

app/models/administrator.rb

@@ -1,6 +1,5 @@
 class Administrator
   include SimplyStored::Couch
-  include Devise::Orm::SimplyStored
   devise :database_authenticatable, :rememberable #, :recoverable, :rememberable, :trackable, :registerable
 
   view :by_email, key: :email

app/models/section.rb

@@ -3,7 +3,7 @@ class Section
   include Qwaiter::Distribution
 
   property :title
-  property :path, type: Array, default: []
+  property :path, type: Array, default: [[0.0, 0.0], [20.0, 30.0]] # default width 20m height 30m
 
   belongs_to :supplier
   has_many :tables
@@ -46,10 +46,11 @@ class Section
     self.path[0] ||= [0.0, 0.0]
     self.path[1] ||= [0.0, 0.0]
     unless path[1][0] == val
-      self.path[1][0] = val 
+      self.path[1][0] = val
       path_will_change!
     end
   end
+
   def height=(val)
     val = val.to_f
     self.path[0] ||= [0.0, 0.0]

app/models/supplier.rb

@@ -1,6 +1,5 @@
 class Supplier
   include SimplyStored::Couch
-  include Devise::Orm::SimplyStored
   devise :database_authenticatable, :recoverable, :rememberable, :trackable, :registerable, :confirmable
   property :unconfirmed_email
 

app/models/user.rb

@@ -1,6 +1,5 @@
 class User
   include SimplyStored::Couch
-  include Devise::Orm::SimplyStored
 
   property :name
   property :active_list_id

app/views/application/_error_messages.html.slim

@@ -1,7 +1,7 @@
 -if target.errors.any?
   #error_explanation
     .errors-content
-      %h2= t('helpers.forms.errors.title', :count => target.errors.count)
+      h2= t('helpers.forms.errors.title', :count => target.errors.count)
-      %ul
+      ul
         - for message in target.errors.full_messages
-          %li= message
+          li= message

app/views/layouts/phone.html.slim

@@ -32,7 +32,7 @@ html lang="en"
         var $locale = 'en';
         var $asset_path = '/assets/';
         var Qstorage = localStorage;
-        #{Rails.env.production? ? '' : "data_host = 'http://qwaiter.dev';"}
+        #{Rails.env.production? ? '' : "data_host = 'http://localhost:3000';".html_safe }
         var data_host = 'http://localhost:3000';
         QMobile || (QMobile = {
           scanQr: function(){window.location = '/select_qrcode'},

app/views/layouts/tablet.html.slim

@@ -16,14 +16,7 @@ html lang="en"
     link href="/images/apple-touch-icon-72x72.png" rel="apple-touch-icon-precomposed" sizes="72x72"
     link href="/images/apple-touch-icon.png" rel="apple-touch-icon-precomposed"
     link href="/favicon.ico" rel="shortcut icon"
-
+    = render 'suppliers/application/head'
-    javascript:
-      var $locale = '#{I18n.locale}';
-      var supplier_id = '#{current_supplier.id}';
-      var data_host = '';
-      var event_host = '#{event_host}';
-      var datepicker_options = {dateFormat: 'yy-mm-dd', firstDay: #{current_supplier.week_starts_on_monday? ? 1 : 0}};
-      
     = yield :head
 
   body

app/views/supplier/edit.html.slim

@@ -21,7 +21,7 @@
             = f.label :location, class: 'control-label'
             .controls
             = f.text_field :location, class: 'location_picker'
-            = image_tag 'supplier/settings/location-balloon.png'         
+            = image_tag 'supplier/settings/location-balloon.png'
           .control-group
             = f.label :time_zone, class: 'control-label'
             .controls

app/views/suppliers/application/_head.html.erb

@@ -0,0 +1,7 @@
+<script>
+var $locale = '<%= I18n.locale %>';
+var supplier_id = '<%= current_supplier.id %>';
+var data_host = '';
+var event_host = '<%= event_host %>';
+var datepicker_options = {dateFormat: 'yy-mm-dd', firstDay: <%= current_supplier.week_starts_on_monday? ? 1 : 0 %>};
+</script>

app/views/suppliers/tables/index.html.slim

@@ -21,7 +21,7 @@ div.page-header= title :index, model_class
         - @tables.each do |table|
           tr
             td.link= link_to table.number, [:suppliers, table]
-            td.link= link_to_if table.section.present?, table.section.try(:title), [:suppliers, table.section]
+            td.link= link_to_if table.section.present?, table.section.try(:title), tables_view_suppliers_section_path(table.section)
             td.timestamp data-time=table.created_at.utc.iso8601
             td.actions
               = link_to t('helpers.links.edit'), [:edit, :suppliers, table], class: 'btn btn-mini', data: {t: 'helpers.links.edit'}

config/couchdb.yml

@@ -1,9 +1,9 @@
 development:
   validation_framework: :active_model #optional
-  database: qrammer_development
+  database: qwaiter_development
 test:
   validation_framework: :active_model #optional
-  database: qrammer_test
+  database: qwaiter_test
 production:
   validation_framework: :active_model #optional
   database: qwaiter

config/environments/development.rb

@@ -5,13 +5,6 @@ Qwaiter::Application.configure do
   # every request. This slows down response time but is perfect for development
   # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
-  silence_warnings do
-    begin
-        require 'pry'
-        IRB = Pry
-    rescue LoadError
-    end
-  end
 
   # Log error messages when you accidentally call methods on nil.
   config.whiny_nils = true

config/initializers/devise.rb

@@ -1,16 +1,19 @@
 # Use this hook to configure devise mailer, warden hooks and so forth.
 # Many of these configuration options can be set straight in your model.
 Devise.setup do |config|
+  # The secret key used by Devise. Devise uses this key to generate
+  # random tokens. Changing this key will render invalid all existing
+  # confirmation, reset password and unlock tokens in the database.
+  config.secret_key = '43bd9182902186846fbc9bfb99952f7e1a7e4a04e3f0e34042e976649985e101e53799ff6a69738279ac31144d3197be6ba62c92f276c3af5cad7e27d722f91c'
+
   # ==> Mailer Configuration
   # Configure the e-mail address which will be shown in Devise::Mailer,
-  # note that it will be overwritten if you use your own mailer class with default "from" parameter.
+  # note that it will be overwritten if you use your own mailer class
-  config.mailer_sender = 'Qwaiter <service@qwaiter.com>'
+  # with default "from" parameter.
+  config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com'
 
   # Configure the class responsible to send e-mails.
-  # config.mailer = "Devise::Mailer"
+  # config.mailer = 'Devise::Mailer'
-
-  # Automatically apply schema changes in tableless databases
-  config.apply_schema = false
 
   # ==> ORM configuration
   # Load and configure the ORM. Supports :active_record (default) and
@@ -51,17 +54,21 @@ Devise.setup do |config|
   # enable it only for database (email + password) authentication.
   # config.params_authenticatable = true
 
-  # Tell if authentication through HTTP Basic Auth is enabled. False by default.
+  # Tell if authentication through HTTP Auth is enabled. False by default.
   # It can be set to an array that will enable http authentication only for the
   # given strategies, for example, `config.http_authenticatable = [:token]` will
-  # enable it only for token authentication.
+  # enable it only for token authentication. The supported strategies are:
-   # config.http_authenticatable = [:token]
+  # :database      = Support basic authentication with authentication key + password
+  # :token         = Support basic authentication with token authentication key
+  # :token_options = Support token authentication with options as defined in
+  #                  http://api.rubyonrails.org/classes/ActionController/HttpAuthentication/Token.html
+  # config.http_authenticatable = false
 
   # If http headers should be returned for AJAX requests. True by default.
   # config.http_authenticatable_on_xhr = true
 
-  # The realm used in Http Basic Authentication. "Application" by default.
+  # The realm used in Http Basic Authentication. 'Application' by default.
-  # config.http_authentication_realm = "Application"
+  # config.http_authentication_realm = 'Application'
 
   # It will change confirmation, password recovery and other workflows
   # to behave the same regardless if the e-mail provided was right or wrong.
@@ -75,6 +82,12 @@ Devise.setup do |config|
   # passing :skip => :sessions to `devise_for` in your config/routes.rb
   config.skip_session_storage = [:http_auth]
 
+  # By default, Devise cleans up the CSRF token on authentication to
+  # avoid CSRF token fixation attacks. This means that, when using AJAX
+  # requests for sign in and sign up, you need to get a new CSRF token
+  # from the server. You can disable this option at your own risk.
+  # config.clean_up_csrf_token_on_authentication = true
+
   # ==> Configuration for :database_authenticatable
   # For bcrypt, this is the cost for hashing the password and defaults to 10. If
   # using other encryptors, it sets how many times you want the password re-encrypted.
@@ -85,7 +98,7 @@ Devise.setup do |config|
   config.stretches = Rails.env.test? ? 1 : 10
 
   # Setup a pepper to generate the encrypted password.
-  # config.pepper = "0645e56df1cf3f1fabb289964a240de9069b044768999ea2bec0ff49794c0613273f9a29c013f47574c9c225b0d5dbe9a8d961ba49dd9a3e878a0da539905b56"
+  # config.pepper = '2d7486d586fab8cd5b61566b8435f3de36e40ca6b15235fd39be9412bd4d478a67e157f855bdd14dde2057d443c7db30574e8cb02f948b99662f02b54a888770'
 
   # ==> Configuration for :confirmable
   # A period that the user is allowed to access the website even without
@@ -95,7 +108,15 @@ Devise.setup do |config|
   # the user cannot access the website without confirming his account.
   # config.allow_unconfirmed_access_for = 2.days
 
-  # If true, requires any email changes to be confirmed (exctly the same way as
+  # A period that the user is allowed to confirm their account before their
+  # token becomes invalid. For example, if set to 3.days, the user can confirm
+  # their account within 3 days after the mail was sent, but on the fourth day
+  # their account can't be confirmed with the token any more.
+  # Default is nil, meaning there is no restriction on how long a user can take
+  # before confirming their account.
+  # config.confirm_within = 3.days
+
+  # If true, requires any email changes to be confirmed (exactly the same way as
   # initial account confirmation) to be applied. Requires additional unconfirmed_email
   # db field (see migrations). Until confirmed new email is stored in
   # unconfirmed email column, and copied to email column on successful confirmation.
@@ -111,20 +132,16 @@ Devise.setup do |config|
   # If true, extends the user's remember period when remembered via cookie.
   # config.extend_remember_period = false
 
-  # If true, uses the password salt as remember token. This should be turned
-  # to false if you are not using database authenticatable.
-  config.use_salt_as_remember_token = true
-
   # Options to be passed to the created cookie. For instance, you can set
   # :secure => true in order to force SSL only cookies.
-  # config.cookie_options = {}
+  # config.rememberable_options = {}
 
   # ==> Configuration for :validatable
-  # Range for password length. Default is 6..128.
+  # Range for password length. Default is 8..128.
-  # config.password_length = 6..128
+  config.password_length = 8..128
 
   # Email regex used to validate email formats. It simply asserts that
-  # an one (and only one) @ exists in the given string. This is mainly
+  # one (and only one) @ exists in the given string. This is mainly
   # to give user feedback and not to assert the e-mail validity.
   # config.email_regexp = /\A[^@]+@[^@]+\z/
 
@@ -133,6 +150,9 @@ Devise.setup do |config|
   # time the user will be asked for credentials again. Default is 30 minutes.
   # config.timeout_in = 30.minutes
 
+  # If true, expires auth token on session timeout.
+  # config.expire_auth_token_on_timeout = false
+
   # ==> Configuration for :lockable
   # Defines which strategy will be used to lock an account.
   # :failed_attempts = Locks an account after a number of failed attempts to sign in.
@@ -171,27 +191,28 @@ Devise.setup do |config|
   # :sha1, :sha512 or encryptors from others authentication tools as :clearance_sha1,
   # :authlogic_sha512 (then you should set stretches above to 20 for default behavior)
   # and :restful_authentication_sha1 (then you should set stretches to 10, and copy
-  # REST_AUTH_SITE_KEY to pepper)
+  # REST_AUTH_SITE_KEY to pepper).
+  #
+  # Require the `devise-encryptable` gem when using anything other than bcrypt
   # config.encryptor = :sha512
 
   # ==> Configuration for :token_authenticatable
   # Defines name of the authentication token params key
-  config.token_authentication_key = :auth_token
+  # config.token_authentication_key = :auth_token
 
   # ==> Scopes configuration
   # Turn scoped views on. Before rendering "sessions/new", it will first check for
   # "users/sessions/new". It's turned off by default because it's slower if you
   # are using only default views.
-  config.scoped_views = true
+  # config.scoped_views = false
 
   # Configure the default scope given to Warden. By default it's the first
   # devise role declared in your routes (usually :user).
-  config.default_scope = :supplier
+  # config.default_scope = :user
 
-  # Configure sign_out behavior.
+  # Set this configuration to false if you want /users/sign_out to sign out
-  # Sign_out action can be scoped (i.e. /users/sign_out affects only :user scope).
+  # only the current scope. By default, Devise signs out all scopes.
-  # The default is true, which means any logout action will sign out all active scopes.
+  # config.sign_out_all_scopes = true
-  config.sign_out_all_scopes = false
 
   # ==> Navigation configuration
   # Lists the formats that should be treated as navigational. Formats like
@@ -202,10 +223,10 @@ Devise.setup do |config|
   # should add them to the navigational formats lists.
   #
   # The "*/*" below is required to match Internet Explorer requests.
-  # config.navigational_formats = ["*/*", :html]
+  # config.navigational_formats = ['*/*', :html]
 
   # The default HTTP method used to sign out a resource. Default is :delete.
-  config.sign_out_via = [:delete, :get]
+  config.sign_out_via = :delete
 
   # ==> OmniAuth
   # Add a new OmniAuth provider. Check the wiki for more information on setting
@@ -220,4 +241,18 @@ Devise.setup do |config|
   #   manager.intercept_401 = false
   #   manager.default_strategies(:scope => :user).unshift :some_external_strategy
   # end
+
+  # ==> Mountable engine configurations
+  # When using Devise inside an engine, let's call it `MyEngine`, and this engine
+  # is mountable, there are some extra configurations to be taken into account.
+  # The following options are available, assuming the engine is mounted as:
+  #
+  #     mount MyEngine, at: '/my_engine'
+  #
+  # The router that invoked `devise_for`, in the example above, would be:
+  # config.router_name = :my_engine
+  #
+  # When using omniauth, Devise cannot automatically set Omniauth path,
+  # so you need to do it manually. For the users scope, it would be:
+  # config.omniauth_path_prefix = '/my_engine/users/auth'
 end

config/locales/devise.en.yml

@@ -1,71 +1,60 @@
 # Additional translations at https://github.com/plataformatec/devise/wiki/I18n
 
 en:
+  devise:
+    confirmations:
+      confirmed: "Your account was successfully confirmed. Please sign in."
+      confirmed_and_signed_in: "Your account was successfully confirmed. You are now signed in."
+      send_instructions: "You will receive an email with instructions about how to confirm your account in a few minutes."
+      send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions about how to confirm your account in a few minutes."
+    failure:
+      already_authenticated: "You are already signed in."
+      inactive: "Your account is not activated yet."
+      invalid: "Invalid email or password."
+      invalid_token: "Invalid authentication token."
+      locked: "Your account is locked."
+      not_found_in_database: "Invalid email or password."
+      timeout: "Your session expired. Please sign in again to continue."
+      unauthenticated: "You need to sign in or sign up before continuing."
+      unconfirmed: "You have to confirm your account before continuing."
+    mailer:
+      confirmation_instructions:
+        subject: "Confirmation instructions"
+      reset_password_instructions:
+        subject: "Reset password instructions"
+      unlock_instructions:
+        subject: "Unlock Instructions"
+    omniauth_callbacks:
+      failure: "Could not authenticate you from %{kind} because \"%{reason}\"."
+      success: "Successfully authenticated from %{kind} account."
+    passwords:
+      no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided."
+      send_instructions: "You will receive an email with instructions about how to reset your password in a few minutes."
+      send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes."
+      updated: "Your password was changed successfully. You are now signed in."
+      updated_not_active: "Your password was changed successfully."
+    registrations:
+      destroyed: "Bye! Your account was successfully cancelled. We hope to see you again soon."
+      signed_up: "Welcome! You have signed up successfully."
+      signed_up_but_inactive: "You have signed up successfully. However, we could not sign you in because your account is not yet activated."
+      signed_up_but_locked: "You have signed up successfully. However, we could not sign you in because your account is locked."
+      signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please open the link to activate your account."
+      update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and click on the confirm link to finalize confirming your new email address."
+      updated: "You updated your account successfully."
+    sessions:
+      signed_in: "Signed in successfully."
+      signed_out: "Signed out successfully."
+    unlocks:
+      send_instructions: "You will receive an email with instructions about how to unlock your account in a few minutes."
+      send_paranoid_instructions: "If your account exists, you will receive an email with instructions about how to unlock it in a few minutes."
+      unlocked: "Your account has been unlocked successfully. Please sign in to continue."
   errors:
     messages:
+      already_confirmed: "was already confirmed, please try signing in"
+      confirmation_period_expired: "needs to be confirmed within %{period}, please request a new one"
       expired: "has expired, please request a new one"
       not_found: "not found"
-      already_confirmed: "was already confirmed, please try signing in"
       not_locked: "was not locked"
       not_saved:
         one: "1 error prohibited this %{resource} from being saved:"
         other: "%{count} errors prohibited this %{resource} from being saved:"
-
-  devise:
-    failure:
-      already_authenticated: 'You are already signed in.'
-      unauthenticated: 'You need to sign in or sign up before continuing.'
-      unconfirmed: 'You have to confirm your account before continuing.'
-      locked: 'Your account is locked.'
-      invalid: 'Invalid email or password.'
-      invalid_token: 'Invalid authentication token.'
-      timeout: 'Your session expired, please sign in again to continue.'
-      inactive: 'Your account was not activated yet.'
-    sessions:
-      title: Sign in
-      button: Sign in
-      remember_me: Remember me
-      forgot_your_password: 'Forgot your password?'
-      signed_in: 'Signed in successfully.'
-      signed_out: 'Signed out successfully.'
-    passwords:
-      title: Forgot your password?
-      button: 'Send me reset password instructions'
-      send_instructions: 'You will receive an email with instructions about how to reset your password in a few minutes.'
-      updated: 'Your password was changed successfully. You are now signed in.'
-      updated_not_active: 'Your password was changed successfully.'
-      send_paranoid_instructions: "If your e-mail exists on our database, you will receive a password recovery link on your e-mail"
-      edit:
-        title: 'Change your password'
-        button: 'Change my password' 
-    confirmations:
-      did_not_receive_instructions_link: "Didn't receive confirmation instructions?"
-      send_instructions: 'You will receive an email with instructions about how to confirm your account in a few minutes.'
-      send_paranoid_instructions: 'If your e-mail exists on our database, you will receive an email with instructions about how to confirm your account in a few minutes.'
-      confirmed: 'Your account was successfully confirmed. You are now signed in.'
-    registrations:
-      title: Sign up
-      button: Sign up
-      signed_up: 'Welcome! You have signed up successfully.'
-      signed_up_but_unconfirmed: 'A message with a confirmation link has been sent to your email address. Please open the link to activate your account.'
-      signed_up_but_inactive: 'You have signed up successfully. However, we could not sign you in because your account is not yet activated.'
-      signed_up_but_locked: 'You have signed up successfully. However, we could not sign you in because your account is locked.'
-      updated: 'You updated your account successfully.'
-      update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and click on the confirm link to finalize confirming your new email address."
-      destroyed: 'Bye! Your account was successfully cancelled. We hope to see you again soon.'
-    unlocks:
-      did_not_receive_instructions_link: "Didn't receive unlock instructions?"
-      send_instructions: 'You will receive an email with instructions about how to unlock your account in a few minutes.'
-      unlocked: 'Your account has been unlocked successfully. Please sign in to continue.'
-      send_paranoid_instructions: 'If your account exists, you will receive an email with instructions about how to unlock it in a few minutes.'
-    omniauth_callbacks:
-      sign_in_with: "Sign in with %{provider}"
-      success: 'Successfully authorized from %{kind} account.'
-      failure: 'Could not authorize you from %{kind} because "%{reason}".'
-    mailer:
-      confirmation_instructions:
-        subject: 'Confirmation instructions'
-      reset_password_instructions:
-        subject: 'Reset password instructions'
-      unlock_instructions:
-        subject: 'Unlock Instructions'