activerecord-mysql2rgeo-adapter 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebf8862e5aa9cc0a6ad9358eb11ef336c6d6121d
-  data.tar.gz: b0d45b2ce970040c8f7a4c86bf62a74f9e7867b8
+  metadata.gz: 9db157d9de22cd8f9f841f41e80d91c3721cf656
+  data.tar.gz: 28e27dff6926e8ee812dccbc0446ae704b289abb
 SHA512:
-  metadata.gz: f2008b6ddec86dd4bdf2677d692a34fed1c34036892cdb049692b394cced198abbf053e51d9e5a9befa2a73580e8f926e61d96192508c9e925e75a44ef57f5b5
-  data.tar.gz: 7f9479cded7e02999a7d52a3719e8b0280f674b7da7dd6b561d507fddf0841f2bfa612d9af2830e6e9c521b64c2064aadeff023f00424f2d334170440a3aeafd
+  metadata.gz: fd946b2d8f998030b2e0478b6df556509e7a727f93fd3086d3151d3eb2ddfdd64ba558fe6852e210029aa8ed0a409821280b86d602383e549951a5e5f5e16522
+  data.tar.gz: '09a2ad7169d0051e7a749781a2c1f43846396f5dfcd66cc46b86b4cffcbeea8fb1687db71d34b818748d79b53145a79b1a1fe334253303685244e518a8ee6368'

data/lib/active_record/connection_adapters/mysql2rgeo/arel_tosql.rb

@@ -24,30 +24,6 @@ module Arel  # :nodoc:
         FUNC_MAP[standard_name.downcase] || standard_name
       end
 
-      def visit_Arel_Nodes_SelectCore(o, collector)
-        len = o.projections.length - 1
-        if len == 0
-          if !o.projections.first.nil? && o.projections.first.respond_to?(:relation)
-            projections = []
-            @connection.columns(o.projections.first.relation.name).each do |x|
-              projections << o.projections.first.relation[x.name.to_sym]
-            end
-            o.projections = projections
-          end
-        end
-        super
-      end
-
-      def visit_Arel_Attributes_Attribute(o, collector)
-        join_name = o.relation.table_alias || o.relation.name
-
-        collector << if (!column_for(o).nil? && column_for(o).type == :geometry) && !collector.value.include?(" WHERE ")
-                       "ST_AsText(#{quote_table_name join_name}.#{quote_column_name o.name}) as #{quote_column_name o.name}"
-                     else
-                       "#{quote_table_name join_name}.#{quote_column_name o.name}"
-                     end
-      end
-
       def visit_String(node, collector)
         collector << "#{st_func('ST_WKTToSQL')}(#{quote(node)})"
       end

data/lib/active_record/connection_adapters/mysql2rgeo/version.rb

@@ -1,7 +1,7 @@
 module ActiveRecord
   module ConnectionAdapters
     module Mysql2Rgeo
-      VERSION = "1.0.2".freeze
+      VERSION = "1.0.3".freeze
     end
   end
 end

data/lib/active_record/type/spatial.rb

@@ -59,50 +59,46 @@ module ActiveRecord
 
       def spatial_factory
         @spatial_factory ||=
-          RGeo::ActiveRecord::SpatialFactoryStore.instance.factory(
-            geo_type: @geo_type,
-            sql_type: @sql_type,
-            srid: @srid
-          )
+            RGeo::ActiveRecord::SpatialFactoryStore.instance.factory(
+                geo_type: @geo_type,
+                sql_type: @sql_type,
+                srid: @srid
+            )
       end
 
       # support setting an RGeo object or a WKT string
       def serialize(value)
         return if value.nil?
         geo_value = cast_value(value)
-        geo_value
-        # TODO: - only valid types should be allowed
+
+        # TODO - only valid types should be allowed
         # e.g. linestring is not valid for point column
-        # raise "maybe should raise" unless RGeo::Feature::Geometry.check_type(geo_value)
-        # RGeo::WKRep::WKBGenerator.new(hex_format: true, type_format: :ewkb, emit_ewkb_srid: true).generate(geo_value)
+        raise "maybe should raise" unless RGeo::Feature::Geometry.check_type(geo_value)
+        geo_value
       end
 
       private
 
-      # Convenience method for types which do not need separate type casting
-      # behavior for user and database inputs. Called by Value#cast for
-      # values except +nil+.
-      def cast_value(value) # :doc:
+      def cast_value(value)
         return if value.nil?
-        value.class === "String" ? parse_wkt(value) : parse_wkt(value.to_s)
-      end
-
-      # convert WKT string into RGeo object
-      def parse_wkt(string)
-        wkt_parser(string).parse(string)
-      rescue RGeo::Error::ParseError
-        nil
-      end
-
-      def binary_string?(string)
-        string[0] == "\x00" || string[0] == "\x01" || string[0, 4] =~ /[0-9a-fA-F]{4}/
-      end
-
-      def wkt_parser(string)
-        if binary_string?(string)
-          RGeo::WKRep::WKBParser.new(spatial_factory, support_ewkb: true, default_srid: @srid)
-        else
-          RGeo::WKRep::WKTParser.new(spatial_factory, support_ewkt: true, default_srid: @srid)
+        case value
+          when ::RGeo::Feature::Geometry
+            value
+            # RGeo::Feature.cast(value, spatial_factory) rescue nil
+          when ::String
+            marker = value[4, 1]
+            if marker == "\x00" || marker == "\x01"
+              srid = value[0, 4].unpack(marker == "\x01" ? 'V' : 'N').first
+              RGeo::WKRep::WKBParser.new(spatial_factory, support_ewkb: true, default_srid: srid).parse(value[4..-1]) rescue nil
+            elsif value[0, 10] =~ /[0-9a-fA-F]{8}0[01]/
+              srid = value[0, 8].to_i(16)
+              srid = [srid].pack('V').unpack('N').first if value[9, 1] == '1'
+              RGeo::WKRep::WKBParser.new(spatial_factory, support_ewkb: true, default_srid: srid).parse(value[8..-1]) rescue nil
+            else
+              RGeo::WKRep::WKTParser.new(spatial_factory, support_ewkt: true, default_srid: @srid).parse(value) rescue nil
+            end
+          else
+            nil
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-mysql2rgeo-adapter
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Yongdae Hwang