graticule 1.0.0.pre2 → 2.0.0

data/lib/graticule.rb

@@ -1,7 +1,9 @@
 $:.unshift(File.dirname(__FILE__))
 
 require 'active_support'
+require 'active_support/core_ext'
 
+require 'graticule/version'
 require 'graticule/core_ext'
 require 'graticule/location'
 require 'graticule/precision'

data/lib/graticule/geocoder/bogus.rb

@@ -3,7 +3,7 @@ module Graticule #:nodoc:
     # Bogus geocoder that can be used for test purposes
     class Bogus
       # A queue of canned responses
-      class_inheritable_accessor :responses
+      class_attribute :responses
       self.responses = []
       
       # A default location to use if the responses queue is empty

data/lib/graticule/geocoder/geonames.rb

@@ -35,7 +35,7 @@ module Graticule #:nodoc:
       
       # Extracts and raises an error from +xml+, if any.
       def check_error(response) #:nodoc:
-        if response.status
+        if response && response.status
           case response.status.value
           when 14 then
             raise Error, reponse.status.message

data/lib/graticule/geocoder/google.rb

@@ -52,7 +52,6 @@ module Graticule #:nodoc:
         has_one :address, Address
       
         attr_reader :longitude, :latitude
-        delegate :accuracy, :to => :address, :allow_nil => true
         
         with_options :deep => true, :namespace => 'urn:oasis:names:tc:ciq:xsdschema:xAL:2.0' do |map|
           map.element :street,      String, :tag => 'ThoroughfareName'
@@ -66,6 +65,10 @@ module Graticule #:nodoc:
           @longitude, @latitude, _ = coordinates.split(',').map { |v| v.to_f }
         end
       
+        def accuracy
+          address.accuracy if address
+        end
+      
         def precision
           PRECISION[accuracy] || :unknown
         end

data/lib/graticule/geocoder/host_ip.rb

@@ -22,7 +22,7 @@ module Graticule #:nodoc:
       end
       
       def parse_response(response) #:nodoc:
-        returning Location.new do |location|
+        Location.new.tap do |location|
           location.latitude = response['Latitude']
           location.longitude = response['Longitude']
           location.locality, location.region = response['City'].split(', ')

data/lib/graticule/version.rb

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

metadata

@@ -1,37 +1,85 @@
 --- !ruby/object:Gem::Specification 
 name: graticule
 version: !ruby/object:Gem::Version 
-  version: 1.0.0.pre2
+  prerelease: false
+  segments: 
+  - 2
+  - 0
+  - 0
+  version: 2.0.0
 platform: ruby
 authors: 
 - Brandon Keepers
+- Daniel Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-02-04 00:00:00 -05:00
+date: 2010-10-01 00:00:00 -04:00
 default_executable: geocode
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :runtime
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id001
   name: activesupport
+- !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  requirement: *id002
+  name: i18n
 - !ruby/object:Gem::Dependency 
-  name: happymapper
+  prerelease: false
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 3
+        - 0
         version: 0.3.0
-    version: 
+  requirement: *id003
+  name: happymapper
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id004
+  name: mocha
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id005
+  name: rcov
 description: Graticule is a geocoding API that provides a common interface to all the popular services, including Google, Yahoo, Geocoder.us, and MetaCarta.
 email: brandon@opensoul.org
 executables: 
@@ -41,24 +89,13 @@ extensions: []
 extra_rdoc_files: 
 - README.txt
 files: 
-- .autotest
-- .gitignore
-- CHANGELOG.txt
-- LICENSE.txt
-- README.txt
-- Rakefile
-- VERSION
 - bin/geocode
-- graticule.gemspec
-- init.rb
-- lib/graticule.rb
 - lib/graticule/cli.rb
 - lib/graticule/core_ext.rb
-- lib/graticule/distance.rb
 - lib/graticule/distance/haversine.rb
 - lib/graticule/distance/spherical.rb
 - lib/graticule/distance/vincenty.rb
-- lib/graticule/geocoder.rb
+- lib/graticule/distance.rb
 - lib/graticule/geocoder/base.rb
 - lib/graticule/geocoder/bogus.rb
 - lib/graticule/geocoder/freethepostcode.rb
@@ -72,61 +109,14 @@ files:
 - lib/graticule/geocoder/multi.rb
 - lib/graticule/geocoder/multimap.rb
 - lib/graticule/geocoder/yahoo.rb
+- lib/graticule/geocoder.rb
 - lib/graticule/location.rb
 - lib/graticule/precision.rb
-- site/index.html
-- site/plugin.html
-- site/stylesheets/style.css
-- test/config.yml.default
-- test/fixtures/responses/freethepostcode/not_found.txt
-- test/fixtures/responses/freethepostcode/success.txt
-- test/fixtures/responses/geocoder_ca/success.xml
-- test/fixtures/responses/geocoder_us/success.xml
-- test/fixtures/responses/geocoder_us/unknown.xml
-- test/fixtures/responses/geonames/missing.xml
-- test/fixtures/responses/geonames/success.xml
-- test/fixtures/responses/geonames/unknown.xml
-- test/fixtures/responses/google/badkey.xml
-- test/fixtures/responses/google/limit.xml
-- test/fixtures/responses/google/missing_address.xml
-- test/fixtures/responses/google/only_coordinates.xml
-- test/fixtures/responses/google/partial.xml
-- test/fixtures/responses/google/server_error.xml
-- test/fixtures/responses/google/success.xml
-- test/fixtures/responses/google/success_multiple_results.xml
-- test/fixtures/responses/google/unavailable.xml
-- test/fixtures/responses/google/unknown_address.xml
-- test/fixtures/responses/host_ip/private.txt
-- test/fixtures/responses/host_ip/success.txt
-- test/fixtures/responses/host_ip/unknown.txt
-- test/fixtures/responses/local_search_maps/empty.txt
-- test/fixtures/responses/local_search_maps/not_found.txt
-- test/fixtures/responses/local_search_maps/success.txt
-- test/fixtures/responses/mapquest/multi_result.xml
-- test/fixtures/responses/mapquest/success.xml
-- test/fixtures/responses/multimap/missing_params.xml
-- test/fixtures/responses/multimap/no_matches.xml
-- test/fixtures/responses/multimap/success.xml
-- test/fixtures/responses/yahoo/success.xml
-- test/fixtures/responses/yahoo/unknown_address.xml
-- test/graticule/distance_test.rb
-- test/graticule/geocoder/freethepostcode_test.rb
-- test/graticule/geocoder/geocoder_ca_test.rb
-- test/graticule/geocoder/geocoder_us_test.rb
-- test/graticule/geocoder/geocoders.rb
-- test/graticule/geocoder/geonames_test.rb
-- test/graticule/geocoder/google_test.rb
-- test/graticule/geocoder/host_ip_test.rb
-- test/graticule/geocoder/local_search_maps_test.rb
-- test/graticule/geocoder/mapquest_test.rb
-- test/graticule/geocoder/multi_test.rb
-- test/graticule/geocoder/multimap_test.rb
-- test/graticule/geocoder/yahoo_test.rb
-- test/graticule/geocoder_test.rb
-- test/graticule/location_test.rb
-- test/graticule/precision_test.rb
-- test/mocks/uri.rb
-- test/test_helper.rb
+- lib/graticule/version.rb
+- lib/graticule.rb
+- CHANGELOG.txt
+- LICENSE.txt
+- README.txt
 has_rdoc: true
 homepage: http://github.com/collectiveidea/graticule
 licenses: []
@@ -143,70 +133,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      version: 1.3.1
-  version: 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: graticule
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: API for using all the popular geocoding services.
-test_files: 
-- test/config.yml
-- test/config.yml.default
-- test/fixtures/responses/freethepostcode/not_found.txt
-- test/fixtures/responses/freethepostcode/success.txt
-- test/fixtures/responses/geocoder_ca/success.xml
-- test/fixtures/responses/geocoder_us/success.xml
-- test/fixtures/responses/geocoder_us/unknown.xml
-- test/fixtures/responses/geonames/missing.xml
-- test/fixtures/responses/geonames/success.xml
-- test/fixtures/responses/geonames/unknown.xml
-- test/fixtures/responses/google/badkey.xml
-- test/fixtures/responses/google/limit.xml
-- test/fixtures/responses/google/missing_address.xml
-- test/fixtures/responses/google/only_coordinates.xml
-- test/fixtures/responses/google/partial.xml
-- test/fixtures/responses/google/server_error.xml
-- test/fixtures/responses/google/success.xml
-- test/fixtures/responses/google/success_multiple_results.xml
-- test/fixtures/responses/google/unavailable.xml
-- test/fixtures/responses/google/unknown_address.xml
-- test/fixtures/responses/host_ip/private.txt
-- test/fixtures/responses/host_ip/success.txt
-- test/fixtures/responses/host_ip/unknown.txt
-- test/fixtures/responses/local_search_maps/empty.txt
-- test/fixtures/responses/local_search_maps/not_found.txt
-- test/fixtures/responses/local_search_maps/success.txt
-- test/fixtures/responses/mapquest/multi_result.xml
-- test/fixtures/responses/mapquest/success.xml
-- test/fixtures/responses/multimap/missing_params.xml
-- test/fixtures/responses/multimap/no_matches.xml
-- test/fixtures/responses/multimap/success.xml
-- test/fixtures/responses/yahoo/success.xml
-- test/fixtures/responses/yahoo/unknown_address.xml
-- test/graticule/distance_test.rb
-- test/graticule/geocoder/freethepostcode_test.rb
-- test/graticule/geocoder/geocoder_ca_test.rb
-- test/graticule/geocoder/geocoder_us_test.rb
-- test/graticule/geocoder/geocoders.rb
-- test/graticule/geocoder/geonames_test.rb
-- test/graticule/geocoder/google_test.rb
-- test/graticule/geocoder/host_ip_test.rb
-- test/graticule/geocoder/local_search_maps_test.rb
-- test/graticule/geocoder/mapquest_test.rb
-- test/graticule/geocoder/multi_test.rb
-- test/graticule/geocoder/multimap_test.rb
-- test/graticule/geocoder/yahoo_test.rb
-- test/graticule/geocoder_test.rb
-- test/graticule/location_test.rb
-- test/graticule/precision_test.rb
-- test/mocks/uri.rb
-- test/test_helper.rb
+test_files: []
+

data/.autotest

@@ -1,13 +0,0 @@
-Autotest.add_hook :initialize do |at|
-  at.clear_mappings
-
-  at.add_mapping %r%^lib/(.*)\.rb$% do |_, m|
-    at.files_matching %r%^test/#{m[1]}_test.rb$%
-  end
-
-  at.add_mapping(%r%^test/.*\.rb$%) {|filename, _| filename }
-
-  at.add_mapping %r%^test/fixtures/(.*)s.yml% do |_, _|
-    at.files_matching %r%^test/.*\.rb$%
-  end
-end

data/.gitignore

@@ -1,6 +0,0 @@
-test/config.yml
-*.gem
-pkg
-coverage
-rdoc
-.DS_Store

data/Rakefile

@@ -1,123 +0,0 @@
-begin
-  require 'jeweler'
-rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
-  exit 1
-end
-require 'rubygems'
-require 'activesupport'
-require 'rake/testtask'
-require 'rake/rdoctask'
-require 'rcov/rcovtask'
-
-Jeweler::Tasks.new do |s|
-  s.name              = "graticule"
-  s.rubyforge_project = "graticule"
-  s.author            = 'Brandon Keepers'
-  s.email             = 'brandon@opensoul.org'
-  s.summary           = "API for using all the popular geocoding services."
-  s.description       = 'Graticule is a geocoding API that provides a common interface to all the popular services, including Google, Yahoo, Geocoder.us, and MetaCarta.'
-  s.homepage          = "http://github.com/collectiveidea/graticule"
-  s.add_dependency    "activesupport"
-  s.add_dependency    'happymapper', '>=0.3.0'
-  s.has_rdoc          = true
-  s.extra_rdoc_files  = ["README.txt"]
-  s.rdoc_options      = ["--main", "README.rdoc", "--inline-source", "--line-numbers"]
-  s.test_files        = Dir['test/**/*']
-end
-
-desc 'Default: run unit tests.'
-task :default => :test
-
-desc 'Run the unit tests'
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib' << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
-end
-
-desc 'Generate documentatio'
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'Graticule'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README.txt')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-namespace :test do
-  desc "just rcov minus html output"
-  Rcov::RcovTask.new(:coverage) do |t|
-    # t.libs << 'test'
-    t.test_files = FileList['test/**/*_test.rb']
-    t.output_dir = 'coverage'
-    t.verbose = true
-    t.rcov_opts = %w(--exclude test,/usr/lib/ruby,/Library/Ruby,$HOME/.gem --sort coverage)
-  end
-end
-
-require 'rake/contrib/sshpublisher'
-namespace :rubyforge do
-
-  desc "Release gem and RDoc documentation to RubyForge"
-  task :release => ["rubyforge:release:gem", "rubyforge:release:docs"]
-
-  namespace :release do
-    desc "Publish RDoc to RubyForge."
-    task :docs => [:rdoc] do
-      config = YAML.load(
-          File.read(File.expand_path('~/.rubyforge/user-config.yml'))
-      )
-
-      host = "#{config['username']}@rubyforge.org"
-      remote_dir = "/var/www/gforge-projects/the-perfect-gem/"
-      local_dir = 'rdoc'
-
-      Rake::SshDirPublisher.new(host, remote_dir, local_dir).upload
-    end
-  end
-end
-
-require 'active_support'
-require 'net/http'
-require 'uri'
-RESPONSES_PATH = File.dirname(__FILE__) + '/test/fixtures/responses'
-
-def cache_responses(service)
-  test_config[service.to_s]['responses'].each do |file,url|
-    File.open("#{RESPONSES_PATH}/#{service}/#{file}", 'w') do |f|
-      f.puts Net::HTTP.get(URI.parse(url))
-    end
-  end
-end
-
-def test_config
-  file = File.dirname(__FILE__) + '/test/config.yml'
-  raise "Copy config.yml.default to config.yml and set the API keys" unless File.exists?(file)
-  @test_config ||= returning(YAML.load(File.read(file))) do |config|
-    config.each do |service,values|
-      values['responses'].each {|file,url| update_placeholders!(values, url) }
-    end
-  end
-end
-
-def update_placeholders!(config, thing)
-  config.each do |option, value|
-    thing.gsub!(":#{option}", value) if value.is_a?(String)
-  end
-end
-
-namespace :test do
-  namespace :cache do
-    desc 'Cache test responses from all the geocoders'
-    task :all => test_config.keys
-
-    test_config.keys.each do |service|
-      desc "Cache test responses for #{service}"
-      task service do
-        cache_responses(service)
-      end
-    end
-  end
-end
-