armg 0.7.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e7678ce25fd09f721c2f7c3f1bede00883e9452e
-  data.tar.gz: a20939445411bc79a773ea58eb4f9880de239190
+SHA256:
+  metadata.gz: 799e9abfae32c77cb45dcba9d047b1993c0bd89c1c7991e6638ca57fe08df00c
+  data.tar.gz: 78872a397ba74eb08968f3c6e7e9173976501563304ed582d925b93ce085f920
 SHA512:
-  metadata.gz: 591c81f706ce898945a6a72df3b4b241570c532038b8ec3352e1e81c8d13287454cf639b51b6098b06aacc79deee809537c2629998b2786d9f786eb3bc713de4
-  data.tar.gz: 40c3a68f7de8800ee49c3b66dfc9f3e2a03540812813308a9040c902e7ae644c682c0b491482adb2be6d28a6841575d99ad7cc495abe8b7de01235dcde204c20
+  metadata.gz: f938016e888bf2d30cebc445c414205ea9543932b9c33c89dd2c0af6b0c2522997caee1503434cd2c6c22b635eaa496bddb5bec0b80e6b78634128e5b868259f
+  data.tar.gz: 18d735ba55d6504f0d784ec1b0d65527abb65d3cbf3ac7813e5a8ac05da90f2d72bd21a6928c26f1b059a43bce439896c0bad363835420497ba1a714a61a1cd2

data/.github/workflows/test.yml

@@ -0,0 +1,63 @@
+name: test
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - 2.4
+          - 2.5
+          - 2.6
+          - 2.7
+        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/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
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/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/.gitignore

@@ -12,3 +12,4 @@
 .rspec_status
 
 /gemfiles/*.lock
+/test.rb

data/.rubocop.yml

@@ -0,0 +1,27 @@
+AllCops:
+  Exclude:
+    - gemfiles/**/*
+    - test.rb
+  TargetRubyVersion: 2.4
+  NewCops: enable
+Bundler/OrderedGems:
+  Include:
+    - "Appraisals"
+Layout/LineLength:
+  Enabled: false
+Metrics/BlockLength:
+  Enabled: false
+Naming/MethodParameterName:
+  Enabled: false
+Style/AccessModifierDeclarations:
+  Enabled: false
+Style/Documentation:
+  Enabled: false
+Style/HashEachMethods:
+  Enabled: true
+Style/HashTransformKeys:
+  Enabled: true
+Style/HashTransformValues:
+  Enabled: true
+Gemspec/RequiredRubyVersion:
+  Enabled: false

data/Appraisals

@@ -1,7 +1,21 @@
+# frozen_string_literal: true
+
 appraise 'ar50' do
-  gem 'activerecord', '~> 5.0'
+  gem 'activerecord', '~> 5.0.0'
 end
 
 appraise 'ar51' do
-  gem 'activerecord', '~> 5.1'
+  gem 'activerecord', '~> 5.1.0'
+end
+
+appraise 'ar52' do
+  gem 'activerecord', '~> 5.2.0'
+end
+
+appraise 'ar60' do
+  gem 'activerecord', '~> 6.0.0'
+end
+
+appraise 'ar61' do
+  gem 'activerecord', '~> 6.1.0'
 end

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in armg.gemspec

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/winebarrel/armg/workflows/test/badge.svg?branch=master)](https://github.com/winebarrel/armg/actions)
+
 
 ## Installation
 
@@ -113,6 +114,47 @@ bundle exec appraisal ar51 rake
 # ARMG_TEST_MYSQL_PORT=10057 ARMG_TEST_MYSQL_ENGINE=InnoDB bundle exec appraisal ar51 rake
 ```
 
+## Using with [Ridgepole](https://github.com/winebarrel/ridgepole)
+
+You need to extend the TableDefinition class.
+
+```ruby
+# ridgepole-geo.rb
+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
+$ ridgepole -c 'mysql2://root@127.0.0.1:10057/armg_test' -r armg -e > Schemafile
+
+$ cat Schemafile
+# Export Schema
+create_table "geoms", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  t.geometry "location", null: false
+  t.string "name"
+  t.index ["location"], name: "idx_location", length: 32, type: :spatial
+  t.index ["name"], name: "idx_name", length: 10
+end
+
+$ ridgepole -c 'mysql2://root@127.0.0.1:10057/armg_test' -r armg,ridgepole-geo -a
+Apply `Schemafile`
+No change
+```
+
 ## Related links
 
 * [rgeo/rgeo: Geospatial data library for Ruby](https://github.com/rgeo/rgeo)

data/Rakefile

@@ -1,6 +1,13 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+RuboCop::RakeTask.new do |task|
+  task.options = %w[-c .rubocop.yml]
+end
+
+task default: %i[rubocop spec]

data/armg.gemspec

@@ -1,5 +1,6 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'armg/version'
 
@@ -9,8 +10,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Genki Sugawara']
   spec.email         = ['sugawara@cookpad.com']
 
-  spec.summary       = %q{Add MySQL geometry type to Active Record.}
-  spec.description   = %q{Add MySQL geometry type to Active Record.}
+  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.license       = 'MIT'
 
@@ -21,12 +22,16 @@ 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'
+  spec.add_dependency 'activerecord', '>= 5', '< 7'
   spec.add_dependency 'rgeo'
+  spec.add_development_dependency 'appraisal', '>= 2.2.0'
   spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'erbh', '>= 0.1.2'
+  spec.add_development_dependency 'mysql2'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'mysql2'
-  spec.add_development_dependency 'rspec-match_fuzzy'
-  spec.add_development_dependency 'appraisal', '>= 2.2.0'
+  spec.add_development_dependency 'rspec-match_ruby', '>= 0.1.3'
+  spec.add_development_dependency 'rubocop', '>= 1.7.0'
+  spec.add_development_dependency 'rubocop-rake'
+  spec.add_development_dependency 'rubocop-rspec'
 end

data/bin/console

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-require "bundler/setup"
-require "armg"
+require 'bundler/setup'
+require 'armg'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +11,5 @@ require "armg"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start(__FILE__)

data/docker-compose.yml

@@ -1,4 +1,4 @@
-version: '2'
+version: "2"
 services:
   mysql56:
     ports:

data/gemfiles/.bundle/config

@@ -0,0 +1,2 @@
+---
+BUNDLE_RETRY: "1"

data/gemfiles/ar50.gemfile

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

data/gemfiles/ar51.gemfile

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

data/gemfiles/ar52.gemfile

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

data/gemfiles/ar60.gemfile

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

data/gemfiles/ar61.gemfile

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

data/lib/armg.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/lazy_load_hooks'
 require 'rgeo'
 require 'armg/version'

data/lib/armg/abstract_mysql_adapter_ext.rb

@@ -1,18 +1,20 @@
-module Armg::AbstractMysqlAdapterExt
-  def initialize_type_map(m)
-    super
-    m.register_type %r(^geometry)i,  Armg::MysqlGeometry.new
-  end
+# frozen_string_literal: true
+
+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
+    def indexes(*args, &block)
+      is = super
 
-    is.each do |i|
-      if i.type == :spatial
-        i.lengths = nil
+      is.each do |i|
+        i.lengths = nil if i.type == :spatial && i.respond_to?(:lengths=)
       end
-    end
 
-    is
+      is
+    end
   end
 end

data/lib/armg/armg.rb

@@ -1,22 +1,10 @@
+# frozen_string_literal: true
+
 module Armg
   @deserializer = Armg::WkbDeserializer.new
   @serializer = Armg::WkbSerializer.new
 
   class << self
-    def deserializer
-      @deserializer
-    end
-
-    def deserializer=(v)
-      @deserializer = v
-    end
-
-    def serializer
-      @serializer
-    end
-
-    def serializer=(v)
-      @serializer = v
-    end
+    attr_accessor :deserializer, :serializer
   end
 end

data/lib/armg/mysql_geometry.rb

@@ -1,21 +1,33 @@
-class Armg::MysqlGeometry < ActiveModel::Type::Value
-  def type
-    :geometry
-  end
+# frozen_string_literal: true
 
-  def deserialize(value)
-    if value.is_a?(::String)
-      Armg.deserializer.deserialize(value)
-    else
-      value
+module Armg
+  class MysqlGeometry < ActiveModel::Type::Value
+    def type
+      :geometry
+    end
+
+    def binary?
+      true
+    end
+
+    def deserialize(value)
+      case value
+      when ::String
+        Armg.deserializer.deserialize(value)
+      when ActiveModel::Type::Binary::Data
+        Armg.deserializer.deserialize(value.to_s)
+      else
+        value
+      end
     end
-  end
 
-  def serialize(value)
-    if value.nil?
-      nil
-    else
-      Armg.serializer.serialize(value)
+    def serialize(value)
+      if value.nil?
+        nil
+      else
+        value = Armg.serializer.serialize(value)
+        ActiveModel::Type::Binary::Data.new(value)
+      end
     end
   end
 end

data/lib/armg/table_definition_ext.rb

@@ -1,5 +1,9 @@
-module Armg::TableDefinitionExt
-  def geometry(*args, **options)
-    args.each { |name| column(name, :geometry, options) }
+# frozen_string_literal: true
+
+module Armg
+  module TableDefinitionExt
+    def geometry(*args, **options)
+      args.each { |name| column(name, :geometry, **options) }
+    end
   end
 end

data/lib/armg/utils.rb

@@ -1,15 +1,19 @@
+# frozen_string_literal: true
+
 # see https://dev.mysql.com/doc/refman/5.7/en/gis-data-formats.html
-module Armg::Utils
-  def mysql_geometry_to_wkb(mysql_geometry)
-    mysql_geometry = mysql_geometry.b
-    srid = mysql_geometry.slice!(0..3)
-    mysql_geometry[4] = "\x20"
-    mysql_geometry.insert(5, srid)
-  end
-  module_function :mysql_geometry_to_wkb
+module Armg
+  module Utils
+    def mysql_geometry_to_wkb(mysql_geometry)
+      mysql_geometry = mysql_geometry.b
+      srid = mysql_geometry.slice!(0..3)
+      mysql_geometry[4] = "\x20"
+      mysql_geometry.insert(5, srid)
+    end
+    module_function :mysql_geometry_to_wkb
 
-  def pack_srid(srid)
-    [srid].pack('L<')
+    def pack_srid(srid)
+      [srid].pack('L<')
+    end
+    module_function :pack_srid
   end
-  module_function :pack_srid
 end

data/lib/armg/version.rb

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

data/lib/armg/wkb_deserializer.rb

@@ -1,15 +1,19 @@
-class Armg::WkbDeserializer
-  DEFAULT_OPTIONS = {
-    support_ewkb: true,
-  }
+# frozen_string_literal: true
 
-  def initialize(factory: nil, **options)
-    options = DEFAULT_OPTIONS.merge(options)
-    @wkb_parser = RGeo::WKRep::WKBParser.new(factory, options)
-  end
+module Armg
+  class WkbDeserializer
+    DEFAULT_OPTIONS = {
+      support_ewkb: true
+    }.freeze
+
+    def initialize(factory: nil, **options)
+      options = DEFAULT_OPTIONS.merge(options)
+      @wkb_parser = RGeo::WKRep::WKBParser.new(factory, options)
+    end
 
-  def deserialize(mysql_geometry)
-    wkb = Armg::Utils.mysql_geometry_to_wkb(mysql_geometry)
-    @wkb_parser.parse(wkb)
+    def deserialize(mysql_geometry)
+      wkb = Armg::Utils.mysql_geometry_to_wkb(mysql_geometry)
+      @wkb_parser.parse(wkb)
+    end
   end
 end

data/lib/armg/wkb_serializer.rb

@@ -1,16 +1,20 @@
-class Armg::WkbSerializer
-  DEFAULT_OPTIONS = {
-    type_format: :ewkb,
-    little_endian: true,
-  }
+# frozen_string_literal: true
 
-  def initialize(**options)
-    options = DEFAULT_OPTIONS.merge(options)
-    @wkb_generator = RGeo::WKRep::WKBGenerator.new(options)
-  end
+module Armg
+  class WkbSerializer
+    DEFAULT_OPTIONS = {
+      type_format: :ewkb,
+      little_endian: true
+    }.freeze
+
+    def initialize(**options)
+      options = DEFAULT_OPTIONS.merge(options)
+      @wkb_generator = RGeo::WKRep::WKBGenerator.new(options)
+    end
 
-  def serialize(obj)
-    srid = Armg::Utils.pack_srid(obj.srid)
-    srid + @wkb_generator.generate(obj)
+    def serialize(obj)
+      srid = Armg::Utils.pack_srid(obj.srid)
+      srid + @wkb_generator.generate(obj)
+    end
   end
 end

data/lib/armg/wkt_deserializer.rb

@@ -1,23 +1,30 @@
-class Armg::WktDeserializer
-  DEFAULT_WKB_PARSER_OPTIONS = {
-    support_ewkb: true,
-  }
+# frozen_string_literal: true
 
-  DEFAULT_WKT_GENERATOR_OPTIONS = {
-    tag_format: :ewkt,
-    #emit_ewkt_srid: true,
-  }
+module Armg
+  class WktDeserializer
+    DEFAULT_WKB_PARSER_OPTIONS = {
+      support_ewkb: true
+    }.freeze
 
-  def initialize(factory: nil, wkb_parser_options: {}, wkt_generator_options: {})
-    @wkb_parser = RGeo::WKRep::WKBParser.new(factory,
-      DEFAULT_WKB_PARSER_OPTIONS.merge(wkb_parser_options))
-    @wkt_generator = RGeo::WKRep::WKTGenerator.new(
-      DEFAULT_WKT_GENERATOR_OPTIONS.merge(wkt_generator_options))
-  end
+    DEFAULT_WKT_GENERATOR_OPTIONS = {
+      tag_format: :ewkt
+      # emit_ewkt_srid: true,
+    }.freeze
+
+    def initialize(factory: nil, wkb_parser_options: {}, wkt_generator_options: {})
+      @wkb_parser = RGeo::WKRep::WKBParser.new(
+        factory,
+        DEFAULT_WKB_PARSER_OPTIONS.merge(wkb_parser_options)
+      )
+      @wkt_generator = RGeo::WKRep::WKTGenerator.new(
+        DEFAULT_WKT_GENERATOR_OPTIONS.merge(wkt_generator_options)
+      )
+    end
 
-  def deserialize(mysql_geometry)
-    wkb = Armg::Utils.mysql_geometry_to_wkb(mysql_geometry)
-    obj = @wkb_parser.parse(wkb)
-    @wkt_generator.generate(obj)
+    def deserialize(mysql_geometry)
+      wkb = Armg::Utils.mysql_geometry_to_wkb(mysql_geometry)
+      obj = @wkb_parser.parse(wkb)
+      @wkt_generator.generate(obj)
+    end
   end
 end

data/lib/armg/wkt_serializer.rb

@@ -1,23 +1,30 @@
-class Armg::WktSerializer
-  DEFAULT_WKB_GENERATOR_OPTIONS = {
-    type_format: :ewkb,
-    little_endian: true,
-  }
+# frozen_string_literal: true
 
-  DEFAULT_WKT_PARSER_OPTIONS = {
-    support_ewkt: true
-  }
+module Armg
+  class WktSerializer
+    DEFAULT_WKB_GENERATOR_OPTIONS = {
+      type_format: :ewkb,
+      little_endian: true
+    }.freeze
 
-  def initialize(factory: nil, wkb_generator_options: {}, wkt_parser_options: {})
-    @wkb_generator = RGeo::WKRep::WKBGenerator.new(
-      DEFAULT_WKB_GENERATOR_OPTIONS.merge(wkb_generator_options))
-    @wkt_parser = RGeo::WKRep::WKTParser.new(factory,
-      DEFAULT_WKT_PARSER_OPTIONS.merge(wkt_parser_options))
-  end
+    DEFAULT_WKT_PARSER_OPTIONS = {
+      support_ewkt: true
+    }.freeze
+
+    def initialize(factory: nil, wkb_generator_options: {}, wkt_parser_options: {})
+      @wkb_generator = RGeo::WKRep::WKBGenerator.new(
+        DEFAULT_WKB_GENERATOR_OPTIONS.merge(wkb_generator_options)
+      )
+      @wkt_parser = RGeo::WKRep::WKTParser.new(
+        factory,
+        DEFAULT_WKT_PARSER_OPTIONS.merge(wkt_parser_options)
+      )
+    end
 
-  def serialize(wkt)
-    obj = @wkt_parser.parse(wkt)
-    srid = Armg::Utils.pack_srid(obj.srid)
-    srid + @wkb_generator.generate(obj)
+    def serialize(wkt)
+      obj = @wkt_parser.parse(wkt)
+      srid = Armg::Utils.pack_srid(obj.srid)
+      srid + @wkb_generator.generate(obj)
+    end
   end
 end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: armg
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Genki Sugawara
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2017-08-13 00:00:00.000000000 Z
+date: 2020-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: rgeo
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +44,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +72,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: erbh
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.2
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  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: rake
   requirement: !ruby/object:Gem::Requirement
@@ -81,21 +129,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: mysql2
+  name: rspec-match_ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
-  name: rspec-match_fuzzy
+  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:
     - - ">="
@@ -109,19 +171,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '0'
 description: Add MySQL geometry type to Active Record.
 email:
 - sugawara@cookpad.com
@@ -129,9 +191,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
+- ".rubocop.yml"
 - Appraisals
 - Gemfile
 - LICENSE.txt
@@ -141,8 +204,12 @@ files:
 - bin/console
 - bin/setup
 - docker-compose.yml
+- gemfiles/.bundle/config
 - gemfiles/ar50.gemfile
 - gemfiles/ar51.gemfile
+- gemfiles/ar52.gemfile
+- gemfiles/ar60.gemfile
+- gemfiles/ar61.gemfile
 - lib/armg.rb
 - lib/armg/abstract_mysql_adapter_ext.rb
 - lib/armg/armg.rb
@@ -154,12 +221,11 @@ files:
 - lib/armg/wkb_serializer.rb
 - lib/armg/wkt_deserializer.rb
 - lib/armg/wkt_serializer.rb
-- test.rb
 homepage: https://github.com/winebarrel/armg
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -174,9 +240,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Add MySQL geometry type to Active Record.
 test_files: []

data/.travis.yml

@@ -1,30 +0,0 @@
-dist: trusty
-sudo: required
-group: edge
-services:
-  - docker
-language: ruby
-rvm:
-  - 2.2.7
-  - 2.3.4
-  - 2.4.1
-gemfile:
-  - gemfiles/ar50.gemfile
-  - gemfiles/ar51.gemfile
-before_install:
-  - gem install bundler
-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
-  - apt
-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

data/test.rb

@@ -1,11 +0,0 @@
-#!/usr/bin/env ruby
-require 'rgeo'
-a = "0101000000000000000000F03F000000000000F03F"
-
-factory = RGeo::Geographic.spherical_factory(:default_srid => 4326)
-parser = RGeo::WKRep::WKBParser.new(nil, support_ewkb: true, default_srid: 4326)
-point = parser.parse(a)
-p point.srid
-
-generator = RGeo::WKRep::WKTGenerator.new(tag_format: :ewkt) #, emit_ewkt_srid: true)
-p generator.generate(point)