spree_change_locale 0.5.2 → 0.5.3

data/Gemfile.lock

@@ -1,50 +1,50 @@
 PATH
   remote: .
   specs:
-    spree_change_locale (0.5.1)
+    spree_change_locale (0.5.3)
       http_accept_language (~> 1.0)
       spree_core (>= 0.70.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.1.1)
-      actionpack (= 3.1.1)
+    actionmailer (3.1.3)
+      actionpack (= 3.1.3)
       mail (~> 2.3.0)
-    actionpack (3.1.1)
-      activemodel (= 3.1.1)
-      activesupport (= 3.1.1)
+    actionpack (3.1.3)
+      activemodel (= 3.1.3)
+      activesupport (= 3.1.3)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       i18n (~> 0.6)
-      rack (~> 1.3.2)
+      rack (~> 1.3.5)
       rack-cache (~> 1.1)
       rack-mount (~> 0.8.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.0.2)
+      sprockets (~> 2.0.3)
     activemerchant (1.17.0)
       activesupport (>= 2.3.11)
       braintree (>= 2.0.0)
       builder (>= 2.0.0)
       json (>= 1.5.1)
-    activemodel (3.1.1)
-      activesupport (= 3.1.1)
+    activemodel (3.1.3)
+      activesupport (= 3.1.3)
       builder (~> 3.0.0)
       i18n (~> 0.6)
-    activerecord (3.1.1)
-      activemodel (= 3.1.1)
-      activesupport (= 3.1.1)
+    activerecord (3.1.3)
+      activemodel (= 3.1.3)
+      activesupport (= 3.1.3)
       arel (~> 2.2.1)
       tzinfo (~> 0.3.29)
-    activeresource (3.1.1)
-      activemodel (= 3.1.1)
-      activesupport (= 3.1.1)
-    activesupport (3.1.1)
+    activeresource (3.1.3)
+      activemodel (= 3.1.3)
+      activesupport (= 3.1.3)
+    activesupport (3.1.3)
       multi_json (~> 1.0)
     acts_as_list (0.1.4)
     archive-tar-minitar (0.5.2)
     arel (2.2.1)
-    braintree (2.13.0)
+    braintree (2.13.1)
       builder (>= 2.0.0)
     builder (3.0.0)
     capybara (1.0.1)
@@ -57,7 +57,7 @@ GEM
     childprocess (0.2.2)
       ffi (~> 1.0.6)
     cocaine (0.2.0)
-    columnize (0.3.4)
+    columnize (0.3.5)
     cucumber (1.0.6)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
@@ -77,14 +77,14 @@ GEM
     erubis (2.7.0)
     faker (1.0.0)
       i18n (~> 0.4)
-    ffi (1.0.9)
+    ffi (1.0.11)
     gherkin (2.4.21)
       json (>= 1.4.6)
-    highline (1.5.1)
+    highline (1.6.2)
     hike (1.2.1)
     http_accept_language (1.0.2)
     i18n (0.6.0)
-    jquery-rails (1.0.17)
+    jquery-rails (1.0.19)
       railties (~> 3.0)
       thor (~> 0.14)
     json (1.6.1)
@@ -125,17 +125,17 @@ GEM
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.1.1)
-      actionmailer (= 3.1.1)
-      actionpack (= 3.1.1)
-      activerecord (= 3.1.1)
-      activeresource (= 3.1.1)
-      activesupport (= 3.1.1)
+    rails (3.1.3)
+      actionmailer (= 3.1.3)
+      actionpack (= 3.1.3)
+      activerecord (= 3.1.3)
+      activeresource (= 3.1.3)
+      activesupport (= 3.1.3)
       bundler (~> 1.0)
-      railties (= 3.1.1)
-    railties (3.1.1)
-      actionpack (= 3.1.1)
-      activesupport (= 3.1.1)
+      railties (= 3.1.3)
+    railties (3.1.3)
+      actionpack (= 3.1.3)
+      activesupport (= 3.1.3)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -170,24 +170,24 @@ GEM
       ruby-debug-base19 (>= 0.11.19)
     ruby_core_source (0.1.5)
       archive-tar-minitar (>= 0.5.2)
-    rubyzip (0.9.4)
-    selenium-webdriver (2.10.0)
+    rubyzip (0.9.5)
+    selenium-webdriver (2.13.0)
       childprocess (>= 0.2.1)
-      ffi (= 1.0.9)
+      ffi (~> 1.0.9)
       json_pure
       rubyzip
-    spree_core (0.70.1)
+    spree_core (0.70.3)
       activemerchant (= 1.17.0)
       acts_as_list (= 0.1.4)
       deface (>= 0.7.0)
       faker (= 1.0.0)
-      highline (= 1.5.1)
+      highline (= 1.6.2)
       jquery-rails (>= 1.0.14)
       kaminari (>= 0.12.4)
       meta_search (= 1.1.1)
       nested_set (= 1.6.8)
       paperclip (= 2.4.1)
-      rails (= 3.1.1)
+      rails (>= 3.1.1, <= 3.1.3)
       rd_find_by_param (= 0.1.1)
       rd_resource_controller
       state_machine (= 1.0.1)

data/app/controllers/locale_controller.rb

@@ -1,14 +1,6 @@
 class LocaleController < Spree::BaseController
   def set
-    if request.referer && request.referer.starts_with?("http://" + request.host)
-      session["user_return_to"] = request.referer
-    end
-    if params[:locale] && I18n.available_locales.include?(params[:locale].to_sym)
-      session[:locale] = I18n.locale = params[:locale].to_sym
-    #   flash.notice = t(:locale_changed)
-    # else
-    #   flash[:error] = t(:locale_not_changed)
-    end
+    session[:locale] = I18n.locale = params[:locale].to_sym if params[:locale] && I18n.available_locales.include?(params[:locale].to_sym)
     redirect_back_or_default(params[:return_path] ? "/#{params[:return_path]}" : root_path)
   end
 end

data/spec/controllers/locale_controller_spec.rb

@@ -1,10 +1,6 @@
 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'
@@ -19,8 +15,13 @@ describe LocaleController do
     response.should redirect_to(root_path)
   end
   
-  it "should give url for Spanish" do
+  it "should give root url for Spanish" do
     { :get => "/es" }.should route_to(:controller => "locale", :action => "set", :locale => "es")
+  end
+  it "should give cart url for Spanish" do
+    { :get => "/es/cart" }.should route_to(:controller => "locale", :action => "set", :locale => "es", :return_path => "cart")
+  end
+  it "should not give root url for Russian" do
     { :get => "/ru" }.should_not route_to(:controller => "locale", :action => "set", :locale => "es")
   end
 end

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.5.2'
+  s.version     = '0.5.3'
   s.summary     = 'Easy locale change for Spree'
   s.description = 'Easy locale change for Spree'
   s.required_ruby_version = '>= 1.8.7'

metadata

@@ -2,7 +2,7 @@
 name: spree_change_locale
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors: 
 - humancopy
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-22 00:00:00 Z
+date: 2011-11-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: spree_core