armg 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6357d13d722e80d5014732474b708d62318d3b4e
-  data.tar.gz: 5e64ccc1ddd43b489f690f9bdb0c693c87d6c8f5
+  metadata.gz: 96bf61ee4daaa6960675b6f6101419636ecc4a7f
+  data.tar.gz: 6e2c5da9a1c844b0ac43ab44ab3d7b460f904adc
 SHA512:
-  metadata.gz: 4ed2047d3fa13d2cc42d51a2d21e348472655948dc26de93588fd1be453e53864634a995adc18e8a7ccd0463b0d29c2feaa0cd2b9a457b5aceaa6dd5782b9b9b
-  data.tar.gz: ee25f6bd443c089cfff31ea63d11ac2cb8bfefaba890ce7ec1da9d55c60f88b8ea0c294feee70a6ba21538800c31045f72f6625b7329429e6502f0f8cf46a6b6
+  metadata.gz: 2900aa7568ee144478e6ae4c4da3323693b6bb9a764676ed1a5f32580b8908ae12cb81e642cb695e2d9360a8698266b38b569671a56b6f82e4a86f5c26388270
+  data.tar.gz: 268ea2385fd6e0c6ccfa634c64889812c9d708a402eac724ea26dacfffecd02e7b9d6b5d6b97e704fa0a8b670eae98ae9b2f17c4718fe5d789242d990897f354

data/README.md

@@ -77,7 +77,7 @@ Geom.take
 #=> #<Geom id: 1, location: #<RGeo::Geographic::SphericalPointImpl:0x... "POINT (-122.1 47.3)">>
 ```
 
-## Using custom WKB serializer
+## Using custom serializer
 
 ```ruby
 class CustomSerializer
@@ -112,3 +112,8 @@ bundle exec appraisal ar51 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
 ```
+
+## Related links
+
+* [rgeo/rgeo: Geospatial data library for Ruby](https://github.com/rgeo/rgeo)
+* [MySQL :: MySQL 5.7 Reference Manual :: 11.5.3 Supported Spatial Data Formats](https://dev.mysql.com/doc/refman/5.7/en/gis-data-formats.html)

data/lib/armg.rb

@@ -4,6 +4,7 @@ require 'armg/version'
 
 ActiveSupport.on_load(:active_record) do
   require 'active_record/connection_adapters/abstract_mysql_adapter'
+  require 'armg/utils'
   require 'armg/wkb_serializer'
   require 'armg/wkb_deserializer'
   require 'armg/wkt_serializer'
@@ -13,7 +14,7 @@ ActiveSupport.on_load(:active_record) do
   require 'armg/table_definition_ext'
   require 'armg/armg'
 
-  ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter::NATIVE_DATABASE_TYPES[:geometry] = { name: "geometry" }
+  ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter::NATIVE_DATABASE_TYPES[:geometry] = { name: 'geometry' }
   ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter.prepend(Armg::AbstractMysqlAdapterExt)
   ActiveRecord::Type.register(:geometry, Armg::MysqlGeometry, adapter: :mysql2)
   ActiveRecord::ConnectionAdapters::MySQL::TableDefinition.prepend(Armg::TableDefinitionExt)

data/lib/armg/utils.rb

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

data/lib/armg/version.rb

@@ -1,3 +1,3 @@
 module Armg
-  VERSION = '0.5.2'
+  VERSION = '0.6.0'
 end

data/lib/armg/wkb_deserializer.rb

@@ -3,16 +3,13 @@ class Armg::WkbDeserializer
     support_ewkb: true,
   }
 
-  def initialize(factory = nil, options = {})
+  def initialize(factory: nil, **options)
     options = DEFAULT_OPTIONS.merge(options)
     @wkb_parser = RGeo::WKRep::WKBParser.new(factory, options)
   end
 
-  def deserialize(wkb)
-    wkb = wkb.b
-    srid = wkb.slice!(0..3)
-    wkb[4] = "\x20"
-    wkb.insert(5, srid)
+  def deserialize(mysql_geometry)
+    wkb = Armg::Utils.mysql_geometry_to_wkb(mysql_geometry)
     @wkb_parser.parse(wkb)
   end
 end

data/lib/armg/wkb_serializer.rb

@@ -4,13 +4,13 @@ class Armg::WkbSerializer
     little_endian: true,
   }
 
-  def initialize(options = {})
+  def initialize(**options)
     options = DEFAULT_OPTIONS.merge(options)
     @wkb_generator = RGeo::WKRep::WKBGenerator.new(options)
   end
 
   def serialize(obj)
-    srid = [obj.srid].pack('L<')
+    srid = Armg::Utils.pack_srid(obj.srid)
     srid + @wkb_generator.generate(obj)
   end
 end

data/lib/armg/wkt_deserializer.rb

@@ -1,17 +1,23 @@
-class Armg::WktDeserializer < Armg::WkbDeserializer
-  DEFAULT_OPTIONS = {
+class Armg::WktDeserializer
+  DEFAULT_WKB_PARSER_OPTIONS = {
+    support_ewkb: true,
+  }
+
+  DEFAULT_WKT_GENERATOR_OPTIONS = {
     tag_format: :ewkt,
     #emit_ewkt_srid: true,
   }
 
-  def initialize(factory = nil, options = {})
-    super(factory, options)
-    options = DEFAULT_OPTIONS.merge(options)
-    @generator = RGeo::WKRep::WKTGenerator.new(options)
+  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(wkb)
-    obj = super(wkb)
-    @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

data/lib/armg/wkt_serializer.rb

@@ -1,16 +1,23 @@
-class Armg::WktSerializer < Armg::WkbSerializer
-  DEFAULT_OPTIONS = {
+class Armg::WktSerializer
+  DEFAULT_WKB_GENERATOR_OPTIONS = {
+    type_format: :ewkb,
+    little_endian: true,
+  }
+
+  DEFAULT_WKT_PARSER_OPTIONS = {
     support_ewkt: true
   }
 
-  def initialize(factory = nil, options = {})
-    super(options)
-    options = DEFAULT_OPTIONS.merge(options)
-    @wkt_parser = RGeo::WKRep::WKTParser.new(factory, options)
+  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)
-    super(obj)
+    srid = Armg::Utils.pack_srid(obj.srid)
+    srid + @wkb_generator.generate(obj)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: armg
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - Genki Sugawara
@@ -148,6 +148,7 @@ files:
 - lib/armg/armg.rb
 - lib/armg/mysql_geometry.rb
 - lib/armg/table_definition_ext.rb
+- lib/armg/utils.rb
 - lib/armg/version.rb
 - lib/armg/wkb_deserializer.rb
 - lib/armg/wkb_serializer.rb