refinerycms-i18n 4.0.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 985a7f5d83484a91fa8277f88ad2e30bb5302fb3
-  data.tar.gz: 5e97eb8e393f3b3e068b65d0f2c019752fa9a5ed
+  metadata.gz: 6e44a07018771a23eeda1f1b5b12fd845eb1932d
+  data.tar.gz: c802cfd10d4199a642a2a6e11f2127cca2fff59d
 SHA512:
-  metadata.gz: 1e5ed7f28ac84366a817ba60f46f64456b6ccff75f440e8cf952bfe1b8c6ab0d46531761453707e6693b8b56ff8425c4328fe525c75f42bb8584a6bf57e05905
-  data.tar.gz: 984345ab600a159ff5c7ea5790cb6dcbdad2d7b383ecffbaa041944e97eee096ef1151ba8d11a021add0ece2ea77edfd71019e80fa6efbe96e79cb0b1b787956
+  metadata.gz: 55dd35355020bac66f0be88c1f130fb6d00f06c4f587f5dfa8c6c4db35cde9222213d17b6318056fba599148de2c0ca8cba9babfd38f0c5efc4cb0f9fe98d117
+  data.tar.gz: 2a2604e5316d9909cf31280224b5297ab16d43ce4959d9af560b90654960965a10fd18a91e0a90c8837f047a68b1daeeff11478a9a275a4e802ade2d5690ef5a

data/.travis.yml

@@ -9,7 +9,8 @@ notifications:
   webhooks:
     - https://webhooks.gitter.im/e/b5d48907cdc89864b874
 rvm:
-  - 2.4.1
-  - 2.3.3
-  - 2.2.6
+  - 2.5.0
+  - 2.4.3
+  - 2.3.6
+  - 2.2.9
 sudo: false

data/bin/rails

@@ -1,5 +1,11 @@
 #!/usr/bin/env ruby
-# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
+# This command will automatically be run when you run "rails" with Rails gems
+# installed from the root of your application.
 
-ENGINE_PATH = File.expand_path('../..',  __FILE__)
-load File.expand_path('../../spec/dummy/bin/rails',  __FILE__)
+begin
+  load File.join(File.expand_path('../../',  __FILE__), 'spec/dummy/bin/rails')
+rescue LoadError => load_error
+  warn "No dummy Rails application found! \n" \
+       "To create one in spec/dummy, please run: \n\n" \
+       "    rake refinery:testing:dummy_app"
+end

data/lib/refinery/i18n/engine.rb

@@ -18,8 +18,7 @@ module Refinery
       config.to_prepare do
         ::ApplicationController.module_eval do
           def default_url_options
-            locale_param=(::Refinery::I18n.config.enabled? && ::I18n.locale != ::Refinery::I18n.default_frontend_locale) ? { :locale => ::I18n.locale } : {}
-            super.reverse_merge locale_param
+            super.reverse_merge ({ locale: ::I18n.locale })
           end
 
           def find_or_set_locale

data/refinerycms-i18n.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms-i18n}
-  s.version           = %q{4.0.1}
+  s.version           = %q{4.0.2}
   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{http://refinerycms.com}
+  s.homepage          = %q{https://refinerycms.com}
   s.authors           = ['Philip Arndt', 'Uģis Ozols']
   s.require_paths     = %w(lib)
   s.license           = %q{MIT}
@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.files             = `git ls-files`.split("\n")
   s.test_files        = `git ls-files -- spec/*`.split("\n")
 
-  s.required_ruby_version = '>= 2.2.6'
+  s.required_ruby_version = '>= 2.2.9'
 
   s.add_dependency    'routing-filter',   '>= 0.4.0'
   s.add_dependency    'rails-i18n',       '~> 5.0.0'

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

@@ -5,7 +5,7 @@ module Refinery
     describe ResourcesController, type: :controller do
       before do
         Globalize.locale = :en
-        @resource = FactoryGirl.create(:resource, :resource_title => "My resource in English")
+        @resource = FactoryBot.create(:resource, :resource_title => "My resource in English")
 
         # Add a translation
         Globalize.locale = :es

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-i18n
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - Philip Arndt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-14 00:00:00.000000000 Z
+date: 2018-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: routing-filter
@@ -316,14 +316,13 @@ files:
 - lib/translate/log.rb
 - lib/translate/storage.rb
 - refinerycms-i18n.gemspec
-- script/rails
 - spec/controllers/refinery/admin/resources_controller_spec.rb
 - spec/features/set_locale_spec.rb
 - spec/spec_helper.rb
 - spec/support/refinery/i18n/set_defaults.rb
 - tasks/rspec.rake
 - translate-readme.md
-homepage: http://refinerycms.com
+homepage: https://refinerycms.com
 licenses:
 - MIT
 metadata: {}
@@ -335,7 +334,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.6
+      version: 2.2.9
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/script/rails

@@ -1,5 +0,0 @@
-#!/usr/bin/env ruby
-# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
-
-ENGINE_PATH = File.expand_path('../..',  __FILE__)
-load File.expand_path('../../spec/dummy/script/rails',  __FILE__)