armg 0.8.1 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87b091745ad8e4956f0fe1d82c5550d6c700feeb34541fef66e96309f3bcf09c
-  data.tar.gz: 0a045f637a8914a492cf93579f85399a6510183e23425ea152e864a81d9f8d8d
+  metadata.gz: 6f21d8219a8753c5343896f6bac0a9095dcc3b041e2081c2b2f429e5236c2b8c
+  data.tar.gz: 1537948342121354504c2ae87f7b71271b8407bb2fa23c5f80d8551b81d307ca
 SHA512:
-  metadata.gz: e448dc89ea4e86c696a06a7e16ea09634a729347592ddfe0372ee9dd18dbda6f243f5313f05b2f84872171c84585c69def8207cf4a8aa6f0d2b0ab9006a5a2ca
-  data.tar.gz: 9f426744830c050aa10152aa062232dc1bf9758b819c768b600f582c07ae3099acbb4413d43f2180c1b1a76593636192c6d06817770540922aef14abb895b845
+  metadata.gz: 613068eaf698bba0925b0b50a07d91cb070e9b6056b42e1662ab5e9a795738f25c0b5296b43a66280c1506bd56dd76f63fa1cbc3fa70e32ca85966fb862f5e39
+  data.tar.gz: c563b9cd4ee699b03f449773e896db1d004d3cc90abedebe4a2c2f7188acc4e335a51d58350e16885ac139fda90207f9fa9bbdea37c0730b9bea60c8c966cded

data/.github/workflows/test.yml

@@ -0,0 +1,55 @@
+name: test
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - 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
+        gemfile:
+          - gemfiles/ar60.gemfile
+          - gemfiles/ar61.gemfile
+          - gemfiles/ar70.gemfile
+
+    steps:
+      - uses: actions/checkout@v2
+      - 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) }}
+          restore-keys: |
+            ${{ runner.os }}-gems-${{ matrix.ruby }}-${{ matrix.gemfile }}-
+
+      - name: Setup dependencies
+        run: |
+          for i in {1..60}; do docker-compose up -d && break; sleep 1; done
+
+          gem install bundler
+          bundle config path vendor/bundle
+          bundle install --jobs 4 --retry 3
+
+          # Wait until database servers start
+          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
+        env:
+          BUNDLE_GEMFILE: ${{ matrix.gemfile }}
+
+      - run: ${{ matrix.env }} bundle exec rake
+        env:
+          BUNDLE_GEMFILE: ${{ matrix.gemfile }}

data/.rubocop.yml

@@ -3,6 +3,7 @@ AllCops:
     - gemfiles/**/*
     - test.rb
   TargetRubyVersion: 2.4
+  NewCops: enable
 Bundler/OrderedGems:
   Include:
     - "Appraisals"
@@ -22,3 +23,5 @@ Style/HashTransformKeys:
   Enabled: true
 Style/HashTransformValues:
   Enabled: true
+Gemspec/RequiredRubyVersion:
+  Enabled: false

data/Appraisals

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

data/CHANGELOG.md

@@ -0,0 +1,31 @@
+# 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
+
+## [0.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)

data/README.md

@@ -3,7 +3,8 @@
 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://travis-ci.org/winebarrel/armg.svg?branch=master)](https://travis-ci.org/winebarrel/armg)
+[![Build Status](https://github.com/cookpad/armg/workflows/test/badge.svg?branch=master)](https://github.com/cookpad/armg/actions)
+
 
 ## Installation
 
@@ -107,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)
@@ -119,17 +120,22 @@ You need to extend the TableDefinition class.
 
 ```ruby
 # ridgepole-geo.rb
-module Ridgepole
-  class DSLParser
-    class TableDefinition
-      def geometry(*args)
-        options = args.extract_options!
-        column_names = args
-        column_names.each { |name| column(name, :geometry, options) }
-      end
-    end
+module TableDefinitionExtForGeometry
+  def geometry(*args)
+    options = args.extract_options!
+    column_names = args
+    column_names.each { |name| column(name, :geometry, options) }
+  end
+end
+Ridgepole::DSLParser::TableDefinition.prepend(TableDefinitionExtForGeometry)
+
+module DiffExtForGeometry
+  def normalize_index_options!(opts)
+    super
+    opts.delete(:length) if opts[:type] == :spatial
   end
 end
+Ridgepole::Diff.prepend(DiffExtForGeometry)
 ```
 
 ```sh

data/armg.gemspec

@@ -12,9 +12,8 @@ Gem::Specification.new do |spec|
 
   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'
@@ -31,5 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rspec-match_ruby', '>= 0.1.3'
-  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'rubocop', '>= 1.7.0'
+  spec.add_development_dependency 'rubocop-rake'
+  spec.add_development_dependency 'rubocop-rspec'
 end

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

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

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

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 5.1.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/armg.rb

@@ -5,12 +5,6 @@ module Armg
   @serializer = Armg::WkbSerializer.new
 
   class << self
-    attr_reader :deserializer
-
-    attr_writer :deserializer
-
-    attr_reader :serializer
-
-    attr_writer :serializer
+    attr_accessor :deserializer, :serializer
   end
 end

data/lib/armg/table_definition_ext.rb

@@ -3,7 +3,7 @@
 module Armg
   module TableDefinitionExt
     def geometry(*args, **options)
-      args.each { |name| column(name, :geometry, options) }
+      args.each { |name| column(name, :geometry, **options) }
     end
   end
 end

data/lib/armg/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: armg
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.10.0
 platform: ruby
 authors:
 - Genki Sugawara
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-03-09 00:00:00.000000000 Z
+date: 2022-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,20 +16,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
@@ -144,6 +144,34 @@ dependencies:
         version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.7.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.7.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -163,11 +191,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - Appraisals
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -177,10 +206,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
@@ -192,11 +220,12 @@ 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: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -211,8 +240,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: Add MySQL geometry type to Active Record.
 test_files: []

data/.travis.yml

@@ -1,33 +0,0 @@
-dist: xenial
-sudo: required
-group: edge
-services:
-  - docker
-language: ruby
-rvm:
-  - 2.4.9
-  - 2.5.7
-  - 2.6.5
-gemfile:
-  - gemfiles/ar50.gemfile
-  - gemfiles/ar51.gemfile
-  - gemfiles/ar52.gemfile
-  - gemfiles/ar60.gemfile
-before_script:
-  - sudo service mysql stop
-  - docker-compose up -d
-  - 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
-cache:
-  - bundler
-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
-script:
-  - bundle exec rake
-matrix:
-  exclude:
-    - rvm: 2.4.9
-      gemfile: gemfiles/ar60.gemfile

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: "../"