refinerycms-i18n 3.0.2 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac37504ad8f7f3a48dd97a244f5a9d064c4eabb7
-  data.tar.gz: 68f1b485fa2104ed15c8adf58751e9310796130b
+  metadata.gz: cc4cabe515e10b49ab000d371942adf2f950f473
+  data.tar.gz: dba925f4bc3859768899838c2a20017f1ad1fce7
 SHA512:
-  metadata.gz: 709f5b24238d70b604c95a0ba690154aced4a66036d4a67b44ef6f6430eacbd9ab91ca829e4812d8bea34f7df37b6bdcba67085507bb683508cbb5ae4d7ba92e
-  data.tar.gz: b5baabbb16b7ad7dc288b098f258999cdf0b55873a3cf024f967bfcc8c41f4b849c603fbb1b37a543459c9c59a0d15bc746d218f0d4d8ae17071f8b49ce382cb
+  metadata.gz: 128a6d8ee0ebaba2f2f1bc5d6adeff3bb7325399a6e38709041bfd8c8e72d8c097bfacca745d807fd55b3d3c0791c1f96e0241cd0bdd68a92b853610b03663b1
+  data.tar.gz: fa3f991e56456fd68030dd186383f6eb5704659f554a53d4b3fe1b9c3b5c44acee4bcb805dcc83c0c58cd0e84b7224858641646aa1af1cab09f418f63ac138d5

data/.travis.yml

@@ -1,31 +1,15 @@
 language: ruby
+cache: bundler
 bundler_args: --without development
-sudo: false
-cache:
-  - bundler: true
-before_script:
-  - "sh -e /etc/init.d/xvfb start"
-  - "bundle exec rake refinery:testing:dummy_app"
-script:
-  - "DISPLAY=:99.0 bundle exec rspec spec"
-notifications:
-  email: true
-  irc:
-    use_notice: true
-    skip_join: true
-    channels:
-      - "irc.freenode.org#refinerycms"
-  campfire:
-    on_success: always
-    on_failure: always
-    rooms:
-      - secure: "JaX+Ckvdd2wqL2bD6t8PHvMDBHxWBlCrkBKPcDKxV0t0DOwzzzwxMryVqcRi\nPsmM/zvmWFATDyRmivhNOpu4lRg9RytSroxZ9nkmbLDqjCyEAZ6tv4yZXME/\nPaxPwmfwgS9g8TKjj3lSWS7rEpqqg0D5S0XIfIHrj6KB6LUmFHc="
-  webhooks:
-    - https://webhooks.gitter.im/e/b5d48907cdc89864b874
+before_script: "bin/rake refinery:testing:dummy_app"
 env:
   - DB=postgresql
   - DB=mysql
+notifications:
+  webhooks:
+    - https://webhooks.gitter.im/e/b5d48907cdc89864b874
 rvm:
-  - 2.4
-  - 2.3
-  - 2.2
+  - 2.4.1
+  - 2.3.3
+  - 2.2.6
+sudo: false

data/Gemfile

@@ -2,7 +2,7 @@ source "https://rubygems.org"
 
 gemspec
 
-git "https://github.com/refinery/refinerycms", branch: "3-0-stable" do
+git "https://github.com/refinery/refinerycms", branch: "master" do
   gem "refinerycms"
 
   group :test do

data/README.md

@@ -0,0 +1,3 @@
+# Refinery CMS I18n [![Build Status](https://travis-ci.org/refinery/refinerycms-i18n.svg?branch=master)](https://travis-ci.org/refinery/refinerycms-i18n)
+
+I18n logic extracted from Refinery CMS, for Refinery CMS.

data/bin/rake

@@ -0,0 +1,21 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rake' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+begin
+  if Dir.exist?(File.expand_path('../../spec/dummy', __FILE__))
+    load File.expand_path("../spring", __FILE__)
+  end
+rescue LoadError
+end
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rake', 'rake')

data/bin/rspec

@@ -0,0 +1,22 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+begin
+  if Dir.exist?(File.expand_path('../../spec/dummy', __FILE__))
+    load File.expand_path("../spring", __FILE__)
+  end
+rescue LoadError
+end
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rspec-core', 'rspec')

data/bin/spring

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+
+# This file loads spring without using Bundler, in order to be fast
+# It gets overwritten when you run the `spring binstub` command
+
+unless defined?(Spring)
+  require "rubygems"
+  require "bundler"
+
+  if match = Bundler.default_lockfile.read.match(/^GEM$.*?^    (?:  )*spring \((.*?)\)$.*?^$/m)
+    ENV["GEM_PATH"] = ([Bundler.bundle_path.to_s] + Gem.path).join(File::PATH_SEPARATOR)
+    ENV["GEM_HOME"] = ""
+    Gem.paths = ENV
+
+    gem "spring", match[1]
+    require "spring/binstub"
+  end
+end

data/lib/refinery/i18n/engine.rb

@@ -17,11 +17,10 @@ module Refinery
 
       config.to_prepare do
         ::ApplicationController.module_eval do
-          def default_url_options_with_locale
+          def default_url_options
             locale_param=(::Refinery::I18n.config.enabled? && ::I18n.locale != ::Refinery::I18n.default_frontend_locale) ? { :locale => ::I18n.locale } : {}
-            default_url_options_without_locale.reverse_merge locale_param
+            super.reverse_merge locale_param
           end
-          alias_method_chain :default_url_options, :locale
 
           def find_or_set_locale
             ::I18n.locale = ::Refinery::I18n.current_frontend_locale
@@ -37,7 +36,7 @@ module Refinery
             Globalize.locale = ::I18n.locale
           end
 
-          prepend_before_filter :find_or_set_locale
+          prepend_before_action :find_or_set_locale
           protected :default_url_options, :find_or_set_locale
         end
 
@@ -63,7 +62,7 @@ module Refinery
             end
           end
           # globalize! should be prepended first so that it runs after find_or_set_locale
-          prepend_before_filter :globalize!, :find_or_set_locale
+          prepend_before_action :globalize!, :find_or_set_locale
           protected :globalize!, :find_or_set_locale
         end
       end

data/refinerycms-i18n.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms-i18n}
-  s.version           = %q{3.0.2}
+  s.version           = %q{4.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}
@@ -14,8 +14,8 @@ 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.0.0'
+  s.required_ruby_version = '>= 2.2.6'
 
   s.add_dependency    'routing-filter',   '>= 0.4.0'
-  s.add_dependency    'rails-i18n',       '~> 4.0.1'
+  s.add_dependency    'rails-i18n',       '~> 5.0.0'
 end

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

@@ -20,7 +20,7 @@ module Refinery
         expect(assigns(:resources).first.resource_title).to eql('My resource in English')
 
         # Switch globalized content to ES
-        get :index, switch_locale: :es
+        get :index, params: { switch_locale: :es }
         expect(Globalize.locale).to eql(:es)
         expect(::I18n.locale).to eql(:en)
         expect(assigns(:resources).first.resource_title).to eql('Mi recurso en español')

data/spec/features/set_locale_spec.rb

@@ -2,7 +2,7 @@
 require "spec_helper"
 
 describe "set_locale parameter", :type => :feature do
-  refinery_login_with :refinery_user
+  refinery_login
 
   it "changes language used in backend" do
     visit refinery.admin_pages_path

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-i18n
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 4.0.0
 platform: ruby
 authors:
 - Philip Arndt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-31 00:00:00.000000000 Z
+date: 2017-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: routing-filter
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: 5.0.0
 description: i18n logic extracted from Refinery CMS, for Refinery CMS.
 email: info@refinerycms.com
 executables: []
@@ -48,6 +48,7 @@ files:
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
+- README.md
 - Rakefile
 - app/assets/images/refinery/icons/flags/ad.png
 - app/assets/images/refinery/icons/flags/ae.png
@@ -298,6 +299,9 @@ files:
 - app/assets/images/refinery/icons/flags/zm.png
 - app/assets/images/refinery/icons/flags/zw.png
 - bin/rails
+- bin/rake
+- bin/rspec
+- bin/spring
 - lib/generators/refinery/i18n_generator.rb
 - lib/generators/refinery/templates/config/initializers/refinery/i18n.rb.erb
 - lib/refinery/i18n-filter.rb
@@ -331,7 +335,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.2.6
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="