armg 0.4.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '09e0e685a3ded9712b09523f1ab17e6b0b2cb0a7'
-  data.tar.gz: ef5f593a129fa7a6d50183fafd750bbe3ae8c838
+  metadata.gz: cd750e12ff779d85ab6c3e37f061e65fbee07e2f
+  data.tar.gz: b17f2516d892fb0029552f2577379ff2b8709772
 SHA512:
-  metadata.gz: 7d2cfa2b8b982726afa09b410f4f027d30c3bff84809c357e900f8f834802827e63285330821862c53787bd7ac9781aec2b87bee08a99bbdc7dd235f19c48e78
-  data.tar.gz: 918c8676a146dcfcd8d16446ff4d31850ecc971ab909efb5fac133eeff63f7c842a2ec635d7fab29bf2a0ebea9d87b01cdf627f9c4fca30ec1c7bbfdac9605ed
+  metadata.gz: 6a6072cb270a02f58750bd7a884a73f82eba207ca57a174e7a12a7c5555f2487fc0a12245268a19ee0031616d220fa0d467ca315ba597f3eb5976fe39cbf97ba
+  data.tar.gz: bba7d5b0166f2f6310045b87dca715386d200bab7365ecec5f75284b62b56cab39d706ca5c03af1fa457cd8bcbe84904e3fa3c4f3d32a7683f58f2321198cf26

data/.gitignore

@@ -10,3 +10,5 @@
 
 # rspec failure tracking
 .rspec_status
+
+/gemfiles/*.lock

data/.travis.yml

@@ -1,16 +1,30 @@
-sudo: false
-dist: precise
+dist: trusty
+sudo: required
+group: edge
+services:
+  - docker
 language: ruby
 rvm:
+  - 2.2.7
   - 2.3.4
-before_install: gem install bundler
+  - 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
-services:
-  - mysql
 env:
-  global:
-    - ARMG_TEST_MYSQL_PORT=3306
+  - 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/Appraisals

@@ -0,0 +1,7 @@
+appraise 'ar50' do
+  gem 'activerecord', '~> 5.0'
+end
+
+appraise 'ar51' do
+  gem 'activerecord', '~> 5.1'
+end

data/README.md

@@ -44,47 +44,71 @@ Geom.first
 #=> #<Geom id: 1, location: #<RGeo::Cartesian::PointImpl:0x... "POINT (-122.1 47.3)">>
 ```
 
-## Using custom WKB parser
+## Using WKT
 
 ```ruby
-class CustomParser
+Armg.deserializer = Armg::WktDeserializer.new
+Armg.serializer = Armg::WktSerializer.new
+
+Geom.create!(location: 'Point(-122.1 47.3)')
+
+Geom.first
+#=> #<Geom id: 1, location: "Point (-122.1 47.3)">
+```
+
+## Using custom deserializer
+
+```ruby
+class CustomDeserializer
   def initialize
     factory = RGeo::Geographic.spherical_factory(srid: 0)
-    @parser = RGeo::WKRep::WKBParser.new(factory, support_ewkb: true)
+    @wkb_parser = RGeo::WKRep::WKBParser.new(factory, support_ewkb: true)
   end
 
-  def parse(wkb)
+  def deserialize(wkb)
     wkb_without_srid = wkb.b.slice(4..-1)
-    @parser.parse(wkb_without_srid)
+    @wkb_parser.parse(wkb_without_srid)
   end
 end
 
-Armg.wkb_parser = CustomParser.new
+Armg.deserializer = CustomDeserializer.new
 
 Geom.take
 #=> #<Geom id: 1, location: #<RGeo::Geographic::SphericalPointImpl:0x... "POINT (-122.1 47.3)">>
 ```
 
-## Using custom WKB generator
+## Using custom WKB serializer
 
 ```ruby
-class CustomGenerator
+class CustomSerializer
   def initialize
     @wkt_parser = RGeo::WKRep::WKTParser.new(nil, support_ewkt: true)
-    @generator = RGeo::WKRep::WKBGenerator.new(type_format: :ewkb, little_endian: true)
+    @wkb_generator = RGeo::WKRep::WKBGenerator.new(type_format: :ewkb, little_endian: true)
   end
 
-  def generate(value)
+  def serialize(value)
     if value.is_a?(String)
       value = @wkt_parser.parse(value)
     end
 
     srid = "\x00\x00\x00\x00"
-    srid + @generator.generate(value)
+    srid + @wkb_generator.generate(value)
   end
 end
 
-Armg.wkb_generator = CustomGenerator.new
+Armg.serializer = CustomSerializer.new
 
 Geom.create!(id: 4, location: 'Point(-122.1 47.3)')
 ```
+
+## Running tests
+
+```sh
+docker-compose up -d
+bundle install
+bundle exec appraisal install
+bundle exec appraisal ar51 rake
+# bundle exec appraisal ar50 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
+```

data/armg.gemspec

@@ -28,4 +28,5 @@ Gem::Specification.new do |spec|
   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'
 end

data/docker-compose.yml

@@ -1,8 +1,14 @@
 version: '2'
 services:
-  mysql:
+  mysql56:
     ports:
-      - "6033:3306"
+      - "10056:3306"
     image: "mysql:5.6"
     environment:
       - MYSQL_ALLOW_EMPTY_PASSWORD=1
+  mysql57:
+    ports:
+      - "10057:3306"
+    image: "mysql:5.7"
+    environment:
+      - MYSQL_ALLOW_EMPTY_PASSWORD=1

data/gemfiles/ar50.gemfile

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

data/gemfiles/ar51.gemfile

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

data/lib/armg.rb

@@ -4,8 +4,10 @@ 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/wkb_serializer'
+  require 'armg/wkb_deserializer'
+  require 'armg/wkt_serializer'
+  require 'armg/wkt_deserializer'
   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 = Armg::MysqlGeometry::DEFAULT_WKB_PARSER
-  @wkb_generator = Armg::MysqlGeometry::DEFAULT_WKB_GENERATOR
+  @deserializer = Armg::WkbDeserializer.new
+  @serializer = Armg::WkbSerializer.new
 
   class << self
-    def wkb_parser
-      @wkb_parser
+    def deserializer
+      @deserializer
     end
 
-    def wkb_parser=(parser)
-      @wkb_parser = parser
+    def deserializer=(v)
+      @deserializer = v
     end
 
-    def wkb_generator
-      @wkb_generator
+    def serializer
+      @serializer
     end
 
-    def wkb_generator=(generator)
-      @wkb_generator = generator
+    def serializer=(v)
+      @serializer = v
     end
   end
 end

data/lib/armg/mysql_geometry.rb

@@ -1,14 +1,11 @@
 class Armg::MysqlGeometry < ActiveModel::Type::Value
-  DEFAULT_WKB_PARSER = Armg::WkbParser.new
-  DEFAULT_WKB_GENERATOR = Armg::WkbGenerator.new
-
   def type
     :geometry
   end
 
   def deserialize(value)
     if value.is_a?(::String)
-      Armg.wkb_parser.parse(value)
+      Armg.deserializer.deserialize(value)
     else
       value
     end
@@ -18,7 +15,7 @@ class Armg::MysqlGeometry < ActiveModel::Type::Value
     if value.nil?
       nil
     else
-      Armg.wkb_generator.generate(value)
+      Armg.serializer.serialize(value)
     end
   end
 end

data/lib/armg/version.rb

@@ -1,3 +1,3 @@
 module Armg
-  VERSION = '0.4.4'
+  VERSION = '0.5.0'
 end

data/lib/armg/{wkb_parser.rb → wkb_deserializer.rb}

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

data/lib/armg/wkb_serializer.rb

@@ -0,0 +1,16 @@
+class Armg::WkbSerializer
+  DEFAULT_OPTIONS = {
+    type_format: :ewkb,
+    little_endian: true,
+  }
+
+  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 + @wkb_generator.generate(obj)
+  end
+end

data/lib/armg/wkt_deserializer.rb

@@ -0,0 +1,17 @@
+class Armg::WktDeserializer < Armg::WkbDeserializer
+  DEFAULT_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)
+  end
+
+  def deserialize(wkb)
+    obj = super(wkb)
+    @generator.generate(obj)
+  end
+end

data/lib/armg/wkt_serializer.rb

@@ -0,0 +1,16 @@
+class Armg::WktSerializer < Armg::WkbSerializer
+  DEFAULT_OPTIONS = {
+    support_ewkt: true
+  }
+
+  def initialize(factory = nil, options = {})
+    super(options)
+    options = DEFAULT_OPTIONS.merge(options)
+    @wkt_parser = RGeo::WKRep::WKTParser.new(factory, options)
+  end
+
+  def serialize(wkt)
+    obj = @wkt_parser.parse(wkt)
+    super(obj)
+  end
+end

data/test.rb

@@ -0,0 +1,11 @@
+#!/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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: armg
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-12 00:00:00.000000000 Z
+date: 2017-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -108,6 +108,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
 description: Add MySQL geometry type to Active Record.
 email:
 - sugawara@cookpad.com
@@ -118,6 +132,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- Appraisals
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -126,14 +141,19 @@ files:
 - bin/console
 - bin/setup
 - docker-compose.yml
+- gemfiles/ar50.gemfile
+- gemfiles/ar51.gemfile
 - 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
-- lib/armg/wkb_generator.rb
-- lib/armg/wkb_parser.rb
+- lib/armg/wkb_deserializer.rb
+- 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

data/lib/armg/wkb_generator.rb

@@ -1,16 +0,0 @@
-class Armg::WkbGenerator
-  DEFAULT_OPTIONS = {
-    type_format: :ewkb,
-    little_endian: true,
-  }
-
-  def initialize(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