live_ast 0.5.2 → 0.6.0

data/CHANGES.rdoc

@@ -1,6 +1,12 @@
 
 = LiveAST ChangeLog
 
+== Version 0.6.0
+
+* removed FlushError and NoSourceError -- not possible to distinguish these
+* added more tests
+* refined testing API for plugins
+
 == Version 0.5.2
 
 * fix default plugin version

data/MANIFEST

@@ -2,7 +2,7 @@ CHANGES.rdoc
 MANIFEST
 README.rdoc
 Rakefile
-devel/jumpstart.rb
+devel/levitate.rb
 lib/live_ast.rb
 lib/live_ast/ast_eval.rb
 lib/live_ast/ast_load.rb
@@ -19,6 +19,7 @@ lib/live_ast/to_ruby.rb
 lib/live_ast/version.rb
 test/ast_eval_feature_test.rb
 test/ast_load_feature_test.rb
+test/attr_test.rb
 test/backtrace_test.rb
 test/covert_define_method_test.rb
 test/def_test.rb
@@ -44,6 +45,7 @@ test/lambda_test.rb
 test/load_path_test.rb
 test/load_test.rb
 test/main.rb
+test/nested_test.rb
 test/noninvasive_test.rb
 test/readme_test.rb
 test/recursive_eval_test.rb

data/README.rdoc

@@ -182,8 +182,8 @@ To override the default parser,
   LiveAST.parser = YourParser
 
 To test it, provide some examples of what the ASTs look like in
-<code>YourParser::TestForms</code>. See the +live_ast_ruby_parser+ gem
-for reference.
+<code>YourParser::Test</code>. See the +live_ast_ruby_parser+ gem for
+reference.
 
 == Noninvasive Mode
 
@@ -223,12 +223,12 @@ The following alternative interface is available.
   # => s(:defn, :f, s(:args), s(:scope, s(:block, s(:str, "A#f"))))
 
   p LiveAST.ast(lambda { })
-  # => s(:iter, s(:call, nil, :lambda, s(:arglist)), nil, nil)
+  # => s(:iter, s(:call, nil, :lambda, s(:arglist)), nil)
 
   f = LiveAST.eval("lambda { }", binding)
 
   p LiveAST.ast(f) 
-  # => s(:iter, s(:call, nil, :lambda, s(:arglist)), nil, nil)
+  # => s(:iter, s(:call, nil, :lambda, s(:arglist)), nil)
   
   ast_eval  # => raises NameError
 

data/Rakefile

@@ -1,6 +1,6 @@
-require_relative 'devel/jumpstart'
+require_relative 'devel/levitate'
 
-Jumpstart.new "live_ast" do |s|
+Levitate.new "live_ast" do |s|
   s.developers << ["James M. Lawrence", "quixoticsycophant@gmail.com"]
   s.github_user = "quix"
   s.rubyforge_info = ["quix", "liveast"]
@@ -16,5 +16,5 @@ Jumpstart.new "live_ast" do |s|
   ]
   s.rdoc_options << "-a"
   
-  s.dependencies << ["live_ast_ruby_parser", ">= 0.5.1"]
+  s.dependencies << ["live_ast_ruby_parser", ">= 0.6.0"]
 end

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/error.rb

@@ -7,23 +7,14 @@ module LiveAST
   end
 
   class ASTNotFoundError < StandardError
-  end
-
-  class RawEvalError < ASTNotFoundError
     def message
-      "Must use ast_eval instead of eval in order to obtain AST."
-    end
-  end
-  
-  class NoSourceError < ASTNotFoundError
-    def message
-      "No source found for the requested AST."
+      "The requested AST could not be found (AST flushed or compiled code)."
     end
   end
 
-  class FlushedError < ASTNotFoundError
+  class RawEvalError < ASTNotFoundError
     def message
-      "The requested AST was flushed from the cache."
+      "Must use ast_eval instead of eval in order to obtain AST."
     end
   end
 end

data/lib/live_ast/linker.rb

@@ -53,7 +53,7 @@ module LiveAST
       def find_proc_ast(obj)
         @mutex.synchronize do
           fetch_proc_attachment(obj) or (
-            ast = find_ast(*obj.source_location) or raise FlushedError
+            ast = find_ast(*obj.source_location) or raise ASTNotFoundError
             attach_to_proc(obj, ast)
           )
         end
@@ -63,7 +63,7 @@ module LiveAST
         @mutex.synchronize do
           case ast = find_ast(*location)
           when nil
-            fetch_method_attachment(klass, name) or raise FlushedError
+            fetch_method_attachment(klass, name) or raise ASTNotFoundError
           else
             attach_to_method(klass, name, ast)
           end
@@ -71,7 +71,7 @@ module LiveAST
       end
 
       def find_ast(*location)
-        raise NoSourceError unless location.size == 2
+        raise ASTNotFoundError unless location.size == 2
         raise RawEvalError if location.first == "(eval)"
         ast = fetch_from_cache(*location)
         raise MultipleDefinitionsOnSameLineError if ast == :multiple

data/lib/live_ast/version.rb

@@ -1,3 +1,3 @@
 module LiveAST
-  VERSION = "0.5.2"
+  VERSION = "0.6.0"
 end

data/test/attr_test.rb

@@ -0,0 +1,24 @@
+require_relative 'main'
+
+class AttrTest < RegularTest
+  class A
+    attr_accessor :f
+    attr_reader :g
+    attr_writer :h
+  end
+
+  def test_attr
+    assert_raises LiveAST::ASTNotFoundError do
+      A.instance_method(:f).to_ast
+    end
+    assert_raises LiveAST::ASTNotFoundError do
+      A.instance_method(:f=).to_ast
+    end
+    assert_raises LiveAST::ASTNotFoundError do
+      A.instance_method(:g).to_ast
+    end
+    assert_raises LiveAST::ASTNotFoundError do
+      A.instance_method(:h=).to_ast
+    end
+  end
+end

data/test/error_test.rb

@@ -23,7 +23,7 @@ class ErrorTest < RegularTest
   end
 
   def test_ast_not_found
-    assert_raises LiveAST::NoSourceError do
+    assert_raises LiveAST::ASTNotFoundError do
       File.method(:open).to_ast
     end
   end

data/test/flush_cache_test.rb

@@ -39,7 +39,7 @@ define_unsorted_test_case "FlushCacheTest", RegularTest do
 
     LiveAST.flush_cache
 
-    assert_raises LiveAST::FlushedError do
+    assert_raises LiveAST::ASTNotFoundError do
       klass.instance_method(:g).to_ast
     end
   end
@@ -59,7 +59,7 @@ define_unsorted_test_case "FlushCacheTest", RegularTest do
     assert_equal f_ast.object_id,
                  klass.instance_method(:f).to_ast.object_id
 
-    assert_raises LiveAST::FlushedError do
+    assert_raises LiveAST::ASTNotFoundError do
       klass.instance_method(:g).to_ast
     end
   end
@@ -91,7 +91,7 @@ define_unsorted_test_case "FlushCacheTest", RegularTest do
 
     assert_equal a_ast.object_id, a.to_ast.object_id
     
-    assert_raises LiveAST::FlushedError do
+    assert_raises LiveAST::ASTNotFoundError do
       b.to_ast
     end
   end

data/test/main.rb

@@ -30,7 +30,7 @@ class JLMiniTest < MiniTest::Unit::TestCase
   end
 
   def delim(char)
-    ":\n" << (char*72) << "\n"
+    "\n" << (char*72) << "\n"
   end
 
   def mu_pp(obj)
@@ -74,7 +74,7 @@ class JLMiniTest < MiniTest::Unit::TestCase
 end
 
 class BaseTest < JLMiniTest
-  include LiveAST.parser::TestForms
+  include LiveAST.parser::Test
 
   DATA_DIR = File.expand_path(File.dirname(__FILE__) + "/data")
 

data/test/nested_test.rb

@@ -0,0 +1,29 @@
+require_relative 'main'
+
+class NestedTest < RegularTest
+  def test_lambda
+    a = lambda {
+      lambda {
+        "33"
+      }
+    }
+    
+    assert_equal nested_lambdas("33"), a.to_ast
+    assert_equal no_arg_block(:lambda, "33"), a.call.to_ast
+  end
+
+  class A
+    def f
+      Class.new do
+        def g
+          "44"
+        end
+      end
+    end
+  end
+
+  def test_defs
+    assert_equal nested_defs(:f, :g, "44"), A.instance_method(:f).to_ast
+    assert_equal no_arg_def(:g, "44"), A.new.f.instance_method(:g).to_ast
+  end
+end

data/test/readme_test.rb

@@ -1,7 +1,8 @@
 require_relative 'main'
-require_relative '../devel/jumpstart'
+require_relative '../devel/levitate'
 
-if LiveAST.parser.respond_to?(:unified?) and LiveAST.parser.unified?
+if LiveAST.parser::Test.respond_to?(:unified_sexp?) and
+    LiveAST.parser::Test.unified_sexp?
   sections = [
     "Synopsis",
     "Loading Source",
@@ -9,5 +10,5 @@ if LiveAST.parser.respond_to?(:unified?) and LiveAST.parser.unified?
     "+to_ruby+",
   ]
 
-  Jumpstart.doc_to_test("README.rdoc", *sections)
+  Levitate.doc_to_test("README.rdoc", *sections)
 end

data/test/to_ruby_test.rb

@@ -83,6 +83,5 @@ class AAC_ToRubyTest < RegularTest
     end.instance_method(:f).to_ruby
     assert_equal src, dst
   end
-end if (un = LiveAST.parser::Unparser rescue nil) &&
-       un.respond_to?(:ruby2ruby?) &&
-       un.ruby2ruby?
+end if LiveAST.parser::Test.respond_to?(:unparser_matches_ruby2ruby?) &&
+       LiveAST.parser::Test.unparser_matches_ruby2ruby?

metadata

@@ -2,7 +2,7 @@
 name: live_ast
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors: 
 - James M. Lawrence
@@ -10,7 +10,7 @@ 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: 
 - !ruby/object:Gem::Dependency 
@@ -21,7 +21,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.5.1
+        version: 0.6.0
   type: :runtime
   version_requirements: *id001
 description: LiveAST enables a program to find the ASTs of objects created by dynamically generated code.
@@ -37,7 +37,7 @@ files:
 - CHANGES.rdoc
 - README.rdoc
 - Rakefile
-- devel/jumpstart.rb
+- devel/levitate.rb
 - lib/live_ast.rb
 - lib/live_ast/ast_eval.rb
 - lib/live_ast/ast_load.rb
@@ -54,6 +54,7 @@ files:
 - lib/live_ast/version.rb
 - test/ast_eval_feature_test.rb
 - test/ast_load_feature_test.rb
+- test/attr_test.rb
 - test/backtrace_test.rb
 - test/covert_define_method_test.rb
 - test/def_test.rb
@@ -79,6 +80,7 @@ files:
 - test/load_path_test.rb
 - test/load_test.rb
 - test/main.rb
+- test/nested_test.rb
 - test/noninvasive_test.rb
 - test/readme_test.rb
 - test/recursive_eval_test.rb