mandrill_batch_mailer 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c6e6c5d426fdfc9462c81098e2c64f2146907a5
-  data.tar.gz: c2a7696bad891b2479cf370db9ee6753b25cc9dc
+  metadata.gz: 62eb5a8ab276e549611894a5e53967bc8ac6bf86
+  data.tar.gz: 32d2bd5d65060185e34e078fbdd10a84a66ed57f
 SHA512:
-  metadata.gz: 284043167940b1473b76f4eff2b6b2c813a5853c9b50c549914567e76d737134730a12d0caf52e1dadd7bdc6f6254033d3c2393b0acf6fb6b321200a54137d3e
-  data.tar.gz: 6768a56dfb2d615fef6014f892906ce25eb5325fa12fd8be06b7ffe2f04bf7a6bb1f1776f0dc2eb686f05ad9cc122cfe5926beca256fe8be9adf3927e3cc2a3b
+  metadata.gz: 17f92ea6f9071ea26a2a4c23e3bc49d8fbc0364a29f0cc7e1208d67a00fb1ce2d26e4acf2c67c9b63ac48c5086aa0e9eb3166febc507bea639c71edc7cc226fb
+  data.tar.gz: 8dfb5eb9852a1bbaa9d27f926ffe8d70c69f9158832d342067b9cb82861248f24f535048da73cb17494cb22fded20525d783e28ba45aa91ddb77564c8d746d2d

data/lib/mandrill_batch_mailer/base_mailer.rb

@@ -1,6 +1,7 @@
 require 'active_support'
 require 'active_support/inflector'
 require 'active_support/core_ext/object/try'
+require 'active_support/core_ext/hash/deep_merge.rb'
 
 module MandrillBatchMailer
   class BaseMailer
@@ -154,7 +155,23 @@ module MandrillBatchMailer
       end
 
       def translations
-        I18n.t scope, default: {}
+        if I18n.methods.include? :fallbacks
+          fallback_translations scope
+        else
+          I18n.t scope
+        end
+      end
+
+      def fallback_translations(scope)
+        I18n.fallbacks[I18n.locale].map do |fallback_locale|
+          I18n.t scope, locale: fallback_locale
+        end.reduce do |orig_translations, fallback_translations|
+          if fallback_translations.is_a? Hash
+            fallback_translations.deep_merge orig_translations
+          else
+            orig_translations
+          end
+        end
       end
 
       def class_name
@@ -162,9 +179,13 @@ module MandrillBatchMailer
       end
 
       def shared_translations
-        I18n.t(
-          "#{class_name.deconstantize.underscore}.shared_translations",
-          default: {})
+        shared_scope =
+          "#{class_name.deconstantize.underscore}.shared_translations"
+        if I18n.methods.include? :fallbacks
+          fallback_translations shared_scope
+        else
+          I18n.t shared_scope
+        end
       end
 
       def merge_vars_from(translations)

data/lib/mandrill_batch_mailer/version.rb

@@ -1,3 +1,3 @@
 module MandrillBatchMailer
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/spec/mandrill_batch_mailer/base_mailer_spec.rb

@@ -219,10 +219,27 @@ describe MandrillBatchMailer::BaseMailer do
   end
 
   describe '#translations' do
-    subject { test_mailer.send :translations }
+    subject(:translated) { test_mailer.send :translations }
     it do
       should eq translations[:test_mailer][:testing]
     end
+
+    context 'with de translations and fallbacks on' do
+      let(:de_translations) do
+        { test_mailer: { testing: { subject: 'Ein Test Betreff' } } }
+      end
+      before do
+        I18n::Backend::Simple.include I18n::Backend::Fallbacks
+        I18n.backend.store_translations :de, de_translations
+        I18n.locale = :de
+      end
+      after { I18n.locale = :en }
+
+      it 'uses fallbacks' do
+        expect(translated[:subject]).to eq 'Ein Test Betreff'
+        expect(translated[:just_a_test]).to eq 'This is just a test'
+      end
+    end
   end
 
   describe '#shared_translations' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mandrill_batch_mailer
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - schasse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-25 00:00:00.000000000 Z
+date: 2015-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -190,5 +190,5 @@ signing_key:
 specification_version: 4
 summary: Send batched Mails via Mandrill API
 test_files:
-- spec/spec_helper.rb
 - spec/mandrill_batch_mailer/base_mailer_spec.rb
+- spec/spec_helper.rb