text_helpers 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: aab61ab2ec51e7a9457ad3fc762341ecc59862b7
-  data.tar.gz: 687b06a1b1ee2447c5fb29248307f74726550589
+SHA256:
+  metadata.gz: bd673fcea44270d6cdcfeb8b87938e7224c2a111520ef859e35ce1df4ba785b1
+  data.tar.gz: fb7470beacfab30cfadd994023ae33f00753ddb7714854b642d8257561550491
 SHA512:
-  metadata.gz: c03051dbfce0714ee802493eb44ecabeeb669b9eef87a847b5a21c3a03380832f247ed9192032b804dd8363046fe8c474600fbd3bc16c221587d7337bf380f2a
-  data.tar.gz: 800a199fde5ee931a01078e1a08f2587952b577c9852b30dae3ea726f24cd3d6740edd96d1277871718df97f815b72bb80f16bc1cb1dd1c65d09ce2dbfbe7438
+  metadata.gz: 63302f4838675fd77e69186b58fb6a91948c1d4d34f2f55779af8c2a615f07d9568a4a7c0771155036851ce2f74fc5f6b1d8f90ea81150ee294e1eb0ff90f281
+  data.tar.gz: 38288b327cc615cd9a63c37e581b0ac707e9568087189e38ac5bfd2f64c988124b1b359b4e63bc63b3c8f9a3e5ea2c93c639239f94a4fc32f9d63838c15e9341

data/Rakefile

@@ -4,6 +4,7 @@ require 'rake/testtask'
 
 Rake::TestTask.new do |t|
   t.pattern = "test/**/*_test.rb"
+  t.warning = false
 end
 
 task default: :test

data/lib/text_helpers/translation.rb

@@ -22,7 +22,8 @@ module TextHelpers
 
   module Translation
 
-    ORPHAN_MATCHER = /[ \t](?![^<]*>)(\S+\s*<\/(?:p|li)>)/.freeze
+    ORPHAN_MATCHER = /(\w+)[ \t](?![^<]*>)(\S+\s*<\/(?:p|li)>)/.freeze
+    KEYPATH_MATCHER = /!([\w.\/]+)!/.freeze
 
     # Public: Get the I18n localized text for the passed key.
     #
@@ -43,8 +44,8 @@ module TextHelpers
       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, interpolation_options) }
+      while text =~ KEYPATH_MATCHER do
+        text = text.gsub(KEYPATH_MATCHER) { |match| I18n.t($1, interpolation_options) }
       end
 
       text = smartify(text) if options.fetch(:smart, true)
@@ -65,7 +66,7 @@ module TextHelpers
     def html(key, options = {})
       rendered = markdown(text(key, options.merge(smart: false)))
 
-      rendered = options[:orphans] ? rendered : rendered.gsub(ORPHAN_MATCHER, '&nbsp;\1')
+      rendered = options[:orphans] ? rendered : rendered.gsub(ORPHAN_MATCHER, '\1&nbsp;\2')
       rendered = rendered.gsub(/<\/?p>/, '') if options[:inline]
       rendered.html_safe
     end

data/lib/text_helpers/version.rb

@@ -1,3 +1,3 @@
 module TextHelpers
-  VERSION = "0.7.1"
+  VERSION = "0.7.2"
 end

data/test/lib/text_helpers/translation_test.rb

@@ -32,6 +32,7 @@ describe TextHelpers::Translation do
           test_key:                "*#{@scoped_text}*",
           list_key:                "* #{@scoped_text}",
           single_word_list_key:    "* #{@single_word_text}",
+          prerendered_html_key:    "<ul>\n <li> Get everything you ever wanted</li>\n <li> Practically-guaranteed</li>\n </ul>",
           interpolated_key:        "Global? (!test_key!)",
           interpolated_scoped_key: "Global? (!test_scoped_key!)",
           interpol_arg_key:        "Interpolate global? (!interpolated_key!)",
@@ -86,6 +87,12 @@ describe TextHelpers::Translation do
         assert_equal expected, @helper.html(:single_word_list_key)
       end
 
+      it "correctly handles orphans in HTML with erratic whitespace" do
+        expected = "<ul>\n <li> Get everything you ever&nbsp;wanted</li>\n <li> Practically-guaranteed</li>\n </ul>\n"
+
+        assert_equal expected, @helper.html(:prerendered_html_key)
+      end
+
       it "does not modify HTML tags" do
         expected = "<p><a href=\"mailto:#{@email_address}\">#{@email_address}</a></p>\n"
         assert_equal expected, @helper.html(:email_key)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: text_helpers
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Andrew Horner
@@ -124,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: TextHelpers is a gem which supplies some basic utilities for text localization