i18n_multitenant 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4554661f81cd76709a2fdd32fd9eefb348941870
-  data.tar.gz: dbc66eb9a981b1991c391d5d2ff3800abdf3467d
+  metadata.gz: df671c97a3bab010dc11c20ae0843a32829be66a
+  data.tar.gz: 4048ac20539337ae5e6f6b3210ac64d924ea3fee
 SHA512:
-  metadata.gz: fc570d3d1f4f828822721b3cb478408137e5ac6f804903e7da44a0190d29b48bb4d9ce4945f6cfc4c796c6bca7cb7088124241d652389d013ca2c32449af23f1
-  data.tar.gz: bef4b20e3361d1c6eb176e0f9898042fb159b0577713eddebbe9d755c16dc2c36e6f41624f9a11e044dd6f77116cfe0eea0c0a56d1a30c182fb7e6d5b66796f1
+  metadata.gz: 37764caf34088612a0764abb9a9143422712ecfdf58f17a6253ba6024acf183938998d48bb4e2a382bb1e1915b55121bfd592b619250343bf244a9d637fc7e94
+  data.tar.gz: bbd601c72ccb03bfe84cb3687178e0abb3bfd7a510a7f5f7b8edd14c2322f1d1a55f06d51b238fc93b83d546ebb6cf82c250d92f23fc17094c586ada8d1b833f

data/CHANGELOG.md

@@ -1,3 +1,7 @@
-## I18nMultitenant 1.0.0 (2017-01-11) ##
+## I18nMultitenant 0.0.2 (2017-01-26) ##
+
+*   Added `I18nMultitenant#with_locale`. Fixed non-Rails compatibility issue.
+
+## I18nMultitenant 0.0.1 (2017-01-11) ##
 
 *   Initial Version.

data/README.md

@@ -1,4 +1,11 @@
-# i18n Multi-Tenant
+i18n Multi-Tenant
+====================
+
+[![Gem Version](https://badge.fury.io/rb/i18n_multitenant.svg)](http://badge.fury.io/rb/i18n_multitenant)
+[![Build Status](https://travis-ci.org/ElMassimo/i18n_multitenant.svg)](https://travis-ci.org/ElMassimo/i18n_multitenant)
+[![Test Coverage](https://codeclimate.com/github/ElMassimo/i18n_multitenant/badges/coverage.svg)](https://codeclimate.com/github/ElMassimo/i18n_multitenant/coverage)
+[![Code Climate](https://codeclimate.com/github/ElMassimo/i18n_multitenant/badges/gpa.svg)](https://codeclimate.com/github/ElMassimo/i18n_multitenant)
+[![License](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/ElMassimo/i18n_multitenant/blob/master/LICENSE.txt)
 
 This gem is a small utility that provides the basic configuration to perform
 tenant-specific translations in multi-tenant apps.
@@ -57,3 +64,14 @@ the configuration yourself in other applications by calling:
 ```ruby
 I18nMultitenant.configure(I18n) # or pass I18n.config
 ```
+
+## Front-end Translations
+If you also need to perform translations in the front-end, you can use a library
+like [`i18n-js`](https://github.com/fnando/i18n-js). You can easily configure
+`i18n-js` to support multi-tenant translations by leveraging `i18n` itself:
+
+```erb
+I18n.locale = <%= I18n.locale.to_json.html_safe %>;
+I18n.locales[I18n.locale] = <%= I18n.fallbacks[I18n.locale].to_json.html_safe %>
+```
+

data/lib/i18n_multitenant.rb

@@ -20,19 +20,37 @@ module I18nMultitenant
   #
   #   I18nMultitenant.set(locale: :es)
   #   => :es
-  def self.set(locale: I18n.default_locale, tenant: nil)
-    unless tenant.nil? || tenant.empty?
-      locale = "#{ locale }-#{ tenant.to_s.upcase.tr(' .-', '_') }"
-    end
+  def self.set(options)
+    I18n.locale = locale_for(options)
+  end
 
-    I18n.locale = locale
+  # Public: Executes block using the specified locale configuration, restoring
+  # it after the block is executed.
+  def self.with_locale(options)
+    I18n.with_locale(locale_for(options)) { yield }
+  end
+
+  # Internal: Get the internal locale for a tenant-specific locale.
+  #
+  # Example:
+  #   I18nMultitenant.locale_for(locale: :en, tenant: 'Veridian Dynamics')
+  #   => "en-VERIDIAN_DYNAMICS"
+  def self.locale_for(locale: I18n.default_locale, tenant: nil)
+    if tenant && !tenant.to_s.empty?
+      "#{ locale }-#{ tenant.to_s.upcase.tr(' .-', '_') }"
+    else
+      locale
+    end
   end
 
   # Public: Configures an instance of I18n::Config to ensure fallbacks are setup.
   def self.configure(config, enforce_available_locales: false)
     config.enforce_available_locales = enforce_available_locales
     config.backend.class.send(:include, I18n::Backend::Fallbacks)
-    config.load_path += Dir[Rails.root.join('config', 'locales', '**', '*.{rb,yml}')]
+
+    if defined?(Rails.root)
+      config.load_path += Dir[Rails.root.join('config', 'locales', '**', '*.{rb,yml}')]
+    end
   end
 end
 

data/lib/i18n_multitenant/railtie.rb

@@ -1,5 +1,5 @@
 class I18nMultitenant::Railtie < ::Rails::Railtie
-  config.before_initialize do |app|
+  config.before_initialize do
     I18nMultitenant.configure(I18n)
   end
 end

data/lib/i18n_multitenant/version.rb

@@ -1,3 +1,3 @@
 module I18nMultitenant
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/spec/lib/i18n_multitenant_spec.rb

@@ -11,6 +11,11 @@ RSpec.describe I18nMultitenant do
   }
 
   describe 'set' do
+    context 'passing an incorrect option' do
+      When(:result) { I18nMultitenant.set(locales: [:en, :es]) }
+      Then { expect(result).to have_failed(ArgumentError, /unknown keyword: locales/) }
+    end
+
     context 'setting only the locale' do
       When(:result) { I18nMultitenant.set(locale: locale) }
 
@@ -78,6 +83,22 @@ RSpec.describe I18nMultitenant do
     end
   end
 
+  describe 'with_locale' do
+    context 'is restored afterwards' do
+      Given {
+        I18n.locale = :en
+      }
+      When(:result) {
+        I18nMultitenant.with_locale(locale: :es, tenant: 'Free') {
+          t(:app_name)
+        }
+      }
+      Then { result == 'I18n (versión gratuita)' }
+      And  { I18n.locale == :en }
+      And  { t(:app_name) == 'I18n' }
+    end
+  end
+
   describe 'translation' do
     context 'setting the locale directly' do
       context 'english' do

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
-if ENV['CODECLIMATE_REPO_TOKEN']
-  require 'codeclimate-test-reporter'
-  CodeClimate::TestReporter.start
+require 'simplecov'
+SimpleCov.start do
+  add_filter '/spec/'
 end
 
 require 'rspec/given'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n_multitenant
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Máximo Mussini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-12 00:00:00.000000000 Z
+date: 2017-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n