spree_change_locale 0.4 → 0.5

data/Gemfile

@@ -20,3 +20,5 @@ else
 end
 
 gemspec
+
+gem 'http_accept_language', '~> 1.0'

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    spree_change_locale (0.70.1)
-      spree_core (>= 0.70.1)
+    spree_change_locale (0.5)
+      http_accept_language (~> 1.0)
+      spree_core (>= 0.70.0)
 
 GEM
   remote: http://rubygems.org/
@@ -81,6 +82,7 @@ GEM
       json (>= 1.4.6)
     highline (1.5.1)
     hike (1.2.1)
+    http_accept_language (1.0.2)
     i18n (0.6.0)
     jquery-rails (1.0.16)
       railties (~> 3.0)
@@ -203,7 +205,7 @@ GEM
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.30)
+    tzinfo (0.3.31)
     xpath (0.1.4)
       nokogiri (~> 1.3)
 
@@ -214,6 +216,7 @@ DEPENDENCIES
   capybara (= 1.0.1)
   cucumber-rails (= 1.0.0)
   database_cleaner (= 0.6.7)
+  http_accept_language (~> 1.0)
   nokogiri
   rspec-rails (= 2.6.1)
   ruby-debug19

data/README.md

@@ -6,6 +6,9 @@ Easy locale change in Spree.
 
 Add the following to your Gemfile
 
+    gem 'spree_change_locale'
+
+Or if you want to use edge:
     gem 'spree_change_locale', :git => 'git://github.com/humancopy/spree-change-locale.git'
 
 Run:

data/Versionfile

@@ -1 +1 @@
-"0.70.x" => { :version => "0.4" }
+"0.70.x" => { :version => "0.5" }

data/app/controllers/base_controller_decorator.rb

@@ -1,28 +1,8 @@
 Spree::BaseController.class_eval do
-  helper_method :enabled_locales
   before_filter :set_locale, :if => proc { !session[:locale] }
 
   protected
-  def enabled_locales
-    @enabled_locales ||= (Spree::Config.get(:enabled_locales) || get_locales || I18n.available_locales || [I18n.default_locale]).collect(&:intern)
-  end
-
-  # inspired by: https://github.com/greendog/spree_locales_dropdown
-  def get_locales
-     path = Rails.root.join('config', 'locales')
-     items = Dir.glob(Rails.root.join('config', 'locales', '*.yml')).collect { |filename| File.basename(filename.gsub(/\.yml$/, '')) }
-     items unless items.blank?
-     # Dir.glob(Rails.root.join('config', 'locales', '*.yml')).inject([]) do |mem, filename|
-     #   locale_file = YAML.load_file(path.join(filename))
-     #   str = File.basename(filename.gsub(/\.yml$/, ''))
-     #   str = str.gsub("_spree", "")
-     #   mem << str if locale_file.has_key?(str)
-     # 
-     #   mem
-     # end
-   end
-  
   def set_locale
-    session[:locale] = I18n.locale = (request.preferred_language_from(enabled_locales) || request.compatible_language_from(enabled_locales) || I18n.default_locale).intern
+    session[:locale] = I18n.locale = (request.preferred_language_from(I18n.enabled_locales) || request.compatible_language_from(I18n.enabled_locales) || I18n.default_locale).intern
   end
 end

data/app/helpers/locale_helper.rb

@@ -1,10 +1,12 @@
 module LocaleHelper
+  # mirror I18n extension
+  def enabled_locales; I18n.enabled_locales end
+  def locale_enabled?(locale); I18n.locale_enabled?(locale) end
+
   def link_to_locale(locale, name = nil)
-    link_to name || locale_name(locale), "/#{locale}#{request.path}"
+    link_to name || locale_name(locale), "/#{locale}#{request && request.path}" if locale_enabled?(locale)
   end
   def locale_name(locale)
-    I18n.t :this_file_language, :locale => locale
-    # 
-    # t("locale.#{locale.to_s.sub('-', '_')}")
+    I18n.t(:this_file_language, :locale => locale) if locale_enabled?(locale)
   end
 end

data/config/routes.rb

@@ -1,4 +1,4 @@
 Rails.application.routes.draw do
   # Add your extension routes here
-  match '/:locale/(*return_path)' => 'locale#set', :constraints => {:locale => /\b#{Spree::Config.get(:enabled_locales)}\b/}, :as => :change_locale
+  match '/:locale/(*return_path)' => 'locale#set', :constraints => {:locale => /\b#{I18n.enabled_locales.join('|')}\b/}, :as => :change_locale
 end

data/lib/spree_change_locale/engine.rb

@@ -17,6 +17,8 @@ module SpreeChangeLocale
       Dir.glob(File.join(File.dirname(__FILE__), "../../app/overrides/*.rb")).each do |c|
         Rails.application.config.cache_classes ? require(c) : load(c)
       end
+
+      I18n.send :extend, I18nExtension
     end
 
     config.to_prepare &method(:activate).to_proc

data/lib/spree_change_locale/i18n_extension.rb

@@ -0,0 +1,16 @@
+module I18nExtension
+  def enabled_locales
+    @@enabled_locales ||= (Spree::Config.get(:enabled_locales) || get_locales || I18n.available_locales || [I18n.default_locale]).collect(&:intern)
+  end
+  def locale_enabled?(locale)
+    enabled_locales.include?(locale.intern)
+  end
+
+  private
+  # inspired by: https://github.com/greendog/spree_locales_dropdown
+  def get_locales
+    path = Rails.root.join('config', 'locales')
+    items = Dir.glob(Rails.root.join('config', 'locales', '*.yml')).collect { |filename| File.basename(filename.gsub(/\.yml$/, '')) }
+    items unless items.blank?
+  end
+end

data/lib/spree_change_locale/instance_methods.rb

@@ -0,0 +1,28 @@
+module SpreeChangeLocale
+  module InstanceMethods
+    def enabled_locales
+      @enabled_locales ||= (Spree::Config.get(:enabled_locales) || get_locales || I18n.available_locales || [I18n.default_locale]).collect(&:intern)
+    end
+
+    # inspired by: https://github.com/greendog/spree_locales_dropdown
+    def get_locales
+       path = Rails.root.join('config', 'locales')
+       items = Dir.glob(Rails.root.join('config', 'locales', '*.yml')).collect { |filename| File.basename(filename.gsub(/\.yml$/, '')) }
+       items unless items.blank?
+       # Dir.glob(Rails.root.join('config', 'locales', '*.yml')).inject([]) do |mem, filename|
+       #   locale_file = YAML.load_file(path.join(filename))
+       #   str = File.basename(filename.gsub(/\.yml$/, ''))
+       #   str = str.gsub("_spree", "")
+       #   mem << str if locale_file.has_key?(str)
+       # 
+       #   mem
+       # end
+     end
+  end
+
+  module Methods
+    class << self
+      include InstanceMethods
+    end
+  end
+end

data/lib/spree_change_locale.rb

@@ -1,3 +1,4 @@
 require 'spree_core'
 require 'spree_change_locale/engine'
+require 'spree_change_locale/i18n_extension'
 

data/spec/controllers/locale_controller_spec.rb

@@ -1,5 +1,26 @@
 require 'spec_helper'
 
 describe LocaleController do
+  # it "should use Spree::BaseController" do
+  #   controller.should be_an_instance_of(Spree::BaseController)
+  # end
 
+  it "should redirect to index with session[:locale] set to :es" do
+    session[:locale].should be_nil
+    get 'set', :locale => 'es'
+    session[:locale].should == :es
+    response.should redirect_to(root_path)
+  end
+  
+  it "should redirect to index with session[:locale] set to :en and not :ru" do
+    get 'set', :locale => 'ru'
+    session[:locale].should_not == :ru
+    session[:locale].should == :en
+    response.should redirect_to(root_path)
+  end
+  
+  it "should give url for Spanish" do
+    { :get => "/es" }.should route_to(:controller => "locale", :action => "set", :locale => "es")
+    { :get => "/ru" }.should_not route_to(:controller => "locale", :action => "set", :locale => "es")
+  end
 end

data/spec/helpers/locale_helper_spec.rb

@@ -11,5 +11,16 @@ require 'spec_helper'
 #   end
 # end
 describe LocaleHelper do
-  pending "add some examples to (or delete) #{__FILE__}"
+  it "should return Spanish" do
+    locale_name(:es).should == 'Spanish'
+  end
+  it "should not return Russian" do
+    locale_name(:ru).should_not == 'Russian'
+  end
+  it "should link to Spanish locale" do
+    link_to_locale(:es).should == '<a href="/es">Spanish</a>'
+  end
+  it "should not link to Russian locale" do
+    link_to_locale(:ru).should_not == '<a href="/ru">translation missing: ru.this_file_language</a>'
+  end
 end

data/spec/spec_helper.rb

@@ -3,7 +3,7 @@ ENV["RAILS_ENV"] = "test"
 
 
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)
-
+require 'http_accept_language'
 
 require 'rspec/rails'
 

data/spree_change_locale.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_change_locale'
-  s.version     = '0.4'
+  s.version     = '0.5'
   s.summary     = 'Easy locale change for Spree'
   s.description = 'Easy locale change for Spree'
   s.required_ruby_version = '>= 1.8.7'
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.requirements << 'none'
 
   s.add_dependency 'spree_core', '>= 0.70.0'
-  # s.add_dependency 'http_accept_language', '~> 1.0'
+  s.add_dependency 'http_accept_language', '~> 1.0'
   s.add_development_dependency 'rspec-rails'
 end
 

metadata

@@ -2,7 +2,7 @@
 name: spree_change_locale
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: "0.4"
+  version: "0.5"
 platform: ruby
 authors: 
 - humancopy
@@ -24,16 +24,27 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rspec-rails
+  name: http_accept_language
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "1.0"
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec-rails
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
   type: :development
-  version_requirements: *id002
+  version_requirements: *id003
 description: Easy locale change for Spree
 email: info@humancopy.net
 executables: []
@@ -65,6 +76,8 @@ files:
 - lib/generators/spree_change_locale/install/install_generator.rb
 - lib/spree_change_locale.rb
 - lib/spree_change_locale/engine.rb
+- lib/spree_change_locale/i18n_extension.rb
+- lib/spree_change_locale/instance_methods.rb
 - script/rails
 - spec/controllers/locale_controller_spec.rb
 - spec/helpers/locale_helper_spec.rb