fast_underscore 0.3.1 → 0.3.2

data/fast_underscore.gemspec

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'fast_underscore/version'
 
@@ -24,9 +24,10 @@ Gem::Specification.new do |spec|
   spec.extensions    = ['ext/fast_underscore/extconf.rb']
 
   spec.add_development_dependency 'benchmark-ips', '~> 2'
-  spec.add_development_dependency 'bundler', '~> 1'
+  spec.add_development_dependency 'bundler', '~> 2'
   spec.add_development_dependency 'minitest', '~> 5'
-  spec.add_development_dependency 'rake', '~> 12'
+  spec.add_development_dependency 'rake', '~> 13'
   spec.add_development_dependency 'rake-compiler', '~> 1'
-  spec.add_development_dependency 'rubocop', '~> 0.52'
+  spec.add_development_dependency 'rubocop', '~> 1.12'
+  spec.add_development_dependency 'steep'
 end

data/gemfiles/5.1.gemfile

@@ -4,4 +4,4 @@ source 'https://rubygems.org'
 
 gemspec path: '..'
 
-gem 'activesupport', '~> 5.1'
+gem 'activesupport', '~> 5.1.7'

data/gemfiles/5.2.gemfile

@@ -4,4 +4,4 @@ source 'https://rubygems.org'
 
 gemspec path: '..'
 
-gem 'activesupport', '~> 5.2'
+gem 'activesupport', '~> 5.2.5'

data/gemfiles/6.0.gemfile

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gemspec path: '..'
+
+gem 'activesupport', '~> 6.0.3'

data/gemfiles/6.1.gemfile

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gemspec path: '..'
+
+gem 'activesupport', '~> 6.1.3'

data/lib/fast_underscore.rb

@@ -4,42 +4,85 @@ require 'fast_underscore/version'
 require 'fast_underscore/fast_underscore'
 
 module FastUnderscore
-  # Depending on `ActiveSupport::VERSION`, `::install` determines the manner in
-  # which acronyms are handled, then it redefines the
-  # `ActiveSupport::Inflector::underscore` method to use the `FastUnderscore`
-  # native extension. It leaves the existing `ActiveSupport` monkeypatch on
-  # `String` that allows it to call into the newly redefined `Inflector` method.
-  def self.install
+  # Override ActiveSupport::Inflector::underscore to use
+  # FastUnderscore::underscore for ActiveSupport < 5.2.0.
+  module ActiveSupportInflectorOldPatch
+    def self.pattern
+      return @pattern if defined?(@pattern)
+
+      acronym_regex = ActiveSupport::Inflector.inflections.acronym_regex
+      @pattern = /(?:(?<=([A-Za-z\d]))|\b)(#{acronym_regex})(?=\b|[^a-z])/
+    end
+
+    def underscore(string)
+      return string unless /[A-Z-]|::/.match?(string)
+
+      response = string.dup
+      response.gsub!(ActiveSupportInflectorOldPatch.pattern) do
+        "#{$1 && '_'}#{$2.downcase}"
+      end
+
+      FastUnderscore.underscore(response)
+    end
+  end
+
+  # Override ActiveSupport::Inflector::underscore to use
+  # FastUnderscore::underscore for ActiveSupport >= 5.2.0.
+  module ActiveSupportInflectorPatch
+    def underscore(string)
+      return string unless /[A-Z-]|::/.match?(string)
+
+      response = string.dup
+      acronyms = ActiveSupport::Inflector.inflections.acronyms_underscore_regex
+
+      response.gsub!(acronyms) { "#{$1 && '_'}#{$2.downcase}" }
+
+      FastUnderscore.underscore(response)
+    end
+  end
+
+  # Hooks into ActiveSupport::Inflector and waits for the #underscore method to
+  # be defined. When it is, it automatically redefines it.
+  module ActiveSupportedDelayedPatch
+    def method_added(method)
+      FastUnderscore.active_support if method == :underscore
+      super
+    end
+  end
+
+  # Override the String#underscore method no matter when it was defined so that
+  # we're sure it's going to call the correct implementation.
+  module ActiveSupportStringPatch
+    def underscore
+      ActiveSupport::Inflector.underscore(self)
+    end
+  end
+
+  # Depending on ActiveSupport::VERSION, ::active_support determines the manner
+  # in which acronyms are handled, then it redefines the
+  # ActiveSupport::Inflector::underscore method to use the FastUnderscore
+  # native extension.
+  def self.active_support
     require 'active_support/version'
     gem_version = Gem::Version.new(ActiveSupport::VERSION::STRING)
 
     if gem_version >= Gem::Version.new('5.2.0')
-      require 'fast_underscore/acronym_underscore_regex'
+      ActiveSupport::Inflector.prepend(ActiveSupportInflectorPatch)
     else
-      require 'fast_underscore/acronym_regex'
+      ActiveSupport::Inflector.prepend(ActiveSupportInflectorOldPatch)
     end
+
+    ActiveSupport::Inflector.alias_method(:as_underscore, :underscore)
+    String.prepend(ActiveSupportStringPatch)
   end
 end
 
 if defined?(ActiveSupport)
-  FastUnderscore.install
+  FastUnderscore.active_support
 else
   module ActiveSupport
     module Inflector
-      class << self
-        prepend(
-          Module.new do
-            # Hooks into ActiveSupport::Inflector and waits for the #underscore
-            # method to be defined. When it is, it automatically redefines it.
-            # Using this `prepend` trick to attempt to be a good citizen in the
-            # case that someone else has already hooked into `method_added` on
-            # `Inflector`.
-            def method_added(method)
-              method == :underscore ? FastUnderscore.install : super
-            end
-          end
-        )
-      end
+      prepend(FastUnderscore::ActiveSupportedDelayedPatch)
     end
   end
 end

data/lib/fast_underscore/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FastUnderscore
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

data/sig/fast_underscore.rbs

@@ -0,0 +1,10 @@
+module FastUnderscore
+  VERSION: String
+
+  def self.active_support: () -> void
+  def self.underscore: (String string) -> String
+end
+
+class String
+  def underscore: () -> String
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fast_underscore
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Kevin Deisz
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-04-18 00:00:00.000000000 Z
+date: 2021-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12'
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12'
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.52'
+        version: '1.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.52'
+        version: '1.12'
+- !ruby/object:Gem::Dependency
+  name: steep
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Provides a C-optimized method for underscoring a string
 email:
 - kevin.deisz@gmail.com
@@ -102,18 +116,20 @@ extensions:
 - ext/fast_underscore/extconf.rb
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
+- ".github/workflows/main.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
+- CHANGELOG.md
+- CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
-- LICENSE.txt
+- LICENSE
 - README.md
 - Rakefile
-- bin/benchmark
+- Steepfile
+- bin/bench
 - bin/console
-- bin/rake
-- bin/rubocop
 - bin/setup
 - ext/fast_underscore/extconf.rb
 - ext/fast_underscore/fast_underscore.c
@@ -121,15 +137,16 @@ files:
 - fast_underscore.gemspec
 - gemfiles/5.1.gemfile
 - gemfiles/5.2.gemfile
+- gemfiles/6.0.gemfile
+- gemfiles/6.1.gemfile
 - lib/fast_underscore.rb
-- lib/fast_underscore/acronym_regex.rb
-- lib/fast_underscore/acronym_underscore_regex.rb
 - lib/fast_underscore/version.rb
+- sig/fast_underscore.rbs
 homepage: https://github.com/kddeisz/fast_underscore
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -144,9 +161,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Fast String#underscore implementation
 test_files: []

data/.travis.yml

@@ -1,9 +0,0 @@
-language: ruby
-rvm: 2.5.1
-branches:
-  only: master
-cache: bundler
-script: bin/rubocop && bin/rake
-gemfile:
-- gemfiles/5.1.gemfile
-- gemfiles/5.2.gemfile

data/bin/rake

@@ -1,29 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-#
-# This file was generated by Bundler.
-#
-# The application 'rake' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-bundle_binstub = File.expand_path("../bundle", __FILE__)
-
-if File.file?(bundle_binstub)
-  if File.read(bundle_binstub, 150) =~ /This file was generated by Bundler/
-    load(bundle_binstub)
-  else
-    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
-Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
-  end
-end
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("rake", "rake")

data/bin/rubocop

@@ -1,29 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-#
-# This file was generated by Bundler.
-#
-# The application 'rubocop' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-bundle_binstub = File.expand_path("../bundle", __FILE__)
-
-if File.file?(bundle_binstub)
-  if File.read(bundle_binstub, 150) =~ /This file was generated by Bundler/
-    load(bundle_binstub)
-  else
-    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
-Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
-  end
-end
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("rubocop", "rubocop")

data/lib/fast_underscore/acronym_regex.rb

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-module FastUnderscore
-  # Uses ActiveSupport's `acronym_regex` method to construct a memoized pattern
-  # for replacing acronyms within strings that need to be underscored.
-  module AcronymRegex
-    def self.pattern
-      return @pattern if defined?(@pattern)
-
-      acronym_regex = ActiveSupport::Inflector.inflections.acronym_regex
-      @pattern ||= /(?:(?<=([A-Za-z\d]))|\b)(#{acronym_regex})(?=\b|[^a-z])/
-    end
-
-    def underscore(string)
-      return string unless /[A-Z-]|::/.match?(string)
-
-      response = string.dup
-      response.gsub!(AcronymRegex.pattern) { "#{$1 && '_'}#{$2.downcase}" }
-
-      FastUnderscore.underscore(response)
-    end
-  end
-
-  class << ActiveSupport::Inflector
-    alias as_underscore underscore
-    include AcronymRegex
-  end
-end

data/lib/fast_underscore/acronym_underscore_regex.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-module FastUnderscore
-  # Uses ActiveSupport's `acronym_underscore_regex` method for replacing
-  # acronyms within strings that need to be underscored.
-  module AcronymUnderscoreRegex
-    def underscore(string)
-      return string unless /[A-Z-]|::/.match?(string)
-
-      response = string.dup
-      acronyms = ActiveSupport::Inflector.inflections.acronyms_underscore_regex
-
-      response.gsub!(acronyms) { "#{$1 && '_'}#{$2.downcase}" }
-
-      FastUnderscore.underscore(response)
-    end
-  end
-
-  class << ActiveSupport::Inflector
-    alias as_underscore underscore
-    include AcronymUnderscoreRegex
-  end
-end