armg 0.9.0 → 0.10.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.github/workflows/test.yml +5 -13
- data/Appraisals +4 -12
- data/CHANGELOG.md +31 -0
- data/README.md +5 -5
- data/armg.gemspec +4 -3
- data/gemfiles/{ar50.gemfile → ar70.gemfile} +1 -1
- data/lib/armg/abstract_mysql_adapter_ext.rb +4 -5
- data/lib/armg/version.rb +1 -1
- metadata +12 -12
- data/gemfiles/ar51.gemfile +0 -7
- data/gemfiles/ar52.gemfile +0 -7
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 6f21d8219a8753c5343896f6bac0a9095dcc3b041e2081c2b2f429e5236c2b8c
|
|
4
|
+
data.tar.gz: 1537948342121354504c2ae87f7b71271b8407bb2fa23c5f80d8551b81d307ca
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 613068eaf698bba0925b0b50a07d91cb070e9b6056b42e1662ab5e9a795738f25c0b5296b43a66280c1506bd56dd76f63fa1cbc3fa70e32ca85966fb862f5e39
|
|
7
|
+
data.tar.gz: c563b9cd4ee699b03f449773e896db1d004d3cc90abedebe4a2c2f7188acc4e335a51d58350e16885ac139fda90207f9fa9bbdea37c0730b9bea60c8c966cded
|
data/.github/workflows/test.yml
CHANGED
|
@@ -11,35 +11,27 @@ jobs:
|
|
|
11
11
|
fail-fast: false
|
|
12
12
|
matrix:
|
|
13
13
|
ruby:
|
|
14
|
-
- 2.4
|
|
15
|
-
- 2.5
|
|
16
|
-
- 2.6
|
|
17
14
|
- 2.7
|
|
15
|
+
- 3.0
|
|
16
|
+
- 3.1
|
|
18
17
|
env:
|
|
19
18
|
- ARMG_TEST_MYSQL_PORT=10056 ARMG_TEST_MYSQL_ENGINE=MyISAM
|
|
20
19
|
- ARMG_TEST_MYSQL_PORT=10057 ARMG_TEST_MYSQL_ENGINE=MyISAM
|
|
21
20
|
- ARMG_TEST_MYSQL_PORT=10057 ARMG_TEST_MYSQL_ENGINE=InnoDB
|
|
22
21
|
gemfile:
|
|
23
|
-
- gemfiles/ar50.gemfile
|
|
24
|
-
- gemfiles/ar51.gemfile
|
|
25
|
-
- gemfiles/ar52.gemfile
|
|
26
22
|
- gemfiles/ar60.gemfile
|
|
27
23
|
- gemfiles/ar61.gemfile
|
|
28
|
-
|
|
29
|
-
- ruby: 2.4
|
|
30
|
-
gemfile: gemfiles/ar60.gemfile
|
|
31
|
-
- ruby: 2.4
|
|
32
|
-
gemfile: gemfiles/ar61.gemfile
|
|
24
|
+
- gemfiles/ar70.gemfile
|
|
33
25
|
|
|
34
26
|
steps:
|
|
35
27
|
- uses: actions/checkout@v2
|
|
36
|
-
- uses:
|
|
28
|
+
- uses: ruby/setup-ruby@v1
|
|
37
29
|
with:
|
|
38
30
|
ruby-version: ${{ matrix.ruby }}
|
|
39
31
|
- uses: actions/cache@v2
|
|
40
32
|
with:
|
|
41
33
|
path: gemfiles/vendor/bundle
|
|
42
|
-
key: ${{ runner.os }}-gems-${{ matrix.ruby }}-${{ matrix.gemfile }}-${{ hashFiles('ridgepole.gemspec', '**/Gemfile',
|
|
34
|
+
key: ${{ runner.os }}-gems-${{ matrix.ruby }}-${{ matrix.gemfile }}-${{ hashFiles('ridgepole.gemspec', '**/Gemfile', matrix.gemfile) }}
|
|
43
35
|
restore-keys: |
|
|
44
36
|
${{ runner.os }}-gems-${{ matrix.ruby }}-${{ matrix.gemfile }}-
|
|
45
37
|
|
data/Appraisals
CHANGED
|
@@ -1,17 +1,5 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
|
-
appraise 'ar50' do
|
|
4
|
-
gem 'activerecord', '~> 5.0.0'
|
|
5
|
-
end
|
|
6
|
-
|
|
7
|
-
appraise 'ar51' do
|
|
8
|
-
gem 'activerecord', '~> 5.1.0'
|
|
9
|
-
end
|
|
10
|
-
|
|
11
|
-
appraise 'ar52' do
|
|
12
|
-
gem 'activerecord', '~> 5.2.0'
|
|
13
|
-
end
|
|
14
|
-
|
|
15
3
|
appraise 'ar60' do
|
|
16
4
|
gem 'activerecord', '~> 6.0.0'
|
|
17
5
|
end
|
|
@@ -19,3 +7,7 @@ end
|
|
|
19
7
|
appraise 'ar61' do
|
|
20
8
|
gem 'activerecord', '~> 6.1.0'
|
|
21
9
|
end
|
|
10
|
+
|
|
11
|
+
appraise 'ar70' do
|
|
12
|
+
gem 'activerecord', '~> 7.0.0'
|
|
13
|
+
end
|
data/CHANGELOG.md
ADDED
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
# Changelog
|
|
2
|
+
|
|
3
|
+
All notable changes to this project will be documented in this file.
|
|
4
|
+
|
|
5
|
+
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
|
|
6
|
+
|
|
7
|
+
## Unreleased
|
|
8
|
+
|
|
9
|
+
### Added
|
|
10
|
+
|
|
11
|
+
### Changed
|
|
12
|
+
|
|
13
|
+
### Deprecated
|
|
14
|
+
|
|
15
|
+
### Removed
|
|
16
|
+
|
|
17
|
+
### Fixed
|
|
18
|
+
|
|
19
|
+
### Security
|
|
20
|
+
|
|
21
|
+
## [0.10.0] - 2022-06-18
|
|
22
|
+
|
|
23
|
+
### Added
|
|
24
|
+
|
|
25
|
+
- Support ActiveRecord 7.0 [#14](https://github.com/cookpad/armg/pull/14)
|
|
26
|
+
- Support Ruby 3.0 and 3.1 [#15](https://github.com/cookpad/armg/pull/15)
|
|
27
|
+
|
|
28
|
+
### Removed
|
|
29
|
+
|
|
30
|
+
- Drop support for ActiveRecord 5.0, 5.1, and 5.2 [#15](https://github.com/cookpad/armg/pull/15)
|
|
31
|
+
- Drop support for Ruby 2.4, 2.5, and 2.6 [#15](https://github.com/cookpad/armg/pull/15)
|
data/README.md
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
Add MySQL geometry type to Active Record.
|
|
4
4
|
|
|
5
5
|
[](https://badge.fury.io/rb/armg)
|
|
6
|
-
[](https://github.com/cookpad/armg/actions)
|
|
7
7
|
|
|
8
8
|
|
|
9
9
|
## Installation
|
|
@@ -108,10 +108,10 @@ Geom.create!(id: 4, location: 'Point(-122.1 47.3)')
|
|
|
108
108
|
docker-compose up -d
|
|
109
109
|
bundle install
|
|
110
110
|
bundle exec appraisal install
|
|
111
|
-
bundle exec appraisal
|
|
112
|
-
# bundle exec appraisal
|
|
113
|
-
# ARMG_TEST_MYSQL_PORT=10057 bundle exec appraisal
|
|
114
|
-
# ARMG_TEST_MYSQL_PORT=10057 ARMG_TEST_MYSQL_ENGINE=InnoDB bundle exec appraisal
|
|
111
|
+
bundle exec appraisal ar61 rake
|
|
112
|
+
# bundle exec appraisal ar60 rake
|
|
113
|
+
# ARMG_TEST_MYSQL_PORT=10057 bundle exec appraisal ar61 rake # MySQL 5.7
|
|
114
|
+
# ARMG_TEST_MYSQL_PORT=10057 ARMG_TEST_MYSQL_ENGINE=InnoDB bundle exec appraisal ar61 rake
|
|
115
115
|
```
|
|
116
116
|
|
|
117
117
|
## Using with [Ridgepole](https://github.com/winebarrel/ridgepole)
|
data/armg.gemspec
CHANGED
|
@@ -12,9 +12,8 @@ Gem::Specification.new do |spec|
|
|
|
12
12
|
|
|
13
13
|
spec.summary = 'Add MySQL geometry type to Active Record.'
|
|
14
14
|
spec.description = 'Add MySQL geometry type to Active Record.'
|
|
15
|
-
spec.homepage = 'https://github.com/
|
|
15
|
+
spec.homepage = 'https://github.com/cookpad/armg'
|
|
16
16
|
spec.license = 'MIT'
|
|
17
|
-
|
|
18
17
|
spec.files = `git ls-files -z`.split("\x0").reject do |f|
|
|
19
18
|
f.match(%r{^(test|spec|features)/})
|
|
20
19
|
end
|
|
@@ -22,7 +21,9 @@ Gem::Specification.new do |spec|
|
|
|
22
21
|
spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
|
|
23
22
|
spec.require_paths = ['lib']
|
|
24
23
|
|
|
25
|
-
spec.
|
|
24
|
+
spec.metadata['rubygems_mfa_required'] = 'true'
|
|
25
|
+
|
|
26
|
+
spec.add_dependency 'activerecord', '>= 6', '< 8'
|
|
26
27
|
spec.add_dependency 'rgeo'
|
|
27
28
|
spec.add_development_dependency 'appraisal', '>= 2.2.0'
|
|
28
29
|
spec.add_development_dependency 'bundler'
|
|
@@ -2,11 +2,6 @@
|
|
|
2
2
|
|
|
3
3
|
module Armg
|
|
4
4
|
module AbstractMysqlAdapterExt
|
|
5
|
-
def initialize_type_map(m = type_map)
|
|
6
|
-
super
|
|
7
|
-
m.register_type(/^geometry/i, Armg::MysqlGeometry.new)
|
|
8
|
-
end
|
|
9
|
-
|
|
10
5
|
def indexes(*args, &block)
|
|
11
6
|
is = super
|
|
12
7
|
|
|
@@ -16,5 +11,9 @@ module Armg
|
|
|
16
11
|
|
|
17
12
|
is
|
|
18
13
|
end
|
|
14
|
+
|
|
15
|
+
def type_map
|
|
16
|
+
@type_map ||= super.tap { |m| m.register_type(/^geometry/i, Armg::MysqlGeometry.new) }
|
|
17
|
+
end
|
|
19
18
|
end
|
|
20
19
|
end
|
data/lib/armg/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: armg
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.
|
|
4
|
+
version: 0.10.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Genki Sugawara
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: exe
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date:
|
|
11
|
+
date: 2022-06-18 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: activerecord
|
|
@@ -16,20 +16,20 @@ dependencies:
|
|
|
16
16
|
requirements:
|
|
17
17
|
- - ">="
|
|
18
18
|
- !ruby/object:Gem::Version
|
|
19
|
-
version: '
|
|
19
|
+
version: '6'
|
|
20
20
|
- - "<"
|
|
21
21
|
- !ruby/object:Gem::Version
|
|
22
|
-
version: '
|
|
22
|
+
version: '8'
|
|
23
23
|
type: :runtime
|
|
24
24
|
prerelease: false
|
|
25
25
|
version_requirements: !ruby/object:Gem::Requirement
|
|
26
26
|
requirements:
|
|
27
27
|
- - ">="
|
|
28
28
|
- !ruby/object:Gem::Version
|
|
29
|
-
version: '
|
|
29
|
+
version: '6'
|
|
30
30
|
- - "<"
|
|
31
31
|
- !ruby/object:Gem::Version
|
|
32
|
-
version: '
|
|
32
|
+
version: '8'
|
|
33
33
|
- !ruby/object:Gem::Dependency
|
|
34
34
|
name: rgeo
|
|
35
35
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -196,6 +196,7 @@ files:
|
|
|
196
196
|
- ".rspec"
|
|
197
197
|
- ".rubocop.yml"
|
|
198
198
|
- Appraisals
|
|
199
|
+
- CHANGELOG.md
|
|
199
200
|
- Gemfile
|
|
200
201
|
- LICENSE.txt
|
|
201
202
|
- README.md
|
|
@@ -205,11 +206,9 @@ files:
|
|
|
205
206
|
- bin/setup
|
|
206
207
|
- docker-compose.yml
|
|
207
208
|
- gemfiles/.bundle/config
|
|
208
|
-
- gemfiles/ar50.gemfile
|
|
209
|
-
- gemfiles/ar51.gemfile
|
|
210
|
-
- gemfiles/ar52.gemfile
|
|
211
209
|
- gemfiles/ar60.gemfile
|
|
212
210
|
- gemfiles/ar61.gemfile
|
|
211
|
+
- gemfiles/ar70.gemfile
|
|
213
212
|
- lib/armg.rb
|
|
214
213
|
- lib/armg/abstract_mysql_adapter_ext.rb
|
|
215
214
|
- lib/armg/armg.rb
|
|
@@ -221,10 +220,11 @@ files:
|
|
|
221
220
|
- lib/armg/wkb_serializer.rb
|
|
222
221
|
- lib/armg/wkt_deserializer.rb
|
|
223
222
|
- lib/armg/wkt_serializer.rb
|
|
224
|
-
homepage: https://github.com/
|
|
223
|
+
homepage: https://github.com/cookpad/armg
|
|
225
224
|
licenses:
|
|
226
225
|
- MIT
|
|
227
|
-
metadata:
|
|
226
|
+
metadata:
|
|
227
|
+
rubygems_mfa_required: 'true'
|
|
228
228
|
post_install_message:
|
|
229
229
|
rdoc_options: []
|
|
230
230
|
require_paths:
|
|
@@ -240,7 +240,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
240
240
|
- !ruby/object:Gem::Version
|
|
241
241
|
version: '0'
|
|
242
242
|
requirements: []
|
|
243
|
-
rubygems_version: 3.
|
|
243
|
+
rubygems_version: 3.2.15
|
|
244
244
|
signing_key:
|
|
245
245
|
specification_version: 4
|
|
246
246
|
summary: Add MySQL geometry type to Active Record.
|
data/gemfiles/ar51.gemfile
DELETED