whereabouts 0.6.0 → 0.6.1

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.6.1

data/lib/whereabouts_methods.rb

@@ -6,7 +6,7 @@ module Whereabouts
     # type of Address.  Defaults to the parent class.
     def has_whereabouts klass=:address, options={}
       # extend Address with class name if not defined.
-      unless Object.const_defined?(klass.to_s.camelize) || klass == :address
+      unless klass == :address || Object.const_defined?(klass.to_s.camelize)
         create_address_class(klass.to_s.camelize)
       end
 
@@ -17,43 +17,61 @@ module Whereabouts
       # Define a singleton on the class that returns an array
       # that includes the address fields to validate presence of 
       # or an empty array
-      validate_singleton = "#{klass.to_s}_whereabouts_validate_fields".to_sym
       if options[:validate] && options[:validate].is_a?(Array)
-        set_validators(klass, options[:validate])
-        define_singleton_method validate_singleton do options[:validate] end
+        validators = options[:validate]
+        set_validators(klass, validators)
       else
-        define_singleton_method validate_singleton do [] end
+        validators = []
       end
+      define_singleton_method validate_singleton_for(klass) do validators end
 
       # Check for geocode in options and confirm geocoder is defined.
       # Also defines a singleton to return a boolean about geocoding.
-      geocode_singleton = "#{klass.to_s}_whereabouts_geocode?".to_sym
       if options[:geocode] && options[:geocode] == true && defined?(Geocoder)
+        geocode = true
         set_geocoding(klass)
-        define_singleton_method geocode_singleton do true end
       else
-        define_singleton_method geocode_singleton do false end
+        geocode = false
       end
+      define_singleton_method geocode_singleton_for(klass) do geocode end
     end
 
+    private
+    # Accepts a symbol defining the class and 
+    # returns a symbol to define a singleton
+    # on the class like :address_whereabouts_geocode?
+    def geocode_singleton_for klass
+      "#{klass.to_s}_whereabouts_geocode?".to_sym
+    end
+
+    # Accepts a symbol defining the class and 
+    # returns a symbol to define a singleton
+    # on the class like :address_whereabouts_validate_fields
+    def validate_singleton_for klass
+      "#{klass.to_s}_whereabouts_validate_fields".to_sym
+    end
+    
     # Sets validates_presence_of fields for the Address based on the 
     # singleton method created on the Address addressable_type class.
-    private
     def set_validators klass, fields=[]
-      _single = "#{klass.to_s}_whereabouts_validate_fields".to_sym
+      _single = validate_singleton_for(klass)
       klass.to_s.camelize.constantize.class_eval do
         fields.each do |f|
-          validates_presence_of f, :if => lambda {|a| a.addressable_type.constantize.send(_single).include?(f)}
+          validates_presence_of f, 
+            :if => lambda {|a| a.addressable_type.constantize.send(_single).include?(f)}
         end
       end
     end
 
-    # If defined, geocode the address.
+    # Geocode the address using Address#geocode_address if the 
+    # geocode_singleton is true and the record is either new or
+    # has been updated.
     def set_geocoding klass
-      _single = "#{klass.to_s}_whereabouts_geocode?".to_sym
+      _single = geocode_singleton_for(klass)
       klass.to_s.camelize.constantize.class_eval do
         geocoded_by :geocode_address
-        after_validation :geocode, :if => lambda {|a| a.addressable_type.constantize.send(_single) && (a.new_record? || a.changed?)}
+        after_validation :geocode, 
+          :if => lambda {|a| a.addressable_type.constantize.send(_single) && (a.new_record? || a.changed?)}
       end
     end
 
@@ -65,7 +83,7 @@ module Whereabouts
     end
   end
 end
-# Include the modules into ActiveRecord::Base
+# Include the module into ActiveRecord::Base
 class ActiveRecord::Base
   include Whereabouts
 end

data/spec/spec_helper.rb

@@ -2,6 +2,7 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'
 require 'active_record'
+require 'active_support'
 require 'whereabouts_methods'
 
 # Requires supporting files with custom matchers and macros, etc,

data/whereabouts.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{whereabouts}
-  s.version = "0.6.0"
+  s.name = "whereabouts"
+  s.version = "0.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Nicholas Fine}]
-  s.date = %q{2011-12-02}
-  s.description = %q{Rails plugin for adding associated addresses to Active Record Models}
-  s.email = %q{nicholas.fine@gmail.com}
+  s.authors = ["Nicholas Fine"]
+  s.date = "2011-12-02"
+  s.description = "Rails plugin for adding associated addresses to Active Record Models"
+  s.email = "nicholas.fine@gmail.com"
   s.extra_rdoc_files = [
     "README.markdown"
   ]
@@ -33,11 +33,11 @@ Gem::Specification.new do |s|
     "spec/whereabouts_spec.rb",
     "whereabouts.gemspec"
   ]
-  s.homepage = %q{http://github.com/yrgoldteeth/whereabouts}
-  s.licenses = [%q{MIT}]
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.6}
-  s.summary = %q{Whereabouts - has_whereabouts :address}
+  s.homepage = "http://github.com/yrgoldteeth/whereabouts"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.10"
+  s.summary = "Whereabouts - has_whereabouts :address"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: whereabouts
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-12-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &19837800 !ruby/object:Gem::Requirement
+  requirement: &84930190 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *19837800
+  version_requirements: *84930190
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &19837140 !ruby/object:Gem::Requirement
+  requirement: &84929890 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *19837140
+  version_requirements: *84929890
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &19836420 !ruby/object:Gem::Requirement
+  requirement: &84929590 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *19836420
+  version_requirements: *84929590
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &19835600 !ruby/object:Gem::Requirement
+  requirement: &84929300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *19835600
+  version_requirements: *84929300
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &19834880 !ruby/object:Gem::Requirement
+  requirement: &84929000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.6.2
   type: :development
   prerelease: false
-  version_requirements: *19834880
+  version_requirements: *84929000
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &19834160 !ruby/object:Gem::Requirement
+  requirement: &84928710 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19834160
+  version_requirements: *84928710
 description: Rails plugin for adding associated addresses to Active Record Models
 email: nicholas.fine@gmail.com
 executables: []
@@ -115,7 +115,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 46287067526210080
+      hash: 282947055
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -124,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Whereabouts - has_whereabouts :address