sexp_processor 4.6.1 → 4.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ffce3965783a4dbd48fe6587d3f81516a787001
-  data.tar.gz: 949deb314e41e4d2b6f5748a356531da78c66794
+  metadata.gz: a8c330cf1162f2b13522bf591471d69bd2daac84
+  data.tar.gz: 9f7001a49fb152b343544319f3de1c36f94a6b08
 SHA512:
-  metadata.gz: 5209d34f5cc76beccf8040efb225959d9b4fa63b721236b172f2a68ab2ee979e7fa8c711ea0cd5d5ce1770d6cda4442b4c9e229b669695ce7cacccbb0de33886
-  data.tar.gz: dd6ad34ec54201fae66c582950123339e68105d7128d17e229d5c64df957d21acabed68bed16b9689f147a0b2f8be5d06744887b89157104c786843eafc15966
+  metadata.gz: 918c51196a0a5d9757b20215de228e73bb25e6df71e42aa8fa2bfcf4c3a058937ffd0bdd49e9fc9f6bbfba4d175aa935d946d8a911d91cbc6ed0a886922513ac
+  data.tar.gz: b111b71bb1145d390125f6fa287a8b837916d92974a5665fcdda44b8427554306ceed81baa8625f292cae300267c4697f0aefdf20ec32450d5fb52fd06c95af2

data/History.txt

@@ -1,3 +1,10 @@
+=== 4.7.0 / 2016-02-18
+
+* 2 minor enhancements:
+
+  * Expand to support 2.3 in tests. (presidentbeef)
+  * Return enumerable for deep_each, each_sexp, and each_of_type. (ridiculous)
+
 === 4.6.1 / 2016-01-21
 
 * 1 bug fix:

data/lib/pt_testcase.rb

@@ -76,7 +76,7 @@ class ParseTreeTestCase < Minitest::Test
   end
 
   def self.add_19tests name, hash
-    add_tests "#{name}__19_20_21_22", hash # HACK?
+    add_tests "#{name}__19_20_21_22_23", hash # HACK?
   end
 
   def self.add_19edgecases ruby, sexp, cases
@@ -101,7 +101,7 @@ class ParseTreeTestCase < Minitest::Test
     testcases[verbose][klass] = testcases[nonverbose][klass]
   end
 
-  VER_RE = "(1[89]|2[012])"
+  VER_RE = "(1[89]|2[0123])"
 
   def self.generate_test klass, node, data, input_name, output_name
     klass.send :define_method, "test_#{node}" do

data/lib/sexp.rb

@@ -85,9 +85,10 @@ class Sexp < Array # ZenTest FULL
 
   ##
   # Recursively enumerates the sexp yielding to +block+ for every element.
-  # TODO: test
 
   def deep_each(&block)
+    return enum_for(:deep_each) unless block_given?
+
     self.each_sexp do |sexp|
       block[sexp]
       sexp.deep_each(&block)
@@ -98,6 +99,8 @@ class Sexp < Array # ZenTest FULL
   # Enumeratates the sexp yielding to +b+ when the node_type == +t+.
 
   def each_of_type(t, &b)
+    return enum_for(:each_of_type) unless block_given?
+
     each do | elem |
       if Sexp === elem then
         elem.each_of_type(t, &b)
@@ -108,9 +111,10 @@ class Sexp < Array # ZenTest FULL
 
   ##
   # Recursively enumerates all sub-sexps skipping non-Sexp elements.
-  # TODO: test
 
   def each_sexp
+    return enum_for(:each_sexp) unless block_given?
+
     self.each do |sexp|
       next unless Sexp === sexp
 

data/lib/sexp_processor.rb

@@ -33,7 +33,7 @@ require 'sexp'
 
 class SexpProcessor
 
-  VERSION = "4.6.1"
+  VERSION = "4.7.0"
 
   ##
   # Automatically shifts off the Sexp type before handing the

data/test/test_sexp.rb

@@ -49,6 +49,7 @@ class TestSexp < SexpTestCase # ZenTest FULL
     @processor = SexpProcessor.new
     @sexp = @sexp_class.new(1, 2, 3)
     @basic_sexp = s(:lasgn, :var, s(:lit, 42))
+    @complex_sexp = s(:block, s(:lasgn, :foo, s(:str, "foo")), s(:if, s(:and, s(:true), s(:lit, 1)), s(:if, s(:lvar, :foo), s(:str, "bar"), nil), s(:true)))
     @re = s(:lit, 42)
     @bad1 = s(:lit, 24)
     @bad1 = s(:blah, 42)
@@ -310,6 +311,28 @@ class TestSexp < SexpTestCase # ZenTest FULL
   def test_to_s
     test_inspect
   end
+
+  def test_each_sexp
+    result = []
+    @basic_sexp.each_sexp { |_, val| result << val }
+    assert_equal [42], result
+  end
+
+  def test_each_sexp_without_block
+    assert_kind_of Enumerator, @basic_sexp.each_sexp
+    assert_equal [42], @basic_sexp.each_sexp.map { |_, n| n }
+  end
+
+  def test_deep_each
+    result = []
+    @complex_sexp.deep_each { |s| result << s if s.first == :if }
+    assert_equal [:if, :if], result.map { |k, _| k }
+  end
+
+  def test_deep_each_without_block
+    assert_kind_of Enumerator, @complex_sexp.deep_each
+    assert_equal [:if, :if], @complex_sexp.deep_each.select { |s, _| s == :if }.map { |k, _| k }
+  end
 end
 
 class TestSexpAny < SexpTestCase

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sexp_processor
 version: !ruby/object:Gem::Version
-  version: 4.6.1
+  version: 4.7.0
 platform: ruby
 authors:
 - Ryan Davis
@@ -29,7 +29,7 @@ cert_chain:
   qx3h45R1CAsObX0SQDIT+rRbQrtKz1GHIZTOFYvEJjUY1XmRTZupD3CJ8Q7sDqSy
   NLq5jm1fq6Y9Uolu3RJbmycf
   -----END CERTIFICATE-----
-date: 2016-01-21 00:00:00.000000000 Z
+date: 2016-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest