text_helpers 0.7.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd673fcea44270d6cdcfeb8b87938e7224c2a111520ef859e35ce1df4ba785b1
-  data.tar.gz: fb7470beacfab30cfadd994023ae33f00753ddb7714854b642d8257561550491
+  metadata.gz: 821b971353a180079293995889c2ac37c578e4afbeb2fb4ab4f2b23d885121fa
+  data.tar.gz: 90b1c2814b154bd44b5c862c4cb65b3874eb4def96a8e3f87e7c39d28e9373da
 SHA512:
-  metadata.gz: 63302f4838675fd77e69186b58fb6a91948c1d4d34f2f55779af8c2a615f07d9568a4a7c0771155036851ce2f74fc5f6b1d8f90ea81150ee294e1eb0ff90f281
-  data.tar.gz: 38288b327cc615cd9a63c37e581b0ac707e9568087189e38ac5bfd2f64c988124b1b359b4e63bc63b3c8f9a3e5ea2c93c639239f94a4fc32f9d63838c15e9341
+  metadata.gz: ab19b219ea2f6b4877e1da8d103395836c7666154711591a255e093750059f72415fb283d6f427086ad96782375fa92cce9dfff4645b98fe38af203401b1a46f
+  data.tar.gz: 07b98f9af2b8258d696b3cb067ad54a25bf8e68e4d51f490e5f449dca418ef055cd562ae91ead997eb4be4c62a9587f83bc52bc97b52fd3f811bc176003eccac

data/.travis.yml

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

data/lib/text_helpers/translation.rb

@@ -35,7 +35,7 @@ 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}!"
       }.merge(options)).strip
@@ -45,7 +45,7 @@ module TextHelpers
 
       # Interpolate any keypaths (e.g., `!some.lookup.path/key!`) found in the text.
       while text =~ KEYPATH_MATCHER do
-        text = text.gsub(KEYPATH_MATCHER) { |match| I18n.t($1, interpolation_options) }
+        text = text.gsub(KEYPATH_MATCHER) { |match| I18n.t($1, **interpolation_options) }
       end
 
       text = smartify(text) if options.fetch(:smart, true)

data/lib/text_helpers/version.rb

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

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/test/lib/text_helpers/translation_test.rb

@@ -171,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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: text_helpers
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Andrew Horner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-06 00:00:00.000000000 Z
+date: 2020-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -123,8 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: TextHelpers is a gem which supplies some basic utilities for text localization