Skip to content

Commit 8845c20

Browse files
committed
Do some reorganizing
* Rename "function" classes to Main, e.g., Differ -> Differs::Main. This makes it easier to Ctrl-P for the right files (if you were looking for differ.rb you might get differs/something_else.rb). * Change inspector classes so that what they return match what they're named after. That is, previously an Inspector actually was an InspectionTree object, and now the InspectionTree lives inside the Inspector. * Remove the inspector Map, as well as the MapExtensions which are used by extension modules such as `super_diff/rspec`, `super_diff/active_record`, etc., in favor of the same registry mechanism that differs, operational sequencers, etc. use. * Pluralize extension points in the Configuration object so that you can provide more than one custom differ, operational sequencer, etc., at a time. This reorganization is in preparation for introducing new classes in the future around eliding diff output.
1 parent ce1bb2f commit 8845c20

File tree

85 files changed

+957
-691
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+957
-691
lines changed

Gemfile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ source "https://rubygems.org"
55
git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
66

77
gem "appraisal"
8+
gem(
9+
"attr_extras",
10+
github: "mcmire/attr_extras",
11+
branch: "pass-kwargs-in-explicit-static-facade",
12+
)
813
gem "childprocess"
914
gem "pry-byebug", platform: :mri
1015
gem "pry-nav", platform: :jruby

gemfiles/no_rails.gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,6 @@ gem "pry-nav", platform: :jruby
99
gem "rake"
1010
gem "rspec"
1111
gem "rubocop"
12+
gem "attr_extras", branch: "pass-kwargs-in-explicit-static-facade", git: "https://github.com/mcmire/attr_extras"
1213

1314
gemspec path: "../"

gemfiles/no_rails.gemfile.lock

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
1+
GIT
2+
remote: https://github.com/mcmire/attr_extras
3+
revision: 6073a1d6c7ac2d1b7331a34a09ed2779c4fec83c
4+
branch: pass-kwargs-in-explicit-static-facade
5+
specs:
6+
attr_extras (6.2.3)
7+
18
PATH
29
remote: ..
310
specs:
411
super_diff (0.4.2)
5-
attr_extras
612
diff-lcs
713
patience_diff
814

@@ -14,7 +20,6 @@ GEM
1420
rake
1521
thor (>= 0.14.0)
1622
ast (2.4.0)
17-
attr_extras (6.2.3)
1823
byebug (11.1.3)
1924
childprocess (3.0.0)
2025
coderay (1.1.2)
@@ -64,6 +69,7 @@ PLATFORMS
6469

6570
DEPENDENCIES
6671
appraisal
72+
attr_extras!
6773
childprocess
6874
pry-byebug
6975
pry-nav

gemfiles/rails_5_0.gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ gem "pry-nav", platform: :jruby
99
gem "rake"
1010
gem "rspec"
1111
gem "rubocop"
12+
gem "attr_extras", branch: "pass-kwargs-in-explicit-static-facade", git: "https://github.com/mcmire/attr_extras"
1213
gem "activerecord-jdbcsqlite3-adapter", platform: :jruby
1314
gem "jdbc-sqlite3", platform: :jruby
1415
gem "activerecord", "~> 5.0.0"

gemfiles/rails_5_0.gemfile.lock

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
1+
GIT
2+
remote: https://github.com/mcmire/attr_extras
3+
revision: 6073a1d6c7ac2d1b7331a34a09ed2779c4fec83c
4+
branch: pass-kwargs-in-explicit-static-facade
5+
specs:
6+
attr_extras (6.2.3)
7+
18
PATH
29
remote: ..
310
specs:
411
super_diff (0.4.2)
5-
attr_extras
612
diff-lcs
713
patience_diff
814

@@ -26,7 +32,6 @@ GEM
2632
thor (>= 0.14.0)
2733
arel (7.1.4)
2834
ast (2.4.0)
29-
attr_extras (6.2.3)
3035
byebug (11.1.3)
3136
childprocess (3.0.0)
3237
coderay (1.1.2)
@@ -86,6 +91,7 @@ DEPENDENCIES
8691
activerecord (~> 5.0.0)
8792
activerecord-jdbcsqlite3-adapter
8893
appraisal
94+
attr_extras!
8995
childprocess
9096
jdbc-sqlite3
9197
pry-byebug

gemfiles/rails_5_1.gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ gem "pry-nav", platform: :jruby
99
gem "rake"
1010
gem "rspec"
1111
gem "rubocop"
12+
gem "attr_extras", branch: "pass-kwargs-in-explicit-static-facade", git: "https://github.com/mcmire/attr_extras"
1213
gem "activerecord-jdbcsqlite3-adapter", platform: :jruby
1314
gem "jdbc-sqlite3", platform: :jruby
1415
gem "activerecord", "~> 5.1.0"

gemfiles/rails_5_1.gemfile.lock

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
1+
GIT
2+
remote: https://github.com/mcmire/attr_extras
3+
revision: 6073a1d6c7ac2d1b7331a34a09ed2779c4fec83c
4+
branch: pass-kwargs-in-explicit-static-facade
5+
specs:
6+
attr_extras (6.2.3)
7+
18
PATH
29
remote: ..
310
specs:
411
super_diff (0.4.2)
5-
attr_extras
612
diff-lcs
713
patience_diff
814

@@ -26,7 +32,6 @@ GEM
2632
thor (>= 0.14.0)
2733
arel (8.0.0)
2834
ast (2.4.0)
29-
attr_extras (6.2.3)
3035
byebug (11.1.3)
3136
childprocess (3.0.0)
3237
coderay (1.1.2)
@@ -86,6 +91,7 @@ DEPENDENCIES
8691
activerecord (~> 5.1.0)
8792
activerecord-jdbcsqlite3-adapter
8893
appraisal
94+
attr_extras!
8995
childprocess
9096
jdbc-sqlite3
9197
pry-byebug

gemfiles/rails_5_2.gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ gem "pry-nav", platform: :jruby
99
gem "rake"
1010
gem "rspec"
1111
gem "rubocop"
12+
gem "attr_extras", branch: "pass-kwargs-in-explicit-static-facade", git: "https://github.com/mcmire/attr_extras"
1213
gem "activerecord-jdbcsqlite3-adapter", platform: :jruby
1314
gem "jdbc-sqlite3", platform: :jruby
1415
gem "activerecord", "~> 5.2.0"

gemfiles/rails_5_2.gemfile.lock

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
1+
GIT
2+
remote: https://github.com/mcmire/attr_extras
3+
revision: 6073a1d6c7ac2d1b7331a34a09ed2779c4fec83c
4+
branch: pass-kwargs-in-explicit-static-facade
5+
specs:
6+
attr_extras (6.2.3)
7+
18
PATH
29
remote: ..
310
specs:
411
super_diff (0.4.2)
5-
attr_extras
612
diff-lcs
713
patience_diff
814

@@ -26,7 +32,6 @@ GEM
2632
thor (>= 0.14.0)
2733
arel (9.0.0)
2834
ast (2.4.0)
29-
attr_extras (6.2.3)
3035
byebug (11.1.3)
3136
childprocess (3.0.0)
3237
coderay (1.1.2)
@@ -86,6 +91,7 @@ DEPENDENCIES
8691
activerecord (~> 5.2.0)
8792
activerecord-jdbcsqlite3-adapter
8893
appraisal
94+
attr_extras!
8995
childprocess
9096
jdbc-sqlite3
9197
pry-byebug

gemfiles/rails_6_0.gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ gem "pry-nav", platform: :jruby
99
gem "rake"
1010
gem "rspec"
1111
gem "rubocop"
12+
gem "attr_extras", branch: "pass-kwargs-in-explicit-static-facade", git: "https://github.com/mcmire/attr_extras"
1213
gem "activerecord-jdbcsqlite3-adapter", platform: :jruby
1314
gem "jdbc-sqlite3", platform: :jruby
1415
gem "activerecord", "~> 6.0"

0 commit comments

Comments
 (0)