Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[*.yml]
indent_size = 2
55 changes: 35 additions & 20 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,30 @@
name: Tests
on: [push, pull_request]
on:
push:
branches: [master]
# Triggers the workflow on pull request events.
pull_request:
types: [opened, reopened, synchronize]
# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

# This allows a subsequently queued workflow run to interrupt previous runs.
concurrency:
group: "${{ github.workflow }} @ ${{ github.ref }}"
cancel-in-progress: true

permissions:
contents: read

jobs:
test_results:
name: Verify Stable Test Results
needs: tests
runs-on: ubuntu-latest
steps:
- name: Check stable test results
run: |
[[ "${{ needs.tests.outputs.stable_failed }}" != "1" ]]
tests:
runs-on: ubuntu-latest
env:
Expand All @@ -17,31 +37,22 @@ jobs:
- "3.2"
- "jruby-9.4.14.0"
gemfile:
- gemfiles/ar81_beta.gemfile
- gemfiles/ar80.gemfile
- gemfiles/ar72.gemfile
channel: ['stable']
- gemfiles/ar81.gemfile
channel: ["stable"]
exclude:
- ruby: "jruby-9.4.14.0"
gemfile: gemfiles/ar81_beta.gemfile
channel: 'stable'
- ruby: "jruby-9.4.14.0"
gemfile: gemfiles/ar80.gemfile
channel: 'stable'
gemfile: gemfiles/ar81.gemfile
channel: "stable"
include:
- ruby: head
gemfile: gemfiles/ar80.gemfile
channel: 'experimental'
- ruby: head
gemfile: gemfiles/ar72.gemfile
channel: 'experimental'
- ruby: jruby-head
gemfile: gemfiles/ar80.gemfile
channel: 'experimental'
gemfile: gemfiles/ar81.gemfile
channel: "experimental"
- ruby: jruby-head
gemfile: gemfiles/ar72.gemfile
channel: 'experimental'
gemfile: gemfiles/ar81.gemfile
channel: "experimental"
continue-on-error: ${{ matrix.channel != 'stable' }}
outputs:
stable_failed: ${{ steps.mark_failure.outputs.failure }}
steps:
- name: Set Up Gems
uses: actions/checkout@v4
Expand All @@ -54,3 +65,7 @@ jobs:
bundler-cache: true
- name: Test
run: bundle exec rake
- name: Mark failure
id: mark_failure
if: ${{ failure() && matrix.channel == 'stable' }}
run: echo "failure=1" >> $GITHUB_OUTPUT
4 changes: 2 additions & 2 deletions Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ appraise "ar80" do
gem "activerecord", "~> 8.0.0"
end

appraise "ar81-beta" do
gem "activerecord", "~> 8.1.0.beta"
appraise "ar81" do
gem "activerecord", "~> 8.1.0"
end
2 changes: 1 addition & 1 deletion History.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
### 9.0.0 / Unreleased
### 8.1.0 / 2025-10-23

* Drop support for legacy dependencies (t27duck)
* Support ActiveRecord 8.0 and 8.1 beta (t27duck)
Expand Down
33 changes: 11 additions & 22 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,28 +29,17 @@ Gemfile:
gem 'rgeo-activerecord'
```

Version `8.0+` supports ActiveRecord 7.x with `rgeo` 3.0+

Version `7.0+` supports ActiveRecord 5.x, 6.x, and 7.x with `rgeo` 1.0+

Version `6.2+` supports ActiveRecord 5.x and 6.x with `rgeo` 1.0+

Version `6.1` supports ActiveRecord 5.x and 6.0 with `rgeo` 1.0+.

Version `6.0` supports ActiveRecord 5.x with `rgeo` 1.x.

Version `5.0` supports ActiveRecord 5.0 and 5.1, with `rgeo` 0.6.

Version `4.0` supports ActiveRecord 4.2.

Version `1.1.0` supports ActiveRecord 4.0 and 4.1

Version `0.6.0` supports earlier versions of ruby and ActiveRecord:

- Ruby 1.8.7 or later
- ActiveRecord 3.0.3 - 3.2.x
- rgeo 0.3.20 or later
- arel 2.0.6 or later
| Version | Supported ActiveRecord Versions | Supported rgeo Versions |
| ------- | ------------------------------- | ----------------------- |
| 8.1 | 8.1 | 3.0+ |
| 8.0 | 7.x, 8.0 | 3.0+ |
| 7.0+ | 5.x, 6.x, 7.x | 1.0+ |
| 6.2+ | 5.x, 6.x | 1.0+ |
| 6.1 | 5.x, 6.0 | 1.0+ |
| 6.0 | 5.x | 1.x |
| 5.0 | 5.0, 5.1 | 0.6 |
| 4.0 | 4.2 | |
| 1.1.0 | 4.0, 4.1 | |

### Spatial Factories for Columns

Expand Down
2 changes: 1 addition & 1 deletion gemfiles/ar81_beta.gemfile → gemfiles/ar81.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

source "https://rubygems.org"

gem "activerecord", "~> 8.1.0.beta"
gem "activerecord", "~> 8.1.0"

gemspec path: "../"
2 changes: 1 addition & 1 deletion lib/rgeo/active_record/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

module RGeo
module ActiveRecord
VERSION = "8.0.0"
VERSION = "8.1.0"
end
end
2 changes: 1 addition & 1 deletion rgeo-activerecord.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Gem::Specification.new do |spec|

spec.required_ruby_version = ">= 3.1.0"

spec.add_dependency "activerecord", ">= 7.0"
spec.add_dependency "activerecord", ">= 8.1", "< 8.2"
spec.add_dependency "rgeo", ">= 3.0"

spec.add_development_dependency "appraisal", "~> 2.1"
Expand Down
Loading