text_helpers 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d68768849991fa2e1aef1064d10c70a0c106e3e1
-  data.tar.gz: 010c42fa301e3b113586a30ef7e6e1e2ae014059
+  metadata.gz: f015471aad735a53641fc7c929813edf85b002fb
+  data.tar.gz: be9b3642de7ac04cadbdebd43891a2ed168a2f3c
 SHA512:
-  metadata.gz: 58bea6441da44a2a256ca9ed53a7bb1116a1c4b9d85250846f6e5e84e55d245d7ee626f5d1258556b3527d7ad1893ff8287da9a96e265a740a8d513ca3293bdd
-  data.tar.gz: 5ff92cc80d614a94f78c2852f0e8ef9008cc1e75bdbd2728f89fa35c89eb98d30a0526192fb378b450f88fbcba65af819706482c91ec31b0d2a7d4c73f25cbeb
+  metadata.gz: bd136498aad27d06f3bdbb176fb329caa4b82fe9bf329eb8fd70709c1163acae036c22080a611680425f140b46be4ea765c31ebcfa32fb753e13ba9e164cf877
+  data.tar.gz: 8702f859d002d2298ec3b3353e09232fc0d1026d8b23f7c55a48f80fb3f1386b36c2ff5a96b9b9d27dbed297a0d53a5dc5fc5b5103f5018f4f2520eb6f676b10

data/lib/text_helpers/translation.rb

@@ -26,9 +26,12 @@ module TextHelpers
         default: "!#{key}!"
       }.merge(options)).strip
 
+      interpolation_options = options.dup
+      interpolation_options[:cascade] = true unless interpolation_options.has_key?(:cascade)
+
       # Interpolate any keypaths (e.g., `!some.lookup.path/key!`) found in the text.
       while text =~ /!([\w._\/]+)!/ do
-        text = text.gsub(/!([\w._\/]+)!/) { |match| I18n.t($1, options) }
+        text = text.gsub(/!([\w._\/]+)!/) { |match| I18n.t($1, interpolation_options) }
       end
 
       text = smartify(text) if options.fetch(:smart, true)

data/lib/text_helpers/version.rb

@@ -1,3 +1,3 @@
 module TextHelpers
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

data/test/lib/text_helpers/translation_test.rb

@@ -4,6 +4,7 @@ describe TextHelpers::Translation do
   before do
     @helper = Object.send(:include, TextHelpers::Translation).new
   end
+
   describe "given a stored I18n lookup" do
     before do
       @scoped_text = "Scoped lookup"
@@ -17,20 +18,23 @@ describe TextHelpers::Translation do
 
       @nb_scoped_text = "Scoped lookup"
 
+      I18n.exception_handler = nil
+
       I18n.backend.store_translations :en, {
         test_key: @global_text,
         multiline_key: @multiline_text,
         interpolated_key: "%{interpolate_with}",
         test: {
-          email_key:        "<#{@email_address}>",
-          test_key:         "*#{@scoped_text}*",
-          list_key:         "* #{@scoped_text}",
-          interpolated_key: "Global? (!test_key!)",
-          interpol_arg_key: "Interpolate global? (!interpolated_key!)",
-          recursive_key:    "Recursively !test.interpolated_key!",
-          quoted_key:       "They're looking for \"#{@global_text}\"--#{@scoped_text}",
-          argument_key:     "This is what %{user} said",
-          number_key:       "120\"",
+          email_key:               "<#{@email_address}>",
+          test_key:                "*#{@scoped_text}*",
+          list_key:                "* #{@scoped_text}",
+          interpolated_key:        "Global? (!test_key!)",
+          interpolated_scoped_key: "Global? (!test_scoped_key!)",
+          interpol_arg_key:        "Interpolate global? (!interpolated_key!)",
+          recursive_key:           "Recursively !test.interpolated_key!",
+          quoted_key:              "They're looking for \"#{@global_text}\"--#{@scoped_text}",
+          argument_key:            "This is what %{user} said",
+          number_key:              "120\"",
           pluralized_key: {
             one:            "A single piece of text",
             other:          "%{count} pieces of text"
@@ -39,6 +43,10 @@ describe TextHelpers::Translation do
       }
     end
 
+    after do
+      I18n.backend.reload!
+    end
+
     describe "for a specified scope" do
       before do
         @helper.define_singleton_method :translation_scope do
@@ -151,5 +159,51 @@ describe TextHelpers::Translation do
         assert_equal @global_text, @helper.text(:test_key)
       end
     end
+
+    describe "when a scope is given as an option" do
+      before do
+        @helper.define_singleton_method :translation_scope do
+          'test'
+        end
+      end
+
+      it "shows translation missing if an interpolated key isn't found at the same scope" do
+        expected = "Global? (translation missing: en.test.test_scoped_key)"
+        assert_equal expected, @helper.text(:interpolated_scoped_key, scope: "test")
+      end
+
+      it "interpolates the key if one is found at the same scope" do
+        I18n.backend.store_translations(:en, {
+          test: {test_scoped_key: "a translation"}})
+
+        assert_equal "Global? (a translation)", @helper.text(:interpolated_scoped_key, scope: "test")
+      end
+
+      describe "with the Cascade backend in place" do
+        before do
+          @original_backend = I18n.backend
+          new_backend = @original_backend.dup
+          new_backend.extend(I18n::Backend::Cascade)
+          I18n.backend = new_backend
+        end
+
+        after do
+          I18n.backend = @original_backend
+        end
+
+        it "cascades the interpolated key by default" do
+          I18n.backend.store_translations(:en, {test_scoped_key: "a translation"})
+
+          assert_equal "Global? (a translation)", @helper.text(:interpolated_scoped_key, scope: "test")
+        end
+
+        it "doesn't cascade if cascade: false is passed" do
+          I18n.backend.store_translations(:en, {test_scoped_key: "a translation"})
+
+          expected = "Global? (translation missing: en.test.test_scoped_key)"
+          assert_equal expected, @helper.text(:interpolated_scoped_key, scope: "test", cascade: false)
+        end
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: text_helpers
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Andrew Horner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-24 00:00:00.000000000 Z
+date: 2015-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport