power_assert 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 089a171012087ec11186283c05d7cd1b238d56c1
-  data.tar.gz: 6a970dc3416704997c85a5b8361f9481909e7658
+  metadata.gz: 61a285182186fe82f7d5e42eb9ce9942edfd11ba
+  data.tar.gz: f03a6ff069821625f498c48b359d41697d8278bf
 SHA512:
-  metadata.gz: 9a26ee36c760f14be0a7d4c6ecce7fb8128e1e3834ade0f7ace29b4667885147d807d216d0bf0e95f87a59f8e9d2600c2f425091e8df581b191995d0e51ed825
-  data.tar.gz: 168aa6a21ba264001f63c52d1e66b56f263a4ec6593a23bad3c11e09e1f432960a8f9630e5e36c76d8efe872637bcdcc678b24ef32b3f881dc8cf3f80e5f45df
+  metadata.gz: f4a379fc1cc3569968450a0c37d32f48bd46524b31e5fa73988cd540e4a78f40dfb5297e0fbd14c4c77e5375340a9e033733d4689d2f0e23004af96d2adc78a7
+  data.tar.gz: 48a718d7da45368b3bf5363d6948efcbd29c6a748c29ba56f6f046e214ff728e20f9947434db9e7ac64276b420e7855eaf290f5f227e91f462888b26aad64257

data/lib/power_assert.rb

@@ -64,16 +64,22 @@ module PowerAssert
     end
 
     def inspect
-      @value.inspect
-    rescue NoMethodError
-      InspectationFailure
+      inspect = @value.inspect
+      if Encoding.compatible?(Encoding.default_external, inspect)
+        inspect
+      else
+        begin
+          "#{inspect.encode(Encoding.default_external)}(#{inspect.encoding})"
+        rescue Encoding::UndefinedConversionError, Encoding::InvalidByteSequenceError
+          inspect.force_encoding(Encoding.default_external)
+        end
+      end
+    rescue => e
+      "InspectionFailure: #{e.class}: #{e.message.each_line.first}"
     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)
@@ -151,7 +157,7 @@ module PowerAssert
       if vals.empty?
         return line
       end
-      fmt = (vals[0].column + 1).times.map {|i| vals.find {|v| v.column == i } ? "%<#{i}>s" : ' '  }.join
+      fmt = (0..vals[0].column).map {|i| vals.find {|v| v.column == i } ? "%<#{i}>s" : ' '  }.join
       ret = []
       ret << line.chomp
       ret << sprintf(fmt, vals.each_with_object({}) {|v, h| h[v.column.to_s.to_sym] = '|' }).chomp
@@ -159,7 +165,8 @@ module PowerAssert
         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
+        l = sprintf(fmt, inspected_vals)
+        ret << (l.valid_encoding? ? l.rstrip : l)
       end
       ret.join("\n")
     end

data/lib/power_assert/enable_tracepoint_events.rb

@@ -36,6 +36,11 @@ if defined? RubyVM
         def ==
         end
       end
+
+      refine Symbol do
+        def ==
+        end
+      end
     end
   ensure
     $VERBOSE = verbose

data/lib/power_assert/version.rb

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

data/test/test_power_assert.rb

@@ -148,6 +148,38 @@ class TestPowerAssert < Test::Unit::TestCase
     false
   end
 
+  def test_lazy_inspection
+    PowerAssert.configure do |c|
+      assert !c.lazy_inspection
+    end
+    assert_equal <<END.chomp, assertion_message {
+      'a'.sub(/./, 'b').sub!(/./, 'c')
+          |             |
+          |             "c"
+          "b"
+END
+      'a'.sub(/./, 'b').sub!(/./, 'c')
+    }
+
+    PowerAssert.configure do |c|
+      c.lazy_inspection = true
+    end
+    begin
+      assert_equal <<END.chomp, assertion_message {
+        'a'.sub(/./, 'b').sub!(/./, 'c')
+            |             |
+            |             "c"
+            "c"
+END
+        'a'.sub(/./, 'b').sub!(/./, 'c')
+      }
+    ensure
+      PowerAssert.configure do |c|
+        c.lazy_inspection = false
+      end
+    end
+  end
+
   def test_assertion_message
     a = 0
     @b = 1
@@ -266,14 +298,15 @@ END
     }
 
 
-    assert_equal <<END.chomp,
-      assertion_message { BasicObjectSubclass.new.foo }
-                          |                   |   |
-                          |                   |   "foo"
-                          |                   PowerAssert::InspectationFailure
-                          TestPowerAssert::BasicObjectSubclass
+    a = :a
+    assert_equal <<END.chomp, assertion_message {
+      a == :b
+      | |
+      | false
+      :a
 END
-      assertion_message { BasicObjectSubclass.new.foo }
+      a == :b
+    }
 
 
     if PowerAssert.respond_to?(:clear_global_method_cache, true)
@@ -289,9 +322,76 @@ END
         }
       end
     end
+  end
+
+  def test_inspection_failure
+    assert_match Regexp.new(<<END.chomp.gsub('|', "\\|")),
+      assertion_message { BasicObjectSubclass.new.foo }
+                          |                   |   |
+                          |                   |   "foo"
+                          |                   InspectionFailure: NoMethodError: .*
+                          TestPowerAssert::BasicObjectSubclass
+END
+      assertion_message { BasicObjectSubclass.new.foo }
 
 
-    a = 0
+    verbose = $VERBOSE
+    default_external = Encoding.default_external
+    default_internal = Encoding.default_internal
+    begin
+      $VERBOSE = nil
+      Encoding.default_external = 'cp932'
+      Encoding.default_internal = 'utf-8'
+      ary = ["\u3042"]
+      assert_match Regexp.new(<<END.chomp), assertion_message {
+        ary.length
+        |   |
+        |   1
+        InspectionFailure: Encoding::CompatibilityError: .*
+END
+        ary.length
+      }
+    ensure
+      Encoding.default_internal = default_internal
+      Encoding.default_external = default_external
+      $VERBOSE = verbose
+    end
+  end
+
+  def test_assertion_message_with_incompatible_encodings
+    if Encoding.default_external == Encoding::UTF_8
+      a = "\u3042"
+      def a.inspect
+        super.encode('utf-16le')
+      end
+      assert_equal <<END.chomp, assertion_message {
+        a + a
+        | | |
+        | | "\u3042"(UTF-16LE)
+        | "\u3042\u3042"
+        "\u3042"(UTF-16LE)
+END
+        a + a
+      }
+    end
+
+
+    a = "\xFF"
+    def a.inspect
+      "\xFF".force_encoding('ascii-8bit')
+    end
+    assert_equal <<END.chomp.b, assertion_message {
+      a.length
+      | |
+      | 1
+      \xFF  
+END
+      a.length
+    }.b
+  end
+
+  def test_assertion_message_with_string
+    a, = 0, a # suppress "assigned but unused variable" warning
     @b = 1
     @@c = 2
     $d = 3
@@ -313,36 +413,4 @@ END
       String(a) + String(@b) + String(@@c) + String($d)
 END
   end
-
-  def test_lazy_inspection
-    PowerAssert.configure do |c|
-      assert !c.lazy_inspection
-    end
-    assert_equal <<END.chomp, assertion_message {
-      'a'.sub(/./, 'b').sub!(/./, 'c')
-          |             |
-          |             "c"
-          "b"
-END
-      'a'.sub(/./, 'b').sub!(/./, 'c')
-    }
-
-    PowerAssert.configure do |c|
-      c.lazy_inspection = true
-    end
-    begin
-      assert_equal <<END.chomp, assertion_message {
-        'a'.sub(/./, 'b').sub!(/./, 'c')
-            |             |
-            |             "c"
-            "c"
-END
-        'a'.sub(/./, 'b').sub!(/./, 'c')
-      }
-    ensure
-      PowerAssert.configure do |c|
-        c.lazy_inspection = false
-      end
-    end
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: power_assert
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Kazuki Tsujimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-08 00:00:00.000000000 Z
+date: 2014-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -97,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Power Assert for Ruby