Merge branch 'master' into schema-sort-types

.github/probots.yml

@@ -0,0 +1,2 @@
+enabled:
+  - cla

.github/workflows/ci.yml

@@ -0,0 +1,103 @@
+name: CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request: {}
+
+concurrency:
+  group: ci-${{ github.head_ref || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "3.0"
+          bundler-cache: true
+      - name: Run standardrb
+        run: bundle exec standardrb --no-fix --format progress
+  test:
+    name: "Tests - ${{ matrix.ruby }} | ${{ matrix.gemfile }} | Appraisal: ${{ matrix.appraisal }}"
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - "2.7"
+          - "3.0"
+          - "3.1"
+          - "3.2"
+          - "3.3"
+        gemfile:
+          - Gemfile
+          - gemfiles/rails_5_2.gemfile
+          - gemfiles/rails_6.gemfile
+          - gemfiles/rails_7.gemfile
+          - gemfiles/rails_5_2_graphiti_rails.gemfile
+          - gemfiles/rails_6_graphiti_rails.gemfile
+          - gemfiles/rails_7_graphiti_rails.gemfile
+          - gemfiles/rails_7_1_graphiti_rails.gemfile
+        appraisal:
+          - true
+          - false
+        include:
+          - ruby: ruby-head
+            gemfile: gemfiles/rails_7_1.gemfile
+            appraisal: true
+          - ruby: ruby-head
+            gemfile: Gemfile
+            appraisal: false
+        exclude:
+          # Skip some extra variants
+          - gemfile: Gemfile
+            appraisal: true
+          - gemfile: gemfiles/rails_5_2.gemfile
+            appraisal: false
+          - gemfile: gemfiles/rails_6.gemfile
+            appraisal: false
+          - gemfile: gemfiles/rails_7.gemfile
+            appraisal: false
+          - gemfile: gemfiles/rails_5_2_graphiti_rails.gemfile
+            appraisal: false
+          - gemfile: gemfiles/rails_6_graphiti_rails.gemfile
+            appraisal: false
+          - gemfile: gemfiles/rails_7_graphiti_rails.gemfile
+            appraisal: false
+          - gemfile: gemfiles/rails_7_1_graphiti_rails.gemfile
+            appraisal: false
+            # Rails 5 can't run on Ruby 3
+          - gemfile: gemfiles/rails_5_2.gemfile
+            ruby: 3.0
+          - gemfile: gemfiles/rails_5_2_graphiti_rails.gemfile
+            ruby: 3.0
+          - gemfile: gemfiles/rails_5_2.gemfile
+            ruby: 3.1
+          - gemfile: gemfiles/rails_5_2_graphiti_rails.gemfile
+            ruby: 3.1
+          - gemfile: gemfiles/rails_5_2.gemfile
+            ruby: 3.2
+          - gemfile: gemfiles/rails_5_2_graphiti_rails.gemfile
+            ruby: 3.2
+          - gemfile: gemfiles/rails_5_2.gemfile
+            ruby: 3.3
+          - gemfile: gemfiles/rails_5_2_graphiti_rails.gemfile
+            ruby: 3.3
+    continue-on-error: ${{ matrix.ruby == 'ruby-head' }}
+    env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps
+      BUNDLE_GEMFILE: ${{ github.workspace }}/${{ matrix.gemfile }}
+    steps:
+      - name: Set up Appraisal
+        if: matrix.appraisal
+        run: echo "APPRAISAL_INITIALIZED=true" >> $GITHUB_ENV
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: Run tests
+        run: bundle exec rspec

.standard.yml

@@ -8,7 +8,7 @@ ignore:
     # There are some false hits when doing repeated
     # Class.new blocks in different test cases
     - Lint/DuplicateMethods
-    # This was causing many tests to be harder to read.
-    # Ongoing discussion with StandardRB team in
-    # https://github.com/testdouble/standard/issues/94
-    - Standard/SemanticBlocks
+    # We define a lot of test-specific classes within our test blocks
+    # There's probably a better way to do this, but it's not worth the
+    # effort right now, so let's just disable for specs
+    - Lint/ConstantDefinitionInBlock

Appraisals

@@ -1,70 +1,59 @@
-appraise "rails-4" do
-  gem "rails", "~> 4.2"
-  gem "rspec-rails"
-  gem "sqlite3", "~> 1.3.6"
-  gem "database_cleaner"
-end
-
-appraise "rails-5_0" do
-  gem "rails", "~> 5.0"
+appraise "rails-5_2" do
+  gem "rails", "~> 5.2.0"
   gem "rspec-rails"
-  gem "sqlite3", "~> 1.3.6"
+  gem "sqlite3", "~> 1.4.0"
   gem "database_cleaner"
 end
 
-appraise "rails-5_1" do
-  gem "rails", "~> 5.1"
+appraise "rails-5_2-graphiti-rails" do
+  gem "rails", "~> 5.2.0"
   gem "rspec-rails"
-  gem "sqlite3", "~> 1.3.6"
+  gem "sqlite3", "~> 1.4.0"
   gem "database_cleaner"
+  gem "graphiti-rails", "~> 0.4.0"
 end
 
-appraise "rails-5_2" do
-  gem "rails", "~> 5.2"
+appraise "rails-6" do
+  gem "rails", "~> 6.0"
   gem "rspec-rails"
-  gem "sqlite3", "~> 1.3.6"
+  gem "sqlite3", "~> 1.4.0"
   gem "database_cleaner"
 end
 
-appraise "rails-5_0-graphiti-rails" do
-  gem "rails", "~> 5.0"
+appraise "rails-6-graphiti-rails" do
+  gem "rails", "~> 6.0"
   gem "rspec-rails"
-  gem "sqlite3", "~> 1.3.6"
+  gem "sqlite3", "~> 1.4.0"
   gem "database_cleaner"
-  gem "rescue_registry", git: "https://github.com/wagenet/rescue_registry.git", branch: "master"
-  gem "graphiti-rails", git: "https://github.com/wagenet/graphiti-rails.git", branch: "master"
+  gem "graphiti-rails", "~> 0.4.0"
 end
 
-appraise "rails-5_1-graphiti-rails" do
-  gem "rails", "~> 5.1"
+appraise "rails-7" do
+  gem "rails", "~> 7.0"
   gem "rspec-rails"
-  gem "sqlite3", "~> 1.3.6"
+  gem "sqlite3", "~> 1.4.0"
   gem "database_cleaner"
-  gem "rescue_registry", git: "https://github.com/wagenet/rescue_registry.git", branch: "master"
-  gem "graphiti-rails", git: "https://github.com/wagenet/graphiti-rails.git", branch: "master"
 end
 
-appraise "rails-5_2-graphiti-rails" do
-  gem "rails", "~> 5.2"
+appraise "rails-7-graphiti-rails" do
+  gem "rails", "~> 7.0"
   gem "rspec-rails"
-  gem "sqlite3", "~> 1.3.6"
+  gem "sqlite3", "~> 1.4.0"
   gem "database_cleaner"
-  gem "rescue_registry", git: "https://github.com/wagenet/rescue_registry.git", branch: "master"
-  gem "graphiti-rails", git: "https://github.com/wagenet/graphiti-rails.git", branch: "master"
+  gem "graphiti-rails", "~> 0.4.0"
 end
 
-appraise "rails-6" do
-  gem "rails", "~> 6.0"
+appraise "rails-7-1" do
+  gem "rails", "~> 7.1"
   gem "rspec-rails"
   gem "sqlite3", "~> 1.4.0"
   gem "database_cleaner"
 end
 
-appraise "rails-6-graphiti-rails" do
-  gem "rails", "~> 6.0"
+appraise "rails-7-1-graphiti-rails" do
+  gem "rails", "~> 7.1"
   gem "rspec-rails"
   gem "sqlite3", "~> 1.4.0"
   gem "database_cleaner"
-  gem "rescue_registry", git: "https://github.com/wagenet/rescue_registry.git", branch: "master"
-  gem "graphiti-rails", git: "https://github.com/wagenet/graphiti-rails.git", branch: "master"
+  gem "graphiti-rails", "~> 0.4.0"
 end

Gemfile

@@ -4,6 +4,7 @@ source "https://rubygems.org"
 gemspec
 
 group :test do
+  gem "database_cleaner"
   gem "pry"
   gem "pry-byebug", platform: [:mri]
   gem "appraisal"

gemfiles/rails_5_2.gemfile

@@ -2,9 +2,9 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 5.2"
+gem "rails", "~> 5.2.0"
 gem "rspec-rails"
-gem "sqlite3", "~> 1.3.6"
+gem "sqlite3", "~> 1.4.0"
 gem "database_cleaner"
 
 group :test do

gemfiles/rails_5_2_graphiti_rails.gemfile

@@ -2,12 +2,11 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 5.2"
+gem "rails", "~> 5.2.0"
 gem "rspec-rails"
-gem "sqlite3", "~> 1.3.6"
+gem "sqlite3", "~> 1.4.0"
 gem "database_cleaner"
-gem "rescue_registry", git: "https://github.com/wagenet/rescue_registry.git", branch: "master"
-gem "graphiti-rails", git: "https://github.com/wagenet/graphiti-rails.git", branch: "master"
+gem "graphiti-rails", "~> 0.4.0"
 
 group :test do
   gem "pry"

gemfiles/rails_6_graphiti_rails.gemfile

@@ -6,8 +6,7 @@ gem "rails", "~> 6.0"
 gem "rspec-rails"
 gem "sqlite3", "~> 1.4.0"
 gem "database_cleaner"
-gem "rescue_registry", git: "https://github.com/wagenet/rescue_registry.git", branch: "master"
-gem "graphiti-rails", git: "https://github.com/wagenet/graphiti-rails.git", branch: "master"
+gem "graphiti-rails", "~> 0.4.0"
 
 group :test do
   gem "pry"

gemfiles/rails_5_1.gemfile → gemfiles/rails_7.gemfile

@@ -2,9 +2,9 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 5.1"
+gem "rails", "~> 7.0"
 gem "rspec-rails"
-gem "sqlite3", "~> 1.3.6"
+gem "sqlite3", "~> 1.4.0"
 gem "database_cleaner"
 
 group :test do