rails-localization 0.2.0 → 1.2.0

data/lib/rails-localization/controller.rb

@@ -0,0 +1,22 @@
+module RailsLocalization
+  module Controller
+    def self.included(base)
+      base.class_eval do
+        around_filter :process_with_locale
+
+        protected
+
+        def process_with_locale
+          begin
+            if params.has_key?(:locale)
+              ::I18n.locale = params[:locale].blank? ? ::I18n.default_locale : params[:locale].to_s
+            end
+            yield
+          ensure 
+            ::I18n.locale = ::I18n.default_locale
+          end 
+        end    
+      end
+    end
+  end
+end

data/lib/rails-localization/engine.rb

@@ -0,0 +1,6 @@
+require 'rails/engine'
+
+module RailsLocalization
+  class Engine < ::Rails::Engine
+  end
+end

data/lib/rails-localization/i18n.rb

@@ -0,0 +1,9 @@
+module RailsLocalization
+  module I18n
+    def self.extended(base)
+      def base.locales
+        @locales ||= {}
+      end
+    end
+  end
+end

data/lib/rails-localization/route_set.rb

@@ -0,0 +1,12 @@
+module RailsLocalization
+  module RouteSet
+    def self.included(base)
+      base.class_eval do
+        def url_for_with_locale(options = {})
+          url_for_without_locale RailsLocalization::UrlOptions.formatter(options)
+        end
+        alias_method_chain :url_for, :locale
+      end
+    end
+  end
+end

data/lib/rails-localization/router.rb

@@ -0,0 +1,15 @@
+module ActionDispatch::Routing::Mapper::Localization
+  def self.included(base)
+    base.class_eval do
+      def localized(locales)
+        if @set == Rails.application.routes
+          I18n.locales[:main_app] = locales
+        else
+          sub_app_name = @scope[:module] || :main_app
+          I18n.locales[sub_app_name] = locales
+        end
+        scope("(:locale)", constraints: {locale: /#{locales.keys.join('|')}/}, defaults: {locale: ""}) { yield }
+      end
+    end
+  end
+end 

data/lib/rails-localization/url_options.rb

@@ -0,0 +1,34 @@
+module RailsLocalization
+  module UrlOptions
+    def self.formatter opts
+      if opts[:_recall] && opts[:_recall].has_key?(:locale)
+        opts[:locale] = ::I18n.locale.to_s if opts[:locale].blank?
+
+        if !opts[:script_name].blank?
+          locale = opts.delete(:locale).to_s
+          affect_script_name(opts, locale) unless opts[:locale].to_s == ::I18n.default_locale.to_s
+        else 
+          opts[:locale] = nil if opts[:locale].to_s == ::I18n.default_locale.to_s
+        end
+      end
+
+      if opts.has_key?(:_positional_keys) && opts[:_positional_keys].first == :locale
+        i = opts[:_positional_keys].index(:locale)
+        opts[:_positional_args].insert i, (opts.delete(:locale) || ::I18n.locale.to_s)
+      end
+      
+      opts
+    end
+
+    protected
+
+    def self.affect_script_name opts, locale
+      app_locales = ::I18n.locales[:main_app]
+      if opts[:script_name] =~ /^\/(#{::I18n.locales[:main_app].keys.join('|')})/
+        opts[:script_name].gsub!($1, locale)
+      else
+        opts[:script_name] = "/#{locale}#{opts[:script_name]}"
+      end
+    end
+  end
+end

data/rails-localization.gemspec

@@ -2,14 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: rails-localization 1.2.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "rails-localization"
-  s.version = "0.2.0"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["E-Max"]
-  s.date = "2013-02-25"
+  s.date = "2014-01-31"
   s.description = "This gem allows you to localize your rails application with ease"
   s.email = "max@studentify.nl"
   s.extra_rdoc_files = [
@@ -18,7 +20,8 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
-    ".rvmrc",
+    ".ruby-gemset",
+    ".ruby-version",
     ".travis.yml",
     "Gemfile",
     "Gemfile.lock",
@@ -27,13 +30,22 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "lib/rails-localization.rb",
-    "lib/rails-localization/middleware.rb",
-    "lib/rails-localization/routes_set_ext.rb",
+    "lib/rails-localization/controller.rb",
+    "lib/rails-localization/engine.rb",
+    "lib/rails-localization/i18n.rb",
+    "lib/rails-localization/route_set.rb",
+    "lib/rails-localization/router.rb",
+    "lib/rails-localization/url_options.rb",
     "lib/rails_localization.rb",
     "rails-localization.gemspec",
+    "test/i18n_integration_test.rb",
+    "test/mapper_integration_test.rb",
     "test/rails-localization_test.rb",
     "test/support/capybara_helper.rb",
     "test/test_app/.gitignore",
+    "test/test_app/Gemfile",
+    "test/test_app/Gemfile.lock",
+    "test/test_app/Rakefile",
     "test/test_app/app/assets/images/rails.png",
     "test/test_app/app/assets/javascripts/application.js",
     "test/test_app/app/assets/stylesheets/application.css",
@@ -73,56 +85,25 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/kot-begemot/rails-localization"
   s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "2.2.1"
   s.summary = "Rails localization Gem"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rails>, [">= 0"])
-      s.add_runtime_dependency(%q<localization-middleware>, [">= 0"])
+      s.add_runtime_dependency(%q<rails>, [">= 4.0.0"])
       s.add_runtime_dependency(%q<i18n>, [">= 0"])
-      s.add_development_dependency(%q<test-unit>, [">= 0"])
-      s.add_development_dependency(%q<test-spec>, [">= 0"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_development_dependency(%q<simplecov>, ["~> 0.6.4"])
-      s.add_development_dependency(%q<rcov>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<debugger>, ["~> 1.1.3"])
-      s.add_development_dependency(%q<ruby-debug>, [">= 0"])
-      s.add_development_dependency(%q<capybara>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.0"])
     else
-      s.add_dependency(%q<rails>, [">= 0"])
-      s.add_dependency(%q<localization-middleware>, [">= 0"])
+      s.add_dependency(%q<rails>, [">= 4.0.0"])
       s.add_dependency(%q<i18n>, [">= 0"])
-      s.add_dependency(%q<test-unit>, [">= 0"])
-      s.add_dependency(%q<test-spec>, [">= 0"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<yard>, ["~> 0.6.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_dependency(%q<simplecov>, ["~> 0.6.4"])
-      s.add_dependency(%q<rcov>, ["~> 1.0.0"])
-      s.add_dependency(%q<debugger>, ["~> 1.1.3"])
-      s.add_dependency(%q<ruby-debug>, [">= 0"])
-      s.add_dependency(%q<capybara>, [">= 0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.0"])
     end
   else
-    s.add_dependency(%q<rails>, [">= 0"])
-    s.add_dependency(%q<localization-middleware>, [">= 0"])
+    s.add_dependency(%q<rails>, [">= 4.0.0"])
     s.add_dependency(%q<i18n>, [">= 0"])
-    s.add_dependency(%q<test-unit>, [">= 0"])
-    s.add_dependency(%q<test-spec>, [">= 0"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<yard>, ["~> 0.6.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-    s.add_dependency(%q<simplecov>, ["~> 0.6.4"])
-    s.add_dependency(%q<rcov>, ["~> 1.0.0"])
-    s.add_dependency(%q<debugger>, ["~> 1.1.3"])
-    s.add_dependency(%q<ruby-debug>, [">= 0"])
-    s.add_dependency(%q<capybara>, [">= 0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.0"])
   end
 end
 

data/test/i18n_integration_test.rb

@@ -0,0 +1,28 @@
+# encoding: utf-8
+require File.expand_path("test_helper", File.dirname(__FILE__))
+
+I18n.extend RailsLocalization::I18n
+
+class I18nIntegrationTest < Test::Unit::TestCase
+  setup do
+    @i18n_locales = I18n.instance_variable_get(:@locales)
+    I18n.instance_variable_set(:@locales, nil)
+  end
+
+  teardown do
+    I18n.instance_variable_set(:@locales, @i18n_locales)
+  end
+
+  test "should Respond to locales" do 
+    assert_respond_to I18n, :locales
+  end
+
+  test "should Return locales" do
+    I18n.instance_variable_set(:@locales, {"en" => "English"})
+    assert_equal({"en" => "English"}, I18n.locales)
+  end
+
+  test "should Return empty hash if no locales" do
+    assert_equal({}, I18n.locales)
+  end
+end

data/test/mapper_integration_test.rb

@@ -0,0 +1,45 @@
+# encoding: utf-8
+require File.expand_path("test_helper", File.dirname(__FILE__))
+require "action_dispatch"
+require 'active_support/core_ext'
+require 'rails-localization/router'
+
+I18n.extend RailsLocalization::I18n
+ActionDispatch::Routing::Mapper.send :include, ActionDispatch::Routing::Mapper::Localization
+
+class MapperIntegrationTest < Test::Unit::TestCase
+  setup do
+    @route_set = ActionDispatch::Routing::RouteSet.new
+    @i18n_locales = I18n.instance_variable_get(:@locales)
+    I18n.instance_variable_set(:@locales, nil)
+  end
+
+  teardown do
+    I18n.instance_variable_set(:@locales, @i18n_locales)
+  end
+
+  test "should Respond to localized" do
+    mapper = ActionDispatch::Routing::Mapper.new @route_set
+    assert_respond_to mapper, :localized
+  end
+
+  test "should Define locales for I18n" do
+    @route_set.draw do
+      localized({"en" => "English"}) do; end
+    end
+
+    assert_kind_of(Hash, I18n.locales[:main_app])
+  end
+
+  # test "should recognize path" do
+  #   @route_set.draw do
+  #     localized({"en" => "English"}) do
+  #       resources :posts
+  #       root :to => "welcome#index"
+  #     end
+  #   end
+
+  #   assert_equal({"en" => "English"}, @route_set.recognize_path("/", {:method => :get}))
+  # end
+end
+  

data/test/rails-localization_test.rb

@@ -1,22 +1,19 @@
 # encoding: utf-8
 require File.expand_path("test_helper", File.dirname(__FILE__))
+require File.expand_path("support/capybara_helper", File.dirname(__FILE__))
 
 class RailsLocalizationTest < ActionDispatch::IntegrationTest
   include CapybaraHelper
 
-  def teardown
-    after_teardown
-  end
-  
-  context "sub app" do
-    should "access without locale" do
+  #context "sub app" do
+    test "should access without locale" do
       visit "/sub"
 
       assert_equal 200, page.status_code
       assert page.has_content? "translation missing: en.sub_app.main.index"
     end
 
-    should "access with english locale" do
+    test "should access with english locale" do
       visit "/en/sub"
       assert_equal 200, page.status_code
       assert page.has_content? "translation missing: en.sub_app.main.index"
@@ -26,7 +23,7 @@ class RailsLocalizationTest < ActionDispatch::IntegrationTest
       assert page.has_content? "translation missing: en.sub_app.main.index"
     end
 
-    should "access with russian locale" do
+    test "should access with russian locale" do
       visit "/ru/sub"
       assert_equal 200, page.status_code
       assert page.has_content? "translation missing: ru.sub_app.main.index"
@@ -36,29 +33,29 @@ class RailsLocalizationTest < ActionDispatch::IntegrationTest
       assert page.has_content? "translation missing: ru.sub_app.main.index"
     end
 
-    context "url_for" do
-      should "correctly print path" do
+    #context "url_for" do
+      test "should correctly print path" do
         visit "/sub/print_redirect"
 
         assert_equal 200, page.status_code
         assert page.has_content?("/sub/print_redirect"), "Failed: #{page.source}"
       end
 
-      should "correctly print path with english locale" do
-        visit "en/sub/print_redirect"
+      test "should correctly print path with english locale" do
+        visit "/en/sub/print_redirect"
 
         assert_equal 200, page.status_code
-        assert page.has_content?("/sub/print_redirect"), "Failed: #{page.source}"
+        assert page.has_content?("/en/sub/print_redirect"), "Failed: #{page.source}"
       end
 
-      should "correctly print path with russian locale" do
+      test "should correctly print path with russian locale" do
         visit "/ru/sub/print_redirect"
 
         assert_equal 200, page.status_code
         assert page.has_content?("/ru/sub/print_redirect"), "Failed: #{page.source}"
       end
 
-      should "return path with russian locale" do
+      test "should return path with russian locale" do
         visit "/sub/welcome"
 
         assert_equal 200, page.status_code
@@ -74,18 +71,18 @@ class RailsLocalizationTest < ActionDispatch::IntegrationTest
         assert_equal 200, page.status_code
         assert page.has_content?("/ru/sub/print_redirect"), "Failed: #{page.source}"
       end
-    end
-  end
+    #end
+  #end
 
-  context "root page" do
-    should "access without locale" do
+  #context "root page" do
+    test "root page should access without locale" do
       visit "/"
 
       assert_equal 200, page.status_code
       assert page.has_content? "translation missing: en.main.index"
     end
     
-    should "access with english locale" do
+    test "root page should access with english locale" do
       visit "/en"
       assert_equal 200, page.status_code
       assert page.has_content? "translation missing: en.main.index"
@@ -95,7 +92,7 @@ class RailsLocalizationTest < ActionDispatch::IntegrationTest
       assert page.has_content? "translation missing: en.main.index"
     end
 
-    should "access with russian locale" do
+    test "root page should access with russian locale" do
       visit "/ru"
       assert_equal 200, page.status_code
       assert page.has_content? "translation missing: ru.main.index"
@@ -104,9 +101,9 @@ class RailsLocalizationTest < ActionDispatch::IntegrationTest
       assert_equal 200, page.status_code
       assert page.has_content? "translation missing: ru.main.index"
     end
-  end
+  #end
 
-  context "welcome page" do
+  #context "welcome page" do
     def test_welcome_with_locale_1
       visit "/en/welcome"
       assert_equal 200, page.status_code
@@ -118,9 +115,9 @@ class RailsLocalizationTest < ActionDispatch::IntegrationTest
       assert_equal 200, page.status_code
       assert page.has_content? "translation missing: ru.main.welcome"
     end
-  end
+  #end
   
-  context "404" do
+  #context "404" do
     def test_wrong_page_without_locale
       assert_raise ActionController::RoutingError do
         visit "/test"
@@ -132,9 +129,9 @@ class RailsLocalizationTest < ActionDispatch::IntegrationTest
         visit "en/test"
       end
     end
-  end
+  #end
 
-  context "users page" do
+  #context "users page" do
     def test_user_controller_index
       visit "/en/users"
       assert page.has_content?("translation missing: en.users.index"), "Page body was: #{page.body}"
@@ -145,41 +142,44 @@ class RailsLocalizationTest < ActionDispatch::IntegrationTest
       visit "/ru/users"
       assert page.has_content? "translation missing: ru.users.index"
     end
-  end
+  #end
 
-  context "user path" do
-    def test_locale_included_into_users_path
+  #context "user path" do
+    test "should include locale into users_path" do
       visit "/users/with_locale"
-      assert_equal "/users", page.source, "Page body was: #{page.body}"
+      assert_equal "/users", page.source, "1. Page body was: #{page.body}"
 
       visit "/en/users/with_locale"
-      assert_equal "/users", page.source, "Page body was: #{page.body}"
+      assert_equal "/users", page.source, "2. Page body was: #{page.body}"
 
       visit "/ru/users/with_locale"
-      assert_equal "/ru/users", page.source, "Page body was: #{page.body}"
+      assert_equal "/ru/users", page.source, "3. Page body was: #{page.body}"
     end
 
-    def test_locale_ignored_in_users_path
+    test "should ignore locale in users_path" do
       visit "/users/without_locale"
-      assert_equal "/users", page.source, "Page body was: #{page.body}"
+      assert_equal "/users", page.source, "1. Page body was: #{page.body}"
 
-      visit "/en/users/without_locale"
-      assert_equal "/users", page.source, "Page body was: #{page.body}"
+      assert_raise ActionController::RoutingError do
+        visit "/en/users/without_locale"
+      end
 
-      visit "/ru/users/without_locale"
-      assert_equal "/users", page.source, "Page body was: #{page.body}"
+      assert_raise ActionController::RoutingError do
+        visit "/ru/users/without_locale"
+      end
     end
 
-    def test_locale_forced_in_users_path
+    test "should forced locale in users_path" do
       visit "/users/with_defined_locale"
-      assert_equal "/ru/users", page.source, "Page body was: #{page.body}"
+      assert_equal "/ru/users", page.source, "1. Page body was: #{page.body}"
 
-      visit "/en/users/with_defined_locale"
-      assert_equal "/ru/users", page.source, "Page body was: #{page.body}"
+      assert_raise ActionController::RoutingError do
+        visit "/en/users/with_defined_locale"
+      end
 
-      visit "/ru/users/with_defined_locale"
-      assert_equal "/ru/users", page.source, "Page body was: #{page.body}"
+      assert_raise ActionController::RoutingError do
+        visit "/ru/users/with_defined_locale"
+      end
     end
-
-  end
+  #end
 end