sorcerer 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df8721926f741e7dbf02d294af27ffb0ef6a5966
-  data.tar.gz: 56a609a42385912a4ff0be8851e93c958bd60fce
+  metadata.gz: 8dcf3cdd1a1b69cbc70d2768c27dce5582958aaf
+  data.tar.gz: 25a67f7a15125bfba2759b37ccda0afeb9eaa5fb
 SHA512:
-  metadata.gz: 3211b38e8163a2ec485269bcc6d4d31644bb9659470d254f0c9604f458440255446d1cf9571ce97eb57cb2365a6de62e28c14c12b0b162e8c9265fb7d8f5ab2c
-  data.tar.gz: ff4f4a85b6076fe49dc3599eeacc10d1d9d896919d0a8b043c6dcf1d6c542587f48950c8e7d90381788fb09e5deb0ed4e5f6f80ed1da34a588bbf7c264941e64
+  metadata.gz: 35d606b74d95f711284738d5d72878967ae569c664a25d2bc1f0f786fc06061df63cbcc66d7f870972176afc49a3ec95e0c4d41d66c12879f8ef244f00056653
+  data.tar.gz: 5fb9dbda6db23f37cbec9d5d823fd17cdee7a6ee88289bc484745480215fd511995f0711e61701578f28b5d9c7798ba12633e0a02d9111631fd1f382fa593f02

data/README.md

@@ -130,6 +130,8 @@ MIT-LICENSE file for details.
 
 ## History
 
+* 1.0.2 - Fix bug in interpolated regular expression resourcing.
+
 * 1.0.1 - Add support for missing exception class or variable in
           rescue (from Trent Ogren).
 

data/lib/sorcerer/resource.rb

@@ -284,6 +284,7 @@ module Sorcerer
     SPACE = lambda { |sexp| emit(" ") }
     PASS1 = lambda { |sexp| resource(sexp[1]) }
     PASS2 = lambda { |sexp| resource(sexp[2]) }
+    PASSBOTH = lambda { |sexp| resource(sexp[1]); resource(sexp[2]) }
     EMIT1 = lambda { |sexp| emit(sexp[1]) }
 
     # Earlier versions of ripper miss array node for words, see
@@ -649,14 +650,8 @@ module Sorcerer
         emit(" = ")
         resource(sexp[2])
       },
-      :method_add_arg => lambda { |sexp|
-        resource(sexp[1])
-        resource(sexp[2])
-      },
-      :method_add_block => lambda { |sexp|
-        resource(sexp[1])
-        resource(sexp[2])
-      },
+      :method_add_arg => PASSBOTH,
+      :method_add_block => PASSBOTH,
       :mlhs_add => lambda { |sexp|
         resource(sexp[1])
         emit(", ") unless sexp[1] == [:mlhs_new]
@@ -728,13 +723,14 @@ module Sorcerer
       :redo => lambda { |sexp|
         emit("redo")
       },
-      :regexp_add => PASS2,
+      :regexp_add => PASSBOTH,
       :regexp_literal => lambda { |sexp|
         delims = determine_regexp_delimiters(sexp[2])
         emit(delims[0])
         resource(sexp[1])
         emit(delims[1])
       },
+      :regexp_new => NOOP,
       :rescue => lambda { |sexp|
         outdent do emit("rescue") end
         if sexp[1]                # Exception list
@@ -790,10 +786,7 @@ module Sorcerer
         resource(sexp[2]) if sexp[2]
       },
       :stmts_new => NOOP,
-      :string_add => lambda { |sexp|
-        resource(sexp[1])
-        resource(sexp[2])
-      },
+      :string_add => PASSBOTH,
       :string_concat => lambda { |sexp|
         resource(sexp[1])
         emit(" ")
@@ -903,10 +896,7 @@ module Sorcerer
         words("W", sexp)
       },
       :words_new => NOOP,
-      :xstring_add => lambda { |sexp|
-        resource(sexp[1])
-        resource(sexp[2])
-      },
+      :xstring_add => PASSBOTH,
       :xstring_literal => lambda { |sexp|
         emit('"')
         resource(sexp[1])

data/lib/sorcerer/version.rb

@@ -2,7 +2,7 @@ module Sorcerer
   VERSION_NUMBERS = [
     VERSION_MAJOR = 1,
     VERSION_MINOR = 0,
-    VERSION_BUILD = 1,
+    VERSION_BUILD = 2,
   ]
 
   VERSION = VERSION_NUMBERS.join('.')

data/test/sorcerer/resource_test.rb

@@ -276,6 +276,7 @@ class ResourceTest < Test::Unit::TestCase
     assert_resource "/[a-z]/"
     assert_resource "/\[a-z\]/"
     assert_resource '/#{name}/'
+    assert_resource '/before #{name} after/'
   end
 
   def test_can_source_regular_expressions_with_alternate_delimiters

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sorcerer
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Jim Weirich