rails-localization 1.2.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 45f814e963b1625936bd65aadc83e4096acdca74
-  data.tar.gz: dee12c7e218988db2e34be091454a175199002d2
+SHA256:
+  metadata.gz: e65d3048e387337c90471103e9ec38a17c626f6c6fc85dd73b2005e2f027ab60
+  data.tar.gz: b9c6e5fca7270275eb8a7b2fb7eeb5fa7d6e23d95f59b5b4eef9358c5f7d4b59
 SHA512:
-  metadata.gz: 5be965913a0177a17b5f9739cf744a258b7e6e842fdf9fb05de55029ce72eb0855e4688840e00a959e7a8f8fea2f76954062ca67068b9d56fb1d453fd98f5efa
-  data.tar.gz: 50e6d35007d78709384bc562a52d299157a7cd302d4f74bf1f3a640d3874b3b35ceddbd4a81ea5d43ff6e3bee665eb541d89babd6ae5fe07b15caeac4f7ba7f8
+  metadata.gz: 2897451f27d2f64286f03d8df531b87652a5aadb3e290956d037245b00149eaf22e3c4099d60e0f7fd59ad687c704e5bce27969913746a08802bbdb8cbf2121d
+  data.tar.gz: 18755b927df0bb3ee81d25a85506864009cca774bfb376346faa51e9b534e6c4e98fc9380133bc64d9d7790e6f0ad689fe92f40f9d5544bccecba6308c295037

data/.ruby-version

@@ -1 +1 @@
-ruby-2.0.0
+ruby-2.4.1

data/Gemfile

@@ -1,28 +1,26 @@
 source "http://rubygems.org"
 
-gem "rails", ">= 4.0.0"
+gem "rails", ">= 5.0.0"
 gem "i18n"
 
 group :debug do
-  gem "byebug", platform: :ruby_20
+  gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
+  #gem "byebug", platform: :ruby_20
   #gem "debugger", "~> 1.2.2", platform: :ruby_19
   #gem "ruby-debug", platform: :ruby_18
 end
 
 group :development, :test do
-  gem "jeweler", "~> 1.8.0"
+  gem "jeweler", "~> 2.3"
 end
 
 group :debug, :test do
-  gem "yard"  
-  gem "redcarpet"
+  gem "yard"
 end
 
 group :test do
   gem 'minitest'
   gem "test-unit"
-  gem 'shoulda-context'
-  gem 'shoulda-matchers'
 
   gem "capybara"
-end
+end

data/Gemfile.lock

@@ -1,134 +1,167 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (4.0.2)
-      actionpack (= 4.0.2)
-      mail (~> 2.5.4)
-    actionpack (4.0.2)
-      activesupport (= 4.0.2)
-      builder (~> 3.1.0)
-      erubis (~> 2.7.0)
-      rack (~> 1.5.2)
-      rack-test (~> 0.6.2)
-    activemodel (4.0.2)
-      activesupport (= 4.0.2)
-      builder (~> 3.1.0)
-    activerecord (4.0.2)
-      activemodel (= 4.0.2)
-      activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.2)
-      arel (~> 4.0.0)
-    activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.2)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
-      thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    addressable (2.3.5)
-    arel (4.0.1)
-    atomic (1.1.14)
-    builder (3.1.4)
-    byebug (2.5.0)
-      columnize (~> 0.3.6)
-      debugger-linecache (~> 1.2.0)
-    capybara (2.2.0)
-      mime-types (>= 1.16)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (~> 2.0)
-    columnize (0.3.6)
-    debugger-linecache (1.2.0)
-    erubis (2.7.0)
-    faraday (0.8.8)
-      multipart-post (~> 1.2.0)
-    git (1.2.6)
-    github_api (0.10.1)
+    actioncable (5.2.0)
+      actionpack (= 5.2.0)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailer (5.2.0)
+      actionpack (= 5.2.0)
+      actionview (= 5.2.0)
+      activejob (= 5.2.0)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.2.0)
+      actionview (= 5.2.0)
+      activesupport (= 5.2.0)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.2.0)
+      activesupport (= 5.2.0)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.2.0)
+      activesupport (= 5.2.0)
+      globalid (>= 0.3.6)
+    activemodel (5.2.0)
+      activesupport (= 5.2.0)
+    activerecord (5.2.0)
+      activemodel (= 5.2.0)
+      activesupport (= 5.2.0)
+      arel (>= 9.0)
+    activestorage (5.2.0)
+      actionpack (= 5.2.0)
+      activerecord (= 5.2.0)
+      marcel (~> 0.3.1)
+    activesupport (5.2.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    addressable (2.4.0)
+    arel (9.0.0)
+    builder (3.2.3)
+    byebug (10.0.2)
+    capybara (3.3.1)
       addressable
-      faraday (~> 0.8.1)
-      hashie (>= 1.2)
-      multi_json (~> 1.4)
-      nokogiri (~> 1.5.2)
-      oauth2
-    hashie (2.0.5)
-    highline (1.6.20)
-    hike (1.2.3)
-    httpauth (0.2.0)
-    i18n (0.6.9)
-    jeweler (1.8.8)
+      mini_mime (>= 0.1.3)
+      nokogiri (~> 1.8)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      xpath (~> 3.1)
+    concurrent-ruby (1.0.5)
+    crass (1.0.4)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    erubi (1.7.1)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
+    git (1.4.0)
+    github_api (0.16.0)
+      addressable (~> 2.4.0)
+      descendants_tracker (~> 0.0.4)
+      faraday (~> 0.8, < 0.10)
+      hashie (>= 3.4)
+      mime-types (>= 1.16, < 3.0)
+      oauth2 (~> 1.0)
+    globalid (0.4.1)
+      activesupport (>= 4.2.0)
+    hashie (3.5.7)
+    highline (2.0.0)
+    i18n (1.0.1)
+      concurrent-ruby (~> 1.0)
+    jeweler (2.3.9)
       builder
-      bundler (~> 1.0)
+      bundler
       git (>= 1.2.5)
-      github_api (= 0.10.1)
+      github_api (~> 0.16.0)
       highline (>= 1.6.15)
-      nokogiri (= 1.5.10)
+      nokogiri (>= 1.5.10)
+      psych
       rake
       rdoc
-    json (1.8.1)
-    jwt (0.1.8)
-      multi_json (>= 1.5)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.25.1)
-    minitest (4.7.5)
-    multi_json (1.8.2)
-    multi_xml (0.5.5)
-    multipart-post (1.2.0)
-    nokogiri (1.5.10)
-    oauth2 (0.9.2)
-      faraday (~> 0.8)
-      httpauth (~> 0.2)
-      jwt (~> 0.1.4)
-      multi_json (~> 1.0)
+      semver2
+    jwt (1.5.6)
+    loofah (2.2.2)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.0)
+      mini_mime (>= 0.1.1)
+    marcel (0.3.2)
+      mimemagic (~> 0.3.2)
+    method_source (0.9.0)
+    mime-types (2.99.3)
+    mimemagic (0.3.2)
+    mini_mime (1.0.0)
+    mini_portile2 (2.3.0)
+    minitest (5.11.3)
+    multi_json (1.13.1)
+    multi_xml (0.6.0)
+    multipart-post (2.0.0)
+    nio4r (2.3.1)
+    nokogiri (1.8.4)
+      mini_portile2 (~> 2.3.0)
+    oauth2 (1.4.0)
+      faraday (>= 0.8, < 0.13)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
       multi_xml (~> 0.5)
-      rack (~> 1.2)
-    polyglot (0.3.3)
-    rack (1.5.2)
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rails (4.0.2)
-      actionmailer (= 4.0.2)
-      actionpack (= 4.0.2)
-      activerecord (= 4.0.2)
-      activesupport (= 4.0.2)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.2)
-      sprockets-rails (~> 2.0.0)
-    railties (4.0.2)
-      actionpack (= 4.0.2)
-      activesupport (= 4.0.2)
+      rack (>= 1.2, < 3)
+    power_assert (1.1.3)
+    psych (3.0.2)
+    rack (2.0.5)
+    rack-test (1.0.0)
+      rack (>= 1.0, < 3)
+    rails (5.2.0)
+      actioncable (= 5.2.0)
+      actionmailer (= 5.2.0)
+      actionpack (= 5.2.0)
+      actionview (= 5.2.0)
+      activejob (= 5.2.0)
+      activemodel (= 5.2.0)
+      activerecord (= 5.2.0)
+      activestorage (= 5.2.0)
+      activesupport (= 5.2.0)
+      bundler (>= 1.3.0)
+      railties (= 5.2.0)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (5.2.0)
+      actionpack (= 5.2.0)
+      activesupport (= 5.2.0)
+      method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.1.0)
-    rdoc (4.0.1)
-      json (~> 1.4)
-    redcarpet (3.0.0)
-    shoulda-context (1.1.6)
-    shoulda-matchers (2.4.0)
-      activesupport (>= 3.0.0)
-    sprockets (2.10.1)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.0.1)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (~> 2.8)
-    test-unit (2.5.5)
-    thor (0.18.1)
-    thread_safe (0.1.3)
-      atomic
-    tilt (1.4.1)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.38)
-    xpath (2.0.0)
-      nokogiri (~> 1.3)
-    yard (0.8.7.3)
+    rake (12.3.1)
+    rdoc (6.0.4)
+    semver2 (3.4.2)
+    sprockets (3.7.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    test-unit (3.2.8)
+      power_assert
+    thor (0.20.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    websocket-driver (0.7.0)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.3)
+    xpath (3.1.0)
+      nokogiri (~> 1.8)
+    yard (0.9.15)
 
 PLATFORMS
   ruby
@@ -137,11 +170,11 @@ DEPENDENCIES
   byebug
   capybara
   i18n
-  jeweler (~> 1.8.0)
+  jeweler (~> 2.3)
   minitest
-  rails (>= 4.0.0)
-  redcarpet
-  shoulda-context
-  shoulda-matchers
+  rails (>= 5.0.0)
   test-unit
   yard
+
+BUNDLED WITH
+   1.16.2

data/Rakefile

@@ -28,7 +28,7 @@ Jeweler::RubygemsDotOrgTasks.new
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/*_test.rb'
+  test.pattern = 'test/*_test.rb'
   test.verbose = true
 end
 

data/VERSION

@@ -1 +1 @@
-1.2.0
+2.1.0

data/lib/rails-localization.rb

@@ -5,16 +5,15 @@ require 'rails-localization/engine'
 
 if defined?(ActiveSupport)
   require 'rails-localization/i18n'
-  require 'rails-localization/url_options'
 
   I18n.extend RailsLocalization::I18n
 
   ActiveSupport.on_load(:before_configuration) do
     require 'rails-localization/router'
-    require 'rails-localization/route_set'
+    require 'rails-localization/url_helper'
 
-    ActionDispatch::Routing::RouteSet.send :include, RailsLocalization::RouteSet
-    ActionDispatch::Routing::Mapper.send :include, ActionDispatch::Routing::Mapper::Localization
+    ActionDispatch::Routing::RouteSet::NamedRouteCollection::UrlHelper.send :prepend, RailsLocalization::UrlHelper
+    ActionDispatch::Routing::Mapper.send :prepend, ActionDispatch::Routing::Mapper::Localization
 
     ActiveSupport.on_load(:action_controller) do
       require 'rails-localization/controller'
@@ -23,4 +22,4 @@ if defined?(ActiveSupport)
   end
 else
   warn "ActiveSupport is not defined. Ignoring RailsLocalization loading"
-end
+end

data/lib/rails-localization/controller.rb

@@ -2,7 +2,7 @@ module RailsLocalization
   module Controller
     def self.included(base)
       base.class_eval do
-        around_filter :process_with_locale
+        around_action :process_with_locale
 
         protected
 
@@ -12,11 +12,11 @@ module RailsLocalization
               ::I18n.locale = params[:locale].blank? ? ::I18n.default_locale : params[:locale].to_s
             end
             yield
-          ensure 
+          ensure
             ::I18n.locale = ::I18n.default_locale
-          end 
-        end    
+          end
+        end
       end
     end
   end
-end
+end

data/lib/rails-localization/i18n.rb

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

data/lib/rails-localization/router.rb

@@ -1,15 +1,13 @@
 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
+  def localized(*locales)
+    symbolized_locales = locales.map(&:to_sym)
+    I18n.config.available_locales = symbolized_locales
+    if @set == Rails.application.routes
+      I18n.route_locales[:main_app] = symbolized_locales
+    else
+      sub_app_name = @scope[:module] || :main_app
+      I18n.route_locales[sub_app_name] = symbolized_locales
     end
+    scope("(:locale)", constraints: {locale: /#{symbolized_locales.join('|')}/}, defaults: {locale: ""}) { yield }
   end
-end 
+end

data/lib/rails-localization/url_helper.rb

@@ -0,0 +1,38 @@
+module RailsLocalization
+  module UrlHelper
+    def handle_positional_args(controller_options, inner_options, args, result, path_params)
+      options = super
+
+      if options[:_recall] && options[:_recall].has_key?(:locale) && path_params.include?(:locale)
+        if inner_options.has_key?(:locale) && inner_options[:locale].blank?
+          options.delete(:locale)
+        else
+          if inner_options[:locale] && ::I18n.config.available_locales.include?(inner_options[:locale].to_sym)
+            if inner_options[:locale].to_s != ::I18n.default_locale.to_s
+              options[:locale] = inner_options[:locale]
+            else
+              options.delete(:locale)
+            end
+          else
+            if ::I18n.locale.to_s != ::I18n.default_locale.to_s
+              options[:locale] = ::I18n.locale.to_s
+            else
+              options.delete(:locale)
+            end
+          end
+        end
+      end
+
+      if options.has_key?(:locale) && !inner_options.has_key?(:locale) && !path_params.include?(:locale)
+        options.delete(:locale)
+      end
+
+      if options.has_key?(:_positional_keys) && options[:_positional_keys].includes?(:locale)
+        i = options[:_positional_keys].index(:locale)
+        options[:_positional_args].insert(i, (options.delete(:locale) || ::I18n.locale.to_s))
+      end
+
+      options
+    end
+  end
+end

data/rails-localization.gemspec

@@ -2,18 +2,18 @@
 # 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
+# stub: rails-localization 2.1.0 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "rails-localization"
-  s.version = "1.2.0"
+  s.name = "rails-localization".freeze
+  s.version = "2.1.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 = "2014-01-31"
-  s.description = "This gem allows you to localize your rails application with ease"
-  s.email = "max@studentify.nl"
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["E-Max".freeze]
+  s.date = "2018-08-06"
+  s.description = "This gem allows you to localize your rails application with ease".freeze
+  s.email = "max@studentify.nl".freeze
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -33,9 +33,8 @@ Gem::Specification.new do |s|
     "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/url_helper.rb",
     "lib/rails_localization.rb",
     "rails-localization.gemspec",
     "test/i18n_integration_test.rb",
@@ -83,27 +82,27 @@ Gem::Specification.new do |s|
     "test/test_helper.rb",
     "test/urls_overwriting_test.rb"
   ]
-  s.homepage = "http://github.com/kot-begemot/rails-localization"
-  s.licenses = ["MIT"]
-  s.rubygems_version = "2.2.1"
-  s.summary = "Rails localization Gem"
+  s.homepage = "http://github.com/kot-begemot/rails-localization".freeze
+  s.licenses = ["MIT".freeze]
+  s.rubygems_version = "2.7.7".freeze
+  s.summary = "Rails localization Gem".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rails>, [">= 4.0.0"])
-      s.add_runtime_dependency(%q<i18n>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.8.0"])
+      s.add_runtime_dependency(%q<rails>.freeze, [">= 5.0.0"])
+      s.add_runtime_dependency(%q<i18n>.freeze, [">= 0"])
+      s.add_development_dependency(%q<jeweler>.freeze, ["~> 2.3"])
     else
-      s.add_dependency(%q<rails>, [">= 4.0.0"])
-      s.add_dependency(%q<i18n>, [">= 0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.8.0"])
+      s.add_dependency(%q<rails>.freeze, [">= 5.0.0"])
+      s.add_dependency(%q<i18n>.freeze, [">= 0"])
+      s.add_dependency(%q<jeweler>.freeze, ["~> 2.3"])
     end
   else
-    s.add_dependency(%q<rails>, [">= 4.0.0"])
-    s.add_dependency(%q<i18n>, [">= 0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8.0"])
+    s.add_dependency(%q<rails>.freeze, [">= 5.0.0"])
+    s.add_dependency(%q<i18n>.freeze, [">= 0"])
+    s.add_dependency(%q<jeweler>.freeze, ["~> 2.3"])
   end
 end
 

data/test/i18n_integration_test.rb

@@ -5,24 +5,24 @@ I18n.extend RailsLocalization::I18n
 
 class I18nIntegrationTest < Test::Unit::TestCase
   setup do
-    @i18n_locales = I18n.instance_variable_get(:@locales)
-    I18n.instance_variable_set(:@locales, nil)
+    @i18n_locales = I18n.instance_variable_get(:@route_locales)
+    I18n.instance_variable_set(:@route_locales, nil)
   end
 
   teardown do
-    I18n.instance_variable_set(:@locales, @i18n_locales)
+    I18n.instance_variable_set(:@route_locales, @i18n_locales)
   end
 
-  test "should Respond to locales" do 
-    assert_respond_to I18n, :locales
+  test "should Respond to locales" do
+    assert_respond_to I18n, :route_locales
   end
 
   test "should Return locales" do
-    I18n.instance_variable_set(:@locales, {"en" => "English"})
-    assert_equal({"en" => "English"}, I18n.locales)
+    I18n.instance_variable_set(:@route_locales, ["en"])
+    assert_equal(["en"], I18n.route_locales)
   end
 
   test "should Return empty hash if no locales" do
-    assert_equal({}, I18n.locales)
+    assert_equal({}, I18n.route_locales)
   end
-end
+end

data/test/mapper_integration_test.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 require File.expand_path("test_helper", File.dirname(__FILE__))
+require File.expand_path("support/capybara_helper", File.dirname(__FILE__))
 require "action_dispatch"
 require 'active_support/core_ext'
 require 'rails-localization/router'
@@ -10,12 +11,12 @@ ActionDispatch::Routing::Mapper.send :include, ActionDispatch::Routing::Mapper::
 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)
+    @i18n_locales = I18n.instance_variable_get(:@route_locales)
+    I18n.instance_variable_set(:@route_locales, nil)
   end
 
   teardown do
-    I18n.instance_variable_set(:@locales, @i18n_locales)
+    I18n.instance_variable_set(:@route_locales, @i18n_locales)
   end
 
   test "should Respond to localized" do
@@ -25,21 +26,20 @@ class MapperIntegrationTest < Test::Unit::TestCase
 
   test "should Define locales for I18n" do
     @route_set.draw do
-      localized({"en" => "English"}) do; end
+      localized("en") do; end
     end
 
-    assert_kind_of(Hash, I18n.locales[:main_app])
+    assert_kind_of(Hash, I18n.route_locales[:main_app])
   end
 
   # test "should recognize path" do
   #   @route_set.draw do
-  #     localized({"en" => "English"}) do
+  #     localized("en") do
   #       resources :posts
   #       root :to => "welcome#index"
   #     end
   #   end
 
-  #   assert_equal({"en" => "English"}, @route_set.recognize_path("/", {:method => :get}))
+  #   assert_equal("en", @route_set.recognize_path("/", {:method => :get}))
   # end
 end
-  

data/test/rails-localization_test.rb

@@ -5,6 +5,15 @@ require File.expand_path("support/capybara_helper", File.dirname(__FILE__))
 class RailsLocalizationTest < ActionDispatch::IntegrationTest
   include CapybaraHelper
 
+  setup do
+    I18n.available_locales = [:en, :ru]
+  end
+
+  teardown do
+    ::I18n.locale = ::I18n.default_locale
+    I18n.available_locales = []
+  end
+
   #context "sub app" do
     test "should access without locale" do
       visit "/sub"
@@ -81,7 +90,7 @@ class RailsLocalizationTest < ActionDispatch::IntegrationTest
       assert_equal 200, page.status_code
       assert page.has_content? "translation missing: en.main.index"
     end
-    
+
     test "root page should access with english locale" do
       visit "/en"
       assert_equal 200, page.status_code
@@ -104,27 +113,27 @@ class RailsLocalizationTest < ActionDispatch::IntegrationTest
   #end
 
   #context "welcome page" do
-    def test_welcome_with_locale_1
+    test "page with locale 1 returns context" do
       visit "/en/welcome"
       assert_equal 200, page.status_code
       assert page.has_content? "translation missing: en.main.welcome"
     end
 
-    def test_welcome_with_locale_2
+    test "page with locale 2 returns context" do
       visit "/ru/welcome"
       assert_equal 200, page.status_code
       assert page.has_content? "translation missing: ru.main.welcome"
     end
   #end
-  
+
   #context "404" do
-    def test_wrong_page_without_locale
+    test "wrong page without locale" do
       assert_raise ActionController::RoutingError do
         visit "/test"
       end
     end
 
-    def test_wrong_page_with_locale
+    test "wrong page with locale" do
       assert_raise ActionController::RoutingError do
         visit "en/test"
       end
@@ -182,4 +191,4 @@ class RailsLocalizationTest < ActionDispatch::IntegrationTest
       end
     end
   #end
-end
+end

data/test/test_app/Gemfile

@@ -1,4 +1,4 @@
 source "http://rubygems.org"
 
-gem "rails", ">= 3.0.0", "< 4.0.0"
-gem "rails-localization", path: "../../../rails-localization"
+gem "rails", ">= 5.0.0"
+gem "rails-localization", path: "../../../rails-localization"

data/test/test_app/Gemfile.lock

@@ -1,93 +1,127 @@
 PATH
-  remote: ../../../rails-localization
+  remote: ../..
   specs:
-    rails-localization (1.0.0)
+    rails-localization (1.2.0)
       i18n
-      rails (>= 3.0.0, < 4.0.0)
+      rails (>= 5.0.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.15)
-      actionpack (= 3.2.15)
-      mail (~> 2.5.4)
-    actionpack (3.2.15)
-      activemodel (= 3.2.15)
-      activesupport (= 3.2.15)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.15)
-      activesupport (= 3.2.15)
-      builder (~> 3.0.0)
-    activerecord (3.2.15)
-      activemodel (= 3.2.15)
-      activesupport (= 3.2.15)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.15)
-      activemodel (= 3.2.15)
-      activesupport (= 3.2.15)
-    activesupport (3.2.15)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    arel (3.0.3)
-    builder (3.0.4)
-    erubis (2.7.0)
-    hike (1.2.3)
-    i18n (0.6.5)
-    journey (1.0.4)
-    json (1.8.1)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.25.1)
-    multi_json (1.8.2)
-    polyglot (0.3.3)
-    rack (1.4.5)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.3)
-      rack
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rails (3.2.15)
-      actionmailer (= 3.2.15)
-      actionpack (= 3.2.15)
-      activerecord (= 3.2.15)
-      activeresource (= 3.2.15)
-      activesupport (= 3.2.15)
-      bundler (~> 1.0)
-      railties (= 3.2.15)
-    railties (3.2.15)
-      actionpack (= 3.2.15)
-      activesupport (= 3.2.15)
-      rack-ssl (~> 1.3.2)
+    actioncable (5.2.0)
+      actionpack (= 5.2.0)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailer (5.2.0)
+      actionpack (= 5.2.0)
+      actionview (= 5.2.0)
+      activejob (= 5.2.0)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.2.0)
+      actionview (= 5.2.0)
+      activesupport (= 5.2.0)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.2.0)
+      activesupport (= 5.2.0)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.2.0)
+      activesupport (= 5.2.0)
+      globalid (>= 0.3.6)
+    activemodel (5.2.0)
+      activesupport (= 5.2.0)
+    activerecord (5.2.0)
+      activemodel (= 5.2.0)
+      activesupport (= 5.2.0)
+      arel (>= 9.0)
+    activestorage (5.2.0)
+      actionpack (= 5.2.0)
+      activerecord (= 5.2.0)
+      marcel (~> 0.3.1)
+    activesupport (5.2.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    arel (9.0.0)
+    builder (3.2.3)
+    concurrent-ruby (1.0.5)
+    crass (1.0.4)
+    erubi (1.7.1)
+    globalid (0.4.1)
+      activesupport (>= 4.2.0)
+    i18n (1.0.1)
+      concurrent-ruby (~> 1.0)
+    loofah (2.2.2)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.0)
+      mini_mime (>= 0.1.1)
+    marcel (0.3.2)
+      mimemagic (~> 0.3.2)
+    method_source (0.9.0)
+    mimemagic (0.3.2)
+    mini_mime (1.0.0)
+    mini_portile2 (2.3.0)
+    minitest (5.11.3)
+    nio4r (2.3.1)
+    nokogiri (1.8.4)
+      mini_portile2 (~> 2.3.0)
+    rack (2.0.5)
+    rack-test (1.0.0)
+      rack (>= 1.0, < 3)
+    rails (5.2.0)
+      actioncable (= 5.2.0)
+      actionmailer (= 5.2.0)
+      actionpack (= 5.2.0)
+      actionview (= 5.2.0)
+      activejob (= 5.2.0)
+      activemodel (= 5.2.0)
+      activerecord (= 5.2.0)
+      activestorage (= 5.2.0)
+      activesupport (= 5.2.0)
+      bundler (>= 1.3.0)
+      railties (= 5.2.0)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (5.2.0)
+      actionpack (= 5.2.0)
+      activesupport (= 5.2.0)
+      method_source
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (10.1.0)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    sprockets (2.2.2)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    thor (0.18.1)
-    tilt (1.4.1)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.38)
+      thor (>= 0.18.1, < 2.0)
+    rake (12.3.1)
+    sprockets (3.7.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    thor (0.20.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    websocket-driver (0.7.0)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  rails (>= 3.0.0, < 4.0.0)
+  rails (>= 5.0.0)
   rails-localization!
+
+BUNDLED WITH
+   1.16.2

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

@@ -1,9 +1,9 @@
 class MainController < ApplicationController
   def index
-    render :text => t('main.index')
+    render plain: t('main.index')
   end
 
   def welcome
-    render :text => t('main.welcome')
+    render plain: t('main.welcome')
   end
 end

data/test/test_app/app/controllers/sub_app/main_controller.rb

@@ -1,13 +1,13 @@
 class SubApp::MainController < ApplicationController
   def print_redirect
-    render :text => sub_app_engine.print_redirect_path
+    render plain: sub_app_engine.print_redirect_path
   end
 
   def index
-    render :text => t('sub_app.main.index')
+    render plain: t('sub_app.main.index')
   end
 
   def welcome
-    render :text => sub_app_engine.print_redirect_path(:locale => :ru)
+    render plain: sub_app_engine.print_redirect_path(locale: :ru)
   end
 end

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

@@ -1,18 +1,17 @@
 class UsersController < ApplicationController
   def index
-    render :text => t('users.index')
+    render plain: t('users.index')
   end
 
   def with_locale
-    render :text => users_path, :layout => false
+    render plain: users_path, layout: false
   end
 
   def without_locale
-    render :text => users_path, :layout => false
+    render plain: users_path(:locale => false), layout: false
   end
 
   def with_defined_locale
-    render :text => users_path(:locale => :ru), :layout => false
+    render plain: users_path(:locale => :ru), layout: false
   end
 end
-

data/test/test_app/config/initializers/secret_token.rb

@@ -4,4 +4,4 @@
 # If you change this key, all old signed cookies will become invalid!
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
-TestApp::Application.config.secret_token = '2dfa87d4cd5809fc27fae79627ad5203edbc35bad2a5730fe5ef969f0ef736a798480f49e8cfccc9b25f7e12d8ab500d619d4fbe572da497380293fba0c99975'
+TestApp::Application.config.secret_key_base = '2dfa87d4cd5809fc27fae79627ad5203edbc35bad2a5730fe5ef969f0ef736a798480f49e8cfccc9b25f7e12d8ab500d619d4fbe572da497380293fba0c99975'

data/test/test_app/config/routes.rb

@@ -7,7 +7,7 @@ SubApp::Engine.routes.draw do
 end
 
 TestApp::Application.routes.draw do
-  localized({"en" => "English", "ru" => "Russian"}) do
+  localized("en", "ru") do
     mount SubApp::Engine => '/sub', :as => :sub_app_engine
 
     get :users, :to => "users#index"

data/test/test_helper.rb

@@ -1,7 +1,7 @@
 require 'bundler'
 require 'rack/test'
 require 'test-unit'
-require 'shoulda/context'
+require 'byebug'
 
 Bundler.setup(:default, :test)
 

data/test/urls_overwriting_test.rb

@@ -3,8 +3,13 @@ require File.expand_path("test_helper", File.dirname(__FILE__))
 require File.expand_path("support/capybara_helper", File.dirname(__FILE__))
 
 class UrlsOverwritingTest < ActionController::TestCase
-  def teardown
+  setup do
+    I18n.available_locales = [:en, :ru]
+  end
+
+  teardown do
     ::I18n.locale = ::I18n.default_locale
+    I18n.available_locales = []
   end
 
   test "root" do
@@ -15,4 +20,4 @@ class UrlsOverwritingTest < ActionController::TestCase
     ::I18n.locale = :ru
     assert_generates("/ru", :controller => "main", :action => "index", :locale => "ru")
   end
-end
+end

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: rails-localization
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.1.0
 platform: ruby
 authors:
 - E-Max
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-31 00:00:00.000000000 Z
+date: 2018-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '2.3'
 description: This gem allows you to localize your rails application with ease
 email: max@studentify.nl
 executables: []
@@ -60,10 +60,10 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
 files:
-- .document
-- .ruby-gemset
-- .ruby-version
-- .travis.yml
+- ".document"
+- ".ruby-gemset"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -74,9 +74,8 @@ files:
 - 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/url_helper.rb
 - lib/rails_localization.rb
 - rails-localization.gemspec
 - test/i18n_integration_test.rb
@@ -133,17 +132,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Rails localization Gem

data/lib/rails-localization/route_set.rb

@@ -1,12 +0,0 @@
-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/url_options.rb

@@ -1,34 +0,0 @@
-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