rspec-expectations 2.14.3 → 2.14.4

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    Mzg4MjBiNTY0NTMxM2E3ODVlNjJjYjgzYmJjMThhMTk4N2ZmZmIyOA==
-  data.tar.gz: !binary |-
-    NGRiNWI1ODQ4MTY2YTZlYTJlZGM3ZDQ3YzQwZjExMTQ2YWE5MTc5OA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    ZTEyOTg0ZTBjMDczNGJlZTc1ZGI3YThjODY4MWViMjMzYzI2ZTk1OWQ4NjVi
-    NjgyMmZlZjNiODRjOTU2ODdkYTM0YzIzMjQwMjAxZTI4YzY5Y2MzYWJlZmVl
-    MDgwZjdjZjQ5Nzc0MDY4MzVlMTQwMTczMGE4Y2NhNzJlZDAzMjE=
-  data.tar.gz: !binary |-
-    ZGZjNzZkNjQwMDU4NWI5ZDRmYzM0NjM4M2MwMTMzNmJhODgyOWE0NGU4NzQ0
-    MWI2Yjc2YzUxYjNmMGZmMGQ4MzQ4ODFiYjU2NDViOGJmNGVmNjFlNGU4M2Iz
-    Njc3N2U0ZDUwNGJiMjVhZmRmZDViOTRmNjVhMjU1MDRjYjk3NTY=
+SHA1:
+  metadata.gz: 2fe9c0e9206aaf6e58ecb9d8ef9e906668443bad
+  data.tar.gz: b87df2d0361493a79a7f6b481b55e13babff42e8
+SHA512:
+  metadata.gz: e72fd27b6f8595cccd408ce04cae06c4ec222f424015c0e50a942ab03ee40b716a3d159c4b88d73715769ab45156056d9a51c0f223335c8ddc1ac9cc1fde01bf
+  data.tar.gz: cf203e11140a60a320babfa6be93bd5943b1645a6ccd4b5dc01edaefd5fbe0ed7e770ba05f2deb9f2b096c76213db103cf8ea8042ef8f6e9052ac24d6e45ca04

data/Changelog.md

@@ -1,3 +1,12 @@
+### 2.14.4 / 2013-11-06
+[full changelog](http://github.com/rspec/rspec-expectations/compare/v2.14.3...v2.14.4)
+
+Bug fixes
+
+* Make the `match` matcher produce a diff output. (Jon Rowe, Ben Moss)
+* Choose encoding for diff's more intelligently, and when all else fails fall
+  back to default internal encoding with replacing characters. (Jon Rowe)
+
 ### 2.14.3 / 2013-09-22
 [full changelog](http://github.com/rspec/rspec-expectations/compare/v2.14.2...v2.14.3)
 

data/features/diffing.feature

@@ -43,7 +43,7 @@ Feature: diffing
         actual
           string
       ACTUAL
-          actual.should =~ expected
+          expect(actual).to match expected
         end
       end
       """

data/lib/rspec/expectations/differ.rb

@@ -5,11 +5,13 @@ require 'pp'
 module RSpec
   module Expectations
     class Differ
+
       # This is snagged from diff/lcs/ldiff.rb (which is a commandline tool)
       def diff_as_string(input_data_new, input_data_old)
-        output = matching_encoding("", input_data_old)
-        data_old = input_data_old.split(matching_encoding("\n", input_data_old)).map! { |e| e.chomp }
-        data_new = input_data_new.split(matching_encoding("\n", input_data_new)).map! { |e| e.chomp }
+        encoding = pick_encoding input_data_new, input_data_old
+        output = matching_encoding("", encoding)
+        data_old = input_data_old.split(matching_encoding("\n", encoding)).map! { |e| e.chomp }
+        data_new = input_data_new.split(matching_encoding("\n", encoding)).map! { |e| e.chomp }
         diffs = Diff::LCS.diff(data_old, data_new)
         return output if diffs.empty?
         oldhunk = hunk = nil
@@ -33,16 +35,16 @@ module RSpec
                 hunk.unshift(oldhunk)
               end
             else
-              output << matching_encoding(oldhunk.diff(format).to_s, output)
+              output << matching_encoding(oldhunk.diff(format).to_s, encoding)
             end
           ensure
             oldhunk = hunk
-            output << matching_encoding("\n", output)
+            output << matching_encoding("\n", encoding)
           end
         end
         #Handle the last remaining hunk
-        output << matching_encoding(oldhunk.diff(format).to_s,output)
-        output << matching_encoding("\n",output)
+        output << matching_encoding(oldhunk.diff(format).to_s, encoding)
+        output << matching_encoding("\n", encoding)
         color_diff output
       rescue Encoding::CompatibilityError
         if input_data_new.encoding != input_data_old.encoding
@@ -115,7 +117,8 @@ module RSpec
             #
             # note, PP is used to ensure the ordering of the internal values of key/value e.g.
             # <# a: b: c:> not <# c: a: b:>
-            matching_encoding("#{pp_key} => #{pp_value}", key.to_s)
+            encoding = pick_encoding pp_key, pp_value
+            matching_encoding("#{pp_key} => #{pp_value}", encoding)
           end.join(",\n")
         when String
           object =~ /\n/ ? object : object.inspect
@@ -124,12 +127,23 @@ module RSpec
         end
       end
 
+    private
+
       if String.method_defined?(:encoding)
-        def matching_encoding(string, source)
-          string.encode(source.encoding)
+        def pick_encoding(source_a, source_b)
+          Encoding.compatible?(source_a, source_b) || Encoding.default_external
+        end
+
+        def matching_encoding(string, encoding)
+          string.encode encoding
+        rescue Encoding::UndefinedConversionError
+          string.encode(encoding, :undef => :replace)
         end
       else
-        def matching_encoding(string, source)
+        def pick_encoding(source_a, source_b)
+        end
+
+        def matching_encoding(string, encoding)
           string
         end
       end

data/lib/rspec/expectations/version.rb

@@ -2,7 +2,7 @@ module RSpec
   module Expectations
     # @private
     module Version
-      STRING = '2.14.3'
+      STRING = '2.14.4'
     end
   end
 end

data/lib/rspec/matchers.rb

@@ -521,9 +521,6 @@ module RSpec
     #   expect { do_something_risky }.to raise_error(PoorRiskDecisionError, /oo ri/)
     #
     #   expect { do_something_risky }.not_to raise_error
-    #   expect { do_something_risky }.not_to raise_error(PoorRiskDecisionError)
-    #   expect { do_something_risky }.not_to raise_error(PoorRiskDecisionError, "that was too risky")
-    #   expect { do_something_risky }.not_to raise_error(PoorRiskDecisionError, /oo ri/)
     def raise_error(error=Exception, message=nil, &block)
       BuiltIn::RaiseError.new(error, message, &block)
     end

data/lib/rspec/matchers/built_in/match.rb

@@ -6,6 +6,11 @@ module RSpec
         def match(expected, actual)
           actual.match expected
         end
+
+        def diffable?
+          true
+        end
+
       end
     end
   end

data/spec/rspec/expectations/differ_spec.rb

@@ -54,7 +54,12 @@ EOD
             @actual="Tu avec carte {count} item has".encode('UTF-16LE')
             expect(subject).to eql 'Could not produce a diff because of the encoding of the string (UTF-16LE)'
           end
-          it 'ouputs a message when encountering differently encoded strings' do
+          it 'handles differently encoded strings that are compatible' do
+            @expected = "강인철".encode('UTF-8')
+            @actual   = "abc".encode('us-ascii')
+            expect(subject).to eql "\n@@ -1,2 +1,2 @@\n-abc\n+강인철\n"
+          end
+          it 'outputs a message when encountering differently encoded strings' do
             @expected="Tu avec carté {count} itém has".encode('UTF-16LE')
             @actual="Tu avec carte {count} item has"
             expect(subject).to eql 'Could not produce a diff because the encoding of the actual string (UTF-8) differs from the encoding of the expected string (UTF-16LE)'
@@ -137,7 +142,7 @@ EOD
           expect(diff).to eq expected_diff
         end
 
-        it 'outputs unified diff messaoge of two hashes with differing encoding' do
+        it 'outputs unified diff message of two hashes with differing encoding' do
           expected_diff = %Q{
 @@ -1,2 +1,2 @@
 -"a" => "a"
@@ -148,6 +153,17 @@ EOD
           expect(diff).to eq expected_diff
         end
 
+        it 'outputs unified diff message of two hashes with encoding different to key encoding' do
+          expected_diff = %Q{
+@@ -1,2 +1,2 @@
+-:a => "a"
+#{ (RUBY_VERSION.to_f > 1.8) ?  %Q{+\"한글\" => \"한글2\"} : '+"\355\225\234\352\270\200" => "\355\225\234\352\270\2002"' }
+}
+
+          diff = differ.diff_as_object({ "한글" => "한글2"}, { :a => "a"})
+          expect(diff).to eq expected_diff
+        end
+
         it "outputs unified diff message of two hashes with object keys" do
           expected_diff = %Q{
 @@ -1,2 +1,2 @@
@@ -211,4 +227,3 @@ EOD
     end
   end
 end
-

data/spec/rspec/matchers/match_spec.rb

@@ -30,6 +30,19 @@ describe "expect(...).to match(expected)" do
     matcher.matches?("string")
     expect(matcher.failure_message_for_should).to eq "expected \"string\" to match /rings/"
   end
+
+  it "provides a diff on failure" do
+    allow(RSpec::Matchers.configuration).to receive(:color?).and_return(false)
+
+    failure_message_that_includes_diff = %r%
+\s*Diff:
+\s*@@ -1,2 \+1,2 @@
+\s*-/bar/
+\s*\+"foo"%
+
+    expect { expect("foo").to match(/bar/) }.to fail_with(failure_message_that_includes_diff)
+  end
+
 end
 
 describe "expect(...).not_to match(expected)" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-expectations
 version: !ruby/object:Gem::Version
-  version: 2.14.3
+  version: 2.14.4
 platform: ruby
 authors:
 - Steven Baker
@@ -9,13 +9,13 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-23 00:00:00.000000000 Z
+date: 2013-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.1.3
     - - <
@@ -25,7 +25,7 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.1.3
     - - <
@@ -222,20 +222,20 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: rspec
-rubygems_version: 2.0.7
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: rspec-expectations-2.14.3
+summary: rspec-expectations-2.14.4
 test_files:
 - features/README.md
 - features/Upgrade.md