xmp2assert 13 → 14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca1ec4816655792e3a7191b25a2215bd26ba9f0b
-  data.tar.gz: 1df637b6cdafa53ca5ee6719516f0e5f5d6e82d7
+  metadata.gz: 65892e6017608a18fa23ea592867ced1341486d5
+  data.tar.gz: 4406ecb00f9f72056c30cd60820fc0c0cfd629d8
 SHA512:
-  metadata.gz: 667fbe7d5bed82ce1bc54c4dd353b97d0aeaff04fa2ac112427c1123964d125b234b8100f4bd271aaa0cc5675d4de31f7c8e87facaf9faab7512388bf773d005
-  data.tar.gz: e0fecfd10bedc2fdfdbe3e7e428a0a9f697790238548450439ebb71e86a2c1f44e6467f5ed06cd229d642e176ca14bce91f97dea8693d2030ed0de638671ec25
+  metadata.gz: a82ceac5e13819b380baa4a9039c8b466303e089002ab803cfe9c15f7f49f30772e510fb0e9f00db9fd9ecc8f3955a829664c9f0696315f02cb2dc61c5f2eb26
+  data.tar.gz: 5819e605413a3cbd8fb88abc6731ea8c70460d4f87b14a16297c60bfda1aec3effbae22e6bfac47a53011498a6261a719b2c41fc7484a3ba06237a13a8e1e98e

data/lib/xmp2assert/converter.rb

@@ -83,11 +83,12 @@ class XMP2Assert::Converter
   private_constant :Namespace
 
   def gen_tap tok
-    xmp = tok.to_s.chomp.dump
     case tok.to_sym
     when :'~>' then
+      xmp = "#<#{tok.to_s.chomp}>".dump
       return sprintf " rescue (xmp2assert_assert(%s, $!) and raise)", xmp
     when :'=>' then
+      xmp = tok.to_s.chomp.dump
       nam = gensym xmp
       return sprintf ".tap {|%s| xmp2assert_assert(%s, %s) }", nam, xmp, nam
     end
@@ -368,7 +369,7 @@ class XMP2Assert::Converter
         buf[sym] = tok.to_s << buf[sym]
         tok.yylex  = :comment
         tok.yylval = "#\n"
-      when :sp, :nl then
+      when :sp, :nl, :comment then
         next
       else
         break

data/lib/xmp2assert/template.erb

@@ -59,8 +59,9 @@ rescue Exception => e
   b = e.backtrace
   b.reject! {|i| i.start_with? __FILE__ }
   e.set_backtrace b
-  expected = <%= exception.dump %> #=
-  xmp2assert_assert expected, e, e.backtrace
+  expected = <%= exception.dump %>.lines #=
+  xmp2assert_assert expected[0], e.class, e.backtrace
+  xmp2assert_assert expected[1].chomp.inspect, e.message, e.backtrace
 end
 % else
 eval src, saved_binding, file, line

data/lib/xmp2assert/version.rb

@@ -24,4 +24,4 @@
 # SOFTWARE.
 ;
 
-XMP2Assert::VERSION = 13
+XMP2Assert::VERSION = 14

data/lib/xmp2assert/xmp2rexp.rb

@@ -62,6 +62,7 @@ class XMP2Assert::XMP2Rexp
       next sprintf '\\u(?:%s|\\{%s\\})', str, hex.downcase
     }
     src.gsub!(/\\\.rb:\d+/, '\\.rb:\d+')
+    src.gsub!(/(\\\.){3}/, '.+?')
 
     case nln when 0, 1 then
       return Regexp.new "\\A#{src}\\n?\\z"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xmp2assert
 version: !ruby/object:Gem::Version
-  version: '13'
+  version: '14'
 platform: ruby
 authors:
 - Urabe, Shyouhei
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-23 00:00:00.000000000 Z
+date: 2017-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler