cartodb-rb-client 0.4.0 → 0.4.1

data/cartodb-rb-client.gemspec

@@ -27,8 +27,8 @@ Gem::Specification.new do |s|
   s.add_dependency 'mime-types',  '>= 1.16'
   s.add_dependency 'activesupport', '>= 3.0.0'
   s.add_dependency 'i18n', '>= 0.5.0', '<= 0.6.0'
-  s.add_dependency 'rgeo', '0.3.2'
-  s.add_dependency 'rgeo-geojson', '0.2.1'
+  s.add_dependency 'rgeo', '>= 0.3.2'
+  s.add_dependency 'rgeo-geojson', '>= 0.2.1'
   s.add_dependency 'pg', '0.11.0' if postgresql_installed?
   s.add_dependency 'json', '>= 1.5.3'
 end

data/lib/cartodb-rb-client/cartodb/model/geo.rb

@@ -15,17 +15,25 @@ module CartoDB
 
           geometry_name = geometry_column[:name].to_sym
 
-          self.send :define_method, :the_geom do
-            self.attributes[geometry_name]
-          end
-
-          self.send :define_method, :the_geom= do |the_geom|
-            self.attributes[geometry_name] = the_geom
-          end
-
           case geometry_column[:geometry_type].upcase
           when 'POINT'
+            self.send :define_method, :the_geom do
+              self.attributes[geometry_name]
+            end
+
+            self.send :define_method, :the_geom= do |the_geom|
+              self.attributes[geometry_name] = the_geom
+            end
+
             setup_point_geometry
+          when 'MULTIPOLYGON'
+            self.send :define_method, :the_geom do
+              self.attributes[geometry_name]
+            end
+
+            self.send :define_method, :the_geom= do |the_geom|
+              self.attributes[geometry_name] = convert_to_polygon(the_geom)
+            end
           end
         end
         private :setup_geometry_column
@@ -59,16 +67,35 @@ module CartoDB
 
       def prepare_geo_attributes(attributes)
         return if attributes.nil?
-        longitude = attributes.delete(:longitude)
-        latitude = attributes.delete(:latitude)
-        if latitude && longitude
-          attributes[:the_geom] = RGEO_FACTORY.point(longitude, latitude)
+
+        case self.class.geometry_type
+        when 'point'
+          longitude = attributes.delete(:longitude)
+          latitude = attributes.delete(:latitude)
+
+          attributes[:the_geom] = convert_to_point(latitude, longitude) if latitude && longitude
+        when /polygon/
+          attributes[:the_geom] = convert_to_polygon(attributes[:the_geom])
         end
 
         attributes
       end
       private :prepare_geo_attributes
 
+      def convert_to_point(latitude, longitude)
+        RGEO_FACTORY.point(longitude, latitude)
+      end
+
+      def convert_to_polygon(the_geom)
+        case the_geom
+        when String
+          RGeo::GeoJSON.decode(the_geom, :json_parser => :json, :geo_factory => RGeo::Geographic.spherical_factory(:srid => 4326))
+        when Hash
+          RGeo::GeoJSON.decode(::JSON.generate(the_geom), :json_parser => :json, :geo_factory => RGeo::Geographic.spherical_factory(:srid => 4326))
+        end
+      end
+      private :convert_to_polygon
+
     end
   end
 end

data/lib/cartodb-rb-client/cartodb/model/getters.rb

@@ -34,16 +34,15 @@ module CartoDB
           columns.reject{|c| %w(cartodb_id created_at updated_at).include?(c[:name])}.compact
         end
 
+        def geometry_type
+          @geometry_type
+        end
+
         def model_columns
           @model_columns || []
         end
         private :model_columns
 
-        def geometry_type
-          @geometry_type
-        end
-        private :geometry_type
-
       end
 
       def connection

data/lib/cartodb-rb-client/cartodb/model/schema.rb

@@ -90,19 +90,18 @@ module CartoDB
           @columns.each do |c|
             column_name = c[:name]
             column_type = c[:type]
-            setup_geometry_column(c) and next if column_name.eql?(GEOMETRY_COLUMN) || column_type.eql?('geometry')
 
-            # unless self.methods.include?(column_name)
+            if column_name.eql?(GEOMETRY_COLUMN) || column_type.eql?('geometry')
+              setup_geometry_column(c)
+            else
               self.send :define_method, column_name do
                 self.attributes[column_name.to_sym]
               end
-            # end
 
-            # unless self.methods.include?("#{column_name}=")
               self.send :define_method, "#{column_name}=" do |value|
                 self.attributes[column_name.to_sym] = value
               end
-            # end
+            end
           end
         end
         private :create_column_accessors

data/lib/cartodb-rb-client/cartodb/model/setters.rb

@@ -22,7 +22,6 @@ module CartoDB
         def geometry_type=(geometry_type)
           @geometry_type = geometry_type
         end
-        private :geometry_type=
       end
 
       def cartodb_table=(table)

data/lib/cartodb-rb-client/version.rb

@@ -1,7 +1,7 @@
 module Cartodb
   module Rb
     module Client
-      VERSION = "0.4.0"
+      VERSION = "0.4.1"
     end
   end
 end