whereabouts 0.5.4 → 0.6.0

data/Gemfile

@@ -3,6 +3,7 @@ source 'http://rubygems.org'
 # Example:
 #   gem 'activesupport', '>= 2.3.5'
 gem 'activerecord', '>= 3.0.0'
+gem 'activesupport', '>= 3.0.0'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
@@ -10,6 +11,5 @@ group :development do
   gem 'rspec', '~> 2.3.0'
   gem 'bundler', '~> 1.0.0'
   gem 'jeweler', '~> 1.6.2'
-  gem 'rcov', '>= 0'
   gem 'sqlite3'
 end

data/VERSION

@@ -1 +1 @@
-0.5.4
+0.6.0

data/lib/whereabouts_methods.rb

@@ -1,76 +1,71 @@
-module Yrgoldteeth
-  module Has
-    module Whereabouts
+module Whereabouts
+  extend ActiveSupport::Concern
 
-      # Extend the ClassMethods module
-      def self.included(base)
-        base.extend ClassMethods
+  module ClassMethods
+    # Accepts a symbol that will define the inherited 
+    # 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
+        create_address_class(klass.to_s.camelize)
       end
 
-      module ClassMethods
-        # Accepts a symbol that will define the inherited 
-        # 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
-            create_address_class(klass.to_s.camelize)
-          end
-          
-          # Set the has_one relationship and accepts_nested_attributes_for.  
-          has_one klass, :as => :addressable, :dependent => :destroy
-          accepts_nested_attributes_for klass
+      # Set the has_one relationship and accepts_nested_attributes_for.  
+      has_one klass, :as => :addressable, :dependent => :destroy
+      accepts_nested_attributes_for klass
 
-          # 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
-          else
-            define_singleton_method validate_singleton do [] end
-          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)
-            set_geocoding(klass)
-            define_singleton_method geocode_singleton do true end
-          else
-            define_singleton_method geocode_singleton do false end
-          end
-        end
+      # 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
+      else
+        define_singleton_method validate_singleton do [] end
+      end
 
-        # Sets validates_presence_of fields for the Address based on the 
-        # singleton method created on the Address addressable_type class.
-        def set_validators klass, fields=[]
-          _single = "#{klass.to_s}_whereabouts_validate_fields".to_sym
-          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)}
-            end
-          end
-        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)
+        set_geocoding(klass)
+        define_singleton_method geocode_singleton do true end
+      else
+        define_singleton_method geocode_singleton do false end
+      end
+    end
 
-        # If defined, geocode the address.
-        def set_geocoding klass
-          _single = "#{klass.to_s}_whereabouts_geocode?".to_sym
-          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?)}
-          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
+      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)}
         end
+      end
+    end
 
-        # Generate a new class using Address as the superclass.  
-        # Accepts a string defining the inherited type.
-        def create_address_class(class_name, &block)
-          klass = Class.new Address, &block
-          Object.const_set class_name, klass
-        end
+    # If defined, geocode the address.
+    def set_geocoding klass
+      _single = "#{klass.to_s}_whereabouts_geocode?".to_sym
+      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?)}
       end
     end
+
+    # Generate a new class using Address as the superclass.  
+    # Accepts a string defining the inherited type.
+    def create_address_class(class_name, &block)
+      klass = Class.new Address, &block
+      Object.const_set class_name, klass
+    end
   end
 end
 # Include the modules into ActiveRecord::Base
-ActiveRecord::Base.send(:include, Yrgoldteeth::Has::Whereabouts)
+class ActiveRecord::Base
+  include Whereabouts
+end

data/whereabouts.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{whereabouts}
-  s.version = "0.5.4"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Nicholas Fine"]
-  s.date = %q{2011-07-23}
+  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.extra_rdoc_files = [
@@ -34,9 +34,9 @@ Gem::Specification.new do |s|
     "whereabouts.gemspec"
   ]
   s.homepage = %q{http://github.com/yrgoldteeth/whereabouts}
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
+  s.licenses = [%q{MIT}]
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.6}
   s.summary = %q{Whereabouts - has_whereabouts :address}
 
   if s.respond_to? :specification_version then
@@ -44,25 +44,25 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activerecord>, [">= 3.0.0"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 3.0.0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.2"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
     else
       s.add_dependency(%q<activerecord>, [">= 3.0.0"])
+      s.add_dependency(%q<activesupport>, [">= 3.0.0"])
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.2"])
-      s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
     end
   else
     s.add_dependency(%q<activerecord>, [">= 3.0.0"])
+    s.add_dependency(%q<activesupport>, [">= 3.0.0"])
     s.add_dependency(%q<rspec>, ["~> 2.3.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.2"])
-    s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<sqlite3>, [">= 0"])
   end
 end

metadata

@@ -1,93 +1,89 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: whereabouts
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.6.0
   prerelease: 
-  version: 0.5.4
 platform: ruby
-authors: 
+authors:
 - Nicholas Fine
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-23 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-12-02 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &19837800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *19837800
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &19837140 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *19837140
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &19836420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *19836420
+- !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &19835600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *19835600
+- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &19834880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.6.2
   type: :development
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rcov
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: *19834880
+- !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &19834160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id006
+  version_requirements: *19834160
 description: Rails plugin for adding associated addresses to Active Record Models
 email: nicholas.fine@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.markdown
-files: 
+files:
 - .document
 - .rspec
 - Gemfile
@@ -104,36 +100,32 @@ files:
 - spec/spec_helper.rb
 - spec/whereabouts_spec.rb
 - whereabouts.gemspec
-has_rdoc: true
 homepage: http://github.com/yrgoldteeth/whereabouts
-licenses: 
+licenses:
 - MIT
 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: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -40591267
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 46287067526210080
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Whereabouts - has_whereabouts :address
 test_files: []
-