regexp-examples 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e76c8504f718a77052f24bdd8785042ded1b584
-  data.tar.gz: 5f63fd56430a4f8f0f10fd9ffc4f82d7b1301b2e
+  metadata.gz: 460970b9b7691fe163a9334542ccd57c71241c2a
+  data.tar.gz: 0c4ce5df7f59e72af6de41b8538d72b52c40939d
 SHA512:
-  metadata.gz: ead89c6fead001d78b5336a69fa044af6fce905664c48a1430594b811b3729d4ea341e369ef190a43159672c4ca16a75a3c92c9a068c3638774b6030d318932a
-  data.tar.gz: d9edc5da0d9f2d3a6b856f00b202e5c119a1733f130cdf40b27e70875771f3f08707a9f0523b607b9882220b39e486a844e2013d774660c17c3b0f51743db02a
+  metadata.gz: 5932e6ea64e3008dad054d67f906863244366324e28cf1d280a222966b77dc1bc816760d6af1d9f023518b40ccfbdd8ad9c634060d2811ca5d687e333604e268
+  data.tar.gz: fd2c136a9457aac2e953fe77c972925a6af9f420f025ca9f7500a8252636ebf1ba2b1104232d17719de5b1c53cf8e1a4316c52e789bed113b6589b8cf71c7dda

data/.travis.yml

@@ -2,4 +2,8 @@ language: ruby
 rvm:
   - 2.0.0-p598
   - 2.1.5
-  - ruby-head
+  - 2.2.0
+    # One (ruby 2.3-dev) test fails, due to a change of behaviour in Array#delete_if,
+    # but I don't know if this is intentional. I'll fix it once the behaviour change is documented.
+    # For now, I don't really care if 2.3-dev tests all pass.
+    #  - ruby-head

data/README.md

@@ -45,9 +45,9 @@ For more detail on this, see [configuration options](#configuration-options).
 
 ## Bugs and Not-Yet-Supported syntax
 
-* Options, e.g. `/pattern/i`, `/foo.*bar/m` - Using options will currently just be ignored, for example:
-  * `/test/i.examples` will NOT include `"TEST"`
+* Other options (besides ingnorecase), will currently just be ignored, for example:
   * `/white  space/x.examples` will not strip out the whitespace from the pattern, i.e. this incorrectly returns `["white  space"]` rather than `["whitespace"]`
+  * `/./m.examples(max_group_results: 999)` will not include `"\n"`
 
 * Nested character classes, and the use of set intersection ([See here](http://www.ruby-doc.org/core-2.2.0/Regexp.html#class-Regexp-label-Character+Classes) for the official documentation on this.) For example:
   * `/[[abc]]/.examples`  (which _should_ return `["a", "b", "c"]`)

data/lib/regexp-examples/core_extensions/regexp/examples.rb

@@ -1,9 +1,9 @@
 module CoreExtensions
   module Regexp
     module Examples
-      def examples(options={})
+      def examples(config_options={})
         full_examples = RegexpExamples.map_results(
-          RegexpExamples::Parser.new(source, options).parse
+          RegexpExamples::Parser.new(source, options, config_options).parse
         )
         RegexpExamples::BackReferenceReplacer.new.substitute_backreferences(full_examples)
       end

data/lib/regexp-examples/groups.rb

@@ -16,11 +16,32 @@ module RegexpExamples
     def all_subgroups
       [self, subgroups].flatten.reject { |subgroup| subgroup.group_id.nil? }
     end
+
+    def swapcase
+      # Override to preserve subgroups
+      GroupResult.new(super.to_s, group_id, subgroups)
+    end
+  end
+
+  module GroupWithOptions
+    attr_reader :options
+    def result
+      group_result = super
+      if options[:ignorecase]
+        group_result
+          .concat( group_result.map(&:swapcase) )
+          .uniq
+      else
+        group_result
+      end
+    end
   end
 
   class SingleCharGroup
-    def initialize(char)
+    prepend GroupWithOptions
+    def initialize(char, options)
       @char = char
+      @options = options
     end
     def result
       [GroupResult.new(@char)]
@@ -28,8 +49,10 @@ module RegexpExamples
   end
 
   class CharGroup
-    def initialize(chars)
+    prepend GroupWithOptions
+    def initialize(chars, options)
       @chars = chars
+      @options = options
       if chars[0] == "^"
         @negative = true
         @chars = @chars[1..-1]
@@ -43,6 +66,7 @@ module RegexpExamples
 
     def init_ranges
       # save first and last "-" if present
+
       first = nil
       last = nil
       first = @chars.shift if @chars.first == "-"
@@ -95,6 +119,11 @@ module RegexpExamples
   end
 
   class DotGroup
+    prepend GroupWithOptions
+    def initialize(options={})
+      @options = options
+    end
+
     def result
       CharSets::Any.map do |result|
         GroupResult.new(result)
@@ -103,10 +132,12 @@ module RegexpExamples
   end
 
   class MultiGroup
+    prepend GroupWithOptions
     attr_reader :group_id
-    def initialize(groups, group_id)
+    def initialize(groups, group_id, options)
       @groups = groups
       @group_id = group_id
+      @options = options
     end
 
     # Generates the result of each contained group

data/lib/regexp-examples/parser.rb

@@ -1,13 +1,14 @@
 module RegexpExamples
   class Parser
     attr_reader :regexp_string
-    def initialize(regexp_string, options={})
+    def initialize(regexp_string, regexp_options, config_options={})
       @regexp_string = regexp_string
+      @ignorecase = ( regexp_options & Regexp::IGNORECASE == 1 )
       @num_groups = 0
       @current_position = 0
       RegexpExamples::ResultCountLimiters.configure!(
-        options[:max_repeater_variance],
-        options[:max_group_results]
+        config_options[:max_repeater_variance],
+        config_options[:max_group_results]
       )
     end
 
@@ -27,6 +28,10 @@ module RegexpExamples
 
     private
 
+    def regexp_options
+      {ignorecase: @ignorecase}
+    end
+
     def parse_group(repeaters)
       case next_char
       when '('
@@ -72,7 +77,8 @@ module RegexpExamples
         group = CharGroup.new(
           # Note: The `.dup` is important, as it prevents modifying the constant, in
           # CharGroup#init_ranges (where the '-' is moved to the front)
-          BackslashCharMap[next_char].dup
+          BackslashCharMap[next_char].dup,
+          regexp_options
         )
       when rest_of_string =~ /\A(c|C-)(.)/ # Control character
         @current_position += $1.length
@@ -147,7 +153,7 @@ module RegexpExamples
         end
       end
       groups = parse
-      MultiGroup.new(groups, group_id)
+      MultiGroup.new(groups, group_id, regexp_options)
     end
 
     def parse_multi_end_group
@@ -175,11 +181,11 @@ module RegexpExamples
         chars << next_char
         @current_position += 1
       end
-      CharGroup.new(chars)
+      CharGroup.new(chars, regexp_options)
     end
 
     def parse_dot_group
-      DotGroup.new
+      DotGroup.new(regexp_options)
     end
 
     def parse_or_group(left_repeaters)
@@ -190,7 +196,7 @@ module RegexpExamples
 
 
     def parse_single_char_group(char)
-      SingleCharGroup.new(char)
+      SingleCharGroup.new(char, regexp_options)
     end
 
     def parse_backreference_group(match)

data/lib/regexp-examples/version.rb

@@ -1,3 +1,3 @@
 module RegexpExamples
-  VERSION = '0.4.2'
+  VERSION = '0.5.0'
 end

data/spec/regexp-examples_spec.rb

@@ -242,6 +242,7 @@ RSpec.describe Regexp, "#examples" do
         # a{1}? should be equivalent to (?:a{1})?, i.e. NOT a "non-greedy quantifier"
         it { expect(/a{1}?/.examples).to eq ["", "a"] }
       end
+
       context "max_repeater_variance option" do
         it do
           expect(/a+/.examples(max_repeater_variance: 5))
@@ -252,12 +253,19 @@ RSpec.describe Regexp, "#examples" do
             .to eq %w(aaaa)
         end
       end
+
       context "max_group_results option" do
         it do
           expect(/\d/.examples(max_group_results: 10))
             .to eq %w(0 1 2 3 4 5 6 7 8 9)
         end
       end
+
+      context "case insensitive" do
+        it { expect(/ab/i.examples).to eq %w(ab aB Ab AB) }
+        it { expect(/a+/i.examples).to eq %w(a A aa aA Aa AA aaa aaA aAa aAA Aaa AaA AAa AAA) }
+        it { expect(/([ab])\1/i.examples).to eq %w(aa bb AA BB) }
+      end
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: regexp-examples
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Tom Lord
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-03 00:00:00.000000000 Z
+date: 2015-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler