armg 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d48c9a51ac86f54f3c9f9b096ccb73f993107e8d
-  data.tar.gz: 9ba222019b873a0e67d5eafffed25af84693653a
+SHA256:
+  metadata.gz: 8c66526b53ea3a9ca16e83155baa7545a81f509b82a3db2980f9260225f10cde
+  data.tar.gz: 23161898a3807a84c83c37f3638e4bfa10dbf732acf8f6d9c132ce3bac6309ef
 SHA512:
-  metadata.gz: 4abc9cc841bce58e7c1a5fc82d9b326270695ddb1339996f63a442d9e24747775c941a26a1ad918a4a81195c59e1c7cd9331620238d95ecd71694a2045bd6b5c
-  data.tar.gz: fe5b8fa6001eb9559a8a10726d42d5a6ab18f383060728774b2ac0dd6e798518751130a7856e5a9093f397bdc9867149ce5b18f9b695d85fb62fb2c01f99c0ca
+  metadata.gz: ffb9e81eb9f5caac6668e86be3807d6371ce1b202b37292abdd91b531b3c19f01a0f477dd62cf78187ecdceb2c13e64a736559baccf94f6a4e0cf5884dec7bfa
+  data.tar.gz: 4821ba89863c87396a04a18e5c2703a0bc10b50ac5a752bf735f521426682519fd7011d6bba984eacdca98d6e15cae170659400e22007e46dd1ff281b9fc73dd

data/.gitignore

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

data/.rubocop.yml

@@ -0,0 +1,18 @@
+AllCops:
+  Exclude:
+    - gemfiles/**/*
+    - test.rb
+  TargetRubyVersion: 2.4
+Bundler/OrderedGems:
+  Include:
+    - "Appraisals"
+Layout/LineLength:
+  Enabled: false
+Metrics/BlockLength:
+  Enabled: false
+Naming/MethodParameterName:
+  Enabled: false
+Style/AccessModifierDeclarations:
+  Enabled: false
+Style/Documentation:
+  Enabled: false

data/.travis.yml

@@ -1,18 +1,17 @@
-dist: trusty
+dist: xenial
 sudo: required
 group: edge
 services:
   - docker
 language: ruby
 rvm:
-  - 2.2.7
-  - 2.3.4
-  - 2.4.1
+  - 2.4.9
+  - 2.5.7
+  - 2.6.5
 gemfile:
   - gemfiles/ar50.gemfile
   - gemfiles/ar51.gemfile
-before_install:
-  - gem install bundler
+  - gemfiles/ar52.gemfile
 before_script:
   - sudo service mysql stop
   - docker-compose up -d
@@ -21,7 +20,6 @@ before_script:
   - 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

data/Appraisals

@@ -1,7 +1,13 @@
+# 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

data/Gemfile

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

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'
 
@@ -23,10 +24,12 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'activerecord', '~> 5'
   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'
 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/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,16 @@
+# frozen_string_literal: true
+
 module Armg
   @deserializer = Armg::WkbDeserializer.new
   @serializer = Armg::WkbSerializer.new
 
   class << self
-    def deserializer
-      @deserializer
-    end
+    attr_reader :deserializer
 
-    def deserializer=(v)
-      @deserializer = v
-    end
+    attr_writer :deserializer
 
-    def serializer
-      @serializer
-    end
+    attr_reader :serializer
 
-    def serializer=(v)
-      @serializer = v
-    end
+    attr_writer :serializer
   end
 end

data/lib/armg/mysql_geometry.rb

@@ -1,21 +1,25 @@
-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 deserialize(value)
+      if value.is_a?(::String)
+        Armg.deserializer.deserialize(value)
+      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
+        Armg.serializer.serialize(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.1'
+  VERSION = '0.7.2'
 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,28 @@
-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,28 @@
-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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: armg
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-13 00:00:00.000000000 Z
+date: 2020-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -39,21 +39,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,19 +67,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: erbh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 0.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-match_fuzzy
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,19 +109,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-match_ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 0.1.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 0.1.3
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  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'
 description: Add MySQL geometry type to Active Record.
 email:
 - sugawara@cookpad.com
@@ -131,6 +159,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - Appraisals
 - Gemfile
@@ -141,8 +170,10 @@ files:
 - bin/console
 - bin/setup
 - docker-compose.yml
+- gemfiles/.bundle/config
 - gemfiles/ar50.gemfile
 - gemfiles/ar51.gemfile
+- gemfiles/ar52.gemfile
 - lib/armg.rb
 - lib/armg/abstract_mysql_adapter_ext.rb
 - lib/armg/armg.rb
@@ -154,7 +185,6 @@ 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
@@ -174,8 +204,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Add MySQL geometry type to Active Record.

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)