sorcerer 0.3.10 → 0.3.11

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f65acc7f174926768d7515c943f2895106a79f80
+  data.tar.gz: 79dce6386aa13cef261f88b20be6594406f325d9
+SHA512:
+  metadata.gz: 471a9b64f1487826f2f7ee8b3844d655004765b338686debdab40c3a173bf8b0ad5b36bd544eab9adf2eb0901acd480261c5761b233e51a0d76221efdb2d1e15
+  data.tar.gz: 67d2541e79034a1172be87e26eeddb02bfa9346a607d82d578531f1883f0919a9ba436c9687ae2062f8fd225ada3661fcbc3de68247ebf29852f074ce3d63d64

data/README.md

@@ -11,7 +11,7 @@ Sorcerer is targetted mainly at small snippets of Ruby code,
 expressable in a single line. Longer examples may be re-sourced, but
 they will be rendered in a single line format.
 
-**Version: 0.3.10**
+**Version: 0.3.11**
 
 ## Limitations
 
@@ -123,6 +123,11 @@ output emitted, then use the debug option:
   puts Sorcerer.source(sexp, debug: true)
 ```
 
+## License
+
+Sorcerer is available under the terms of the MIT license. See the
+MIT-LICENSE file for details.
+
 ## History
 
 * 0.3.9 - Support %i{} and %I{}.

data/lib/sorcerer/subexpression.rb

@@ -34,18 +34,30 @@ module Sorcerer
       case sexp.first
       when :var_ref
         list_sexp(sexp)
-      when :vcall, :binary, :array, :hash, :unary, :defined
+      when :vcall               # [:vcall, target]
+        @result << sexp
+      when :fcall               # [:fcall, target]
+        # ignore
+      when :call                # [:call, target, ".", meth]
+        @result << sexp
+        recur(sexp[3])
+        recur(sexp[1])
+      when :method_add_arg      # [:method_add_arg, call, args]
+        @result << sexp
+        recur(sexp[2])
+        within_method_sexp(sexp[1])
+      when :method_add_block    # [:method_add_block, call, block]
+        @result << sexp
+        within_method_sexp(sexp[1])
+      when :binary, :array, :hash, :unary, :defined
         @result << sexp
         list_sexp(sexp)
       when :aref
         @result << sexp
         recur(sexp[1])
         recur(sexp[2])
-      when :brace_block
+      when :brace_block         # [:brace_block, nil, statments]
         # ignore
-      when :call, :method_add_block, :method_add_arg
-        @result << sexp
-        method_sexp(sexp)
       when :const_path_ref
         @result << sexp
         recur(sexp[1])
@@ -61,15 +73,17 @@ module Sorcerer
       end
     end
 
-    def method_sexp(sexp)
+    # When already handling a method call, we don't need to recur on
+    # some items.
+    def within_method_sexp(sexp)
       case sexp.first
-      when :call
+      when :call                # [:call, target, ".", meth]
         recur(sexp[1])
-      when :method_add_block
-        method_sexp(sexp[1])
-      when :method_add_arg
+      when :method_add_block    # [:method_add_block, call, block]
+        within_method_sexp(sexp[1])
+      when :method_add_arg      # [:method_add_arg, call, args]
         recur(sexp[2])
-        method_sexp(sexp[1])
+        within_method_sexp(sexp[1])
       else
         recur(sexp)
       end

data/lib/sorcerer/version.rb

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

data/test/sorcerer/resource_test.rb

@@ -117,6 +117,7 @@ class ResourceTest < Test::Unit::TestCase
     # I don't think we get enough info to accurately resource these.
     # All these calls come back with a period rather than a double
     # colon.
+    skip "Can't resource methods calls with ::"
     assert_resource "Const::meth(a)"
     assert_resource "Const::meth(a, b)"
     assert_resource "Const::meth(a, *b)"
@@ -134,7 +135,14 @@ class ResourceTest < Test::Unit::TestCase
     assert_resource "meth(a, *args, &code)"
   end
 
-  def test_can_source_method_without_explicit_poetry_mode
+  def test_can_source_capitalized_method_without_explicit_target
+    assert_resource "Meth()"
+    assert_resource "Meth a"
+    assert_resource "Meth(a)"
+    assert_resource "Meth { a }"
+  end
+
+  def test_can_source_method_without_explicit_target_in_poetry_mode
     assert_resource "meth a"
     assert_resource "meth a, b"
     assert_resource "meth a, b, c"
@@ -586,6 +594,10 @@ class ResourceTest < Test::Unit::TestCase
     assert_resource_lines "def f &block; end"
   end
 
+  def test_can_source_capitalized_def
+    assert_resource_lines "def F(); end"
+  end
+
   if RUBY_VERSION >= "2.0.0"
     def test_can_source_ruby2_defs
       assert_resource_lines "def f(a, b=1, *args, c: 2, **opts, &block); end"

data/test/sorcerer/subexpression_test.rb

@@ -4,9 +4,10 @@ require 'ripper'
 require 'pp'
 
 class SubexpressionTest < Test::Unit::TestCase
-  def assert_subexpressions(code, subexpressions, debug=false)
+  def assert_subexpressions(code, subexpressions, options={})
     sexp = Ripper::SexpBuilder.new(code).parse
-    if debug
+    if options[:debug]
+      puts "CODE: <#{code}>"
       pp sexp
     end
     subs = Sorcerer.subexpressions(sexp)
@@ -32,7 +33,9 @@ class SubexpressionTest < Test::Unit::TestCase
 
   def test_method_calls_without_args
     assert_subexpressions "o.f", ["o.f", "o"]
+    assert_subexpressions "f",   ["f"]
     assert_subexpressions "f()", ["f()"]
+    assert_subexpressions "F()", ["F()"]
   end
 
   def test_method_calls_with_args

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sorcerer
 version: !ruby/object:Gem::Version
-  version: 0.3.10
-  prerelease: 
+  version: 0.3.11
 platform: ruby
 authors:
 - Jim Weirich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-06 00:00:00.000000000 Z
+date: 2013-07-10 00:00:00.000000000 Z
 dependencies: []
 description: Generate the original Ruby source from a Ripper-style abstract syntax
   tree.
@@ -35,6 +34,7 @@ files:
 - test/sorcerer/subexpression_test.rb
 homepage: http://github.com/jimweirich/sorcerer
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --line-numbers
@@ -44,21 +44,19 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: sorcerer
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Generate Source from Ripper ASTs
 test_files: []