hanami-utils 1.2.0 → 1.3.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0aae68f4cdea2d9ae31f657667113a83649cbde89c6ed92eeef8d1f632a6e67a
-  data.tar.gz: 6b2ef7b145cd6737446c697290d927682b771eb31bf0f1db67ce6a924eb7f600
+  metadata.gz: 54d09fd1479ee07fdc4123bcf919f59929d6bd0c09224674c0432443d438c4f6
+  data.tar.gz: b46600bfa6191095e325867907830c4c1bfac0fcf4e9fb24f6f2907b1d15236c
 SHA512:
-  metadata.gz: 314d82b57155df3316c5e199aac192951ed95b6086a524eb24361d1b690e953e368fb18d2f8a1999b666903c7359c0e7bd32b26659576ba55bad958baccd70e2
-  data.tar.gz: effdbec3320a5cae20cee1d86c9e05a6d7f7e05980a2749dfefe27dc4222b23b2602283614c8bab72fecb8f9f1b478f0cdfdbe39586d94bb9bf0c5b42eb4bc1f
+  metadata.gz: c3608dfc31ba508caa081b50c931e1ddcf00eca260f521fcd91dab9ebe7b7e827c56301b33280551657284231654032025d5ab9de07403bc1db56ee12352f856
+  data.tar.gz: '09f78de10703da264abbc636f8a4bf9172c5565dce7882533c21adca31bf158841bf80998821f158ca77604b9fc9670a677f02644949fd1714a16766fda28918'

data/CHANGELOG.md

@@ -1,6 +1,21 @@
 # Hanami::Utils
 Ruby core extentions and class utilities for Hanami
 
+## v1.3.0.beta1 - 2018-08-08
+### Added
+- [Luca Guidi] Official support for JRuby 9.2.0.0
+- [graywolf] Add `Utils::Files.inject_line_before_last` and `.inject_line_after_last`
+
+### Fixed
+- [graywolf] Don't show `Fixnum` Ruby warning for 2.4+
+- [Luca Guidi] Fix pluralization of `"fee"`
+
+### Deprecated
+- [Luca Guidi & Marion Schleifer] Deprecate `Utils::String` as Ruby type. Please use `Utils::String` class methods instead of `Utils::String.new("")`.
+- [Luca Guidi & Marion Schleifer] Deprecate `Utils::Hash` as Ruby type. Please use `Utils::Hash` class methods instead of `Utils::Hash.new({})`.
+- [Luca Guidi & Marion Schleifer] Deprecate `Utils::String.pluralize` and `.singularize`.
+- [Semyon Pupkov] Deprecate `Utils::Class.load_from_pattern!`
+
 ## v1.2.0 - 2018-04-11
 
 ## v1.2.0.rc2 - 2018-04-06

data/README.md

@@ -4,11 +4,11 @@ Ruby core extensions and class utilities for [Hanami](http://hanamirb.org)
 
 ## Status
 
-[![Gem Version](http://img.shields.io/gem/v/hanami-utils.svg)](https://badge.fury.io/rb/hanami-utils)
-[![Build Status](http://img.shields.io/travis/hanami/utils/master.svg)](https://travis-ci.org/hanami/utils?branch=master)
-[![Coverage](http://img.shields.io/coveralls/hanami/utils/master.svg)](https://coveralls.io/r/hanami/utils)
-[![Code Climate](http://img.shields.io/codeclimate/github/hanami/utils.svg)](https://codeclimate.com/github/hanami/utils)
-[![Dependencies](http://img.shields.io/gemnasium/hanami/utils.svg)](https://gemnasium.com/hanami/utils)
+[![Gem Version](https://badge.fury.io/rb/hanami-utils.svg)](https://badge.fury.io/rb/hanami-utils)
+[![TravisCI](https://travis-ci.org/hanami/utils.svg?branch=master)](https://travis-ci.org/hanami/utils)
+[![CircleCI](https://circleci.com/gh/hanami/utils/tree/master.svg?style=svg)](https://circleci.com/gh/hanami/utils/tree/master)
+[![Test Coverage](https://codecov.io/gh/hanami/utils/branch/master/graph/badge.svg)](https://codecov.io/gh/hanami/utils)
+[![Depfu](https://badges.depfu.com/badges/a8545fb67cf32a2c75b6227bc0821027/overview.svg)](https://depfu.com/github/hanami/utils?project=Bundler)
 [![Inline Docs](http://inch-ci.org/github/hanami/utils.svg)](http://inch-ci.org/github/hanami/utils)
 
 ## Contact

data/hanami-utils.gemspec

@@ -22,6 +22,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'concurrent-ruby', '~> 1.0'
 
   spec.add_development_dependency 'bundler', '~> 1.6'
-  spec.add_development_dependency 'rake',    '~> 11'
+  spec.add_development_dependency 'rake',    '~> 12'
   spec.add_development_dependency 'rspec',   '~> 3.7'
 end

data/lib/hanami-utils.rb

@@ -1 +1 @@
-require 'hanami/utils' # rubocop:disable Naming/FileName
+require 'hanami/utils'

data/lib/hanami/utils/class.rb

@@ -1,4 +1,4 @@
-require 'hanami/utils/string'
+require 'hanami/utils/deprecation'
 
 module Hanami
   module Utils
@@ -110,7 +110,9 @@ module Hanami
       #   # with missing constant
       #   Hanami::Utils::Class.load_from_pattern!('Unknown') # => raises NameError
       def self.load_from_pattern!(pattern, namespace = Object)
-        String.new(pattern).tokenize do |token|
+        Deprecation.new('Hanami::Utils::Class.load_from_pattern! is deprecated, please use Hanami::Utils::Class.load! instead')
+
+        tokenize(pattern) do |token|
           begin
             return namespace.const_get(token, false)
           rescue NameError # rubocop:disable Lint/HandleExceptions
@@ -120,6 +122,35 @@ module Hanami
         full_name = [(namespace == Object ? nil : namespace), pattern].compact.join('::')
         raise NameError.new("uninitialized constant #{full_name}")
       end
+
+      # rubocop:disable Metrics/MethodLength
+      def self.tokenize(pattern)
+        if match = TOKENIZE_REGEXP.match(pattern) # rubocop:disable Lint/AssignmentInCondition
+          pre  = match.pre_match
+          post = match.post_match
+          tokens = match[1].split(TOKENIZE_SEPARATOR)
+          tokens.each do |token|
+            yield("#{pre}#{token}#{post}")
+          end
+        else
+          yield(pattern)
+        end
+
+        nil
+      end
+      # rubocop:enable Metrics/MethodLength
+
+      # Regexp for .tokenize
+      #
+      # @since 1.3.0
+      # @api private
+      TOKENIZE_REGEXP = /\((.*)\)/
+
+      # Separator for .tokenize
+      #
+      # @since 1.3.0
+      # @api private
+      TOKENIZE_SEPARATOR = '|'.freeze
     end
   end
 end

data/lib/hanami/utils/files.rb

@@ -215,14 +215,30 @@ module Hanami
       # @raise [ArgumentError] if `target` cannot be found in `path`
       #
       # @see .inject_line_after
+      # @see .inject_line_before_last
+      # @see .inject_line_after_last
       #
       # @since 1.1.0
       def self.inject_line_before(path, target, contents)
-        content = ::File.readlines(path)
-        i       = index(content, path, target)
+        _inject_line_before(path, target, contents, method(:index))
+      end
 
-        content.insert(i, "#{contents}\n")
-        write(path, content)
+      # Inject `contents` in `path` after last `target`.
+      #
+      # @param path [String,Pathname] the path to file
+      # @param target [String,Regexp] the target to replace
+      # @param contents [String] the contents to inject
+      #
+      # @raise [Errno::ENOENT] if the path doesn't exist
+      # @raise [ArgumentError] if `target` cannot be found in `path`
+      #
+      # @see .inject_line_before
+      # @see .inject_line_after
+      # @see .inject_line_after_last
+      #
+      # @since 1.3.0
+      def self.inject_line_before_last(path, target, contents)
+        _inject_line_before(path, target, contents, method(:rindex))
       end
 
       # Inject `contents` in `path` after `target`.
@@ -235,14 +251,31 @@ module Hanami
       # @raise [ArgumentError] if `target` cannot be found in `path`
       #
       # @see .inject_line_before
+      # @see .inject_line_before_last
+      # @see .inject_line_after_last
       #
       # @since 1.1.0
       def self.inject_line_after(path, target, contents)
-        content = ::File.readlines(path)
-        i       = index(content, path, target)
+        _inject_line_after(path, target, contents, method(:index))
+      end
 
-        content.insert(i + 1, "#{contents}\n")
-        write(path, content)
+      # Inject `contents` in `path` after last `target`.
+      #
+      # @param path [String,Pathname] the path to file
+      # @param target [String,Regexp] the target to replace
+      # @param contents [String] the contents to inject
+      #
+      # @raise [Errno::ENOENT] if the path doesn't exist
+      # @raise [ArgumentError] if `target` cannot be found in `path`
+      #
+      # @see .inject_line_before
+      # @see .inject_line_after
+      # @see .inject_line_before_last
+      # @see .inject_line_after_last
+      #
+      # @since 1.3.0
+      def self.inject_line_after_last(path, target, contents)
+        _inject_line_after(path, target, contents, method(:rindex))
       end
 
       # Removes line from `path`, matching `target`.
@@ -370,10 +403,43 @@ module Hanami
 
       private_class_method :index
 
+      # @since 1.3.0
+      # @api private
+      def self.rindex(content, path, target)
+        line_number(content, target, finder: content.method(:rindex)) or
+          raise ArgumentError.new("Cannot find `#{target}' inside `#{path}'.")
+      end
+
+      private_class_method :rindex
+
+      # @since 1.3.0
+      # @api private
+      def self._inject_line_before(path, target, contents, finder)
+        content = ::File.readlines(path)
+        i       = finder.call(content, path, target)
+
+        content.insert(i, "#{contents}\n")
+        write(path, content)
+      end
+
+      private_class_method :_inject_line_before
+
+      # @since 1.3.0
+      # @api private
+      def self._inject_line_after(path, target, contents, finder)
+        content = ::File.readlines(path)
+        i       = finder.call(content, path, target)
+
+        content.insert(i + 1, "#{contents}\n")
+        write(path, content)
+      end
+
+      private_class_method :_inject_line_after
+
       # @since 1.1.0
       # @api private
-      def self.line_number(content, target)
-        content.index do |l|
+      def self.line_number(content, target, finder: content.method(:index))
+        finder.call do |l|
           case target
           when ::String
             l.include?(target)

data/lib/hanami/utils/hash.rb

@@ -217,6 +217,7 @@ module Hanami
       # @return [Hanami::Utils::Hash] self
       #
       # @since 0.1.0
+      # @deprecated
       #
       # @see http://www.ruby-doc.org/core/Hash.html#method-c-5B-5D
       #
@@ -243,6 +244,7 @@ module Hanami
       # @return [Hash] self
       #
       # @since 0.1.0
+      # @deprecated Use {Hanami::Utils::Hash.symbolize}
       #
       # @example
       #   require 'hanami/utils/hash'
@@ -266,6 +268,7 @@ module Hanami
       # @return [Hash] self
       #
       # @since 1.0.0
+      # @deprecated Use {Hanami::Utils::Hash.deep_symbolize}
       #
       # @example
       #   require 'hanami/utils/hash'
@@ -291,6 +294,7 @@ module Hanami
       # @return [Hash] self
       #
       # @since 0.3.2
+      # @deprecated Use {Hanami::Utils::Hash.stringify}
       #
       # @example
       #   require 'hanami/utils/hash'
@@ -316,6 +320,7 @@ module Hanami
       # @return [Hash] a deep duplicated self
       #
       # @since 0.3.1
+      # @deprecated Use {Hanami::Utils::Hash.deep_dup}
       #
       # @example
       #   require 'hanami/utils/hash'
@@ -383,6 +388,7 @@ module Hanami
       # @return [Array] the keys
       #
       # @since 0.3.0
+      # @deprecated
       #
       # @see http://www.ruby-doc.org/core/Hash.html#method-i-keys
       def keys
@@ -397,6 +403,7 @@ module Hanami
       # @return [Object,nil] the value hold by the given key, if present
       #
       # @since 0.3.0
+      # @deprecated
       #
       # @see http://www.ruby-doc.org/core/Hash.html#method-i-keys
       def delete(key)
@@ -410,6 +417,7 @@ module Hanami
       # @return [Object,nil] the correspoding value, if present
       #
       # @since 0.3.0
+      # @deprecated
       #
       # @see http://www.ruby-doc.org/core/Hash.html#method-i-5B-5D
       def [](key)
@@ -422,6 +430,7 @@ module Hanami
       # @param value [Object] the value to assign
       #
       # @since 0.3.0
+      # @deprecated
       #
       # @see http://www.ruby-doc.org/core/Hash.html#method-i-5B-5D-3D
       def []=(key, value)
@@ -433,6 +442,7 @@ module Hanami
       # @return [::Hash] the hash
       #
       # @since 0.3.0
+      # @deprecated
       #
       # @see http://www.ruby-doc.org/core/Hash.html#method-i-to_h
       def to_h
@@ -449,6 +459,7 @@ module Hanami
       # @return [::Array] the array
       #
       # @since 0.3.0
+      # @deprecated
       #
       # @see http://www.ruby-doc.org/core/Hash.html#method-i-to_a
       def to_a
@@ -460,6 +471,7 @@ module Hanami
       # @return [TrueClass,FalseClass]
       #
       # @since 0.3.0
+      # @deprecated
       def ==(other)
         @hash == other.to_h
       end
@@ -471,6 +483,7 @@ module Hanami
       # @return [Fixnum]
       #
       # @since 0.3.0
+      # @deprecated
       def hash
         @hash.hash
       end
@@ -480,6 +493,7 @@ module Hanami
       # @return [String]
       #
       # @since 0.3.0
+      # @deprecated
       def inspect
         @hash.inspect
       end

data/lib/hanami/utils/inflector.rb

@@ -382,6 +382,8 @@ module Hanami
           $1 + A
         when /\A(buffal|domin|ech|embarg|her|mosquit|potat|tomat)#{ O }\z/i
           $1 + OES
+        when /\A(.*)(fee)\z/
+          $1 + $2 + S
         when /\A(.*)(?:([^f]))f[e]*\z/
           $1 + $2 + VES
         when /\A(.*)us\z/

data/lib/hanami/utils/kernel.rb

@@ -1048,7 +1048,7 @@ module Hanami
       end
 
       class << self
-        private :inspect_type_error
+        private :inspect_type_error # rubocop:disable Style/AccessModifierDeclarations
       end
     end
   end

data/lib/hanami/utils/string.rb

@@ -129,8 +129,8 @@ module Hanami
       #   Hanami::Utils::String.transform("Cherry", -> { "blossom" }))
       #     # => ArgumentError: wrong number of arguments (given 1, expected 0)
       #
-      # rubocop:disable Metrics/MethodLength
       # rubocop:disable Metrics/AbcSize
+      # rubocop:disable Metrics/MethodLength
       def self.transform(input, *transformations)
         fn = @__transformations__.fetch_or_store(transformations.hash) do
           compose do |fns|
@@ -150,8 +150,8 @@ module Hanami
 
         fn.call(input)
       end
-      # rubocop:enable Metrics/AbcSize
       # rubocop:enable Metrics/MethodLength
+      # rubocop:enable Metrics/AbcSize
 
       # Extracted from `transproc` source code
       #
@@ -323,6 +323,7 @@ module Hanami
       # @since 1.1.0
       #
       # @see Hanami::Utils::Inflector
+      # @deprecated
       #
       # @example
       #   require 'hanami/utils/string'
@@ -340,6 +341,7 @@ module Hanami
       # @return [::String] the singularized string.
       #
       # @since 1.1.0
+      # @deprecated
       #
       # @see Hanami::Utils::Inflector
       #
@@ -389,6 +391,7 @@ module Hanami
       # @return [Hanami::Utils::String] self
       #
       # @since 0.1.0
+      # @deprecated
       def initialize(string)
         @string = string.to_s
       end
@@ -398,6 +401,7 @@ module Hanami
       # @return [Hanami::Utils::String] the transformed string
       #
       # @since 0.4.0
+      # @deprecated Use {Hanami::Utils::String.titleize}
       #
       # @example
       #   require 'hanami/utils/string'
@@ -413,6 +417,7 @@ module Hanami
       # @return [Hanami::Utils::String] the transformed string
       #
       # @since 0.5.2
+      # @deprecated Use {Hanami::Utils::String.capitalize}
       #
       # @example
       #   require 'hanami/utils/string'
@@ -444,6 +449,7 @@ module Hanami
       # @return [Hanami::Utils::String] the transformed string
       #
       # @since 0.1.0
+      # @deprecated Use {Hanami::Utils::String.classify}
       #
       # @example
       #   require 'hanami/utils/string'
@@ -467,6 +473,7 @@ module Hanami
       # @see https://github.com/rails/rails/blob/feaa6e2048fe86bcf07e967d6e47b865e42e055b/activesupport/lib/active_support/inflector/methods.rb#L90
       #
       # @return [Hanami::Utils::String] the transformed string
+      # @deprecated Use {Hanami::Utils::String.underscore}
       #
       # @since 0.1.0
       #
@@ -489,6 +496,7 @@ module Hanami
       # @return [Hanami::Utils::String] the transformed string
       #
       # @since 0.4.0
+      # @deprecated Use {Hanami::Utils::String.dasherize}
       #
       # @example
       #   require 'hanami/utils/string'
@@ -510,6 +518,7 @@ module Hanami
       # @return [Hanami::Utils::String] the transformed string
       #
       # @since 0.1.0
+      # @deprecated Use {Hanami::Utils::String.demodulize}
       #
       # @example
       #   require 'hanami/utils/string'
@@ -528,6 +537,7 @@ module Hanami
       # @return [Hanami::Utils::String] the transformed string
       #
       # @since 0.1.2
+      # @deprecated Use {Hanami::Utils::String.namespace}
       #
       # @example
       #   require 'hanami/utils/string'
@@ -549,6 +559,7 @@ module Hanami
       # @return [void]
       #
       # @since 0.1.0
+      # @deprecated
       #
       # @example
       #   require 'hanami/utils/string'
@@ -561,7 +572,9 @@ module Hanami
       #   # =>
       #     'Hanami::Utils'
       #     'Hanami::App'
-      def tokenize # rubocop:disable Metrics/MethodLength
+      #
+      # rubocop:disable Metrics/MethodLength
+      def tokenize
         if match = TOKENIZE_REGEXP.match(@string) # rubocop:disable Lint/AssignmentInCondition
           pre  = match.pre_match
           post = match.post_match
@@ -575,6 +588,7 @@ module Hanami
 
         nil
       end
+      # rubocop:enable Metrics/MethodLength
 
       # Return a pluralized version of self.
       #
@@ -582,6 +596,7 @@ module Hanami
       #
       # @api private
       # @since 0.4.1
+      # @deprecated
       #
       # @see Hanami::Utils::Inflector
       def pluralize
@@ -594,6 +609,7 @@ module Hanami
       #
       # @api private
       # @since 0.4.1
+      # @deprecated
       #
       # @see Hanami::Utils::Inflector
       def singularize
@@ -605,6 +621,7 @@ module Hanami
       # @return [Integer]
       #
       # @since 0.3.0
+      # @deprecated
       def hash
         @string.hash
       end
@@ -614,6 +631,7 @@ module Hanami
       # @return [::String]
       #
       # @since 0.3.0
+      # @deprecated
       def to_s
         @string
       end
@@ -625,6 +643,7 @@ module Hanami
       # @return [TrueClass,FalseClass]
       #
       # @since 0.3.0
+      # @deprecated
       def ==(other)
         to_s == other
       end
@@ -638,6 +657,7 @@ module Hanami
       # @see http://www.ruby-doc.org/core/String.html#method-i-split
       #
       # @since 0.3.0
+      # @deprecated
       def split(pattern, limit = 0)
         @string.split(pattern, limit)
       end
@@ -649,6 +669,7 @@ module Hanami
       # @see http://www.ruby-doc.org/core/String.html#method-i-gsub
       #
       # @since 0.3.0
+      # @deprecated
       def gsub(pattern, replacement = nil, &blk)
         if block_given?
           @string.gsub(pattern, &blk)
@@ -665,6 +686,7 @@ module Hanami
       # @see http://www.ruby-doc.org/core/String.html#method-i-scan
       #
       # @since 0.6.0
+      # @deprecated
       def scan(pattern, &blk)
         @string.scan(pattern, &blk)
       end
@@ -681,6 +703,7 @@ module Hanami
       # @return [Hanami::Utils::String] the replaced string
       #
       # @since 0.6.0
+      # @deprecated Use {Hanami::Utils::String.rsub}
       #
       # @example
       #   require 'hanami/utils/string'

data/lib/hanami/utils/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-utils
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0.beta1
 platform: ruby
 authors:
 - Luca Guidi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-11 00:00:00.000000000 Z
+date: 2018-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: transproc
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11'
+        version: '12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11'
+        version: '12'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -134,12 +134,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Ruby core extentions and Hanami utilities