dm-postgis 1.2.4 → 2.0.0

data/Gemfile

@@ -1,4 +1,3 @@
 source :rubyforge
 
 gemspec
-

data/Gemfile.lock

@@ -1,33 +1,55 @@
 PATH
   remote: .
   specs:
-    dm-postgis (1.2.4)
+    dm-postgis (2.0.0)
       GeoRuby (= 1.3.4)
-      dm-core (~> 1.1.0)
-      dm-postgres-adapter (~> 1.1.0)
+      dm-core (~> 1.2.0)
+      dm-postgres-adapter (~> 1.2.0)
       rake
 
 GEM
   remote: http://rubygems.org/
   specs:
     GeoRuby (1.3.4)
-    addressable (2.2.6)
-    data_objects (0.10.6)
+    addressable (2.2.8)
+    columnize (0.3.6)
+    data_objects (0.10.10)
       addressable (~> 2.1)
-    dm-core (1.1.0)
-      addressable (~> 2.2.4)
-    dm-do-adapter (1.1.0)
-      data_objects (~> 0.10.2)
-      dm-core (~> 1.1.0)
-    dm-postgres-adapter (1.1.0)
-      dm-do-adapter (~> 1.1.0)
-      do_postgres (~> 0.10.2)
-    do_postgres (0.10.6)
-      data_objects (= 0.10.6)
-    rake (0.9.2)
+    debugger (1.2.1)
+      columnize (>= 0.3.1)
+      debugger-linecache (~> 1.1.1)
+      debugger-ruby_core_source (~> 1.1.4)
+    debugger-linecache (1.1.1)
+      debugger-ruby_core_source (>= 1.1.1)
+    debugger-ruby_core_source (1.1.4)
+    diff-lcs (1.1.3)
+    dm-core (1.2.0)
+      addressable (~> 2.2.6)
+    dm-do-adapter (1.2.0)
+      data_objects (~> 0.10.6)
+      dm-core (~> 1.2.0)
+    dm-migrations (1.2.0)
+      dm-core (~> 1.2.0)
+    dm-postgres-adapter (1.2.0)
+      dm-do-adapter (~> 1.2.0)
+      do_postgres (~> 0.10.6)
+    do_postgres (0.10.10)
+      data_objects (= 0.10.10)
+    rake (0.9.2.2)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  debugger
+  dm-migrations (~> 1.2.0)
   dm-postgis!
+  rspec (~> 2.6.0)

data/README.md

@@ -0,0 +1,26 @@
+# dm-postgis
+
+Very simple type for datamapper allowing storing GeoRuby Geometries types in Postgis. This uses GeoRuby to do all the hard work. here's an example
+
+```ruby
+
+class Foo
+  include DataMapper::Resource
+  
+  property :id, Serial
+  property :name, Integer
+  property :geom, PostGISGeometry
+end
+
+# create a GeoRuby LineString
+line = GeoRuby::SimpleFeatures::LineString.new(4236)
+#add some points
+[[12.12,13.14], [12.13,14.15], [12.15,16.17]].each{|x,y| line.points << GeoRuby::SimpleFeatures::Point.from_x_y(x,y)}
+# stick it in the db!
+f = Foo.create(:name => "random geometry", :geom => line)
+```
+
+
+## Copyright
+
+Copyright (c) 2010 Roman Kamyk jr, 2012 svs. See LICENSE for details.

data/dm-postgis.gemspec

@@ -2,45 +2,44 @@
 # Generated by jeweler
 
 Gem::Specification.new do |s|
-  s.name = %q{dm-postgis}
-  s.version = "1.2.4"
-
+  s.name = %q{dm-postgis}	  
+  s.version = "2.0.0"	
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Roman Kamyk jr"]
-  s.description = %q{Adds DMGeometry type to DataMapper that uses GeoRuby for (de)serializing Geometry types into Postgis}
-  s.email = %q{roman.kamyk@gmail.com}
+  s.authors = ["Roman Kamyk jr","svs"]
+  s.description = %q{Adds DMGeometry type to DataMapper that uses GeoRuby for (de)serializing Geometry types into Postgis.}
+  s.email = %q{roman.kamyk@gmail.com svs@svs.io}
   s.extra_rdoc_files = [
     "LICENSE",
-    "README.rdoc"
+    "README.md"
   ]
   s.files = [
     ".document",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE",
-    "README.rdoc",
+    "README.md",
     "Rakefile",
     "VERSION",
     "dm-postgis.gemspec",
-    "lib/dm-postgis-adapter.rb",
     "lib/dm-postgis.rb",
-    "lib/postgis_adapter.rb",
-    "spec/dummy.rb",
-    "spec/fixtures/geo.rb"
+    "lib/dm-postgis/pg_geometry.rb",
+    "spec/pg_geometry_spec.rb",
   ]
   s.homepage = %q{http://github.com/rkj/dm-postgis}
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Geometry type for DataMapper}
   s.test_files = [
-    "spec/dummy.rb",
-    "spec/fixtures/geo.rb"
+    "spec/pg_geometry_spec.rb",
   ]
 
-  dm_version = "~>1.1.0"
+  dm_version = "~>1.2.0"
+  s.add_dependency "GeoRuby", "1.3.4"
   s.add_runtime_dependency "rake"
-  s.add_runtime_dependency "GeoRuby", "1.3.4"
   s.add_runtime_dependency "dm-core", dm_version
   s.add_runtime_dependency "dm-postgres-adapter", dm_version
+  s.add_development_dependency "dm-migrations", dm_version
+  s.add_development_dependency "rspec", "~>2.6.0"
+  s.add_development_dependency "debugger"
 end
 

data/lib/dm-postgis/pg_geometry.rb

@@ -0,0 +1,29 @@
+require 'dm-core'
+require 'geo_ruby'
+module DataMapper
+  class Property
+    class PostGISGeometry < Object
+      include GeoRuby::SimpleFeatures
+      
+      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 typecast_to_primitive(value)
+        load(value)
+      end
+    end # class Text
+  end # module Types
+end # module DataMapper

data/lib/dm-postgis.rb

@@ -1,30 +1,28 @@
-require 'geo_ruby'
 require 'dm-core'
+require 'dm-migrations'
+require 'dm-postgres-adapter'
 
-module DataMapper
-  class Property
-    class DMGeometry < Object
-      include GeoRuby::SimpleFeatures
 
-      def primitive?(value)
-        value.kind_of? Geometry
-      end
 
-      def dump(value)
-        value.nil? ? nil : value.as_hex_ewkb
-      end
+module DataMapper
 
-      def valid?(value, negated = false)
-        super || dump(value).kind_of?(::String)
-      end
+  class Property
+    autoload :PostGISGeometry,            'dm-postgis/pg_geometry'
+  end
 
-      def load(value)
-        value.nil? ? nil : Geometry.from_hex_ewkb(value)
-      end
+  module PostGIS
+    def self.included(base)
+      base.extend ClassMethods
+    end
     
-      def typecast_to_primitive(value)
-        load(value)
-      end
-    end # class Text
-  end # module Types
-end # module DataMapper
+    module ClassMethods
+      def type_map
+        super.merge(
+                    DataMapper::Property::PostGISGeometry => { :primitive => 'GEOMETRY' }
+                    ).freeze
+      end # type_map
+    end # module ClassMethods
+  end # class PostGIS
+end # module
+
+DataMapper::Adapters::PostgresAdapter.send(:include,DataMapper::PostGIS)

data/spec/pg_geometry_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe "dm-postgis" do
+  let(:line)   { GeoRuby::SimpleFeatures::LineString.new(4236).tap {|l|
+      [[12.12,13.14], [12.13,14.15], [12.15,16.17]].each{|x,y| l.points << GeoRuby::SimpleFeatures::Point.from_x_y(x,y)}
+    }
+  }
+  describe "dump" do
+    subject { Foo.properties[:geom].dump(line) }
+    it { should == "01020000208C100000030000003D0AD7A3703D284048E17A14AE472A40C3F5285C8F422840CDCCCCCCCC4C2C40CDCCCCCCCC4C2840EC51B81E852B3040" }
+  end
+  describe "load" do
+    subject { Foo.properties[:geom].load("01020000208C100000030000003D0AD7A3703D284048E17A14AE472A40C3F5285C8F422840CDCCCCCCCC4C2C40CDCCCCCCCC4C2840EC51B81E852B3040") }
+    it { should == line }
+  end
+
+end
+

metadata

@@ -1,140 +1,172 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: dm-postgis
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 2.0.0
   prerelease: 
-  segments: 
-  - 1
-  - 2
-  - 4
-  version: 1.2.4
 platform: ruby
-authors: 
+authors:
 - Roman Kamyk jr
+- svs
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-28 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2013-09-02 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: GeoRuby
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.4
   type: :runtime
-  name: rake
-  version_requirements: *id001
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 3
-        - 4
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 1.3.4
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  name: GeoRuby
-  version_requirements: *id002
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 1
-        - 0
-        version: 1.1.0
-  type: :runtime
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: dm-core
-  version_requirements: *id003
-  prerelease: false
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 1
-        - 0
-        version: 1.1.0
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.0
   type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+- !ruby/object:Gem::Dependency
   name: dm-postgres-adapter
-  version_requirements: *id004
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: dm-migrations
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.6.0
+  type: :development
   prerelease: false
-description: Adds DMGeometry type to DataMapper that uses GeoRuby for (de)serializing Geometry types into Postgis
-email: roman.kamyk@gmail.com
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.6.0
+- !ruby/object:Gem::Dependency
+  name: debugger
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Adds DMGeometry type to DataMapper that uses GeoRuby for (de)serializing
+  Geometry types into Postgis.
+email: roman.kamyk@gmail.com svs@svs.io
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
-- README.rdoc
-files: 
-- .document
+- README.md
+files:
+- ".document"
 - Gemfile
 - Gemfile.lock
 - LICENSE
-- README.rdoc
+- README.md
 - Rakefile
 - VERSION
 - dm-postgis.gemspec
-- lib/dm-postgis-adapter.rb
 - lib/dm-postgis.rb
-- lib/postgis_adapter.rb
-- spec/dummy.rb
-- spec/fixtures/geo.rb
+- lib/dm-postgis/pg_geometry.rb
+- spec/pg_geometry_spec.rb
 homepage: http://github.com/rkj/dm-postgis
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Geometry type for DataMapper
-test_files: 
-- spec/dummy.rb
-- spec/fixtures/geo.rb
+test_files:
+- spec/pg_geometry_spec.rb

data/README.rdoc

@@ -1,7 +0,0 @@
-= dm-postgis
-
-Very simple type for datamapper allowing storing Geometry types in Postgis.
-
-== Copyright
-
-Copyright (c) 2010 Roman Kamyk jr. See LICENSE for details.

data/lib/dm-postgis-adapter.rb

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

data/lib/postgis_adapter.rb

@@ -1,28 +0,0 @@
-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

data/spec/dummy.rb

@@ -1,30 +0,0 @@
-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

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