diff_matcher 1.0.0 → 1.0.1

data/.travis.yml

@@ -0,0 +1,10 @@
+rvm:
+#  - 1.8.6  # travis no longer supports this https://twitter.com/#!/travisci/status/114926454122364928
+  - 1.8.7
+#  - 1.9.1  # travis no longer supports this https://twitter.com/#!/travisci/status/114926454122364928
+  - 1.9.2
+  - 1.9.3
+  - rbx
+  - rbx-2.0
+  - ree
+  - ruby-head

data/CHANGELOG.md

@@ -0,0 +1,9 @@
+# Changelog
+
+### v1.0.1
+
+* BUGFIX for ruby 1.8.7
+
+### v1.0.0
+
+* initial release (as a gem in the wild)

data/Gemfile

@@ -1,9 +1,12 @@
 source "http://rubygems.org"
 
-gemspec
+#gemspec
 
-group :test do
-  gem "rake"
-  gem "rspec" #, "~> 2.0.1"
-  gem "simplecov"
+gem "rake" , "~> 0.9"
+gem "rspec", "~> 2.6.0"
+
+group :development do
+  platforms :mri_19 do
+    gem "simplecov"
+  end
 end

data/README.md

@@ -24,78 +24,100 @@ Installation
 Usage
 ---
 
-    require 'diff_matcher'
-    
-    DiffMatcher::difference(actual, expected, opts={})
+``` ruby
+require 'diff_matcher'
+
+DiffMatcher::difference(actual, expected, opts={})
+```
 
 When `expected` != `actual`
 
-    puts DiffMatcher::difference(1, 2)
-    # => - 1+ 2
-    # => Where, - 1 missing, + 1 additional
+``` ruby
+puts DiffMatcher::difference(1, 2)
+# => - 1+ 2
+# => Where, - 1 missing, + 1 additional
+```
 
 When `expected` == `actual`
 
-    p DiffMatcher::difference(1, 1)
-    # => nil
+``` ruby
+p DiffMatcher::difference(1, 1)
+# => nil
+```
 
 When `actual` is an instance of the `expected`
 
-    p DiffMatcher::difference(String, '1')
-    # => nil
+``` ruby
+p DiffMatcher::difference(String, '1')
+# => nil
+```
 
 When `actual` is a string that matches the `expected` regex
 
-    p DiffMatcher::difference(/[a-z]/, "a")
-    # => nil
+``` ruby
+p DiffMatcher::difference(/[a-z]/, "a")
+# => nil
+```
 
 When `actual` is passed to an `expected` proc and it returns true
 
-    is_boolean = lambda { |x| [FalseClass, TrueClass].include? x.class }
-    p DiffMatcher::difference(is_boolean, true)
-    # => nil
+``` ruby
+is_boolean = lambda { |x| [FalseClass, TrueClass].include? x.class }
+p DiffMatcher::difference(is_boolean, true)
+# => nil
+```
 
 When `actual` is missing one of the `expected` values
 
-    puts DiffMatcher::difference([1, 2], [1])
-    # => [
-    # => - 2
-    # => ]
-    # => Where, - 1 missing
+``` ruby
+puts DiffMatcher::difference([1, 2], [1])
+# => [
+# => - 2
+# => ]
+# => Where, - 1 missing
+```
 
 When `actual` has additional values to the `expected`
 
-    puts DiffMatcher::difference([1], [1, 2])
-    # => [
-    # => + 2
-    # => ]
-    # => Where, - 1 additional
+``` ruby
+puts DiffMatcher::difference([1], [1, 2])
+# => [
+# => + 2
+# => ]
+# => Where, - 1 additional
+```
 
 ### Options
 
 `:ignore_additional=>true` will match even if `actual` has additional items
 
-    p DiffMatcher::difference([1], [1, 2], :ignore_additional=>true)
-    # => nil
+``` ruby
+p DiffMatcher::difference([1], [1, 2], :ignore_additional=>true)
+# => nil
+```
 
 `:verbose=>true` shows only missing and additional items in the output
 
-    puts DiffMatcher::difference([Fixnum, 2], [1], :quiet=>true)
-    # => [
-    # => - 2
-    # => ]
-    # => Where, - 1 missing
+``` ruby
+puts DiffMatcher::difference([Fixnum, 2], [1], :quiet=>true)
+# => [
+# => - 2
+# => ]
+# => Where, - 1 missing
+```
 
 `:verbose=>true` shows all matched items in the output
 
-    puts DiffMatcher::difference([Fixnum, 2], [1], :verbose=>true)
-    # => [
-    # = >  : 1,
-    # => - 2
-    # => ]
-    # => Where, - 1 missing, : 1 match_class
+``` ruby
+puts DiffMatcher::difference([Fixnum, 2], [1], :verbose=>true)
+# => [
+# = >  : 1,
+# => - 2
+# => ]
+# => Where, - 1 missing, : 1 match_class
+```
 
-#### prefixes
+#### Prefixes
 
 NB. The `: 1` from above includes a `:` prefix that shows the `1` was matched against a class (ie. `Fixnum`)
 
@@ -108,7 +130,7 @@ The items shown in a difference are prefixed as follows:
     match class   => ": "
     match proc    => "{ "
 
-#### colours
+#### Colours
 
 Colours (defined in colour schemes) can also appear in the difference.
 
@@ -122,11 +144,15 @@ Using the `:default` colour scheme items shown in a difference are coloured as f
     match proc    => cyan
 
 
+`:color_scheme=>:white_background` shows difference as follows
+
+``` ruby
     puts DiffMatcher::difference(
       { :a=>{ :a1=>11          }, :b=>[ 21, 22 ], :c=>/\d/, :d=>Fixnum, :e=>lambda { |x| (4..6).includes? x },
       { :a=>{ :a1=>10, :a2=>12 }, :b=>[ 21     ], :c=>'3' , :d=>4     , :e=>5                               },
       :verbose=>true, :color_scheme=>:white_background
     )
+```
 
 ![example output](https://raw.github.com/playup/diff_matcher/master/doc/example_output.png)
 

data/Rakefile

@@ -1,5 +1,5 @@
 require 'bundler'
-
+Bundler.setup
 Bundler::GemHelper.install_tasks
 
 require "rspec/core/rake_task"

data/lib/diff_matcher/difference.rb

@@ -49,7 +49,7 @@ module DiffMatcher
     def matching?
       @match ||= @difference ? item_types.map { |item_type|
         @color_scheme[item_type]
-      }.reduce(0) { |count, (color, prefix)|
+      }.inject(0) { |count, (color, prefix)|
         count + @difference.scan("#{color}#{prefix}").size
       } == 0 : true
     end
@@ -101,7 +101,7 @@ module DiffMatcher
         right = diff(actual, expected)
         items_to_s(
           expected,
-          (item_types_shown).reduce([]) { |a, method|
+          (item_types_shown).inject([]) { |a, method|
             a + send(method, left, right, expected.class).compact.map { |item| markup(method, item) }
           }
         )
@@ -112,11 +112,11 @@ module DiffMatcher
 
     def diff(expected, actual, reverse=false)
       if expected.is_a?(Hash)
-        expected.keys.reduce({}) { |h, k|
+        expected.keys.inject({}) { |h, k|
           h.update(k => actual.has_key?(k) ? difference(actual[k], expected[k], reverse) : expected[k])
         }
       elsif expected.is_a?(Array)
-        expected, actual = [expected, actual].map { |x| x.each_with_index.reduce({}) { |h, (v, i)| h.update(i=>v) } }
+        expected, actual = [expected, actual].map { |x| x.each_with_index.inject({}) { |h, (v, i)| h.update(i=>v) } }
         #diff(expected, actual, reverse)  # XXX - is there a test case for this?
         diff(expected, actual)
       else

data/lib/diff_matcher/version.rb

@@ -1,3 +1,3 @@
 module DiffMatcher
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/spec/diff_matcher/difference_spec.rb

@@ -1,7 +1,5 @@
 require "spec_helper"
 
-RUBY_1_9 = (RUBY_VERSION =~ /^1\.9/)
-
 def opts_to_s(opts)
   opts_strs = opts.map { |k,v| ":#{k}=>#{v}" if v }.compact
   opts_strs.size > 0 ? ", " + opts_strs * ", " : ""
@@ -17,7 +15,8 @@ end
 describe DiffMatcher do
   subject { DiffMatcher::difference(expected, actual, opts) }
 
-  shared_examples_for "a differ" do |expected, same, different, difference="", opts={}|
+  shared_examples_for "a differ" do |expected, same, different, difference, opts|
+    opts ||= {}
     context "with #{opts.size > 0 ? opts_to_s(opts) : "no opts"}" do
       describe "difference(#{expected.inspect}, #{same.inspect}#{opts_to_s(opts)})" do
         let(:expected) { expected }
@@ -50,7 +49,7 @@ describe DiffMatcher do
         2
 
       it_behaves_like "a differ", expected, same, different,
-        <<-EOF
+        <<-EOF, {}
         - 1+ 2
         Where, - 1 missing, + 1 additional
         EOF
@@ -63,7 +62,7 @@ describe DiffMatcher do
         "b"
 
       it_behaves_like "a differ", expected, same, different,
-        <<-EOF
+        <<-EOF, {}
         - "a"+ "b"
         Where, - 1 missing, + 1 additional
         EOF
@@ -72,7 +71,7 @@ describe DiffMatcher do
         different = 0
 
         it_behaves_like "a differ", expected, same, different,
-          <<-EOF
+          <<-EOF, {}
           - "a"+ 0
           Where, - 1 missing, + 1 additional
           EOF
@@ -82,7 +81,7 @@ describe DiffMatcher do
         different = nil
 
         it_behaves_like "a differ", expected, same, different,
-          <<-EOF
+          <<-EOF, {}
           - "a"+ nil
           Where, - 1 missing, + 1 additional
           EOF
@@ -96,7 +95,7 @@ describe DiffMatcher do
         false
 
       it_behaves_like "a differ", expected, same, different,
-        <<-EOF
+        <<-EOF, {}
         - nil+ false
         Where, - 1 missing, + 1 additional
         EOF
@@ -109,7 +108,7 @@ describe DiffMatcher do
         [ 2 ]
 
       it_behaves_like "a differ", expected, same, different,
-        <<-EOF
+        <<-EOF, {}
         [
           - 1+ 2
         ]
@@ -157,7 +156,7 @@ describe DiffMatcher do
           [ 1, 2    ]
 
         it_behaves_like "a differ", expected, same, different,
-          <<-EOF
+          <<-EOF, {}
           [
           - 3
           ]
@@ -183,7 +182,7 @@ describe DiffMatcher do
         { "a"=>2 }
 
       it_behaves_like "a differ", expected, same, different,
-        <<-EOF
+        <<-EOF, {}
         {
           "a"=>- 1+ 2
         }
@@ -197,7 +196,7 @@ describe DiffMatcher do
           { "a"=>[ "b", 1 ] }
 
         it_behaves_like "a differ", expected, same, different,
-          <<-EOF
+          <<-EOF, {}
           {
             "a"=>- {"b"=>1}+ ["b", 1]
           }
@@ -213,7 +212,7 @@ describe DiffMatcher do
 
         describe "it won't match the descendents" do
           it_behaves_like "a differ", expected, same, different,
-            <<-EOF
+            <<-EOF, {}
             {
             - "a"=>{"b"=>{"c"=>1}},
             + "b"=>{"c"=>1}
@@ -233,7 +232,7 @@ describe DiffMatcher do
         1
 
       it_behaves_like "a differ", expected, same, different,
-        <<-EOF
+        <<-EOF, {}
         - String+ 1
         Where, - 1 missing, + 1 additional
         EOF
@@ -248,7 +247,7 @@ describe DiffMatcher do
         "A"
 
       it_behaves_like "a differ", expected, same, different,
-        <<-EOF
+        <<-EOF, {}
         - /[a-z]/+ "A"
         Where, - 1 missing, + 1 additional
         EOF
@@ -257,7 +256,7 @@ describe DiffMatcher do
         different = :a
 
         it_behaves_like "a differ", expected, same, different,
-          <<-EOF
+          <<-EOF, {}
           - /[a-z]/+ :a
           Where, - 1 missing, + 1 additional
           EOF
@@ -285,7 +284,7 @@ describe DiffMatcher do
 
     describe "it shows regex, class, proc matches and" do
       it_behaves_like "a differ", expected, same, different,
-        <<-EOF
+        <<-EOF, {}
         [
           - 1+ 0,
           ~ (3),

data/spec/spec_helper.rb

@@ -1,3 +1,6 @@
-require 'simplecov'
-SimpleCov.start
+RUBY_1_9 = (RUBY_VERSION =~ /^1\.9/)
+if RUBY_1_9
+  require 'simplecov'
+  SimpleCov.start
+end
 require "diff_matcher"

metadata

@@ -2,7 +2,7 @@
 name: diff_matcher
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors: 
 - Playup
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-17 00:00:00 +10:00
+date: 2011-09-21 00:00:00 +10:00
 default_executable: 
 dependencies: []
 
@@ -32,6 +32,8 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- .travis.yml
+- CHANGELOG.md
 - Gemfile
 - License.txt
 - README.md
@@ -57,6 +59,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 245833137
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false