refinerycms-i18n 4.0.2 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6e44a07018771a23eeda1f1b5b12fd845eb1932d
-  data.tar.gz: c802cfd10d4199a642a2a6e11f2127cca2fff59d
+SHA256:
+  metadata.gz: 7e4694402d9ab606048504a265341229272cf39960a1b6da00d23714121f9e15
+  data.tar.gz: ed8550a299c0cb478d09ab8439cc1a9f0b817f67b5c7f54666acdc2f5f6f07d0
 SHA512:
-  metadata.gz: 55dd35355020bac66f0be88c1f130fb6d00f06c4f587f5dfa8c6c4db35cde9222213d17b6318056fba599148de2c0ca8cba9babfd38f0c5efc4cb0f9fe98d117
-  data.tar.gz: 2a2604e5316d9909cf31280224b5297ab16d43ce4959d9af560b90654960965a10fd18a91e0a90c8837f047a68b1daeeff11478a9a275a4e802ade2d5690ef5a
+  metadata.gz: d89135c6a0fedada205a87f55a54345502cfba5eca8763ba03fec18bba935f42be0f22fad26b0fee89c297215ab79fa12e6189d31e9aa63e9b5d8cb6e6f5c233
+  data.tar.gz: 9bf7319fdceb496d920d94b3d3445c5f6f1b7c35ca693eae6b1e373516200a213304dc874a689c21d65091db1f7be0236d6add05065da64f4fee06e97605ec9a

data/.travis.yml

@@ -9,8 +9,8 @@ notifications:
   webhooks:
     - https://webhooks.gitter.im/e/b5d48907cdc89864b874
 rvm:
-  - 2.5.0
-  - 2.4.3
-  - 2.3.6
-  - 2.2.9
-sudo: false
+  - 2.5.1
+  - 2.4.4
+  - 2.3.7
+  - 2.2.10
+sudo: false

data/Gemfile

@@ -23,7 +23,7 @@ end
 if !ENV["TRAVIS"] || ENV["DB"] == "mysql"
   gem "activerecord-jdbcmysql-adapter", :platform => :jruby
   gem "jdbc-mysql", "= 5.1.13", :platform => :jruby
-  gem "mysql2", :platform => :ruby
+  gem 'mysql2', '~> 0.4.10', :platform => :ruby
 end
 
 if !ENV["TRAVIS"] || ENV["DB"] == "postgresql"

data/certs/parndt.pem

@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDhjCCAm6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBNMQ0wCwYDVQQDDARnZW1z
+MREwDwYKCZImiZPyLGQBGRYBcDEVMBMGCgmSJomT8ixkARkWBWFybmR0MRIwEAYK
+CZImiZPyLGQBGRYCaW8wHhcNMTcwNzI1MTMxMjIwWhcNMTgwNzI1MTMxMjIwWjBN
+MQ0wCwYDVQQDDARnZW1zMREwDwYKCZImiZPyLGQBGRYBcDEVMBMGCgmSJomT8ixk
+ARkWBWFybmR0MRIwEAYKCZImiZPyLGQBGRYCaW8wggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQDrjwB8be48TFEvGweP7BwWFnmsL2IMU9Ts2UKKWK9GYr7Z
+5uNZFmO1yVBCrmUQHHDlpku6SN6HDO8ChDL7LNugz/4eapRTifHZl8jhPRsOLBcF
+1hANy/V2v5NNkL5Zvb+vsUa7lyjbIOoD5yYzSDl4/T0nOe6xYzxJgBuxZK/nWSOe
+Db8Uffc7B4yhA2kuayUiQUXPYAoPdfUSxoTKDohw17Sm6LKTpg8GkT0ttof1a/xu
+vdsTvZHIcTsYv16e+8SrwLRZ/iBVVsyZFkMYPMxemw7WHxmWElWIgW9S7pUK5Q7J
+oMS5uJVbtV2EmV+cOnhOWDz1A16P7QRFmGje5L+vAgMBAAGjcTBvMAkGA1UdEwQC
+MAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBQ7G/yxuQIzgszkOkaZBgoKBJ1rozAa
+BgNVHREEEzARgQ9nZW1zQHAuYXJuZHQuaW8wGgYDVR0SBBMwEYEPZ2Vtc0BwLmFy
+bmR0LmlvMA0GCSqGSIb3DQEBBQUAA4IBAQB12WMsC+yuuIeM0Ib6HUYZ2IbhRnuW
+4uydNRvKDPdwzjChnOI0POGpcL8O1s1gh+19o/ITq6zRfTLhkwR2ir7XfwHJNppJ
+yg48wbdL5gpZwggKWggKX5G9pqv9LjRsSAew6r0WB+5KW+ArCl/iNo9+AdeR3nUx
+I+L/QiUxYU6XAXSrczL/i7kF5Xc3ZXQYuFsyGW9plA3i9faWUMvGKQc6pvUHIUZC
+jOQmH9VbgbfUrXYM1YOKdlwW5sPR1f4PKLDlvEE+bppIUgKOgLOIv3i7KwrGvFOq
+5r7Wz/HY31SM47mkK21saPJG4NvUFEycf0wlpzP657Pl9aVo47aKKbxX
+-----END CERTIFICATE-----

data/lib/refinery/i18n.rb

@@ -1,4 +1,5 @@
 # Encoding: UTF-8 <-- required, please leave this in.
+require 'mobility'
 require 'refinerycms-core'
 require 'routing-filter'
 require 'rails-i18n'
@@ -42,8 +43,8 @@ module Refinery
       end
 
       def current_frontend_locale
-        if Globalize.locale.present? && Globalize.locale.to_s != config.default_frontend_locale.to_s
-          Globalize.locale
+        if Mobility.locale.present? && Mobility.locale.to_s != config.default_frontend_locale.to_s
+          Mobility.locale
         elsif config.default_frontend_locale.present?
           config.default_frontend_locale
         else

data/lib/refinery/i18n/engine.rb

@@ -27,12 +27,13 @@ module Refinery
             if ::Refinery::I18n.has_locale?(locale = params[:locale].try(:to_sym))
               ::I18n.locale = locale
             elsif locale.present? && locale != ::Refinery::I18n.default_frontend_locale
-              params[:locale] = ::I18n.locale.to_s = ::Refinery::I18n.default_frontend_locale.to_s
-              redirect_to(params, :notice => "The locale '#{locale}' is not supported.") and return
+              ::I18n.locale = ::Refinery::I18n.default_frontend_locale
+              redirect_to(params.permit(:locale).merge(locale: ::I18n.locale),
+                          notice: "The locale '#{locale}' is not supported.") and return
             else
               ::I18n.locale = ::Refinery::I18n.default_frontend_locale
             end
-            Globalize.locale = ::I18n.locale
+            Mobility.locale = ::I18n.locale
           end
 
           prepend_before_action :find_or_set_locale
@@ -52,11 +53,11 @@ module Refinery
           def globalize!
             if ::Refinery::I18n.frontend_locales.any?
               if params[:switch_locale]
-                Globalize.locale = params[:switch_locale].to_sym
+                Mobility.locale = params[:switch_locale].to_sym
               elsif ::I18n.locale != ::Refinery::I18n.default_frontend_locale
-                Globalize.locale = ::Refinery::I18n.default_frontend_locale
+                Mobility.locale = ::Refinery::I18n.default_frontend_locale
               else
-                Globalize.locale = ::I18n.locale
+                Mobility.locale = ::I18n.locale
               end
             end
           end

data/refinerycms-i18n.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms-i18n}
-  s.version           = %q{4.0.2}
+  s.version           = %q{5.0.0}
   s.description       = %q{i18n logic extracted from Refinery CMS, for Refinery CMS.}
   s.summary           = %q{i18n logic for Refinery CMS.}
   s.email             = %q{info@refinerycms.com}
   s.homepage          = %q{https://refinerycms.com}
-  s.authors           = ['Philip Arndt', 'Uģis Ozols']
+  s.authors           = ['Philip Arndt', 'Uģis Ozols', 'Brice Sanchez']
   s.require_paths     = %w(lib)
   s.license           = %q{MIT}
 
@@ -16,6 +16,12 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 2.2.9'
 
-  s.add_dependency    'routing-filter',   '>= 0.4.0'
-  s.add_dependency    'rails-i18n',       '~> 5.0.0'
+  s.add_dependency    'routing-filter',   '~> 0.4'
+  s.add_dependency    'rails-i18n',       '~> 5.0'
+  s.add_dependency    'mobility',         '~> 0.6.0'
+
+  s.cert_chain  = [File.expand_path("../certs/parndt.pem", __FILE__)]
+  if $0 =~ /gem\z/ && ARGV.include?("build") && ARGV.include?(__FILE__)
+    s.signing_key = File.expand_path("~/.ssh/gem-private_key.pem")
+  end
 end

data/spec/controllers/refinery/admin/resources_controller_spec.rb

@@ -4,30 +4,30 @@ module Refinery
   module Admin
     describe ResourcesController, type: :controller do
       before do
-        Globalize.locale = :en
+        Mobility.locale = :en
         @resource = FactoryBot.create(:resource, :resource_title => "My resource in English")
 
         # Add a translation
-        Globalize.locale = :es
+        Mobility.locale = :es
         @resource.resource_title = 'Mi recurso en español'
         @resource.save
       end
 
-      it 'reset Globalize as expected' do
+      it 'reset Mobility as expected' do
         get :index
-        expect(Globalize.locale).to eql(:en)
+        expect(Mobility.locale).to eql(:en)
         expect(::I18n.locale).to eql(:en)
         expect(assigns(:resources).first.resource_title).to eql('My resource in English')
 
         # Switch globalized content to ES
         get :index, params: { switch_locale: :es }
-        expect(Globalize.locale).to eql(:es)
+        expect(Mobility.locale).to eql(:es)
         expect(::I18n.locale).to eql(:en)
         expect(assigns(:resources).first.resource_title).to eql('Mi recurso en español')
 
         # Should return to default locale for globalized content on next request
         get :index
-        expect(Globalize.locale).to eql(:en)
+        expect(Mobility.locale).to eql(:en)
         expect(::I18n.locale).to eql(:en)
         expect(assigns(:resources).first.resource_title).to eql('My resource in English')
       end

data/spec/controllers/refinery/pages_controller_spec.rb

@@ -0,0 +1,21 @@
+require "spec_helper"
+
+module Refinery
+  describe PagesController, type: :controller do
+    before do
+      FactoryBot.create(:page, title: 'test')
+    end
+
+    context 'when locale is unsupported' do
+      subject { get :show, params: { path: 'test', locale: 'en%20217' } }
+
+      it 'redirects to the location with the default frontend locale' do
+        expect(subject).to redirect_to ('/test')
+      end
+
+      it 'flashes a notice message' do
+        expect(subject.request.flash[:notice]).to eq("The locale 'en%20217' is not supported.")
+      end
+    end
+  end
+end

metadata

@@ -1,44 +1,81 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-i18n
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 5.0.0
 platform: ruby
 authors:
 - Philip Arndt
 - Uģis Ozols
+- Brice Sanchez
 autorequire: 
 bindir: bin
-cert_chain: []
-date: 2018-03-15 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDhjCCAm6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBNMQ0wCwYDVQQDDARnZW1z
+  MREwDwYKCZImiZPyLGQBGRYBcDEVMBMGCgmSJomT8ixkARkWBWFybmR0MRIwEAYK
+  CZImiZPyLGQBGRYCaW8wHhcNMTcwNzI1MTMxMjIwWhcNMTgwNzI1MTMxMjIwWjBN
+  MQ0wCwYDVQQDDARnZW1zMREwDwYKCZImiZPyLGQBGRYBcDEVMBMGCgmSJomT8ixk
+  ARkWBWFybmR0MRIwEAYKCZImiZPyLGQBGRYCaW8wggEiMA0GCSqGSIb3DQEBAQUA
+  A4IBDwAwggEKAoIBAQDrjwB8be48TFEvGweP7BwWFnmsL2IMU9Ts2UKKWK9GYr7Z
+  5uNZFmO1yVBCrmUQHHDlpku6SN6HDO8ChDL7LNugz/4eapRTifHZl8jhPRsOLBcF
+  1hANy/V2v5NNkL5Zvb+vsUa7lyjbIOoD5yYzSDl4/T0nOe6xYzxJgBuxZK/nWSOe
+  Db8Uffc7B4yhA2kuayUiQUXPYAoPdfUSxoTKDohw17Sm6LKTpg8GkT0ttof1a/xu
+  vdsTvZHIcTsYv16e+8SrwLRZ/iBVVsyZFkMYPMxemw7WHxmWElWIgW9S7pUK5Q7J
+  oMS5uJVbtV2EmV+cOnhOWDz1A16P7QRFmGje5L+vAgMBAAGjcTBvMAkGA1UdEwQC
+  MAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBQ7G/yxuQIzgszkOkaZBgoKBJ1rozAa
+  BgNVHREEEzARgQ9nZW1zQHAuYXJuZHQuaW8wGgYDVR0SBBMwEYEPZ2Vtc0BwLmFy
+  bmR0LmlvMA0GCSqGSIb3DQEBBQUAA4IBAQB12WMsC+yuuIeM0Ib6HUYZ2IbhRnuW
+  4uydNRvKDPdwzjChnOI0POGpcL8O1s1gh+19o/ITq6zRfTLhkwR2ir7XfwHJNppJ
+  yg48wbdL5gpZwggKWggKX5G9pqv9LjRsSAew6r0WB+5KW+ArCl/iNo9+AdeR3nUx
+  I+L/QiUxYU6XAXSrczL/i7kF5Xc3ZXQYuFsyGW9plA3i9faWUMvGKQc6pvUHIUZC
+  jOQmH9VbgbfUrXYM1YOKdlwW5sPR1f4PKLDlvEE+bppIUgKOgLOIv3i7KwrGvFOq
+  5r7Wz/HY31SM47mkK21saPJG4NvUFEycf0wlpzP657Pl9aVo47aKKbxX
+  -----END CERTIFICATE-----
+date: 2018-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: routing-filter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: rails-i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '5.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: mobility
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 0.6.0
 description: i18n logic extracted from Refinery CMS, for Refinery CMS.
 email: info@refinerycms.com
 executables: []
@@ -302,6 +339,7 @@ files:
 - bin/rake
 - bin/rspec
 - bin/spring
+- certs/parndt.pem
 - lib/generators/refinery/i18n_generator.rb
 - lib/generators/refinery/templates/config/initializers/refinery/i18n.rb.erb
 - lib/refinery/i18n-filter.rb
@@ -317,6 +355,7 @@ files:
 - lib/translate/storage.rb
 - refinerycms-i18n.gemspec
 - spec/controllers/refinery/admin/resources_controller_spec.rb
+- spec/controllers/refinery/pages_controller_spec.rb
 - spec/features/set_locale_spec.rb
 - spec/spec_helper.rb
 - spec/support/refinery/i18n/set_defaults.rb
@@ -342,12 +381,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: i18n logic for Refinery CMS.
 test_files:
 - spec/controllers/refinery/admin/resources_controller_spec.rb
+- spec/controllers/refinery/pages_controller_spec.rb
 - spec/features/set_locale_spec.rb
 - spec/spec_helper.rb
 - spec/support/refinery/i18n/set_defaults.rb

metadata.gz.sig

@@ -0,0 +1 @@
+C)U�c�?g�S(�L��Iԍ�؂L#]p,z}DȺƫffބ��(��g��,k��8����`��&�[�RF��?&�����Վ�?A5���ot�pp�?(����ЮQ���ܞ8��}lh��a�r���A�<�q�v�I���i,oZ�{��:�%�g��1<l�l���2�����:S�?9�J(ZE`��&Q-�C�ꂵ�
}$���	Y�yVO��Z��R��@����#����-�~xښ�hцE�W&D��