typus 0.9.25 → 0.9.26

data/VERSION

@@ -1 +1 @@
-0.9.25
+0.9.26

data/app/controllers/admin/master_controller.rb

@@ -6,7 +6,7 @@ class Admin::MasterController < ApplicationController
 
   include Typus::Authentication
   include Typus::Format
-  include Typus::Locale
+  include Typus::Preferences
   include Typus::Reloader
 
   if Typus::Configuration.options[:ssl]
@@ -20,7 +20,7 @@ class Admin::MasterController < ApplicationController
 
   before_filter :require_login
 
-  before_filter :set_locale
+  before_filter :set_typus_preferences
 
   before_filter :set_resource
   before_filter :find_item, 

data/app/controllers/typus_controller.rb

@@ -5,24 +5,21 @@ class TypusController < ApplicationController
   layout :select_layout
 
   include Typus::Authentication
-  include Typus::Locale
   include Typus::QuickEdit
+  include Typus::Preferences
   include Typus::Reloader
 
   if Typus::Configuration.options[:ssl]
     include SslRequirement
     ssl_required :sign_in, :sign_out, 
                  :dashboard, 
-                 :recover_password, :reset_password, 
-                 :set_locale
+                 :recover_password, :reset_password
   end
 
   filter_parameter_logging :password
 
   before_filter :verify_typus_users_table_schema
 
-  before_filter :set_default_locale, :except => [ :dashboard ]
-
   before_filter :reload_config_et_roles
   before_filter :require_login, 
                 :except => [ :sign_up, :sign_in, :sign_out, 
@@ -33,15 +30,19 @@ class TypusController < ApplicationController
                 :except => [ :sign_up, :sign_in, :sign_out, 
                              :dashboard, 
                              :recover_password, :reset_password, 
-                             :quick_edit, :set_locale ]
+                             :quick_edit ]
 
   before_filter :recover_password_disabled?, 
                 :only => [ :recover_password, :reset_password ]
 
-  before_filter :set_locale, :only => [ :dashboard ]
-
   def dashboard
-    flash[:notice] = _("There are not defined applications in config/typus/*.yml.") if Typus.applications.empty?
+    begin
+      I18n.locale = @current_user.preferences[:locale]
+      flash[:notice] = _("There are not defined applications in config/typus/*.yml.") if Typus.applications.empty?
+    rescue
+      @current_user.update_attributes :preferences => { :locale => Typus::Configuration.options[:default_locale] }
+      retry
+    end
   end
 
   def sign_in

data/app/helpers/typus_helper.rb

@@ -185,16 +185,4 @@ module TypusHelper
     HTML
   end
 
-  def locales(uri = admin_set_locale_path)
-
-    return unless Typus.locales.many?
-
-    locale_links = Typus.locales.map { |l| "<a href=\"#{uri}?locale=#{l.last}\">#{l.first.downcase}</a>" }
-
-    <<-HTML
-<p>#{_("Set language to")} #{locale_links.join(', ')}.</p>
-    HTML
-
-  end
-
 end

data/app/views/layouts/admin.html.erb

@@ -61,7 +61,6 @@
         <%= typus_block :location => 'shared', :partial => 'footer' %>
       </div>
       <div class="right">
-        <%= locales %>
       </div>
       <div class="clear"></div>
     </div>

data/config/locales/typus/de.yml

@@ -96,7 +96,6 @@ de:
   "Remove entry?": "Eintrag entfernen?"
   "Unrelate {{unrelate_model}} from {{unrelate_model_from}}?": "Verknüpfung zwischen {{unrelate_model}} und {{unrelate_model_from}}entfernen?"
   "Change {{attribute}}?": "{{attribute}}ändern?"
-  "Set language": "Sprache einstellen"
   "Today": "Heute"
   "Last few days": "Letzten Tage"
   "Last 7 days": "Letzten 7 Tage"
@@ -104,5 +103,4 @@ de:
   "{{model}} filtered by {{filtered_by}}": "{{model}} gefiltert nach {{filtered_by}}"
   "True": "Richtig"
   "False": "Falsch"
-  "Set language to": "Sprache wechseln zu"
   "Are you sure you want to sign out and end your session?": "Wollen Sie sich abmelden und die Sitzung beenden?"

data/config/locales/typus/es.yml

@@ -96,7 +96,6 @@ es:
   "Remove entry?": "¿Borrar entrada?"
   "Unrelate {{unrelate_model}} from {{unrelate_model_from}}?": "Unrelate {{unrelate_model}} from {{unrelate_model_from}}?"
   "Change {{attribute}}?": "Change {{attribute}}?"
-  "Set language": "Cambiar idioma"
   "Today": "Hoy"
   "Last few days": "Últimos dias"
   "Last 7 days": "Últimos 7 dias"
@@ -104,5 +103,4 @@ es:
   "{{model}} filtered by {{filtered_by}}": "{{model}} filtrados por {{filtered_by}}"
   "True": "Verdadero"
   "False": "Falso"
-  "Set language to": "Idioma"
   "Are you sure you want to sign out and end your session?": 

data/config/locales/typus/language.yml.template

@@ -100,7 +100,6 @@
   "Remove entry?": 
   "Unrelate {{unrelate_model}} from {{unrelate_model_from}}?": 
   "Change {{attribute}}?": 
-  "Set language": 
   "Today": 
   "Last few days": 
   "Last 7 days": 
@@ -108,5 +107,4 @@
   "{{model}} filtered by {{filtered_by}}": 
   "True": 
   "False": 
-  "Set language to": 
   "Are you sure you want to sign out and end your session?": 

data/config/locales/typus/pt-BR.yml

@@ -96,7 +96,6 @@ pt-BR:
   "Remove entry?": "Remover entrada?"
   "Unrelate {{unrelate_model}} from {{unrelate_model_from}}?": "Desvincular {{unrelate_model}} de {{unrelate_model_from}}?"
   "Change {{attribute}}?": "Mudar {{attribute}}?"
-  "Set language": "Mudar idioma"
   "Today": "Hoje"
   "Last few days": "Últimos dias"
   "Last 7 days": "Últimos 7 dias"
@@ -106,5 +105,4 @@ pt-BR:
   "{{model}} filtered by {{filtered_by}}": "{{model}} filtrados por {{filtered_by}}"
   "True": "Verdadeiro"
   "False": "Falso"
-  "Set language to": "Idioma"
   "Are you sure you want to sign out and end your session?": "Tem certeza que quer sair e encerrar sua sessão?"

data/config/locales/typus/ru.yml

@@ -96,7 +96,6 @@ ru:
   "Remove entry?": "Удалить запись?"
   "Unrelate {{unrelate_model}} from {{unrelate_model_from}}?": "Отсоединить {{unrelate_model}} от {{unrelate_model_from}}?"
   "Change {{attribute}}?": "Изменить {{attribute}}?"
-  "Set language": "Установить язык"
   "Today": "Сегодня"
   "Last few days": "Последние дней"
   "Last 7 days": "Последние 7 дней"
@@ -106,5 +105,4 @@ ru:
   "{{model}} filtered by {{filtered_by}}": 
   "True": 
   "False": 
-  "Set language to": 
   "Are you sure you want to sign out and end your session?": 

data/config/routes.rb

@@ -8,7 +8,6 @@ ActionController::Routing::Routes.draw do |map|
     i.admin_sign_up 'sign_up', :action => 'sign_up'
     i.admin_recover_password 'recover_password', :action => 'recover_password'
     i.admin_reset_password 'reset_password', :action => 'reset_password'
-    i.admin_set_locale 'set_locale', :action => 'set_locale'
   end
 
 end

data/generators/typus/templates/config/initializers/typus.rb

@@ -4,8 +4,8 @@
 
 Typus::Configuration.options[:app_name] = '<%= application %>'
 # Typus::Configuration.options[:config_folder] = 'config/typus'
+# Typus::Configuration.options[:default_locale] = :en
 # Typus::Configuration.options[:email] = 'admin@example.com'
-# Typus::Configuration.options[:locales] = [ [ "English", :en ], [ "Español", :es ] ]
 # Typus::Configuration.options[:recover_password] = true
 # Typus::Configuration.options[:root] = 'admin'
 # Typus::Configuration.options[:ssl] = false

data/generators/typus/templates/config/typus/typus.yml

@@ -1,9 +1,9 @@
 TypusUser:
   fields:
     list: email, role, status
-    form: first_name, last_name, role, email, password, password_confirmation
+    form: first_name, last_name, role, email, password, password_confirmation, language
     options:
-      selectors: role
+      selectors: role, language
       booleans:
         status: Active, Inactive
   filters: status, role

data/lib/typus.rb

@@ -11,11 +11,11 @@ module Typus
     end
 
     def locales
-      Typus::Configuration.options[:locales]
-    end
-
-    def default_locale
-      locales.map(&:last).first
+      [ [ "German", 'de' ],
+        [ "English", 'en' ], 
+        [ "Español", 'es' ], 
+        [ "Portuguese", 'pt-BR' ], 
+        [ "Russian", 'ru' ] ]
     end
 
     def applications
@@ -103,8 +103,8 @@ module Typus
       require 'typus/authentication'
       require 'typus/format'
       require 'typus/generator'
-      require 'typus/locale'
       require 'typus/preview'
+      require 'typus/preferences'
       require 'typus/reloader'
       require 'typus/quick_edit'
       require 'typus/user'

data/lib/typus/configuration.rb

@@ -5,9 +5,9 @@ module Typus
     # Default options which can be overwritten from the initializer.
     typus_options = { :app_name => 'Typus', 
                       :config_folder => 'config/typus', 
+                      :default_locale => :en, 
                       :email => 'admin@example.com', 
                       :image_preview_size => 'typus', 
-                      :locales => [ [ "English", :en ] ], 
                       :recover_password => false, 
                       :root => 'admin', 
                       :ssl => false, 

data/lib/typus/locale.rb

@@ -1,27 +0,0 @@
-module Typus
-
-  module Locale
-
-    def set_locale
-      if params[:locale]
-        I18n.locale = params[:locale]
-        session[:typus_locale] = params[:locale]
-        @current_user.update_attributes :preferences => { :locale => params[:locale] }
-        redirect_to request.referer || admin_dashboard_path
-      else
-        begin
-          I18n.locale = @current_user.preferences[:locale]
-        rescue
-          @current_user.update_attributes :preferences => { :locale => Typus.default_locale }
-          retry
-        end
-      end
-    end
-
-    def set_default_locale
-      I18n.locale = Typus.default_locale
-    end
-
-  end
-
-end

data/lib/typus/preferences.rb

@@ -0,0 +1,11 @@
+module Typus
+
+  module Preferences
+
+    def set_typus_preferences
+      I18n.locale = @current_user.preferences[:locale]
+    end
+
+  end
+
+end

data/lib/typus/user.rb

@@ -25,7 +25,7 @@ module Typus
         validates_presence_of :role
 
         before_save :initialize_salt, :encrypt_password, :initialize_token
-        before_create :set_preferences
+        before_save :set_preferences
 
         serialize :preferences
 
@@ -41,6 +41,10 @@ module Typus
         Typus::Configuration.roles.keys.sort
       end
 
+      def language
+        Typus.locales
+      end
+
       def authenticate(email, password)
         user = find_by_email_and_status(email, true)
         user && user.authenticated?(password) ? user : nil
@@ -99,8 +103,18 @@ module Typus
 
     protected
 
+      def language
+        preferences[:locale] rescue Typus::Configuration.options[:default_locale]
+      end
+
+      def language=(locale)
+        self.preferences = { :locale => locale }
+      end
+
       def set_preferences
-        self.preferences = { :locale => Typus.default_locale }
+        if self.preferences.nil? || self.preferences[:locale].nil? || self.preferences[:locale].blank?
+          self.preferences = { :locale => Typus::Configuration.options[:default_locale] }
+        end
       end
 
       def generate_hash(string)

data/test/fixtures/typus_users.yml

@@ -8,6 +8,7 @@ admin:
   token: 1A2B3C4D5E6F
   salt: admin
   crypted_password: <%= Digest::SHA1.hexdigest("--admin--#{12345678}") %>
+  preferences: { :locale => :en }
 
 editor:
   id: 2
@@ -19,6 +20,7 @@ editor:
   token: A2B3C4D5E6F1
   salt: editor
   crypted_password: <%= Digest::SHA1.hexdigest("--editor--#{12345678}") %>
+  preferences: { :locale => :en }
 
 disabled_user:
   id: 3
@@ -30,6 +32,7 @@ disabled_user:
   token: 2B3C4D5E6F1A
   salt: disabled_user
   crypted_password: <%= Digest::SHA1.hexdigest("--disabled_user--#{12345678}") %>
+  preferences: { :locale => :en }
 
 designer:
   id: 4
@@ -41,6 +44,7 @@ designer:
   token: B3C4D5E6F1A2
   salt: designer
   crypted_password: <%= Digest::SHA1.hexdigest("--designer--#{12345678}") %>
+  preferences: { :locale => :en }
 
 removed_role:
   id: 5
@@ -52,3 +56,4 @@ removed_role:
   token: 3C4D5E6F1A2B
   salt: removed_role
   crypted_password: <%= Digest::SHA1.hexdigest("--removed_role--#{12345678}") %>
+  preferences: { :locale => :en }

data/test/helpers/typus_helper_test.rb

@@ -101,17 +101,4 @@ class TypusHelperTest < ActiveSupport::TestCase
     assert_equal expected, output
   end
 
-  def test_locales
-
-    options = { :locales => [ [ "English", :en ], [ "Español", :es ] ] }
-    Typus::Configuration.stubs(:options).returns(options)
-
-    output = locales('set_locale')
-    expected = <<-HTML
-<p>Set language to <a href=\"set_locale?locale=en\">english</a>, <a href=\"set_locale?locale=es\">español</a>.</p>
-    HTML
-    assert_equal expected, output
-
-  end
-
 end

data/test/lib/active_record_test.rb

@@ -16,6 +16,7 @@ class ActiveRecordTest < ActiveSupport::TestCase
                        [:token, :string], 
                        [:salt, :string], 
                        [:crypted_password, :string], 
+                       [:preferences, :string], 
                        [:created_at, :datetime], 
                        [:updated_at, :datetime]]
     assert_equal expected_fields.map { |i| i.first }, TypusUser.model_fields.keys

data/test/lib/configuration_test.rb

@@ -11,8 +11,8 @@ class ConfigurationTest < ActiveSupport::TestCase
     return if File.exist?(initializer)
     assert_equal 'Typus', Typus::Configuration.options[:app_name]
     assert_equal 'vendor/plugins/typus/test/config/working', Typus::Configuration.options[:config_folder]
+    assert_equal :en, Typus::Configuration.options[:default_locale]
     assert_equal 'admin@example.com', Typus::Configuration.options[:email]
-    assert_equal [ [ "English", :en] ], Typus::Configuration.options[:locales]
     assert_equal false, Typus::Configuration.options[:recover_password]
     assert_equal 'admin', Typus::Configuration.options[:root]
     assert_equal false, Typus::Configuration.options[:ssl]

data/test/lib/routes_test.rb

@@ -11,7 +11,7 @@ class RoutesTest < ActiveSupport::TestCase
     expected = [ :admin_sign_up, :admin_sign_in, :admin_sign_out, 
                  :admin_recover_password, :admin_reset_password, 
                  :admin_dashboard, 
-                 :admin_quick_edit, :admin_set_locale ]
+                 :admin_quick_edit ]
 
     expected.each { |route| assert routes.include?(route) }
 
@@ -62,7 +62,7 @@ class RoutesTest < ActiveSupport::TestCase
 
     actions = [ 'sign_up', 'sign_in', 'sign_out', 
                 'recover_password', 'reset_password', 
-                'quick_edit', 'set_locale' ]
+                'quick_edit' ]
 
     actions.each { |a| assert_routing "/admin/#{a}", :controller => 'typus', :action => a }
 

data/test/lib/typus_test.rb

@@ -12,20 +12,6 @@ class TypusTest < ActiveSupport::TestCase
     assert_equal expected, Typus.root
   end
 
-  def test_should_return_locales
-    initializer = "#{Rails.root}/config/initializers/typus.rb"
-    return if File.exist?(initializer)
-    assert Typus.respond_to?(:locales)
-    assert Typus.locales.kind_of?(Array)
-    assert_equal [["English", :en]], Typus.locales
-  end
-
-  def test_should_return_default_locale
-    assert Typus.respond_to?(:default_locale)
-    assert Typus.default_locale.kind_of?(Symbol)
-    assert_equal :en, Typus.default_locale
-  end
-
   def test_should_return_applications_and_should_be_sorted
     assert Typus.respond_to?(:applications)
     assert Typus.applications.kind_of?(Array)

data/test/schema.rb

@@ -50,6 +50,7 @@ ActiveRecord::Schema.define do
     t.string :token, :null => false
     t.string :salt, :null => false
     t.string :crypted_password, :null => false
+    t.string :preferences
     t.timestamps
   end
 

data/test/unit/typus_user_test.rb

@@ -8,7 +8,8 @@ class TypusUserTest < ActiveSupport::TestCase
               :email => 'test@example.com', 
               :password => '12345678', 
               :password_confirmation => '12345678', 
-              :role => Typus::Configuration.options[:root] }
+              :role => Typus::Configuration.options[:root], 
+              :preferences => { :locale => :en } }
     @typus_user = TypusUser.new(@data)
   end
 

data/typus.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{typus}
-  s.version = "0.9.25"
+  s.version = "0.9.26"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Francesc Esplugas"]
@@ -107,6 +107,7 @@ Gem::Specification.new do |s|
      "lib/typus/hash.rb",
      "lib/typus/locale.rb",
      "lib/typus/object.rb",
+     "lib/typus/preferences.rb",
      "lib/typus/preview.rb",
      "lib/typus/quick_edit.rb",
      "lib/typus/reloader.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: typus
 version: !ruby/object:Gem::Version 
-  version: 0.9.25
+  version: 0.9.26
 platform: ruby
 authors: 
 - Francesc Esplugas
@@ -113,6 +113,7 @@ files:
 - lib/typus/hash.rb
 - lib/typus/locale.rb
 - lib/typus/object.rb
+- lib/typus/preferences.rb
 - lib/typus/preview.rb
 - lib/typus/quick_edit.rb
 - lib/typus/reloader.rb