Merge remote-tracking branch 'fsmanuel/master' into master.

Updated migration date to today.

Conflicts:
	db/schema.rb

Gemfile

@@ -37,7 +37,7 @@ gem 'simple-navigation-bootstrap'
 gem 'meta_search'
 gem 'acts_as_versioned', git: 'git://github.com/technoweenie/acts_as_versioned.git' # Use this instead of rubygem
 gem 'acts_as_tree'
-gem 'acts_as_configurable', git: 'git://github.com/bwalding/acts_as_configurable.git'
+gem "rails-settings-cached", "0.2.4"
 gem 'resque'
 gem 'whenever', require: false # For defining cronjobs, see config/schedule.rb
 
@@ -52,7 +52,8 @@ group :development do
   # Better error output
   gem 'better_errors'
   gem 'binding_of_caller'
-
+  # gem "rails-i18n-debug"
+  
   # Re-enable rails benchmarker/profiler
   gem 'ruby-prof'
   gem 'test-unit'
@@ -70,3 +71,7 @@ group :development do
   # Avoid having content-length warnings
   gem 'thin'
 end
+
+# Gems left for backwards compatibility
+gem 'acts_as_configurable', git: 'git://github.com/bwalding/acts_as_configurable.git' # user settings migration needs it
+

Gemfile.lock

@@ -97,7 +97,7 @@ GEM
     has_scope (0.5.1)
     hashery (2.0.1)
     highline (1.6.19)
-    hike (1.2.1)
+    hike (1.2.3)
     i18n (0.6.1)
     inherited_resources (1.3.1)
       has_scope (~> 0.5.0)
@@ -136,7 +136,7 @@ GEM
       polyamorous (~> 0.5.0)
     mime-types (1.21)
     mono_logger (1.1.0)
-    multi_json (1.7.3)
+    multi_json (1.7.6)
     mysql2 (0.3.11)
     net-scp (1.1.1)
       net-ssh (>= 2.6.5)
@@ -174,6 +174,8 @@ GEM
       activesupport (= 3.2.13)
       bundler (~> 1.0)
       railties (= 3.2.13)
+    rails-settings-cached (0.2.4)
+      rails (>= 3.0.0)
     railties (3.2.13)
       actionpack (= 3.2.13)
       activesupport (= 3.2.13)
@@ -209,7 +211,7 @@ GEM
       activesupport (>= 2.3.2)
     simple-navigation-bootstrap (0.0.4)
       simple-navigation (>= 3.7.0)
-    simple_form (2.0.3)
+    simple_form (2.1.0)
       actionpack (~> 3.0)
       activemodel (~> 3.0)
     sinatra (1.3.6)
@@ -285,6 +287,7 @@ DEPENDENCIES
   prawn
   quiet_assets
   rails (~> 3.2.9)
+  rails-settings-cached (= 0.2.4)
   resque
   ruby-prof
   sass-rails (~> 3.2.3)

app/assets/stylesheets/bootstrap_and_overrides.css.less

@@ -220,3 +220,21 @@ tr.unavailable {
   dt { width: 160px; }
   dd { margin-left: 170px; }
 }
+
+.settings {
+  .settings-group {
+    margin-bottom: 10px;
+    .control-label {
+      margin: 5px 0 0 0;
+    }
+  }
+  .control-group {
+    margin-bottom: 5px;
+  }
+  .control-group.h_wrapper {
+    margin-bottom: 5px;
+  }
+  .control-group.select {
+    margin-bottom: 15px
+  }
+}

app/controllers/application_controller.rb

@@ -1,10 +1,13 @@
 # encoding: utf-8
 class ApplicationController < ActionController::Base
+  include Foodsoft::ControllerExtensions::Locale
+  helper_method :available_locales
 
   protect_from_forgery
-  before_filter :select_language, :select_foodcoop, :authenticate, :store_controller, :items_per_page, :set_redirect_to
+  before_filter  :select_foodcoop, :authenticate, :store_controller, :items_per_page, :set_redirect_to
   after_filter  :remove_controller
 
+  
   # Returns the controller handling the current request.
   def self.current
     Thread.current[:application_controller]
@@ -26,7 +29,7 @@ class ApplicationController < ActionController::Base
     redirect_to login_url, :alert => 'Access denied!'
   end
 
-  private  
+  private
 
   def authenticate(role = 'any')
     # Attempt to retrieve authenticated user from controller instance or session...
@@ -141,9 +144,5 @@ class ApplicationController < ActionController::Base
   def default_url_options(options = {})
     {foodcoop: FoodsoftConfig.scope}
   end
-
+  
-  # Used to prevent accidently switching to :en in production mode.
-  def select_language
-    I18n.locale = :de
-  end
 end

app/controllers/home_controller.rb

@@ -16,6 +16,7 @@ class HomeController < ApplicationController
 
   def update_profile
     if @current_user.update_attributes(params[:user])
+      session[:locale] = @current_user.locale
       redirect_to my_profile_url, notice: I18n.t('home.changes_saved')
     else
       render :profile

app/controllers/login_controller.rb

@@ -58,6 +58,7 @@ class LoginController < ApplicationController
         if @user.save
           Membership.new(:user => @user, :group => @invite.group).save!
           @invite.destroy
+          session[:locale] = @user.locale
           redirect_to login_url, notice: I18n.t('login.controller.accept_invitation.notice')
         end
       end

app/controllers/sessions_controller.rb

@@ -11,6 +11,8 @@ class SessionsController < ApplicationController
     if user
       session[:user_id] = user.id
       session[:scope] = FoodsoftConfig.scope  # Save scope in session to not allow switching between foodcoops with one account
+      session[:locale] = user.locale
+
       if session[:return_to].present?
         redirect_to_url = session[:return_to]
         session[:return_to] = nil

app/models/user.rb

@@ -3,6 +3,7 @@
 require 'digest/sha1'
 # specific user rights through memberships (see Group)
 class User < ActiveRecord::Base
+  include RailsSettings::Extend
   #TODO: acts_as_paraniod ??
   
   has_many :memberships, :dependent => :destroy
@@ -19,8 +20,11 @@ class User < ActiveRecord::Base
   has_many :pages, :foreign_key => 'updated_by'
   has_many :created_orders, :class_name => 'Order', :foreign_key => 'created_by_user_id', :dependent => :nullify
   
-  attr_accessor :password, :setting_attributes
+  attr_accessor :password, :settings_attributes
-
+  
+  # makes the current_user (logged-in-user) available in models
+  cattr_accessor :current_user
+  
   validates_presence_of :nick, :email
   validates_presence_of :password, :on => :create
   validates_length_of :nick, :in => 2..25
@@ -32,53 +36,37 @@ class User < ActiveRecord::Base
   validates_length_of :password, :in => 5..25, :allow_blank => true
 
   before_validation :set_password
-  after_save :update_settings
+  after_initialize do
-
+    settings.defaults['profile']  = { 'language' => I18n.default_locale } unless settings.profile
-  # Adds support for configuration settings (through "settings" attribute).
+    settings.defaults['messages'] = { 'send_as_email' => true }           unless settings.messages
-  acts_as_configurable
+    settings.defaults['notify']   = { 'upcoming_tasks' => true  }         unless settings.notify
-  
-  # makes the current_user (logged-in-user) available in models
-  cattr_accessor :current_user
-  
-  # User settings keys
-  # returns the User-settings and the translated description
-  def self.setting_keys
-    {
-      "notify.orderFinished" => I18n.t('model.user.notify.order_finished'),
-      "notify.negativeBalance" => I18n.t('model.user.notify.negative_balance'),
-      "notify.upcoming_tasks" => I18n.t('model.user.notify.upcoming_tasks'),
-      "messages.sendAsEmail" => I18n.t('model.user.notify.send_as_email'),
-      "profile.phoneIsPublic" => I18n.t('model.user.notify.phone_is_public'),
-      "profile.emailIsPublic" => I18n.t('model.user.notify.email_is_public'),
-      "profile.nameIsPublic" => I18n.t('model.user.notify.name_is_public')
-    }
   end
-  # retuns the default setting for a NEW user
+  
-  # for old records nil will returned
+  after_save do
-  # TODO: integrate default behaviour in acts_as_configurable plugin
+    return if settings_attributes.nil?
-  def settings_default(setting)
+    settings_attributes.each do |key, value|
-    # define a default for the settings
+      value.each do |k, v|
-    defaults = {
+        case v
-      "messages.sendAsEmail" => true,
+          when '1'
-      "notify.upcoming_tasks" => true
+            value[k] = true
-    }
+          when '0' 
-    return true if self.new_record? && defaults[setting]
+            value[k] = false
-  end
+        end
-
-  def update_settings
-    unless setting_attributes.nil?
-      for setting in User::setting_keys.keys
-        self.settings[setting] = setting_attributes[setting] && setting_attributes[setting] == '1' ? '1' : nil
       end
+      self.settings.merge!(key, value)
     end
   end
   
+  def locale
+    settings.profile['language']
+  end
+  
   def name
     [first_name, last_name].join(" ")
   end
 
   def receive_email?
-    settings['messages.sendAsEmail'] == "1" && email.present?
+    settings.messages['send_as_email'] == "1" && email.present?
   end
   
   # Sets the user's password. It will be stored encrypted along with a random salt.

app/views/admin/users/show.html.haml

@@ -20,10 +20,10 @@
     .well
       %h4= t '.preference'
       %table.table
-        - for setting in User::setting_keys.keys
+        - @user.settings.profile.each do |key, setting|
           %tr
-            %td= User::setting_keys[setting]
+            %td= t("simple_form.labels.settings.profile.#{key}")
-            %td= @user.settings[setting] == '1' ? t('simple_form.yes') : t('simple_form.no')
+            %td= (setting != true and setting != false) ? setting : (setting === true ? t('simple_form.yes') : t('simple_form.no'))
   .span3
     .well
       %h4= t '.groupabos'

app/views/foodcoop/users/_users.html.haml

@@ -14,9 +14,9 @@
     - for user in @users
       %tr
         %td= user.nick
-        %td= user.name if @current_user.role_admin? || user.settings["profile.nameIsPublic"] == '1'
+        %td= user.name  if @current_user.role_admin? || user.settings.profile["name_is_public"]
-        %td= user.email if @current_user.role_admin? ||  user.settings["profile.emailIsPublic"] == '1'
+        %td= user.email if @current_user.role_admin? || user.settings.profile["email_is_public"]
-        %td= user.phone if @current_user.role_admin? ||  user.settings["profile.phoneIsPublic"] == '1'
+        %td= user.phone if @current_user.role_admin? || user.settings.profile["phone_is_public"]
         %td= user.ordergroup_name
         %td= user.workgroups.collect(&:name).join(', ')
         %td= link_to_new_message(message_params: {mail_to: user.id})

app/views/shared/_user_form_fields.html.haml

@@ -5,11 +5,31 @@
 = f.input :phone
 = f.input :password, :required => f.object.new_record?
 = f.input :password_confirmation
-.control-group
+
-  .controls
+= f.simple_fields_for :settings_attributes do |s|
-    - for setting in User::setting_keys.keys
+  = s.simple_fields_for :profile, defaults: { inline_label: true } do |profile|
-      %label.checkbox{:for => "user[setting_attributes][#{setting}]"}
+    = profile.input 'language', as: :select,  collection: available_locales, required: false, selected: f.object.settings.profile['language']
-        = hidden_field_tag "user[setting_attributes][#{setting}]", '0'
+  
-        = check_box_tag "user[setting_attributes][#{setting}]", '1',
+  .settings
-        f.object.settings[setting] == '1' || f.object.settings_default(setting)
+    .settings-group
-        = User::setting_keys[setting]
+      = s.simple_fields_for :profile, defaults: { inline_label: true } do |profile|
+
+        %div{class: 'control-group h_wrapper'}
+          %h5{class: 'controls'}
+            = t 'simple_form.labels.settings.settings_group.privacy'
+        = profile.input 'phone_is_public',  as: :boolean, label: false, input_html: { checked: f.object.settings.profile['phone_is_public'] }
+        = profile.input 'email_is_public',  as: :boolean, label: false, input_html: { checked: f.object.settings.profile['email_is_public'] }
+        = profile.input 'name_is_public',   as: :boolean, label: false, input_html: { checked: f.object.settings.profile['name_is_public'] }
+  
+    .settings-group
+      %div{class: 'control-group'}
+        %h5{class: 'controls'}
+          = t 'simple_form.labels.settings.settings_group.messages'
+        
+      = s.simple_fields_for :messages, defaults: { inline_label: true, label: false } do |messages|
+        = messages.input 'send_as_email',   as: :boolean, input_html: { checked: f.object.settings.messages['send_as_email'] }
+      = s.simple_fields_for :notify, defaults: { inline_label: true, label: false } do |notify|
+        = notify.input 'order_finished',    as: :boolean, input_html: { checked: f.object.settings.notify['order_finished'] }
+        = notify.input 'negative_balance',  as: :boolean, input_html: { checked: f.object.settings.notify['negative_balance'] }
+        = notify.input 'upcoming_tasks',    as: :boolean, input_html: { checked: f.object.settings.notify['upcoming_tasks'] }
+

app/workers/user_notifier.rb

@@ -18,7 +18,7 @@ class UserNotifier
     Order.find(order_id).group_orders.each do |group_order|
       group_order.ordergroup.users.each do |user|
         begin
-          Mailer.order_result(user, group_order).deliver if user.settings["notify.orderFinished"] == '1'
+          Mailer.order_result(user, group_order).deliver if user.settings.notify["order_finished"]
         rescue
           Rails.logger.warn "Can't deliver mail to #{user.email}"
         end
@@ -34,7 +34,7 @@ class UserNotifier
 
     Ordergroup.find(ordergroup_id).users.each do |user|
       begin
-        Mailer.negative_balance(user, transaction).deliver if user.settings["notify.negativeBalance"] == '1'
+        Mailer.negative_balance(user, transaction).deliver if user.settings.notify["negative_balance"]
       rescue
         Rails.logger.warn "Can't deliver mail to #{user.email}"
       end

config/application.rb

@@ -31,7 +31,7 @@ module Foodsoft
 
     # Internationalization.
     config.i18n.load_path += Dir[Rails.root.join('config', 'locales', '**', '*.{rb,yml}')]
-    config.i18n.default_locale = :de
+    config.i18n.default_locale = :en
 
     # Configure the default encoding used in templates for Ruby 1.9.
     config.encoding = "utf-8"

config/locales/de.yml

@@ -1179,14 +1179,6 @@ de:
       redirect: Weiterleiting auf [[%{title}]]...
     user:
       no_ordergroup: keine Bestellgruppe
-      notify:
-        email_is_public: E-Mail ist für Mitglieder sichtbar
-        name_is_public: Name ist für Mitglieder sichtbar
-        negative_balance: Informiere mich, falls meine Bestellgruppe ins Minus rutscht.
-        order_finished: Informier mich über meine Bestellergebnisse (nach Ende der Bestellung).
-        phone_is_public: Telefon ist für Mitglieder sichtbar
-        send_as_email: Bekomme Nachrichten als Emails.
-        upcoming_tasks: Erinnere mich an anstehende Aufgaben.
   navigation:
     admin:
       home: Übersicht
@@ -1525,6 +1517,12 @@ de:
   simple_form:
     error_notification:
       default_message: Fehler wurden gefunden. Bitte das Formular überprüfen.
+    options:
+      settings:
+        profile:
+          language:
+            de: Deutsch
+            en: English
     hints:
       article:
         unit: z.B. KG oder 1L oder 500g
@@ -1648,6 +1646,21 @@ de:
         workgroup:
           one: Arbeitsgruppe
           other: Arbeitsgruppen
+      settings:
+        settings_group:
+          privacy: Privatsphäre
+          messages: Nachrichten
+        profile:
+          language: Sprache
+          phone_is_public: Telefon ist für Mitglieder sichtbar
+          email_is_public: E-Mail ist für Mitglieder sichtbar
+          name_is_public: Name ist für Mitglieder sichtbar
+        notify:
+          order_finished: Informier mich über meine Bestellergebnisse (nach Ende der Bestellung).
+          negative_balance: Informiere mich, falls meine Bestellgruppe ins Minus rutscht.
+          upcoming_tasks: Erinnere mich an anstehende Aufgaben.
+        messages:
+          send_as_email: Bekomme Nachrichten als Emails.
       workgroup:
         next_weekly_tasks_number: Für wieviel Wochen im Voraus sollen Aufgaben erstellt werden?
         role_admin: Administration

config/locales/en.yml

@@ -1181,14 +1181,6 @@ en:
       redirect: Redirect to [[%{title}]]...
     user:
       no_ordergroup: no order group
-      notify:
-        email_is_public: Email is visible for other members.
-        name_is_public: Name is visible for other members.
-        negative_balance: inform me when by order group has a negative balance.
-        order_finished: Inform me about my order result (when the order is closed).
-        phone_is_public: Phone number is visible for other members.
-        send_as_email: Receive messages as emails.
-        upcoming_tasks: Remind me of upcoming tasks.
   navigation:
     admin:
       home: Overview
@@ -1527,6 +1519,12 @@ en:
   simple_form:
     error_notification:
       default_message: Errors were found. Please check the form.
+    options:
+      settings:
+        profile:
+          language:
+            de: German
+            en: English
     hints:
       article:
         unit: ! 'For example: KG or 1L or 500g'
@@ -1650,6 +1648,21 @@ en:
         workgroup:
           one: Workgroup
           other: Workgroups
+      settings:
+        settings_group:
+          privacy: Privacy
+          messages: Messages
+        profile:
+          language: Language
+          phone_is_public: Phone number is visible for other members.
+          email_is_public: Email is visible for other members.
+          name_is_public: Name is visible for other members.
+        notify:
+          order_finished: Inform me about my order result (when the order is closed).
+          negative_balance: inform me when my order group has a negative balance.
+          upcoming_tasks: Remind me of upcoming tasks.
+        messages:
+          send_as_email: Receive messages as emails.
       workgroup:
         next_weekly_tasks_number: For how many weeks in advance would you like to define tasks?
         role_admin: Administration

config/routes.rb

@@ -8,6 +8,7 @@ Foodsoft::Application.routes.draw do
 
   root :to => redirect("/#{FoodsoftConfig.scope}")
 
+
   scope '/:foodcoop' do
 
     # Root path
@@ -187,7 +188,7 @@ Foodsoft::Application.routes.draw do
     ############## Feedback
 
     resource :feedback, :only => [:new, :create], :controller => 'feedback'
-    
+
     ############## The rest
 
     resources :users, :only => [:index]

db/migrate/20130718183100_create_settings.rb

@@ -0,0 +1,17 @@
+class CreateSettings < ActiveRecord::Migration
+  def self.up
+    create_table :settings do |t|
+      t.string :var, null: false
+      t.text   :value, null: true
+      t.integer :thing_id, null: true
+      t.string :thing_type, limit: 30, null: true
+      t.timestamps
+    end
+    
+    add_index :settings, [ :thing_type, :thing_id, :var ], unique: true
+  end
+
+  def self.down
+    drop_table :settings
+  end
+end

db/migrate/20130718183101_migrate_user_settings.rb

@@ -0,0 +1,34 @@
+class MigrateUserSettings < ActiveRecord::Migration
+  def up
+    old_settings = ConfigurableSetting.all
+    
+    old_settings.each do |old_setting|
+      # get target (user)
+      type      = old_setting.configurable_type
+      id        = old_setting.configurable_id
+      user      = type.constantize.find(id)
+      
+      # get the data (settings)
+      name      = old_setting.name
+      namespace = name.split('.')[0]
+      key       = name.split('.')[1].underscore # Camelcase to underscore
+      
+      # prepare value
+      value     = YAML.load(old_setting.value)
+      value     = value.nil? ? false : value
+      
+      # set the settings_attributes (thanks to settings.merge! we can set them one by one)
+      user.settings_attributes = {
+        "#{namespace}" => {
+          "#{key}" => value
+        }
+      }
+      
+      # save the user to apply after_save callback
+      user.save
+    end
+  end
+
+  def down
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130624085246) do
+ActiveRecord::Schema.define(:version => 20130718183101) do
 
   create_table "article_categories", :force => true do |t|
     t.string "name",        :default => "", :null => false
@@ -268,6 +268,17 @@ ActiveRecord::Schema.define(:version => 20130624085246) do
     t.datetime "updated_at",     :null => false
   end
 
+  create_table "settings", :force => true do |t|
+    t.string   "var",                      :null => false
+    t.text     "value"
+    t.integer  "thing_id"
+    t.string   "thing_type", :limit => 30
+    t.datetime "created_at",               :null => false
+    t.datetime "updated_at",               :null => false
+  end
+
+  add_index "settings", ["thing_type", "thing_id", "var"], :name => "index_settings_on_thing_type_and_thing_id_and_var", :unique => true
+
   create_table "stock_changes", :force => true do |t|
     t.integer  "delivery_id"
     t.integer  "order_id"

lib/foodsoft/controller_extensions.rb

@@ -0,0 +1,55 @@
+# -*- encoding : utf-8 -*-
+module Foodsoft
+  module ControllerExtensions
+    module Locale
+      extend ActiveSupport::Concern
+
+      included do
+        before_filter :set_locale
+      end
+
+      def explicitly_requested_language
+        params[:locale]
+      end
+
+      def user_settings_language
+        current_user.locale if current_user
+      end
+      
+      def session_language
+        session[:locale]
+      end
+
+      def browser_language
+        request.env['HTTP_ACCEPT_LANGUAGE'] ? request.env['HTTP_ACCEPT_LANGUAGE'].scan(/^[a-z]{2}/).first : nil
+      end
+
+      def default_language
+        ::I18n.default_locale
+      end
+
+      protected
+
+      def select_language_according_to_priority
+        language = explicitly_requested_language || session_language || user_settings_language || browser_language
+        language.to_sym unless language.blank?
+      end
+
+      def available_locales
+        ::I18n.available_locales
+      end
+
+      def set_locale
+        if available_locales.include?(select_language_according_to_priority)
+          ::I18n.locale = select_language_according_to_priority
+        else
+          ::I18n.locale = default_language
+        end
+
+        locale = session[:locale] = ::I18n.locale
+        logger.info("Set locale to #{locale}")
+      end
+
+    end
+  end
+end

lib/tasks/foodsoft.rake

@@ -8,7 +8,7 @@ namespace :foodsoft do
       puts "Send notifications for #{task.name} to .."
       for user in task.users
         begin
-          Mailer.upcoming_tasks(user, task).deliver if user.settings['notify.upcoming_tasks'] == 1
+          Mailer.upcoming_tasks(user, task).deliver if user.settings.notify['upcoming_tasks'] == 1
         rescue
           puts "deliver aborted for #{user.email}.."
         end
@@ -23,7 +23,7 @@ namespace :foodsoft do
         unless task.enough_users_assigned?
           puts "Notify workgroup: #{workgroup.name} for task #{task.name}"
           for user in workgroup.users
-            if user.settings['messages.sendAsEmail'] == "1" && !user.email.blank?
+            if user.settings.messages['send_as_email'] == "1" && !user.email.blank?
               begin
                 Mailer.not_enough_users_assigned(task, user).deliver
               rescue