flame-r18n 1.3.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5fe2146f9f4b7a918d01b3686420378f58ecc2a
-  data.tar.gz: 18f7f0478fd922587f1aa7dd6a24d56a5b7037a7
+  metadata.gz: 2061beaf8e72a910714e93a68e08e7361cde88a4
+  data.tar.gz: 44068fc8d3ee0ccd7719060605f0212bf2a1de92
 SHA512:
-  metadata.gz: 43072cf755dac06280a4a38910701573f09ce97af58178b21b6937aa99c57d3c42650e8f0673de9b3dcdc1a8cad5d767395470e565526ef62b800caa4f7a3401
-  data.tar.gz: 93201ac10ad284aee53450e6b377bed8ee54d4c06c794a62f0458179b57a945a72c000028dafe585a4a1740a36febaf50fd472fb64c4d7ffbb58a8f55b248599
+  metadata.gz: ef3a05d013d66162ad43da9315397ba57e95c46305ef72fc2537309cb9eb2c99988ca28e2271b890ecb9031170f4e3657e5d32af9efacbbd49d521eb4a9bdd3c
+  data.tar.gz: b5f1e2e753fad2f3476de0985d1d15dcec077319b086a7d7987068b4ea9208629e4ba382b54196885608074a29064d662e18f04c10153a7158ff92eda55c991c

data/lib/flame/r18n.rb

@@ -1,59 +1,6 @@
-require 'r18n-core'
-
-module Flame
-	# Module for Flame::R18n extension with helper methods and base class
-	module R18n
-		include ::R18n::Helpers
-
-		def self.config(app)
-			app.config[:default_locale] = proc { ::R18n::I18n.default }
-			app.config[:locales] = proc { ::R18n.default_places }
-			app.config[:locales_dir] = proc do
-				File.join(app.config[:root_dir], 'locales')
-			end
-
-			::R18n.default_places { app.config[:locales_dir] }
-		end
-
-		def execute(method)
-			load_r18n
-			session[:locale] = ::R18n.get.locale.code
-			super
-		end
-
-		def init_r18n(locale)
-			::R18n::I18n.new(
-				Array(locale) | locales_from_env,
-				::R18n.default_places,
-				off_filters: :untranslated,
-				on_filters: :untranslated_html
-			)
-		end
+# frozen_string_literal: true
 
-		def thread_locale=(locale)
-			::R18n.thread_set init_r18n locale
-		end
-
-		private
-
-		def locales_from_env
-			::R18n::I18n.parse_http(request.env['HTTP_ACCEPT_LANGUAGE'])
-		end
-
-		def preferred_locale
-			return super if defined? super
-			params[:locale] || session[:locale]
-		end
-
-		def load_r18n
-			::R18n.clear_cache! if config[:environment] == 'development'
-
-			::R18n.thread_set do
-				default_locale = config[:default_locale]
-				::R18n::I18n.default = default_locale if default_locale
+require 'r18n-core'
 
-				init_r18n preferred_locale
-			end
-		end
-	end
-end
+require_relative './r18n/configuration'
+require_relative './r18n/initialization'

data/lib/flame/r18n/configuration.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Flame
+	module R18n
+		## Module for adding Flame::R18n properties into application configuration
+		module Configuration
+			def self.included(app)
+				app.config[:default_locale] = proc { ::R18n::I18n.default }
+				app.config[:locales] = proc { ::R18n.default_places }
+				app.config[:locales_dir] = proc do
+					File.join(app.config[:root_dir], 'locales')
+				end
+
+				::R18n.default_places { app.config[:locales_dir] }
+			end
+		end
+	end
+end

data/lib/flame/r18n/initialization.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require 'r18n-core'
+
+module Flame
+	module R18n
+		## Module for R18n in thread initialization with helper methods
+		module Initialization
+			include ::R18n::Helpers
+
+			def initialize(*)
+				super
+				load_r18n
+				session[:locale] = r18n.locale.code
+			end
+
+			def init_r18n(locale)
+				::R18n::I18n.new(
+					Array(locale) | locales_from_env,
+					::R18n.default_places,
+					off_filters: :untranslated,
+					on_filters: :untranslated_html
+				)
+			end
+
+			def thread_locale=(locale)
+				::R18n.thread_set init_r18n locale
+			end
+
+			private
+
+			def locales_from_env
+				::R18n::I18n.parse_http(request.env['HTTP_ACCEPT_LANGUAGE'])
+			end
+
+			def preferred_locale
+				params[:locale] || session[:locale]
+			end
+
+			def load_r18n
+				::R18n.clear_cache! if config[:environment] == 'development'
+
+				::R18n.thread_set do
+					default_locale = config[:default_locale]
+					::R18n::I18n.default = default_locale if default_locale
+
+					init_r18n preferred_locale
+				end
+			end
+		end
+	end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flame-r18n
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Alexander Popov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-11 00:00:00.000000000 Z
+date: 2017-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: flame
@@ -53,6 +53,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/flame/r18n.rb
+- lib/flame/r18n/configuration.rb
+- lib/flame/r18n/initialization.rb
 homepage: https://github.com/AlexWayfer/flame-r18n
 licenses:
 - MIT
@@ -73,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: R18n plugin for Flame-framework