rails-localization 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/rails-localization.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "rails-localization"
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["E-Max"]

data/test/rails-localization_test.rb

@@ -77,4 +77,40 @@ class RailsLocalizationTest < ActionDispatch::IntegrationTest
       assert page.has_content? "translation missing: ru.users.index"
     end
   end
+
+  context "user path" do
+    def test_locale_included_into_users_path
+      visit "/users/with_locale"
+      assert_equal "/users", page.source, "Page body was: #{page.body}"
+
+      visit "/en/users/with_locale"
+      assert_equal "/users", page.source, "Page body was: #{page.body}"
+
+      visit "/ru/users/with_locale"
+      assert_equal "/ru/users", page.source, "Page body was: #{page.body}"
+    end
+
+    def test_locale_ignored_in_users_path
+      visit "/users/without_locale"
+      assert_equal "/users", page.source, "Page body was: #{page.body}"
+
+      visit "/en/users/without_locale"
+      assert_equal "/users", page.source, "Page body was: #{page.body}"
+
+      visit "/ru/users/without_locale"
+      assert_equal "/users", page.source, "Page body was: #{page.body}"
+    end
+
+    def test_locale_forced_in_users_path
+      visit "/users/with_defined_locale"
+      assert_equal "/ru/users", page.source, "Page body was: #{page.body}"
+
+      visit "/en/users/with_defined_locale"
+      assert_equal "/ru/users", page.source, "Page body was: #{page.body}"
+
+      visit "/ru/users/with_defined_locale"
+      assert_equal "/ru/users", page.source, "Page body was: #{page.body}"
+    end
+
+  end
 end

data/test/test_app/app/controllers/users_controller.rb

@@ -3,9 +3,16 @@ class UsersController < ApplicationController
     render :text => t('users.index')
   end
 
+  def with_locale
+    render :text => users_path, :layout => false
+  end
+
+  def without_locale
+    render :text => users_path(:locale => false), :layout => false
+  end
 
-  def new
-    render :text => users_path
+  def with_defined_locale
+    render :text => users_path(:locale => :ru), :layout => false
   end
 end
 

data/test/test_app/config/routes.rb

@@ -1,5 +1,8 @@
 TestApp::Application.routes.draw do
-  resources :users
+  get :users, :to => "users#index"
+  get "users/with_locale", :to => "users#with_locale"
+  get "users/without_locale", :to => "users#without_locale"
+  get "users/with_defined_locale", :to => "users#with_defined_locale"
   get :welcome, :to => 'main#welcome'
 
   root :to => 'main#index'

data/test/urls_overwriting_test.rb

@@ -23,9 +23,4 @@ class UrlsOverwritingTest < ActionController::TestCase
       assert_generates("/", :controller => "main", :action => "index", :locale => :de)
     end
   end
-
-#  test "routing" do
-#    assert_equal '/', TestApp::Application.routes.url_for
-#  end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-localization
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-09-10 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &78203240 !ruby/object:Gem::Requirement
+  requirement: &84016770 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78203240
+  version_requirements: *84016770
 - !ruby/object:Gem::Dependency
   name: localization-middleware
-  requirement: &78202930 !ruby/object:Gem::Requirement
+  requirement: &84016390 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78202930
+  version_requirements: *84016390
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &78202510 !ruby/object:Gem::Requirement
+  requirement: &84015980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78202510
+  version_requirements: *84015980
 - !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: &78202130 !ruby/object:Gem::Requirement
+  requirement: &84015370 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *78202130
+  version_requirements: *84015370
 - !ruby/object:Gem::Dependency
   name: test-spec
-  requirement: &78201750 !ruby/object:Gem::Requirement
+  requirement: &84015010 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *78201750
+  version_requirements: *84015010
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &78201150 !ruby/object:Gem::Requirement
+  requirement: &84014440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *78201150
+  version_requirements: *84014440
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &78200420 !ruby/object:Gem::Requirement
+  requirement: &84013960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *78200420
+  version_requirements: *84013960
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &78199960 !ruby/object:Gem::Requirement
+  requirement: &84011820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *78199960
+  version_requirements: *84011820
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &78199470 !ruby/object:Gem::Requirement
+  requirement: &84011450 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 0.6.4
   type: :development
   prerelease: false
-  version_requirements: *78199470
+  version_requirements: *84011450
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &78198970 !ruby/object:Gem::Requirement
+  requirement: &84011090 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *78198970
+  version_requirements: *84011090
 - !ruby/object:Gem::Dependency
   name: debugger
-  requirement: &78198490 !ruby/object:Gem::Requirement
+  requirement: &84009630 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 1.1.3
   type: :development
   prerelease: false
-  version_requirements: *78198490
+  version_requirements: *84009630
 - !ruby/object:Gem::Dependency
   name: ruby-debug
-  requirement: &78197940 !ruby/object:Gem::Requirement
+  requirement: &84009200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *78197940
+  version_requirements: *84009200
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &78197570 !ruby/object:Gem::Requirement
+  requirement: &84008810 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,7 +153,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *78197570
+  version_requirements: *84008810
 description: This gem allows you to localize your rails application with ease
 email: max@studentify.nl
 executables: []
@@ -229,7 +229,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -787288623
+      hash: 811579485
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: