text_helpers 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c49f9648a3bb95e99aea71aedff8bae0454e01e0
-  data.tar.gz: ed92fc57ef9f89ac19d1b29f54a9245f912d721b
+  metadata.gz: b830f91668677103c3ef206b9921ee1b22002f38
+  data.tar.gz: b8083debf8108e5a2aabbb006a3a714d8ccd7326
 SHA512:
-  metadata.gz: 21a84ee6259dfe61a832c93fdbdb7ad26fc3ffcdbd574eb33f4b63ecb5cf1bb3ad82f97a59e54000998e91c1ed51bf66b35547b3016db2fbc4055ef4ae0db67e
-  data.tar.gz: c5df917ab268762229f9e586e39f1d669b33affae097f2e87154b4ea50fe000ee1879f3e1f98ee0a3ad0e61043c0b679804f9211124b2c6a6beb4d8afcbec190
+  metadata.gz: 775485ba26237b01b0b037517fd2a684d4c409a197bb7e30a87e2c760d40ac390e9810f241c7cc546487326bbefc7cceff3c10932bdefc767f9499a873c8ea8d
+  data.tar.gz: 3c3d7e67185f1f54e3a6a8afc6281f1c492214a739fda44e6a3d9e6f51efde7d3cccd291709e535aa3fd6a9cce05207338b59d0e1ce698e6e385858156f4fd2a

data/lib/text_helpers/translation.rb

@@ -20,14 +20,15 @@ module TextHelpers
     #
     # Returns a String resulting from the I18n lookup.
     def text(key, options = {})
+      options = html_safe_options(options)
       text = I18n.t(key, {
         scope: self.translation_scope,
         default: "!#{key}!"
-      }.merge(html_safe_options(options))).strip
+      }.merge(options)).strip
 
       # 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) }
+        text = text.gsub(/!([\w._\/]+)!/) { |match| I18n.t($1, options) }
       end
 
       text = smartify(text) if options.fetch(:smart, true)

data/lib/text_helpers/version.rb

@@ -1,3 +1,3 @@
 module TextHelpers
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/test/lib/text_helpers/translation_test.rb

@@ -20,11 +20,13 @@ describe TextHelpers::Translation do
       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",
@@ -92,6 +94,10 @@ describe TextHelpers::Translation do
         assert_equal "Global? (#{@global_text})", @helper.text(:interpolated_key)
       end
 
+      it "interpolates contents of scopes wrapped in !!" do
+        assert_equal "Interpolate global? (My interpolated text)", @helper.text(:interpol_arg_key, interpolate_with: "My interpolated text")
+      end
+
       it "handles recursive interpolation" do
         assert_equal "Recursively Global? (#{@global_text})", @helper.text(:recursive_key)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: text_helpers
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Andrew Horner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-06 00:00:00.000000000 Z
+date: 2014-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport