arel_toolkit 0.4.3 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28d6dfc92b5aebf97e6a22fa4ded2583f5d2184b1f0a8afc7ea4bc1951805b6d
-  data.tar.gz: 9c72d8926233ec968b2c864886a422848bb0fd85c7e2828e86db0b9cee21144a
+  metadata.gz: 8b20aac1b2e004c7d251e7e48aadbacc223df6fae248bbbfc4fba309e8135d66
+  data.tar.gz: dcb21b38da506edbcd72caafb15d6e5d911c86049abc5c61479d41d31930f193
 SHA512:
-  metadata.gz: 7aaab2a35e519f4c85ce56135efa0374b8806318791913c351b797972827e0c10a5e4b9d17f6d21d8abed7508db17170a199ec4186dc16a9036a4e460a767ca0
-  data.tar.gz: 127121759494230ea9d82b7499812f942c44026f4ff7d22dc08b45d0b5a60ce1505b11bc4c6136391005aef17ef2932565e6266c189fd521c0869dac455bdf47
+  metadata.gz: 572619fe51e9d76cad9a26e58c8205f132996a81f9e7a15dcd2692ef6bfb3d6553c2f6563eb2deaa8589fca7a1d710ea95647f2d5496f180b5a4152e77cffa50
+  data.tar.gz: 9aa9885eff763f559225a75f701205b6d6de6d5671bf4203917e7cd4cb420c0dfcdc273cf471309136b971840de458bdc8afd624995966380834280fd5b10f6d

data/.github/workflows/coverage.yml

@@ -0,0 +1,48 @@
+name: Coverage
+on:
+  workflow_run:
+    workflows: ["Test"]
+    types: 
+      - completed
+
+jobs:
+  upload_coverage:
+    runs-on: ubuntu-latest
+    if: ${{ github.event.workflow_run.conclusion == 'success' }}
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        ref: ${{ github.event.workflow_run.head_sha }}
+    - env:
+        GITHUB: ${{ toJson(github) }}
+      run: |
+        env
+    - name: Download coverage
+      uses: dawidd6/action-download-artifact@v2
+      with:
+        workflow: test.yml
+        commit: ${{ github.event.workflow_run.head_sha }}
+        run_id: ${{ github.event.workflow_run.id }}
+        run_number: ${{ github.event.workflow_run.run_number }}
+        name: rspec-coverage
+        path: ./coverage
+    - name: Report to codeclimate
+      if: always()
+      shell: bash
+      env:
+        JOB_STATUS: ${{ job.status == 'Success' }}
+        CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
+        GIT_BRANCH: ${{ github.event.workflow_run.head_branch }}
+        GIT_COMMIT_SHA: ${{ github.event.workflow_run.head_sha }}
+      run: |
+        curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+        chmod +x ./cc-test-reporter
+        EXIT_CODE=$([[ "$JOB_STATUS" == true ]] && echo 0 || echo 1)
+        ./cc-test-reporter after-build --exit-code $EXIT_CODE
+
+    - name: Upload coverage to GitHub pages
+      if: ${{ github.event.workflow_run.head_branch == 'master' }}
+      uses: maxheld83/ghpages@v0.2.1
+      env:
+        BUILD_DIR: ./coverage
+        GH_PAT: ${{ secrets.GH_PAT }}

data/.github/workflows/test.yml

@@ -0,0 +1,68 @@
+name: Test
+on:
+  push:
+    branches: 
+      - master
+  pull_request:
+
+jobs:
+  rspec:
+    name: RSpec
+    runs-on: ubuntu-latest
+    services:
+      postgres:
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        image: postgres:10.10
+        ports:
+          - 5432:5432
+        env:
+          POSTGRES_DB: arel_toolkit_test
+          POSTGRES_USER: postgres
+    steps:
+    - uses: actions/checkout@v2
+
+    # Based on https://github.com/paambaati/codeclimate-action/blob/0f8af43fca84b500025ca48b581bcff933244252/src/main.ts#L39-L57
+    - name: Set env for push event
+      run: |
+        GIT_BRANCH=$(echo "${{ github.ref }}" | sed 's/refs\/heads\///g')
+        echo "GIT_BRANCH=$GIT_BRANCH" >> $GITHUB_ENV
+        echo "GIT_COMMIT_SHA=${{ github.sha }}" >> $GITHUB_ENV
+      if: ${{ github.event_name == 'push' }}
+    - name: Set env for pull_request event
+      run: |
+        echo "GIT_BRANCH=${{ github.event.pull_request.head.ref }}" >> $GITHUB_ENV
+        echo "GIT_COMMIT_SHA=${{ github.event.pull_request.head.sha }}" >> $GITHUB_ENV
+      if: ${{ github.event_name == 'pull_request' }}
+
+    # From https://docs.github.com/en/actions/reference/context-and-expression-syntax-for-github-actions#contexts
+    - env:
+        GITHUB: ${{ toJson(github) }}
+      run: |
+        env
+    - uses: ruby/setup-ruby@v1
+      with:
+        bundler-cache: true
+    - run: bundle exec appraisal install
+    - name: Compile extension
+      run: |
+        bundle exec rake clean
+        bundle exec rake compile
+    - name: Start coverage
+      run: |
+        curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+        chmod +x ./cc-test-reporter
+        ./cc-test-reporter before-build
+    - name: RSpec
+      run: |
+        bundle exec rspec --force-color
+    - name: Appraisal RSpec
+      run: |
+        bundle exec appraisal rspec --force-color
+    - uses: actions/upload-artifact@v2
+      with:
+        name: rspec-coverage
+        path: ./coverage

data/.gitignore

@@ -21,4 +21,6 @@
 # emacs
 TAGS
 .#*
-stackprof.json
+stackprof.json
+
+.idea

data/.rubocop.yml

@@ -1,5 +1,7 @@
 AllCops:
   Exclude:
+    - 'gemfiles/active_record_6.gemfile'
+    - 'gemfiles/active_record_6_1.gemfile'
     - 'gemfiles/arel_gems.gemfile'
     - 'gemfiles/default.gemfile'
 

data/.ruby-version

@@ -1 +1 @@
-2.5.3
+2.5.9

data/.tool-versions

@@ -0,0 +1 @@
+ruby 2.7.4

data/Appraisals

@@ -11,3 +11,7 @@ end
 appraise 'active_record_6' do
   gem 'activerecord', '~> 6.0.0'
 end
+
+appraise 'active_record_6_1' do
+  gem 'activerecord', '~> 6.1.0'
+end

data/CHANGELOG.md

@@ -1,5 +1,51 @@
 # Changelog
 
+## [v0.4.7](https://github.com/mvgijssel/arel_toolkit/tree/v0.4.7) (2022-02-01)
+
+[Full Changelog](https://github.com/mvgijssel/arel_toolkit/compare/v0.4.6...v0.4.7)
+
+**Implemented enhancements:**
+
+- Bump google-protobuf from 3.17.3 to 3.19.2 [\#190](https://github.com/mvgijssel/arel_toolkit/pull/190) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump nokogiri from 1.11.7 to 1.12.5 [\#189](https://github.com/mvgijssel/arel_toolkit/pull/189) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Add Rails 6.1 support [\#188](https://github.com/mvgijssel/arel_toolkit/pull/188) ([Willianvdv](https://github.com/Willianvdv))
+
+## [v0.4.6](https://github.com/mvgijssel/arel_toolkit/tree/v0.4.6) (2021-07-29)
+
+[Full Changelog](https://github.com/mvgijssel/arel_toolkit/compare/v0.4.5...v0.4.6)
+
+**Implemented enhancements:**
+
+- Use GitHub actions instead of TravisCI [\#137](https://github.com/mvgijssel/arel_toolkit/issues/137)
+- Bump addressable from 2.7.0 to 2.8.0 [\#183](https://github.com/mvgijssel/arel_toolkit/pull/183) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Upgrade pg\_query to 2.0 [\#175](https://github.com/mvgijssel/arel_toolkit/pull/175) ([DeRRudi77](https://github.com/DeRRudi77))
+
+**Fixed bugs:**
+
+- Improve local development experience [\#184](https://github.com/mvgijssel/arel_toolkit/pull/184) ([mvgijssel](https://github.com/mvgijssel))
+
+## [v0.4.5](https://github.com/mvgijssel/arel_toolkit/tree/v0.4.5) (2021-07-08)
+
+[Full Changelog](https://github.com/mvgijssel/arel_toolkit/compare/v0.4.4...v0.4.5)
+
+**Implemented enhancements:**
+
+- Refactor test setup [\#181](https://github.com/mvgijssel/arel_toolkit/issues/181)
+- Bump nokogiri from 1.11.1 to 1.11.7 [\#176](https://github.com/mvgijssel/arel_toolkit/pull/176) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump activerecord from 5.2.4.3 to 6.1.3 [\#173](https://github.com/mvgijssel/arel_toolkit/pull/173) ([dependabot[bot]](https://github.com/apps/dependabot))
+
+## [v0.4.4](https://github.com/mvgijssel/arel_toolkit/tree/v0.4.4) (2021-02-11)
+
+[Full Changelog](https://github.com/mvgijssel/arel_toolkit/compare/v0.4.3...v0.4.4)
+
+**Implemented enhancements:**
+
+- Bump nokogiri from 1.10.8 to 1.11.1 [\#171](https://github.com/mvgijssel/arel_toolkit/pull/171) ([dependabot[bot]](https://github.com/apps/dependabot))
+
+**Fixed bugs:**
+
+- Fix conditional update and delete statements in Rails 6 [\#170](https://github.com/mvgijssel/arel_toolkit/pull/170) ([mvgijssel](https://github.com/mvgijssel))
+
 ## [v0.4.3](https://github.com/mvgijssel/arel_toolkit/tree/v0.4.3) (2020-11-09)
 
 [Full Changelog](https://github.com/mvgijssel/arel_toolkit/compare/v0.4.2...v0.4.3)
@@ -35,7 +81,7 @@
 - Create a transformer that replaces a table reference with a subquery [\#141](https://github.com/mvgijssel/arel_toolkit/issues/141)
 - Same signature for all middleware helpers [\#135](https://github.com/mvgijssel/arel_toolkit/issues/135)
 - Instantiate PG::Result object instead of duck typed object [\#130](https://github.com/mvgijssel/arel_toolkit/issues/130)
-- Add `to\_sql` to Arel.middleware which prints the sql after middleware processing [\#127](https://github.com/mvgijssel/arel_toolkit/issues/127)
+- Add `to_sql` to Arel.middleware which prints the sql after middleware processing [\#127](https://github.com/mvgijssel/arel_toolkit/issues/127)
 - Extend Middleware to include the response from the database [\#126](https://github.com/mvgijssel/arel_toolkit/issues/126)
 - Extend AddSchemaToTable to support multiple schemas and regclass typecasts [\#124](https://github.com/mvgijssel/arel_toolkit/issues/124)
 - Optional context argument for Arel middleware [\#110](https://github.com/mvgijssel/arel_toolkit/issues/110)
@@ -101,7 +147,7 @@
 
 ## [v0.2.0](https://github.com/mvgijssel/arel_toolkit/tree/v0.2.0) (2019-05-30)
 
-[Full Changelog](https://github.com/mvgijssel/arel_toolkit/compare/v0.1.0...v0.2.0)
+[Full Changelog](https://github.com/mvgijssel/arel_toolkit/compare/6507f4849d752353a23e9c14b73e4759b370ada9...v0.2.0)
 
 **Implemented enhancements:**
 
@@ -133,4 +179,4 @@
 
 
 
-\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*
+\* *This Changelog was automatically generated       by [github_changelog_generator]      (https://github.com/github-changelog-generator/github-changelog-generator)*

data/Gemfile.lock

@@ -1,61 +1,100 @@
 PATH
   remote: .
   specs:
-    arel_toolkit (0.4.3)
-      activerecord
+    arel_toolkit (0.4.7)
+      activerecord (>= 5.0.0)
       pg (~> 1.1.4)
-      pg_query (~> 1.2.0)
+      pg_query (~> 2.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.2.4.3)
-      activesupport (= 5.2.4.3)
-    activerecord (5.2.4.3)
-      activemodel (= 5.2.4.3)
-      activesupport (= 5.2.4.3)
-      arel (>= 9.0)
-    activesupport (5.2.4.3)
+    activemodel (6.1.4.1)
+      activesupport (= 6.1.4.1)
+    activerecord (6.1.4.1)
+      activemodel (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
+    activesupport (6.1.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    addressable (2.7.0)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     ansi (1.5.0)
-    appraisal (2.2.0)
+    appraisal (2.4.1)
       bundler
       rake
       thor (>= 0.14.0)
-    approvals (0.0.24)
-      nokogiri (~> 1.6)
-      thor (~> 0.18)
-    arel (9.0.0)
-    ast (2.4.0)
-    binding_of_caller (0.8.0)
+    approvals (0.0.25)
+      nokogiri (~> 1.8)
+      thor (~> 1.0)
+    ast (2.4.2)
+    async (1.30.1)
+      console (~> 1.10)
+      nio4r (~> 2.3)
+      timers (~> 4.1)
+    async-http (0.56.5)
+      async (>= 1.25)
+      async-io (>= 1.28)
+      async-pool (>= 0.2)
+      protocol-http (~> 0.22.0)
+      protocol-http1 (~> 0.14.0)
+      protocol-http2 (~> 0.14.0)
+    async-http-faraday (0.11.0)
+      async-http (~> 0.42)
+      faraday
+    async-io (1.32.2)
+      async
+    async-pool (0.3.8)
+      async (>= 1.25)
+    binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)
-    coderay (1.1.2)
-    concurrent-ruby (1.1.6)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.9)
+    console (1.13.1)
+      fiber-local
     database_cleaner (1.7.0)
-    debug_inspector (0.0.3)
-    diff-lcs (1.3)
-    docile (1.3.1)
-    dpl (1.10.11)
-    faraday (0.17.0)
+    debug_inspector (1.1.0)
+    diff-lcs (1.4.4)
+    docile (1.4.0)
+    dpl (1.10.16)
+    faraday (1.8.0)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0.1)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
       multipart-post (>= 1.2, < 3)
-    faraday-http-cache (2.0.0)
-      faraday (~> 0.8)
-    ffi (1.11.1)
-    formatador (0.2.5)
-    github_changelog_generator (1.15.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-http-cache (2.2.0)
+      faraday (>= 0.8)
+    faraday-httpclient (1.0.1)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    ffi (1.15.4)
+    fiber-local (1.0.0)
+    formatador (0.3.0)
+    github_changelog_generator (1.16.4)
       activesupport
+      async (>= 1.25.0)
+      async-http-faraday
       faraday-http-cache
       multi_json
       octokit (~> 4.6)
       rainbow (>= 2.2.1)
       rake (>= 10.0)
-      retriable (~> 3.0)
-    guard (2.15.0)
+    google-protobuf (3.19.4)
+    guard (2.17.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       lumberjack (>= 1.0.12, < 2.0)
@@ -76,74 +115,84 @@ GEM
       guard (~> 2.0)
       rubocop (~> 0.20)
     hirb (0.7.3)
-    i18n (1.8.2)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     interception (0.5)
-    jaro_winkler (1.5.3)
-    json (2.3.1)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
-    lumberjack (1.0.13)
+    jaro_winkler (1.5.4)
+    json (2.5.1)
+    listen (3.7.0)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    lumberjack (1.2.8)
     memory_profiler (0.9.14)
     method_source (0.9.2)
-    mini_portile2 (2.4.0)
-    minitest (5.14.1)
-    multi_json (1.14.1)
+    mini_portile2 (2.6.1)
+    minitest (5.14.4)
+    multi_json (1.15.0)
     multipart-post (2.1.1)
     nenv (0.3.0)
-    nokogiri (1.10.8)
-      mini_portile2 (~> 2.4.0)
-    notiffany (0.1.1)
+    nio4r (2.5.8)
+    nokogiri (1.12.5)
+      mini_portile2 (~> 2.6.1)
+      racc (~> 1.4)
+    notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    octokit (4.14.0)
+    octokit (4.21.0)
+      faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
-    parallel (1.17.0)
-    parser (2.6.3.0)
-      ast (~> 2.4.0)
+    parallel (1.21.0)
+    parser (3.0.2.0)
+      ast (~> 2.4.1)
     pg (1.1.4)
-    pg_query (1.2.0)
+    pg_query (2.1.3)
+      google-protobuf (>= 3.19.2)
+    protocol-hpack (1.4.2)
+    protocol-http (0.22.5)
+    protocol-http1 (0.14.2)
+      protocol-http (~> 0.22)
+    protocol-http2 (0.14.2)
+      protocol-hpack (~> 1.4)
+      protocol-http (~> 0.18)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     pry-alias (0.0.1)
       binding_of_caller
       pry
-    pry-doc (1.0.0)
+    pry-doc (1.2.0)
       pry (~> 0.11)
       yard (~> 0.9.11)
     pry-nav (0.3.0)
       pry (>= 0.9.10, < 0.13.0)
-    pry-rescue (1.5.0)
+    pry-rescue (1.5.2)
       interception (>= 0.5)
       pry (>= 0.12.0)
     pry-stack_explorer (0.4.9.3)
       binding_of_caller (>= 0.7)
       pry (>= 0.9.11)
-    public_suffix (4.0.1)
+    public_suffix (4.0.6)
+    racc (1.5.2)
     rainbow (3.0.0)
-    rake (13.0.1)
-    rake-compiler (1.0.7)
+    rake (13.0.6)
+    rake-compiler (1.1.1)
       rake
-    rb-fsevent (0.10.3)
-    rb-inotify (0.10.0)
+    rb-fsevent (0.11.0)
+    rb-inotify (0.10.1)
       ffi (~> 1.0)
-    retriable (3.1.2)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.3)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
     rubocop (0.71.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
@@ -151,8 +200,8 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
-    ruby-progressbar (1.10.1)
-    ruby_dep (1.5.0)
+    ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.5)
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
@@ -166,19 +215,20 @@ GEM
       hirb
       simplecov
     simplecov-html (0.10.2)
-    stackprof (0.2.13)
-    thor (0.20.3)
-    thread_safe (0.3.6)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.6.0)
-    yard (0.9.20)
+    stackprof (0.2.17)
+    thor (1.1.0)
+    timers (4.3.3)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (1.6.1)
+    yard (0.9.26)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  appraisal (~> 2.2.0)
+  appraisal (~> 2.4.1)
   approvals (~> 0.0.24)
   arel_toolkit!
   bundler (~> 2.0)
@@ -205,4 +255,4 @@ DEPENDENCIES
   stackprof (~> 0.2)
 
 BUNDLED WITH
-   2.1.4
+   2.3.6

data/README.md

@@ -143,9 +143,26 @@ This gem aims to have full support for PostgreSQL's SQL. In order to do so, it n
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+1. Check out the repo
+1. Run `bin/setup` to install dependencies.
+1. Start the postgres database `docker compose up`
+1. Run `bundle exec rspec` to run the tests
+1. Run `bundle exec appraisal rspec` to run the tests for the different gem sets
+
+You can also run `bin/console` for an interactive prompt that will allow you to experiment. To install this gem onto your local machine, run `bundle exec rake install`.
+
+## Releasing
+
+1. Update version in `version.rb`
+1. Create a new branch `v<<VERSION_HERE>>`
+1. Run `bundle install`
+1. Run `bundle exec appraisal install`
+1. Run `bundle exec rake changelog`
+1. Commit the changes
+1. Open a PR with name `Version <<VERSION_HERE>>` ([example](https://github.com/mvgijssel/arel_toolkit/pull/172))
+1. Merge the PR
+1. Checkout the master branch and pull latest changes
+1. Run `bundle exec rake release`
 
 ## Contributing
 

data/arel_toolkit.gemspec

@@ -25,9 +25,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.extensions    = ['ext/pg_result_init/extconf.rb']
 
-  spec.add_dependency 'activerecord'
+  spec.add_dependency 'activerecord', '>= 5.0.0'
   spec.add_dependency 'pg', '~> 1.1.4'
-  spec.add_dependency 'pg_query', '~> 1.2.0'
+  spec.add_dependency 'pg_query', '~> 2.1'
 
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'dpl', '~> 1.10.11'
@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake-compiler', '~> 1.0'
   spec.add_development_dependency 'rspec', '~> 3.8'
   spec.add_development_dependency 'approvals', '~> 0.0.24'
-  spec.add_development_dependency 'appraisal', '~> 2.2.0'
+  spec.add_development_dependency 'appraisal', '~> 2.4.1'
   spec.add_development_dependency 'database_cleaner', '~> 1.7.0'
   spec.add_development_dependency 'simplecov', '~> 0.16.1'
   spec.add_development_dependency 'simplecov-console', '~> 0.4.2'
@@ -47,10 +47,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'guard-rspec', '~> 4.7'
   spec.add_development_dependency 'guard-rubocop', '~> 1.3.0'
   spec.add_development_dependency 'guard-rake', '~> 1.0.0'
-
   spec.add_development_dependency 'stackprof', '~> 0.2'
   spec.add_development_dependency 'memory_profiler', '~> 0.9'
-
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'pry-nav'
   spec.add_development_dependency 'pry-doc'

data/bin/console

@@ -1,6 +1,8 @@
 #!/usr/bin/env ruby
 
 require 'bundler/setup'
+require 'pry'
+
 require 'arel_toolkit'
 require_relative '../spec/support/active_record'
 
@@ -8,5 +10,4 @@ require_relative '../spec/support/active_record'
 # with your gem easier. You can also use a different console, if you like.
 
 # (If you use this, don't forget to add pry to your Gemfile!)
-require 'pry'
 Pry.start

data/bin/setup

@@ -3,6 +3,27 @@ set -euo pipefail
 IFS=$'\n\t'
 set -vx
 
-bundle install
+asdf plugin-add ruby || true
+asdf install
+
+# Make sure "gem" is available
+asdf reshim ruby
+
+# Need specific version of bundler for this ruby version
+gem install bundler -v 2.2.19
+
+# Make sure "bundle" is available
+asdf reshim ruby
 
-# Do any other automated setup that you need to do here
+EXPECTED_VERSION="Bundler version 2.2.19"
+BUNDLER_VERSION=$(bundle --version)
+
+if [[ "$BUNDLER_VERSION" != "$EXPECTED_VERSION" ]]; then
+  echo "Using the wrong bundler version: '$BUNDLER_VERSION'. Expected '$EXPECTED_VERSION'"
+  exit 1
+fi
+
+bundle install
+bundle exec appraisal install
+bundle exec rake clean
+bundle exec rake compile

data/docker-compose.yml

@@ -0,0 +1,11 @@
+version: '3.8'
+services:
+  database:
+    image: postgres:latest
+    container_name: arel_toolkit_database
+    environment:
+      POSTGRES_PASSWORD: postgres
+      POSTGRES_USER: postgres
+      POSTGRES_DB: arel_toolkit_test
+    ports:
+      - 5432:5432