armg 0.9.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 799e9abfae32c77cb45dcba9d047b1993c0bd89c1c7991e6638ca57fe08df00c
-  data.tar.gz: 78872a397ba74eb08968f3c6e7e9173976501563304ed582d925b93ce085f920
+  metadata.gz: 1d93f5c0ccd639a541a6b5c7f4d6e525bb726ee51dad6b7e10e44bbb5391e661
+  data.tar.gz: a8fc3cf837edfd65e95c989822016205e10cb018142315040e7997f82229eaa1
 SHA512:
-  metadata.gz: f938016e888bf2d30cebc445c414205ea9543932b9c33c89dd2c0af6b0c2522997caee1503434cd2c6c22b635eaa496bddb5bec0b80e6b78634128e5b868259f
-  data.tar.gz: 18d735ba55d6504f0d784ec1b0d65527abb65d3cbf3ac7813e5a8ac05da90f2d72bd21a6928c26f1b059a43bce439896c0bad363835420497ba1a714a61a1cd2
+  metadata.gz: 24aecfae70437c9b4c84f34f31dac0b3ab4737e62318895c5808f0b410f929c3953574718bdf82a3eb8c3cb20f11f5958a014bec66e07d6f896ee1a3789d946e
+  data.tar.gz: d526c3fb89a6585b072e524fb99741faa92471a3ede5538d928364ae0b8144f37503b68778aad578fa26fc10da1463dda57d116a8038acd146cfde0ec83964f2

data/.github/workflows/test.yml

@@ -11,35 +11,29 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
-          - 2.4
-          - 2.5
-          - 2.6
           - 2.7
+          - 3.0
+          - 3.1
         env:
           - ARMG_TEST_MYSQL_PORT=10056 ARMG_TEST_MYSQL_ENGINE=MyISAM
           - ARMG_TEST_MYSQL_PORT=10057 ARMG_TEST_MYSQL_ENGINE=MyISAM
           - ARMG_TEST_MYSQL_PORT=10057 ARMG_TEST_MYSQL_ENGINE=InnoDB
+          - ARMG_TEST_MYSQL_PORT=10080 ARMG_TEST_MYSQL_ENGINE=MyISAM
+          - ARMG_TEST_MYSQL_PORT=10080 ARMG_TEST_MYSQL_ENGINE=InnoDB
         gemfile:
-          - gemfiles/ar50.gemfile
-          - gemfiles/ar51.gemfile
-          - gemfiles/ar52.gemfile
           - gemfiles/ar60.gemfile
           - gemfiles/ar61.gemfile
-        exclude:
-          - ruby: 2.4
-            gemfile: gemfiles/ar60.gemfile
-          - ruby: 2.4
-            gemfile: gemfiles/ar61.gemfile
+          - gemfiles/ar70.gemfile
 
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-ruby@v1
+      - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
       - uses: actions/cache@v2
         with:
           path: gemfiles/vendor/bundle
-          key: ${{ runner.os }}-gems-${{ matrix.ruby }}-${{ matrix.gemfile }}-${{ hashFiles('ridgepole.gemspec', '**/Gemfile', '${{ matrix.gemfile }}') }}
+          key: ${{ runner.os }}-gems-${{ matrix.ruby }}-${{ matrix.gemfile }}-${{ hashFiles('ridgepole.gemspec', '**/Gemfile', matrix.gemfile) }}
           restore-keys: |
             ${{ runner.os }}-gems-${{ matrix.ruby }}-${{ matrix.gemfile }}-
 
@@ -55,6 +49,7 @@ jobs:
           function mysql_ping { mysqladmin -u root -h 127.0.0.1 -P $1 ping; }
           for i in {1..60}; do mysql_ping 10056 && break; sleep 1; done
           for i in {1..60}; do mysql_ping 10057 && break; sleep 1; done
+          for i in {1..60}; do mysql_ping 10080 && break; sleep 1; done
         env:
           BUNDLE_GEMFILE: ${{ matrix.gemfile }}
 

data/.rubocop.yml

@@ -25,3 +25,5 @@ Style/HashTransformValues:
   Enabled: true
 Gemspec/RequiredRubyVersion:
   Enabled: false
+Gemspec/DevelopmentDependencies:
+  EnforcedStyle: gemspec

data/Appraisals

@@ -1,17 +1,5 @@
 # frozen_string_literal: true
 
-appraise 'ar50' do
-  gem 'activerecord', '~> 5.0.0'
-end
-
-appraise 'ar51' do
-  gem 'activerecord', '~> 5.1.0'
-end
-
-appraise 'ar52' do
-  gem 'activerecord', '~> 5.2.0'
-end
-
 appraise 'ar60' do
   gem 'activerecord', '~> 6.0.0'
 end
@@ -19,3 +7,7 @@ end
 appraise 'ar61' do
   gem 'activerecord', '~> 6.1.0'
 end
+
+appraise 'ar70' do
+  gem 'activerecord', '~> 7.0.0'
+end

data/CHANGELOG.md

@@ -0,0 +1,42 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
+
+## [Unreleased]
+
+### Added
+
+### Changed
+
+### Deprecated
+
+### Removed
+
+### Fixed
+
+### Security
+
+## [v0.11.0] - 2023-03-07
+
+### Added
+
+- Support MySQL 8.0 (with limitation) [#18](https://github.com/cookpad/armg/pull/18)
+    - Be careful of your SRID when upgrading.
+
+## [v0.10.0] - 2022-06-18
+
+### Added
+
+- Support ActiveRecord 7.0 [#14](https://github.com/cookpad/armg/pull/14)
+- Support Ruby 3.0 and 3.1 [#15](https://github.com/cookpad/armg/pull/15)
+
+### Removed
+
+- Drop support for ActiveRecord 5.0, 5.1, and 5.2 [#15](https://github.com/cookpad/armg/pull/15)
+- Drop support for Ruby 2.4, 2.5, and 2.6 [#15](https://github.com/cookpad/armg/pull/15)
+
+[Unreleased]: https://github.com/cookpad/armg/compare/v0.10.0...HEAD
+[v0.10.0]: https://github.com/cookpad/armg/compare/v0.9.0...v0.10.0
+[v0.11.0]: https://github.com/cookpad/armg/compare/v0.10.0...v0.11.0

data/README.md

@@ -3,7 +3,7 @@
 Add MySQL geometry type to Active Record.
 
 [![Gem Version](https://badge.fury.io/rb/armg.svg)](https://badge.fury.io/rb/armg)
-[![Build Status](https://github.com/winebarrel/armg/workflows/test/badge.svg?branch=master)](https://github.com/winebarrel/armg/actions)
+[![Build Status](https://github.com/cookpad/armg/workflows/test/badge.svg?branch=master)](https://github.com/cookpad/armg/actions)
 
 
 ## Installation
@@ -108,10 +108,10 @@ Geom.create!(id: 4, location: 'Point(-122.1 47.3)')
 docker-compose up -d
 bundle install
 bundle exec appraisal install
-bundle exec appraisal ar51 rake
-# bundle exec appraisal ar50 rake
-# ARMG_TEST_MYSQL_PORT=10057 bundle exec appraisal ar51 rake # MySQL 5.7
-# ARMG_TEST_MYSQL_PORT=10057 ARMG_TEST_MYSQL_ENGINE=InnoDB bundle exec appraisal ar51 rake
+bundle exec appraisal ar61 rake
+# bundle exec appraisal ar60 rake
+# ARMG_TEST_MYSQL_PORT=10057 bundle exec appraisal ar61 rake # MySQL 5.7
+# ARMG_TEST_MYSQL_PORT=10057 ARMG_TEST_MYSQL_ENGINE=InnoDB bundle exec appraisal ar61 rake
 ```
 
 ## Using with [Ridgepole](https://github.com/winebarrel/ridgepole)
@@ -155,6 +155,14 @@ Apply `Schemafile`
 No change
 ```
 
+## Limitation on MySQL 8.0
+
+At the moment, armg gem supports only SRIDs with long-lat axis order in MySQL 8.0.
+e.g. SRID=3857 (WGS 84 / Pseudo-Mercator -- Spherical Mercator, Google Maps, OpenStreetMap, Bing, ArcGIS, ESRI)
+
+That is, armg does not support SRIDs with lat-long axis order.
+e.g. SRID=4326 (WGS 84 -- WGS84 - World Geodetic System 1984, used in GPS)
+
 ## Related links
 
 * [rgeo/rgeo: Geospatial data library for Ruby](https://github.com/rgeo/rgeo)

data/armg.gemspec

@@ -7,14 +7,13 @@ require 'armg/version'
 Gem::Specification.new do |spec|
   spec.name          = 'armg'
   spec.version       = Armg::VERSION
-  spec.authors       = ['Genki Sugawara']
-  spec.email         = ['sugawara@cookpad.com']
+  spec.authors       = ['Genki Sugawara', 'Cookpad Inc.']
+  spec.email         = ['kaimono-dev@cookpad.com']
 
   spec.summary       = 'Add MySQL geometry type to Active Record.'
   spec.description   = 'Add MySQL geometry type to Active Record.'
-  spec.homepage      = 'https://github.com/winebarrel/armg'
+  spec.homepage      = 'https://github.com/cookpad/armg'
   spec.license       = 'MIT'
-
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
@@ -22,7 +21,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activerecord', '>= 5', '< 7'
+  spec.metadata['rubygems_mfa_required'] = 'true'
+
+  spec.add_dependency 'activerecord', '>= 6', '< 8'
   spec.add_dependency 'rgeo'
   spec.add_development_dependency 'appraisal', '>= 2.2.0'
   spec.add_development_dependency 'bundler'

data/docker-compose.yml

@@ -12,3 +12,9 @@ services:
     image: "mysql:5.7"
     environment:
       - MYSQL_ALLOW_EMPTY_PASSWORD=1
+  mysql80:
+    ports:
+      - "10080:3306"
+    image: "mysql:8.0"
+    environment:
+      - MYSQL_ALLOW_EMPTY_PASSWORD=1

data/gemfiles/{ar50.gemfile → ar70.gemfile}

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 5.0.0"
+gem "activerecord", "~> 7.0.0"
 
 gemspec path: "../"

data/lib/armg/abstract_mysql_adapter_ext.rb

@@ -2,11 +2,6 @@
 
 module Armg
   module AbstractMysqlAdapterExt
-    def initialize_type_map(m = type_map)
-      super
-      m.register_type(/^geometry/i, Armg::MysqlGeometry.new)
-    end
-
     def indexes(*args, &block)
       is = super
 
@@ -16,5 +11,9 @@ module Armg
 
       is
     end
+
+    def type_map
+      @type_map ||= super.tap { |m| m.register_type(/^geometry/i, Armg::MysqlGeometry.new) }
+    end
   end
 end

data/lib/armg/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Armg
-  VERSION = '0.9.0'
+  VERSION = '0.11.0'
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: armg
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Genki Sugawara
+- Cookpad Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-30 00:00:00.000000000 Z
+date: 2023-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,20 +17,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: rgeo
   requirement: !ruby/object:Gem::Requirement
@@ -186,7 +187,7 @@ dependencies:
         version: '0'
 description: Add MySQL geometry type to Active Record.
 email:
-- sugawara@cookpad.com
+- kaimono-dev@cookpad.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -196,6 +197,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - Appraisals
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -205,11 +207,9 @@ files:
 - bin/setup
 - docker-compose.yml
 - gemfiles/.bundle/config
-- gemfiles/ar50.gemfile
-- gemfiles/ar51.gemfile
-- gemfiles/ar52.gemfile
 - gemfiles/ar60.gemfile
 - gemfiles/ar61.gemfile
+- gemfiles/ar70.gemfile
 - lib/armg.rb
 - lib/armg/abstract_mysql_adapter_ext.rb
 - lib/armg/armg.rb
@@ -221,10 +221,11 @@ files:
 - lib/armg/wkb_serializer.rb
 - lib/armg/wkt_deserializer.rb
 - lib/armg/wkt_serializer.rb
-homepage: https://github.com/winebarrel/armg
+homepage: https://github.com/cookpad/armg
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -240,7 +241,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Add MySQL geometry type to Active Record.

data/gemfiles/ar51.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", "~> 5.1.0"
-
-gemspec path: "../"

data/gemfiles/ar52.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", "~> 5.2.0"
-
-gemspec path: "../"