Skip to content

Commit 6b59f8a

Browse files
author
Jack Casey
committed
Merge remote-tracking branch 'origin/master' into resource-level-links-update
2 parents 9a88740 + 443d443 commit 6b59f8a

File tree

84 files changed

+1446
-1116
lines changed

Some content is hidden

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

84 files changed

+1446
-1116
lines changed

‎.travis.yml‎

Lines changed: 43 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,45 +3,74 @@ language: ruby
33
rvm:
44
- 2.5
55
- 2.6
6+
- 2.7
67
gemfile:
78
- Gemfile
89
- gemfiles/rails_4.gemfile
9-
- gemfiles/rails_5.gemfile
10+
- gemfiles/rails_5_0.gemfile
11+
- gemfiles/rails_5_1.gemfile
12+
- gemfiles/rails_5_2.gemfile
1013
- gemfiles/rails_6.gemfile
11-
- gemfiles/rails_5_graphiti_rails.gemfile
14+
- gemfiles/rails_5_0_graphiti_rails.gemfile
15+
- gemfiles/rails_5_1_graphiti_rails.gemfile
16+
- gemfiles/rails_5_2_graphiti_rails.gemfile
1217
- gemfiles/rails_6_graphiti_rails.gemfile
1318
env:
14-
- COMMAND=standardrb --no-fix --format progress
19+
- COMMAND="standardrb --no-fix --format progress"
1520
- COMMAND=rspec
1621
- COMMAND=rspec APPRAISAL_INITIALIZED=true
1722
matrix:
1823
exclude:
19-
- env: COMMAND=standardrb --no-fix --format progress
24+
# Don't run the appraisal version of the specs for the base gemfile
25+
- env: COMMAND=rspec APPRAISAL_INITIALIZED=true
26+
gemfile: Gemfile
27+
# Don't run the standardrb check on any gemfile except the base gemfile
28+
# (but run it for each ruby version)
29+
- env: COMMAND="standardrb --no-fix --format progress"
2030
gemfile: gemfiles/rails_4.gemfile
21-
- env: COMMAND=standardrb --no-fix --format progress
22-
gemfile: gemfiles/rails_5.gemfile
23-
- env: COMMAND=standardrb --no-fix --format progress
31+
- env: COMMAND="standardrb --no-fix --format progress"
32+
gemfile: gemfiles/rails_5_0.gemfile
33+
- env: COMMAND="standardrb --no-fix --format progress"
34+
gemfile: gemfiles/rails_5_1.gemfile
35+
- env: COMMAND="standardrb --no-fix --format progress"
36+
gemfile: gemfiles/rails_5_2.gemfile
37+
- env: COMMAND="standardrb --no-fix --format progress"
2438
gemfile: gemfiles/rails_6.gemfile
25-
- env: COMMAND=standardrb --no-fix --format progress
26-
gemfile: gemfiles/rails_5_graphiti_rails.gemfile
27-
- env: COMMAND=standardrb --no-fix --format progress
39+
- env: COMMAND="standardrb --no-fix --format progress"
40+
gemfile: gemfiles/rails_5_0_graphiti_rails.gemfile
41+
- env: COMMAND="standardrb --no-fix --format progress"
42+
gemfile: gemfiles/rails_5_1_graphiti_rails.gemfile
43+
- env: COMMAND="standardrb --no-fix --format progress"
44+
gemfile: gemfiles/rails_5_2_graphiti_rails.gemfile
45+
- env: COMMAND="standardrb --no-fix --format progress"
2846
gemfile: gemfiles/rails_6_graphiti_rails.gemfile
29-
- env: COMMAND=rspec APPRAISAL_INITIALIZED=true
30-
gemfile: Gemfile
47+
# Don't run the basic versions of the specs for any of the specific gemfiles
3148
- env: COMMAND=rspec
3249
gemfile: gemfiles/rails_4.gemfile
3350
- env: COMMAND=rspec
34-
gemfile: gemfiles/rails_5.gemfile
51+
gemfile: gemfiles/rails_5_0.gemfile
52+
- env: COMMAND=rspec
53+
gemfile: gemfiles/rails_5_1.gemfile
54+
- env: COMMAND=rspec
55+
gemfile: gemfiles/rails_5_2.gemfile
3556
- env: COMMAND=rspec
3657
gemfile: gemfiles/rails_6.gemfile
3758
- env: COMMAND=rspec
38-
gemfile: gemfiles/rails_5_graphiti_rails.gemfile
59+
gemfile: gemfiles/rails_5_0_graphiti_rails.gemfile
60+
- env: COMMAND=rspec
61+
gemfile: gemfiles/rails_5_1_graphiti_rails.gemfile
62+
- env: COMMAND=rspec
63+
gemfile: gemfiles/rails_5_2_graphiti_rails.gemfile
3964
- env: COMMAND=rspec
4065
gemfile: gemfiles/rails_6_graphiti_rails.gemfile
66+
67+
# Don't run rails 4 egmfile against any rubies (for some reason?)
4168
- gemfile: gemfiles/rails_4.gemfile
4269
rvm: 2.5
4370
- gemfile: gemfiles/rails_4.gemfile
4471
rvm: 2.6
72+
- gemfile: gemfiles/rails_4.gemfile
73+
rvm: 2.7
4574

4675
script:
4776
- bundle _1.17.3_ exec $COMMAND

‎Appraisals‎

Lines changed: 37 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,50 @@
11
appraise "rails-4" do
2-
gem "rails", "~> 4.1"
2+
gem "rails", "~> 4.2"
33
gem "rspec-rails"
44
gem "sqlite3", "~> 1.3.6"
55
gem "database_cleaner"
66
end
77

8-
appraise "rails-5" do
8+
appraise "rails-5_0" do
9+
gem "rails", "~> 5.0"
10+
gem "rspec-rails"
11+
gem "sqlite3", "~> 1.3.6"
12+
gem "database_cleaner"
13+
end
14+
15+
appraise "rails-5_1" do
16+
gem "rails", "~> 5.1"
17+
gem "rspec-rails"
18+
gem "sqlite3", "~> 1.3.6"
19+
gem "database_cleaner"
20+
end
21+
22+
appraise "rails-5_2" do
923
gem "rails", "~> 5.2"
1024
gem "rspec-rails"
1125
gem "sqlite3", "~> 1.3.6"
1226
gem "database_cleaner"
1327
end
1428

15-
appraise "rails-5-graphiti-rails" do
29+
appraise "rails-5_0-graphiti-rails" do
30+
gem "rails", "~> 5.0"
31+
gem "rspec-rails"
32+
gem "sqlite3", "~> 1.3.6"
33+
gem "database_cleaner"
34+
gem "rescue_registry", git: "https://github.com/wagenet/rescue_registry.git", branch: "master"
35+
gem "graphiti-rails", git: "https://github.com/wagenet/graphiti-rails.git", branch: "master"
36+
end
37+
38+
appraise "rails-5_1-graphiti-rails" do
39+
gem "rails", "~> 5.1"
40+
gem "rspec-rails"
41+
gem "sqlite3", "~> 1.3.6"
42+
gem "database_cleaner"
43+
gem "rescue_registry", git: "https://github.com/wagenet/rescue_registry.git", branch: "master"
44+
gem "graphiti-rails", git: "https://github.com/wagenet/graphiti-rails.git", branch: "master"
45+
end
46+
47+
appraise "rails-5_2-graphiti-rails" do
1648
gem "rails", "~> 5.2"
1749
gem "rspec-rails"
1850
gem "sqlite3", "~> 1.3.6"
@@ -22,14 +54,14 @@ appraise "rails-5-graphiti-rails" do
2254
end
2355

2456
appraise "rails-6" do
25-
gem "rails", "~> 6.0.0.rc1"
57+
gem "rails", "~> 6.0"
2658
gem "rspec-rails"
2759
gem "sqlite3", "~> 1.4.0"
2860
gem "database_cleaner"
2961
end
3062

3163
appraise "rails-6-graphiti-rails" do
32-
gem "rails", "~> 6.0.0.rc1"
64+
gem "rails", "~> 6.0"
3365
gem "rspec-rails"
3466
gem "sqlite3", "~> 1.4.0"
3567
gem "database_cleaner"

‎Guardfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ guard :rspec, cmd: "bundle exec rspec --color --format documentation" do
2121
watch(rails.controllers) do |m|
2222
[
2323
rspec.spec.call("controllers/#{m[1]}_controller"),
24-
rspec.spec.call("api/#{m[1]}"),
24+
rspec.spec.call("api/#{m[1]}")
2525
]
2626
end
2727

2828
# Rails config changes
29-
watch(rails.spec_helper) { rspec.spec_dir }
30-
watch(rails.routes) { "#{rspec.spec_dir}/routing" }
31-
watch(rails.app_controller) { "#{rspec.spec_dir}/controllers" }
29+
watch(rails.spec_helper) { rspec.spec_dir }
30+
watch(rails.routes) { "#{rspec.spec_dir}/routing" }
31+
watch(rails.app_controller) { "#{rspec.spec_dir}/controllers" }
3232
end

‎deprecated_generators/graphiti/resource_generator.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ def default_attributes
9393
raise "Unable to set #{self} default_attributes from #{attributes_class}. #{attributes_class} must be a kind of ApplicationRecord"
9494
end
9595
if attributes_class.table_exists?
96-
return attributes_class.columns.map do |c|
96+
attributes_class.columns.map do |c|
9797
OpenStruct.new({name: c.name.to_sym, type: c.type})
9898
end
9999
else

‎gemfiles/rails_5_0.gemfile‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# This file was generated by Appraisal
2+
3+
source "https://rubygems.org"
4+
5+
gem "rails", "~> 5.0"
6+
gem "rspec-rails"
7+
gem "sqlite3", "~> 1.3.6"
8+
gem "database_cleaner"
9+
10+
group :test do
11+
gem "pry"
12+
gem "pry-byebug", platform: [:mri]
13+
gem "appraisal"
14+
gem "guard"
15+
gem "guard-rspec"
16+
end
17+
18+
gemspec path: "../"

‎gemfiles/rails_5_0_graphiti_rails.gemfile‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# This file was generated by Appraisal
2+
3+
source "https://rubygems.org"
4+
5+
gem "rails", "~> 5.0"
6+
gem "rspec-rails"
7+
gem "sqlite3", "~> 1.3.6"
8+
gem "database_cleaner"
9+
gem "rescue_registry", git: "https://github.com/wagenet/rescue_registry.git", branch: "master"
10+
gem "graphiti-rails", git: "https://github.com/wagenet/graphiti-rails.git", branch: "master"
11+
12+
group :test do
13+
gem "pry"
14+
gem "pry-byebug", platform: [:mri]
15+
gem "appraisal"
16+
gem "guard"
17+
gem "guard-rspec"
18+
end
19+
20+
gemspec path: "../"

‎gemfiles/rails_5_1.gemfile‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# This file was generated by Appraisal
2+
3+
source "https://rubygems.org"
4+
5+
gem "rails", "~> 5.1"
6+
gem "rspec-rails"
7+
gem "sqlite3", "~> 1.3.6"
8+
gem "database_cleaner"
9+
10+
group :test do
11+
gem "pry"
12+
gem "pry-byebug", platform: [:mri]
13+
gem "appraisal"
14+
gem "guard"
15+
gem "guard-rspec"
16+
end
17+
18+
gemspec path: "../"

‎gemfiles/rails_5_1_graphiti_rails.gemfile‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# This file was generated by Appraisal
2+
3+
source "https://rubygems.org"
4+
5+
gem "rails", "~> 5.1"
6+
gem "rspec-rails"
7+
gem "sqlite3", "~> 1.3.6"
8+
gem "database_cleaner"
9+
gem "rescue_registry", git: "https://github.com/wagenet/rescue_registry.git", branch: "master"
10+
gem "graphiti-rails", git: "https://github.com/wagenet/graphiti-rails.git", branch: "master"
11+
12+
group :test do
13+
gem "pry"
14+
gem "pry-byebug", platform: [:mri]
15+
gem "appraisal"
16+
gem "guard"
17+
gem "guard-rspec"
18+
end
19+
20+
gemspec path: "../"

‎gemfiles/rails_5.gemfile‎ renamed to ‎gemfiles/rails_5_2.gemfile‎

File renamed without changes.

‎gemfiles/rails_5_graphiti_rails.gemfile‎ renamed to ‎gemfiles/rails_5_2_graphiti_rails.gemfile‎

File renamed without changes.

0 commit comments

Comments
 (0)