aub-graticule 0.2.11 → 0.3.0

data/Rakefile

@@ -9,19 +9,18 @@ require 'rake/rdoctask'
 require 'rcov/rcovtask'
 
 Jeweler::Tasks.new do |s|
-  s.name = "graticule"
-  s.rubyforge_project = "graticule"
+  s.name = "aub-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.homepage = "http://github.com/aub/graticule"
   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/**/*.{yml,rb}']
 end
+Jeweler::GemcutterTasks.new
 
 desc 'Default: run unit tests.'
 task :default => :test
@@ -33,7 +32,7 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = true
 end
 
-desc 'Generate documentatio'
+desc 'Generate documentation'
 Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'Graticule'
@@ -53,28 +52,6 @@ namespace :test do
   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
-
 namespace :test do
   namespace :cache do
     desc 'Cache test responses from all the free geocoders'
@@ -140,4 +117,4 @@ def update_placeholders!(config, thing)
   config.each do |option, value|
     thing.gsub!(":#{option}", value) if value.is_a?(String)
   end
-end
+end

data/VERSION

@@ -1 +1 @@
-0.2.11
+0.3.0

data/aub-graticule.gemspec

@@ -0,0 +1,144 @@
+# 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{aub-graticule}
+  s.version = "0.3.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Brandon Keepers"]
+  s.date = %q{2010-03-04}
+  s.default_executable = %q{geocode}
+  s.description = %q{Graticule is a geocoding API that provides a common interface to all the popular services, including Google, Yahoo, Geocoder.us, and MetaCarta.}
+  s.email = %q{brandon@opensoul.org}
+  s.executables = ["geocode"]
+  s.extra_rdoc_files = [
+    "README.txt"
+  ]
+  s.files = [
+    ".gitignore",
+     "CHANGELOG.txt",
+     "LICENSE.txt",
+     "Manifest.txt",
+     "README.txt",
+     "Rakefile",
+     "VERSION",
+     "aub-graticule.gemspec",
+     "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/geocoder/base.rb",
+     "lib/graticule/geocoder/bogus.rb",
+     "lib/graticule/geocoder/geocoder_ca.rb",
+     "lib/graticule/geocoder/geocoder_us.rb",
+     "lib/graticule/geocoder/google.rb",
+     "lib/graticule/geocoder/host_ip.rb",
+     "lib/graticule/geocoder/local_search_maps.rb",
+     "lib/graticule/geocoder/mapquest.rb",
+     "lib/graticule/geocoder/meta_carta.rb",
+     "lib/graticule/geocoder/multi.rb",
+     "lib/graticule/geocoder/multimap.rb",
+     "lib/graticule/geocoder/postcode_anywhere.rb",
+     "lib/graticule/geocoder/rest.rb",
+     "lib/graticule/geocoder/yahoo.rb",
+     "lib/graticule/location.rb",
+     "lib/graticule/version.rb",
+     "site/index.html",
+     "site/plugin.html",
+     "site/stylesheets/style.css",
+     "test/config.yml.default",
+     "test/fixtures/responses/geocoder_us/success.xml",
+     "test/fixtures/responses/geocoder_us/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/meta_carta/bad_address.xml",
+     "test/fixtures/responses/meta_carta/multiple.xml",
+     "test/fixtures/responses/meta_carta/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/postcode_anywhere/badkey.xml",
+     "test/fixtures/responses/postcode_anywhere/canada.xml",
+     "test/fixtures/responses/postcode_anywhere/empty.xml",
+     "test/fixtures/responses/postcode_anywhere/success.xml",
+     "test/fixtures/responses/postcode_anywhere/uk.xml",
+     "test/fixtures/responses/yahoo/success.xml",
+     "test/fixtures/responses/yahoo/unknown_address.xml",
+     "test/mocks/uri.rb",
+     "test/test_helper.rb",
+     "test/unit/graticule/distance_test.rb",
+     "test/unit/graticule/geocoder/geocoder_us_test.rb",
+     "test/unit/graticule/geocoder/geocoders.rb",
+     "test/unit/graticule/geocoder/google_test.rb",
+     "test/unit/graticule/geocoder/host_ip_test.rb",
+     "test/unit/graticule/geocoder/local_search_maps_test.rb",
+     "test/unit/graticule/geocoder/mapquest_test.rb",
+     "test/unit/graticule/geocoder/meta_carta_test.rb",
+     "test/unit/graticule/geocoder/multi_test.rb",
+     "test/unit/graticule/geocoder/multimap_test.rb",
+     "test/unit/graticule/geocoder/postcode_anywhere_test.rb",
+     "test/unit/graticule/geocoder/yahoo_test.rb",
+     "test/unit/graticule/geocoder_test.rb",
+     "test/unit/graticule/location_test.rb"
+  ]
+  s.homepage = %q{http://github.com/aub/graticule}
+  s.rdoc_options = ["--main", "README.rdoc", "--inline-source", "--line-numbers"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.6}
+  s.summary = %q{API for using all the popular geocoding services.}
+  s.test_files = [
+    "test/mocks/uri.rb",
+     "test/test_helper.rb",
+     "test/unit/graticule/distance_test.rb",
+     "test/unit/graticule/geocoder/geocoder_us_test.rb",
+     "test/unit/graticule/geocoder/geocoders.rb",
+     "test/unit/graticule/geocoder/google_test.rb",
+     "test/unit/graticule/geocoder/host_ip_test.rb",
+     "test/unit/graticule/geocoder/local_search_maps_test.rb",
+     "test/unit/graticule/geocoder/mapquest_test.rb",
+     "test/unit/graticule/geocoder/meta_carta_test.rb",
+     "test/unit/graticule/geocoder/multi_test.rb",
+     "test/unit/graticule/geocoder/multimap_test.rb",
+     "test/unit/graticule/geocoder/postcode_anywhere_test.rb",
+     "test/unit/graticule/geocoder/yahoo_test.rb",
+     "test/unit/graticule/geocoder_test.rb",
+     "test/unit/graticule/location_test.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
+    else
+    end
+  else
+  end
+end
+

data/lib/graticule.rb

@@ -1,26 +1,33 @@
 $:.unshift(File.dirname(__FILE__))
 
-require 'active_support'
-
-require 'graticule/version'
 require 'graticule/core_ext'
-require 'graticule/location'
 require 'graticule/geocoder'
-require 'graticule/geocoder/base'
-require 'graticule/geocoder/bogus'
-require 'graticule/geocoder/rest'
-require 'graticule/geocoder/google'
-require 'graticule/geocoder/host_ip'
-require 'graticule/geocoder/multi'
-require 'graticule/geocoder/yahoo'
-require 'graticule/geocoder/geocoder_ca'
-require 'graticule/geocoder/geocoder_us'
-require 'graticule/geocoder/local_search_maps'
-require 'graticule/geocoder/meta_carta'
-require 'graticule/geocoder/postcode_anywhere'
-require 'graticule/geocoder/multimap'
-require 'graticule/geocoder/mapquest'
-require 'graticule/distance'
-require 'graticule/distance/haversine'
-require 'graticule/distance/spherical'
-require 'graticule/distance/vincenty'
+
+module Graticule
+  autoload :Version,            'graticule/version'
+  autoload :Location,           'graticule/location'
+  autoload :Distance,           'graticule/distance'
+  
+  module Geocoder
+    autoload :Base,             'graticule/geocoder/base'
+    autoload :Bogus,            'graticule/geocoder/bogus'
+    autoload :GeocoderCa,       'graticule/geocoder/geocoder_ca'
+    autoload :GeocoderUs,       'graticule/geocoder/geocoder_us'
+    autoload :Google,           'graticule/geocoder/google'
+    autoload :HostIp,           'graticule/geocoder/host_ip'
+    autoload :LocalSearchMaps,  'graticule/geocoder/local_search_maps'
+    autoload :Mapquest,         'graticule/geocoder/mapquest'
+    autoload :MetaCarta,        'graticule/geocoder/meta_carta'
+    autoload :Multi,            'graticule/geocoder/multi'
+    autoload :Multimap,         'graticule/geocoder/multimap'
+    autoload :PostcodeAnywhere, 'graticule/geocoder/postcode_anywhere'
+    autoload :Rest,             'graticule/geocoder/rest'
+    autoload :Yahoo,            'graticule/geocoder/yahoo'
+  end
+
+  module Distance
+    autoload :Haversine,        'graticule/distance/haversine'
+    autoload :Spherical,        'graticule/distance/spherical'
+    autoload :Vincenty,         'graticule/distance/vincenty'
+  end
+end

data/lib/graticule/core_ext.rb

@@ -12,4 +12,12 @@ module Graticule
   end
 end
 
-Numeric.send :include, Graticule::RadiansAndDegrees
+unless Object.respond_to?(:blank?)
+  class Object
+    def blank?
+      respond_to?(:empty?) ? empty? : !self
+    end
+  end
+end
+
+Numeric.send :include, Graticule::RadiansAndDegrees

data/lib/graticule/geocoder.rb

@@ -8,7 +8,8 @@ module Graticule
   # See the documentation for your specific geocoder for more information
   #
   def self.service(name)
-    Geocoder.const_get name.to_s.camelize
+    clazz_name = name.to_s.gsub(/_(.)/) { $1.upcase }.gsub(/^(.)/) { $1.upcase }
+    Geocoder.const_get clazz_name
   end
   
   # Base error class
@@ -18,4 +19,4 @@ module Graticule
   # Raised when you try to locate an invalid address.
   class AddressError < Error; end
 
-end
+end

data/lib/graticule/geocoder/geocoder_us.rb

@@ -41,9 +41,10 @@ module Graticule #:nodoc:
       end
 
       def check_error(xml) #:nodoc:
-        raise AddressError, xml.text if xml.text =~ /couldn't find this address! sorry/
-        raise Error, xml.text if xml.text =~ /Your browser sent a request that this server could not understand./
-        raise Error, xml.text if !(xml.text =~ /geo:Point/)
+        text = xml.to_s
+        raise AddressError, text if text =~ /couldn't find this address! sorry/
+        raise Error, text if text =~ /Your browser sent a request that this server could not understand./
+        raise Error, text if !(text =~ /geo:Point/)
       end
 
     end

data/lib/graticule/geocoder/multimap.rb

@@ -52,9 +52,15 @@ module Graticule #:nodoc:
         location = Location.new
         location.precision = PRECISION[r.attributes['geocodeQuality']] || :unknown
         
-        location.street = r.elements['Address/Street'].text.titleize unless r.elements['Address/Street'].nil?
-        location.locality = r.elements['Address/Areas/Area'].text.titleize unless r.elements['Address/Areas/Area'].nil?
-        location.region = r.elements['Address/State'].text.titleize unless r.elements['Address/State'].nil?
+        location.street = r.elements['Address/Street'].text unless r.elements['Address/Street'].nil?
+        location.street.gsub!(/([A-Z])([A-Z]+)/) { "#{$1}#{$2.downcase}" } if location.street
+
+        location.locality = r.elements['Address/Areas/Area'].text unless r.elements['Address/Areas/Area'].nil?
+        location.locality.gsub!(/([A-Z])([A-Z]+)/) { "#{$1}#{$2.downcase}" } if location.locality
+
+        location.region = r.elements['Address/State'].text unless r.elements['Address/State'].nil?
+        location.region.gsub!(/([A-Z])([A-Z]+)/) { "#{$1}#{$2.downcase}" } if location.region
+
         location.postal_code = r.elements['Address/PostalCode'].text unless r.elements['Address/PostalCode'].nil?
         location.country = r.elements['Address/CountryCode'].text
         

data/lib/graticule/geocoder/yahoo.rb

@@ -55,8 +55,12 @@ module Graticule #:nodoc:
         location.latitude = r.elements['Latitude'].text.to_f
         location.longitude = r.elements['Longitude'].text.to_f
 
-        location.street = r.elements['Address'].text.titleize unless r.elements['Address'].text.blank?
-        location.locality = r.elements['City'].text.titleize unless r.elements['City'].text.blank?
+        location.street = r.elements['Address'].text
+        location.street.gsub!(/([A-Z])([A-Z]+)/) { "#{$1}#{$2.downcase}" } if location.street
+
+        location.locality = r.elements['City'].text
+        location.locality.gsub!(/([A-Z])([A-Z]+)/) { "#{$1}#{$2.downcase}" } if location.locality
+
         location.region = r.elements['State'].text
         location.postal_code = r.elements['Zip'].text
         location.country = r.elements['Country'].text
@@ -74,11 +78,8 @@ module Graticule #:nodoc:
       def make_url(params) #:nodoc:
         params[:appid] = @appid
         params[:output] = 'xml'
-
         super params
       end
-
     end
-    
   end
 end

data/lib/graticule/location.rb

@@ -22,7 +22,7 @@ module Graticule
     end
     
     def blank?
-      attributes.except(:precision).empty?
+      (attributes.keys - [:precision]).empty?
     end
     
     # Returns an Array with latitude and longitude.
@@ -37,8 +37,8 @@ module Graticule
     # Calculate the distance to another location.  See the various Distance formulas
     # for more information
     def distance_to(destination, options = {})
-      options = {:formula => :haversine, :units => :miles}.merge(options)
-      "Graticule::Distance::#{options[:formula].to_s.titleize}".constantize.distance(self, destination, options[:units])
+      formula = (options[:formula] || :haversine).to_s.gsub(/^(.)/) { $1.upcase }.gsub(/_(.)/) { $1.upcase }
+      Distance.const_get(formula).distance(self, destination, options[:units] || :miles)
     end
     
     # Where would I be if I dug through the center of the earth?

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: aub-graticule
 version: !ruby/object:Gem::Version 
-  version: 0.2.11
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Brandon Keepers
@@ -9,19 +14,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-20 00:00:00 -07:00
+date: 2010-03-04 00:00:00 -05:00
 default_executable: geocode
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
+dependencies: []
+
 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: 
@@ -38,6 +34,7 @@ files:
 - README.txt
 - Rakefile
 - VERSION
+- aub-graticule.gemspec
 - bin/geocode
 - graticule.gemspec
 - init.rb
@@ -118,8 +115,10 @@ files:
 - test/unit/graticule/geocoder/yahoo_test.rb
 - test/unit/graticule/geocoder_test.rb
 - test/unit/graticule/location_test.rb
-has_rdoc: false
-homepage: http://github.com/collectiveidea/graticule
+has_rdoc: true
+homepage: http://github.com/aub/graticule
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -132,18 +131,20 @@ 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 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
-rubyforge_project: graticule
-rubygems_version: 1.2.0
+rubyforge_project: 
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: API for using all the popular geocoding services.