Add locale data, update user decorator

Author: Natacha Ségala

Gemfile

@@ -66,6 +66,7 @@ group :development, :test do
 end
 
 group :development do
+  gem 'guard-rspec', require: false
   # Access an IRB console on exception pages or by using <%= console %> anywhere in the code.
   gem 'web-console', '>= 3.3.0'
   gem 'listen', '>= 3.0.5', '< 3.2'

Gemfile.lock

@@ -73,6 +73,7 @@ GEM
     climate_control (0.2.0)
     cocaine (0.5.8)
       climate_control (>= 0.0.3, < 1.0)
+    coderay (1.1.2)
     coffee-rails (4.2.2)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0)
@@ -111,10 +112,25 @@ GEM
       factory_girl (~> 4.9.0)
       railties (>= 3.0.0)
     ffi (1.9.18)
+    formatador (0.2.5)
     geocoder (1.4.4)
     get_process_mem (0.2.1)
     globalid (0.4.1)
       activesupport (>= 4.2.0)
+    guard (2.14.2)
+      formatador (>= 0.2.4)
+      listen (>= 2.7, < 4.0)
+      lumberjack (>= 1.0.12, < 2.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
+      pry (>= 0.9.12)
+      shellany (~> 0.0)
+      thor (>= 0.18.1)
+    guard-compat (1.2.1)
+    guard-rspec (4.7.3)
+      guard (~> 2.1)
+      guard-compat (~> 1.1)
+      rspec (>= 2.99.0, < 4.0)
     heapy (0.1.3)
     i18n (0.9.1)
       concurrent-ruby (~> 1.0)
@@ -142,6 +158,7 @@ GEM
     loofah (2.1.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
+    lumberjack (1.0.12)
     mail (2.7.0)
       mini_mime (>= 0.1.1)
     memory_profiler (0.9.8)
@@ -155,9 +172,13 @@ GEM
     minitest (5.10.3)
     multi_json (1.12.2)
     mysql2 (0.4.10)
+    nenv (0.3.0)
     nio4r (2.1.0)
     nokogiri (1.8.1)
       mini_portile2 (~> 2.3.0)
+    notiffany (0.1.1)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
     orm_adapter (0.5.0)
     paperclip (5.1.0)
       activemodel (>= 4.2.0)
@@ -166,6 +187,9 @@ GEM
       mime-types
       mimemagic (~> 0.3.0)
     pg (0.21.0)
+    pry (0.11.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
     public_suffix (3.0.1)
     puma (3.10.0)
     rack (2.0.3)
@@ -203,6 +227,10 @@ GEM
     responders (2.4.0)
       actionpack (>= 4.2.0, < 5.3)
       railties (>= 4.2.0, < 5.3)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
     rspec-core (3.7.0)
       rspec-support (~> 3.7.0)
     rspec-expectations (3.7.0)
@@ -236,6 +264,7 @@ GEM
     selenium-webdriver (3.7.0)
       childprocess (~> 0.5)
       rubyzip (~> 1.0)
+    shellany (0.0.1)
     shoulda (3.5.0)
       shoulda-context (~> 1.0, >= 1.0.1)
       shoulda-matchers (>= 1.4.1, < 3.0)
@@ -300,6 +329,7 @@ DEPENDENCIES
   devise
   factory_girl_rails
   geocoder
+  guard-rspec
   jbuilder (~> 2.5)
   jquery-rails
   letter_opener_web

Guardfile

@@ -0,0 +1,70 @@
+  # A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+## Uncomment and set this to only include directories you want to watch
+# directories %w(app lib config test spec features) \
+#  .select{|d| Dir.exists?(d) ? d : UI.warning("Directory #{d} does not exist")}
+
+## Note: if you are using the `directories` clause above and you are not
+## watching the project directory ('.'), then you will want to move
+## the Guardfile to a watched dir and symlink it back, e.g.
+#
+#  $ mkdir config
+#  $ mv Guardfile config/
+#  $ ln -s config/Guardfile .
+#
+# and, you'll have to watch "config/Guardfile" instead of "Guardfile"
+
+# Note: The cmd option is now required due to the increasing number of ways
+#       rspec may be run, below are examples of the most common uses.
+#  * bundler: 'bundle exec rspec'
+#  * bundler binstubs: 'bin/rspec'
+#  * spring: 'bin/rspec' (This will use spring if running and you have
+#                          installed the spring binstubs per the docs)
+#  * zeus: 'zeus rspec' (requires the server to be started separately)
+#  * 'just' rspec: 'rspec'
+
+guard :rspec, cmd: "bundle exec rspec" do
+  require "guard/rspec/dsl"
+  dsl = Guard::RSpec::Dsl.new(self)
+
+  # Feel free to open issues for suggestions and improvements
+
+  # RSpec files
+  rspec = dsl.rspec
+  watch(rspec.spec_helper) { rspec.spec_dir }
+  watch(rspec.spec_support) { rspec.spec_dir }
+  watch(rspec.spec_files)
+
+  # Ruby files
+  ruby = dsl.ruby
+  dsl.watch_spec_files_for(ruby.lib_files)
+
+  # Rails files
+  rails = dsl.rails(view_extensions: %w(erb haml slim))
+  dsl.watch_spec_files_for(rails.app_files)
+  dsl.watch_spec_files_for(rails.views)
+
+  watch(rails.controllers) do |m|
+    [
+      rspec.spec.call("routing/#{m[1]}_routing"),
+      rspec.spec.call("controllers/#{m[1]}_controller"),
+      rspec.spec.call("acceptance/#{m[1]}")
+    ]
+  end
+
+  # Rails config changes
+  watch(rails.spec_helper)     { rspec.spec_dir }
+  watch(rails.routes)          { "#{rspec.spec_dir}/routing" }
+  watch(rails.app_controller)  { "#{rspec.spec_dir}/controllers" }
+
+  # Capybara features specs
+  watch(rails.view_dirs)     { |m| rspec.spec.call("features/#{m[1]}") }
+  watch(rails.layouts)       { |m| rspec.spec.call("features/#{m[1]}") }
+
+  # Turnip features and steps
+  watch(%r{^spec/acceptance/(.+)\.feature$})
+  watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$}) do |m|
+    Dir[File.join("**/#{m[1]}.feature")][0] || "spec/acceptance"
+  end
+end

ProcFile

@@ -1 +1,2 @@
-web: bundle exec puma -C config/puma.rb
+web: bundle exec rails s
+webpacker: webpack-dev-server --port 5001

app/controllers/registrations_controller.rb

@@ -58,19 +58,8 @@ def update
     self.resource = resource_class.to_adapter.get!(send(:"current_#{resource_name}").to_key)
     prev_unconfirmed_email = resource.unconfirmed_email if resource.respond_to?(:unconfirmed_email)
 
-    if account_update_params[:programs].present?
-      programs = account_update_params[:programs].map { |n| Program.find_by_name(n) }
-      params = account_update_params.merge!(:programs => programs)
-    else
-      params = account_update_params
-    end
-
-    if account_update_params[:password].present?
-      resource_updated = update_resource(resource, params)
-    else
-      params = params.except(:password, :password_confirmation, :current_password)
-      resource_updated = resource.update_attributes(params)
-    end
+    proxy_update_resource = Proc.new { |resource, params| update_resource(resource, params) }
+    resource_updated = User.update(account_update_params, resource, proxy_update_resource)
 
     yield resource if block_given?
     if resource_updated
@@ -136,7 +125,7 @@ def account_update_params
         :city,
         :thumbnail_image,
         :timezone,
-        :languages => '',
+        :languages => [],
         :programs => []
     )
   end

app/controllers/test_controller.rb

@@ -13,7 +13,7 @@ def show
 
     @data = {
         :programs => programs,
-        :currentUser => user,
+        :currentUser => current_user,
         :timezones => timezones,
         :languages => languages
     }

app/controllers/user_profiles_controller.rb

@@ -47,10 +47,15 @@ def decorate
         :last_logged_in => last_logged_in,
         :thumbnail_image => picture,
         :description => description,
-        :timezone => timezone
+        :timezone => timezone,
+        :languages => languages
     }.merge(availabilities_hash)
   end
 
+  def languages
+    user.languages.pluck(:name)
+  end
+
   def timezone
     user.timezone
   end

app/decorators/user_decorator.rb

@@ -45,16 +45,14 @@ class AvailabilitiesTable extends Component {
           </TableRowColumn>
           <TableRowColumn>
             <FormattedMessage
-              id='Availabilities.tableFrom'
+              id='from'
               defaultMessage='From'
-              values={ { start_time } }
             />
           </TableRowColumn>
           <TableRowColumn>
             <FormattedMessage
-              id='Availabilities.tableTo'
+              id='to'
               defaultMessage='To'
-              values={ { end_time } }
             />
           </TableRowColumn>
           <TableRowColumn >
@@ -143,13 +141,13 @@ class AvailabilitiesTable extends Component {
                 </TableHeaderColumn>
                 <TableHeaderColumn key='start_time'>
                   <FormattedMessage
-                    id='Availabilities.startTime'
+                    id='startTime'
                     defaultMessage='Start Time'
                   />
                 </TableHeaderColumn>
                 <TableHeaderColumn key='end_time'>
                   <FormattedMessage
-                    id='Availabilities.endTime'
+                    id='endTime'
                     defaultMessage='End Time'
                   />
                 </TableHeaderColumn>

app/javascript/components/AvailabilitiesTable.js

@@ -3,6 +3,7 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import Paper from 'material-ui/Paper';
 import RaisedButton from 'material-ui/RaisedButton';
+import { FormattedMessage } from 'react-intl';
 
 import Header from './Header';
 import AvailabilitiesTable from './AvailabilitiesTable';
@@ -24,9 +25,12 @@ class AvailabilityIndexPage extends Component {
         <Header currentUser={ currentUser } />
         <Paper zDepth={ 1 } style={ paperMarginOverride } rounded={ false }>
           <div className='availabilityIndexContainer'>
-            I can help with:
+            <FormattedMessage
+              id='AvailabilityIndexPage.Help'
+              defaultMessage='I can help with'
+            />
             <ul className='availabilityIndexListContainer'>
-              { _.map(this.props.programs, ({ name }) => <li className='availabilityListItem' key={name}>{ name }</li>) }
+              { _.map(this.props.programs, ({ name }) => <li className='availabilityListItem' key={ name }>{ name }</li>) }
             </ul>
 
             { this.renderAvailabilities() }
@@ -52,7 +56,12 @@ class AvailabilityIndexPage extends Component {
     } else {
       return (
         <a href='/availabilities/new' >
-          <RaisedButton primary label='Create new availabilities' className='conversationButton' />
+          <RaisedButton primary className='conversationButton' >
+            <FormattedMessage
+              id='availabilityCreateNew'
+              defaultMessage='Create new availabilities'
+            />
+          </RaisedButton>
         </a>
       );
     }

app/javascript/components/AvailabilityIndexPage.js

@@ -9,6 +9,7 @@ import MenuItem from 'material-ui/MenuItem';
 import Subheader from 'material-ui/Subheader';
 import Avatar from 'material-ui/Avatar';
 import { Link } from 'react-router-dom';
+import { FormattedMessage } from 'react-intl';
 
 import { List, ListItem } from 'material-ui/List';
 import RaisedButton from 'material-ui/RaisedButton';
@@ -66,21 +67,33 @@ class ConversationIndexPage extends Component {
         if (client) {
           return (
             <a href='/search' >
-              <RaisedButton primary label='Search for volunteers' className='conversationButton' />
+              <RaisedButton primary label='' className='conversationButton' >
+                <FormattedMessage
+                  id='ConversationIndexPage.Search'
+                  defaultMessage='Search for volunteers'
+                />
+              </RaisedButton>
             </a>
           );
         } else if (volunteer) {
           return (
             <a href='/availabilities/new' >
-              <RaisedButton primary label='Create new availabilities' className='conversationButton' />
+              <RaisedButton primary className='conversationButton' >
+                <FormattedMessage
+                  id='availabilityCreateNew'
+                />
+              </RaisedButton>
             </a>
           );
         }
       }();
       return (
         <List >
           <Subheader >
-            No Message Available
+            <FormattedMessage
+              id='ConversationIndexPage.NoMessage'
+              defaultMessage=' No Message Available'
+            />
           </Subheader>
           { button }
         </List>
@@ -120,7 +133,10 @@ class ConversationIndexPage extends Component {
         <IconMenu iconButtonElement={ iconButtonElement } >
           <MenuItem>
             <Link className='conversationIndexPageLink' to={ { pathname: '/messages/new', query: { recipient: newMessageRecipient, userName: newMessageFirstName } } } >
-              Reply
+              <FormattedMessage
+                id='messageReply'
+                defaultMessage='Reply'
+              />
             </Link>
           </MenuItem>
         </IconMenu>