diff_matcher 2.3.1 → 2.3.3

data/.gitignore

@@ -0,0 +1,3 @@
+coverage
+pkg
+Gemfile.lock

data/CHANGELOG.md

@@ -1,5 +1,49 @@
 # Changelog
 
+### v2.3.3
+
+  Allow HTML output using `:html_output=>true` option
+
+### v2.3.2
+
+  Summarize `Hash` and `Array` output in diff with `"..."`
+```
+  eg.
+  - [...]+ {...}
+```
+
+### v2.2.3
+
+* set color_enabled/color_scheme on the class
+  
+  (ie. so it can be used by default)
+
+### v2.2.2
+
+* BUGFIX for `AllMatcher`
+  
+  - return a diff instead of raising an exception
+  - (raising an exception was a bad idea as it blew up the entire match
+     when used in conjuction with an or-matcher, or embedded into other
+     matchers)
+
+### v2.2.1
+
+* AllMatcher also accepts a size (`Fixnum` or `Range`)
+
+### v2.2.0
+
+* Added Matcher and AllMatcher
+  - Matcher returns the *closest* diff.
+* Added `:min`, `:max` args to `AllMatcher` and `:optional_keys` to `Matcher`
+* Added range matcher
+
+### v2.0.0
+
+* Remove `:verbose` option
+  
+  More often than not users want this as the default.
+
 ### v1.0.1
 
 * BUGFIX for ruby 1.8.7

data/README.md

@@ -214,6 +214,16 @@ puts DiffMatcher::difference([Fixnum, 2], [1], :quiet=>true)
 # => Where, - 1 missing
 ```
 
+`:html_output=>true` will convert ansii escape codes to html spans
+
+``` ruby
+puts DiffMatcher::difference(1, 2, :html_output=>true)
+<pre>
+<span style="color:red">- <b>1</b></span><span style="color:yellow">+ <b>2</b></span>
+Where, <span style="color:red">- <b>1 missing</b></span>, <span style="color:yellow">+ <b>1 additional</b></span>
+</pre>
+```
+
 #### Prefixes
 
 The items shown in a difference are prefixed as follows:

data/lib/diff_matcher/difference.rb

@@ -1,3 +1,5 @@
+require 'diff_matcher/escape_to_html'
+
 module DiffMatcher
 
   def self.difference(expected, actual, opts={})
@@ -121,6 +123,8 @@ module DiffMatcher
       @optional_keys = opts.delete(:optional_keys) || []
       @dif_count = 0
       @difference = difference(expected, actual)
+      @html_output = opts[:html_output]
+      @color_enabled = true if @html_output
     end
 
     def matching?
@@ -144,7 +148,8 @@ module DiffMatcher
         }.compact.join(", ")
         msg <<  "\nWhere, #{where}" if where.size > 0
 
-        @color_enabled ? msg : msg.gsub(/\e\[\d+m/, "")
+        msg.gsub!(/\e\[\d+m/, "") unless @color_enabled
+        @html_output ? "<pre>\n#{escape_to_html(msg)}\n</pre>" : msg
       end
     end
 

data/lib/diff_matcher/escape_to_html.rb

@@ -0,0 +1,32 @@
+# from http://stackoverflow.com/questions/4894434/ansi-escape-code-with-html-tags-in-ruby
+def escape_to_html(data)
+  { 1 => :nothing,
+    2 => :nothing,
+    4 => :nothing,
+    5 => :nothing,
+    7 => :nothing,
+    30 => :black,
+    31 => :red,
+    32 => :green,
+    33 => :yellow,
+    34 => :blue,
+    35 => :magenta,
+    36 => :cyan,
+    37 => :white,
+    40 => :nothing,
+    41 => :nothing,
+    43 => :nothing,
+    44 => :nothing,
+    45 => :nothing,
+    46 => :nothing,
+    47 => :nothing,
+  }.each do |key, value|
+    if value != :nothing
+      data.gsub!(/\e\[#{key}m/,"<span style=\"color:#{value}\">")
+    else
+      data.gsub!(/\e\[#{key}m/,"<b>")
+    end
+  end
+  data.gsub!(/^\e\[0m/,'')
+  data.gsub!(/\e\[0m/,'</b></span>')
+end

data/lib/diff_matcher/version.rb

@@ -1,3 +1,3 @@
 module DiffMatcher
-  VERSION = "2.3.1"
+  VERSION = "2.3.3"
 end

data/spec/diff_matcher/difference_spec.rb

@@ -750,5 +750,22 @@ describe "DiffMatcher::difference(expected, actual, opts)" do
           EOF
       end
     end
+
+    describe "it shows matches in html" do
+      it_behaves_like "a diff matcher", expected, same, different,
+        <<-EOF , :color_scheme => :white_background, :html_output=>true
+        <pre>
+        [
+          <span style=\"color:red\">- <b>1</b></span><span style=\"color:magenta\">+ <b>0</b></span>,
+          2,
+          <span style=\"color:green\">~ </b></span>\"<span style=\"color:green\">(<b>3</b></span><span style=\"color:green\">)</b></span>\"</b></span>,
+          <span style=\"color:blue\">: <b>4</b></span>,
+          <span style=\"color:cyan\">. <b>5</b></span>,
+          <span style=\"color:cyan\">{ <b>6</b></span>
+        ]
+        Where, <span style=\"color:red\">- <b>1 missing</b></span>, <span style=\"color:magenta\">+ <b>1 additional</b></span>, <span style=\"color:green\">~ <b>1 match_regexp</b></span>, <span style=\"color:blue\">: <b>1 match_class</b></span>, <span style=\"color:cyan\">. <b>1 match_range</b></span>, <span style=\"color:cyan\">{ <b>1 match_proc</b></span>
+        </pre>
+        EOF
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diff_matcher
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-02 00:00:00.000000000 +10:00
+date: 2012-08-03 00:00:00.000000000 +10:00
 default_executable: 
 dependencies: []
 description: ! "DiffMatcher performs recursive matches on values contained in hashes,
@@ -22,11 +22,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitignore
 - .rspec
 - .travis.yml
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - License.txt
 - README.md
 - Rakefile
@@ -34,9 +34,9 @@ files:
 - diff_matcher.gemspec
 - doc/diff_matcher.gif
 - doc/example_output.png
-- examples/tennis_score.rb
 - lib/diff_matcher.rb
 - lib/diff_matcher/difference.rb
+- lib/diff_matcher/escape_to_html.rb
 - lib/diff_matcher/version.rb
 - spec/diff_matcher/difference_spec.rb
 - spec/spec_helper.rb
@@ -55,7 +55,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -173866385
+      hash: 1047575201
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/Gemfile.lock

@@ -1,26 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    diff-lcs (1.1.3)
-    multi_json (1.0.4)
-    rake (0.9.2.2)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
-    simplecov (0.5.4)
-      multi_json (~> 1.0.3)
-      simplecov-html (~> 0.5.3)
-    simplecov-html (0.5.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  rake (~> 0.9)
-  rspec (~> 2.6.0)
-  simplecov

data/examples/tennis_score.rb

@@ -1,15 +0,0 @@
-require 'diff_matcher'
-
-set_scores = [
-  [[6,4], [6,4], [6,4]],
-  [[8,4], [6,9], [6,4]],
-]
-
-pat_set_scores = DiffMatcher::AllMatcher.new(
-  [0..6, 0..6],
-  :size => 2..3
-)
-
-invalid_scores = set_scores.map { |score| pat_set_scores.diff(score) }.compact
-
-puts invalid_scores