Skip to content

Commit ea05626

Browse files
committed
Rename Differ/Differs::* to EqualityMatcher/EqualityMatchers::*
We want to split off the concept of "a thing that produces a diff" from "the thing that I run and will spit out whether or not two objects are equal".
1 parent 54174a0 commit ea05626

File tree

12 files changed

+19
-19
lines changed

12 files changed

+19
-19
lines changed

lib/super_diff.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
require_relative "super_diff/differ"
1+
require_relative "super_diff/equality_matcher"

lib/super_diff/differ.rb renamed to lib/super_diff/equality_matcher.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
require_relative "differs/detector"
2-
require_relative "differs/object"
1+
require_relative "equality_matchers/detector"
2+
require_relative "equality_matchers/object"
33

44
module SuperDiff
5-
class Differ
5+
class EqualityMatcher
66
def self.call(expected:, actual:)
77
new(expected: expected, actual: actual).call
88
end
@@ -14,9 +14,9 @@ def initialize(expected:, actual:)
1414

1515
def call
1616
if expected.is_a?(actual.class)
17-
Differs::Detector.call(expected.class).call(expected, actual)
17+
EqualityMatchers::Detector.call(expected.class).call(expected, actual)
1818
else
19-
Differs::Object.call(expected, actual)
19+
EqualityMatchers::Object.call(expected, actual)
2020
end
2121
end
2222

lib/super_diff/differs/array.rb renamed to lib/super_diff/equality_matchers/array.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
require_relative "collection"
44

55
module SuperDiff
6-
module Differs
6+
module EqualityMatchers
77
class Array < Collection
88
def initialize(expected, actual)
99
super(expected, actual)

lib/super_diff/differs/base.rb renamed to lib/super_diff/equality_matchers/base.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
require_relative "../csi"
22

33
module SuperDiff
4-
module Differs
4+
module EqualityMatchers
55
class Base
66
ICONS = { deleted: "-", inserted: "+" }
77
STYLES = { inserted: :inserted, deleted: :deleted, equal: :normal }

lib/super_diff/differs/collection.rb renamed to lib/super_diff/equality_matchers/collection.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
require_relative "base"
22

33
module SuperDiff
4-
module Differs
4+
module EqualityMatchers
55
class Collection < Base
66
protected
77

lib/super_diff/differs/detector.rb renamed to lib/super_diff/equality_matchers/detector.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
require_relative "object"
55

66
module SuperDiff
7-
module Differs
7+
module EqualityMatchers
88
module Detector
99
def self.call(klass)
10-
if Differs.const_defined?(klass.name, false)
11-
Differs.const_get(klass.name)
10+
if EqualityMatchers.const_defined?(klass.name, false)
11+
EqualityMatchers.const_get(klass.name)
1212
else
13-
Differs::Object
13+
EqualityMatchers::Object
1414
end
1515
end
1616
end

lib/super_diff/differs/hash.rb renamed to lib/super_diff/equality_matchers/hash.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
require_relative "collection"
22

33
module SuperDiff
4-
module Differs
4+
module EqualityMatchers
55
class Hash < Collection
66
def fail
77
<<~OUTPUT.strip

lib/super_diff/differs/multi_line_string.rb renamed to lib/super_diff/equality_matchers/multi_line_string.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
require_relative "base"
44

55
module SuperDiff
6-
module Differs
6+
module EqualityMatchers
77
class MultiLineString < Base
88
def initialize(expected, actual)
99
@expected = split_into_lines(expected)

lib/super_diff/differs/object.rb renamed to lib/super_diff/equality_matchers/object.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
require_relative "base"
22

33
module SuperDiff
4-
module Differs
4+
module EqualityMatchers
55
class Object < Base
66
def fail
77
<<~OUTPUT.strip

lib/super_diff/differs/single_line_string.rb renamed to lib/super_diff/equality_matchers/single_line_string.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
require_relative "base"
22

33
module SuperDiff
4-
module Differs
4+
module EqualityMatchers
55
class SingleLineString < Base
66
def fail
77
<<~OUTPUT.strip

lib/super_diff/differs/string.rb renamed to lib/super_diff/equality_matchers/string.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
require_relative "single_line_string"
33

44
module SuperDiff
5-
module Differs
5+
module EqualityMatchers
66
module String
77
def self.call(expected, actual)
88
if expected.include?("\n") || actual.include?("\n")

spec/unit/differ_spec.rb renamed to spec/unit/equality_matcher_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
require "spec_helper"
22

3-
RSpec.describe SuperDiff::Differ do
3+
RSpec.describe SuperDiff::EqualityMatcher do
44
describe "#call" do
55
context "given the same integers" do
66
it "returns an empty string" do

0 commit comments

Comments
 (0)