solidus_i18n 1.1.0 → 1.2.0

data/config/routes.rb

@@ -3,4 +3,8 @@ Spree::Core::Engine.routes.draw do
   filter :locale
 
   post '/locale/set', to: 'locale#set', defaults: { format: :json }, as: :set_locale
+
+  namespace :admin do
+    resource :locale, only: [:show, :update]
+  end
 end

data/db/migrate/20150609154031_remove_translations_from_spree_tables.rb

@@ -1,4 +1,4 @@
-class RemoveTranslationsFromSpreeTables < ActiveRecord::Migration
+class RemoveTranslationsFromSpreeTables < SolidusSupport::Migration[4.2]
   def up
     # Don't migrate if we still use Globalize, i.e. through spree_globalize Gem
     return if defined?(Globalize)

data/lib/solidus_i18n.rb

@@ -1,7 +1,8 @@
 require 'rails-i18n'
 require 'solidus_core'
+require 'solidus_support'
 require 'solidus_i18n/engine'
+require 'solidus_i18n/locale'
 require 'solidus_i18n/version'
-require 'solidus_i18n/utils'
 require 'coffee_script'
 require 'deface'

data/lib/solidus_i18n/controller_locale_helper.rb

@@ -6,7 +6,7 @@ module SolidusI18n
     extend ActiveSupport::Concern
 
     included do
-      prepend_before_filter :set_user_language
+      prepend_before_action :set_user_language
 
       private
 

data/lib/solidus_i18n/version.rb

@@ -9,7 +9,7 @@ module SolidusI18n
 
   module VERSION
     MAJOR = 1
-    MINOR = 1
+    MINOR = 2
     TINY  = 0
     PRE   = nil
 

data/solidus_i18n.gemspec

@@ -24,16 +24,17 @@ Gem::Specification.new do |s|
   s.has_rdoc = false
 
   s.add_runtime_dependency 'i18n_data', '~> 0.7.0'
-  s.add_runtime_dependency 'rails-i18n', '~> 4.0.1'
+  s.add_runtime_dependency 'rails-i18n', ['>= 4.0.1', '< 6']
   s.add_runtime_dependency 'kaminari-i18n', '~> 0.3.2'
   s.add_runtime_dependency 'routing-filter', '~> 0.6.0'
   s.add_runtime_dependency 'solidus_core', ['>= 1.1', '< 3']
+  s.add_runtime_dependency 'solidus_support'
   s.add_runtime_dependency 'deface', '~> 1.0'
 
   s.add_development_dependency 'byebug'
   s.add_development_dependency 'capybara', '~> 2.4.4'
   s.add_development_dependency 'database_cleaner', '~> 1.3'
-  s.add_development_dependency 'factory_girl', '~> 4.5'
+  s.add_development_dependency 'factory_bot', '~> 4.5'
   s.add_development_dependency 'ffaker', '>= 1.25.0'
   s.add_development_dependency 'poltergeist', '~> 1.5'
   s.add_development_dependency 'pry-rails', '>= 0.3.0'

data/spec/controllers/locales_controller_spec.rb

@@ -10,14 +10,14 @@ RSpec.describe Spree::HomeController, type: :controller do
 
   context 'tries not supported fr locale' do
     it 'falls back do default locale' do
-      get :index, locale: 'fr'
+      get :index, params: { locale: 'fr' }
       expect(I18n.locale).to eq :en
     end
   end
 
   context 'tries supported es locale' do
     it 'takes this locale' do
-      get :index, locale: 'es'
+      get :index, params: { locale: 'es' }
       expect(I18n.locale).to eq :es
     end
   end

data/spec/features/admin/translations_spec.rb

@@ -16,6 +16,7 @@ RSpec.feature 'Translations', :js do
     background do
       SolidusI18n::Config.available_locales = []
       visit spree.edit_admin_general_settings_path
+      click_on "Locales"
     end
 
     scenario 'adds german to available locales' do

data/spec/support/factory_girl.rb

@@ -1,5 +1,5 @@
-require 'factory_girl'
+require 'factory_bot'
 
 RSpec.configure do |config|
-  config.include FactoryGirl::Syntax::Methods
+  config.include FactoryBot::Syntax::Methods
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_i18n
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Thomas von Deyen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-06 00:00:00.000000000 Z
+date: 2018-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n_data
@@ -28,16 +28,22 @@ dependencies:
   name: rails-i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: kaminari-i18n
   requirement: !ruby/object:Gem::Requirement
@@ -86,6 +92,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
+- !ruby/object:Gem::Dependency
+  name: solidus_support
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: deface
   requirement: !ruby/object:Gem::Requirement
@@ -143,7 +163,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: factory_girl
+  name: factory_bot
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -261,13 +281,14 @@ files:
 - app/assets/javascripts/spree/frontend/solidus_i18n.js
 - app/assets/stylesheets/spree/backend/solidus_i18n.css
 - app/assets/stylesheets/spree/frontend/solidus_i18n.css
-- app/controllers/spree/admin/general_settings_controller_decorator.rb
+- app/controllers/spree/admin/locales_controller.rb
 - app/controllers/spree/api/base_controller_decorator.rb
 - app/controllers/spree/base_controller_decorator.rb
 - app/controllers/spree/locale_controller_decorator.rb
 - app/helpers/solidus_i18n/locale_helper.rb
-- app/overrides/spree/admin/general_settings/edit/localization_settings.html.erb.deface
+- app/overrides/spree/admin/shared/_configuration_menu/add_i18n_tab.html.erb.deface
 - app/overrides/spree/shared/_main_nav_bar/locale_selector.html.erb.deface
+- app/views/spree/admin/locales/show.html.erb
 - bin/rails
 - config/initializers/country_names.rb
 - config/initializers/routing_filter.rb
@@ -318,7 +339,6 @@ files:
 - lib/solidus_i18n/controller_locale_helper.rb
 - lib/solidus_i18n/engine.rb
 - lib/solidus_i18n/locale.rb
-- lib/solidus_i18n/utils.rb
 - lib/solidus_i18n/version.rb
 - lib/tasks/solidus_i18n/upgrade.rake
 - solidus_i18n.gemspec
@@ -354,7 +374,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Provides locale information for use in Solidus.

data/app/controllers/spree/admin/general_settings_controller_decorator.rb

@@ -1,12 +0,0 @@
-Spree::Admin::GeneralSettingsController.class_eval do
-  before_filter :update_i18n_settings, only: :update
-
-  private
-
-  def update_i18n_settings
-    params.each do |name, value|
-      next unless SolidusI18n::Config.has_preference? name
-      SolidusI18n::Config[name] = value.map(&:to_sym)
-    end
-  end
-end

data/app/overrides/spree/admin/general_settings/edit/localization_settings.html.erb.deface

@@ -1,20 +0,0 @@
-<!-- insert_after '[data-hook=admin_general_setting_mail_from_address]'-->
-<div class="panel panel-default panel-localization">
-  <div class="panel-heading">
-    <h1 class="panel-title">
-      <%= Spree.t(:'i18n.localization_settings') %>
-    </h1>
-  </div>
-
-  <div class="panel-body" data-hook="localization_settings_body">
-    <div class="form-group">
-      <label for="available_locales_">
-        <%= Spree.t(:'i18n.available_locales') %>
-      </label>
-      <%= select_available_locales %>
-      <p class="help-block">
-        <%= Spree.t(:'i18n.locales_displayed_on_frontend_select_box') %>
-      </p>
-    </div>
-  </div>
-</div>

data/lib/solidus_i18n/utils.rb

@@ -1,56 +0,0 @@
-require 'active_support/core_ext'
-
-module SolidusI18n
-  module Utils
-    # Retrieve comments, translation data in hash form
-    def read_file(filename, basename)
-      # Add error checking for failed file read?
-      (comments, data) = IO.read(filename).split(/#{basename}:\s*\n/)
-      return comments, create_hash(data)
-    end
-    module_function :read_file
-
-    # Creates hash of translation data
-    def create_hash(data)
-      words = {}
-      return words unless data
-      parent = []
-      previous_key = 'base'
-      data.split("\n").each do |w|
-        next if w.strip.blank? || w.strip[0] == '#'
-        (key, value) = w.split(':', 2)
-        value ||= ''
-        # Determine level of current key in comparison to parent array
-        shift = (key =~ /\w/) / 2 - parent.size
-        key = key.sub(/^\s+/, '')
-        # If key is child of previous key, add previous key as parent
-        parent << previous_key if shift > 0
-        # If key is not related to previous key, remove parent keys
-        (shift*-1).times { parent.pop } if shift < 0
-        # Track key in case next key is child of this key
-        previous_key = key
-        words[parent.join(':') + ':' + key] = value
-      end
-      words
-    end
-    module_function :create_hash
-
-    # Writes to file from translation data hash structure
-    def write_file(filename, basename, _comments, words, comment_values = true, _fallback_values = {})
-      File.open(filename, 'w') do |log|
-        log.puts(basename + ": \n")
-        words.sort.each do |k, v|
-          keys = k.split(':')
-          # Add indentation for children keys
-          (keys.size - 1).times do
-            keys[keys.size - 1] = '  ' + keys[keys.size - 1]
-          end
-          value = v.strip
-          value = ('#' + value) if comment_values && !value.blank?
-          log.puts "#{keys[keys.size - 1]}: #{value}\n"
-        end
-      end
-    end
-    module_function :write_file
-  end
-end