dm-postgis 1.0.1 → 1.1.0

data/Gemfile

@@ -0,0 +1,4 @@
+source :rubyforge
+
+gem "GeoRuby"
+

data/Rakefile

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'rake'
+require 'bundler'
 
 begin
   require 'jeweler'
@@ -10,7 +11,7 @@ begin
     gem.email = "roman.kamyk@gmail.com"
     gem.homepage = "http://github.com/rkj/dm-postgis"
     gem.authors = ["Roman Kamyk jr"]
-    gem.add_dependency 'GeoRuby', '>= 1.3.4'
+    gem.add_bundler_dependencies
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.1.0

data/lib/dm-postgis-adapter.rb

@@ -0,0 +1,9 @@
+require 'postgis_adapter'
+require 'dm-postgres-adapter'
+module DataMapper
+  module Adapters
+    class PostgisAdapter < PostgresAdapter
+      include DataMapper::Migrations::PostgisAdapter
+    end
+  end
+end

data/lib/dm-postgis.rb

@@ -1,19 +1,19 @@
 require 'geo_ruby'
 
 module DataMapper
-  module Types
-    class DMGeometry < DataMapper::Type
+  class Property
+    class DMGeometry < Property
       include GeoRuby::SimpleFeatures
-      
-      primitive Text
+      primitive ::Object
       default nil
+      # length nil
       lazy false
     
-      def self.dump(value, property)
+      def dump(value)
         value.nil? ? nil : value.as_hex_ewkb
       end
 
-      def self.load(value, property)
+      def load(value)
         value.nil? ? nil : Geometry.from_hex_ewkb(value)
       end
     
@@ -23,12 +23,4 @@ module DataMapper
       end
     end # class Text
   end # module Types
-  
-  class Property
-    PRIMITIVES << DataMapper::Types::DMGeometry
-    def typecast_to_geometry(raw_value)
-      return nil if raw_value.nil? || raw_value.empty?
-      return GeoRuby::SimpleFeatures::Geometry.from_hex_ewkb(raw_value)
-    end
-  end
 end # module DataMapper

data/lib/postgis_adapter.rb

@@ -0,0 +1,28 @@
+require 'do_postgres'
+
+module DataObjects
+  module Postgis 
+    include Postgres
+  end
+end
+
+require 'dm-migrations/adapters/dm-postgres-adapter'
+module DataMapper
+  module Migrations
+    module PostgisAdapter 
+      include DataMapper::Migrations::PostgresAdapter
+      def self.included(base)
+        base.extend DataObjectsAdapter::ClassMethods
+        base.extend ClassMethods
+      end
+      
+      module ClassMethods
+        def type_map
+          @type_map ||= super.merge(
+            DataMapper::Property::DMGeometry => { :primitive => 'GEOMETRY' }
+          ).freeze
+        end # type_map
+      end # module ClassMethods
+    end # class PostgresAdapter
+  end # module Migration
+end # module

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: dm-postgis
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  prerelease: false
+  segments: 
+  - 1
+  - 1
+  - 0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Roman Kamyk jr
@@ -9,19 +14,21 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-16 00:00:00 +01:00
+date: 2010-06-16 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: GeoRuby
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: GeoRuby
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.3.4
-    version: 
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id001
+  prerelease: false
 description: Adds DMGeometry type to DataMapper that uses GeoRuby for (de)serializing Geometry types into Postgis
 email: roman.kamyk@gmail.com
 executables: []
@@ -34,11 +41,14 @@ extra_rdoc_files:
 files: 
 - .document
 - .gitignore
+- Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
 - VERSION
+- lib/dm-postgis-adapter.rb
 - lib/dm-postgis.rb
+- lib/postgis_adapter.rb
 has_rdoc: true
 homepage: http://github.com/rkj/dm-postgis
 licenses: []
@@ -52,18 +62,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Geometry type for DataMapper