refinerycms-i18n 2.1.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f3cc913b0e9ae54c7e114a610b2f7ba25c66ce7
-  data.tar.gz: a99c91f97d16ece099057864ccdfffe125da92f6
+  metadata.gz: 23c6b946727499f4fc96f3bc9e047b8d34f11a50
+  data.tar.gz: 27a88c795ab764e8b5871630ef8c2b800fbc9f31
 SHA512:
-  metadata.gz: 38d9ace175d27ca988b29b2248994f1a986bd6f3a1f3aebf5001c39152bb1c27fcad762fd01bd6279d308ef7489453db7c88792cb7c339cfb2c09448038e2316
-  data.tar.gz: 3070b164f87a116dc689bd2fe9da46042885b0dc20cff7d6ba175df0817a2c9fcb79b98246c97c6aff9af1c55fa4a8345eb6d5faaed072bab8c0f79edc59c17f
+  metadata.gz: a63df0adefec2189c51d4c2c4c1ed43565b2d54eae1d605f8510b9abfc2eab8db8a49ca75dbf54c5a9d6739ffcb513d2091aa7f25120a6295d75270fb9b87d39
+  data.tar.gz: bc8d3209229d12cd69752c65b908f4f22ce1160b2feba9dcd94833fa733ba2e78ebd061f19a535e2250a82cb9b9e3c38ed4f307877f03574d4c7a8e7bca3c93c

data/.gitignore

@@ -83,4 +83,7 @@ db/schema.rb
 # END REFINERY CMS DEVELOPMENT =================================================
 
 Gemfile.lock
-spec/dummy
+spec/dummy
+
+# Local Gemfile for developing without sharing dependencies
+.gemfile

data/.travis.yml

@@ -1,12 +1,11 @@
 language: ruby
-before_install:
-  - 'if [[ "$TRAVIS_RUBY_VERSION" =~ "jruby" ]] ; then gem update --system ; fi'
-  - gem install bundler
-install:
-  - bundle install --without development
+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 > /dev/null"
+  - "bundle exec rake refinery:testing:dummy_app"
 script:
   - "DISPLAY=:99.0 bundle exec rspec spec"
 notifications:
@@ -21,15 +20,12 @@ notifications:
     on_failure: always
     rooms:
       - secure: "JaX+Ckvdd2wqL2bD6t8PHvMDBHxWBlCrkBKPcDKxV0t0DOwzzzwxMryVqcRi\nPsmM/zvmWFATDyRmivhNOpu4lRg9RytSroxZ9nkmbLDqjCyEAZ6tv4yZXME/\nPaxPwmfwgS9g8TKjj3lSWS7rEpqqg0D5S0XIfIHrj6KB6LUmFHc="
+  webhooks:
+    - https://webhooks.gitter.im/e/b5d48907cdc89864b874
 env:
   - DB=postgresql
   - DB=mysql
-matrix:
-  allow_failures:
-    - rvm: rbx-19mode
-    - rvm: jruby-19mode
 rvm:
+  - 2.2
+  - 2.1
   - 2.0.0
-  - 1.9.3
-  - rbx-19mode
-  - jruby-19mode

data/Gemfile

@@ -1,73 +1,44 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 gemspec
 
-git 'git://github.com/refinery/refinerycms.git', :branch => 'master' do
-  gem 'refinerycms'
+git "https://github.com/refinery/refinerycms", branch: "master" do
+  gem "refinerycms"
 
-  group :development, :test do
-    gem 'refinerycms-testing'
+  group :test do
+    gem "refinerycms-testing"
   end
 end
 
-group :development, :test do
-  require 'rbconfig'
+gem "mime-types", "~> 1.25.1"
 
-  # Database Configuration
-  unless ENV['TRAVIS']
-    gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
-    gem 'sqlite3', :platform => :ruby
-  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
-  end
-
-  if !ENV['TRAVIS'] || ENV['DB'] == 'postgresql'
-    gem 'activerecord-jdbcpostgresql-adapter', :platform => :jruby
-    gem 'pg', :platform => :ruby
-  end
-
-  platforms :mswin, :mingw do
-    gem 'win32console'
-    gem 'rb-fchange', '~> 0.0.5'
-    gem 'rb-notifu', '~> 0.0.4'
-  end
+# Database Configuration
+unless ENV["TRAVIS"]
+  gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby
+  gem "sqlite3", :platform => :ruby
+end
 
-  platforms :ruby do
-    unless ENV['TRAVIS']
-      if RbConfig::CONFIG['target_os'] =~ /darwin/i
-        gem 'rb-fsevent', '>= 0.3.9'
-        gem 'growl',      '~> 1.0.3'
-      end
-      if RbConfig::CONFIG['target_os'] =~ /linux/i
-        gem 'rb-inotify', '>= 0.5.1'
-        gem 'libnotify',  '~> 0.1.3'
-        gem 'therubyracer', '~> 0.9.9'
-      end
-    end
-  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
+end
 
-  platforms :jruby do
-    unless ENV['TRAVIS']
-      if RbConfig::CONFIG['target_os'] =~ /darwin/i
-        gem 'growl',      '~> 1.0.3'
-      end
-      if RbConfig::CONFIG['target_os'] =~ /linux/i
-        gem 'rb-inotify', '>= 0.5.1'
-        gem 'libnotify',  '~> 0.1.3'
-      end
-    end
-  end
+if !ENV["TRAVIS"] || ENV["DB"] == "postgresql"
+  gem "activerecord-jdbcpostgresql-adapter", :platform => :jruby
+  gem "pg", :platform => :ruby
 end
 
+gem "jruby-openssl", :platform => :jruby
+
 # Refinery/rails should pull in the proper versions of these
 group :assets do
-  gem 'sass-rails'
-  gem 'coffee-rails'
-  gem 'uglifier'
+  gem "sass-rails"
+  gem "coffee-rails"
+  gem "uglifier"
 end
 
-gem 'jquery-rails'
+# Load local gems according to Refinery developer preference.
+if File.exist? local_gemfile = File.expand_path("../.gemfile", __FILE__)
+  eval File.read(local_gemfile)
+end

data/Rakefile

@@ -13,7 +13,6 @@ if File.exists?(APP_RAKEFILE)
 end
 
 require "refinerycms-testing"
-Refinery::Testing::Railtie.load_tasks
 Refinery::Testing::Railtie.load_dummy_tasks(ENGINE_PATH)
 
 load File.expand_path('../tasks/rspec.rake', __FILE__)

data/lib/refinery/i18n.rb

@@ -21,6 +21,7 @@ module Refinery
           :nb => 'Norsk Bokmål',
           :sl => 'Slovenian',
           :es => 'Español',
+          :ca => 'Català',
           :it => 'Italiano',
           :de => 'Deutsch',
           :lv => 'Latviski',

data/lib/refinery/i18n/configuration.rb

@@ -16,7 +16,7 @@ module Refinery
 
     def self.frontend_locales
       config.frontend_locales.select do |locale|
-        config.locales.keys.include?(locale)
+        config.locales.keys.map(&:to_s).include?(locale.to_s)
       end
     end
   end

data/lib/refinery/i18n/engine.rb

@@ -28,13 +28,13 @@ module Refinery
 
             if ::Refinery::I18n.has_locale?(locale = params[:locale].try(:to_sym))
               ::I18n.locale = locale
-            elsif locale.present? and locale != ::Refinery::I18n.default_frontend_locale
+            elsif locale.present? && locale != ::Refinery::I18n.default_frontend_locale
               params[:locale] = ::I18n.locale = ::Refinery::I18n.default_frontend_locale
               redirect_to(params, :notice => "The locale '#{locale}' is not supported.") and return
             else
               ::I18n.locale = ::Refinery::I18n.default_frontend_locale
             end
-            Thread.current[:globalize_locale] = ::I18n.locale
+            Globalize.locale = ::I18n.locale
           end
 
           prepend_before_filter :find_or_set_locale
@@ -43,7 +43,7 @@ module Refinery
 
         ::Refinery::AdminController.class_eval do
           def find_or_set_locale
-            if (params[:set_locale] and ::Refinery::I18n.locales.keys.map(&:to_sym).include?(params[:set_locale].to_sym))
+            if (params[:set_locale] && ::Refinery::I18n.locales.keys.map(&:to_sym).include?(params[:set_locale].to_sym))
               ::Refinery::I18n.current_locale = params[:set_locale].to_sym
               redirect_back_or_default(refinery.admin_root_path) and return
             else
@@ -54,13 +54,13 @@ module Refinery
           def globalize!
             if ::Refinery::I18n.frontend_locales.any?
               if params[:switch_locale]
-                Thread.current[:globalize_locale] = params[:switch_locale].to_sym
+                Globalize.locale = params[:switch_locale].to_sym
               elsif ::I18n.locale != ::Refinery::I18n.default_frontend_locale
-                Thread.current[:globalize_locale] = ::Refinery::I18n.default_frontend_locale
+                Globalize.locale = ::Refinery::I18n.default_frontend_locale
               end
             end
 
-            Thread.current[:globalize_locale] = ::I18n.locale if Thread.current[:globalize_locale].nil?
+            Globalize.locale = ::I18n.locale if Globalize.locale.nil?
           end
           # globalize! should be prepended first so that it runs after find_or_set_locale
           prepend_before_filter :globalize!, :find_or_set_locale

data/refinerycms-i18n.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms-i18n}
-  s.version           = %q{2.1.0}
+  s.version           = %q{3.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,6 +14,8 @@ Gem::Specification.new do |s|
   s.files             = `git ls-files`.split("\n")
   s.test_files        = `git ls-files -- spec/*`.split("\n")
 
-  s.add_dependency    'routing-filter',   '~> 0.3.0'
-  s.add_dependency    'rails-i18n',       '~> 0.7.3'
+  s.required_ruby_version = '>= 1.9.3'
+
+  s.add_dependency    'routing-filter',   '>= 0.4.0.dev'
+  s.add_dependency    'rails-i18n',       '~> 4.0.1'
 end

data/spec/features/set_locale_spec.rb

@@ -0,0 +1,16 @@
+# encoding: utf-8
+require "spec_helper"
+
+describe "set_locale parameter", :type => :feature do
+  refinery_login_with :refinery_user
+
+  it "changes language used in backend" do
+    visit refinery.admin_pages_path
+
+    expect(page).to have_content("Switch to your website")
+
+    visit refinery.admin_pages_path(:set_locale => :cs)
+
+    expect(page).to have_content("Přepnout na web")
+  end
+end

data/spec/spec_helper.rb

@@ -13,14 +13,10 @@ Rails.backtrace_cleaner.remove_silencers!
 
 RSpec.configure do |config|
   config.mock_with :rspec
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.filter_run :focus => true
   config.run_all_when_everything_filtered = true
 end
 
-# set javascript driver for capybara
-Capybara.javascript_driver = :selenium
-
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories including factories.
 ([Rails.root.to_s] | ::Refinery::Plugins.registered.pathnames).map{|p|

data/spec/support/refinery/i18n/set_defaults.rb

@@ -11,7 +11,7 @@ RSpec.configure do |config|
 
       config.frontend_locales = [:en]
 
-      config.locales = {:en=>"English", :fr=>"Français", :nl=>"Nederlands", :"pt-BR"=>"Português", :da=>"Dansk", :nb=>"Norsk Bokmål", :sl=>"Slovenian", :es=>"Español", :it=>"Italiano", :de=>"Deutsch", :lv=>"Latviski", :ru=>"Русский", :sv=>"Svenska", :pl=>"Polski", :"zh-CN"=>"Simplified Chinese", :"zh-TW"=>"Traditional Chinese", :el=>"Ελληνικά", :rs=>"Srpski", :cs=>"Česky", :sk=>"Slovenský", :ja=>"日本語", :bg=>"Български"}
+      config.locales = {:en=>"English", :fr=>"Français", :nl=>"Nederlands", :"pt-BR"=>"Português", :da=>"Dansk", :nb=>"Norsk Bokmål", :sl=>"Slovenian", :es=>"Español", :ca=>"Català", :it=>"Italiano", :de=>"Deutsch", :lv=>"Latviski", :ru=>"Русский", :sv=>"Svenska", :pl=>"Polski", :"zh-CN"=>"Simplified Chinese", :"zh-TW"=>"Traditional Chinese", :el=>"Ελληνικά", :rs=>"Srpski", :cs=>"Česky", :sk=>"Slovenský", :ja=>"日本語", :bg=>"Български"}
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-i18n
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Philip Arndt
@@ -9,44 +9,44 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-15 00:00:00.000000000 Z
+date: 2015-01-21 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.3.0
+        version: 0.4.0.dev
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0.dev
 - !ruby/object:Gem::Dependency
   name: rails-i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.3
+        version: 4.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.3
+        version: 4.0.1
 description: i18n logic extracted from Refinery CMS, for Refinery CMS.
 email: info@refinerycms.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Rakefile
 - app/assets/images/refinery/icons/flags/ad.png
@@ -84,7 +84,6 @@ files:
 - app/assets/images/refinery/icons/flags/by.png
 - app/assets/images/refinery/icons/flags/bz.png
 - app/assets/images/refinery/icons/flags/ca.png
-- app/assets/images/refinery/icons/flags/catalonia.png
 - app/assets/images/refinery/icons/flags/cc.png
 - app/assets/images/refinery/icons/flags/cd.png
 - app/assets/images/refinery/icons/flags/cf.png
@@ -313,7 +312,7 @@ files:
 - lib/translate/storage.rb
 - refinerycms-i18n.gemspec
 - script/rails
-- spec/features/dashboard_locale_picker_spec.rb
+- spec/features/set_locale_spec.rb
 - spec/spec_helper.rb
 - spec/support/refinery/i18n/set_defaults.rb
 - tasks/rspec.rake
@@ -328,22 +327,22 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: i18n logic for Refinery CMS.
 test_files:
-- spec/features/dashboard_locale_picker_spec.rb
+- spec/features/set_locale_spec.rb
 - spec/spec_helper.rb
 - spec/support/refinery/i18n/set_defaults.rb
 has_rdoc: 

data/spec/features/dashboard_locale_picker_spec.rb

@@ -1,32 +0,0 @@
-# encoding: utf-8
-require "spec_helper"
-
-describe "dashboard locale picker" do
-  refinery_login_with :refinery_user
-
-  it "changes language used in backend", :js => true do
-    visit refinery.admin_dashboard_path
-
-    page.should have_content("Switch to your website")
-
-    within "#current_locale" do
-      click_link "Change language"
-    end
-    within "#other_locales" do
-      click_link "Latviski"
-    end
-
-    page.should have_content("Pārslēgties uz jūsu saitu")
-    page.should have_no_content("Switch to your website")
-
-    within "#current_locale" do
-      click_link "Mainīt valodu"
-    end
-    within "#other_locales" do
-      click_link "English"
-    end
-
-    page.should have_content("Switch to your website")
-    page.should have_no_content("Pārslēgties uz jūsu saitu")
-  end
-end