sorcerer 0.0.4 → 0.0.5

data/Rakefile

@@ -13,7 +13,7 @@ end
 
 PROJ = 'sorcerer'
 RUBY = ENV['RUBY19'] || 'ruby19'
-PKG_VERSION = '0.0.4'
+PKG_VERSION = '0.0.5'
 
 PKG_FILES = FileList[
   'README.textile',

data/lib/sorcerer/subexpression.rb

@@ -32,19 +32,34 @@ module Sorcerer
 
     def tagged_sexp(sexp)
       case sexp.first
-      when :var_ref, :binary, :call, :array, :hash, :unary
+      when :var_ref, :binary, :array, :hash, :unary
         @result << sexp
         list_sexp(sexp)
       when :aref
         @result << sexp
         recur(sexp[2])
-      when :method_add_arg
+      when :brace_block
+        # ignore
+      when :call, :method_add_block, :method_add_arg
         @result << sexp
-        recur(sexp[1][1])
-        list_sexp(sexp[2])
+        method_sexp(sexp)
       else
         list_sexp(sexp)
       end
     end
+
+    def method_sexp(sexp)
+      case sexp.first
+      when :call
+        recur(sexp[1])
+      when :method_add_block
+        method_sexp(sexp[1])
+      when :method_add_arg
+        recur(sexp[2])
+        method_sexp(sexp[1])
+      else
+        recur(sexp)
+      end
+    end
   end
 end

data/rakelib/git.rake

@@ -0,0 +1,13 @@
+
+namespace "git" do
+  desc "Tag the current version of the project as #{PROJ}-#{PKG_VERSION}"
+  task :tag do
+    sh "git tag #{PROJ}-#{PKG_VERSION}"
+  end
+
+  desc "Build and Push the current gem"
+  task :push => :gem do
+    sh "gem push pkg/#{PROJ}-#{PKG_VERSION}.gem"
+  end
+   
+end

data/test/sorcerer/subexpression_test.rb

@@ -38,13 +38,18 @@ class SubexpressionTest < Test::Unit::TestCase
   def test_method_calls_with_args
     assert_subexpressions "o.f()", ["o.f()", "o"]
     assert_subexpressions "o.f(a, b)", [
-      "o.f(a, b)", "o", "a", "b"
+      "o.f(a, b)", "a", "b", "o"
     ]
     assert_subexpressions "f(a, b)", [
       "f(a, b)", "a", "b"
     ]
   end
 
+  def test_method_calls_with_blocks
+    assert_subexpressions "o.f { a }", ["o.f { a }", "o"]
+    assert_subexpressions "o.f(z) { a }", ["o.f(z) { a }", "z", "o"]
+  end
+
   def test_array_reference
     assert_subexpressions "a[i]", ["a[i]", "i"]
   end
@@ -66,13 +71,13 @@ class SubexpressionTest < Test::Unit::TestCase
   end
 
   def test_complex_expression
-    assert_subexpressions "o.f(a+b, c*d, x.y, z(k, 2, 3))", [
-      "o.f(a + b, c * d, x.y, z(k, 2, 3))",
-      "o",
+    assert_subexpressions "o.f(a+b, c*d, x.y, z(k, 2, 3)) { xx }", [
+      "o.f(a + b, c * d, x.y, z(k, 2, 3)) { xx }",
       "a + b", "a", "b",
       "c * d", "c", "d", 
       "x.y", "x",
       "z(k, 2, 3)", "k",
+      "o",
     ]
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sorcerer
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Jim Weirich
@@ -25,6 +25,7 @@ files:
 - README.textile
 - Rakefile
 - doc/jamis.rb
+- rakelib/git.rake
 - rakelib/readme.rake
 - lib/sorcerer/resource.rb
 - lib/sorcerer/subexpression.rb