regexp-examples 1.4.4 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c1b039b345ad1978b9d96b4d87d2e709326f9a45
-  data.tar.gz: fc3578734d1c91a01030d864ab240252600df089
+SHA256:
+  metadata.gz: 905cc28db8e824ca4bdfed6a6b3e304af0fa76de572a7fd673c4e64074f758a0
+  data.tar.gz: 42bcbba65b38998244b26d7a1a5c20f8212094ab204860381442d56d56760989
 SHA512:
-  metadata.gz: 1eb398e9341eb8fc06a97a1b3a27c8b0d5efafd6b049f76f454efb13516fa29b1047f51b0646e14ff2888ee16fbed738dac53d1042bd8ccb180064e5c3ce702d
-  data.tar.gz: cc01ceb7567b6e77f37a369dc99e429ccd3389a72393711554a959dcc6cc6d72292ffb7e0906768898b593d1dceac9a0a0f557552ca34dc9c259cb679fe7b1ca
+  metadata.gz: fa88b19665fbf46251d7226369d1b27b35e19a61deb354df5d3fef3cab0a09a86c3214767f52410a39a384953c8e488ae1c51d67fe382351d76b2eaae0f09bdb
+  data.tar.gz: 34572d245792daa0cbe168e110592ba76174c6b986099db2a7f1591c2d9b0bb095f8869bf4b9cdfe1afab19648a0cd2354eff322e6b45179b2bdd21bea56dd9d

data/.gitignore

@@ -14,3 +14,5 @@
 mkmf.log
 tags
 /coverage/
+
+/spec/examples.txt

data/.rspec

@@ -1,2 +1,2 @@
 --color
---require spec_helper
+--require gem_helper

data/.ruby-version

@@ -0,0 +1 @@
+2.6.3

data/.travis.yml

@@ -1,12 +1,9 @@
 language: ruby
 rvm:
-  - 2.0.0
-  - 2.1.10
-  - 2.2.10
-  - 2.3.8
   - 2.4.5
-  - 2.5.3
-  - 2.6.0
+  - 2.5.5
+  - 2.6.2 # Uses unicode 12.0.0
+  - 2.6.3 # Uses unicode 12.1.0
   - ruby-head
 matrix:
   allow_failures:

data/README.md

@@ -52,21 +52,18 @@ Obviously, you will get different (random) results if you try these yourself!
 ```
 
 ## Supported ruby versions
-* MRI 2.0.x
-* MRI 2.1.x
-* MRI 2.2.x
-* MRI 2.3.x
-* MRI 2.4.x
-* MRI 2.5.x
-* MRI 2.6.x
-
-MRI ≤ 1.9.3 are not supported. This is primarily because MRI 2.0.0 introduced a new
-regexp engine (`Oniguruma` was replaced by `Onigmo`). Whilst *most* of this gem could
-be made to work with MRI 1.9.x (or even 1.8.x), I feel the changes are too significant
-to implement backwards compatability (especially since [long-term support for MRI
-1.9.3 has now ended](https://www.ruby-lang.org/en/news/2014/01/10/ruby-1-9-3-will-end-on-2015/)).
-
-For example, named properties (e.g. `/\p{Alpha}/`) are illegal syntax on MRI 1.9.3.
+MRI 2.4.0 (oldest non-[EOL](https://www.ruby-lang.org/en/news/2019/03/31/support-of-ruby-2-3-has-ended/) version) --> 2.6.3 (latest stable version)
+
+MRI 2.0.0 --> 2.3.x were supported until version `1.5.0` of this library. Support was dropped primarily
+because of the need to use `RbConfig::CONFIG['UNICODE_VERSION']`, which was added to ruby version `2.4.0`.
+
+MRI versions ≤ 1.9.3 were never supported by this library. This is primarily because MRI 2.0.0 introduced a new
+regexp engine (`Oniguruma` was replaced by `Onigmo` -- For example, named properties like `/\p{Alpha}/`
+are illegal syntax on MRI 1.9.3.). Whilst *most* of this gem could be made to work with MRI 1.9.x
+(or even 1.8.x), I considered the changes too significant to implement backwards compatability
+(especially since [long-term support for MRI 1.9.3 has long
+ended](https://www.ruby-lang.org/en/news/2014/01/10/ruby-1-9-3-will-end-on-2015/)).
+
 
 Other implementations, such as JRuby, could probably work fine -
 but I haven't fully tried/tested it. Pull requests are welcome.

data/lib/core_extensions/regexp/examples.rb

@@ -29,5 +29,4 @@ module CoreExtensions
   end
 end
 
-# Regexp#include is private for ruby 2.0 and below
-Regexp.send(:include, CoreExtensions::Regexp::Examples)
+Regexp.include(CoreExtensions::Regexp::Examples)

data/lib/regexp-examples/backreferences.rb

@@ -3,7 +3,7 @@ module RegexpExamples
   # In a nutshell, this works by doing the following:
   # * Given a regex that contains a capute group and backreference, e.g. `/(a|b) \1/`
   # * After generating examples, the backreference is tored as a placeholder:
-  #   `["a __1__", "b __1__"]`
+  #   `["a __BACKREF-PLACEHOLDER-1__", "b __BACKREF-PLACEHOLDER-1__"]`
   # * This class is used to fill in each placeholder accordingly:
   #   `["a a", "b b"]`
   # * Also, beware of octal groups and cases where the backref invalidates the example!!
@@ -15,7 +15,7 @@ module RegexpExamples
 
     def substitute_backreferences(full_examples)
       full_examples.map do |full_example|
-        # For instance, one "full example" from /(a|(b)) \2/: "a __2__"
+        # For instance, one "full example" from /(a|(b)) \2/: "a __BACKREF-PLACEHOLDER-2__"
         # should be rejected because the backref (\2) does not exist
         catch(:backref_not_found) do
           substitute_backrefs_one_at_a_time(full_example)

data/lib/regexp-examples/chargroup_parser.rb

@@ -1,4 +1,6 @@
 require_relative 'parser_helpers/charset_negation_helper'
+require_relative 'parser_helpers/parse_group_helper'
+require_relative 'parser_helpers/parse_after_backslash_group_helper'
 
 module RegexpExamples
   # A "sub-parser", for char groups in a regular expression
@@ -13,6 +15,8 @@ module RegexpExamples
   # [[^:alpha:]&&[\n]a-c] - all of the above!!!! (should match "\n")
   class ChargroupParser
     include CharsetNegationHelper
+    include ParseGroupHelper
+    include ParseAfterBackslashGroupHelper
 
     attr_reader :regexp_string, :current_position
     alias length current_position
@@ -37,7 +41,6 @@ module RegexpExamples
           parse_after_ampersand
         else
           @charset.concat parse_checking_backlash
-          @current_position += 1
         end
       end
 
@@ -79,15 +82,23 @@ module RegexpExamples
         @current_position += 1
         parse_after_backslash
       else
-        [next_char]
+        r = [next_char]
+        @current_position += 1
+        r
       end
     end
 
     def parse_after_backslash
       if next_char == 'b'
+        @current_position += 1
         ["\b"]
+      elsif rest_of_string =~ /\Au(\h{4}|\{\h{1,4}\})/
+        @current_position += 1
+        parse_backslash_unicode_sequence(Regexp.last_match(1)).result.map(&:to_s)
       else
-        CharSets::BackslashCharMap.fetch(next_char, [next_char])
+        char = CharSets::BackslashCharMap.fetch(next_char, [next_char])
+        @current_position += 1
+        char
       end
     end
 
@@ -117,13 +128,18 @@ module RegexpExamples
     end
 
     def parse_after_hyphen
-      if regexp_string[@current_position + 1] == ']' # e.g. /[abc-]/ -- not a range!
+      r = if regexp_string[@current_position + 1] == ']' # e.g. /[abc-]/ -- not a range!
+        @current_position += 1
         @charset << '-'
+      elsif rest_of_string =~ /\A-\\u(\h{4}|\{\h{1,4}\})/
+        @current_position += 3
+        char = parse_backslash_unicode_sequence(Regexp.last_match(1)).result.first.to_s
+        @charset.concat((@charset.last..char).to_a)
       else
         @current_position += 1
         @charset.concat((@charset.last..parse_checking_backlash.first).to_a)
       end
-      @current_position += 1
+      r
     end
 
     def rest_of_string

data/lib/regexp-examples/groups.rb

@@ -181,10 +181,10 @@ module RegexpExamples
   # We substitute backreferences with PLACEHOLDERS. These are then, later,
   # replaced by the appropriate value. (See BackReferenceReplacer)
   # The simplest example is /(a) \1/ - So, we temporarily treat the "result"
-  # of /\1/ as being "__1__". It later gets updated.
+  # of /\1/ as being "__BACKREF-PLACEHOLDER-1__". It later gets updated.
   class BackReferenceGroup
     include RandomResultBySample
-    PLACEHOLDER_FORMAT = '__%s__'.freeze
+    PLACEHOLDER_FORMAT = '__BACKREF-PLACEHOLDER-%s__'.freeze
     attr_reader :id
     def initialize(id)
       @id = id

data/lib/regexp-examples/unicode_char_ranges.rb

@@ -11,8 +11,7 @@ module RegexpExamples
     # These values were generated by: scripts/unicode_lister.rb
     # Note: Only the first 128 results are listed, for performance.
     # Also, some groups seem to have no matches (weird!)
-    # (Don't care about ruby micro version number)
-    STORE_FILENAME = "unicode_ranges_#{RUBY_VERSION[0..2]}.pstore".freeze
+    STORE_FILENAME = "unicode_ranges_#{RbConfig::CONFIG['UNICODE_VERSION']}.pstore".freeze
 
     attr_reader :range_store
 
@@ -30,10 +29,12 @@ module RegexpExamples
 
     private
 
+    # The method is written like this to future-proof it a little,
+    # i.e. the gem won't completely break for a new ruby version release
     def unicode_ranges_file
       db_path = File.join(__dir__, '../../db')
       Dir["#{db_path}/*.pstore"].sort.select do |file|
-        file <= "#{db_path}/unicode_ranges_#{RUBY_VERSION[0..2]}.pstore"
+        file <= "#{db_path}/#{STORE_FILENAME}"
       end.last
     end
 

data/lib/regexp-examples/version.rb

@@ -1,4 +1,4 @@
 # Gem version
 module RegexpExamples
-  VERSION = '1.4.4'.freeze
+  VERSION = '1.5.0'.freeze
 end

data/regexp-examples.gemspec

@@ -13,10 +13,10 @@ Gem::Specification.new do |s|
   s.executables      = s.files.grep(/^bin\//) { |f| File.basename(f) }
   s.test_files       = s.files.grep(/^(test|spec|features)\//)
   s.require_paths    = ['lib']
-  s.homepage         =
-    'http://rubygems.org/gems/regexp-examples'
-  s.add_development_dependency 'bundler', '~> 1.7'
-  s.add_development_dependency 'rake', '~> 10.0'
+  s.homepage         = 'http://rubygems.org/gems/regexp-examples'
+  s.add_development_dependency 'bundler', '> 1.7'
+  s.add_development_dependency 'rake', '~> 12.0'
+  s.add_development_dependency 'pry', '~> 0.12.0'
   s.license          = 'MIT'
-  s.required_ruby_version = '>= 2.0.0'
+  s.required_ruby_version = '>= 2.4.0'
 end

data/spec/gem_helper.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+require 'coveralls'
+Coveralls.wear!
+
+require './lib/regexp-examples.rb'
+require 'helpers'
+require 'pry'
+
+# Several of these tests (intentionally) use "weird" regex patterns,
+# that spam annoying warnings when running.
+# E.g. warning: invalid back reference: /\k/
+# and  warning: character class has ']' without escape: /[]]/
+# This config disables those warnings.
+$VERBOSE = nil
+
+RSpec.configure do |config|
+  config.include Helpers
+end

data/spec/regexp-examples_spec.rb

@@ -72,6 +72,7 @@ RSpec.describe Regexp, '#examples' do
         /[abc]/,
         /[a-c]/,
         /[abc-e]/,
+        /[\u4e00-\u9fa5]/,
         /[^a-zA-Z]/,
         /[\w]/,
         /[]]/,

data/spec/spec_helper.rb

@@ -1,28 +1,30 @@
-require 'coveralls'
-Coveralls.wear!
-
-require './lib/regexp-examples.rb'
-require 'helpers'
-require 'pry'
-
-# Several of these tests (intentionally) use "weird" regex patterns,
-# that spam annoying warnings when running.
-# E.g. warning: invalid back reference: /\k/
-# and  warning: character class has ']' without escape: /[]]/
-# This config disables those warnings.
-$VERBOSE = nil
-
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# The generated `.rspec` file contains `--require spec_helper` which will cause
+# this file to always be loaded, without a need to explicitly require it in any
+# files.
+#
+# Given that it is always loaded, you are encouraged to keep this file as
+# light-weight as possible. Requiring heavyweight dependencies from this file
+# will add to the boot time of your test suite on EVERY test run, even for an
+# individual file that may not need all of that loaded. Instead, consider making
+# a separate helper file that requires the additional dependencies and performs
+# the additional setup, and require it from the spec files that actually need
+# it.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
-  config.include Helpers
-
+  # rspec-expectations config goes here. You can use an alternate
+  # assertion/expectation library such as wrong or the stdlib/minitest
+  # assertions if you prefer.
   config.expect_with :rspec do |expectations|
     # This option will default to `true` in RSpec 4. It makes the `description`
     # and `failure_message` of custom matchers include text for helper methods
     # defined using `chain`, e.g.:
-    # be_bigger_than(2).and_smaller_than(4).description
-    #   # => "be bigger than 2 and smaller than 4"
+    #     be_bigger_than(2).and_smaller_than(4).description
+    #     # => "be bigger than 2 and smaller than 4"
     # ...rather than:
-    #   # => "be bigger than 2"
+    #     # => "be bigger than 2"
     expectations.include_chain_clauses_in_custom_matcher_descriptions = true
   end
 
@@ -35,10 +37,60 @@ RSpec.configure do |config|
     mocks.verify_partial_doubles = true
   end
 
+  # This option will default to `:apply_to_host_groups` in RSpec 4 (and will
+  # have no way to turn it off -- the option exists only for backwards
+  # compatibility in RSpec 3). It causes shared context metadata to be
+  # inherited by the metadata hash of host groups and examples, rather than
+  # triggering implicit auto-inclusion in groups with matching metadata.
+  config.shared_context_metadata_behavior = :apply_to_host_groups
+
+  # This allows you to limit a spec run to individual examples or groups
+  # you care about by tagging them with `:focus` metadata. When nothing
+  # is tagged with `:focus`, all examples get run. RSpec also provides
+  # aliases for `it`, `describe`, and `context` that include `:focus`
+  # metadata: `fit`, `fdescribe` and `fcontext`, respectively.
+  config.filter_run_when_matching :focus
+
+  # Allows RSpec to persist some state between runs in order to support
+  # the `--only-failures` and `--next-failure` CLI options. We recommend
+  # you configure your source control system to ignore this file.
+  config.example_status_persistence_file_path = "spec/examples.txt"
+
+  # Limits the available syntax to the non-monkey patched syntax that is
+  # recommended. For more details, see:
+  #   - http://rspec.info/blog/2012/06/rspecs-new-expectation-syntax/
+  #   - http://www.teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+  #   - http://rspec.info/blog/2014/05/notable-changes-in-rspec-3/#zero-monkey-patching-mode
   config.disable_monkey_patching!
 
+  # This setting enables warnings. It's recommended, but in some cases may
+  # be too noisy due to issues in dependencies.
+  config.warnings = true
+
+  # Many RSpec users commonly either run the entire suite or an individual
+  # file, and it's useful to allow more verbose output when running an
+  # individual spec file.
+  if config.files_to_run.one?
+    # Use the documentation formatter for detailed output,
+    # unless a formatter has already been configured
+    # (e.g. via a command-line flag).
+    config.default_formatter = "doc"
+  end
+
   # Print the 10 slowest examples and example groups at the
   # end of the spec run, to help surface which specs are running
   # particularly slow.
-  # config.profile_examples = 10
+  config.profile_examples = 10
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = :random
+
+  # Seed global randomization in this process using the `--seed` CLI option.
+  # Setting this allows you to use `--seed` to deterministically reproduce
+  # test failures related to randomization by passing the same `--seed` value
+  # as the one that triggered the failure.
+  Kernel.srand config.seed
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: regexp-examples
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 1.5.0
 platform: ruby
 authors:
 - Tom Lord
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-27 00:00:00.000000000 Z
+date: 2019-07-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.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
@@ -30,14 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 0.12.0
 description: Regexp#examples returns a list of "all" strings that are matched by the
   regex. Regexp#random_example returns one, random string that matches.
 email: lord.thom@gmail.com
@@ -48,17 +62,17 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".ruby-version"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- db/unicode_ranges_2.0.pstore
-- db/unicode_ranges_2.2.pstore
-- db/unicode_ranges_2.3.pstore
-- db/unicode_ranges_2.4.pstore
-- db/unicode_ranges_2.5.pstore
-- db/unicode_ranges_2.6.pstore
+- db/unicode_ranges_10.0.0.pstore
+- db/unicode_ranges_11.0.0.pstore
+- db/unicode_ranges_12.0.0.pstore
+- db/unicode_ranges_12.1.0.pstore
+- db/unicode_ranges_9.0.0.pstore
 - lib/core_extensions/regexp/examples.rb
 - lib/regexp-examples.rb
 - lib/regexp-examples/backreferences.rb
@@ -80,6 +94,7 @@ files:
 - regexp-examples.gemspec
 - scripts/unicode_lister.rb
 - spec/config_spec.rb
+- spec/gem_helper.rb
 - spec/helpers.rb
 - spec/regexp-examples_spec.rb
 - spec/regexp-examples_spec_2.4.1.rb
@@ -97,20 +112,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Extends the Regexp class with '#examples' and '#random_example'
 test_files:
 - spec/config_spec.rb
+- spec/gem_helper.rb
 - spec/helpers.rb
 - spec/regexp-examples_spec.rb
 - spec/regexp-examples_spec_2.4.1.rb