sexp_processor 4.9.0 → 4.10.0b1

data/test/test_sexp_processor.rb

@@ -1,78 +1,86 @@
 $TESTING = true
 
-require 'sexp_processor'
-require 'stringio'
-require 'minitest/autorun'
-require 'pp'
+if ENV["COV"]
+  require "simplecov"
+  SimpleCov.start do
+    add_filter "lib/sexp.rb"
+    add_filter "test"
+  end
+  warn "Running simplecov"
+end
+
+require "sexp_processor"
+require "stringio"
+require "minitest/autorun"
+require "pp"
 
 # Fake test classes:
 
 class TestProcessor < SexpProcessor # ZenTest SKIP
   attr_accessor :auto_shift_type
 
-  def process_acc1(exp)
+  def initialize
+    super
+    self.require_empty = false
+    self.auto_shift_type = false
+  end
+
+  def process_acc1 exp
     out = self.expected.new(:acc2, exp.thing_three, exp.thing_two, exp.thing_one)
     exp.clear
-    return out
+    out
   end
 
-  def process_acc2(exp)
-    out = []
+  def process_acc2 exp
+    out = s()
     out << exp.thing_one
   end
 
-  def process_specific(exp)
-    _ = exp.shift
-    result = s(:blah)
-    until exp.empty?
-      result.push process(exp.shift)
-    end
-    result
+  def process_specific exp
+    _, *data = exp
+    s(:blah, *data.map { |x| process x })
   end
 
-  def process_strip(exp)
-    result = exp.deep_clone
-    exp.clear
-    result
+  def process_strip exp
+    exp.deep_clone
   end
 
-  def process_nonempty(exp)
+  def process_nonempty exp
     s(*exp)
   end
 
-  def process_broken(exp)
+  def process_broken exp
     result = [*exp]
     exp.clear
     result
   end
 
-  def process_expected(exp)
+  def process_expected exp
     exp.clear
-    return {}
+    {}
   end
 
-  def process_string(exp)
-    return exp.shift
+  def process_string exp
+    exp.sexp_type
   end
 
-  def rewrite_rewritable(exp) # (a b c) => (a c b)
-    return s(exp.shift, exp.pop, exp.shift)
+  def rewrite_rewritable exp # (a b c) => (a c b)
+    a, b, c = exp
+    s(a, c, b)
   end
 
-  def process_rewritable(exp)
+  def process_rewritable exp
+    _, *data = exp
+
     @n ||= 0
-    exp.shift # name
-    result = s(:rewritten)
-    until exp.empty?
-      result.push process(exp.shift)
-    end
-    result.push @n
+    result = s(:rewritten, *data.map { |x| process x }, @n)
     @n += 1
+
     result
   end
 
-  def rewrite_major_rewrite(exp)
-    exp[0] = :rewritable
+  def rewrite_major_rewrite exp
+    exp.sexp_type = :rewritable
     exp
   end
 end
@@ -83,7 +91,7 @@ class TestProcessorDefault < SexpProcessor # ZenTest SKIP
     self.default_method = :def_method
   end
 
-  def def_method(exp)
+  def def_method exp
     exp.clear
     self.expected.new(42)
   end
@@ -98,13 +106,13 @@ class TestSexpProcessor < Minitest::Test
   end
 
   def test_process_specific
-    a = [:specific, [:x, 1], [:y, 2], [:z, 3]]
-    expected = [:blah, [:x, 1], [:y, 2], [:z, 3]]
+    a = s(:specific, s(:x, 1), s(:y, 2), s(:z, 3))
+    expected = s(:blah, s(:x, 1), s(:y, 2), s(:z, 3))
     assert_equal(expected, @processor.process(a))
   end
 
   def test_process_generic
-    a = [:blah, 1, 2, 3]
+    a = s(:blah, 1, 2, 3)
     expected = a.deep_clone
     assert_equal(expected, @processor.process(a))
   end
@@ -122,7 +130,7 @@ class TestSexpProcessor < Minitest::Test
     @processor.warn_on_default = false
 
     assert_raises SexpTypeError do
-      @processor.process([:broken, 1, 2, 3])
+      @processor.process(s(:broken, 1, 2, 3))
     end
   end
 
@@ -131,7 +139,7 @@ class TestSexpProcessor < Minitest::Test
     @processor.unsupported << :strip
 
     assert_raises UnsupportedNodeError do
-      @processor.process([:whatever])
+      @processor.process(s(:whatever))
     end
   end
 
@@ -139,29 +147,32 @@ class TestSexpProcessor < Minitest::Test
     @processor.strict = true
     @processor.unsupported = [ :unsupported ]
     assert_raises UnsupportedNodeError do
-      @processor.process([:unsupported, 42])
+      @processor.process(s(:unsupported, 42))
     end
   end
 
   def test_strict
     @processor.strict = true
     assert_raises UnknownNodeError do
-      @processor.process([:blah, 1, 2, 3])
+      @processor.process(s(:blah, 1, 2, 3))
     end
   end
-  def test_strict=; skip; end #Handled
+
+  def test_strict=; skip; end # handled
 
   def test_require_empty_false
     @processor.require_empty = false
 
-    assert_equal s(:nonempty, 1, 2, 3), @processor.process([:nonempty, 1, 2, 3])
+    assert_equal s(:nonempty, 1, 2, 3), @processor.process(s(:nonempty, 1, 2, 3))
   end
 
   def test_require_empty_true
     assert_raises NotEmptyError do
-      @processor.process([:nonempty, 1, 2, 3])
+      @processor.require_empty = true
+      @processor.process(s(:nonempty, 1, 2, 3))
     end
   end
+
   def test_require_empty=; skip; end # handled
 
   def test_process_strip
@@ -189,7 +200,6 @@ class TestSexpProcessor < Minitest::Test
     expect = s(:rewritable, 2, 1)
     result = @processor.rewrite(insert)
     assert_equal(expect, result)
-    assert_equal(s(2), insert) # post-processing
   end
 
   def test_process_rewrite
@@ -256,6 +266,7 @@ class TestSexpProcessor < Minitest::Test
     @processor.auto_shift_type = true
     assert_equal(true, @processor.auto_shift_type)
   end
+
   def test_auto_shift_type_equal; skip; end # handled
 
   def test_default_method
@@ -264,12 +275,13 @@ class TestSexpProcessor < Minitest::Test
     @processor.default_method = :something
     assert_equal :something, @processor.default_method
   end
+
   def test_default_method=; skip; end # handled
 
   def test_expected
     assert_equal Sexp, @processor.expected
     assert_raises SexpTypeError do
-      @processor.process([:expected])           # should raise
+      @processor.process(s(:expected))           # should raise
     end
 
     @processor.process(s(:str, "string"))       # shouldn't raise
@@ -282,8 +294,9 @@ class TestSexpProcessor < Minitest::Test
       @processor.process(s(:string, "string"))     # should raise
     end
 
-    @processor.process([:expected])        # shouldn't raise
+    @processor.process(s(:expected))        # shouldn't raise
   end
+
   def test_expected=; skip; end # handled
 
   # Not Testing:
@@ -323,7 +336,7 @@ class TestMethodBasedSexpProcessor < Minitest::Test
 
     assert_empty processor.method_stack
 
-    expected = {"main#xxx" => "file.rb:42"}
+    expected = { "main#xxx" => "file.rb:42" }
     assert_equal expected, processor.method_locations
   end
 
@@ -336,7 +349,7 @@ class TestMethodBasedSexpProcessor < Minitest::Test
 
     assert_empty processor.method_stack
 
-    expected = {"main#xxx" => "file.rb:42-44"}
+    expected = { "main#xxx" => "file.rb:42-44" }
     assert_equal expected, processor.method_locations
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sexp_processor
 version: !ruby/object:Gem::Version
-  version: 4.9.0
+  version: 4.10.0b1
 platform: ruby
 authors:
 - Ryan Davis
@@ -30,7 +30,7 @@ cert_chain:
   E4oJcnPkJAr0rw504JGtlZtONZQblwmRJOIdXzolaE3NRGUzGVOUSptZppAKiavY
   fO6tdKQc/5RfA8oQEkg8hrxA5PQSz4TOFJGLpFvIapEk6tMruQ0bHgkhr9auXg==
   -----END CERTIFICATE-----
-date: 2017-04-13 00:00:00.000000000 Z
+date: 2017-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -81,6 +81,7 @@ files:
 - lib/pt_testcase.rb
 - lib/sexp.rb
 - lib/sexp_processor.rb
+- lib/strict_sexp.rb
 - lib/unique.rb
 - test/test_composite_sexp_processor.rb
 - test/test_environment.rb
@@ -103,9 +104,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.8