refinerycms-i18n 2.0.2 → 2.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 9f3cc913b0e9ae54c7e114a610b2f7ba25c66ce7
+  data.tar.gz: a99c91f97d16ece099057864ccdfffe125da92f6
+SHA512:
+  metadata.gz: 38d9ace175d27ca988b29b2248994f1a986bd6f3a1f3aebf5001c39152bb1c27fcad762fd01bd6279d308ef7489453db7c88792cb7c339cfb2c09448038e2316
+  data.tar.gz: 3070b164f87a116dc689bd2fe9da46042885b0dc20cff7d6ba175df0817a2c9fcb79b98246c97c6aff9af1c55fa4a8345eb6d5faaed072bab8c0f79edc59c17f

data/.travis.yml

@@ -1,17 +1,35 @@
+language: ruby
+before_install:
+  - 'if [[ "$TRAVIS_RUBY_VERSION" =~ "jruby" ]] ; then gem update --system ; fi'
+  - gem install bundler
+install:
+  - bundle install --without development
 before_script:
+  - "sh -e /etc/init.d/xvfb start"
   - "bundle exec rake refinery:testing:dummy_app > /dev/null"
-script: "bundle exec rspec ./spec"
+script:
+  - "DISPLAY=:99.0 bundle exec rspec spec"
 notifications:
-  email:
-    - parndt@gmail.com
-    - ugis.ozolss@gmail.com
+  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="
 env:
-  - DB=sqlite3
+  - DB=postgresql
+  - DB=mysql
 matrix:
   allow_failures:
-    - rvm: rbx
+    - rvm: rbx-19mode
+    - rvm: jruby-19mode
 rvm:
-  - 1.8.7
+  - 2.0.0
   - 1.9.3
-  - rbx
-  - jruby
+  - rbx-19mode
+  - jruby-19mode

data/Gemfile

@@ -1,8 +1,8 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 gemspec
 
-git 'git://github.com/resolve/refinerycms.git', :branch => '2-0-stable' do
+git 'git://github.com/refinery/refinerycms.git', :branch => 'master' do
   gem 'refinerycms'
 
   group :development, :test do
@@ -13,9 +13,22 @@ end
 group :development, :test do
   require 'rbconfig'
 
-  gem 'sqlite3', :platform => [:ruby, :mswin, :mingw]
+  # Database Configuration
+  unless ENV['TRAVIS']
+    gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
+    gem 'sqlite3', :platform => :ruby
+  end
 
-  gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
+  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'
@@ -24,9 +37,6 @@ group :development, :test do
   end
 
   platforms :ruby do
-    gem 'spork', '0.9.0.rc9'
-    gem 'guard-spork'
-
     unless ENV['TRAVIS']
       if RbConfig::CONFIG['target_os'] =~ /darwin/i
         gem 'rb-fsevent', '>= 0.3.9'

data/Rakefile

@@ -17,3 +17,5 @@ Refinery::Testing::Railtie.load_tasks
 Refinery::Testing::Railtie.load_dummy_tasks(ENGINE_PATH)
 
 load File.expand_path('../tasks/rspec.rake', __FILE__)
+
+task :default => :spec

data/lib/generators/refinery/i18n_generator.rb

@@ -3,7 +3,8 @@ module Refinery
     source_root File.expand_path('../templates', __FILE__)
 
     def generate_refinery_i18n_initializer
-      template "config/initializers/refinery/i18n.rb.erb", File.join(destination_root, "config", "initializers", "refinery", "i18n.rb")
+      template "config/initializers/refinery/i18n.rb.erb",
+               File.join(destination_root, "config", "initializers", "refinery", "i18n.rb")
     end
 
   end

data/lib/generators/refinery/templates/config/initializers/refinery/i18n.rb.erb

@@ -1,8 +1,6 @@
 # encoding: utf-8
 
 Refinery::I18n.configure do |config|
-  # config.enabled = <%= Refinery::I18n.config.enabled.inspect %>
-
   # config.default_locale = <%= Refinery::I18n.config.default_locale.inspect %>
 
   # config.current_locale = <%= Refinery::I18n.config.current_locale.inspect %>

data/lib/refinery/i18n-filter.rb

@@ -2,7 +2,7 @@ module RoutingFilter
   class RefineryLocales < Filter
 
     def around_recognize(path, env, &block)
-      if ::Refinery::I18n.enabled?
+      if ::Refinery::I18n.url_filter_enabled?
         if path =~ %r{^/(#{::Refinery::I18n.locales.keys.join('|')})(/|$)}
           path.sub! %r(^/(([a-zA-Z\-_])*)(?=/|$)) do
             ::I18n.locale = $1
@@ -15,7 +15,7 @@ module RoutingFilter
       end
 
       yield.tap do |params|
-        params[:locale] = ::I18n.locale if ::Refinery::I18n.enabled?
+        params[:locale] = ::I18n.locale
       end
     end
 
@@ -24,9 +24,9 @@ module RoutingFilter
 
       yield.tap do |result|
         result = result.is_a?(Array) ? result.first : result
-        if ::Refinery::I18n.enabled? and
+        if ::Refinery::I18n.url_filter_enabled? and
            locale != ::Refinery::I18n.default_frontend_locale and
-           result !~ %r{^/(refinery|wymiframe)}
+           result !~ %r{^/(#{Refinery::Core.backend_route}|wymiframe)}
           result.sub!(%r(^(http.?://[^/]*)?(.*))) { "#{$1}/#{locale}#{$2}" }
         end
       end

data/lib/refinery/i18n.rb

@@ -1,6 +1,7 @@
 # Encoding: UTF-8 <-- required, please leave this in.
 require 'refinerycms-core'
 require 'routing-filter'
+require 'rails-i18n'
 
 module Refinery
   autoload :I18nGenerator, 'generators/refinery/i18n_generator'
@@ -14,7 +15,8 @@ module Refinery
           :en => 'English',
           :fr => 'Français',
           :nl => 'Nederlands',
-          :'pt-BR' => 'Português',
+          :pt => 'Português',
+          :'pt-BR' => 'Português brasileiro',
           :da => 'Dansk',
           :nb => 'Norsk Bokmål',
           :sl => 'Slovenian',
@@ -25,14 +27,16 @@ module Refinery
           :ru => 'Русский',
           :sv => 'Svenska',
           :pl => 'Polski',
-          :'zh-CN' => 'Simplified Chinese',
-          :'zh-TW' => 'Traditional Chinese',
+          :'zh-CN' => '简体中文',
+          :'zh-TW' => '繁體中文',
           :el => 'Ελληνικά',
           :rs => 'Srpski',
           :cs => 'Česky',
           :sk => 'Slovenský',
           :ja => '日本語',
-          :bg => 'Български'
+          :bg => 'Български',
+          :hu => 'Hungarian',
+          :uk => 'Українська'
         }
       end
 
@@ -46,8 +50,8 @@ module Refinery
         end
       end
 
-      def enabled?
-        config.enabled
+      def url_filter_enabled?
+        config.url_filter_enabled
       end
 
       def has_locale?(locale)

data/lib/refinery/i18n/configuration.rb

@@ -3,13 +3,21 @@ module Refinery
     include ActiveSupport::Configurable
 
     config_accessor :current_locale, :default_locale, :default_frontend_locale,
-                    :enabled, :frontend_locales, :locales
+                    :fallbacks_enabled, :frontend_locales, :locales,
+                    :url_filter_enabled
 
-    self.enabled = true
     self.default_locale = :en
     self.default_frontend_locale = self.default_locale
     self.current_locale = self.default_locale
+    self.fallbacks_enabled = true
     self.frontend_locales = [self.default_frontend_locale]
     self.locales = self.built_in_locales
+    self.url_filter_enabled = true
+
+    def self.frontend_locales
+      config.frontend_locales.select do |locale|
+        config.locales.keys.include?(locale)
+      end
+    end
   end
 end

data/lib/refinery/i18n/engine.rb

@@ -7,32 +7,34 @@ module Refinery
       end
 
       initializer "configure fallbacks" do
-        require "i18n/backend/fallbacks"
-        if defined?(::I18n::Backend::Simple) && defined?(::I18n::Backend::Fallbacks)
-          ::I18n::Backend::Simple.send(:include, ::I18n::Backend::Fallbacks)
+        if ::Refinery::I18n.fallbacks_enabled
+          require "i18n/backend/fallbacks"
+          if defined?(::I18n::Backend::Simple) && defined?(::I18n::Backend::Fallbacks)
+            ::I18n::Backend::Simple.send(:include, ::I18n::Backend::Fallbacks)
+          end
         end
       end
 
       config.to_prepare do
         ::ApplicationController.module_eval do
-          def default_url_options(options={})
-            ::Refinery::I18n.enabled? ? { :locale => ::I18n.locale } : {}
+          def default_url_options_with_locale
+            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
           end
+          alias_method_chain :default_url_options, :locale
 
           def find_or_set_locale
-            if ::Refinery::I18n.enabled?
-              ::I18n.locale = ::Refinery::I18n.current_frontend_locale
+            ::I18n.locale = ::Refinery::I18n.current_frontend_locale
 
-              if ::Refinery::I18n.has_locale?(locale = params[:locale].try(:to_sym))
-                ::I18n.locale = locale
-              elsif locale.present? and 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
+            if ::Refinery::I18n.has_locale?(locale = params[:locale].try(:to_sym))
+              ::I18n.locale = locale
+            elsif locale.present? and 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
           end
 
           prepend_before_filter :find_or_set_locale
@@ -66,12 +68,12 @@ module Refinery
         end
       end
 
-      config.after_initialize do
+      initializer "register refinery_i18n plugin" do
         ::Refinery::Plugin.register do |plugin|
           plugin.name = "refinery_i18n"
-          plugin.version = %q{2.0.0}
           plugin.hide_from_menu = true
           plugin.always_allow_access = true
+          plugin.pathname = root
         end
       end
 

data/refinerycms-i18n.gemspec

@@ -1,17 +1,19 @@
+# encoding: utf-8
+
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms-i18n}
-  s.version           = %q{2.0.2}
+  s.version           = %q{2.1.0}
   s.description       = %q{i18n logic extracted from Refinery CMS, for Refinery CMS.}
-  s.date              = %q{2012-08-03}
   s.summary           = %q{i18n logic for Refinery CMS.}
   s.email             = %q{info@refinerycms.com}
   s.homepage          = %q{http://refinerycms.com}
-  s.authors           = ['Philip Arndt']
+  s.authors           = ['Philip Arndt', 'Uģis Ozols']
   s.require_paths     = %w(lib)
-
-  s.add_dependency    'refinerycms-core', '~> 2.0.0'
-  s.add_dependency    'routing-filter',   '>= 0.2.3'
+  s.license           = %q{MIT}
 
   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'
 end

data/script/rails

@@ -0,0 +1,5 @@
+#!/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__)

data/spec/{requests → features}/dashboard_locale_picker_spec.rb

@@ -2,9 +2,9 @@
 require "spec_helper"
 
 describe "dashboard locale picker" do
-  login_refinery_user
+  refinery_login_with :refinery_user
 
-  it "changes language used in backend" do
+  it "changes language used in backend", :js => true do
     visit refinery.admin_dashboard_path
 
     page.should have_content("Switch to your website")

data/spec/spec_helper.rb

@@ -1,56 +1,30 @@
 require 'rubygems'
 
-def setup_environment
-  # Configure Rails Environment
-  ENV["RAILS_ENV"] ||= 'test'
+# Configure Rails Environment
+ENV["RAILS_ENV"] ||= 'test'
 
-  require File.expand_path("../dummy/config/environment", __FILE__)
+require File.expand_path("../dummy/config/environment", __FILE__)
 
-  require 'rspec/rails'
-  require 'capybara/rspec'
-  require 'factory_girl_rails'
+require 'rspec/rails'
+require 'capybara/rspec'
+require 'factory_girl_rails'
 
-  Rails.backtrace_cleaner.remove_silencers!
+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
-end
-
-def each_run
-  ActiveSupport::Dependencies.clear
-
-  FactoryGirl.reload
-
-  # 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|
-    Dir[File.join(p, 'spec', 'support', '**', '*.rb').to_s]
-  }.flatten.sort.each do |support_file|
-    require support_file
-  end
+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
 
-# If spork is available in the Gemfile it'll be used but we don't force it.
-unless (begin; require 'spork'; rescue LoadError; nil end).nil?
-  Spork.prefork do
-    # Loading more in this block will cause your tests to run faster. However,
-    # if you change any configuration or code from libraries loaded here, you'll
-    # need to restart spork for it take effect.
-    setup_environment
-  end
+# set javascript driver for capybara
+Capybara.javascript_driver = :selenium
 
-  Spork.each_run do
-    # This code will be run each time you run your specs.
-    each_run
-  end
-else
-  setup_environment
-  each_run
+# 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|
+  Dir[File.join(p, 'spec', 'support', '**', '*.rb').to_s]
+}.flatten.sort.each do |support_file|
+  require support_file
 end

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

@@ -0,0 +1,17 @@
+# encoding: utf-8
+
+RSpec.configure do |config|
+  config.before(:all) do
+    Refinery::I18n.configure do |config|
+      config.default_locale = :en
+
+      config.current_locale = :en
+
+      config.default_frontend_locale = :en
+
+      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=>"Български"}
+    end
+  end
+end