srl_ruby 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17b59ca17f397a24c01b84bd9d1a4a67743e2f73
-  data.tar.gz: 8b6b397b9d5e95bf1f5a6f6b5cdd866d7a8e966d
+  metadata.gz: 808f335172ddb8259c8f7c7d5ed0207936c6f7ad
+  data.tar.gz: cd7bfcabd76599a570997cf9032d2522d346f038
 SHA512:
-  metadata.gz: 5b7e2d0a99199a431eb2c381f566171161e7c7aaa6098211d9740e3f4bbc86568aafa60d6f41a5e334a35c81cddffc2260e11c1a6a8392e39f8095f7cba05571
-  data.tar.gz: 6d7cd5fe49e6277558f2cfaa2601ee515cb14556fc5d8c4b831d853f4f77f52301758166618b0cf3e7f5ae6cf9cab957052ad7cb0f5f53a323726c4bb307824d
+  metadata.gz: 3db09d707e1496ed2711a903d5f655aca233fd695804a4ba6787fa8e067bb190efb9c770e9ee0e685ed6282f9956c8e23c30cedf4f3dca7a428c99e53e165c23
+  data.tar.gz: 02f3eb69d6cbc700e2d4f22ebe9d3e2c96892e150258aa9984af3102fde44a98cc2ebb4ab5025acdd6f961f1614cc75bf5e964d28e42263a6ca3b84b9df99b10

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+## [0.3.1] - 2018-04-04
+### Added
+- Added `Cucumber` feature files both for additional testing and demo purposes.  
+    Almost all examples from SRL websites are "featured".
+
+### Changed
+- All regex node classes support the `done!` method. It signals the end of aprsing, this is the right moment to finalize/tune 
+    the parse tree or parse forest to build.
+
+### Fixed
+- Method `PolyadicExpression#done!` fixes an issue with lookbehind regex generation. The lookbehind expression precede the
+  expression to be mathced/capture. In SRL, lookbehind syntax the expression to capture or match...
+- Class `SrlRuby::ASTBuilder` improved support "from ... to ..." syntax: supports the case when boundaries are swapped.
+  If last captured subexpression is a repetition, then it is made lazy (instead of greedy).
+
 ## [0.3.0] - 2018-04-04
 Version bump: SrlRuby passes the complete official SRL test suite! 
 ### Changed

data/Rakefile

@@ -1,5 +1,6 @@
 require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
+require 'rspec/core/rake_task' # Rspec as testing tool
+require 'cucumber/rake/task' # Cucumber as testing tool
 
 desc 'Run RSpec'
 RSpec::Core::RakeTask.new do |spec|
@@ -7,10 +8,12 @@ RSpec::Core::RakeTask.new do |spec|
 end
 
 
-# Combine RSpec tests
-desc 'Run tests, with RSpec'
-task test: [:spec]
+Cucumber::Rake::Task.new do |_|
+end
 
+# Combine RSpec and Cucumber tests
+desc 'Run tests, with RSpec and Cucumber'
+task test: [:spec, :cucumber]
 
 # Default rake task
 task default: :test

data/lib/regex/atomic_expression.rb

@@ -10,6 +10,10 @@ module Regex # This module is used as a namespace
     def atomic?
       return true
     end
+    
+    def done!()
+      # Do nothing
+    end
   end # class
 end # module
 

data/lib/regex/monadic_expression.rb

@@ -14,6 +14,10 @@ module Regex # This module is used as a namespace
       super()
       @child = theChild
     end
+    
+    def done!()
+      # Do nothing
+    end    
 
     protected
   

data/lib/regex/polyadic_expression.rb

@@ -22,6 +22,19 @@ module Regex # This module is used as a namespace
 
       return self
     end
+    
+    def done!()
+      children.each(&:done!)
+      children.each_with_index do |child, index|
+        break if index == children.size - 1
+        next_child = children[index+1]
+        if next_child.kind_of?(Lookaround) && next_child.dir == :behind
+          # Swap children: lookbehind regex must precede pattern
+          @children[index+1] = child
+          @children[index] = next_child
+        end
+      end
+    end
 
     # Build a depth-first in-order children visitor.
     # The visitor is implemented as an Enumerator.

data/lib/regex/repetition.rb

@@ -14,6 +14,10 @@ module Regex # This module is used as a namespace
       super(childExpressionToRepeat)
       @multiplicity = aMultiplicity
     end
+    
+    def done!()
+      child.done!
+    end
 
     protected
 

data/lib/srl_ruby/ast_builder.rb

@@ -59,7 +59,6 @@ module SrlRuby
     end
 
     def char_range(lowerBound, upperBound)
-      # TODO fix module nesting
       lower = Regex::Character.new(lowerBound)
       upper = Regex::Character.new(upperBound)
       return Regex::CharRange.new(lower, upper)
@@ -189,18 +188,18 @@ module SrlRuby
     end
 
     # rule('letter_range' => %w[LETTER FROM LETTER_LIT TO LETTER_LIT]).as 'lowercase_from_to'
-    def reduce_lowercase_from_to(_production, _range, _tokens, theChildren)
-      lower = theChildren[2].token.lexeme
-      upper =  theChildren[4].token.lexeme
-      ch_range = char_range(lower, upper)
+    def reduce_lowercase_from_to(_production, _range, _tokens, theChildren) 
+      raw_range = [theChildren[2].token.lexeme, theChildren[4].token.lexeme]
+      range_sorted = raw_range.sort
+      ch_range = char_range(range_sorted[0], range_sorted[1])
       char_class(false, ch_range)
     end
 
     # rule('letter_range' => %w[UPPERCASE LETTER FROM LETTER_LIT TO LETTER_LIT]).as 'uppercase_from_to'
     def reduce_uppercase_from_to(_production, _range, _tokens, theChildren)
-      lower = theChildren[3].token.lexeme
-      upper =  theChildren[5].token.lexeme
-      ch_range = char_range(lower.upcase, upper.upcase)
+      raw_range = [theChildren[3].token.lexeme, theChildren[5].token.lexeme]
+      range_sorted = raw_range.sort
+      ch_range = char_range(range_sorted[0], range_sorted[1])
       char_class(false, ch_range)
     end
 
@@ -218,7 +217,10 @@ module SrlRuby
 
     # rule('digit_range' => %w[digit_or_number FROM DIGIT_LIT TO DIGIT_LIT]).as 'digits_from_to'
     def reduce_digits_from_to(aProduction, aRange, theTokens, theChildren)
-      reduce_lowercase_from_to(aProduction, aRange, theTokens, theChildren)
+      raw_range = [theChildren[2].token.lexeme, theChildren[4].token.lexeme]
+      range_sorted = raw_range.map(&:to_i).sort
+      ch_range = char_range(range_sorted[0].to_s, range_sorted[1].to_s)
+      char_class(false, ch_range)
     end
 
     # rule('character_class' => %w[ANY CHARACTER]).as 'any_character'

data/lib/srl_ruby/version.rb

@@ -1,3 +1,3 @@
 module SrlRuby
-  VERSION = '0.3.0'.freeze
+  VERSION = '0.3.1'.freeze
 end

data/spec/acceptance/srl_test_suite_spec.rb

@@ -18,13 +18,10 @@ RSpec.describe SrlRuby do
   def load_file(aFilename)
     return Acceptance::RuleFileParser.load_file(rule_path + aFilename)
   end
-
-#   
-#   CaptureTest = Struct.new(:test_string, :expectations)
    
   def test_rule_file(aRuleFileRepr)
     regex = SrlRuby::parse(aRuleFileRepr.srl.value)
-    puts regex.source
+    # puts regex.source
     expect(regex).to be_kind_of(Regexp)
 
     aRuleFileRepr.match_tests.each do |test|

data/spec/acceptance/support/rule_file_ast_builder.rb

@@ -19,6 +19,10 @@ module Acceptance
     }.freeze
 
     attr_reader :options
+    
+    def done!()
+      # Do nothing!
+    end
 
     protected
 

data/spec/srl_ruby_spec.rb

@@ -281,12 +281,12 @@ END_SRL
 
     it 'should parse positive lookbehind' do
       regexp = SrlRuby.parse('literally "bar" if already had literally "foo"')
-      expect(regexp.source).to eq('bar(?<=foo)')
+      expect(regexp.source).to eq('(?<=foo)bar')
     end
 
     it 'should parse negative lookbehind' do
       regexp = SrlRuby.parse('literally "bar" if not already had literally "foo"')
-      expect(regexp.source).to eq('bar(?<!foo)')
+      expect(regexp.source).to eq('(?<!foo)bar')
     end
   end # context
 

data/srl_ruby.gemspec

@@ -38,11 +38,12 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Dimitri Geshef']
   spec.email         = ['famished.tiger@yahoo.com']
 
-  spec.description   = %q(A parser for the Simple Regex Language (SRL).)
+  spec.description   = %Q(Build easily regular expressions thanks to Simple Regex Language)
   spec.summary   = <<-END_DESCR
-srl_ruby is a gem implementing a parser for Simple Regex Language (SRL).
+A parser for the [Simple Regex Language](https://simple-regex.com/).
 It translates patterns expressed in SRL into plain Ruby Regexp objects 
-or regex literals. 
+or in regex literals. Use self-documenting, human readable, SRL expressions
+to craft your new awesome regular expressions.
 END_DESCR
   spec.homepage      = 'https://github.com/famished-tiger/SRL-Ruby'
   spec.license       = 'MIT'
@@ -55,10 +56,11 @@ END_DESCR
   spec.required_ruby_version = '>= 2.1.0'
   
   # Runtime dependencies
-  spec.add_dependency 'rley', '~> 0.6.05'
+  spec.add_dependency 'rley', '~> 0.6.06'
 
   # Development dependencies
   spec.add_development_dependency 'bundler', '~> 1.16'
+  spec.add_development_dependency 'cucumber', '>= 2.2.0'  
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: srl_ruby
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Dimitri Geshef
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-04 00:00:00.000000000 Z
+date: 2018-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rley
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.05
+        version: 0.6.06
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.05
+        version: 0.6.06
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.16'
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +80,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-description: A parser for the Simple Regex Language (SRL).
+description: Build easily regular expressions thanks to Simple Regex Language
 email:
 - famished.tiger@yahoo.com
 executables:
@@ -169,9 +183,10 @@ rubyforge_project:
 rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
-summary: srl_ruby is a gem implementing a parser for Simple Regex Language (SRL).
-  It translates patterns expressed in SRL into plain Ruby Regexp objects  or regex
-  literals.
+summary: A parser for the [Simple Regex Language](https://simple-regex.com/). It translates
+  patterns expressed in SRL into plain Ruby Regexp objects  or in regex literals.
+  Use self-documenting, human readable, SRL expressions to craft your new awesome
+  regular expressions.
 test_files:
 - spec/acceptance/srl_test_suite_spec.rb
 - spec/regex/character_spec.rb