text_helpers 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96b1413c9d4a7e4a7c09d61fcf73d31024088238
-  data.tar.gz: f8d107fdadfb1d61b71fd41b3338b0981f325e2f
+  metadata.gz: 320e647924e409f4729c273ce71c68c2042c3748
+  data.tar.gz: f5a7f39ee0319697a1f6569666b28083043b892d
 SHA512:
-  metadata.gz: b61a1f7ab9fdc3b2a0c7c40190c37609fd5d57058df512ea19376d462b90424f08da965975a53d3cc863665ed36c8ba1a275e754bfc24713bee61e2ac960ae96
-  data.tar.gz: b800a3e4ae9fe750c3645de28546b38d51c10ced240b65d5b6ba311dfe719d117613c08d7f2d3637dc3a7faf55f209c0a74b96a7863f1bd3abca4c26b745c8c2
+  metadata.gz: a12a9414e716c6cc7c7d7a7a4265cb20222bced8ea6d607d0e2cfed59f08f0b8fcc3f9159f6013befd721b217a8040080a25406e09f0dac04fe85775bdeeff37
+  data.tar.gz: c81f7a27c1467d3d3c924f11176e7058d5dbf744e2326f4c48da33a6c126f36cf26443b33c539f2e76d02b14a0fef8b7242884481e3b69e7396753a1deee3cab

data/.gitignore

@@ -4,6 +4,8 @@
 .config
 .yardoc
 .DS_Store
+.ruby-version
+.ruby-gemset
 
 Gemfile.lock
 InstalledFiles

data/README.md

@@ -18,11 +18,19 @@ structure mirroring the app directory structure. The text for
 requirement, but will go a long way toward keeping your locales easily
 maintainable.
 
+If you're using this within a Rails project, you'll probably want to add the
+following line to your application.rb to ensure that Rails loads any locale
+files organized this way:
+
+```ruby
+config.i18n.load_path += Dir[Rails.root.join('config', 'locales', '**', '*.{rb,yml}').to_s]
+```
+
 In any locale file entry, you can reference another key in the locale file by
-using the syntax `!scope.to.key!`. For the sake of maintainability, the use of
-this interpolation should be restricted to small fragments of highly-recycled 
-static values. `I18n`'s built-in `%{value}` interpolation can be used for 
-variable text.
+using the syntax `!scope.to.key!`. For the sake of maintainability, I
+recommend restricting the use of this feature to small, highly-recycled
+fragments of static text. `I18n`'s built-in `%{value}` interpolation can be
+used for variable text.
 
 ### In Views
 

data/lib/text_helpers/contexts.rb

@@ -22,12 +22,8 @@ shared_context "a view spec", view: true do
   def translation_scope
     matcher = /(?<path>.*)\/_?(?<view>[^\/.]+)(?<extension>\.html\.haml)?/
     info = matcher.match(example.metadata[:full_description])
+    path = info[:path].gsub('/', '.')
 
-    if info
-      path = info[:path].gsub('/', '.')
-      "views.#{path}.#{info[:view]}"
-    else
-      "views.#{params[:controller]}.#{params[:action]}"
-    end
+    "views.#{path}.#{info[:view]}"
   end
 end

data/lib/text_helpers/translation.rb

@@ -21,11 +21,14 @@ module TextHelpers
       text = I18n.t(key, {
         scope: self.translation_scope,
         default: "!#{key}!"
-      }.merge(options))
+      }.merge(options)).strip
 
       # Interpolate any keypaths (e.g., `!some.lookup.path/key!`) found in the text.
-      final_text = text.strip.gsub(/!([\w._\/]+)!/) { |match| I18n.t($1) }
-      final_text.html_safe
+      while text =~ /!([\w._\/]+)!/ do
+        text = text.gsub(/!([\w._\/]+)!/) { |match| I18n.t($1) }
+      end
+
+      text.html_safe
     end
 
     # Public: Get an HTML representation of the rendered markdown for the passed I18n key.

data/lib/text_helpers/version.rb

@@ -1,3 +1,3 @@
 module TextHelpers
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/test/lib/text_helpers/translation_test.rb

@@ -21,10 +21,11 @@ describe TextHelpers::Translation do
         test_key: @global_text,
         multiline_key: @multiline_text,
         test: {
-          email_key: "<#{@email_address}>",
-          test_key: "*#{@scoped_text}*",
-          list_key: "* #{@scoped_text}",
-          interpolated_key: "Global? (!test_key!)"
+          email_key:        "<#{@email_address}>",
+          test_key:         "*#{@scoped_text}*",
+          list_key:         "* #{@scoped_text}",
+          interpolated_key: "Global? (!test_key!)",
+          recursive_key:    "Recursively !test.interpolated_key!"
         }
       }
     end
@@ -83,6 +84,10 @@ describe TextHelpers::Translation do
       it "interpolates values wrapped in !!" do
         assert_equal "Global? (#{@global_text})", @helper.text(:interpolated_key)
       end
+
+      it "handles recursive interpolation" do
+        assert_equal "Recursively Global? (#{@global_text})", @helper.text(:recursive_key)
+      end
     end
 
     describe "when no valid scope is provided" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: text_helpers
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Andrew Horner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-26 00:00:00.000000000 Z
+date: 2014-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -93,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: TextHelpers is a gem which supplies some basic utilities for text localization