live_ast_ripper 0.5.1 → 0.6.0

data/CHANGES.rdoc

@@ -1,6 +1,12 @@
 
 = live_ast_ripper ChangeLog
 
+== Version 0.6.0
+
+* added new testing API methods
+* fixed a recursion issue
+* optimized
+
 == Version 0.5.1
 
 * doc fixes

data/MANIFEST

@@ -2,6 +2,7 @@ CHANGES.rdoc
 MANIFEST
 README.rdoc
 Rakefile
-devel/jumpstart.rb
+devel/levitate.rb
 lib/live_ast_ripper.rb
-lib/live_ast_ripper/test_forms.rb
+lib/live_ast_ripper/test.rb
+lib/live_ast_ripper/version.rb

data/README.rdoc

@@ -3,7 +3,11 @@
 
 == Summary
 
-A Ripper-based parser plug-in for LiveAST.
+A Ripper-based parser plugin for LiveAST.
+
+== Install
+
+  % gem install live_ast_ripper
 
 == Links
 

data/Rakefile

@@ -1,12 +1,14 @@
-require_relative 'devel/jumpstart'
+require_relative 'devel/levitate'
 
-Jumpstart.new "live_ast_ripper" do |s|
+Levitate.new "live_ast_ripper" do |s|
   s.developers << ["James M. Lawrence", "quixoticsycophant@gmail.com"]
   s.github_user = "quix"
-  s.version = "0.5.1"
+  s.camel_name = "LiveASTRipper"
   s.description = s.summary
 end
 
-# testing done inside live_ast
 task :test do
+  puts "Testing is done with LiveAST test suite."
 end
+
+task :default => :test

data/devel/{jumpstart.rb → levitate.rb}

@@ -1,5 +1,5 @@
 
-class Jumpstart
+class Levitate
   class Installer
     def initialize
       require 'fileutils'
@@ -816,8 +816,8 @@ class Jumpstart
         begin
       }
       footer = %{
-        rescue Exception => __jumpstart_exception
-          puts "raises \#{__jumpstart_exception.class}"
+        rescue Exception => __levitate_exception
+          puts "raises \#{__levitate_exception.class}"
         end
       }
       final_code = header + code + footer
@@ -860,15 +860,15 @@ class Jumpstart
     end
 
     def doc_to_spec(file, *sections, &block)
-      jump = self
+      levitate = self
       describe file do
         sections.each { |section|
           describe "section `#{section}'" do
             it "should run as claimed" do
               if block
-                jump.run_doc_section(file, section, self, &block)
+                levitate.run_doc_section(file, section, self, &block)
               else
-                jump.run_doc_section(file, section, self) {
+                levitate.run_doc_section(file, section, self) {
                   |expected, actual, index|
                   actual.should == expected
                 }
@@ -880,14 +880,14 @@ class Jumpstart
     end
 
     def doc_to_test(file, *sections, &block)
-      jump = self
+      levitate = self
       klass = Class.new MiniTest::Unit::TestCase do
         sections.each { |section|
           define_method "test_#{file}_#{section}" do
             if block
-              jump.run_doc_section(file, section, self, &block)
+              levitate.run_doc_section(file, section, self, &block)
             else
-              jump.run_doc_section(file, section, self) {
+              levitate.run_doc_section(file, section, self) {
                 |expected, actual, index|
                 assert_equal expected, actual
               }

data/lib/live_ast_ripper.rb

@@ -1,19 +1,15 @@
 require 'live_ast/base'
 require 'ripper'
 
+#
+# Ripper-based parser plugin for LiveAST.
+#
 class LiveASTRipper
-  class << self
-    #
-    # Whether to strip line/column and other personality traits.
-    #
-    # This is Ripper-specific -- not part of the live_ast API.
-    #
-    attr_accessor :steamroll
-  end
-  
   #
-  # Returns a line --> sexp hash where sexp corresponds to the
-  # method or block defined at the given line.
+  # Returns a line-to-sexp hash where sexp corresponds to the method
+  # or block defined at the given line.
+  #
+  # This method is the only requirement of a LiveAST parser plugin.
   #
   def parse(code)
     @defs = {}
@@ -22,78 +18,56 @@ class LiveASTRipper
   end
 
   def process(sexp)
-    case sexp[0]
-    when :def
-      process_def(sexp)
-    when :method_add_block
-      process_method_add_block(sexp)
-    else
-      sexp.map { |elem|
-        elem.is_a?(Array) ? process(elem) : elem
-      }
-    end
-  end
-  
-  def process_def(sexp)
-    line = sexp[1][2][0]
-
-    result = []
-    result << sexp.shift
-    result << sexp.shift
-    result << process(sexp.shift)
-    result << process(sexp.shift)
-
-    result = steamroll(result) if LiveASTRipper.steamroll
-    store_sexp(result, line)
-
-    []
-  end
-
-  def process_method_add_block(sexp)
-    line = 
-      case sexp[1][0]
-      when :method_add_arg
-        sexp[1][1][1].last[0]
-      when :call, :command_call
-        sexp[1][3][2][0]
-      when :command
-        sexp[1][1][2][0]
+    line =
+      case sexp.first
+      when :def
+        sexp[1][2][0]
+      when :method_add_block
+        case sexp[1][0]
+        when :method_add_arg
+          sexp[1][1][1].last[0]
+        when :call, :command_call
+          sexp[1][3][2][0]
+        when :command
+          sexp[1][1][2][0]
+        end
       end
 
-    result = []
-    result << sexp.shift
-    result << process(sexp.shift)
-    result << process(sexp.shift)
-    
-    result = steamroll(result) if LiveASTRipper.steamroll
-    store_sexp(result, line)
+    if line
+      @defs[line] = @defs.has_key?(line) ? :multiple : sexp
+    end
 
-    []
-  end
+    steamroll(sexp) if LiveASTRipper.steamroll
 
-  def store_sexp(sexp, line)
-    @defs[line] = @defs.has_key?(line) ? :multiple : sexp
+    sexp.each do |elem|
+      process(elem) if elem.is_a? Array
+    end
   end
 
   def steamroll(sexp)
-    sexp.map { |elem|
-      if elem.is_a? Array
-        sub_elem = 
-          if elem[0].is_a?(Symbol) and elem[0][0] == "@"
-            elem[0..-2]
-          else
-            elem
-          end
-        steamroll(sub_elem)
-      elsif elem == :brace_block or elem == :do_block
+    if sexp.first.is_a?(Symbol) and sexp.first[0] == "@"
+      # remove [line, column]
+      sexp.pop
+    end
+    
+    sexp.map! { |elem|
+      case elem
+      when :brace_block, :do_block
         :block
       else
         elem
       end
     }
   end
+
+  class << self
+    #
+    # Whether to strip line/column and other personality traits.
+    #
+    attr_accessor :steamroll
+  end
 end
 
-LiveASTRipper.autoload :TestForms, "live_ast_ripper/test_forms"
+LiveASTRipper.autoload :Test, "live_ast_ripper/test"
 
 LiveAST.parser = LiveASTRipper

data/lib/live_ast_ripper/{test_forms.rb → test.rb}

@@ -1,6 +1,8 @@
 
-# For testing with LiveAST.
-module LiveASTRipper::TestForms
+#
+# Used by the LiveAST test suite.
+#
+module LiveASTRipper::Test
   #
   # no_arg_def(:f, "A#f") returns the ast of
   #
@@ -211,7 +213,67 @@ module LiveASTRipper::TestForms
         op,
         [:var_ref, [:@ident, "y"]]]]]]
   end
+
+  #
+  # nested_lambdas("foo") returns the ast of
+  #
+  #   lambda {
+  #     lambda {
+  #       "foo"
+  #     }
+  #   }
+  #  
+  def nested_lambdas(str)
+    [:method_add_block,
+     [:method_add_arg, [:fcall, [:@ident, "lambda"]], []],
+     [:block,
+      nil,
+      [[:method_add_block,
+        [:method_add_arg, [:fcall, [:@ident, "lambda"]], []],
+        [:block,
+         nil,
+         [[:string_literal,
+           [:string_content, [:@tstring_content, str]]]]]]]]]
+  end
+    
+  # nested_defs(:f, :g, "foo") returns the ast of
+  #
+  #   def f
+  #     Class.new do
+  #       def g
+  #         "foo"
+  #       end
+  #     end
+  #   end
+  #   
+  def nested_defs(u, v, str)
+    [:def,
+     [:@ident, u.to_s],
+     [:params, nil, nil, nil, nil, nil],
+     [:bodystmt,
+      [[:method_add_block,
+        [:call,
+         [:var_ref, [:@const, "Class"]],
+         :".",
+         [:@ident, "new"]],
+        [:block,
+         nil,
+         [[:def,
+           [:@ident, v.to_s],
+           [:params, nil, nil, nil, nil, nil],
+           [:bodystmt,
+            [[:string_literal,
+              [:string_content, [:@tstring_content, str]]]],
+            nil,
+            nil,
+            nil]]]]]],
+      nil,
+      nil,
+      nil]]
+  end
 end
 
+#
 # testing assumes sexps are steamrolled
+#
 LiveASTRipper.steamroll = true

data/lib/live_ast_ripper/version.rb

@@ -0,0 +1,3 @@
+module LiveASTRipper
+  VERSION = "0.6.0"
+end

metadata

@@ -2,7 +2,7 @@
 name: live_ast_ripper
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors: 
 - James M. Lawrence
@@ -10,11 +10,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-24 00:00:00 -05:00
+date: 2011-02-26 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
-description: A Ripper-based parser plug-in for LiveAST.
+description: A Ripper-based parser plugin for LiveAST.
 email: 
 - quixoticsycophant@gmail.com
 executables: []
@@ -27,9 +27,10 @@ files:
 - CHANGES.rdoc
 - README.rdoc
 - Rakefile
-- devel/jumpstart.rb
+- devel/levitate.rb
 - lib/live_ast_ripper.rb
-- lib/live_ast_ripper/test_forms.rb
+- lib/live_ast_ripper/test.rb
+- lib/live_ast_ripper/version.rb
 - MANIFEST
 has_rdoc: true
 homepage: http://quix.github.com/live_ast_ripper
@@ -40,7 +41,7 @@ rdoc_options:
 - --main
 - README.rdoc
 - --title
-- "live_ast_ripper: A Ripper-based parser plug-in for LiveAST."
+- "live_ast_ripper: A Ripper-based parser plugin for LiveAST."
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -61,6 +62,6 @@ rubyforge_project:
 rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
-summary: A Ripper-based parser plug-in for LiveAST.
+summary: A Ripper-based parser plugin for LiveAST.
 test_files: []