text_helpers 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4342beb840df0ee1900b30f38834af4369f59fb5
-  data.tar.gz: 8f9de833dd817c836b675069eacb469cb1913355
+  metadata.gz: 776df8d7a9be3cdd18ae750affd047db2054a54d
+  data.tar.gz: de1b56e9e926fd136d4f21b83d5f2bd32aca3945
 SHA512:
-  metadata.gz: b91d57f519796838e79edd29bc909f0fa438044a008c402304f0898dcd1e9e552979feaad3f834da1c5d676055a109f9986db83cecdecc122fcae3c7eaad385c
-  data.tar.gz: 0df629319595bbe552627f3f3edc29b54ec1809230878bb4aef6cae25bde2bc28d829e9422d546cee3ba1776f5a27e79cf693dada354bd7a30e51b41d762cca5
+  metadata.gz: 297235af410582b99cd195e5cd9d5c0e6a7d75bf2605ba5919cb863a0bd30f761c9aa8d987ebb074660a0d3dfd44e8b905d5573ad39cb544226d889086a9e82c
+  data.tar.gz: 8ab0165dcd09fc8a1f60d20f7a1b7f2f47331e2e65c20204ae397b2a60e4fafe2550b131491df80674b26e10eb4c2d7991129186703d8703c5d845cf3ac6316e

data/lib/text_helpers/translation.rb

@@ -10,6 +10,9 @@ module TextHelpers
     #
     # key     - The desired I18n lookup key.
     # options - A Hash of options to pass through to the lookup.
+    #           :orphans - A special option that will prevent the insertion of
+    #                      non-breaking space characters at the end of the text
+    #                      when set to true.
     #
     # Returns a String resulting from the I18n lookup.
     def text(key, options = {})
@@ -19,26 +22,30 @@ module TextHelpers
       }.merge(options))
 
       # Interpolate any keypaths (e.g., `!some.lookup.path/key!`) found in the text.
-      text.strip.gsub(/!([\w._\/]+)!/) do |match|
+      final_text = text.strip.gsub(/!([\w._\/]+)!/) do |match|
         I18n.t($1)
-      end.html_safe
+      end
+      final_text = final_text.sub(/\s(\S+)\Z/, ' \1') unless options[:orphans]
+      final_text.html_safe
     end
 
     # Public: Get an HTML representation of the rendered markdown for the passed I18n key.
     #
     # key     - The desired I18n lookup key.
     # options - A Hash of options to pass through to the lookup.
-    #           :inline - A special option that will remove the enclosing <p>
-    #                     tags when set to true.
+    #           :inline  - A special option that will remove the enclosing <p>
+    #                      tags when set to true.
+    #           :orphans - A special option that will prevent the insertion of
+    #                      non-breaking space characters at the end of each
+    #                      paragraph when set to true.
     #
     # Returns a String containing the localized text rendered via Markdown
     def html(key, options = {})
-      rendered = GitHub::Markdown.render(text(key, options))
-      if options[:inline]
-        rendered.gsub(/<\/?p>/, '').html_safe
-      else
-        rendered.html_safe
-      end
+      rendered = GitHub::Markdown.render(text(key, options.merge(orphans: true)))
+
+      rendered = options[:orphans] ? rendered : rendered.sub(/\s(\S+\s*<\/p>)/, '&nbsp;\1')
+      rendered = rendered.gsub(/<\/?p>/, '') if options[:inline]
+      rendered.html_safe
     end
 
     protected

data/lib/text_helpers/version.rb

@@ -1,3 +1,3 @@
 module TextHelpers
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/test/lib/text_helpers/translation_test.rb

@@ -9,6 +9,9 @@ describe TextHelpers::Translation do
       @scoped_text = "Scoped lookup"
       @global_text = "Global lookup"
 
+      @nb_scoped_text = "Scoped lookup"
+      @nb_global_text = "Global lookup"
+
       I18n.backend.store_translations :en, {
         test_key: @global_text,
         test: {
@@ -26,19 +29,31 @@ describe TextHelpers::Translation do
       end
 
       it "looks up the text for the key in a scope derived from the call stack" do
-        assert_equal "*#{@scoped_text}*", @helper.text(:test_key)
+        assert_equal "*#{@nb_scoped_text}*", @helper.text(:test_key)
+      end
+
+      it "allows orphaned text with :orphans" do
+        assert_equal "*#{@scoped_text}*", @helper.text(:test_key, orphans: true)
       end
 
       it "converts the text to HTML via Markdown" do
-        assert_equal "<p><em>#{@scoped_text}</em></p>\n", @helper.html(:test_key)
+        assert_equal "<p><em>#{@nb_scoped_text}</em></p>\n", @helper.html(:test_key)
+      end
+
+      it "allows orphaned text with :orphans" do
+        assert_equal "<p><em>#{@scoped_text}</em></p>\n", @helper.html(:test_key, orphans: true)
       end
 
       it "removes the enclosing paragraph with :inline" do
-        assert_equal "<em>#{@scoped_text}</em>\n", @helper.html(:test_key, inline: true)
+        assert_equal "<em>#{@nb_scoped_text}</em>\n", @helper.html(:test_key, inline: true)
+      end
+
+      it "correctly combines :orphans and :inline options" do
+        assert_equal "<em>#{@scoped_text}</em>\n", @helper.html(:test_key, inline: true, orphans: true)
       end
 
       it "interpolates values wrapped in !!" do
-        assert_equal "Global? (#{@global_text})", @helper.text(:interpolated_key)
+        assert_equal "Global? (#{@nb_global_text})", @helper.text(:interpolated_key)
       end
     end
 
@@ -50,7 +65,7 @@ describe TextHelpers::Translation do
       end
 
       it "defaults to a globally-defined value for the key" do
-        assert_equal @global_text, @helper.text(:test_key)
+        assert_equal @nb_global_text, @helper.text(:test_key)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: text_helpers
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Andrew Horner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-14 00:00:00.000000000 Z
+date: 2013-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport