regexp_parser 1.5.0 → 1.5.1

data/spec/syntax/syntax_spec.rb

@@ -41,4 +41,8 @@ RSpec.describe(Regexp::Syntax) do
 
     expect(Regexp::Syntax.version_class('ruby/2.3')).to eq Regexp::Syntax::V2_3
   end
+
+  specify('raises for unknown constant lookups') do
+    expect { Regexp::Syntax::V1 }.to raise_error(/V1/)
+  end
 end

data/spec/syntax/versions/1.8.6_spec.rb

@@ -1,38 +1,17 @@
 require 'spec_helper'
 
 RSpec.describe(Regexp::Syntax::V1_8_6) do
-  let(:syntax) { Regexp::Syntax.new('ruby/1.8.6') }
-
-  tests = {
-    implements: {
-      assertion: T::Assertion::Lookahead,
-      backref: [:number],
-      escape: T::Escape::Basic + T::Escape::ASCII + T::Escape::Meta + T::Escape::Control,
-      group: T::Group::V1_8_6,
-      quantifier: T::Quantifier::Greedy + T::Quantifier::Reluctant + T::Quantifier::Interval + T::Quantifier::IntervalReluctant
-    },
-    excludes: {
-      assertion: T::Assertion::Lookbehind,
-      backref: T::Backreference::All - [:number] + T::SubexpressionCall::All,
-      quantifier: T::Quantifier::Possessive
-    }
+  include_examples 'syntax', Regexp::Syntax.new('ruby/1.8.6'),
+  implements: {
+    assertion: T::Assertion::Lookahead,
+    backref: [:number],
+    escape: T::Escape::Basic + T::Escape::ASCII + T::Escape::Meta + T::Escape::Control,
+    group: T::Group::V1_8_6,
+    quantifier: T::Quantifier::Greedy + T::Quantifier::Reluctant + T::Quantifier::Interval + T::Quantifier::IntervalReluctant
+  },
+  excludes: {
+    assertion: T::Assertion::Lookbehind,
+    backref: T::Backreference::All - [:number] + T::SubexpressionCall::All,
+    quantifier: T::Quantifier::Possessive
   }
-
-  tests.each do |method, types|
-    expected = method != :excludes
-
-    types.each do |type, tokens|
-      if tokens.nil? || tokens.empty?
-        specify("syntax_V1_8_#{method}_#{type}") do
-          expect(syntax.implements?(type, nil)).to eq expected
-        end
-      else
-        tokens.each do |token|
-          specify("syntax_V1_8_#{method}_#{type}_#{token}") do
-            expect(syntax.implements?(type, token)).to eq expected
-          end
-        end
-      end
-    end
-  end
 end

data/spec/syntax/versions/1.9.1_spec.rb

@@ -1,23 +1,10 @@
 require 'spec_helper'
 
 RSpec.describe(Regexp::Syntax::V1_9_1) do
-  let(:syntax) { Regexp::Syntax.new('ruby/1.9.1') }
-
-  tests = {
-    implements: {
-      escape: T::Escape::Hex + T::Escape::Octal + T::Escape::Unicode,
-      type: T::CharacterType::Hex,
-      quantifier: T::Quantifier::Greedy + T::Quantifier::Reluctant + T::Quantifier::Possessive
-    }
+  include_examples 'syntax', Regexp::Syntax.new('ruby/1.9.1'),
+  implements: {
+    escape: T::Escape::Hex + T::Escape::Octal + T::Escape::Unicode,
+    type: T::CharacterType::Hex,
+    quantifier: T::Quantifier::Greedy + T::Quantifier::Reluctant + T::Quantifier::Possessive
   }
-
-  tests.each do |method, types|
-    types.each do |type, tokens|
-      tokens.each do |token|
-        specify("syntax_V1_9_1_#{method}_#{type}_#{token}") do
-          expect(syntax.implements?(type, token)).to be true
-        end
-      end
-    end
-  end
 end

data/spec/syntax/versions/1.9.3_spec.rb

@@ -1,22 +1,9 @@
 require 'spec_helper'
 
 RSpec.describe(Regexp::Syntax::V1_9_3) do
-  let(:syntax) { Regexp::Syntax.new('ruby/1.9.3') }
-
-  tests = {
-    implements: {
-      property: T::UnicodeProperty::Script_V1_9_3 + T::UnicodeProperty::Age_V1_9_3,
-      nonproperty: T::UnicodeProperty::Script_V1_9_3 + T::UnicodeProperty::Age_V1_9_3
-    }
+  include_examples 'syntax', Regexp::Syntax.new('ruby/1.9.3'),
+  implements: {
+    property: T::UnicodeProperty::Script_V1_9_3 + T::UnicodeProperty::Age_V1_9_3,
+    nonproperty: T::UnicodeProperty::Script_V1_9_3 + T::UnicodeProperty::Age_V1_9_3
   }
-
-  tests.each do |method, types|
-    types.each do |type, tokens|
-      tokens.each do |token|
-        specify("syntax_V1_9_3_#{method}_#{type}_#{token}") do
-          expect(syntax.implements?(type, token)).to be true
-        end
-      end
-    end
-  end
 end

data/spec/syntax/versions/2.0.0_spec.rb

@@ -1,28 +1,13 @@
 require 'spec_helper'
 
 RSpec.describe(Regexp::Syntax::V2_0_0) do
-  let(:syntax) { Regexp::Syntax.new('ruby/2.0.0') }
-
-  tests = {
-    implements: {
-      property: T::UnicodeProperty::Age_V2_0_0,
-      nonproperty: T::UnicodeProperty::Age_V2_0_0
-    },
-    excludes: {
-      property: [:newline],
-      nonproperty: [:newline]
-    }
+  include_examples 'syntax', Regexp::Syntax.new('ruby/2.0.0'),
+  implements: {
+    property: T::UnicodeProperty::Age_V2_0_0,
+    nonproperty: T::UnicodeProperty::Age_V2_0_0
+  },
+  excludes: {
+    property: [:newline],
+    nonproperty: [:newline]
   }
-
-  tests.each do |method, types|
-    expected = method != :excludes
-
-    types.each do |type, tokens|
-      tokens.each do |token|
-        specify("syntax_ruby_V2_0_0_#{method}_#{type}_#{token}") do
-          expect(syntax.implements?(type, token)).to eq expected
-        end
-      end
-    end
-  end
 end

data/spec/syntax/versions/2.2.0_spec.rb

@@ -1,22 +1,9 @@
 require 'spec_helper'
 
 RSpec.describe(Regexp::Syntax::V2_2_0) do
-  let(:syntax) { Regexp::Syntax.new('ruby/2.2.0') }
-
-  tests = {
-    implements: {
-      property: T::UnicodeProperty::Script_V2_2_0 + T::UnicodeProperty::Age_V2_2_0,
-      nonproperty: T::UnicodeProperty::Script_V2_2_0 + T::UnicodeProperty::Age_V2_2_0
-    }
+  include_examples 'syntax', Regexp::Syntax.new('ruby/2.2.0'),
+  implements: {
+    property: T::UnicodeProperty::Script_V2_2_0 + T::UnicodeProperty::Age_V2_2_0,
+    nonproperty: T::UnicodeProperty::Script_V2_2_0 + T::UnicodeProperty::Age_V2_2_0
   }
-
-  tests.each do |method, types|
-    types.each do |type, tokens|
-      tokens.each do |token|
-        specify("syntax_V2_2_0_#{method}_#{type}_#{token}") do
-          expect(syntax.implements?(type, token)).to be true
-        end
-      end
-    end
-  end
 end

data/spec/syntax/versions/aliases_spec.rb

@@ -1,115 +1,31 @@
 require 'spec_helper'
 
 RSpec.describe(Regexp::Syntax) do
-  specify('syntax alias 1 8 6') do
-    syntax = Regexp::Syntax.new('ruby/1.8.6')
-
-    expect(syntax).to be_a(Regexp::Syntax::V1_8_6)
-  end
-
-  specify('syntax alias 1 8 alias') do
-    syntax = Regexp::Syntax.new('ruby/1.8')
-
-    expect(syntax).to be_a(Regexp::Syntax::V1_8_6)
-  end
-
-  specify('syntax alias 1 9 1') do
-    syntax = Regexp::Syntax.new('ruby/1.9.1')
-
-    expect(syntax).to be_a(Regexp::Syntax::V1_9_1)
-  end
-
-  specify('syntax alias 1 9 alias') do
-    syntax = Regexp::Syntax.new('ruby/1.9')
-
-    expect(syntax).to be_a(Regexp::Syntax::V1_9_3)
-  end
-
-  specify('syntax alias 2 0 0') do
-    syntax = Regexp::Syntax.new('ruby/2.0.0')
-
-    expect(syntax).to be_a(Regexp::Syntax::V1_9)
-  end
-
-  specify('syntax alias 2 0 alias') do
-    syntax = Regexp::Syntax.new('ruby/2.0')
-
-    expect(syntax).to be_a(Regexp::Syntax::V2_0_0)
-  end
-
-  specify('syntax alias 2 1 alias') do
-    syntax = Regexp::Syntax.new('ruby/2.1')
-
-    expect(syntax).to be_a(Regexp::Syntax::V2_0_0)
-  end
-
-  specify('syntax alias 2 2 0') do
-    syntax = Regexp::Syntax.new('ruby/2.2.0')
-
-    expect(syntax).to be_a(Regexp::Syntax::V2_0_0)
-  end
-
-  specify('syntax alias 2 2 10') do
-    syntax = Regexp::Syntax.new('ruby/2.2.10')
-
-    expect(syntax).to be_a(Regexp::Syntax::V2_0_0)
-  end
-
-  specify('syntax alias 2 2 alias') do
-    syntax = Regexp::Syntax.new('ruby/2.2')
-
-    expect(syntax).to be_a(Regexp::Syntax::V2_0_0)
-  end
-
-  specify('syntax alias 2 3 0') do
-    syntax = Regexp::Syntax.new('ruby/2.3.0')
-
-    expect(syntax).to be_a(Regexp::Syntax::V2_3_0)
-  end
-
-  specify('syntax alias 2 3') do
-    syntax = Regexp::Syntax.new('ruby/2.3')
-
-    expect(syntax).to be_a(Regexp::Syntax::V2_3_0)
-  end
-
-  specify('syntax alias 2 4 0') do
-    syntax = Regexp::Syntax.new('ruby/2.4.0')
-
-    expect(syntax).to be_a(Regexp::Syntax::V2_4_0)
-  end
-
-  specify('syntax alias 2 4 1') do
-    syntax = Regexp::Syntax.new('ruby/2.4.1')
-
-    expect(syntax).to be_a(Regexp::Syntax::V2_4_1)
-  end
-
-  specify('syntax alias 2 5 0') do
-    syntax = Regexp::Syntax.new('ruby/2.5.0')
-
-    expect(syntax).to be_a(Regexp::Syntax::V2_4_1)
-    expect(syntax).to be_a(Regexp::Syntax::V2_5_0)
-  end
-
-  specify('syntax alias 2 5') do
-    syntax = Regexp::Syntax.new('ruby/2.5')
-
-    expect(syntax).to be_a(Regexp::Syntax::V2_5_0)
-  end
-
-  specify('syntax alias 2 6 0') do
-    syntax = Regexp::Syntax.new('ruby/2.6.0')
-
-    expect(syntax).to be_a(Regexp::Syntax::V2_5_0)
-    expect(syntax).to be_a(Regexp::Syntax::V2_6_0)
-  end
-
-  specify('syntax alias 2 6') do
-    syntax = Regexp::Syntax.new('ruby/2.6')
-
-    expect(syntax).to be_a(Regexp::Syntax::V2_5_0)
-  end
+  RSpec.shared_examples 'syntax alias' do |string, klass|
+    it "aliases #{string} to #{klass}" do
+      syntax = Regexp::Syntax.new(string)
+      expect(syntax).to be_a klass
+    end
+  end
+
+  include_examples 'syntax alias', 'ruby/1.8.6',  Regexp::Syntax::V1_8_6
+  include_examples 'syntax alias', 'ruby/1.8',    Regexp::Syntax::V1_8_6
+  include_examples 'syntax alias', 'ruby/1.9.1',  Regexp::Syntax::V1_9_1
+  include_examples 'syntax alias', 'ruby/1.9',    Regexp::Syntax::V1_9_3
+  include_examples 'syntax alias', 'ruby/2.0.0',  Regexp::Syntax::V1_9
+  include_examples 'syntax alias', 'ruby/2.0',    Regexp::Syntax::V2_0_0
+  include_examples 'syntax alias', 'ruby/2.1',    Regexp::Syntax::V2_0_0
+  include_examples 'syntax alias', 'ruby/2.2.0',  Regexp::Syntax::V2_0_0
+  include_examples 'syntax alias', 'ruby/2.2.10', Regexp::Syntax::V2_0_0
+  include_examples 'syntax alias', 'ruby/2.2',    Regexp::Syntax::V2_0_0
+  include_examples 'syntax alias', 'ruby/2.3.0',  Regexp::Syntax::V2_3_0
+  include_examples 'syntax alias', 'ruby/2.3',    Regexp::Syntax::V2_3_0
+  include_examples 'syntax alias', 'ruby/2.4.0',  Regexp::Syntax::V2_4_0
+  include_examples 'syntax alias', 'ruby/2.4.1',  Regexp::Syntax::V2_4_1
+  include_examples 'syntax alias', 'ruby/2.5.0',  Regexp::Syntax::V2_4_1
+  include_examples 'syntax alias', 'ruby/2.5',    Regexp::Syntax::V2_5_0
+  include_examples 'syntax alias', 'ruby/2.6.0',  Regexp::Syntax::V2_5_0
+  include_examples 'syntax alias', 'ruby/2.6',    Regexp::Syntax::V2_5_0
 
   specify('future alias warning') do
     expect { Regexp::Syntax.new('ruby/5.0') }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: regexp_parser
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Ammar Ali
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-15 00:00:00.000000000 Z
+date: 2019-05-23 00:00:00.000000000 Z
 dependencies: []
 description: A library for tokenizing, lexing, and parsing Ruby regular expressions.
 email:
@@ -40,7 +40,9 @@ files:
 - lib/regexp_parser/expression/classes/set/intersection.rb
 - lib/regexp_parser/expression/classes/set/range.rb
 - lib/regexp_parser/expression/classes/type.rb
+- lib/regexp_parser/expression/methods/match.rb
 - lib/regexp_parser/expression/methods/match_length.rb
+- lib/regexp_parser/expression/methods/options.rb
 - lib/regexp_parser/expression/methods/strfregexp.rb
 - lib/regexp_parser/expression/methods/tests.rb
 - lib/regexp_parser/expression/methods/traverse.rb
@@ -93,9 +95,13 @@ files:
 - spec/expression/conditional_spec.rb
 - spec/expression/free_space_spec.rb
 - spec/expression/methods/match_length_spec.rb
+- spec/expression/methods/match_spec.rb
 - spec/expression/methods/strfregexp_spec.rb
 - spec/expression/methods/tests_spec.rb
 - spec/expression/methods/traverse_spec.rb
+- spec/expression/options_spec.rb
+- spec/expression/root_spec.rb
+- spec/expression/sequence_spec.rb
 - spec/expression/subexpression_spec.rb
 - spec/expression/to_h_spec.rb
 - spec/expression/to_s_spec.rb
@@ -136,12 +142,11 @@ files:
 - spec/scanner/properties_spec.rb
 - spec/scanner/quantifiers_spec.rb
 - spec/scanner/refcalls_spec.rb
-- spec/scanner/scripts_spec.rb
 - spec/scanner/sets_spec.rb
 - spec/scanner/types_spec.rb
-- spec/scanner/unicode_blocks_spec.rb
 - spec/spec_helper.rb
 - spec/support/runner.rb
+- spec/support/shared_examples.rb
 - spec/support/warning_extractor.rb
 - spec/syntax/syntax_spec.rb
 - spec/syntax/syntax_token_map_spec.rb
@@ -206,14 +211,19 @@ test_files:
 - spec/parser/groups_spec.rb
 - spec/parser/quantifiers_spec.rb
 - spec/support/warning_extractor.rb
+- spec/support/shared_examples.rb
 - spec/support/runner.rb
 - spec/expression/subexpression_spec.rb
+- spec/expression/methods/match_spec.rb
 - spec/expression/methods/match_length_spec.rb
 - spec/expression/methods/traverse_spec.rb
 - spec/expression/methods/strfregexp_spec.rb
 - spec/expression/methods/tests_spec.rb
 - spec/expression/free_space_spec.rb
+- spec/expression/options_spec.rb
 - spec/expression/to_s_spec.rb
+- spec/expression/root_spec.rb
+- spec/expression/sequence_spec.rb
 - spec/expression/clone_spec.rb
 - spec/expression/to_h_spec.rb
 - spec/expression/conditional_spec.rb
@@ -234,9 +244,7 @@ test_files:
 - spec/scanner/all_spec.rb
 - spec/scanner/conditionals_spec.rb
 - spec/scanner/types_spec.rb
-- spec/scanner/scripts_spec.rb
 - spec/scanner/anchors_spec.rb
-- spec/scanner/unicode_blocks_spec.rb
 - spec/scanner/meta_spec.rb
 - spec/scanner/errors_spec.rb
 - spec/scanner/refcalls_spec.rb

data/spec/scanner/scripts_spec.rb

@@ -1,49 +0,0 @@
-require 'spec_helper'
-
-RSpec.describe('UnicodeScript scanning') do
-  tests = {
-    'Aghb'	                  => :caucasian_albanian,
-    'Caucasian Albanian'	    => :caucasian_albanian,
-
-    'Arab'	                  => :arabic,
-    'Arabic'	                => :arabic,
-
-    'Armi'	                  => :imperial_aramaic,
-    'Imperial Aramaic'        => :imperial_aramaic,
-
-    'Egyp'                    => :egyptian_hieroglyphs,
-    'Egyptian Hieroglyphs'    => :egyptian_hieroglyphs, # test whitespace
-
-    'Linb'                    => :linear_b,
-    'Linear-B'                => :linear_b, # test dash
-
-    'Yiii'                    => :yi,
-    'Yi'                      => :yi,
-
-    'Zinh'                    => :inherited,
-    'Inherited'               => :inherited,
-    'Qaai'                    => :inherited,
-
-    'Zyyy'                    => :common,
-    'Common'                  => :common,
-
-    'Zzzz'                    => :unknown,
-    'Unknown'                 => :unknown,
-  }
-
-  tests.each_with_index do |(property, token), count|
-    specify("scanner_property_#{token}_#{count}") do
-      tokens = RS.scan("a\\p{#{property}}c")
-      result = tokens.at(1)
-      expect(result[0]).to eq :property
-      expect(result[1]).to eq token
-    end
-
-    specify("scanner_nonproperty_#{token}_#{count}") do
-      tokens = RS.scan("a\\P{#{property}}c")
-      result = tokens.at(1)
-      expect(result[0]).to eq :nonproperty
-      expect(result[1]).to eq token
-    end
-  end
-end