graticule 2.0.0 → 2.0.1

data/README.textile

@@ -0,0 +1,43 @@
+h1. Graticule
+
+Graticule is a geocoding API for looking up address coordinates.  It supports many popular APIs, including Yahoo, Google, Geocoder.ca and Geocoder.us.
+
+h2. Usage
+
+<pre><code>require 'rubygems'
+require 'graticule'
+geocoder = Graticule.service(:google).new "api_key"
+location = geocoder.locate "61 East 9th Street, Holland, MI"</code></pre>
+
+h2. Distance Calculation
+
+Graticule includes 3 different distance formulas, Spherical (simplest but least accurate), Vincenty (most accurate and most complicated), and Haversine (somewhere inbetween).
+
+<pre><code>geocoder.locate("Holland, MI").distance_to(geocoder.locate("Chicago, IL"))
+#=> 101.997458788177</code></pre>
+
+h2. Command Line
+
+Graticule includes a command line interface (CLI).
+
+<pre><code>$ geocode -s yahoo -a yahookey Washington, DC
+Washington, DC US
+latitude: 38.895222, longitude: -77.036758</code></pre>
+
+h2. Mailing List
+
+Join us on the "mailing list":http://groups.google.com/group/graticule.
+
+h2. How to contribute
+
+If you find what you might think is a bug:
+
+# Check the "GitHub issue tracker":http://github.com/collectiveidea/graticule/issues/ to see if anyone else has had the same issue.
+# If you don't see anything, create an issue with information on how to reproduce it.
+
+If you want to contribute an enhancement or a fix:
+
+# Fork "the project":http://github.com/collectiveidea/graticule/ on GitHub.
+# Make your changes with tests.
+# Commit the changes without making changes to the Rakefile, VERSION, or any other files that aren't related to your enhancement or fix
+# Send a pull request.

data/lib/graticule.rb

@@ -21,6 +21,7 @@ require 'graticule/geocoder/local_search_maps'
 require 'graticule/geocoder/freethepostcode'
 require 'graticule/geocoder/multimap'
 require 'graticule/geocoder/mapquest'
+require 'graticule/geocoder/simple_geo'
 require 'graticule/distance'
 require 'graticule/distance/haversine'
 require 'graticule/distance/spherical'

data/lib/graticule/cli.rb

@@ -45,7 +45,7 @@ module Graticule
       result = Graticule.service(options[:service]).new(*options[:api_key].split(',')).locate(options[:location])
       location = (result.is_a?(Array) ? result.first : result)
       if location
-        out << location.to_s(:coordinates => true)
+        out << location.to_s(:coordinates => true) + "\n"
         exit 0
       else
         out << "Location not found"

data/lib/graticule/geocoder/simple_geo.rb

@@ -0,0 +1,64 @@
+require 'json'
+
+module Graticule
+  module Geocoder
+
+    # First you need a SimpleGeo JSONP API key.  You can register for one here:
+    # http://simplegeo.com/docs/clients-code-libraries/javascript-sdk
+    #
+    #     gg = Graticule.service(:SimpleGeo).new(SIMPLEGEO_TOKEN)
+    #     location = gg.locate '1600 Amphitheater Pkwy, Mountain View, CA'
+    #     location.coordinates
+    #     #=> [37.423111, -122.081783]
+    #
+    class SimpleGeo < Base
+
+      def initialize(token)
+        @token  = token
+        @url    = URI.parse 'http://api.simplegeo.com/1.0/context/address.json?'
+      end
+
+      def locate(query)
+        get :address => "#{query}"
+      end
+
+      # reimplement Base#get so we can return only the time zone for replacing geonames
+      def time_zone(query)
+        response = prepare_response(make_url(:address => "#{query}").open('User-Agent' => USER_AGENT).read)
+        check_error(response)
+        return parse_time_zone(response)
+      rescue OpenURI::HTTPError => e
+        check_error(prepare_response(e.io.read))
+        raise
+      end
+
+    private
+
+      def prepare_response(response)
+        JSON.parse(response)
+      end
+
+      def parse_response(response)
+        Location.new(
+          :latitude    => response["query"]["latitude"],
+          :longitude   => response["query"]["longitude"],
+          :precision   => :unknown
+        )
+      end
+
+      def parse_time_zone(response)
+        response["features"].detect do |feature|
+          feature["classifiers"].first["category"] == "Time Zone"
+        end["name"]
+      end
+
+      def check_error(response)
+        raise Error, response["message"] unless response["message"].blank?
+      end
+
+      def make_url(params)
+        super params.merge(:token => @token)
+      end
+    end
+  end
+end

data/lib/graticule/location.rb

@@ -1,60 +1,56 @@
 module Graticule
-  
+
   # A geographic location
   class Location
     attr_accessor :latitude, :longitude, :street, :locality, :region, :postal_code, :country, :precision, :warning
     alias_method :city, :locality
     alias_method :state, :region
     alias_method :zip, :postal_code
-    
+
     def initialize(attrs = {})
       attrs.each do |key,value|
         self.send("#{key}=", value)
       end
       self.precision ||= :unknown
     end
-    
+
     def precision=(precision)
       @precision = Precision.new(precision.to_s)
     end
-    
+
     def attributes
       [:latitude, :longitude, :street, :locality, :region, :postal_code, :country, :precision].inject({}) do |result,attr|
         result[attr] = self.send(attr) unless self.send(attr).blank?
         result
       end
     end
-    
+
     def blank?
       attributes.except(:precision).empty?
     end
-    
+
     # Returns an Array with latitude and longitude.
     def coordinates
       [latitude, longitude]
     end
-    
+
     def ==(other)
       other.respond_to?(:attributes) ? attributes == other.attributes : false
     end
-    
+
     # 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])
     end
-    
+
     # Where would I be if I dug through the center of the earth?
     def antipode
       Location.new :latitude => -latitude, :longitude => longitude + (longitude >= 0 ? -180 : 180)
     end
     alias_method :antipodal_location, :antipode
-    
-    def time_zone
-      Graticule::Geocoder::Geonames.new.time_zone self
-    end
-    
+
     def to_s(options = {})
       options = {:coordinates => false, :country => true}.merge(options)
       result = ""
@@ -64,6 +60,6 @@ module Graticule
       result << "\nlatitude: #{latitude}, longitude: #{longitude}" if options[:coordinates] && [latitude, longitude].any?
       result
     end
-    
+
   end
 end

data/lib/graticule/version.rb

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

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: graticule
 version: !ruby/object:Gem::Version 
+  hash: 13
   prerelease: false
   segments: 
   - 2
   - 0
-  - 0
-  version: 2.0.0
+  - 1
+  version: 2.0.1
 platform: ruby
 authors: 
 - Brandon Keepers
@@ -15,71 +16,95 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-01 00:00:00 -04:00
+date: 2011-02-28 00:00:00 -05:00
 default_executable: geocode
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
   version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   requirement: *id001
+  type: :runtime
   name: activesupport
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  type: :runtime
+- !ruby/object:Gem::Dependency 
   version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   requirement: *id002
+  type: :runtime
   name: i18n
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  type: :runtime
+- !ruby/object:Gem::Dependency 
   version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 0
         - 3
         - 0
         version: 0.3.0
   requirement: *id003
+  type: :runtime
   name: happymapper
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  type: :development
+- !ruby/object:Gem::Dependency 
   version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   requirement: *id004
-  name: mocha
-- !ruby/object:Gem::Dependency 
+  type: :runtime
+  name: json
   prerelease: false
-  type: :development
+- !ruby/object:Gem::Dependency 
   version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   requirement: *id005
+  type: :development
+  name: mocha
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id006
+  type: :development
   name: rcov
+  prerelease: false
 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: 
@@ -87,7 +112,7 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
-- README.txt
+- README.textile
 files: 
 - bin/geocode
 - lib/graticule/cli.rb
@@ -108,6 +133,7 @@ files:
 - lib/graticule/geocoder/mapquest.rb
 - lib/graticule/geocoder/multi.rb
 - lib/graticule/geocoder/multimap.rb
+- lib/graticule/geocoder/simple_geo.rb
 - lib/graticule/geocoder/yahoo.rb
 - lib/graticule/geocoder.rb
 - lib/graticule/location.rb
@@ -116,7 +142,7 @@ files:
 - lib/graticule.rb
 - CHANGELOG.txt
 - LICENSE.txt
-- README.txt
+- README.textile
 has_rdoc: true
 homepage: http://github.com/collectiveidea/graticule
 licenses: []
@@ -130,23 +156,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: graticule
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: API for using all the popular geocoding services.

data/README.txt

@@ -1,45 +0,0 @@
-= Graticule
-
-Graticule is a geocoding API for looking up address coordinates.  It supports many popular APIs, including Yahoo, Google, Geocoder.ca and Geocoder.us.
-
-= Usage
-
-  require 'rubygems'
-  require 'graticule'
-  geocoder = Graticule.service(:google).new "api_key"
-  location = geocoder.locate "61 East 9th Street, Holland, MI"
-
-= Distance Calculation
-
-Graticule includes 3 different distance formulas, Spherical (simplest but least accurate), Vincenty (most accurate and most complicated), and Haversine (somewhere inbetween).
-
-  geocoder.locate("Holland, MI").distance_to(geocoder.locate("Chicago, IL"))
-  #=> 101.997458788177
-  
-= Command Line
-
-Graticule includes a command line interface (CLI).
-
-  $ geocode -s yahoo -a yahookey Washington, DC
-  Washington, DC US
-  latitude: 38.895222, longitude: -77.036758
-
-= Mailing List
-
-Join us on the mailing list at http://groups.google.com/group/graticule
-
-= How to contribute
-
-If you find what you might think is a bug:
-
-1. Check the GitHub issue tracker to see if anyone else has had the same issue.
-   http://github.com/collectiveidea/graticule/issues/
-2. If you don't see anything, create an issue with information on how to reproduce it.
-
-If you want to contribute an enhancement or a fix:
-
-1. Fork the project on github.
-   http://github.com/collectiveidea/graticule/
-2. Make your changes with tests.
-3. Commit the changes without making changes to the Rakefile, VERSION, or any other files that aren't related to your enhancement or fix
-4. Send a pull request.