Merge from graphiti-api/graphiti master

.github/probots.yml

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

.github/workflows/ci.yml

@@ -0,0 +1,166 @@
+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@v3
+      - 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"
+          - "3.4"
+        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
+          - gemfiles/rails_7_2_graphiti_rails.gemfile
+          - gemfiles/rails_8_0_graphiti_rails.gemfile
+        appraisal:
+          - true
+          - false
+        include:
+          - ruby: ruby-head
+            gemfile: gemfiles/rails_7_1.gemfile
+            appraisal: true
+          - ruby: ruby-head
+            gemfile: gemfiles/rails_7_2_graphiti_rails.gemfile
+            appraisal: true
+          - ruby: ruby-head
+            gemfile: gemfiles/rails_8_0_graphiti_rails.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
+          - gemfile: gemfiles/rails_7_2_graphiti_rails.gemfile
+            appraisal: false
+          - gemfile: gemfiles/rails_8_0_graphiti_rails.gemfile
+            appraisal: false
+
+          # Rails 8 needs ruby 3.2 +
+          - gemfile: gemfiles/rails_8_0_graphiti_rails.gemfile
+            ruby: 2.7
+          - gemfile: gemfiles/rails_8_0_graphiti_rails.gemfile
+            ruby: 3.0
+          - gemfile: gemfiles/rails_8_0_graphiti_rails.gemfile
+            ruby: 3.1
+
+          # Rails 7.2 needs ruby 3.1 +
+          - gemfile: gemfiles/rails_7_2_graphiti_rails.gemfile
+            ruby: 2.7
+          - gemfile: gemfiles/rails_7_2_graphiti_rails.gemfile
+            ruby: 3.0
+
+          # Rails 7.1 needs ruby 3.0 +
+          - gemfile: gemfiles/rails_7_1_graphiti_rails.gemfile
+            ruby: 2.7
+          - gemfile: gemfiles/rails_7_1_graphiti_rails.gemfile
+            ruby: 3.0
+
+          # Rails 7.0 needs ruby 3.1 +
+          - gemfile: gemfiles/rails_7_0_graphiti_rails.gemfile
+            ruby: 3.2
+          - gemfile: gemfiles/rails_7_0_graphiti_rails.gemfile
+            ruby: 3.3
+          - gemfile: gemfiles/rails_7_0_graphiti_rails.gemfile
+            ruby: 3.4
+
+          # Rails 6 needs < ruby 3.4
+          - gemfile: gemfiles/rails_6.gemfile
+            ruby: 3.4
+          - gemfile: gemfiles/rails_6_graphiti_rails.gemfile
+            ruby: 3.4
+
+          # 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
+          - gemfile: gemfiles/rails_5_2.gemfile
+            ruby: 3.4
+          - gemfile: gemfiles/rails_5_2_graphiti_rails.gemfile
+            ruby: 3.4
+    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@v3
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: Run tests
+        run: bundle exec rspec
+  publish:
+    name: Release
+    runs-on: ubuntu-latest
+    if: github.ref == 'refs/heads/master'
+    needs: [test]
+    steps:
+      - name: Dispatch Release
+        uses: benc-uk/workflow-dispatch@v1
+        with:
+          workflow: Generate New Release
+          token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

@@ -0,0 +1,36 @@
+---
+name: Generate New Release
+
+on:
+  workflow_dispatch:
+
+jobs:
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          submodules: true
+          persist-credentials: false
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "3.1"
+      - name: Build
+        run: |
+          gem install bundler
+          git submodule update --init --recursive
+          bundle install --jobs 4 --retry 3
+      - name: Setup Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: 14
+      - name: Install Dependencies
+        run: yarn install --frozen-lockfile
+      - name: Release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GEM_HOST_API_KEY: ${{ secrets.GEM_HOST_API_KEY }}
+        run: node_modules/.bin/semantic-release

.gitignore

@@ -7,6 +7,7 @@
 /spec/reports/
 /gemfiles/*.lock
 /tmp/
+node_modules
 .byebug_history
 spec/.rspec-examples
 spec/dummy/log/*

.standard.yml

@@ -1,14 +1,14 @@
 fix: true
 parallel: true
-ruby_version: 2.4
+ruby_version: 2.7
 
 ignore:
   - 'vendor/**/*'
   - 'spec/**/*':
     # 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,38 +1,59 @@
-appraise "rails-4" do
-  gem "rails", "~> 4.1"
+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" do
-  gem "rails", "~> 5.2"
+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-graphiti-rails" 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"
-  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-6" do
-  gem "rails", "~> 6.0.0.rc1"
+appraise "rails-6-graphiti-rails" do
+  gem "rails", "~> 6.0"
   gem "rspec-rails"
   gem "sqlite3", "~> 1.4.0"
   gem "database_cleaner"
+  gem "graphiti-rails", "~> 0.4.0"
 end
 
-appraise "rails-6-graphiti-rails" do
-  gem "rails", "~> 6.0.0.rc1"
+appraise "rails-7" do
+  gem "rails", "~> 7.0"
+  gem "rspec-rails"
+  gem "sqlite3", "~> 1.4.0"
+  gem "database_cleaner"
+end
+
+appraise "rails-7-graphiti-rails" do
+  gem "rails", "~> 7.0"
+  gem "rspec-rails"
+  gem "sqlite3", "~> 1.4.0"
+  gem "database_cleaner"
+  gem "graphiti-rails", "~> 0.4.0"
+end
+
+appraise "rails-7-1" do
+  gem "rails", "~> 7.1"
+  gem "rspec-rails"
+  gem "sqlite3", "~> 1.4.0"
+  gem "database_cleaner"
+end
+
+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