sorcerer 0.3.0 → 0.3.1

data/README.textile

@@ -7,6 +7,8 @@ p. 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.1*
+
 h2. Limitations
 
 Sorcerer is only testing on Ruby 1.9.
@@ -120,8 +122,16 @@ output emitted, then use the debug option:
 h2. History
 
 * 0.0.7 - Basic single line version
+
 * 0.1.0 - Added support for multi-line output. Improved rendering of a
-   number of constructs
+          number of constructs
+
 * 0.2.0 - Added support for indented output.
 
+* 0.3.0 - New hash literal support. Multi-line output always end with
+          a newline.
+
+* 0.3.1 - 1.9.3 support. Indenting stabby procs. RedCloth not required
+          for testing.
+
 

data/lib/sorcerer/resource.rb

@@ -261,6 +261,11 @@ module Sorcerer
     PASS2 = lambda { |sexp| resource(sexp[2]) }
     EMIT1 = lambda { |sexp| emit(sexp[1]) }
 
+    # Earlier versions of ripper miss array node for words, see
+    # http://bugs.ruby-lang.org/issues/4365 for more details
+    MISSES_ARRAY_NODE_FOR_WORDS = RUBY_VERSION < '1.9.2' ||
+      (RUBY_VERSION == '1.9.2' && RUBY_PATCHLEVEL < 320)
+
     HANDLERS = {
       # parser keywords
 
@@ -345,9 +350,15 @@ module Sorcerer
       :args_new => NOOP,
       :args_prepend => NYI,
       :array => lambda { |sexp|
-        emit("[")
-        resource(sexp[1]) if sexp[1]
-        emit("]")
+        if !MISSES_ARRAY_NODE_FOR_WORDS &&
+             sexp[1] &&
+             [:words_add, :qwords_add].include?(sexp[1].first)
+          resource(sexp[1])
+        else
+          emit("[")
+          resource(sexp[1]) if sexp[1]
+          emit("]")
+        end
       },
       :assign => lambda { |sexp|
         resource(sexp[1])
@@ -580,14 +591,16 @@ module Sorcerer
         emit("->")
         resource(sexp[1])
         emit(" {")
-        if ! void?(sexp[2])
-          soft_newline
-          resource(sexp[2])
-        end
-        if void?(sexp[2])
-          emit(" ")
-        else
-          soft_newline
+        indent do
+          if ! void?(sexp[2])
+            soft_newline
+            resource(sexp[2])
+          end
+          if void?(sexp[2])
+            emit(" ")
+          else
+            soft_newline
+          end
         end
         emit("}")
       },
@@ -698,9 +711,16 @@ module Sorcerer
         end
       },
       :rescue_mod => lambda { |sexp|
-        resource(sexp[2])
+        if RUBY_VERSION <= '1.9.2'
+          # Pre ruby 1.9.3 these nodes were returned in the reverse order, see
+          # http://bugs.ruby-lang.org/issues/4716 for more details
+          first_node, second_node = sexp[2], sexp[1]
+        else
+          first_node, second_node = sexp[1], sexp[2]
+        end
+        resource(first_node)
         emit(" rescue ")
-        resource(sexp[1])
+        resource(second_node)
       },
       :rest_param => lambda { |sexp|
         emit("*")
@@ -796,6 +816,7 @@ module Sorcerer
       :var_alias => NYI,
       :var_field => PASS1,
       :var_ref => PASS1,
+      :vcall => PASS1,
       :void_stmt => NOOP,
       :when => lambda { |sexp|
         outdent do emit("when ") end

data/lib/sorcerer/subexpression.rb

@@ -32,7 +32,7 @@ module Sorcerer
 
     def tagged_sexp(sexp)
       case sexp.first
-      when :var_ref, :binary, :array, :hash, :unary
+      when :var_ref, :vcall, :binary, :array, :hash, :unary
         @result << sexp
         list_sexp(sexp)
       when :aref

data/lib/sorcerer/version.rb

@@ -1,7 +1,7 @@
 module Sorcerer
   VERSION_MAJOR = 0
   VERSION_MINOR = 3
-  VERSION_BUILD = 0
+  VERSION_BUILD = 1
   VERSION_BETA  = 0
 
   VERSION_NUMBERS = [VERSION_MAJOR, VERSION_MINOR, VERSION_BUILD] +

data/rakelib/git.rake

@@ -1,4 +1,3 @@
-
 namespace "git" do
   desc "Tag the current version of the project as #{PROJ}-#{PKG_VERSION}"
   task :tag do

data/rakelib/readme.rake

@@ -1,19 +1,44 @@
 #!/usr/bin/env ruby
 
-require 'redcloth'
+begin
+  require 'redcloth'
+  directory "html"
 
-directory "html"
+  desc "Display the README file"
+  task :readme => "html/README.html" do
+    sh "open html/README.html"
+  end
 
-desc "Display the README file"
-task :readme => "html/README.html" do
-  sh "open html/README.html"
-end
+  desc "format the README file"
+  task "html/README.html" => ['html', 'README.textile', "readme:update"] do
+    open("README.textile") do |source|
+      open('html/README.html', 'w') do |out|
+        out.write(RedCloth.new(source.read).to_html)
+      end
+    end
+  end
 
-desc "format the README file"
-task "html/README.html" => ['html', 'README.textile'] do
-  open("README.textile") do |source|
-    open('html/README.html', 'w') do |out|
-      out.write(RedCloth.new(source.read).to_html)
+  namespace "readme" do
+    desc "Update the version in the readme"
+    task :update do
+      open("README.textile") do |ins|
+        open("new_readme.txt", "w") do |outs|
+          while line = ins.gets
+            if line =~ /^\*Version: .*\*$/
+              line = "*Version: #{PKG_VERSION}*"
+            end
+            outs.puts line
+          end
+        end
+      end
+      mv "README.textile", "README.bak"
+      mv "new_readme.txt", "README.textile"
     end
   end
+
+rescue LoadError => ex
+  task :readme do
+    fail "Install RedCloth to generate the README"
+  end
 end
+

data/test/sorcerer/resource_test.rb

@@ -32,10 +32,10 @@ class SourcerTest < Test::Unit::TestCase
   # * "#" is expected to be a tabbed indent in indent mode and a null
   # string in single line and multi-line modes.
   #
-  def assert_resource_lines(string)
-    assert_resource_for_mode(string, multiline: false) { |s| for_single_line(s) }
-    assert_resource_for_mode(string, multiline: true)  { |s| for_multi_line(s) }
-    assert_resource_for_mode(string, indent: true)     { |s| for_indented(s) }
+  def assert_resource_lines(string, options={})
+    assert_resource_for_mode(string, options.merge(multiline: false)) { |s| for_single_line(s) }
+    assert_resource_for_mode(string, options.merge(multiline: true))  { |s| for_multi_line(s) }
+    assert_resource_for_mode(string, options.merge(indent: true))     { |s| for_indented(s) }
   end
 
   # Assert the string is correctly resourced given the options and the
@@ -68,12 +68,20 @@ class SourcerTest < Test::Unit::TestCase
       gsub(/#/,'  ') + "\n"
   end
 
+  def quietly
+    original_verbosity = $VERBOSE
+    $VERBOSE = nil
+    yield
+  ensure
+    $VERBOSE = original_verbosity
+  end
+
   def source(string, options={})
     if options[:debug]
       puts
       puts "***************************** options: #{options.inspect}"
     end
-    sexp = Ripper::SexpBuilder.new(string).parse
+    sexp = quietly { Ripper::SexpBuilder.new(string).parse }
     fail "Failed to parts '#{string}'" if sexp.nil?
     Sorcerer.source(sexp, options)
   end
@@ -151,7 +159,7 @@ class SourcerTest < Test::Unit::TestCase
     assert_resource "meth &code"
     assert_resource "meth a, &code"
     assert_resource "meth a, *args, &code"
-    assert_resource "meth a, *args do |x| x.y end",
+    assert_resource "meth a, *args do |x| x.y end"
   end
 
   def test_can_source_method_with_bare_assoc
@@ -204,7 +212,7 @@ class SourcerTest < Test::Unit::TestCase
     assert_resource_lines "->(a, b) { }"
     assert_resource_lines "->(a, *args) { }"
     assert_resource_lines "->(a, b=12, *args, &block) { }"
-    assert_resource_lines "->(a) {~b~}"
+    assert_resource_lines "->(a) {~#b~}"
   end
 
   def test_can_source_dot_calls
@@ -623,7 +631,7 @@ class SourcerTest < Test::Unit::TestCase
   end
 
   def test_can_use_ripper_sexp_output
-    sexp = Ripper.sexp("a = 1")
+    sexp = quietly { Ripper.sexp("a = 1") }
     assert_equal "a = 1", Sorcerer.source(sexp)
   end
 

metadata

@@ -1,27 +1,23 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sorcerer
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.3.1
   prerelease: 
-  version: 0.3.0
 platform: ruby
-authors: 
+authors:
 - Jim Weirich
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-07-05 00:00:00 Z
+date: 2012-07-09 00:00:00.000000000 Z
 dependencies: []
-
-description: Generate the original Ruby source from a Ripper-style abstract syntax tree.
+description: Generate the original Ruby source from a Ripper-style abstract syntax
+  tree.
 email: jim.weirich@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - README.textile
 - Rakefile
 - doc/jamis.rb
@@ -36,35 +32,32 @@ files:
 - test/sorcerer/subexpression_test.rb
 homepage: http://github.com/jimweirich/sorcerer
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --line-numbers
 - --inline-source
 - --main
 - README.textile
 - --title
 - Rake -- Ruby Make
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: sorcerer
 rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Generate Source from Ripper ASTs
 test_files: []
-