dm-postgis 1.1.0 → 1.2.0

data/Gemfile

@@ -1,4 +1,7 @@
 source :rubyforge
 
+dm_version = "1.0.2"
 gem "GeoRuby"
+gem "dm-core", dm_version
+gem "dm-postgres-adapter", dm_version
 

data/Gemfile.lock

@@ -0,0 +1,27 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    GeoRuby (1.3.4)
+    addressable (2.2.2)
+    data_objects (0.10.2)
+      addressable (~> 2.1)
+    dm-core (1.0.2)
+      addressable (~> 2.2)
+      extlib (~> 0.9.15)
+    dm-do-adapter (1.0.2)
+      data_objects (~> 0.10.2)
+      dm-core (~> 1.0.2)
+    dm-postgres-adapter (1.0.2)
+      dm-do-adapter (~> 1.0.2)
+      do_postgres (~> 0.10.2)
+    do_postgres (0.10.2)
+      data_objects (= 0.10.2)
+    extlib (0.9.15)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  GeoRuby
+  dm-core (= 1.0.2)
+  dm-postgres-adapter (= 1.0.2)

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

data/lib/dm-postgis.rb

@@ -1,25 +1,30 @@
 require 'geo_ruby'
+require 'dm-core'
 
 module DataMapper
   class Property
-    class DMGeometry < Property
+    #class DMGeometry < GeoRuby::SimpleFeatures::Geometry
+    class DMGeometry < Text
       include GeoRuby::SimpleFeatures
-      primitive ::Object
-      default nil
-      # length nil
-      lazy false
-    
+
+      def primitive?(value)
+        value.kind_of? Geometry
+      end
+
       def dump(value)
         value.nil? ? nil : value.as_hex_ewkb
       end
 
+      def valid?(value, negated = false)
+        super || dump(value).kind_of?(::String)
+      end
+
       def load(value)
         value.nil? ? nil : Geometry.from_hex_ewkb(value)
       end
     
-      def self.typecast(value, property)
-        return value if value.nil? || value.kind_of?(Geometry)
-        return Geometry.from_hex_ewkb(value)
+      def typecast_to_primitive(value)
+        load(value)
       end
     end # class Text
   end # module Types

data/spec/dummy.rb

@@ -0,0 +1,30 @@
+require 'dm-core/spec/setup'
+require 'dm-core/spec/lib/adapter_helpers'
+require 'dm-migrations'
+
+ENV['ADAPTER']='postgres'
+DataMapper::Spec.setup
+
+describe "dm-postgis" do
+  it "should load" do
+    require 'dm-postgis'
+  end
+
+  describe "should allow DMGeometry property" do
+    require 'dm-postgis'
+    require 'fixtures/geo'
+    it 'should work for empty values' do
+      TestTable.new.should_not be_nil
+    end
+
+    it 'should work for positions' do
+      g = GeoRuby::SimpleFeatures::Point.from_x_y(1, 2)
+      t = TestTable.new(:position => g)
+      t.save.should be(true)
+      t.reload
+      t.position.x.should == 1
+      t.position.y.should == 2
+    end
+  end
+end
+

data/spec/fixtures/geo.rb

@@ -0,0 +1,7 @@
+class TestTable
+  include ::DataMapper::Resource
+  property :id, Serial
+  property :position, DMGeometry, :required => false
+end
+DataMapper.auto_upgrade!
+

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dm-postgis
 version: !ruby/object:Gem::Version 
+  hash: 31
   prerelease: false
   segments: 
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Roman Kamyk jr
@@ -14,21 +15,101 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-16 00:00:00 +02:00
+date: 2010-11-16 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  name: GeoRuby
   version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   requirement: *id001
   prerelease: false
+  type: :runtime
+  name: GeoRuby
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 0
+        - 2
+        version: 1.0.2
+  requirement: *id002
+  prerelease: false
+  type: :runtime
+  name: dm-core
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 0
+        - 2
+        version: 1.0.2
+  requirement: *id003
+  prerelease: false
+  type: :runtime
+  name: dm-postgres-adapter
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id004
+  prerelease: false
+  type: :runtime
+  name: GeoRuby
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 0
+        - 2
+        version: 1.0.2
+  requirement: *id005
+  prerelease: false
+  type: :runtime
+  name: dm-core
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 0
+        - 2
+        version: 1.0.2
+  requirement: *id006
+  prerelease: false
+  type: :runtime
+  name: dm-postgres-adapter
 description: Adds DMGeometry type to DataMapper that uses GeoRuby for (de)serializing Geometry types into Postgis
 email: roman.kamyk@gmail.com
 executables: []
@@ -40,8 +121,8 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -49,35 +130,42 @@ files:
 - lib/dm-postgis-adapter.rb
 - lib/dm-postgis.rb
 - lib/postgis_adapter.rb
+- spec/dummy.rb
+- spec/fixtures/geo.rb
 has_rdoc: true
 homepage: http://github.com/rkj/dm-postgis
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Geometry type for DataMapper
-test_files: []
-
+test_files: 
+- spec/dummy.rb
+- spec/fixtures/geo.rb

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC