text_helpers 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76310dc21b93fc2bb4aace8b18ce91e1712e6b9b
-  data.tar.gz: 7c5d2386b6c74204ce86b538ace393019227dff5
+  metadata.gz: e580b82c75e3cf43132b59a8ad149e2d390d8be7
+  data.tar.gz: df4a31f298410004501ab0dad411f901e9394be4
 SHA512:
-  metadata.gz: b6e92e7ca7d97ca96efa12a38dddaf9b29339e8f1b3c24624c51b572f6016dcb4b81ca1a10d871e968dec96b488c397c2c4b64ab498d1fc212dddd7335226763
-  data.tar.gz: 563d9f78a6c41ac2a824510295e3fade5d671c95a261e97974fbbba5ee66f93da99f2530cfab7f1cde02611d7fb262596a11ecc93f99635bfc9cec9629172b25
+  metadata.gz: 65bee9783a1513a997add55402ee2dcef6da947f79cbe7ea893571aae457b47cd99501a2500a6add832c1321c89ecfa4d1e35554d68dfc382cf84d94eb8abc39
+  data.tar.gz: 383ee4e7373779411aa47b22dbb62e08897305c2c6c1e51f99dd0d4350f909e7b43c6bf019c74d04ec310483cc5c583120dad5b63b2b63c14f38ddb5f094f63a

data/lib/text_helpers/translation.rb

@@ -43,7 +43,7 @@ module TextHelpers
     def html(key, options = {})
       rendered = GitHub::Markdown.render(text(key, options.merge(orphans: true)))
 
-      rendered = options[:orphans] ? rendered : rendered.gsub(/\s(\S+\s*<\/p>)/, '&nbsp;\1')
+      rendered = options[:orphans] ? rendered : rendered.gsub(/\s(\S+\s*<\/(?:p|li)>)/, '&nbsp;\1')
       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.1.7"
+  VERSION = "0.1.8"
 end

data/test/lib/text_helpers/translation_test.rb

@@ -8,7 +8,7 @@ describe TextHelpers::Translation do
     before do
       @scoped_text = "Scoped lookup"
       @global_text = "Global lookup"
-      @multiline_text = <<-MULTI.gsub(/^[ \t]*/, '')
+      @multiline_text = <<-MULTI.gsub(/^[ \t]+/, '')
         This is some multiline text.
 
         It should include multiple paragraphs.
@@ -22,6 +22,7 @@ describe TextHelpers::Translation do
         multiline_key: @multiline_text,
         test: {
           test_key: "*#{@scoped_text}*",
+          list_key: "* #{@scoped_text}",
           interpolated_key: "Global? (!test_key!)"
         }
       }
@@ -46,12 +47,22 @@ describe TextHelpers::Translation do
         assert_equal "<p><em>#{@nb_scoped_text}</em></p>\n", @helper.html(:test_key)
       end
 
+      it "handles orphans within HTML list items" do
+        expected = <<-EXPECTED.gsub(/^[ \t]+/, '')
+        <ul>
+        <li>#{@nb_scoped_text}</li>
+        </ul>
+        EXPECTED
+
+        assert_equal expected, @helper.html(:list_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 "correctly eliminates orphans across multiple paragraphs" do
-        expected = <<-EXPECTED.gsub(/^[ \t]*/, '')
+        expected = <<-EXPECTED.gsub(/^[ \t]+/, '')
           <p>This is some multiline&nbsp;text.</p>
 
           <p>It should include multiple&nbsp;paragraphs.</p>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: text_helpers
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Andrew Horner