hanami-utils 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab3141a4fd9052c6472d5bfd820eca5be30a9be7e3f8c7a8c5039ca14ff8a44e
-  data.tar.gz: c6b7581c887b4c7dafe0834a5ee045eaef17d1ed9a82aeffd5e6de2c995093d6
+  metadata.gz: 545770be01c79024c33b64bb801b417f3c0b2a40ed88a635eedd43e0516c8824
+  data.tar.gz: 0bc96d622a662fc6a469175fcbda2c88f28057fa4018db12218116bface3d02c
 SHA512:
-  metadata.gz: e05b9c87e1e3206ba379a7f4d09fcae6602049d36548306ccec1abf89f7a2e2271ab995e2afa9702411062f3fd0f2e13e1bcdcd69868a63e05517fc36bf1c020
-  data.tar.gz: 55e117ed1367cdd8791531e42b7da858641a6e36f24cd5d440371e006a704ffa53dd0e01d352e306dd6be1eedb4ba0ffd728228e01dfab0a9de9e6e3814cbd04
+  metadata.gz: c37c0b42a52d21ad5f1746b56aabc0ebe132ae9479674785066f32d5620e91865d50df375e51a0802de4a0f2280fba5598dfe4044a82e933b46d765695a63395
+  data.tar.gz: 0d22487f8f82568cdac873d58562a0cd3bdf8f7d5de7f268791c5cb454f07873a1dca90943967539b7e38e0cda3b852fd52d422e567231c81057191905b523b2

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Hanami::Utils
 Ruby core extentions and class utilities for Hanami
 
+## v1.3.3 - 2019-09-13
+### Fixed
+- [Mauro Morales] Ensure `Utils::Inflector.pluralize` and `.singularize` to work with words that contain an underscore (`_`)
+
 ## v1.3.2 - 2019-06-21
 ### Added
 - [Vladislav Yashin & Luca Guidi] Added `Utils::BasicObject#instance_of?`, `#is_a?`, and `#kind_of`

data/lib/hanami/utils/inflector.rb

@@ -27,17 +27,35 @@ module Hanami
         # @since 0.6.0
         # @api private
         def ===(other)
-          key = other.downcase
+          key = extract_last_alphanumeric_token(other)
           @rules.key?(key) || @rules.value?(key)
         end
 
         # @since 0.6.0
         # @api private
         def apply(string)
-          key    = string.downcase
+          key = extract_last_alphanumeric_token(string)
           result = @rules[key] || @rules.rassoc(key).last
 
-          string[0] + result[1..-1]
+          prefix = if key == string.downcase
+                     string[0]
+                   else
+                     string[0..string.index(key)]
+                   end
+
+          prefix + result[1..-1]
+        end
+
+        private
+
+        # @since 1.3.3
+        # @api private
+        def extract_last_alphanumeric_token(string)
+          if string.downcase =~ /_([[:alpha:]]*)\z/
+            Regexp.last_match(1)
+          else
+            string.downcase
+          end
         end
       end
 
@@ -373,15 +391,15 @@ module Hanami
           $1 + IES
         when /\A(.*)(ex|ix)\z/
           $1 + ICES
-        when /\A(.*)(eau|#{ EAUX })\z/
+        when /\A(.*)(eau|#{EAUX})\z/
           $1 + EAUX
         when /\A(.*)x\z/
           $1 + XES
         when /\A(.*)ma\z/
           string + TA
-        when /\A(.*)(um|#{ A })\z/
+        when /\A(.*)(um|#{A})\z/
           $1 + A
-        when /\A(buffal|domin|ech|embarg|her|mosquit|potat|tomat)#{ O }\z/i
+        when /\A(buffal|domin|ech|embarg|her|mosquit|potat|tomat)#{O}\z/i
           $1 + OES
         when /\A(.*)(fee)\z/
           $1 + $2 + S

data/lib/hanami/utils/version.rb

@@ -3,6 +3,6 @@ module Hanami
     # Defines the version
     #
     # @since 0.1.0
-    VERSION = '1.3.2'.freeze
+    VERSION = '1.3.3'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-utils
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Luca Guidi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-21 00:00:00.000000000 Z
+date: 2019-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: transproc