power_assert 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1afb2223a3e268c8295564a49a13c7feff085da7
-  data.tar.gz: d37fc4cfd92f123df5863ce90ed70e68da566a34
+  metadata.gz: 089a171012087ec11186283c05d7cd1b238d56c1
+  data.tar.gz: 6a970dc3416704997c85a5b8361f9481909e7658
 SHA512:
-  metadata.gz: 72b22a8fe4dcf9905a19b22b6081af7273fdba4ddfdea9b7cca07c852ed3c6a5bfb5ab2db6042079a95e4e78f18736d0a034a7384aec170eab6ca16b32a4cfa5
-  data.tar.gz: 4946106cb77a3f81a457a8585f63e1c58ae81a2773d9065e58dce7e95b1a422cfa549668f38b4e5e5af1e2eb064b17bfa4abe63d60fe6a8d99d7abde86e7c33e
+  metadata.gz: 9a26ee36c760f14be0a7d4c6ecce7fb8128e1e3834ade0f7ace29b4667885147d807d216d0bf0e95f87a59f8e9d2600c2f425091e8df581b191995d0e51ed825
+  data.tar.gz: 168aa6a21ba264001f63c52d1e66b56f263a4ec6593a23bad3c11e09e1f432960a8f9630e5e36c76d8efe872637bcdcc678b24ef32b3f881dc8cf3f80e5f45df

data/README.rdoc

@@ -7,9 +7,10 @@ Power Assert for Ruby.
 * {test-unit-power_assert}[https://github.com/k-tsj/test-unit-power_assert]
 * {minitest-power_assert}[https://github.com/hsbt/minitest-power_assert]
 * {pry-power_assert}[https://github.com/yui-knk/pry-power_assert]
+* {rspec-power_assert}[https://github.com/joker1007/rspec-power_assert]
 * {power_p}[https://github.com/k-tsj/power_p]
 
 == Reference
 * {Power Assert in Ruby (at RubyKaigi 2014) // Speaker Deck}[https://speakerdeck.com/k_tsj/power-assert-in-ruby]
 
-== Travis Build Status {<img src="https://secure.travis-ci.org/k-tsj/power_assert.png"/>}[http://travis-ci.org/k-tsj/power_assert]
+== Travis Build Status {<img src="https://secure.travis-ci.org/k-tsj/power_assert.png?branch=master"/>}[http://travis-ci.org/k-tsj/power_assert]

data/Rakefile

@@ -4,6 +4,6 @@ require "rake/testtask"
 task :default => :test
 Rake::TestTask.new do |t|
   # helper(simplecov) must be required before loading power_assert
-  t.ruby_opts = ["-w", "-r./test/helper", "-rpower_assert"]
+  t.ruby_opts = ["-w", "-r./test/helper"]
   t.test_files = FileList["test/test_*.rb"]
 end

data/lib/power_assert.rb

@@ -9,6 +9,7 @@ rescue
 end
 
 require 'power_assert/version'
+require 'power_assert/enable_tracepoint_events'
 require 'ripper'
 
 module PowerAssert
@@ -21,14 +22,31 @@ module PowerAssert
       yield configuration
     end
 
-    def start(assertion_proc, assertion_method: nil)
-      yield Context.new(assertion_proc, assertion_method)
+    def start(assertion_proc_or_source, assertion_method: nil, source_binding: TOPLEVEL_BINDING)
+      if respond_to?(:clear_global_method_cache, true)
+        clear_global_method_cache
+      end
+      yield Context.new(assertion_proc_or_source, assertion_method, source_binding)
+    end
+
+    private
+
+    if defined?(RubyVM) and respond_to?(:using, true)
+      def clear_global_method_cache
+        class << Object.new
+          using Empty
+        end
+      end
     end
   end
 
   Configuration = Struct.new(:lazy_inspection)
   private_constant :Configuration
 
+  module Empty
+  end
+  private_constant :Empty
+
   class InspectedValue
     def initialize(value)
       @value = value
@@ -40,6 +58,22 @@ module PowerAssert
   end
   private_constant :InspectedValue
 
+  class SafeInspectable
+    def initialize(value)
+      @value = value
+    end
+
+    def inspect
+      @value.inspect
+    rescue NoMethodError
+      InspectationFailure
+    end
+  end
+  private_constant :SafeInspectable
+
+  class InspectationFailure; end
+  private_constant :InspectationFailure
+
   class Context
     Value = Struct.new(:name, :value, :column)
     Ident = Struct.new(:type, :name, :column)
@@ -49,26 +83,31 @@ module PowerAssert
 
     attr_reader :message_proc
 
-    def initialize(assertion_proc, assertion_method)
+    def initialize(assertion_proc_or_source, assertion_method, source_binding)
+      if assertion_proc_or_source.kind_of?(Proc)
+        @assertion_proc = assertion_proc_or_source
+        @line = nil
+      else
+        @assertion_proc = source_binding.eval "Proc.new {#{assertion_proc_or_source}}"
+        @line = assertion_proc_or_source
+      end
       path = nil
       lineno = nil
-      @line = nil
       methods = nil
       refs = nil
       method_ids = nil
       return_values = []
       @base_caller_length = -1
-      @assertion_proc = assertion_proc
       @assertion_method_name = assertion_method.to_s
       @message_proc = -> {
         return nil if @base_caller_length < 0
-        @message ||= build_assertion_message(@line || '', methods || [], return_values, refs || [], assertion_proc.binding).freeze
+        @message ||= build_assertion_message(@line || '', methods || [], return_values, refs || [], @assertion_proc.binding).freeze
       }
-      @proc_local_variables = assertion_proc.binding.eval('local_variables').map(&:to_s)
+      @proc_local_variables = @assertion_proc.binding.eval('local_variables').map(&:to_s)
       target_thread = Thread.current
       @trace = TracePoint.new(:return, :c_return) do |tp|
         next if method_ids and ! method_ids.include?(tp.method_id)
-        locs = tp.binding.eval('caller_locations')
+        locs = tp.binding.eval('::Kernel.caller_locations')
         current_diff = locs.length - @base_caller_length
         target_diff = TARGET_CALLER_DIFF[tp.event]
         is_target_bmethod = current_diff < target_diff
@@ -77,13 +116,15 @@ module PowerAssert
           unless path
             path = locs[idx].path
             lineno = locs[idx].lineno
-            @line = open(path).each_line.drop(lineno - 1).first
+            @line ||= open(path).each_line.drop(lineno - 1).first
             idents = extract_idents(Ripper.sexp(@line))
             methods, refs = idents.partition {|i| i.type == :method }
             method_ids = methods.map(&:name).map(&:to_sym).uniq
           end
           if path == locs[idx].path and lineno == locs[idx].lineno
-            val = PowerAssert.configuration.lazy_inspection ? tp.return_value : InspectedValue.new(tp.return_value.inspect)
+            val = PowerAssert.configuration.lazy_inspection ?
+              tp.return_value :
+              InspectedValue.new(SafeInspectable.new(tp.return_value).inspect)
             return_values << Value[tp.method_id.to_s, val, nil]
           end
         end
@@ -115,10 +156,10 @@ module PowerAssert
       ret << line.chomp
       ret << sprintf(fmt, vals.each_with_object({}) {|v, h| h[v.column.to_s.to_sym] = '|' }).chomp
       vals.each do |i|
-        ret << sprintf(fmt,
-                       vals.each_with_object({}) do |j, h|
-                         h[j.column.to_s.to_sym] = [i.value.inspect, '|', ' '][i.column <=> j.column]
-                       end).rstrip
+        inspected_vals = vals.each_with_object({}) do |j, h|
+          h[j.column.to_s.to_sym] = [SafeInspectable.new(i.value).inspect, '|', ' '][i.column <=> j.column]
+        end
+        ret << sprintf(fmt, inspected_vals).rstrip
       end
       ret.join("\n")
     end
@@ -186,7 +227,7 @@ module PowerAssert
       when :program
         _, ((tag0, (tag1, (tag2, (tag3, mname, _)), _), (tag4, _, ss))) = sexp
         if tag0 == :method_add_block and tag1 == :method_add_arg and tag2 == :fcall and
-            tag3 == :@ident and mname == @assertion_method_name and (tag4 == :brace_block or tag4 == :do_block)
+            (tag3 == :@ident or tag3 == :@const) and mname == @assertion_method_name and (tag4 == :brace_block or tag4 == :do_block)
           ss.flat_map {|s| extract_idents(s) }
         else
           _, (s, *) = sexp
@@ -254,9 +295,3 @@ module PowerAssert
   end
   private_constant :Context
 end
-
-if defined? RubyVM
-  RubyVM::InstructionSequence.compile_option = {
-    specialized_instruction: false
-  }
-end

data/lib/power_assert/enable_tracepoint_events.rb

@@ -0,0 +1,48 @@
+if defined? RubyVM
+  basic_classes = [
+    Fixnum, Float, String, Array, Hash, Bignum, Symbol, Time, Regexp
+  ]
+
+  basic_operators = [
+    :+, :-, :*, :/, :%, :==, :===, :<, :<=, :<<, :[], :[]=,
+    :length, :size, :empty?, :succ, :>, :>=, :!, :!=, :=~, :freeze
+  ]
+
+  # set redefined flag
+  basic_classes.each do |klass|
+    basic_operators.each do |bop|
+      if klass.public_method_defined?(bop)
+        klass.instance_method(bop).owner.module_eval do
+          public bop
+        end
+      end
+    end
+  end
+
+  # bypass check_cfunc
+  verbose = $VERBOSE
+  begin
+    $VERBOSE = nil
+    module PowerAssert
+      refine BasicObject do
+        def !
+        end
+
+        def ==
+        end
+      end
+
+      refine Module do
+        def ==
+        end
+      end
+    end
+  ensure
+    $VERBOSE = verbose
+  end
+
+  # disable optimization
+  RubyVM::InstructionSequence.compile_option = {
+    specialized_instruction: false
+  }
+end

data/lib/power_assert/version.rb

@@ -1,3 +1,3 @@
 module PowerAssert
-  VERSION = "0.1.4"
+  VERSION = "0.2.0"
 end

data/test/test_power_assert.rb

@@ -6,7 +6,7 @@ require 'set'
 class TestPowerAssert < Test::Unit::TestCase
   EXTRACT_METHODS_TEST = [
     [[[:method, "c", 4], [:method, "b", 2], [:method, "d", 8], [:method, "a", 0]],
-      'a(b(c), d))'],
+      'a(b(c), d)'],
 
     [[[:method, "a", 0], [:method, "b", 2], [:method, "d", 6], [:method, "c", 4]],
       'a.b.c(d)'],
@@ -117,14 +117,27 @@ class TestPowerAssert < Test::Unit::TestCase
 
   EXTRACT_METHODS_TEST.each_with_index do |(expect, source), idx|
     define_method("test_extract_methods_#{'%03d' % idx}") do
-      pa = PowerAssert.const_get(:Context).new(-> { var = nil; -> { var } }.(), nil)
+      pa = PowerAssert.const_get(:Context).new(-> { var = nil; -> { var } }.(), nil, TOPLEVEL_BINDING)
       pa.instance_variable_set(:@line, source)
       pa.instance_variable_set(:@assertion_method_name, 'assertion_message')
       assert_equal expect, pa.send(:extract_idents, Ripper.sexp(source)).map(&:to_a), source
     end
   end
 
-  def assertion_message(&blk)
+  class BasicObjectSubclass < BasicObject
+    def foo
+      "foo"
+    end
+  end
+
+  def assertion_message(source = nil, source_binding = TOPLEVEL_BINDING, &blk)
+    ::PowerAssert.start(source || blk, assertion_method: __callee__, source_binding: source_binding) do |pa|
+      pa.yield
+      pa.message_proc.()
+    end
+  end
+
+  def Assertion(&blk)
     ::PowerAssert.start(blk, assertion_method: __callee__) do |pa|
       pa.yield
       pa.message_proc.()
@@ -186,6 +199,24 @@ END
     assertion_message { "0".class }
 
 
+    assert_equal <<END.chomp,
+      "0".class
+          |
+          String
+END
+    Assertion {
+      "0".class
+    }
+
+
+    assert_equal <<END.chomp,
+    Assertion { "0".class }
+                    |
+                    String
+END
+    Assertion { "0".class }
+
+
     assert_equal <<END.chomp, assertion_message {
       Set.new == Set.new([0])
       |   |   |  |   |
@@ -233,6 +264,54 @@ END
 END
       bmethod
     }
+
+
+    assert_equal <<END.chomp,
+      assertion_message { BasicObjectSubclass.new.foo }
+                          |                   |   |
+                          |                   |   "foo"
+                          |                   PowerAssert::InspectationFailure
+                          TestPowerAssert::BasicObjectSubclass
+END
+      assertion_message { BasicObjectSubclass.new.foo }
+
+
+    if PowerAssert.respond_to?(:clear_global_method_cache, true)
+      3.times do
+        assert_equal <<END.chomp, assertion_message {
+          String == Array
+          |      |  |
+          |      |  Array
+          |      false
+          String
+END
+          String == Array
+        }
+      end
+    end
+
+
+    a = 0
+    @b = 1
+    @@c = 2
+    $d = 3
+    assert_equal <<END.chomp, assertion_message(<<END, binding)
+      String(a) + String(@b) + String(@@c) + String($d)
+      |      |  | |      |   | |      |    | |      |
+      |      |  | |      |   | |      |    | |      3
+      |      |  | |      |   | |      |    | "3"
+      |      |  | |      |   | |      |    "0123"
+      |      |  | |      |   | |      2
+      |      |  | |      |   | "2"
+      |      |  | |      |   "012"
+      |      |  | |      1
+      |      |  | "1"
+      |      |  "01"
+      |      0
+      "0"
+END
+      String(a) + String(@b) + String(@@c) + String($d)
+END
   end
 
   def test_lazy_inspection

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: power_assert
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Kazuki Tsujimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-27 00:00:00.000000000 Z
+date: 2014-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -71,6 +71,7 @@ files:
 - README.rdoc
 - Rakefile
 - lib/power_assert.rb
+- lib/power_assert/enable_tracepoint_events.rb
 - lib/power_assert/version.rb
 - power_assert.gemspec
 - test/helper.rb
@@ -96,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Power Assert for Ruby