tml-rails 5.1.2 → 5.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a537d22885f54958a20638d66b8356792d7e6e05
-  data.tar.gz: df0675cdbf1573d18b02732bf2df544b9e9d953a
+  metadata.gz: 1686ece654b47d5e607faf3a8160637470df42dc
+  data.tar.gz: 873f2fe4d1d5f45038cecc34048861fd3a80249d
 SHA512:
-  metadata.gz: 03ab8362f41ec90f7e5d252a4e5a9184cfbafc707ab86c1b3571780ca823d7d52213f2f924b60eefba2abdb3cc2a687f44f2c452905b631e6fd6bc312e1237eb
-  data.tar.gz: de38a043dfa40efb0776be48113996df20c295ec383b2cf0953b9ae794a47600cd4130f171f5e798cb6cf43828ae5b5eac72d5b3922862a80fd0811e7217af13
+  metadata.gz: e0cb96e9ca1cc4f5167ce9ddcab45e6a7714b2064db7b02db211aa24d1532ede89a9b340d276caebe83cfbe0d22cb58692829b6337539ec37abc6752fb5c8805
+  data.tar.gz: 5df1217ba2837c069216920d7e4803c077b38be7fc8aceea0af2d1293395d137ebeadecb362150f7e1109ba2ef3c8d3c13e4ba8561f5eae66f1076da1ef4435e

data/lib/tml_rails/extensions/action_controller_extension.rb

@@ -36,10 +36,8 @@ module TmlRails
       base.send(:include, TmlRails::ActionCommonMethods)
       base.send(:include, InstanceMethods)
 
-      if Tml.config.auto_init
-        base.before_filter  :tml_init
-        base.after_filter   :tml_reset
-      end
+      base.before_filter :tml_filter_init
+      base.after_filter :tml_filter_reset
 
       if defined? base.rescue_from
         base.rescue_from 'Tml::Exception' do |e|
@@ -65,14 +63,10 @@ module TmlRails
         self.class.name
       end
 
-      def tml_cookie_name
-        Tml::Utils.cookie_name(Tml.config.application[:key])
-      end
-
       # Returns data from cookie set by the agent
       def tml_cookie
         @tml_cookie ||= begin
-          cookie = cookies[tml_cookie_name]
+          cookie = cookies[Tml::Utils.cookie_name(Tml.config.application[:key])]
           if cookie.blank?
             {}
           else
@@ -147,12 +141,12 @@ module TmlRails
 
         @tml_started_at = Time.now
 
-        Tml.session.init({
-         :source      => tml_source,
-         :locale      => tml_locale,
-         :user        => tml_viewing_user,
-         :translator  => tml_translator
-        })
+        Tml.session.init(
+            :source => tml_source,
+            :locale => tml_locale,
+            :user => tml_viewing_user,
+            :translator => tml_translator
+        )
 
         if I18n.backend.class.name == 'I18n::Backend::Tml'
           if defined? I18n.enforce_available_locales
@@ -162,15 +156,23 @@ module TmlRails
         end
       end
 
+      def tml_filter_init
+        tml_init if Tml.config.auto_init
+      end
+
       def tml_reset
         return if Tml.config.disabled?
         @tml_finished_at = Time.now
-        tml_application.submit_missing_keys
+        Tml.session.application.submit_missing_keys if Tml.session.application
         Tml.session.reset
         Tml.cache.reset_version
         Tml.logger.info("Request took #{@tml_finished_at - @tml_started_at} mls") if @tml_started_at
       end
 
+      def tml_filter_reset
+        tml_reset if Tml.config.auto_init
+      end
+
     end
   end
 end

data/lib/tml_rails/extensions/action_view_extension.rb

@@ -34,6 +34,7 @@ module TmlRails
     extend ActiveSupport::Concern
 
     # Translates HTML block
+    # noinspection RubyArgCount
     def trh(tokens = {}, options = {}, &block)
       return '' unless block_given?
 

data/lib/tml_rails/version.rb

@@ -30,5 +30,5 @@
 #++
 
 module TmlRails
-  VERSION = '5.1.2'
+  VERSION = '5.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tml-rails
 version: !ruby/object:Gem::Version
-  version: 5.1.2
+  version: 5.2.1
 platform: ruby
 authors:
 - Michael Berkovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-01 00:00:00.000000000 Z
+date: 2015-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
 description: Translation Markup Language from Translation Exchange.
 email:
 - michael@translationexchange.com