armg 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a7b4fe373024d59b31f19785f7da0a032b80a36
-  data.tar.gz: a38c06cd0ea07f5c495522eb4b491140eb1658c3
+  metadata.gz: 84e6b3ee252fb5c11271a5ef0ae7ab318d4a509d
+  data.tar.gz: 2c2be3dad6a3db05718938e80b238debc0c13168
 SHA512:
-  metadata.gz: 55ed05dc88ffadd02115f21e5ab3214fd9c0edb81cabf2fcdf9a3e4da7b9ca9bc25ea3669d97d24b5b97029888e8221bf96634ce8ab9fb1e5988b6e7831d209a
-  data.tar.gz: 950052ac3c4af3ef611643a0114223cc8cfd1f4dbb6994d0794b0f1d933c32d86d23c086859fa967251edae3e2058a2b7392b5d7ea9303a4c8b272896414b5d7
+  metadata.gz: 4d9aa995ba5b6b5a228ab6f6eac7c2640a2e9db5a37de2e71e759c3b6104026277d18e688fbf451853a9258257be461470719e4be8049b5fcda7e3ee978d2b6c
+  data.tar.gz: 1f609a7196e10b8c29e71399988f45389443df8960084347cce53e3992b2920ced2b8051b034776c5391907091006272aade83b9f88efb5f966ed393172c66e2

data/lib/armg.rb

@@ -7,6 +7,7 @@ ActiveSupport.on_load(:active_record) do
   require 'armg/abstract_mysql_adapter_ext'
   require 'armg/mysql_geometry'
   require 'armg/table_definition_ext'
+  require 'armg/armg'
 
   ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter::NATIVE_DATABASE_TYPES[:geometry] = { name: "geometry" }
   ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter.prepend(Armg::AbstractMysqlAdapterExt)
@@ -14,4 +15,3 @@ ActiveSupport.on_load(:active_record) do
   ActiveRecord::ConnectionAdapters::MySQL::TableDefinition.prepend(Armg::TableDefinitionExt)
   ActiveRecord::ConnectionAdapters::MySQL::Table.prepend(Armg::TableDefinitionExt)
 end
-

data/lib/armg/armg.rb

@@ -0,0 +1,22 @@
+module Armg
+  @wkb_parser_factory = Armg::MysqlGeometry::DEFAULT_WKB_PARSER_FACTORY
+  @wkb_generator_factory = Armg::MysqlGeometry::DEFAULT_WKB_GENERATOR_FACTORY
+
+  class << self
+    def wkb_parser_factory
+      @wkb_parser_factory
+    end
+
+    def wkb_parser_factory=(factory)
+      @wkb_parser_factory = factory
+    end
+
+    def wkb_generator_factory
+      @wkb_generator_factory
+    end
+
+    def wkb_generator_factory=(factory)
+      @wkb_generator_factory = factory
+    end
+  end
+end

data/lib/armg/mysql_geometry.rb

@@ -1,15 +1,27 @@
 class Armg::MysqlGeometry < ActiveModel::Type::Value
   include ActiveModel::Type::Helpers::Mutable
 
+  DEFAULT_WKB_PARSER_FACTORY = proc do |wkb|
+    srid = wkb[0..3].unpack('L<').first
+    [ RGeo::WKRep::WKBParser.new(nil, support_ewkb: true, default_srid: srid),
+      wkb[4..-1],
+    ]
+  end
+
+  DEFAULT_WKB_GENERATOR_FACTORY = proc do |value|
+    [ RGeo::WKRep::WKBGenerator.new(type_format: :ewkb, little_endian: true),
+      [value.srid].pack('L<'),
+    ]
+  end
+
   def type
     :geometry
   end
 
   def deserialize(value)
     if value.is_a?(::String)
-      srid = value[0..3].unpack('L<').first
-      wkb_parser = RGeo::WKRep::WKBParser.new(nil, support_ewkb: true, default_srid: srid)
-      wkb_parser.parse(value[4..-1])
+      wkb_parser, value = Armg.wkb_parser_factory.call(value)
+      wkb_parser.parse(value)
     else
       value
     end
@@ -19,9 +31,9 @@ class Armg::MysqlGeometry < ActiveModel::Type::Value
     if value.nil?
       nil
     else
-      wkb_generator = RGeo::WKRep::WKBGenerator.new(type_format: :ewkb, little_endian: true)
+      wkb_generator, srid = Armg.wkb_generator_factory.call(value)
       wkb = wkb_generator.generate(value)
-      [value.srid].pack('L<') + wkb
+      srid + wkb
     end
   end
 end

data/lib/armg/version.rb

@@ -1,3 +1,3 @@
 module Armg
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: armg
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Genki Sugawara
@@ -128,6 +128,7 @@ files:
 - docker-compose.yml
 - lib/armg.rb
 - lib/armg/abstract_mysql_adapter_ext.rb
+- lib/armg/armg.rb
 - lib/armg/mysql_geometry.rb
 - lib/armg/table_definition_ext.rb
 - lib/armg/version.rb
@@ -151,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Add MySQL geometry type to Active Record.