armg 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84e6b3ee252fb5c11271a5ef0ae7ab318d4a509d
-  data.tar.gz: 2c2be3dad6a3db05718938e80b238debc0c13168
+  metadata.gz: 469ae0fd83f0f67d9e31b66f79c25f2a8649ab6a
+  data.tar.gz: fe09fd8a362b915e18be5462b76f17c4b74deab3
 SHA512:
-  metadata.gz: 4d9aa995ba5b6b5a228ab6f6eac7c2640a2e9db5a37de2e71e759c3b6104026277d18e688fbf451853a9258257be461470719e4be8049b5fcda7e3ee978d2b6c
-  data.tar.gz: 1f609a7196e10b8c29e71399988f45389443df8960084347cce53e3992b2920ced2b8051b034776c5391907091006272aade83b9f88efb5f966ed393172c66e2
+  metadata.gz: eb3abcf2d2a06ffff03a1a94fee61efc2f2acee1e2fb2c4aebf2bf12811447920bf20e5b25472b212258c482708de2de246f4e943f01c28af816e8fb3c7fb6f1
+  data.tar.gz: 2c23cea430e9e830a64ac1cb66b15421ba15e4e44a595af089ff3ff8a4f32e5c2e40fb8da1e64ddb38e5826bd747419539ef2540a015a3f48b9576be80628770

data/README.md

@@ -2,6 +2,7 @@
 
 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)
 
 ## Installation
@@ -26,7 +27,7 @@ Or install it yourself as:
 require 'active_record'
 require 'armg'
 
-ActiveRecord::Base.establish_connection(adapter: 'mysql2', database: 'my_db');
+ActiveRecord::Base.establish_connection(adapter: 'mysql2', database: 'my_db')
 
 ActiveRecord::Migration.create_table :geoms, options: 'ENGINE=MyISAM' do |t|
   t.geometry 'location', null: false
@@ -42,3 +43,48 @@ Geom.create!(location: point)
 Geom.first
 #=> #<Geom id: 1, location: #<RGeo::Cartesian::PointImpl:0x... "POINT (-122.1 47.3)">>
 ```
+
+## Using custom WKB parser
+
+```ruby
+class CustomParser
+  def initialize
+    factory = RGeo::Geographic.spherical_factory(srid: 0)
+    @parser = RGeo::WKRep::WKBParser.new(factory, support_ewkb: true)
+  end
+
+  def parse(wkb)
+    wkb_without_srid = wkb.bytes[4..-1].pack('c*')
+    @parser.parse(wkb_without_srid)
+  end
+end
+
+Armg.wkb_parser = CustomParser.new
+
+Geom.take
+#=> #<Geom id: 1, location: #<RGeo::Geographic::SphericalPointImpl:0x... "POINT (-122.1 47.3)">>
+```
+
+## Using custom WKB generator
+
+```ruby
+class CustomGenerator
+  def initialize
+    @wkt_parser = RGeo::WKRep::WKTParser.new(nil, support_ewkt: true)
+    @generator = RGeo::WKRep::WKBGenerator.new(type_format: :ewkb, little_endian: true)
+  end
+
+  def generate(value)
+    if value.is_a?(String)
+      value = @wkt_parser.parse(value)
+    end
+
+    srid = "\x00\x00\x00\x00"
+    srid + @generator.generate(value)
+  end
+end
+
+Armg.wkb_generator = CustomGenerator.new
+
+Geom.create!(id: 4, location: 'Point(-122.1 47.3)')
+```

data/lib/armg.rb

@@ -4,6 +4,8 @@ require 'armg/version'
 
 ActiveSupport.on_load(:active_record) do
   require 'active_record/connection_adapters/abstract_mysql_adapter'
+  require 'armg/wkb_generator'
+  require 'armg/wkb_parser'
   require 'armg/abstract_mysql_adapter_ext'
   require 'armg/mysql_geometry'
   require 'armg/table_definition_ext'

data/lib/armg/armg.rb

@@ -1,22 +1,22 @@
 module Armg
-  @wkb_parser_factory = Armg::MysqlGeometry::DEFAULT_WKB_PARSER_FACTORY
-  @wkb_generator_factory = Armg::MysqlGeometry::DEFAULT_WKB_GENERATOR_FACTORY
+  @wkb_parser = Armg::MysqlGeometry::DEFAULT_WKB_PARSER
+  @wkb_generator = Armg::MysqlGeometry::DEFAULT_WKB_GENERATOR
 
   class << self
-    def wkb_parser_factory
-      @wkb_parser_factory
+    def wkb_parser
+      @wkb_parser
     end
 
-    def wkb_parser_factory=(factory)
-      @wkb_parser_factory = factory
+    def wkb_parser=(parser)
+      @wkb_parser = parser
     end
 
-    def wkb_generator_factory
-      @wkb_generator_factory
+    def wkb_generator
+      @wkb_generator
     end
 
-    def wkb_generator_factory=(factory)
-      @wkb_generator_factory = factory
+    def wkb_generator=(generator)
+      @wkb_generator = generator
     end
   end
 end

data/lib/armg/mysql_geometry.rb

@@ -1,18 +1,8 @@
 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
+  DEFAULT_WKB_PARSER = Armg::WkbParser.new
+  DEFAULT_WKB_GENERATOR = Armg::WkbGenerator.new
 
   def type
     :geometry
@@ -20,8 +10,7 @@ class Armg::MysqlGeometry < ActiveModel::Type::Value
 
   def deserialize(value)
     if value.is_a?(::String)
-      wkb_parser, value = Armg.wkb_parser_factory.call(value)
-      wkb_parser.parse(value)
+      Armg.wkb_parser.parse(value)
     else
       value
     end
@@ -31,9 +20,7 @@ class Armg::MysqlGeometry < ActiveModel::Type::Value
     if value.nil?
       nil
     else
-      wkb_generator, srid = Armg.wkb_generator_factory.call(value)
-      wkb = wkb_generator.generate(value)
-      srid + wkb
+      Armg.wkb_generator.generate(value)
     end
   end
 end

data/lib/armg/version.rb

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

data/lib/armg/wkb_generator.rb

@@ -0,0 +1,16 @@
+class Armg::WkbGenerator
+  DEFAULT_OPTIONS = {
+    type_format: :ewkb,
+    little_endian: true,
+  }
+
+  def initialize(factory = nil, options = {})
+    options = DEFAULT_OPTIONS.merge(options)
+    @generator = RGeo::WKRep::WKBGenerator.new(options)
+  end
+
+  def generate(deserialized_value)
+    srid = [deserialized_value.srid].pack('L<')
+    srid + @generator.generate(deserialized_value)
+  end
+end

data/lib/armg/wkb_parser.rb

@@ -0,0 +1,18 @@
+class Armg::WkbParser
+  DEFAULT_OPTIONS = {
+    support_ewkb: true,
+  }
+
+  def initialize(factory = nil, options = {})
+    options = DEFAULT_OPTIONS.merge(options)
+    @parser = RGeo::WKRep::WKBParser.new(factory, options)
+  end
+
+  def parse(wkb)
+    wkb = wkb.bytes
+    srid = wkb.slice!(0..3)
+    wkb[4] = 0x20
+    wkb.insert(5, *srid)
+    @parser.parse(wkb.pack('c*'))
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: armg
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-11 00:00:00.000000000 Z
+date: 2017-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -132,6 +132,8 @@ files:
 - lib/armg/mysql_geometry.rb
 - lib/armg/table_definition_ext.rb
 - lib/armg/version.rb
+- lib/armg/wkb_generator.rb
+- lib/armg/wkb_parser.rb
 homepage: https://github.com/winebarrel/armg
 licenses:
 - MIT
@@ -152,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Add MySQL geometry type to Active Record.