sexp_path 0.5.1 → 0.5.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 642b64481c3c3122cce88572f5b3391da7de2008
+  data.tar.gz: ec790db6019e7294d18d7147d1efb14fb050440d
+SHA512:
+  metadata.gz: 2b0f98e4a951f85bd66c8669265ea113c31044deba3bd22c94f3cf08baa7ec45a75d75376464a54ae3589120ab4acaee53bc3342b00fb6a8196d22b7144671f9
+  data.tar.gz: 30abfada1970daee876e4a790fc65b907949285afeb652f88f8b2d97f889fa2a53e093fa214999a4d23a7f5bc930da4736fb06bf432caef3cf576f33fb2e780c

data/lib/sexp_path.rb

@@ -52,8 +52,16 @@ class Sexp
   # Extends Sexp to allow any Sexp to be used as a SexpPath matcher
   def satisfy?(o, data={})
     return false unless o.is_a? Sexp
-    return false unless (length == o.length || last.is_a?(SexpPath::Matcher::Remaining) )
-    each_with_index{|c,i| return false unless c.is_a?(Sexp) ? c.satisfy?( o[i], data ) : c == o[i] }
+    return false unless length == o.length || (last.is_a?(Sexp) && last.greedy?)
+    
+    each_with_index do |child,i|
+      if child.is_a?(Sexp)
+        candidate = child.greedy? ? o[i..-1] : o[i]
+        return false unless child.satisfy?( candidate, data )
+      else
+        return false unless child == o[i]
+      end
+    end
 
     capture_match(o, data)
   end

data/lib/sexp_path/matcher/base.rb

@@ -45,6 +45,10 @@ class SexpPath::Matcher::Base < Sexp
     SexpPath::Matcher::Sibling.new(self, o)
   end
   
+  def greedy?
+    false
+  end
+  
   # Formats the matcher as:
   #   q(:a, :b)
   def inspect

data/lib/sexp_path/matcher/remaining.rb

@@ -9,7 +9,11 @@ class SexpPath::Matcher::Remaining < SexpPath::Matcher::Base
   
   # Always satisfied once this is reached.  Think of it as a var arg.
   def satisfy?(o, data={})
-    data
+    capture_match o, data
+  end
+  
+  def greedy?
+    true
   end
   
   def inspect

data/test/sexp_path_capture_test.rb

@@ -128,4 +128,16 @@ class SexpPathCaptureTest < Test::Unit::TestCase
     assert_equal s(:c), res['c']
   end
   
+  def test_capturing_remaining
+    sexp = s(s(:a), s(:b), s(:c))
+    assert res = Q?{ s(s(:a), ___ % 'match') }.satisfy?( sexp )
+    assert_equal [s(:b), s(:c)], res['match']
+  end
+  
+  def test_capturing_remaining_atoms
+    sexp = s(:a, :b, :c)
+    assert res = Q?{ s(:a, ___ % 'match') }.satisfy?( sexp )
+    assert_equal [:b, :c], res['match']
+  end
+  
 end

metadata

@@ -1,48 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: sexp_path
 version: !ruby/object:Gem::Version
-  version: 0.5.1
-  prerelease: 
+  version: 0.5.2
 platform: ruby
 authors:
 - Adam Sanderson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-23 00:00:00.000000000 Z
+date: 2014-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sexp_processor
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.2'
-    none: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.2'
-    none: false
 - !ruby/object:Gem::Dependency
   name: ruby_parser
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
-    none: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
-    none: false
 description: Example based structural pattern matching for S-Expressions
 email: netghost@gmail.com
 executables: []
@@ -50,6 +45,11 @@ extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
+- Gemfile
+- README.rdoc
+- examples/print_methods.rb
+- examples/sexp_grep.rb
+- lib/sexp_path.rb
 - lib/sexp_path/matcher/all.rb
 - lib/sexp_path/matcher/any.rb
 - lib/sexp_path/matcher/atom.rb
@@ -68,41 +68,35 @@ files:
 - lib/sexp_path/sexp_query_builder.rb
 - lib/sexp_path/sexp_result.rb
 - lib/sexp_path/traverse.rb
-- lib/sexp_path.rb
-- examples/print_methods.rb
-- examples/sexp_grep.rb
 - test/sample.rb
 - test/sexp_path_capture_test.rb
 - test/sexp_path_matching_test.rb
 - test/sexp_replacement_test.rb
 - test/use_case_test.rb
-- README.rdoc
-- Gemfile
 homepage: https://github.com/adamsanderson/sexp_path
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
+- "--main"
 - README.rdoc
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '1.9'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Pattern matching for S-Expressions
 test_files: []