acts_as_geocodable 1.0.0 → 1.0.1

data/.gitignore

@@ -1,2 +1,3 @@
 debug.log
-pkg
+pkg
+rdoc

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/acts_as_geocodable.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{acts_as_geocodable}
-  s.version = "1.0.0"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Daniel Morrison", "Brandon Keepers"]
-  s.date = %q{2009-10-21}
+  s.date = %q{2009-12-16}
   s.description = %q{Simple geocoding for Rails ActiveRecord models. See the README for more details.}
   s.email = %q{info@collectiveidea.com}
   s.extra_rdoc_files = [

data/lib/acts_as_geocodable.rb

@@ -135,12 +135,22 @@ module CollectiveIdea #:nodoc:
           end
         end
         
+        # Validate that the model can be geocoded
+        #
+        # Options:
+        # * <tt>:message</tt>: Added to errors base (Default: Address could not be geocoded.)
+        # * <tt>:allow_nil</tt>: If all the address attributes are blank, then don't try to validate the geocode (Default: false)
+        # * <tt>:precision</tt>: Require a certain geocoding precision
+        #
         def validates_as_geocodable(options = {})
           options = options.reverse_merge :message => "Address could not be geocoded.", :allow_nil => false
-          validate do |geocodable|
-            if !(options[:allow_nil] && geocodable.to_location.attributes.all?(&:blank?)) &&
-                !Geocode.find_or_create_by_location(geocodable.to_location)
-              geocodable.errors.add_to_base options[:message]
+          validate do |model|
+            is_blank = model.to_location.attributes.except(:precision).all?(&:blank?)
+            unless options[:allow_nil] && is_blank
+              geocode = model.send :attach_geocode
+              if !geocode || (options[:precision] && options[:precision].to_s != geocode.precision)
+                model.errors.add_to_base options[:message]
+              end
             end
           end
         end
@@ -247,12 +257,13 @@ module CollectiveIdea #:nodoc:
           elsif !new_geocode && self.geocoding
             self.geocoding.destroy
           end
+          new_geocode
         rescue Graticule::Error => e
           logger.warn e.message
         end
         
         
-        def update_address(force = false)
+        def update_address(force = false) #:nodoc:
           unless self.geocode.blank?
             if self.acts_as_geocodable_options[:address].is_a? Symbol
               method = self.acts_as_geocodable_options[:address]
@@ -271,7 +282,7 @@ module CollectiveIdea #:nodoc:
           end
         end
         
-        def geo_attribute(attr_key)
+        def geo_attribute(attr_key) #:nodoc:
           if self.acts_as_geocodable_options[:address].is_a? Symbol
             attr_name = self.acts_as_geocodable_options[:address]
             attr_key == :street ? self.send(attr_name) : nil

data/test/acts_as_geocodable_test.rb

@@ -32,9 +32,7 @@ class ActsAsGeocodableTest < ActiveSupport::TestCase
   fixtures :vacations, :cities, :geocodes, :geocodings
 
   # enable Should macros
-  def self.model_class
-    Vacation
-  end
+  subject { Vacation.new }
   
   should_have_one :geocoding
   
@@ -169,19 +167,40 @@ class ActsAsGeocodableTest < ActiveSupport::TestCase
   
   context "validates_as_geocodable" do
     setup do
-      @vacation = ValidatedVacation.new :locality => "Grand Rapids", :region => "MI"
+      @model = Class.new(Vacation)
+      @vacation = @model.new :locality => "Grand Rapids", :region => "MI"
+    end
+
+    should "be valid with geocodable address" do
+      @model.validates_as_geocodable
+      assert @vacation.valid?
     end
 
     should "be invalid without geocodable address" do
+      @model.validates_as_geocodable
       Geocode.geocoder.expects(:locate).raises(Graticule::Error)
       assert !@vacation.valid?
       assert_equal 1, @vacation.errors.size
       assert_equal "Address could not be geocoded.", @vacation.errors.on(:base)
     end
     
-    should "be valid with geocodable address" do
+    should "be valid with proper precision" do
+      @model.validates_as_geocodable :precision => :street
+      Geocode.geocoder.expects(:locate).returns(Graticule::Location.new(:precision => 'street'))
       assert @vacation.valid?
     end
+    
+    should "be invalid without proper precision" do
+      @model.validates_as_geocodable :precision => :street
+      Geocode.geocoder.expects(:locate).returns(Graticule::Location.new(:precision => 'city'))
+      assert !@vacation.valid?
+      assert_equal "Address could not be geocoded.", @vacation.errors.on(:base)
+    end
+
+    should "allow nil" do
+      @model.validates_as_geocodable :allow_nil => true
+      assert @model.new.valid?
+    end
   end
   
   context "find with origin" do

data/test/test_helper.rb

@@ -12,7 +12,7 @@ require 'shoulda'
 require 'matchy'
 require 'mocha'
 
-require plugin_test_dir + '/../init.rb'
+require plugin_test_dir + '/../rails/init.rb'
 
 ActiveRecord::Base.logger = Logger.new(plugin_test_dir + "/debug.log")
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_geocodable
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors: 
 - Daniel Morrison
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-21 00:00:00 +01:00
+date: 2009-12-16 00:00:00 +00:00
 default_executable: 
 dependencies: []