dry-inflector 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7cccc4cd092473c4c5dfefd8830e97c987fbb6cd6039b6253fd973a0b4d5b8ac
-  data.tar.gz: 6aca715e9ab5497c0f325691783e92a10035b27a3e6fdf483df38b7fb306d6ad
+  metadata.gz: 91485a1eac7b8b76f5a017b6eb04d567b54ae0685fd30ba1e3378450343de3f4
+  data.tar.gz: ee1e2b939347eda2577ddff9d3d454cc1e3115d2ac298260ea6215d26d5b78ec
 SHA512:
-  metadata.gz: 2c9c21e1611fe3bafd8cf7e303b5030c1ba3f777fd397a58f2dfba77f8be05b49fdece384e49d82d43043e388ca3fc1f1c6c84508fdfdac02ce9851edfee1dba
-  data.tar.gz: c83c9d597c611194642fe6aed04b3c5f6e37ec9fa212b3501a13c93010305f9c339875a09ba123b8a97fa89f567e90c110af9ac76317f4c16749a5e91601b57e
+  metadata.gz: 3d6f9a7fb8249866c30008a11b93715040e5b24106e83e731be32e15dc10c5e8b06d90072d21670e33b44dec41a5ceb075f076dc038d1dfb6424e6185a4ee283
+  data.tar.gz: e238694af29c1611b54630b9aecfa8b8c1b1096596393f811a9a8430a82d83f71e39e27b72337f504870f4122559ceb8cea7c9a4ffa05b8310dc616b7fa21282

data/CHANGELOG.md

@@ -1,23 +1,43 @@
-# Dry::Inflector
+# dry-inflector
 
 Inflector for Ruby
 
-## v0.1.2 - to be released
+## v0.2.0 - 2019-10-13
+
+### Added
+
+- [Abinoam P. Marques Jr. & Andrii Savchenko] Introduced `Dry::Inflector#upper_camelize` and `Dry::Inflector#lower_camelize`. `Dry::Inflector#camelize` is now an alias for `Dry::Inflector#upper_camelize` and may be deprecated later.
+	```ruby
+	inflector.camelize_upper("data_mapper") # => "DataMapper"
+	inflector.camelize_lower("data_mapper") # => "dataMapper"
+	```
+
+### Fixed
+
+- [ecnal] Fixed singularization rules for words like "alias" or "status"
+
+[Compare v0.1.2...v0.2.0](https://github.com/dry-rb/dry-inflector/compare/v0.1.2...v0.2.0)
+
+## v0.1.2 - 2018-04-25
 
 ### Added
 
 - [Gustavo Caso & Nikita Shilnikov] Added support for acronyms
 
-[Compare v0.1.1...master](https://github.com/dry-rb/dry-inflector/compare/v0.1.1...master)
+[Compare v0.1.1...v0.1.2](https://github.com/dry-rb/dry-inflector/compare/v0.1.1...v0.1.2)
 
 ## v0.1.1 - 2017-11-18
+
 ### Fixed
+
 - [Luca Guidi & Abinoam P. Marques Jr.] Ensure `Dry::Inflector#ordinalize` to work for all the numbers from 0 to 100
 
 [Compare v0.1.0...v0.1.1](https://github.com/dry-rb/dry-inflector/compare/v0.1.0...v0.1.1)
 
 ## v0.1.0 - 2017-11-17
+
 ### Added
+
 - [Luca Guidi] Introduced `Dry::Inflector#pluralize`
 - [Luca Guidi] Introduced `Dry::Inflector#singularize`
 - [Luca Guidi] Introduced `Dry::Inflector#camelize`

data/README.md

@@ -1,16 +1,13 @@
-[gitter]: https://gitter.im/dry-rb/chat
 [gem]: https://img.shields.io/gem/v/dry-inflector.svg
 [travis]: https://travis-ci.org/dry-rb/dry-inflector
-[gemnasium]: https://gemnasium.com/dry-rb/dry-inflector
 [codeclimate]: https://codeclimate.com/github/dry-rb/dry-inflector
-[coveralls]: https://coveralls.io/r/dry-rb/dry-inflector
+[chat]: https://dry-rb.zulipchat.com
 [inchpages]: http://inch-ci.org/github/dry-rb/dry-inflector
 
-# dry-inflector [![Join the chat at https://gitter.im/dry-rb/chat](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/dry-rb/chat)
+# dry-inflector [![Join the chat at https://dry-rb.zulipchat.com](https://img.shields.io/badge/dry--rb-join%20chat-%23346b7a.svg)][chat]
 
 [![Gem Version](https://badge.fury.io/rb/dry-inflector.svg)][gem]
 [![Build Status](https://travis-ci.org/dry-rb/dry-inflector.svg?branch=master)][travis]
-[![Dependency Status](https://gemnasium.com/dry-rb/dry-inflector.svg)][gemnasium]
 [![Code Climate](https://codeclimate.com/github/dry-rb/dry-inflector/badges/gpa.svg)][codeclimate]
 [![Test Coverage](https://codeclimate.com/github/dry-rb/dry-inflector/badges/coverage.svg)][codeclimate]
 [![Inline docs](http://inch-ci.org/github/dry-rb/dry-inflector.svg?branch=master)][inchpages]

data/dry-inflector.gemspec

@@ -13,10 +13,13 @@ Gem::Specification.new do |spec|
 
   spec.summary       = "DRY Inflector"
   spec.description   = "String inflections for dry-rb"
-  spec.homepage      = "http://dry-rb.org"
+  spec.homepage      = "https://dry-rb.org"
   spec.license       = "MIT"
 
   spec.metadata["allowed_push_host"] = "https://rubygems.org"
+  spec.metadata["changelog_uri"] = "https://github.com/dry-rb/dry-inflector/blob/master/CHANGELOG.md"
+  spec.metadata["source_code_uri"] = "https://github.com/dry-rb/dry-inflector"
+  spec.metadata["bug_tracker_uri"] = "https://github.com/dry-rb/dry-inflector/issues"
 
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
@@ -24,8 +27,9 @@ Gem::Specification.new do |spec|
 
   spec.files         = `git ls-files -- lib/* CHANGELOG.md LICENSE.md README.md dry-inflector.gemspec`.split($INPUT_RECORD_SEPARATOR)
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.required_ruby_version = '>= 2.4'
 
-  spec.add_development_dependency "bundler", "~> 1.16"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake",    "~> 12.0"
   spec.add_development_dependency "rspec",   "~> 3.7"
   spec.add_development_dependency "rubocop", "~> 0.50.0"

data/lib/dry-inflector.rb

@@ -0,0 +1 @@
+require 'dry/inflector'

data/lib/dry/inflector.rb

@@ -34,30 +34,42 @@ module Dry
       @inflections = Inflections.build(&blk)
     end
 
-    # Camelize a string
+    # Lower camelize a string
     #
     # @param input [String,Symbol] the input
-    # @return [String] the camelized string
+    # @return [String] the lower camelized string
     #
-    # @since 0.1.0
+    # @since 0.1.3
     #
     # @example
     #   require "dry/inflector"
     #
     #   inflector = Dry::Inflector.new
-    #   inflector.camelize("dry/inflector") # => "Dry::Inflector"
-    def camelize(input)
-      input = input.to_s.dup
-      input.sub!(/^[a-z\d]*/) { |match| inflections.acronyms.apply_to(match) }
-      input.gsub!(%r{(?:_|(/))([a-z\d]*)}i) do
-        m1 = Regexp.last_match(1)
-        m2 = Regexp.last_match(2)
-        "#{m1}#{inflections.acronyms.apply_to(m2)}"
-      end
-      input.gsub!("/", "::")
-      input
+    #   inflector.camelize_lower("data_mapper") # => "dataMapper"
+    def camelize_lower(input)
+      internal_camelize(input, false)
+    end
+
+    # Upper camelize a string
+    #
+    # @param input [String,Symbol] the input
+    # @return [String] the upper camelized string
+    #
+    # @since 0.1.3
+    #
+    # @example
+    #   require "dry/inflector"
+    #
+    #   inflector = Dry::Inflector.new
+    #   inflector.camelize_upper("data_mapper") # => "DataMapper"
+    #   inflector.camelize_upper("dry/inflector") # => "Dry::Inflector"
+    def camelize_upper(input)
+      internal_camelize(input, true)
     end
 
+    alias :camelize :camelize_upper
+
+
     # Find a constant with the name specified in the argument string
     #
     # The name is assumed to be the one of a top-level constant,
@@ -288,6 +300,15 @@ module Dry
       !(input =~ /\A[[:space:]]*\z/).nil? || inflections.uncountables.include?(input.downcase)
     end
 
+    # @return [String]
+    #
+    # @since 0.2.0
+    # @api public
+    def to_s
+      '#<Dry::Inflector>'
+    end
+    alias inspect to_s
+
     private
 
     # @since 0.1.0
@@ -298,8 +319,21 @@ module Dry
     # @api private
     DEFAULT_SEPARATOR = " "
 
-    # @since 0.1.0
-    # @api private
     attr_reader :inflections
+
+    # @since 0.1.3
+    # @api private
+    def internal_camelize(input, upper)
+      input = input.to_s.dup
+      input.sub!(/^[a-z\d]*/) { |match| inflections.acronyms.apply_to(match, upper) }
+      input.gsub!(%r{(?:_|(/))([a-z\d]*)}i) do
+        m1 = Regexp.last_match(1)
+        m2 = Regexp.last_match(2)
+        "#{m1}#{inflections.acronyms.apply_to(m2)}"
+      end
+      input.gsub!("/", "::")
+      input
+    end
+
   end
 end

data/lib/dry/inflector/inflections/defaults.rb

@@ -57,8 +57,8 @@ module Dry
           inflect.singular(/s\z/i, "")
           inflect.singular(/(n)ews\z/i, '\1ews')
           inflect.singular(/([ti])a\z/i, '\1um')
-          inflect.singular(/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses\z/i, '\1\2sis')
-          inflect.singular(/(^analy)ses\z/i, '\1sis')
+          inflect.singular(/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)(sis|ses)\z/i, '\1\2sis')
+          inflect.singular(/(^analy)(sis|ses)\z/i, '\1sis')
           inflect.singular(/([^f])ves\z/i, '\1fe')
           inflect.singular(/(hive)s\z/i, '\1')
           inflect.singular(/(tive)s\z/i, '\1')
@@ -69,12 +69,12 @@ module Dry
           inflect.singular(/(ss)\z/i, '\1')
           inflect.singular(/(x|ch|ss|sh)es\z/i, '\1')
           inflect.singular(/([m|l])ice\z/i, '\1ouse')
-          inflect.singular(/(bus)es\z/i, '\1')
+          inflect.singular(/(bus)(es)?\z/i, '\1')
           inflect.singular(/(o)es\z/i, '\1')
           inflect.singular(/(shoe)s\z/i, '\1')
-          inflect.singular(/(cris|ax|test)es\z/i, '\1is')
-          inflect.singular(/(octop|vir)i\z/i, '\1us')
-          inflect.singular(/(alias|status)es\z/i, '\1')
+          inflect.singular(/(cris|ax|test)(is|es)\z/i, '\1is')
+          inflect.singular(/(octop|vir)(us|i)\z/i, '\1us')
+          inflect.singular(/(alias|status)(es)?\z/i, '\1')
           inflect.singular(/^(ox)en/i, '\1')
           inflect.singular(/(vert|ind)ices\z/i, '\1ex')
           inflect.singular(/(matr)ices\z/i, '\1ix')

data/lib/dry/inflector/version.rb

@@ -3,6 +3,6 @@
 module Dry
   class Inflector
     # @since 0.1.0
-    VERSION = "0.1.2"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dry-inflector
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Luca Guidi
@@ -10,22 +10,22 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-25 00:00:00.000000000 Z
+date: 2019-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -81,17 +81,21 @@ files:
 - LICENSE.md
 - README.md
 - dry-inflector.gemspec
+- lib/dry-inflector.rb
 - lib/dry/inflector.rb
 - lib/dry/inflector/acronyms.rb
 - lib/dry/inflector/inflections.rb
 - lib/dry/inflector/inflections/defaults.rb
 - lib/dry/inflector/rules.rb
 - lib/dry/inflector/version.rb
-homepage: http://dry-rb.org
+homepage: https://dry-rb.org
 licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
+  changelog_uri: https://github.com/dry-rb/dry-inflector/blob/master/CHANGELOG.md
+  source_code_uri: https://github.com/dry-rb/dry-inflector
+  bug_tracker_uri: https://github.com/dry-rb/dry-inflector/issues
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -100,15 +104,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: DRY Inflector