rspec-match_ignoring_whitespace 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: ad3b8354fd617b6a2db5a077cfa3b1c49ab2394f6d481e722d5158013ae378b7
-  data.tar.gz: acfabac792eee53f6f9f7ec4ee1c19498815a3e7524553fe1735845e9931f398
+SHA1:
+  metadata.gz: '038c5481ebb263e376683226b2fd191925332aaa'
+  data.tar.gz: a9adcd0d707bfe6edfeb7d40c8907596410690a3
 SHA512:
-  metadata.gz: bebec84b9e47ae4b9db953703125bc23e017a5bdd3ae90ce6724b207bc9c48fd3c7df8c61d546a66fc651a4c95a755dc9f6eee860c41ac137779259746c93c90
-  data.tar.gz: 72a52d8d2b77a41d27ba668cb8d59769de5d2c329e06def7503b3ea28a3530e69f36c68dcb26c430fa9021b3fc6206e8950dd9c5d3f0d72c603eac641f0a5e21
+  metadata.gz: af7a58d59630c3659262105e78a27eb83b976d5318a96e13f032bf9c7130a15c5ba0893479ac2c79b77fd85a82948b014b02ad325dce6ef9e8d2a7160fcc1fd9
+  data.tar.gz: f64cc00d6510940eb8cd4bda53c79b8ea894c3f7a6ea0dd9d32398805d538a07b08b789d6735d6b48b285e6cd9c968367990a420f8733e9d8066c00860395516

data/.gitignore

@@ -1,5 +1,6 @@
 .*.swp
 .*.swo
+/.bundle
 /.ruby-version
 /.ruby-gemset
 /pkg

data/README.md

@@ -19,7 +19,7 @@ Installation
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'rspec-match_fuzzy'
+gem 'rspec-match_ignoring_whitespace'
 ```
 
 And then execute:
@@ -28,7 +28,7 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install rspec-match_fuzzy
+    $ gem install rspec-match_ignoring_whitespace
 
 
 Usage

data/lib/rspec/match_ignoring_whitespace.rb

@@ -1,30 +1,84 @@
 require 'rspec'
+require 'levenstein_with_path'
+require 'word_wrap'
+
+def collapse_spaces(str)
+  str.gsub(/[\n[[:blank:]]]+/, ' ').strip
+end
 
 RSpec::Matchers.define :match_ignoring_whitespace do |expected|
   expected = expected.to_s
 
   match do |actual|
     actual = actual.to_s
-    actual.gsub(/[\n[[:blank:]]]+/, ' ').strip == expected.gsub(/[\n[[:blank:]]]+/, ' ').strip
+    collapse_spaces(actual) == collapse_spaces(expected)
   end
 
   failure_message do |actual|
     actual = actual.to_s
-    actual_normalized   = actual.gsub(/[\n[[:blank:]]]+/, ' ').strip
-    expected_normalized = expected.gsub(/[\n[[:blank:]]]+/, ' ').strip
-
-    message = <<-EOF.strip
-expected: #{expected_normalized.inspect}
-     got: #{actual_normalized.inspect}
-    EOF
-
-    diff = RSpec::Expectations.differ.diff(actual_normalized, expected_normalized)
+    actual_normalized   = collapse_spaces(actual)
+    expected_normalized = collapse_spaces(expected)
 
-    unless diff.strip.empty?
-      diff_label = RSpec::Matchers::ExpectedsForMultipleDiffs::DEFAULT_DIFF_LABEL
-      message << "\n\n" << diff_label << diff
+    diff = LevensteinWithPath::Path.new(
+      expected_normalized.split(' '),
+      actual_normalized.split(' ')
+    )
+    runs = []
+    last_edit = nil
+    diff.edits.each do |edit|
+      last_edit = runs.last
+      if last_edit.class == edit.class
+        runs.pop
+        case edit
+        when LevensteinWithPath::Keep
+          runs << LevensteinWithPath::Keep.new(last_edit.token + [edit.token])
+        when LevensteinWithPath::Swap
+          runs << LevensteinWithPath::Swap.new(last_edit.token1 + [edit.token1], last_edit.token2 + [edit.token2])
+        when LevensteinWithPath::Insert
+          runs << LevensteinWithPath::Insert.new(last_edit.token + [edit.token])
+        when LevensteinWithPath::Delete
+          runs << LevensteinWithPath::Delete.new(last_edit.token + [edit.token])
+        else
+          raise "Unknown class: #{edit}"
+        end
+      else
+        case edit
+        when LevensteinWithPath::Keep
+          runs << LevensteinWithPath::Keep.new([edit.token])
+        when LevensteinWithPath::Swap
+          runs << LevensteinWithPath::Swap.new([edit.token1], [edit.token2])
+        when LevensteinWithPath::Insert
+          runs << LevensteinWithPath::Insert.new([edit.token])
+        when LevensteinWithPath::Delete
+          runs << LevensteinWithPath::Delete.new([edit.token])
+        else
+          raise "Unknown class: #{edit}"
+        end
+      end
     end
 
-    message
+    message = runs.flat_map do |run|
+      case run
+      when LevensteinWithPath::Keep
+        WordWrap.ww(run.token.join(' '), 80).split("\n")
+      when LevensteinWithPath::Swap
+        WordWrap.ww(run.token1.join(' '), 78).split("\n").map do |line|
+          "- #{line}"
+        end +
+        WordWrap.ww(run.token2.join(' '), 78).split("\n").map do |line|
+          "+ #{line}"
+        end
+      when LevensteinWithPath::Insert
+        WordWrap.ww(run.token.join(' '), 78).split("\n").map do |line|
+          "+ #{line}"
+        end
+      when LevensteinWithPath::Delete
+        WordWrap.ww(run.token.join(' '), 78).split("\n").map do |line|
+          "- #{line}"
+        end
+      else
+        raise "Unknown class: #{run}"
+      end
+    end.join("\n")
   end
 end

data/lib/rspec/match_ignoring_whitespace/version.rb

@@ -1,5 +1,5 @@
 module RSpec
   module MatchIgnoringWhitespace
-    VERSION = '1.0.0'.freeze
+    VERSION = '1.1.0'.freeze
   end
 end

data/rspec-match_ignoring_whitespace.gemspec

@@ -21,6 +21,8 @@ Gem::Specification.new do |s|
   s.test_files = `git ls-files -- {test,spec,fixtures}/*`.split("\n")
 
   s.add_dependency 'rspec', '>= 3.2.0'
+  s.add_dependency 'levenstein_with_path'
+  s.add_dependency 'word_wrap'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'simplecov'

data/spec/match_ignoring_whitespace_spec.rb

@@ -43,23 +43,43 @@ describe 'match_ignoring_whitespace' do
   end
 
   context "doesn't match" do
+    let(:matcher) { match_ignoring_whitespace(expected) }
     specify 'nil' do
-      expect(nil).not_to match_ignoring_whitespace expected
+      expect(nil).not_to matcher
+      expect(matcher.failure_message).to eq '- πόλλ΄ οἶδ΄ ἀλώπηξ, ἀλλ΄ ἐχῖνος ἓν μέγα.'
     end
     specify 'an empty string' do
-      expect('').not_to match_ignoring_whitespace expected
+      expect('').not_to matcher
+      expect(matcher.failure_message).to eq '- πόλλ΄ οἶδ΄ ἀλώπηξ, ἀλλ΄ ἐχῖνος ἓν μέγα.'
     end
     specify 'a single space' do
-      expect(' ').not_to match_ignoring_whitespace expected
+      expect(' ').not_to matcher
+      expect(matcher.failure_message).to eq '- πόλλ΄ οἶδ΄ ἀλώπηξ, ἀλλ΄ ἐχῖνος ἓν μέγα.'
     end
     specify 'a different string' do
-      expect('χρημάτων ἄελπτον οὐδέν ἐστιν οὐδ᾽ ἀπώμιον οὐδὲ θαυμάσιον').not_to match_ignoring_whitespace expected
+      expect('χρημάτων ἄελπτον οὐδέν ἐστιν οὐδ᾽ ἀπώμιον οὐδὲ θαυμάσιον').not_to matcher
+      expect(matcher.failure_message).to eq [
+        # TODO: Even Insert+Swap (like here) is joinable I think:
+        '+ χρημάτων',
+        '- πόλλ΄ οἶδ΄ ἀλώπηξ, ἀλλ΄ ἐχῖνος ἓν μέγα.',
+        '+ ἄελπτον οὐδέν ἐστιν οὐδ᾽ ἀπώμιον οὐδὲ θαυμάσιον',
+      ].join("\n")
     end
     specify 'a string missing a space' do
-      expect("πόλλ΄ οἶδ΄ ἀλώπηξ,ἀλλ΄ ἐχῖνος ἓν μέγα.").not_to match_ignoring_whitespace expected
+      expect("πόλλ΄ οἶδ΄ ἀλώπηξ,ἀλλ΄ ἐχῖνος ἓν μέγα.").not_to matcher
+      expect(matcher.failure_message).to eq [
+        'πόλλ΄ οἶδ΄',
+        # TODO: It would be nice to join things like Delete+Swap or Swap+Insert:
+        '- ἀλώπηξ,',
+        '- ἀλλ΄',
+        '+ ἀλώπηξ,ἀλλ΄',
+        'ἐχῖνος ἓν μέγα.',
+      ].join("\n")
     end
     specify 'expecting nil' do
-      expect('anything').not_to match_ignoring_whitespace(nil)
+      matcher = match_ignoring_whitespace(nil)
+      expect('anything').not_to matcher
+      expect(matcher.failure_message).to eq '+ anything'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-match_ignoring_whitespace
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Paul A. Jungwirth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-19 00:00:00.000000000 Z
+date: 2018-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -24,6 +24,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
+- !ruby/object:Gem::Dependency
+  name: levenstein_with_path
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: word_wrap
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -121,8 +149,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: RSpec matcher to compare strings ignoring whitespace
-test_files: []
+test_files:
+- spec/match_ignoring_whitespace_spec.rb
+- spec/spec_helper.rb