sexp_processor 4.4.3 → 4.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c847159418199e0c96895e23b28368b141320f9
-  data.tar.gz: b19be09f312410655b8b3ed8feeb85990d8d0e6f
+  metadata.gz: ebcc78edd5d4fc9463a7dc219d1bd7016bcc3ab4
+  data.tar.gz: bbc520509e23beb95761bf6247b4f0c56e67e5fd
 SHA512:
-  metadata.gz: f401eb92711cbed3f4227eb4c133442862d1eb8ef888fa64d87805dea7e80bf4b0cad4d9bad06bb80f3568ccfb8da3c8f1f320f474c7da77747dfa5afc3664a5
-  data.tar.gz: b94d88a84a4aa15fc10eddb4a0c3f7aca5189696e235ff9c3ef6d6115e0d8707178368830aebf925a7723c6ed860b873fe53ca3e4ac809f187c3b7f47ff66b28
+  metadata.gz: 912bf4fe79f0808aa6a84e4bdbaf67a20cd8a5a208671a45dad8a613373402b2c6897fcb145aefc5bec6a66ba1b51d60acf064407bb627b4c381e571504df3c7
+  data.tar.gz: 9d8d0e494d6893b19f3331213ac06dc0126e19cb5eb9298cc25b61b9570253e7594aeb46e610ddd25bd437fe9714335cb0f47240e50ece9dce808efb074412ce

data/History.txt

@@ -1,3 +1,9 @@
+=== 4.4.4 / 2014-08-14
+
+* 1 bug fix:
+
+  * MethodBasedSexpProcessor#in_klass clears out the method_stack for the duration of the block.
+
 === 4.4.3 / 2014-03-24
 
 * 1 bug fix:

data/lib/sexp_processor.rb

@@ -33,7 +33,7 @@ require 'sexp'
 
 class SexpProcessor
 
-  VERSION = "4.4.3"
+  VERSION = "4.4.4"
 
   ##
   # Automatically shifts off the Sexp type before handing the
@@ -444,7 +444,10 @@ class MethodBasedSexpProcessor < SexpProcessor
     end
 
     @class_stack.unshift name
-    yield
+
+    with_new_method_stack do
+      yield
+    end
   ensure
     @class_stack.shift
   end
@@ -467,7 +470,10 @@ class MethodBasedSexpProcessor < SexpProcessor
 
   def in_sklass
     @sclass.push true
-    yield
+
+    with_new_method_stack do
+      yield
+    end
   ensure
     @sclass.pop
   end
@@ -601,6 +607,18 @@ class MethodBasedSexpProcessor < SexpProcessor
   def signature
     "#{klass_name}#{method_name}"
   end
+
+  ##
+  # Reset the method stack for the duration of the block. Used for
+  # class scoping.
+
+  def with_new_method_stack
+    old_method_stack, @method_stack = @method_stack, []
+
+    yield
+  ensure
+    @method_stack = old_method_stack
+  end
 end
 
 class Object

data/test/test_sexp_processor.rb

@@ -306,8 +306,11 @@ class TestMethodBasedSexpProcessor < Minitest::Test
   def test_in_klass
     assert_empty processor.class_stack
 
-    processor.in_klass "xxx::yyy" do
-      assert_equal ["xxx::yyy"], processor.class_stack
+    processor.in_method "method", "file", 42 do
+      processor.in_klass "xxx::yyy" do
+        assert_equal ["xxx::yyy"], processor.class_stack
+        assert_empty processor.method_stack
+      end
     end
 
     assert_empty processor.class_stack

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sexp_processor
 version: !ruby/object:Gem::Version
-  version: 4.4.3
+  version: 4.4.4
 platform: ruby
 authors:
 - Ryan Davis
@@ -29,7 +29,7 @@ cert_chain:
   Y4evBVezr3SjXz08vPqRO5YRdO3zfeMT8gBjRqZjWJGMZ2lD4XNfrs7eky74CyZw
   xx3n58i0lQkBE1EpKE0lFu/y
   -----END CERTIFICATE-----
-date: 2014-03-25 00:00:00.000000000 Z
+date: 2014-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -37,14 +37,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '5.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '5.4'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -65,14 +65,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.12'
 description: |-
   sexp_processor branches from ParseTree bringing all the generic sexp
   processing tools with it. Sexp, SexpProcessor, Environment, etc... all
@@ -121,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: sexp_processor
+rubyforge_project: 
 rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4