locale_mailer 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26b6b91858f7a2e8c5e7ff0958d62ac522edf7b6
-  data.tar.gz: 30f6e223d04fa5b0d0cc545d7f8b624675ee3465
+  metadata.gz: 991fd4e039b610e59c3a7931e3ac33152c91cb14
+  data.tar.gz: e896a44e5623e26fd90da6ea88941ce587f660cd
 SHA512:
-  metadata.gz: ca62cf839282f01fe71bd47b441f7776cdd9f69b0a2e28d286012ecad11a421f249688d670768f551ca024ea726ee28c2139276a573cc3cb9a842c4d0e1419bb
-  data.tar.gz: 206c0c95ed7d9031ee62b11a08d1576455d624de5883ce7e019c24b622b03a4624a946328b8c86cdba1e4089e891535b5df567e81596ae537a2db70336c979d5
+  metadata.gz: a60553225e034aa5af897f3c68d1af9d0c8abadf0abf477edb977ee909d663bda8b915c4dfdc855e3c7fffbfcd02e7c83219b460d0f3735d7efea51e780c3302
+  data.tar.gz: 61aba9f059b18ec8d5d85f15a3f63c911f3af38a72cecd758c496c928723bec07f2ab1d0615505d93be4cb3dcf751b4e15e313821a29a8e0398128427cc9032b

data/lib/locale_mailer/concern.rb

@@ -20,84 +20,77 @@ module LocaleMailer
     included do
       alias_method_chain :mail, :localized_templates
       private :mail, :mail_with_localized_templates, :mail_without_localized_templates
+      helper_method :action_i18n_options, :action_i18n_path
     end
 
     private
 
-      def mail_with_localized_templates(options = {}, &block)
-        begin
-          mail_without_localized_templates(options, &block)
-        rescue ActionView::MissingTemplate => e
-          options.symbolize_keys!
-
-          # i18n_path = [
-          #   Rails.configuration.locale_mailer_path_prefix,
-          #   options[:template_path] || mailer_name.gsub('/','.').underscore,
-          #   options[:template_name] || action_name
-          # ].compact.join('.')
-
-
-          if I18n.exists? i18n_path(options), I18n.locale
-            locale_options = instance_public_variables_to_hash
-            options[:subject] = subject_from_locale(i18n_path(options), locale_options) unless options.key?(:subject)
-            mail_without_localized_templates options do |format|
-              html_body = body_from_locale i18n_path(options), locale_options, options
-              format.html {
-                html_body
-              }
-              format.text {
-                Loofah.scrub_fragment(html_body, LocaleMailer::A2HREF).to_text
-              }
-            end
-          else
-            raise e
+    def mail_with_localized_templates(options = {}, &block)
+      begin
+        mail_without_localized_templates(options, &block)
+      rescue ActionView::MissingTemplate => e
+        options.symbolize_keys!
+
+        if I18n.exists? action_i18n_path(options), I18n.locale
+          options[:subject] = subject_from_locale(options) unless options.key?(:subject)
+          mail_without_localized_templates options do |format|
+            html_body = body_from_locale options
+            format.html {
+              html_body
+            }
+            format.text {
+              Loofah.scrub_fragment(html_body, LocaleMailer::A2HREF).to_text
+            }
           end
+        else
+          raise e
         end
       end
+    end
 
-      def i18n_path options
-        [
-          Rails.configuration.locale_mailer_path_prefix,
-          options[:template_path] || mailer_name.gsub('/','.').underscore,
-          options[:template_name] || action_name
-        ].compact.join('.')
-      end
+    def action_i18n_path options = {}
+      @action_i18n_path ||= [
+        Rails.configuration.locale_mailer_path_prefix,
+        (options[:template_path] || mailer_name.gsub('/','.').underscore),
+        (options[:template_name] || action_name)
+      ].compact.join('.')
+    end
 
-      def instance_public_variables_to_hash
-        instance_variables.inject({}) do |memo, name|
-          if name.to_s.match(/\A@(?!_).*/)
-            if instance_variable_get(name).try(:as_json).is_a? Hash
-              flatten_hash(instance_variable_get(name).as_json).each do |(k,v)|
-                memo["#{name.to_s.gsub(/\A@/,'')}_#{k}".to_sym] = v
-              end
-            else
-              memo[name.to_s.gsub(/\A@/,'').to_sym] = instance_variable_get(name)
+    def action_i18n_options
+      @action_i18n_options ||= instance_variables.inject({}) do |memo, name|
+        if name.to_s.match(/\A@(?!_).*/) and not name.to_s.match(/\A@action_i18n_/)
+          if instance_variable_get(name).try(:as_json).is_a? Hash
+            flatten_hash(instance_variable_get(name).as_json).each do |(k,v)|
+              memo["#{name.to_s.gsub(/\A@/,'')}_#{k}".to_sym] = v
             end
+          else
+            memo[name.to_s.gsub(/\A@/,'').to_sym] = instance_variable_get(name)
           end
-          memo
         end
+        memo
       end
+    end
 
-      def flatten_hash(hash)
-        hash.each_with_object({}) do |(k, v), h|
-          if v.is_a? Hash
-            flatten_hash(v).map do |h_k, h_v|
-              h["#{k}_#{h_k}".to_sym] = h_v
-            end
-          else
-            h[k] = v
+    def flatten_hash(hash)
+      hash.each_with_object({}) do |(k, v), h|
+        if v.is_a? Hash
+          flatten_hash(v).map do |h_k, h_v|
+            h["#{k}_#{h_k}".to_sym] = h_v
           end
+        else
+          h[k] = v
         end
       end
+    end
 
-      def subject_from_locale i18n_path, locale_options
-        view_context.t([i18n_path, :subject].join('.'), locale_options)
-      end
+    def subject_from_locale options
+      view_context.t([action_i18n_path(options), :subject].join('.'), action_i18n_options)
+    end
 
-      def body_from_locale i18n_path, locale_options, options
-        render inline:  view_context.text([i18n_path, :body].join('.'), locale_options),
-           layout: options[:layout] || _layout
-      end
+    def body_from_locale  options
+      render inline: view_context.text([action_i18n_path(options), :body].join('.'), action_i18n_options),
+         layout: options[:layout] || _layout
+    end
 
   end
 end

data/lib/locale_mailer/version.rb

@@ -1,3 +1,3 @@
 module LocaleMailer
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: locale_mailer
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - itkin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-08 00:00:00.000000000 Z
+date: 2016-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer