armg 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64bfa6ec3175a3630c3c0cfb70778be10301c253
-  data.tar.gz: c75657dceb039cabf0561a8d52eed721060554a5
+  metadata.gz: 1a7b4fe373024d59b31f19785f7da0a032b80a36
+  data.tar.gz: a38c06cd0ea07f5c495522eb4b491140eb1658c3
 SHA512:
-  metadata.gz: 952ba9df602ca83e6407120f07cade09b606ed609b7007f0953ae5598b0b0b2df62f34a0b97c573c357cf64290769965ceef785270144274585fe3b935f33744
-  data.tar.gz: e44a5c5eb8d005f8eae767da1ad149ab99dac4197154de6cd09439af253d3b5b5b83bb6921c1b9e0d501cfd068a66c1d365e5e8819267be08545e9f989e16e82
+  metadata.gz: 55ed05dc88ffadd02115f21e5ab3214fd9c0edb81cabf2fcdf9a3e4da7b9ca9bc25ea3669d97d24b5b97029888e8221bf96634ce8ab9fb1e5988b6e7831d209a
+  data.tar.gz: 950052ac3c4af3ef611643a0114223cc8cfd1f4dbb6994d0794b0f1d933c32d86d23c086859fa967251edae3e2058a2b7392b5d7ea9303a4c8b272896414b5d7

data/.rspec

@@ -1,2 +1,2 @@
---format documentation
 --color
+--require spec_helper

data/.travis.yml

@@ -1,5 +1,16 @@
 sudo: false
+dist: precise
 language: ruby
 rvm:
-  - 2.3.3
-before_install: gem install bundler -v 1.14.3
+  - 2.3.4
+before_install: gem install bundler
+cache:
+  - bundler
+  - apt
+services:
+  - mysql
+env:
+  global:
+    - ARMG_TEST_MYSQL_PORT=3306
+script:
+  - bundle exec rake

data/README.md

@@ -2,6 +2,8 @@
 
 Add MySQL geometry type to Active Record.
 
+[![Build Status](https://travis-ci.org/winebarrel/armg.svg?branch=master)](https://travis-ci.org/winebarrel/armg)
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -24,26 +26,19 @@ Or install it yourself as:
 require 'active_record'
 require 'armg'
 
-ActiveRecord::Base.establish_connection(adapter: 'mysql2', database: 'my_app');
+ActiveRecord::Base.establish_connection(adapter: 'mysql2', database: 'my_db');
 
-ActiveRecord::Migration.create_table :geoms do |t|
-  t.geometry 'location'
+ActiveRecord::Migration.create_table :geoms, options: 'ENGINE=MyISAM' do |t|
+  t.geometry 'location', null: false
+  t.index ['location'], name: 'idx_location', type: :spatial
 end
 
 class Geom < ActiveRecord::Base; end
 
-Geom.create!(geometry: [1, 1.0, 1.0])
-#=> #<Geom id: 15 geometry: [1, 1.0, 1.0]>
-
-# 1: Point
-# 2: LineString
-# 3: Polygon
-# 4: MultiPoint
-# 5: MultiLineString
-# 6: MultiPolygon
-# 7:GeometryCollection.
-# see https://dev.mysql.com/doc/refman/5.6/en/gis-data-formats.html
+wkt_parser = RGeo::WKRep::WKTParser.new(nil, support_ewkt: true)
+point = wkt_parser.parse('SRID=4326;Point(-122.1 47.3)')
+Geom.create!(location: point)
 
 Geom.first
-#=> #<Geom id: 1, geometry: [1, 1.0, 1.0]>
+#=> #<Geom id: 1, location: #<RGeo::Cartesian::PointImpl:0x... "POINT (-122.1 47.3)">>
 ```

data/armg.gemspec

@@ -22,7 +22,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'activerecord', '~> 5'
+  spec.add_dependency 'rgeo'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'mysql2'
+  spec.add_development_dependency 'rspec-match_fuzzy'
 end

data/docker-compose.yml

@@ -0,0 +1,8 @@
+version: '2'
+services:
+  mysql:
+    ports:
+      - "6033:3306"
+    image: "mysql:5.6"
+    environment:
+      - MYSQL_ALLOW_EMPTY_PASSWORD=1

data/lib/armg.rb

@@ -1,4 +1,5 @@
 require 'active_support/lazy_load_hooks'
+require 'rgeo'
 require 'armg/version'
 
 ActiveSupport.on_load(:active_record) do
@@ -11,5 +12,6 @@ ActiveSupport.on_load(:active_record) do
   ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter.prepend(Armg::AbstractMysqlAdapterExt)
   ActiveRecord::Type.register(:geometry, Armg::MysqlGeometry, adapter: :mysql2)
   ActiveRecord::ConnectionAdapters::MySQL::TableDefinition.prepend(Armg::TableDefinitionExt)
+  ActiveRecord::ConnectionAdapters::MySQL::Table.prepend(Armg::TableDefinitionExt)
 end
 

data/lib/armg/abstract_mysql_adapter_ext.rb

@@ -3,4 +3,12 @@ module Armg::AbstractMysqlAdapterExt
     super
     m.register_type %r(^geometry)i,  Armg::MysqlGeometry.new
   end
+
+  def indexes(*args, &block)
+    super.tap do |is|
+      is.each do |i|
+        i.lengths = nil if i.type = :spatial
+      end
+    end
+  end
 end

data/lib/armg/mysql_geometry.rb

@@ -7,9 +7,9 @@ class Armg::MysqlGeometry < ActiveModel::Type::Value
 
   def deserialize(value)
     if value.is_a?(::String)
-      # https://dev.mysql.com/doc/refman/5.6/en/gis-data-formats.html
-      value.slice!(0, 5)
-      value.unpack("L<E2")
+      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])
     else
       value
     end
@@ -19,7 +19,9 @@ class Armg::MysqlGeometry < ActiveModel::Type::Value
     if value.nil?
       nil
     else
-      "\x00\x00\x00\x00\x01" + value.pack("L<E2")
+      wkb_generator = RGeo::WKRep::WKBGenerator.new(type_format: :ewkb, little_endian: true)
+      wkb = wkb_generator.generate(value)
+      [value.srid].pack('L<') + wkb
     end
   end
 end

data/lib/armg/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: armg
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-10 00:00:00.000000000 Z
+date: 2017-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5'
+- !ruby/object:Gem::Dependency
+  name: rgeo
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +80,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  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'
+- !ruby/object:Gem::Dependency
+  name: rspec-match_fuzzy
+  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
@@ -83,6 +125,7 @@ files:
 - armg.gemspec
 - bin/console
 - bin/setup
+- docker-compose.yml
 - lib/armg.rb
 - lib/armg/abstract_mysql_adapter_ext.rb
 - lib/armg/mysql_geometry.rb
@@ -108,7 +151,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.