power_assert 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61a285182186fe82f7d5e42eb9ce9942edfd11ba
-  data.tar.gz: f03a6ff069821625f498c48b359d41697d8278bf
+  metadata.gz: 4114043b958f530bf1b005c95b52c283e196b2dd
+  data.tar.gz: ca1573692d996d86479bdbfd412071543074a4d0
 SHA512:
-  metadata.gz: f4a379fc1cc3569968450a0c37d32f48bd46524b31e5fa73988cd540e4a78f40dfb5297e0fbd14c4c77e5375340a9e033733d4689d2f0e23004af96d2adc78a7
-  data.tar.gz: 48a718d7da45368b3bf5363d6948efcbd29c6a748c29ba56f6f046e214ff728e20f9947434db9e7ac64276b420e7855eaf290f5f227e91f462888b26aad64257
+  metadata.gz: 2dad87631bbcfe83d491276b325d85f9a6f3ff9a23f4057c8a0aaec7b00fc24b512db5a095b7092e79aa3e672e542670b407acf8772f3303dd70598adb702c89
+  data.tar.gz: c454a8d8a07e2eca899c3e43b4a895de55680cf4de23dde7eb92a49ace1fe4f10e4bcc7eb0f8403894cacfd539db4a09994c01ba26a7b4df17835ee0d0d9255c

data/lib/power_assert.rb

@@ -64,14 +64,14 @@ module PowerAssert
     end
 
     def inspect
-      inspect = @value.inspect
-      if Encoding.compatible?(Encoding.default_external, inspect)
-        inspect
+      inspected = @value.inspect
+      if Encoding.compatible?(Encoding.default_external, inspected)
+        inspected
       else
         begin
-          "#{inspect.encode(Encoding.default_external)}(#{inspect.encoding})"
+          "#{inspected.encode(Encoding.default_external)}(#{inspected.encoding})"
         rescue Encoding::UndefinedConversionError, Encoding::InvalidByteSequenceError
-          inspect.force_encoding(Encoding.default_external)
+          inspected.force_encoding(Encoding.default_external)
         end
       end
     rescue => e
@@ -165,8 +165,7 @@ 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
-        l = sprintf(fmt, inspected_vals)
-        ret << (l.valid_encoding? ? l.rstrip : l)
+        ret << encoding_safe_rstrip(sprintf(fmt, inspected_vals))
       end
       ret.join("\n")
     end
@@ -181,6 +180,17 @@ module PowerAssert
       end
     end
 
+    def encoding_safe_rstrip(str)
+      str.rstrip
+    rescue ArgumentError, Encoding::CompatibilityError
+      enc = str.encoding
+      if enc.ascii_compatible?
+        str.b.rstrip.force_encoding(enc)
+      else
+        str
+      end
+    end
+
     def extract_idents(sexp)
       tag, * = sexp
       case tag

data/lib/power_assert/version.rb

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

data/test/test_power_assert.rb

@@ -384,7 +384,7 @@ END
       a.length
       | |
       | 1
-      \xFF  
+      \xFF
 END
       a.length
     }.b

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: power_assert
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Kazuki Tsujimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-16 00:00:00.000000000 Z
+date: 2014-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit