text_helpers 0.7.1 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: aab61ab2ec51e7a9457ad3fc762341ecc59862b7
-  data.tar.gz: 687b06a1b1ee2447c5fb29248307f74726550589
+SHA256:
+  metadata.gz: af6ec054fd5d8245c92d4cb73518c2a54237f2a0be69c409eacb3c3a1fb258d5
+  data.tar.gz: 705a6cb053a6497f473d0a50a8782c5f3ffa00352c82a3ae050406e87b8bcec8
 SHA512:
-  metadata.gz: c03051dbfce0714ee802493eb44ecabeeb669b9eef87a847b5a21c3a03380832f247ed9192032b804dd8363046fe8c474600fbd3bc16c221587d7337bf380f2a
-  data.tar.gz: 800a199fde5ee931a01078e1a08f2587952b577c9852b30dae3ea726f24cd3d6740edd96d1277871718df97f815b72bb80f16bc1cb1dd1c65d09ce2dbfbe7438
+  metadata.gz: '0282c042d36297f1d3a7e60db481cfd0253645da0791112a58f89f1b289420e717d66f7e20a6d9a8b6d512720700470c7b452ad889a3f5e816929291c729c7b6'
+  data.tar.gz: 8ad38d3fe70e5ad3f33dbc871f8f5cb2d19c890d76609908bf397db2de7487baa27b4eddd5c8db924f553bdc3adcac7ce6126c64c0d7ade904f1d7b0f7f846ba

data/.travis.yml

@@ -1,3 +1,4 @@
 language: ruby
 rvm:
-  - 2.2.2
+  - 2.6.2
+  - 2.7.0

data/CHANGELOG.md

@@ -0,0 +1,95 @@
+# Change Log
+
+## [1.1.1] - 2021-02-02
+
+### Changes
+
+- Bump minimum redcarpet version for security (thanks to @n00dle)
+
+## [1.1.0] - 2020-12-02
+
+### New Features 
+
+- Add `rel=noopener` to external links (thanks to @n00dle)
+
+## [1.0.1] - 2020-12-02
+
+### Changes 
+
+- Support cascading backends by default
+
+## [1.0.0] - 2020-03-27
+
+### Changes
+
+- **(Breaking)** Drop explicit support for Ruby versions below 2.6
+
+### Bug Fixes
+
+- Properly support translations using I18n::Pluralization backend (thanks to @jhanggi)
+
+## [0.7.2] - 2019-07-06
+
+### Bug Fixes
+
+- Improve orphaned text matcher targeting
+
+## [0.7.1] - 2019-07-05
+
+### Bug Fixes
+
+- Prevent unnecessary non-breaking spaces in generated HTML
+
+### Changes
+
+- Improve `NotImplementedError` messaging (thanks to @stephen-puiszis)
+- Update README with spec setup instructions (thanks to @jhanggi)
+
+## [0.7.0] - 2016-05-06
+
+### New features
+
+- Automatically load entire locale directory via Railtie
+
+## [0.6.1] - 2015-10-01
+
+### Changes
+
+- Bump version requirement for Redcarpet gem to address memory leaks
+
+## [0.6.0] - 2015-06-15
+
+### New Features
+
+- Apply `target=_blank` attribute to anchor tags pointed at external URLs
+
+## [0.5.3] - 2015-02-25
+
+### Changes
+
+- Update spec helpers for compatibility with RSpec 3 (thanks to @gabrielg)
+
+## [0.5.2] - 2015-02-03
+
+### Changes
+
+- Support cascading backends for interpolated keys (thanks to @gabrielg)
+
+## [0.5.1] - 2015-01-23
+
+### New Features
+
+- Add RSpec helpers (thanks to @gabrielg)
+
+[1.1.1]: https://github.com/ahorner/text-helpers/compare/v1.1.0...v1.1.1
+[1.1.0]: https://github.com/ahorner/text-helpers/compare/v1.0.1...v1.1.0
+[1.0.1]: https://github.com/ahorner/text-helpers/compare/v1.0.0...v1.0.1
+[1.0.0]: https://github.com/ahorner/text-helpers/compare/v0.7.2...v1.0.0
+[0.7.2]: https://github.com/ahorner/text-helpers/compare/v0.7.1...v0.7.2
+[0.7.1]: https://github.com/ahorner/text-helpers/compare/v0.7.0...v0.7.1
+[0.7.0]: https://github.com/ahorner/text-helpers/compare/v0.6.1...v0.7.0
+[0.6.1]: https://github.com/ahorner/text-helpers/compare/v0.6.0...v0.6.1
+[0.6.0]: https://github.com/ahorner/text-helpers/compare/v0.5.3...v0.6.0
+[0.5.3]: https://github.com/ahorner/text-helpers/compare/v0.5.2...v0.5.3
+[0.5.2]: https://github.com/ahorner/text-helpers/compare/v0.5.1...v0.5.2
+[0.5.1]: https://github.com/ahorner/text-helpers/compare/v0.5.0...v0.5.1

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.rb

@@ -5,10 +5,10 @@ require "text_helpers/railtie" if defined?(Rails)
 module TextHelpers
   # RaiseExceptionHandler just raises all exceptions, rather than swallowing
   # MissingTranslation ones. It's cribbed almost verbatim from
-  # http://edgeguides.rubyonrails.org/i18n.html#customize-your-i18n-setup.
+  # https://guides.rubyonrails.org/i18n.html#using-different-exception-handlers.
   class RaiseExceptionHandler < I18n::ExceptionHandler
     def call(exception, locale, key, options)
-      if exception.is_a?(I18n::MissingTranslation)
+      if exception.is_a?(I18n::MissingTranslation) && key.to_s != "i18n.plural.rule"
         raise exception.to_exception
       else
         super

data/lib/text_helpers/translation.rb

@@ -12,7 +12,7 @@ module TextHelpers
       attributes = [
         ("href=\"#{link}\"" if link),
         ("title=\"#{title}\"" if title),
-        ("target=\"_blank\"" if link =~ PROTOCOL_MATCHER),
+        ("target=\"_blank\" rel=\"noopener\"" if link.match?(PROTOCOL_MATCHER)),
       ]
 
       "<a #{attributes.compact.join(" ")}>#{content}</a>"
@@ -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.
     #
@@ -34,17 +35,17 @@ module TextHelpers
     # Returns a String resulting from the I18n lookup.
     def text(key, options = {})
       options = html_safe_options(options)
-      text = I18n.t(key, {
+      text = I18n.t(key, **{
         scope: self.translation_scope,
-        default: "!#{key}!"
+        default: "!#{key}!",
+        cascade: true,
       }.merge(options)).strip
 
-      interpolation_options = options.dup
-      interpolation_options[:cascade] = true unless interpolation_options.has_key?(:cascade)
+      interpolation_options = { cascade: true }.merge(options)
 
       # 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.match?(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 = "1.1.1"
 end

data/test/lib/text_helpers/translation_test.rb

@@ -1,4 +1,4 @@
-require_relative '../../test_helper'
+require_relative "../../test_helper"
 
 describe TextHelpers::Translation do
   before do
@@ -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)
@@ -112,12 +119,12 @@ describe TextHelpers::Translation do
         assert_equal "<em>#{@scoped_text}</em>\n", @helper.html(:test_key, inline: true, orphans: true)
       end
 
-      it "renders internal links without a target" do
+      it "renders internal links without a target or rel" do
         assert_equal "<a href=\"/internal/path\">Internal&nbsp;link</a>\n", @helper.html(:internal_link, inline: true)
       end
 
-      it "renders external links with target='_blank'" do
-        assert_equal "<a href=\"http://external.com\" target=\"_blank\">External&nbsp;link</a>\n", @helper.html(:external_link, inline: true)
+      it "renders external links with target='_blank' and rel='noopener'" do
+        assert_equal "<a href=\"http://external.com\" target=\"_blank\" rel=\"noopener\">External&nbsp;link</a>\n", @helper.html(:external_link, inline: true)
       end
 
       it "interpolates values wrapped in !!" do
@@ -164,10 +171,32 @@ describe TextHelpers::Translation do
         assert_equal "This is what <b>Han</b> Solo said", @helper.text(:argument_key, user: "<b>Han</b> Solo".html_safe)
       end
 
-      it "correctly handles non-string params" do
+      it "correctly handles pluralized keys" do
         assert_equal "A single piece of text", @helper.text(:pluralized_key, count: 1)
         assert_equal "2 pieces of text", @helper.text(:pluralized_key, count: 2)
       end
+
+      describe "when the pluralization backend is configured and the exception handler is enabled" do
+        before do
+          @original_backend = I18n.backend
+          new_backend = @original_backend.dup
+          new_backend.extend(I18n::Backend::Pluralization)
+          I18n.backend = new_backend
+
+          @original_exception_handler = I18n.exception_handler
+          I18n.exception_handler = TextHelpers::RaiseExceptionHandler.new
+        end
+
+        after do
+          I18n.backend = @original_backend
+          I18n.exception_handler = @original_exception_handler
+        end
+
+        it "correctly handles pluralized keys" do
+          assert_equal "A single piece of text", @helper.text(:pluralized_key, count: 1)
+          assert_equal "2 pieces of text", @helper.text(:pluralized_key, count: 2)
+        end
+      end
     end
 
     describe "when no valid scope is provided" do
@@ -213,6 +242,14 @@ describe TextHelpers::Translation do
           I18n.backend = @original_backend
         end
 
+        it "cascades the requested key by default" do
+          I18n.backend.store_translations(:en, {test_scoped_key: "a translation"})
+          assert_equal "a translation", @helper.text(:test_scoped_key, scope: "some.unnecessary.scope")
+
+          I18n.backend.store_translations(:en, {some: {test_scoped_key: "a scoped translation"}})
+          assert_equal "a scoped translation", @helper.text(:test_scoped_key, scope: "some.unnecessary.scope")
+        end
+
         it "cascades the interpolated key by default" do
           I18n.backend.store_translations(:en, {test_scoped_key: "a translation"})
 

data/test/lib/text_helpers/version_test.rb

@@ -3,6 +3,6 @@ require_relative "../../test_helper"
 describe TextHelpers do
 
   it "defines a version" do
-    TextHelpers::VERSION.wont_be_nil
+    assert TextHelpers::VERSION
   end
 end

data/text_helpers.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency("activesupport")
   gem.add_dependency("i18n", ">=0.6.8")
-  gem.add_dependency("redcarpet", ">=3.3.3")
+  gem.add_dependency("redcarpet", ">=3.5.1")
 
   gem.add_development_dependency("rake")
   gem.add_development_dependency("railties")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: text_helpers
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 1.1.1
 platform: ruby
 authors:
 - Andrew Horner
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-07-06 00:00:00.000000000 Z
+date: 2021-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.3
+        version: 3.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.3
+        version: 3.5.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -89,6 +89,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -108,7 +109,7 @@ homepage: https://github.com/ahorner/text-helpers
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -123,9 +124,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: TextHelpers is a gem which supplies some basic utilities for text localization
   in Rails projects.  The library is intended to make it simple to keep your application's