acts_as_geocodable 1.0.4 → 2.0.0

data/lib/acts_as_geocodable/geocode.rb

@@ -1,10 +1,10 @@
 class Geocode < ActiveRecord::Base
   has_many :geocodings, :dependent => :destroy
-  
+
   validates_uniqueness_of :query
 
   cattr_accessor :geocoder
-  
+
   def distance_to(destination, units = :miles, formula = :haversine)
     if destination && destination.latitude && destination.longitude
       Graticule::Distance.const_get(formula.to_s.camelize).distance(self, destination, units)
@@ -14,42 +14,42 @@ class Geocode < ActiveRecord::Base
   def geocoded?
     !latitude.blank? && !longitude.blank?
   end
-  
+
   def self.find_or_create_by_query(query)
     find_by_query(query) || create_by_query(query)
   end
-  
+
   def self.create_by_query(query)
     create geocoder.locate(query).attributes.merge(:query => query)
   end
-  
+
   def self.find_or_create_by_location(location)
     find_by_query(location.to_s) || create_from_location(location)
   end
-  
+
   def self.create_from_location(location)
     create geocoder.locate(location).attributes.merge(:query => location.to_s)
   rescue Graticule::Error => e
     logger.warn e.message
     nil
   end
-  
+
   def precision
-    Graticule::Precision.new(self[:precision].to_s)
+    Graticule::Precision.new(self[:precision])
   end
-  
+
   def precision=(name)
     self[:precision] = name.to_s
   end
-  
+
   def geocoded
     @geocoded ||= geocodings.collect { |geocoding| geocoding.geocodable }
   end
-  
+
   def on(geocodable)
     geocodings.create :geocodable => geocodable
   end
-  
+
   def coordinates
     "#{longitude},#{latitude}"
   end
@@ -57,7 +57,7 @@ class Geocode < ActiveRecord::Base
   def to_s
     coordinates
   end
-  
+
   # Create a Graticule::Location
   def to_location
     Graticule::Location.new(attributes.except('id', 'query'))

data/lib/acts_as_geocodable/remote_location.rb

@@ -1,6 +1,6 @@
-module CollectiveIdea #:nodoc:
+module ActsAsGeocodable #:nodoc:
   module RemoteLocation #:nodoc:
-    
+
     # Get the remote location of the request IP using http://hostip.info
     def remote_location
       if request.remote_ip == '127.0.0.1'
@@ -13,6 +13,8 @@ module CollectiveIdea #:nodoc:
       logger.warn "An error occurred while looking up the location of '#{request.remote_ip}': #{e.message}"
       nil
     end
-    
+
   end
-end
+end
+
+ActionController::Base.send :include, ActsAsGeocodable::RemoteLocation

data/lib/acts_as_geocodable/version.rb

@@ -0,0 +1,3 @@
+module ActsAsGeocodable
+  VERSION = '2.0.0' unless defined?(::ActsAsGeocodable::VERSION)
+end

data/lib/generators/acts_as_geocodable/USAGE

@@ -0,0 +1,12 @@
+Description:
+  The geocodable migration generator creates a migration which you can use to generate two tables:
+
+    geocodes - Contains the latitude and longitude coordinates, with the address they refer to.
+    geocodings - The polymorphic join table.
+
+
+Example:
+    rails generate acts_as_geocodable
+
+    With 4 existing migrations, this will create an AddGeocodableTables migration in the
+    file db/migrate/5_add_geocodable_tables.rb

data/lib/generators/acts_as_geocodable/acts_as_geocodable_generator.rb

@@ -0,0 +1,28 @@
+require 'rails/generators'
+require 'rails/generators/migration'
+
+class ActsAsGeocodableGenerator < Rails::Generators::Base
+  include Rails::Generators::Migration
+
+  def self.source_root
+     @source_root ||= File.join(File.dirname(__FILE__), 'templates')
+  end
+
+  # Implement the required interface for Rails::Generators::Migration.
+  #
+  def self.next_migration_number(dirname) #:nodoc:
+    next_migration_number = current_migration_number(dirname) + 1
+    if ActiveRecord::Base.timestamped_migrations
+      [Time.now.utc.strftime("%Y%m%d%H%M%S"), "%.14d" % next_migration_number].max
+    else
+      "%.3d" % next_migration_number
+    end
+  end
+
+  def create_migration_file
+    if defined?(ActiveRecord)
+      migration_template 'migration.rb', 'db/migrate/add_geocodable_tables.rb'
+    end
+  end
+
+end

data/{generators/geocodable_migration → lib/generators/acts_as_geocodable}/templates/migration.rb

@@ -1,4 +1,4 @@
-class <%= class_name %> < ActiveRecord::Migration
+class AddGeocodableTables < ActiveRecord::Migration
   def self.up
     create_table "geocodes" do |t|
       t.column "latitude", :decimal, :precision => 15, :scale => 12
@@ -20,7 +20,7 @@ class <%= class_name %> < ActiveRecord::Migration
     add_index "geocodes", ["postal_code"], :name => "geocodes_postal_code_index"
     add_index "geocodes", ["country"], :name => "geocodes_country_index"
     add_index "geocodes", ["precision"], :name => "geocodes_precision_index"
-    
+
 
     create_table "geocodings" do |t|
       t.column "geocodable_id", :integer

metadata

@@ -3,36 +3,127 @@ name: acts_as_geocodable
 version: !ruby/object:Gem::Version 
   prerelease: false
   segments: 
-  - 1
+  - 2
   - 0
-  - 4
-  version: 1.0.4
+  - 0
+  version: 2.0.0
 platform: ruby
 authors: 
 - Daniel Morrison
 - Brandon Keepers
+- Brian Ryckbost
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-09-20 00:00:00 -04:00
+date: 2010-10-01 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :runtime
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
+        - 0
+        version: 2.0.0
+  requirement: *id001
   name: graticule
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
+        - 0
+        version: "0"
+  requirement: *id002
+  name: rails
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 5
+        version: 1.2.5
+  requirement: *id003
+  name: sqlite3-ruby
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 8
         - 1
+        version: 2.8.1
+  requirement: *id004
+  name: mysql
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
         - 0
         - 0
-        - pre2
-        version: 1.0.0.pre2
-  type: :runtime
-  version_requirements: *id001
+        - beta
+        version: 2.0.0.beta
+  requirement: *id005
+  name: rspec
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id006
+  name: factory_girl
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id007
+  name: database_cleaner
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id008
+  name: ruby-debug
 description: Simple geocoding for Rails ActiveRecord models. See the README for more details.
 email: info@collectiveidea.com
 executables: []
@@ -42,36 +133,17 @@ extensions: []
 extra_rdoc_files: 
 - README
 files: 
-- .gitignore
-- CHANGELOG
-- Gemfile
-- Gemfile.lock
-- MIT-LICENSE
-- README
-- Rakefile
-- VERSION
-- about.yml
-- acts_as_geocodable.gemspec
-- generators/geocodable_migration/USAGE
-- generators/geocodable_migration/geocodable_migration_generator.rb
-- generators/geocodable_migration/templates/migration.rb
-- install.rb
-- lib/acts_as_geocodable.rb
 - lib/acts_as_geocodable/geocode.rb
 - lib/acts_as_geocodable/geocoding.rb
 - lib/acts_as_geocodable/remote_location.rb
-- lib/acts_as_geocodable/tasks/acts_as_geocodable_tasks.rake
-- rails/init.rb
-- test/acts_as_geocodable_test.rb
-- test/db/database.yml
-- test/db/schema.rb
-- test/fixtures/cities.yml
-- test/fixtures/geocodes.yml
-- test/fixtures/geocodings.yml
-- test/fixtures/vacations.yml
-- test/geocode_test.rb
-- test/test_helper.rb
-- uninstall.rb
+- lib/acts_as_geocodable/version.rb
+- lib/acts_as_geocodable.rb
+- lib/generators/acts_as_geocodable/acts_as_geocodable_generator.rb
+- lib/generators/acts_as_geocodable/templates/migration.rb
+- lib/generators/acts_as_geocodable/USAGE
+- CHANGELOG
+- MIT-LICENSE
+- README
 has_rdoc: true
 homepage: http://github.com/collectiveidea/acts_as_geocodable
 licenses: []
@@ -102,8 +174,5 @@ rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Simple geocoding for Rails ActiveRecord models
-test_files: 
-- test/acts_as_geocodable_test.rb
-- test/db/schema.rb
-- test/geocode_test.rb
-- test/test_helper.rb
+test_files: []
+

data/.gitignore

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

data/Gemfile

@@ -1,2 +0,0 @@
-source :rubygems
-gemspec

data/Gemfile.lock

@@ -1,23 +0,0 @@
-PATH
-  remote: .
-  specs:
-    acts_as_geocodable (1.0.3)
-      graticule (>= 1.0.0.pre2)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activesupport (3.0.0)
-    graticule (1.0.0.pre2)
-      activesupport
-      happymapper (>= 0.3.0)
-    happymapper (0.3.2)
-      libxml-ruby (~> 1.1.3)
-    libxml-ruby (1.1.4)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  acts_as_geocodable!
-  graticule (>= 1.0.0.pre2)

data/Rakefile

@@ -1,39 +0,0 @@
-require 'rake'
-require 'load_multi_rails_rake_tasks'
-require 'rake/testtask'
-require 'rake/rdoctask'
-
-desc 'Default: run unit tests.'
-task :default => :test
-
-desc 'Test the acts_as_geocodable plugin.'
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
-end
-
-desc 'Generate documentation for the acts_as_geocodable plugin.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'ActsAsGeocodable'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = 'acts_as_geocodable'
-    gemspec.summary = 'Simple geocoding for Rails ActiveRecord models'
-    gemspec.description = 'Simple geocoding for Rails ActiveRecord models. See the README for more details.'
-    gemspec.email = 'info@collectiveidea.com'
-    gemspec.homepage = 'http://github.com/collectiveidea/acts_as_geocodable'
-    gemspec.authors = ['Daniel Morrison', 'Brandon Keepers']
-    gemspec.add_dependency 'graticule', '>=1.0.0.pre2'
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
-end

data/VERSION

@@ -1 +0,0 @@
-1.0.4

data/about.yml

@@ -1,7 +0,0 @@
-author: 
-    name: Brandon Keepers and Daniel Morrison, Collective Idea
-    homepage: http://collectiveidea.com
-summary: A plugin to help build geo-aware applications
-homepage: http://opensoul.org/2007/2/13/geocoding-as-easy-as-1-2
-plugin: http://source.collectiveidea.com/public/rails/plugins/acts_as_geocodable
-license: MIT

data/acts_as_geocodable.gemspec

@@ -1,75 +0,0 @@
-# Generated by jeweler
-# 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.4"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Daniel Morrison", "Brandon Keepers"]
-  s.date = %q{2010-09-20}
-  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 = [
-    "README"
-  ]
-  s.files = [
-    ".gitignore",
-     "CHANGELOG",
-     "Gemfile",
-     "Gemfile.lock",
-     "MIT-LICENSE",
-     "README",
-     "Rakefile",
-     "VERSION",
-     "about.yml",
-     "acts_as_geocodable.gemspec",
-     "generators/geocodable_migration/USAGE",
-     "generators/geocodable_migration/geocodable_migration_generator.rb",
-     "generators/geocodable_migration/templates/migration.rb",
-     "install.rb",
-     "lib/acts_as_geocodable.rb",
-     "lib/acts_as_geocodable/geocode.rb",
-     "lib/acts_as_geocodable/geocoding.rb",
-     "lib/acts_as_geocodable/remote_location.rb",
-     "lib/acts_as_geocodable/tasks/acts_as_geocodable_tasks.rake",
-     "rails/init.rb",
-     "test/acts_as_geocodable_test.rb",
-     "test/db/database.yml",
-     "test/db/schema.rb",
-     "test/fixtures/cities.yml",
-     "test/fixtures/geocodes.yml",
-     "test/fixtures/geocodings.yml",
-     "test/fixtures/vacations.yml",
-     "test/geocode_test.rb",
-     "test/test_helper.rb",
-     "uninstall.rb"
-  ]
-  s.homepage = %q{http://github.com/collectiveidea/acts_as_geocodable}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{Simple geocoding for Rails ActiveRecord models}
-  s.test_files = [
-    "test/acts_as_geocodable_test.rb",
-     "test/db/schema.rb",
-     "test/geocode_test.rb",
-     "test/test_helper.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<graticule>, [">= 1.0.0.pre2"])
-    else
-      s.add_dependency(%q<graticule>, [">= 1.0.0.pre2"])
-    end
-  else
-    s.add_dependency(%q<graticule>, [">= 1.0.0.pre2"])
-  end
-end
-