localizable_routes 4.0.0.1 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f44462ca27e04be3df91f12c35bd410ab8c07f7
-  data.tar.gz: b358f05757bf4adf1029dcc39dee93ffd1177412
+  metadata.gz: b841ad1878352de8fb2ec0ea69ae600f793ee2ed
+  data.tar.gz: 1565a554b7f8a18cce83a97e89903a68b915dd62
 SHA512:
-  metadata.gz: 41c2c66539e8de2b856f73e152dbc7908a0f72189883f2dd28e8aa09f58288675c151fbc1d485771c618dc7334a320109e91ad5d567244dc7843284a46e0f180
-  data.tar.gz: 9bbba27d618a5aa4393d555b98071ab328fe1ef3ca8a31da081303af05fbaed502834aec7bd25638166412468c26c3d6c7a1e40fdc5b77b1fa46e834c64b8631
+  metadata.gz: 0f894054e66777db7887f644a471c285a1995ce54a874549932bafd165a2e233d51ed3a4a6b30113d9988365c1f84b9b20346b78a05c3e63f8779cc484238ba0
+  data.tar.gz: 1382c20f268ed0c3386288a1167cbbc7e58b0e96cb6c30feafc87014e1273b717fab254fb5188d9a0608395b3e3a0ffdd516a06d307d01ed05229a0272557371

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2016 Mathías Montossi
+Copyright 2017 Museways
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,7 +1,7 @@
 [![Gem Version](https://badge.fury.io/rb/localizable_routes.svg)](http://badge.fury.io/rb/localizable_routes)
-[![Code Climate](https://codeclimate.com/github/mmontossi/localizable_routes/badges/gpa.svg)](https://codeclimate.com/github/mmontossi/localizable_routes)
-[![Build Status](https://travis-ci.org/mmontossi/localizable_routes.svg)](https://travis-ci.org/mmontossi/localizable_routes)
-[![Dependency Status](https://gemnasium.com/mmontossi/localizable_routes.svg)](https://gemnasium.com/mmontossi/localizable_routes)
+[![Code Climate](https://codeclimate.com/github/museways/localizable_routes/badges/gpa.svg)](https://codeclimate.com/github/museways/localizable_routes)
+[![Build Status](https://travis-ci.org/museways/localizable_routes.svg)](https://travis-ci.org/museways/localizable_routes)
+[![Dependency Status](https://gemnasium.com/museways/localizable_routes.svg)](https://gemnasium.com/museways/localizable_routes)
 
 # Localizable Routes
 
@@ -37,11 +37,11 @@ localized strategy: :param, locales: %i(es en) do
   get 'page' => 'pages#show', as: :param
 end
 
-localized strategy: :subdomain, locales: { 'uy' => :es, 'us' => :en } do
+localized strategy: :subdomain, locales: { 'es' => :es, 'www' => :en } do
   get 'page' => 'pages#show', as: :subdomain
 end
 
-localized strategy: :domain, locales: { 'domain.uy' => :es, 'domain.us' => :en } do
+localized strategy: :domain, locales: { 'domain.es' => :es, 'domain.com' => :en } do
   get 'page' => 'pages#show', as: :domain
 end
 ```
@@ -65,10 +65,10 @@ param_path
 # => /en/pagina if I18n.locale is :es
 
 subdomain_url
-# => http://uy.domain.com/pagina if current subdomain is uy
+# => http://es.domain.com/pagina if current subdomain is es
 
 domain_url
-# => http://domain.uy/pagina if current domain is domain.uy
+# => http://domain.es/pagina if current domain is domain.es
 ```
 
 And you can change the locale by passing the corresponding parameter:
@@ -76,22 +76,22 @@ And you can change the locale by passing the corresponding parameter:
 param_path locale: :en
 # => /en/page
 
-subdomain_url sudomain: 'us'
-# => http://us.domain.com/page
+subdomain_url sudomain: 'es'
+# => http://es.domain.com/pagina
 
-domain_url domain: 'domain.us'
-# => http://domain.us/page
+domain_url domain: 'domain.com'
+# => http://domain.com/page
 ```
 
 ## Contributing
 
 Any issue, pull request, comment of any kind is more than welcome!
 
-I will mainly ensure compatibility to PostgreSQL, AWS, Redis, Elasticsearch, FreeBSD and Memcached. 
+I will mainly ensure compatibility to Rails, AWS, PostgreSQL, Redis, Elasticsearch and FreeBSD. 
 
 ## Credits
 
-This gem is maintained and funded by [mmontossi](https://github.com/mmontossi).
+This gem is maintained and funded by [museways](https://github.com/museways).
 
 ## License
 

data/Rakefile

@@ -4,16 +4,14 @@ rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
 
-Bundler::GemHelper.install_tasks
+require 'bundler/gem_tasks'
 
 require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
   t.libs << 'test'
   t.pattern = 'test/**/*_test.rb'
   t.verbose = false
-  t.warning = false
 end
 
 task default: :test

data/lib/localizable_routes/extensions/action_dispatch/mapper.rb

@@ -21,30 +21,26 @@ module LocalizableRoutes
           @localization = nil
         end
 
-        def add_route(action, options)
+        def add_route(action, controller, options, _path, to, via, formatted, anchor, options_constraints)
           if @localization
+            strategy = @localization[:strategy]
             @localization[:locales].each do |locale|
               localized_options = options.dup
-              localized_options[:constraints] ||= {}
-              localized_options[:defaults] ||= {}
-              strategy = @localization[:strategy]
+              localized_options_constraints = options_constraints.dup
               if strategy == :param
                 @locale = locale
-                localized_options[:constraints][:locale] = locale
-                localized_options[:defaults][:locale] = locale
+                localized_options[:locale] = locale
+                localized_options_constraints[:locale] = locale
               else
                 @locale = locale.second
-                localized_options[:constraints][strategy] = locale.first
-                localized_options[:defaults][strategy] = locale.first
+                localized_options[strategy] = locale.first
+                localized_options_constraints[strategy] = locale.first
               end
-              super action, localized_options
+              super action, controller, localized_options, _path, to, via, formatted, anchor, localized_options_constraints
             end
             @locale = nil
             if options.fetch(:as, true)
-              @set.named_routes.define_localized_url_helper(
-                name_for_action(options[:as], action),
-                @localization
-              )
+              @set.named_routes.add_localized_url_helper name_for_action(options[:as], action), @localization
             end
           else
             super
@@ -55,7 +51,7 @@ module LocalizableRoutes
           candidate = super
           if candidate && @locale
             suffixed_candidate = "#{super}_#{@locale}"
-            if !as.nil? || !@set.named_routes.routes.has_key?(suffixed_candidate.to_sym)
+            unless @set.named_routes.key?(suffixed_candidate)
               suffixed_candidate
             end
           else

data/lib/localizable_routes/extensions/action_dispatch/named_route_collection.rb

@@ -4,7 +4,7 @@ module LocalizableRoutes
       module NamedRouteCollection
         extend ActiveSupport::Concern
 
-        def define_localized_url_helper(name, localization)
+        def add_localized_url_helper(name, localization)
           %w(path url).each do |type|
             helper = :"#{name}_#{type}"
             target = instance_variable_get("@#{type}_helpers_module")

data/lib/localizable_routes/version.rb

@@ -1,5 +1,5 @@
 module LocalizableRoutes
 
-  VERSION = '4.0.0.1'
+  VERSION = '5.1.0'
 
 end

metadata

@@ -1,38 +1,46 @@
 --- !ruby/object:Gem::Specification
 name: localizable_routes
 version: !ruby/object:Gem::Version
-  version: 4.0.0.1
+  version: 5.1.0
 platform: ruby
 authors:
 - mmontossi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-14 00:00:00.000000000 Z
+date: 2017-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 4.3.0
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
-    - - "<"
+        version: '5.1'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.3.0
+        version: '0.21'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.21'
 description: Flexible toolkit to localize routes in rails.
 email:
-- mmontossi@gmail.com
+- hi@museways.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -45,53 +53,7 @@ files:
 - lib/localizable_routes/extensions/action_dispatch/named_route_collection.rb
 - lib/localizable_routes/railtie.rb
 - lib/localizable_routes/version.rb
-- test/dummy/Rakefile
-- test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/assets/stylesheets/application.css
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/controllers/namespace/pages_controller.rb
-- test/dummy/app/controllers/namespace/resources_controller.rb
-- test/dummy/app/controllers/nested_controller.rb
-- test/dummy/app/controllers/pages_controller.rb
-- test/dummy/app/controllers/resources_controller.rb
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/bin/bundle
-- test/dummy/bin/rails
-- test/dummy/bin/rake
-- test/dummy/bin/setup
-- test/dummy/config.ru
-- test/dummy/config/application.rb
-- test/dummy/config/boot.rb
-- test/dummy/config/database.yml
-- test/dummy/config/database.yml.travis
-- test/dummy/config/environment.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/initializers/assets.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/cookies_serializer.rb
-- test/dummy/config/initializers/filter_parameter_logging.rb
-- test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/session_store.rb
-- test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/config/locales/es.yml
-- test/dummy/config/routes.rb
-- test/dummy/config/secrets.yml
-- test/dummy/log/development.log
-- test/dummy/log/test.log
-- test/dummy/public/404.html
-- test/dummy/public/422.html
-- test/dummy/public/500.html
-- test/dummy/public/favicon.ico
-- test/helper_test.rb
-- test/route_test.rb
-- test/support/i18n_support.rb
-- test/test_helper.rb
-homepage: https://github.com/mmontossi/localizable_routes
+homepage: https://github.com/museways/localizable_routes
 licenses:
 - MIT
 metadata: {}
@@ -103,7 +65,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -111,54 +73,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Localizable routes for rails.
-test_files:
-- test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/assets/stylesheets/application.css
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/controllers/namespace/pages_controller.rb
-- test/dummy/app/controllers/namespace/resources_controller.rb
-- test/dummy/app/controllers/nested_controller.rb
-- test/dummy/app/controllers/pages_controller.rb
-- test/dummy/app/controllers/resources_controller.rb
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/bin/bundle
-- test/dummy/bin/rails
-- test/dummy/bin/rake
-- test/dummy/bin/setup
-- test/dummy/config/application.rb
-- test/dummy/config/boot.rb
-- test/dummy/config/database.yml
-- test/dummy/config/database.yml.travis
-- test/dummy/config/environment.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/initializers/assets.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/cookies_serializer.rb
-- test/dummy/config/initializers/filter_parameter_logging.rb
-- test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/session_store.rb
-- test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/config/locales/es.yml
-- test/dummy/config/routes.rb
-- test/dummy/config/secrets.yml
-- test/dummy/config.ru
-- test/dummy/log/development.log
-- test/dummy/log/test.log
-- test/dummy/public/404.html
-- test/dummy/public/422.html
-- test/dummy/public/500.html
-- test/dummy/public/favicon.ico
-- test/dummy/Rakefile
-- test/helper_test.rb
-- test/route_test.rb
-- test/support/i18n_support.rb
-- test/test_helper.rb
+test_files: []

data/test/dummy/Rakefile

@@ -1,5 +0,0 @@
-# Add your own tasks in files placed in lib/tasks ending in .rake,
-# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
-
-require File.expand_path('../config/application', __FILE__)
-Rails.application.load_tasks

data/test/dummy/app/assets/javascripts/application.js

@@ -1,13 +0,0 @@
-// This is a manifest file that'll be compiled into application.js, which will include all the files
-// listed below.
-//
-// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-// or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path.
-//
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// compiled file.
-//
-// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
-// about supported directives.
-//
-//= require_tree .

data/test/dummy/app/assets/stylesheets/application.css

@@ -1,15 +0,0 @@
-/*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the bottom of the
- * compiled file so the styles you add here take precedence over styles defined in any styles
- * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
- * file per style scope.
- *
- *= require_tree .
- *= require_self
- */

data/test/dummy/app/controllers/application_controller.rb

@@ -1,5 +0,0 @@
-class ApplicationController < ActionController::Base
-  # Prevent CSRF attacks by raising an exception.
-  # For APIs, you may want to use :null_session instead.
-  protect_from_forgery with: :exception
-end

data/test/dummy/app/controllers/namespace/pages_controller.rb

@@ -1,6 +0,0 @@
-class Namespace::PagesController < ApplicationController
-
-  def nested
-  end
- 
-end

data/test/dummy/app/controllers/namespace/resources_controller.rb

@@ -1,6 +0,0 @@
-class Namespace::ResourcesController < ApplicationController
-
-  def index
-  end
- 
-end

data/test/dummy/app/controllers/nested_controller.rb

@@ -1,6 +0,0 @@
-class NestedController < ApplicationController
-
-  def index
-  end
-
-end

data/test/dummy/app/controllers/pages_controller.rb

@@ -1,12 +0,0 @@
-class PagesController < ApplicationController
- 
-  def index
-  end
-
-  def simple
-  end
-
-  def complex
-  end
-
-end

data/test/dummy/app/controllers/resources_controller.rb

@@ -1,6 +0,0 @@
-class ResourcesController < ApplicationController
-
-  def index
-  end
-
-end

data/test/dummy/app/helpers/application_helper.rb

@@ -1,2 +0,0 @@
-module ApplicationHelper
-end

data/test/dummy/app/views/layouts/application.html.erb

@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>Dummy</title>
-    <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %>
-    <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
-    <%= csrf_meta_tags %>
-  </head>
-  <body>
-    <%= yield %>
-  </body>
-</html>

data/test/dummy/bin/bundle

@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
-load Gem.bin_path('bundler', 'bundle')

data/test/dummy/bin/rails

@@ -1,5 +0,0 @@
-#!/usr/bin/env ruby
-
-APP_PATH = File.expand_path('../../config/application', __FILE__)
-require_relative '../config/boot'
-require 'rails/commands'

data/test/dummy/bin/rake

@@ -1,5 +0,0 @@
-#!/usr/bin/env ruby
-
-require_relative '../config/boot'
-require 'rake'
-Rake.application.run

data/test/dummy/bin/setup

@@ -1,30 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'pathname'
-
-# path to your application root.
-APP_ROOT = Pathname.new File.expand_path('../../',  __FILE__)
-
-Dir.chdir APP_ROOT do
-  # This script is a starting point to setup your application.
-  # Add necessary setup steps to this file:
-
-  puts '== Installing dependencies =='
-  system 'gem install bundler --conservative'
-  system 'bundle check || bundle install'
-
-  # puts "\n== Copying sample files =="
-  # unless File.exist?('config/database.yml')
-  #   system 'cp config/database.yml.sample config/database.yml'
-  # end
-
-  puts "\n== Preparing database =="
-  system 'bin/rake db:setup'
-
-  puts "\n== Removing old logs and tempfiles =="
-  system 'rm -f log/*'
-  system 'rm -rf tmp/cache'
-
-  puts "\n== Restarting application server =="
-  system 'touch tmp/restart.txt'
-end

data/test/dummy/config/application.rb

@@ -1,27 +0,0 @@
-require File.expand_path('../boot', __FILE__)
-
-require 'active_model/railtie'
-require 'action_controller/railtie'
-require 'action_mailer/railtie'
-require 'action_view/railtie'
-require 'sprockets/railtie'
-require 'rails/test_unit/railtie'
-
-Bundler.require(*Rails.groups)
-require 'localizable_routes'
-
-module Dummy
-  class Application < Rails::Application
-    # Settings in config/environments/* take precedence over those specified here.
-    # Application configuration should go into files in config/initializers
-    # -- all .rb files in that directory are automatically loaded.
-
-    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
-    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
-    # config.time_zone = 'Central Time (US & Canada)'
-
-    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
-    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
-    # config.i18n.default_locale = :de
-  end
-end

data/test/dummy/config/boot.rb

@@ -1,5 +0,0 @@
-# Set up gems listed in the Gemfile.
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)
-
-require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
-$LOAD_PATH.unshift File.expand_path('../../../../lib', __FILE__)

data/test/dummy/config/database.yml

@@ -1,10 +0,0 @@
-default: &default
-  adapter: postgresql
-
-development:
-  <<: *default
-  database: gem_development
-
-test:
-  <<: *default
-  database: gem_test

data/test/dummy/config/database.yml.travis

@@ -1,3 +0,0 @@
-test:
-  adapter: <%= 'jdbc' if RUBY_ENGINE == 'jruby' %>postgresql
-  database: travis

data/test/dummy/config/environment.rb

@@ -1,5 +0,0 @@
-# Load the Rails application.
-require File.expand_path('../application', __FILE__)
-
-# Initialize the Rails application.
-Rails.application.initialize!

data/test/dummy/config/environments/development.rb

@@ -1,38 +0,0 @@
-Rails.application.configure do
-  # Settings specified here will take precedence over those in config/application.rb.
-
-  # In the development environment your application's code is reloaded on
-  # every request. This slows down response time but is perfect for development
-  # since you don't have to restart the web server when you make code changes.
-  config.cache_classes = false
-
-  # Do not eager load code on boot.
-  config.eager_load = false
-
-  # Show full error reports and disable caching.
-  config.consider_all_requests_local = true
-  config.action_controller.perform_caching = false
-
-  # Don't care if the mailer can't send.
-  config.action_mailer.raise_delivery_errors = false
-
-  # Print deprecation notices to the Rails logger.
-  config.active_support.deprecation = :log
-
-  # Debug mode disables concatenation and preprocessing of assets.
-  # This option may cause significant delays in view rendering with a large
-  # number of complex assets.
-  config.assets.debug = true
-
-  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
-  # yet still be able to expire them through the digest params.
-  config.assets.digest = true
-
-  # Adds additional error checking when serving assets at runtime.
-  # Checks for improperly declared sprockets dependencies.
-  # Raises helpful error messages.
-  config.assets.raise_runtime_errors = true
-
-  # Raises error for missing translations
-  # config.action_view.raise_on_missing_translations = true
-end