acts_as_geocodable 1.0.1 → 1.0.2

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.0.2

data/acts_as_geocodable.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{acts_as_geocodable}
-  s.version = "1.0.1"
+  s.version = "1.0.2"
 
   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-12-16}
+  s.date = %q{2010-02-04}
   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 = [
@@ -67,3 +67,4 @@ Gem::Specification.new do |s|
   else
   end
 end
+

data/lib/acts_as_geocodable.rb

@@ -139,8 +139,16 @@ module CollectiveIdea #:nodoc:
         #
         # 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
+        # * <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 minimum geocoding precision
+        #
+        # validates_as_geocodable also takes a block that you can use to performa additional
+        # checks on the geocode. If this block returns false, then validation will fail.
+        #
+        #   validates_as_geocodable do |geocode|
+        #     geocode.country == "US"
+        #   end
         #
         def validates_as_geocodable(options = {})
           options = options.reverse_merge :message => "Address could not be geocoded.", :allow_nil => false
@@ -148,13 +156,15 @@ module CollectiveIdea #:nodoc:
             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)
+              if !geocode ||
+                  (options[:precision] && geocode.precision < options[:precision]) ||
+                  (block_given? && yield(geocode) == false)
                 model.errors.add_to_base options[:message]
               end
             end
           end
         end
-      
+        
       private
       
         def add_distance_to_select!(origin, options)

data/lib/acts_as_geocodable/geocode.rb

@@ -34,6 +34,10 @@ class Geocode < ActiveRecord::Base
     nil
   end
   
+  def precision
+    Graticule::Precision.new(self[:precision].to_s)
+  end
+  
   def precision=(name)
     self[:precision] = name.to_s
   end

data/test/acts_as_geocodable_test.rb

@@ -184,15 +184,21 @@ class ActsAsGeocodableTest < ActiveSupport::TestCase
       assert_equal "Address could not be geocoded.", @vacation.errors.on(:base)
     end
     
-    should "be valid with proper precision" do
+    should "be valid with the same 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
+    should "be valid with a higher precision" do
+      @model.validates_as_geocodable :precision => :region
+      Geocode.geocoder.expects(:locate).returns(Graticule::Location.new(:precision => 'street'))
+      assert @vacation.valid?
+    end
+    
+    should "be invalid with a lower precision" do
       @model.validates_as_geocodable :precision => :street
-      Geocode.geocoder.expects(:locate).returns(Graticule::Location.new(:precision => 'city'))
+      Geocode.geocoder.expects(:locate).returns(Graticule::Location.new(:precision => 'region'))
       assert !@vacation.valid?
       assert_equal "Address could not be geocoded.", @vacation.errors.on(:base)
     end
@@ -201,6 +207,23 @@ class ActsAsGeocodableTest < ActiveSupport::TestCase
       @model.validates_as_geocodable :allow_nil => true
       assert @model.new.valid?
     end
+    
+    should "be invalid if block returns false" do
+      @model.validates_as_geocodable(:allow_nil => false) do |geocode|
+        ["USA", "US"].include?(geocode.country)
+      end
+      Geocode.geocoder.expects(:locate).returns(Graticule::Location.new(:country => 'CA'))
+      assert !@vacation.valid?
+    end
+
+    should "be valid if block returns true" do
+      @model.validates_as_geocodable(:allow_nil => false) do |geocode|
+        ["USA", "US"].include?(geocode.country)
+      end
+      Geocode.geocoder.expects(:locate).returns(Graticule::Location.new(:country => 'US'))
+      
+      assert @vacation.valid?
+    end
   end
   
   context "find with origin" do

metadata

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