picard 0.1 → 0.2.1

data/Gemfile

@@ -1,3 +1,3 @@
 source "http://rubygems.org"
-
-gemspec
+gem 'rake'
+gemspec

data/lib/picard.rb

@@ -1,12 +1 @@
-require "picard/version"
-
-require_relative 'picard/extensions'
-require_relative 'picard/context'
-require_relative 'picard/error_message_formatter'
-require_relative 'picard/ast_helper'
-require_relative 'picard/assertion_wrapper'
-require_relative 'picard/s_expression_sugar'
-require_relative 'picard/class_ripper'
-require_relative 'picard/preprocessor'
-require_relative 'picard/method_ripper'
-require_relative 'picard/test_unit'
+require_relative 'picard_02'

data/lib/picard/assertion_wrapper.rb

@@ -1,43 +1,95 @@
-require 'live_ast'
 require 'ruby2ruby'
 require_relative 's_expression_sugar'
 
 module Picard
+
+  class BasicAssertion
+    def extract_argument ast
+      ast[3][1]
+    end
+
+    def extract_receiver ast
+      ast[1]
+    end
+  end
+
+  class Default < BasicAssertion
+    def === ast
+      true
+    end
+
+    def transform ast, message
+      s(:call, nil, :assert, s(:arglist,ast, s(:str, message)))
+    end
+  end
+
+  class EqualTo < BasicAssertion
+    def === ast
+      ast[0] == :call and ast[2] == :==
+    end
+
+    def transform ast, message
+      s(:call, nil,
+          :assert_equal,
+            s(:arglist,
+              extract_argument(ast),
+              extract_receiver(ast),
+              s(:str, message)))
+    end
+  end
+
+  class NotEqualTo < BasicAssertion
+    def === ast
+      ast[0] == :call and ast[2] == :'!='
+    end
+
+    def transform ast, message
+      s(:call, nil,
+          :assert_not_equal,
+            s(:arglist,
+              extract_argument(ast),
+              extract_receiver(ast),
+              s(:str, message)))
+    end
+  end
+
+  class Match < BasicAssertion
+    def === ast
+      ast[0] == :call and ast[2] == :'=~'
+    end
+
+    def transform ast, message
+      s(:call, nil,
+          :assert_match,
+            s(:arglist,
+              extract_argument(ast),
+              extract_receiver(ast),
+              s(:str, message)))
+    end
+  end
+
   class AssertionWrapper
     include Picard::SExpressionSugar
 
     def initialize formatter = ErrorMessageFormatter.new
       @formatter = formatter
+      @handlers = [EqualTo.new, NotEqualTo.new, Match.new, Default.new]
     end
 
     def wrap_assertion ast, context
       line = ast_to_str(ast)
       message = @formatter.format_message(line, context)
-      
-      if equal_to_assertion? ast
-        s(:call, nil,
-                 :assert_equal,
-                 s(:arglist,
-                    extract_argument(ast),
-                    extract_receiver(ast),
-                    s(:str, message)))
-      else
-        s(:call, nil, :assert, s(:arglist,ast, s(:str, message)))
-      end
-    end
 
-    private
-
-    def equal_to_assertion? ast
-      ast[0] == :call and ast[2] == :==
+      handler = find_matching_handler ast
+      handler.transform ast, message
     end
 
-    def extract_argument ast
-      ast[3][1]
-    end
+    private
 
-    def extract_receiver ast
-      ast[1]
+    def find_matching_handler ast
+      @handlers.find do |h|
+        h === ast
+      end
     end
 
     def ast_to_str ast

data/lib/picard/ast_helper.rb

@@ -1,80 +1,84 @@
-require 'live_ast'
 require 'ruby2ruby'
 
 module Picard
-  class AstHelper
-    ResultItem = Struct.new(:index, :ast)
 
-    def initialize wrapper = Picard::AssertionWrapper.new
-      @wrapper = wrapper
-    end
+  ResultItem = Struct.new(:ast, :index)
 
-    def all_statements method
-      method_ast = method.to_ast
-      body_statements = extract_body_statements(method_ast)
-      wrap_in_result_items body_statements
+  class AstHelper
+    def initialize(wrapper = Picard::AssertionWrapper.new)
+      @wrapper = wrapper
     end
 
-    def all_statements_in_block method, block_name
-      statements = all_statements(method)
-
-      start_index = find_index_of_statements_calling(statements, block_name)
-      start_index ? statements[start_index + 1 .. -1] : []
+    def extract_ast method
+      ast = method.to_sexp do |code|
+        index = code.index('def') + 3
+        code[index...index] = ' fake.'
+        true
+      end
+      MethodAst.new ast
     end
 
     def wrap_assertion method, ast
       context = Picard::Context.new(method.source_location[0], ast.line)
       @wrapper.wrap_assertion ast, context
     end
-
-    def replace_statement method, index, new_statement_ast
-      method_ast = method.to_ast
-      body_statements = extract_statements(method_ast)
-      body_statements[index + 1] = new_statement_ast
+  end
+  
+  class MethodAst
+    def initialize ast
+      @ast = ast
     end
 
-    def method_to_string method
-      ast = method.to_ast
-      str = ast_to_str ast
-      remove_spaces str
+    def body_statements
+      st = wrap_into_result_items(all_statements)
+      remove_prefix_statement st
     end
 
-    private
-
-    def ast_to_str ast
-      Ruby2Ruby.new.process ast
+    def all_statements_in_block block_name
+      statements = body_statements
+      start_index = find_index_of_statements_calling(statements, block_name)
+      start_index ? statements[start_index + 1 .. -1] : []
     end
 
-    def remove_spaces str
-      str.gsub(/\n\s+/, "\n")
+    def replace_statement! index, new_statement
+      all_statements[index] = new_statement
     end
 
-    def find_index_of_statements_calling items, method_name
-      items.index do |item|
-        ast = item.ast
-        ast[0] == :call and ast[2] == method_name
-      end
+    def generate_method
+      str = ast_to_str(@ast)
+      remove_spaces str
     end
 
-    def extract_body_statements method_ast
-      st = extract_statements(method_ast)
-      remove_prefix_statement st
+  private
+
+    def wrap_into_result_items statements
+      res = []
+      statements.each_with_index do |s, i|
+        res << ResultItem.new(s, i)
+      end
+      res
     end
 
     def remove_prefix_statement statements
       statements[1..-1]
     end
 
-    def extract_statements method_ast
-      method_ast[3][1]
+    def all_statements
+      @ast[3][1]
     end
 
-    def wrap_in_result_items asts
-      res = []
-      asts.each_with_index do |e, i|
-        res << ResultItem.new(i, e)
+    def find_index_of_statements_calling items, method_name
+      items.index do |item|
+        item.ast[0] == :call and item.ast[2] == method_name
       end
-      res
+    end
+
+    def ast_to_str ast
+      Ruby2Ruby.new.process ast
+    end
+
+    def remove_spaces str
+      str.gsub(/\n\s+/, "\n")
     end
   end
 end

data/lib/picard/extensions.rb

@@ -1,3 +1,5 @@
+require 'sourcify'
+
 module Picard
   class ::Object
     def metaclass; class << self; self; end; end
@@ -7,4 +9,8 @@ module Picard
       meta_eval { define_method name, &blk }
     end
   end
-end
+
+  ::UnboundMethod.class_eval do
+    include Sourcify::Method
+  end
+end

data/lib/picard/method_ripper.rb

@@ -1,5 +1,3 @@
-require 'live_ast'
-
 module Picard
   class MethodRipper
     def initialize ast_helper = AstHelper.new
@@ -7,22 +5,24 @@ module Picard
     end
 
     def wrap_all_assertions! method
-      assertions = @ast_helper.all_statements_in_block(method, :expect)
-      replace_all_statements_with_assertions! assertions, method
-      replace_method_implementation_in_owner! method
+      ast = @ast_helper.extract_ast(method)
+      assertions = ast.all_statements_in_block(:expect)
+
+      replace_all_statements_with_assertions! ast, assertions, method
+      replace_method_implementation_in_owner! ast, method
     end
 
     private
 
-    def replace_all_statements_with_assertions! assertions, method
+    def replace_all_statements_with_assertions! ast, assertions, method
       assertions.each do |e|
         wrapped = @ast_helper.wrap_assertion(method, e.ast)
-        @ast_helper.replace_statement(method, e.index, wrapped)
+        ast.replace_statement!(e.index, wrapped)
       end
     end
 
-    def replace_method_implementation_in_owner! method
-      new_method_str = @ast_helper.method_to_string(method)
+    def replace_method_implementation_in_owner! ast, method
+      new_method_str = ast.generate_method
       method.owner.class_eval new_method_str
     end
   end

data/lib/picard/preprocessor.rb

@@ -1,5 +1,3 @@
-require 'live_ast'
-require 'live_ast/to_ruby'
 require 'ruby2ruby'
 
 module Picard

data/lib/picard/version.rb

@@ -1,7 +1,6 @@
 module PicardTestFramework
-  module V01
-    VERSION = "0.1"
+  module V02
+    VERSION = "0.2.1"
   end
 end
-
-Picard = PicardTestFramework::V01
+Picard = PicardTestFramework::V02

data/lib/picard_02.rb

@@ -0,0 +1,11 @@
+require_relative "picard/version"
+require_relative 'picard/extensions'
+require_relative 'picard/context'
+require_relative 'picard/error_message_formatter'
+require_relative 'picard/ast_helper'
+require_relative 'picard/assertion_wrapper'
+require_relative 'picard/s_expression_sugar'
+require_relative 'picard/class_ripper'
+require_relative 'picard/preprocessor'
+require_relative 'picard/method_ripper'
+require_relative 'picard/test_unit'

data/picard.gemspec

@@ -18,7 +18,8 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'live_ast', '= 1.0.2'
-  s.add_dependency 'live_ast_ripper', '= 0.6.5'
+  s.add_dependency 'sourcify', '>= 0.6.0.rc1'
   s.add_development_dependency 'flexmock'
+  s.add_development_dependency 'picard', '= 0.1'
+  s.add_development_dependency 'test-unit'
 end

data/test/picard/assertion_wrapper_test.rb

@@ -1,8 +1,8 @@
 require File.expand_path("../../test_helper", __FILE__)
 
 class Picard::AssertionWrapperTest < Test::Unit::TestCase
-  include Picard::TestUnit
-  include Picard::SExpressionSugar
+  include PicardStable::TestUnit
+  include PicardStable::SExpressionSugar
 
   def setup
     @formatter = flexmock('formatter')
@@ -12,8 +12,7 @@ class Picard::AssertionWrapperTest < Test::Unit::TestCase
   def test_should_wrap_simple_assertions
     given
       ast = s(:lit, true)
-      context = flexmock(:file => 'file', :lineno => 1)
-      @formatter.should_receive(:format_message).with('true', context).and_return('generated error message')
+      context = init_context_and_formatter('true')
 
     expect
       @wrapper.wrap_assertion(ast, context) == s(:call, nil,
@@ -26,8 +25,7 @@ class Picard::AssertionWrapperTest < Test::Unit::TestCase
   def test_should_wrap_equal_to_assertions
     given
       ast = s(:call, s(:lit, 1), :==, s(:arglist, s(:lit, 2)))
-      context = flexmock(:file => 'file', :lineno => 1)
-      @formatter.should_receive(:format_message).with('(1 == 2)', context).and_return('generated error message')
+      context = init_context_and_formatter('(1 == 2)')
 
     expect
       @wrapper.wrap_assertion(ast, context) == s(:call, nil,
@@ -37,4 +35,39 @@ class Picard::AssertionWrapperTest < Test::Unit::TestCase
                     s(:lit, 1),
                     s(:str, 'generated error message')))
   end
+
+  def test_should_wrap_not_equal_to_assertions
+    given
+      ast = s(:call, s(:lit, 1), :'!=', s(:arglist, s(:lit, 2)))
+      context = init_context_and_formatter('1.!=(2)')
+
+    expect
+      @wrapper.wrap_assertion(ast, context) == s(:call, nil,
+                  :assert_not_equal,
+                  s(:arglist,
+                    s(:lit, 2),
+                    s(:lit, 1),
+                    s(:str, 'generated error message')))
+  end
+
+  def test_should_wrap_matching_assertions
+    given
+      ast = s(:call, s(:lit, 1), :'=~', s(:arglist, s(:lit, 2)))
+      context = init_context_and_formatter('1.=~(2)')
+
+    expect
+      @wrapper.wrap_assertion(ast, context) == s(:call, nil,
+                  :assert_match,
+                  s(:arglist,
+                    s(:lit, 2),
+                    s(:lit, 1),
+                    s(:str, 'generated error message')))
+  end
+
+  private
+  def init_context_and_formatter line
+    context = flexmock(:file => 'file', :lineno => 1)
+    @formatter.should_receive(:format_message).with(line, context).and_return('generated error message')
+    context
+  end
 end

data/test/picard/ast_helper_test.rb

@@ -1,117 +1,127 @@
 require File.expand_path("../../test_helper", __FILE__)
 
 class Picard::AstHelperTest < Test::Unit::TestCase
-  include Picard::TestUnit
-  include Picard::SExpressionSugar
-
-  def setup
-    @wrapper = flexmock('wrapper')
-    @helper = Picard::AstHelper.new @wrapper
-  end
-
+  include PicardStable::TestUnit
+  include PicardStable::SExpressionSugar
 
   class TestClass1
     def test_method
-      one
-      two
     end
   end
 
-  def test_should_return_all_statements_of_method
+  def test_ast_helper_should_add_nil_to_empty_method
     given
-      method = TestClass1.instance_method(:test_method)
-      actual = @helper.all_statements(method)
+      ast = ast_of(TestClass1)
 
     expect
-      actual[0].index == 0
-      actual[0].ast == s(:call, nil, :one, s(:arglist))
-
-      actual[1].index == 1
-      actual[1].ast == s(:call, nil, :two, s(:arglist))
+      ast.body_statements[0].ast == s(:nil)
   end
 
 
   class TestClass2
     def test_method
       one
-      expect
       two
     end
   end
 
-  def test_should_find_all_statements_in_specified_block
+  def test_ast_helper_should_extract_ast_including_body_statments
     given
-      method = TestClass2.instance_method(:test_method)
-      actual = @helper.all_statements_in_block(method, :expect)
+      statements = ast_of(TestClass2).body_statements
 
     expect
-      actual.size == 1
-      actual[0].index == 2
-      actual[0].ast == s(:call, nil, :two, s(:arglist))
+      statements[0].index == 1
+      statements[0].ast == s(:call, nil, :one, s(:arglist))
+
+      statements[1].index == 2
+      statements[1].ast == s(:call, nil, :two, s(:arglist))
   end
 
 
   class TestClass3
     def test_method
       one
+      expect
       two
     end
   end
 
-  def test_should_return_empty_array_if_block_is_not_found
+  def test_method_ast_should_return_all_statements_in_block
     given
-      method = TestClass3.instance_method(:test_method)
+      statements = ast_of(TestClass3).all_statements_in_block(:expect)
 
     expect
-      @helper.all_statements_in_block(method, :where) == []
+      statements[0].index == 3
+      statements[0].ast = s(:call, nil, :two, s(:arglist))
   end
 
 
   class TestClass4
     def test_method
-      false
+      one
+      two
     end
   end
 
-  def test_should_replace_statement
+  def test_method_ast_should_return_empty_array_if_block_is_not_found
     given
-      method = TestClass4.instance_method(:test_method)
-      @helper.replace_statement(method, 0, s(:lit, true))
-      all_statements = @helper.all_statements(method)
+      statements = ast_of(TestClass4)
 
     expect
-      all_statements[0].ast == s(:lit, true)
+      statements.all_statements_in_block(:where) == []
   end
 
 
   class TestClass5
-    def method
+    def test_method
+      false
     end
   end
 
-  def test_should_wrap_assertion
+  def test_method_ast_should_replace_statement
     given
-      method = TestClass5.instance_method(:method)
-      ast = s(:lit, true)
-      @wrapper.should_receive(:wrap_assertion).and_return('wrapped ast')
+      ast = ast_of(TestClass5)
+      ast.replace_statement!(1, s(:true))
 
     expect
-      @helper.wrap_assertion(method, ast) == 'wrapped ast'
+      ast.body_statements[0].ast == s(:true)
   end
 
 
-  class TestClass5
-    def method
+  class TestClass6
+    def test_method
       false
     end
   end
 
-  def test_should_return_string_representation_of_a_method_reflecting_updated_ast
+  def test_method_ast_should_generate_method_as_string
     given
-      method = TestClass5.instance_method(:method)
-      @helper.replace_statement(method, 0, s(:lit, true))
+      ast = ast_of(TestClass5)
+
+    expect
+      ast.generate_method == "def test_method\nfalse\nend"
+  end
+
 
+  def test_ast_helper_should_wrap_assertion
+    given
+      ast = flexmock(:line => 100)
+      method = flexmock(:source_location => ['location'])
+      expected_context = Picard::Context.new('location', 100)
+    
+      wrapper = flexmock('wrapper')
+      wrapper.should_receive(:wrap_assertion).with(ast, expected_context).and_return('wrapped ast')
+
+      helper = Picard::AstHelper.new(wrapper)
+    
     expect
-      @helper.method_to_string(method) == "def method\ntrue\nend"
+      helper.wrap_assertion(method, ast) == 'wrapped ast'
+  end
+
+  private
+
+  def ast_of(clazz)
+    method = clazz.instance_method(:test_method)
+    Picard::AstHelper.new.extract_ast(method)
   end
 end

data/test/picard/class_ripper_test.rb

@@ -1,7 +1,7 @@
 require File.expand_path("../../test_helper", __FILE__)
 
 class Picard::ClassRipperTest < Test::Unit::TestCase
-  include Picard::TestUnit
+  include PicardStable::TestUnit
 
   def setup
     @ripper = Picard::ClassRipper.new

data/test/picard/demo_test.rb

@@ -1,5 +1,11 @@
 require File.expand_path("../../test_helper", __FILE__)
-require 'live_ast'
+#require 'live_ast'
+#require 'live_ast_ripper'
+#require 'sorcerer'
+#require 'test/unit'
+#require 'sourcify'
+#require 'ruby2ruby'
+
 
 module Picard
   class DemoTest < Test::Unit::TestCase
@@ -7,11 +13,31 @@ module Picard
     #
     #def test_one
     #  expect
-    #    1 == 2
+    #    2 == 2
+    #end
+
+    #def method1
+    #  false
     #end
-    #def regular_method
-    #  method 1, 2
+
+    #def test_what_breaks_ruby
+    #  #method = MyMath.method(:regular_method)
+    #  #puts method.inspect
+    #  #puts method.to_sexp.inspect
+    #  method = DemoTest.instance_method(:method1)
+    #  #method = method.bind('fake')
+    #  puts method.inspect
+    #
+    #  ast = method.to_sexp do |code|
+    #    index = code.index('def') + 3
+    #    code[index...index] = ' fake.'
+    #    true
+    #  end
+    #  puts ast.inspect
+    #  puts Ruby2Ruby.new.process(ast)
+    #  #puts(ast.inspect)
     #end
+
     #
     #def test_two
     #  ast = DemoTest.instance_method(:regular_method).to_ast

data/test/picard/error_message_formatter_test.rb

@@ -1,7 +1,7 @@
 require File.expand_path("../../test_helper", __FILE__)
 
 class Picard::ErrorMessageFormatterTest < Test::Unit::TestCase
-  include Picard::TestUnit
+  include PicardStable::TestUnit
 
   def test_should_wrap_error_message
     given

data/test/picard/method_ripper_test.rb

@@ -1,7 +1,7 @@
 require File.expand_path("../../test_helper", __FILE__)
 
 class Picard::MethodRipperTest < Test::Unit::TestCase
-  include Picard::TestUnit
+  include PicardStable::TestUnit
   
   class TestClass
     attr_reader :assert_args

data/test/picard/preprocessor_test.rb

@@ -1,7 +1,7 @@
 require File.expand_path("../../test_helper", __FILE__)
 
 class Picard::PreprocessorTest < Test::Unit::TestCase
-  include Picard::TestUnit
+  include PicardStable::TestUnit
 
   class BaseTestClass
     attr_reader :assert_args

data/test/picard/test_unit_test.rb

@@ -1,7 +1,7 @@
 require File.expand_path("../../test_helper", __FILE__)
 
 class Picard::TestUnitTest < Test::Unit::TestCase
-  include Picard::TestUnit
+  include PicardStable::TestUnit
 
   class TestUsingPicard
     include Picard::TestUnit

data/test/test_helper.rb

@@ -1,13 +1,7 @@
 require 'test/unit'
 require 'flexmock/test_unit'
+require 'picard'
+PicardStable = PicardTestFramework::V01
 
-require_relative '../lib/picard/extensions'
-require_relative '../lib/picard/context'
-require_relative '../lib/picard/error_message_formatter'
-require_relative '../lib/picard/ast_helper'
-require_relative '../lib/picard/assertion_wrapper'
-require_relative '../lib/picard/s_expression_sugar'
-require_relative '../lib/picard/class_ripper'
-require_relative '../lib/picard/preprocessor'
-require_relative '../lib/picard/method_ripper'
-require_relative '../lib/picard/test_unit'
+Picard = PicardTestFramework::V02
+require_relative '../lib/picard_02.rb'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: picard
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,33 +9,44 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-15 00:00:00.000000000Z
+date: 2011-10-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: live_ast
-  requirement: &2156661700 !ruby/object:Gem::Requirement
+  name: sourcify
+  requirement: &2153158180 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 0.6.0.rc1
   type: :runtime
   prerelease: false
-  version_requirements: *2156661700
+  version_requirements: *2153158180
+- !ruby/object:Gem::Dependency
+  name: flexmock
+  requirement: &2153157260 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2153157260
 - !ruby/object:Gem::Dependency
-  name: live_ast_ripper
-  requirement: &2156659860 !ruby/object:Gem::Requirement
+  name: picard
+  requirement: &2153155940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 0.6.5
-  type: :runtime
+        version: '0.1'
+  type: :development
   prerelease: false
-  version_requirements: *2156659860
+  version_requirements: *2153155940
 - !ruby/object:Gem::Dependency
-  name: flexmock
-  requirement: &2156659180 !ruby/object:Gem::Requirement
+  name: test-unit
+  requirement: &2153154960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156659180
+  version_requirements: *2153154960
 description: Test framework inspired by Spock
 email:
 - vic.savkin@gmail.com
@@ -68,6 +79,7 @@ files:
 - lib/picard/s_expression_sugar.rb
 - lib/picard/test_unit.rb
 - lib/picard/version.rb
+- lib/picard_02.rb
 - picard.gemspec
 - test/picard/assertion_wrapper_test.rb
 - test/picard/ast_helper_test.rb