postgis_adapter 0.2.3 → 0.3.0

data/Manifest.txt

@@ -7,6 +7,7 @@ init.rb
 install.rb
 lib/postgis_adapter.rb
 lib/postgis_adapter/acts_as_geom.rb
+lib/postgis_adapter/acts_as_geom_flymake.rb
 lib/postgis_adapter/common_spatial_adapter.rb
 lib/postgis_functions.rb
 lib/postgis_functions/bbox.rb

data/lib/postgis_adapter.rb

@@ -18,7 +18,7 @@ include GeoRuby::SimpleFeatures
 include SpatialAdapter
 
 module PostgisAdapter
-  VERSION = '0.2.3'
+  VERSION = '0.3.0'
 end
 
 #tables to ignore in migration : relative to PostGIS management of geometric columns
@@ -38,18 +38,23 @@ ActiveRecord::Base.class_eval do
     def self.get_conditions(attrs)
       attrs.map do |attr, value|
         attr = attr.to_s
+        column_name = connection.quote_column_name(attr)
         if columns_hash[attr].is_a?(SpatialColumn)
           if value.is_a?(Array)
             attrs[attr.to_sym]= "BOX3D(" + value[0].join(" ") + "," + value[1].join(" ") + ")"
-            "#{table_name}.#{connection.quote_column_name(attr)} && SetSRID(?::box3d, #{value[2] || DEFAULT_SRID} ) "
+            "#{table_name}.#{column_name} && SetSRID(?::box3d, #{value[2] || DEFAULT_SRID} ) "
           elsif value.is_a?(Envelope)
             attrs[attr.to_sym]= "BOX3D(" + value.lower_corner.text_representation + "," + value.upper_corner.text_representation + ")"
-            "#{table_name}.#{connection.quote_column_name(attr)} && SetSRID(?::box3d, #{value.srid} ) "
+            "#{table_name}.#{column_name} && SetSRID(?::box3d, #{value.srid} ) "
           else
-            "#{table_name}.#{connection.quote_column_name(attr)} && ? "
+            "#{table_name}.#{column_name} && ? "
           end
         else
-          "#{table_name}.#{connection.quote_column_name(attr)} #{attribute_condition(value)}"
+          begin
+            "#{table_name}.#{attribute_condition(column_name, value)}"
+          rescue ArgumentError
+            "#{table_name}.#{column_name} #{attribute_condition(value)}"
+          end
         end
       end.join(' AND ')
     end

data/lib/postgis_adapter/acts_as_geom_flymake.rb

@@ -0,0 +1,69 @@
+# #
+# PostGIS Adapter
+#
+#
+# http://github.com/nofxx/postgis_adapter
+#
+module PostgisFunctions
+  def self.included(base)
+    base.send :extend, ClassMethods
+  end
+
+  module ClassMethods
+    #
+    # class City
+    #   has_geom :point, :bounds
+    # end
+    #
+    # @city.bounds.area            #=>  12.456
+    # @city.point.distance_to(@p)  #=>  "1000"
+    # @product.tax_currency     #=>  "USD"
+    #
+    # Opts:
+    # :cents => "pennys"        #=>  @product.pennys
+    # :currency => "currency"   #=>  @product.currency
+    # :allow_nil => true
+    # :with_currency => true
+    #
+    def has_geom(*attributes)
+      config = {:with_currency => true, :converter => lambda { |m| m.to_money },
+                :allow_nil => false }.update(attributes.extract_options!)
+
+      attributes.each do |attr|
+        mapping = [[config[:cents] || "#{attr}_cents", 'cents']]
+        mapping << [config[:currency] || "#{attr}_currency", 'currency'] if config[:with_currency]
+
+        composed_of attr, :class_name => 'Money',:allow_nil => config[:allow_nil],
+           :mapping => mapping, :converter => config[:converter]
+      end
+
+    end
+    
+    # acts_as_geom :geom
+    def acts_as_geom(*columns)
+      cattr_accessor :postgis_geoms
+      geoms = columns.map do |g|
+        geom_type = get_geom_type(g)
+        case geom_type
+        when :point
+          send :include, PointFunctions
+        when :polygon
+          send :include, PolygonFunctions
+        when :line_string
+          send :include, LineStringFunctions
+        end
+        g
+      end
+      self.postgis_geoms = {:columns => geoms}#, :opts => options}
+    end
+
+    def get_geom_type(column)
+      self.columns.select { |c| c.name == column.to_s}.first.geometry_type
+    rescue ActiveRecord::StatementInvalid => e
+      nil
+    end
+  end
+end
+
+ActiveRecord::Base.send :include, PostgisFunctions
+

data/postgis_adapter.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{postgis_adapter}
-  s.version = "0.2.3"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marcos Piccinini"]
-  s.date = %q{2009-02-16}
+  s.date = %q{2009-03-09}
   s.description = %q{Postgis Adapter for Activer Record}
   s.email = ["x@nofxx.com"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.rdoc"]
-  s.files = ["History.txt", "MIT-LICENSE", "Manifest.txt", "README.rdoc", "Rakefile", "init.rb", "install.rb", "lib/postgis_adapter.rb", "lib/postgis_adapter/acts_as_geom.rb", "lib/postgis_adapter/common_spatial_adapter.rb", "lib/postgis_functions.rb", "lib/postgis_functions/bbox.rb", "lib/postgis_functions/class.rb", "lib/postgis_functions/common.rb", "postgis_adapter.gemspec", "rails/init.rb", "script/console", "script/destroy", "script/generate", "spec/db/database_postgis.yml", "spec/db/models_postgis.rb", "spec/db/schema_postgis.rb", "spec/postgis_adapter/acts_as_geom_spec.rb", "spec/postgis_adapter/common_spatial_adapter_spec.rb", "spec/postgis_adapter_spec.rb", "spec/postgis_functions/bbox_spec.rb", "spec/postgis_functions/class_spec.rb", "spec/postgis_functions/common_spec.rb", "spec/postgis_functions_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "uninstall.rb"]
+  s.files = ["History.txt", "MIT-LICENSE", "Manifest.txt", "README.rdoc", "Rakefile", "init.rb", "install.rb", "lib/postgis_adapter.rb", "lib/postgis_adapter/acts_as_geom.rb", "lib/postgis_adapter/acts_as_geom_flymake.rb", "lib/postgis_adapter/common_spatial_adapter.rb", "lib/postgis_functions.rb", "lib/postgis_functions/bbox.rb", "lib/postgis_functions/class.rb", "lib/postgis_functions/common.rb", "postgis_adapter.gemspec", "rails/init.rb", "script/console", "script/destroy", "script/generate", "spec/db/database_postgis.yml", "spec/db/models_postgis.rb", "spec/db/schema_postgis.rb", "spec/postgis_adapter/acts_as_geom_spec.rb", "spec/postgis_adapter/common_spatial_adapter_spec.rb", "spec/postgis_adapter_spec.rb", "spec/postgis_functions/bbox_spec.rb", "spec/postgis_functions/class_spec.rb", "spec/postgis_functions/common_spec.rb", "spec/postgis_functions_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "uninstall.rb"]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/nofxx/postgis_adapter}
   s.rdoc_options = ["--main", "README.rdoc"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: postgis_adapter
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors: 
 - Marcos Piccinini
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-16 00:00:00 -03:00
+date: 2009-03-09 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -63,6 +63,7 @@ files:
 - install.rb
 - lib/postgis_adapter.rb
 - lib/postgis_adapter/acts_as_geom.rb
+- lib/postgis_adapter/acts_as_geom_flymake.rb
 - lib/postgis_adapter/common_spatial_adapter.rb
 - lib/postgis_functions.rb
 - lib/postgis_functions/bbox.rb