dm-geokit 1.0.2 → 1.1.0

data/{README → README.md}

@@ -1,5 +1,4 @@
-dm-geokit
-=========
+# dm-geokit
 
 A mixin for Datamapper models that enables geographic functionality.
 
@@ -7,17 +6,16 @@ A mixin for Datamapper models that enables geographic functionality.
 * Sort by distance easily: Location.all(:address.near => {:origin => 'Portland, OR', :distance => 5.mi}, :order => [:address_distance.desc])
 * Ability to specify multiple fields that are geocodable (mostly)
 
-Usage
-=====
+# Usage
 
 Basic Class Definition:
 
-class Location
-  include DataMapper::Resource
-  include DataMapper::GeoKit
-  property :id, Serial
-  has_geographic_location :address
-end
+    class Location
+      include DataMapper::Resource
+      include DataMapper::GeoKit
+      property :id, Serial
+      has_geographic_location :address
+    end
 
 This will automatically generate fields and methods for use with the DM Object, prefixed with the field name specified.
 Since the above example used the field :address, the following fields would be generated:
@@ -33,14 +31,14 @@ Since the above example used the field :address, the following fields would be g
 
 You can either reference those fields directly, or use the proxy object returned by calling .address on your object:
 
-l = Location.all(:address.near => {:origin => 'Portland, OR', :distance => 5.mi})
+    l = Location.all(:address.near => {:origin => 'Portland, OR', :distance => 5.mi})
 
-l.each do |loc|
-  puts loc.address # .to_s yields string representation of full address, e.g. "12345 My St. Portland, OR USA"
-  puts loc.address.inspect # the proxy object, GeographicLocation, with matching methods for each property
-  puts loc.address.street_address # getting the street_address from the proxy object
-  puts loc.address_street_address # directly access the SQL column
-end
+    l.each do |loc|
+      puts loc.address # .to_s yields string representation of full address, e.g. "12345 My St. Portland, OR USA"
+      puts loc.address.inspect # the proxy object, GeographicLocation, with matching methods for each property
+      puts loc.address.street_address # getting the street_address from the proxy object
+      puts loc.address_street_address # directly access the SQL column
+    end
 
 The GeographicLocation proxy object is a convenience to allow you to compare and sort results in Ruby.
 
@@ -48,5 +46,5 @@ Requirements
 ===========
 
 * geokit >= 1.5.0
-* dm-core >= 0.10.1
-* dm-aggregates >= 0.10.1
+* dm-core >= 1.0.2
+* dm-aggregates >= 1.0.2

data/lib/dm-geokit/resource.rb

@@ -12,7 +12,14 @@ module DataMapper
         send :include, InstanceMethods
         send :include, ::GeoKit::Mappable
 
-        property name.to_sym, String, :length => 255, :auto_validation => false
+        if defined?(DataMapper::Validations)
+          # since we return a custom object when this property is called, it breaks
+          # when dm-validations is included, so we set auto_validation to false if
+          # dm-validations is loaded
+          property name.to_sym, String, :length => 255, :auto_validation => false
+        else
+          property name.to_sym, String, :length => 255
+        end
         property "#{name}_distance".to_sym, Float
 
         PROPERTY_NAMES.each do |p|
@@ -23,8 +30,6 @@ module DataMapper
           end
         end
 
-        DataMapper.auto_upgrade!
-
         if options[:auto_geocode] == true or options[:auto_geocode].nil?
           define_method :auto_geocode? do
             true

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 $TESTING=true
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
-%w(dm-geokit dm-migrations dm-is-versioned).each{|l| require l}
+%w(dm-geokit dm-validations dm-migrations dm-is-versioned).each{|l| require l}
 
 DataMapper::Logger.new(STDOUT, :debug)
 DataMapper.setup(:default, "mysql://root:1nt3rfac3@localhost/dm_geokit_test")

metadata

@@ -1,13 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-geokit
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 2
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors: 
 - Matt King
@@ -15,39 +9,29 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-23 00:00:00 -07:00
+date: 2011-03-19 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: dm-core
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 51
-        segments: 
-        - 0
-        - 10
-        - 2
-        version: 0.10.2
-  type: :runtime
-  version_requirements: *id001
+        version: 1.0.2
+    version: 
 - !ruby/object:Gem::Dependency 
   name: geokit
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id002
+    version: 
 description: Geographic Property support for DataMapper
 email: mking@mking.me
 executables: []
@@ -56,11 +40,11 @@ extensions: []
 
 extra_rdoc_files: 
 - LICENSE
-- README
+- README.md
 - TODO
 files: 
 - LICENSE
-- README
+- README.md
 - Rakefile
 - TODO
 - VERSION.yml
@@ -76,8 +60,6 @@ files:
 - lib/dm-geokit/support/symbol.rb
 - lib/jeweler/templates/.gitignore
 - lib/skeleton/api_keys_template
-- spec/dm_geokit_spec.rb
-- spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/mattking17/dm-geokit/tree/master
 licenses: []
@@ -88,27 +70,21 @@ 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"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: dm-geokit
-rubygems_version: 1.3.7
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: DataMapper plugin for geokit