geocoder 1.0.5 → 1.1.0

data/CHANGELOG.rdoc

@@ -2,9 +2,22 @@
 
 Per-release changes to Geocoder.
 
+== 1.1.0 (2011 Dec 3)
+
+* A block passed to geocoded_by is now always executed, even if the geocoding service returns no results. This means you need to make sure you have results before trying to assign data to your object.
+* Fix issues with joins and row counts (issues #49, 86, and 108) by not using GROUP BY clause with ActiveRecord scopes.
+* Fix incorrect object ID when join used (fixes issue #140).
+* Fix calculation of bounding box which spans 180th meridian (thanks github.com/hwuethrich).
+* Add within_bounding_box scope for ActiveRecord-based models (thanks github.com/gavinhughes and dbloete).
+* Add option to raise Geocoder::OverQueryLimitError for Google geocoding service.
+* Add support for Nominatim geocoding service (thanks github.com/wranglerdriver).
+* Add support for API key to Geocoder.ca geocoding service (thanks github.com/ryanLonac).
+* Add support for state to Yandex results (thanks github.com/tipugin).
+
 == 1.0.5 (2011 Oct 26)
 
 * Fix error with `rake assets:precompile` (thanks github.com/Sush).
+* Fix HTTPS support (thanks github.com/rsanheim).
 * Improve cache interface.
 
 == 1.0.4 (2011 Sep 18)

data/README.rdoc

@@ -50,7 +50,7 @@ Next, your model must tell Geocoder which method returns your object's geocodabl
 
 For reverse geocoding, tell Geocoder which attributes store latitude and longitude:
 
-  reverse_geocoded_by :lat, :lon
+  reverse_geocoded_by :latitude, :longitude
   after_validation :reverse_geocode  # auto-fetch address
 
 === Mongoid
@@ -190,7 +190,7 @@ If your model has +street+, +city+, +state+, and +country+ attributes you might
 
 For reverse geocoding you can also specify an alternate name attribute where the address will be stored, for example:
 
-  reverse_geocoded_by :lat, :lon, :address => :location  # ActiveRecord
+  reverse_geocoded_by :latitude, :longitude, :address => :location  # ActiveRecord
   reverse_geocoded_by :coordinates, :address => :loc     # MongoDB
 
 
@@ -198,7 +198,7 @@ For reverse geocoding you can also specify an alternate name attribute where the
 
 So far we have looked at shortcuts for assigning geocoding results to object attributes. However, if you need to do something fancy you can skip the auto-assignment by providing a block (takes the object to be geocoded and an array of <tt>Geocoder::Result</tt> objects) in which you handle the parsed geocoding result any way you like, for example:
 
-  reverse_geocoded_by :lat, :lon do |obj,results|
+  reverse_geocoded_by :latitude, :longitude do |obj,results|
     if geo = results.first
       obj.city    = geo.city
       obj.zipcode = geo.postal_code
@@ -294,6 +294,17 @@ Documentation:: http://msdn.microsoft.com/en-us/library/ff701715.aspx
 Terms of Service:: http://www.microsoft.com/maps/product/terms.html
 Limitations:: No country codes or state names. Must be used on "public-facing, non-password protected web sites," "in conjunction with Bing Maps or an application that integrates Bing Maps."
 
+==== Nominatim (<tt>:nominatim</tt>)
+
+API key:: none
+Quota:: 1 request/second
+Region:: world
+SSL support:: no
+Languages:: ?
+Documentation:: http://wiki.openstreetmap.org/wiki/Nominatim
+Terms of Service:: http://wiki.openstreetmap.org/wiki/Nominatim_usage_policy
+Limitations:: Please limit request rate to 1 per second and include your contact information in User-Agent headers. Data licensed under CC-BY-SA (you must provide attribution).
+
 ==== Yandex (<tt>:yandex</tt>)
 
 API key:: required

data/Rakefile

@@ -4,11 +4,17 @@ Bundler::GemHelper.install_tasks
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/*_test.rb'
+  test.pattern = 'test/*_test.rb'
   test.verbose = true
 end
 
-task :default => :test
+Rake::TestTask.new(:integration) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/integration/*_test.rb'
+  test.verbose = true
+end
+
+task :default => [:test, :integration]
 
 require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|

data/lib/geocoder.rb

@@ -1,5 +1,6 @@
 require "geocoder/configuration"
 require "geocoder/calculations"
+require "geocoder/exceptions"
 require "geocoder/cache"
 require "geocoder/request"
 require "geocoder/models/active_record"
@@ -56,7 +57,7 @@ module Geocoder
   # All street address lookups, default first.
   #
   def street_lookups
-    [:google, :google_premier, :yahoo, :bing, :geocoder_ca, :yandex]
+    [:google, :google_premier, :yahoo, :bing, :geocoder_ca, :yandex, :nominatim]
   end
 
   ##
@@ -67,11 +68,6 @@ module Geocoder
   end
 
 
-  # exception classes
-  class Error < StandardError; end
-  class ConfigurationError < Error; end
-
-
   private # -----------------------------------------------------------------
 
   ##

data/lib/geocoder/cli.rb

@@ -13,8 +13,13 @@ module Geocoder
         opts.separator "\nOptions: "
 
         opts.on("-k <key>", "--key <key>",
-          "Key for geocoding API (optional for most)") do |key|
-          Geocoder::Configuration.api_key = key
+          "Key for geocoding API (optional for most). For Google Premier use 'key client channel' separated by spaces") do |key|
+          premier_key = key.split(' ')
+          if premier_key.length == 3
+            Geocoder::Configuration.api_key = premier_key
+          else
+            Geocoder::Configuration.api_key = key
+          end
         end
 
         opts.on("-l <language>", "--language <language>",

data/lib/geocoder/exceptions.rb

@@ -0,0 +1,11 @@
+module Geocoder
+
+  class Error < StandardError
+  end
+
+  class ConfigurationError < Error
+  end
+
+  class OverQueryLimitError < Error
+  end
+end

data/lib/geocoder/lookups/base.rb

@@ -91,13 +91,17 @@ module Geocoder
       end
 
       ##
-      # Raise exception instead of warning for specified exceptions.
+      # Raise exception if configuration specifies it should be raised.
+      # Return false if exception not raised.
       #
-      def raise_error(err)
-        raise err if Geocoder::Configuration.always_raise.include?(err.class)
+      def raise_error(error, message = nil)
+        if Geocoder::Configuration.always_raise.include?(error.class)
+          raise error, message
+        else
+          false
+        end
       end
 
-
       ##
       # Returns a parsed search result (Ruby hash).
       #
@@ -141,8 +145,11 @@ module Geocoder
       def fetch_raw_data(query, reverse = false)
         timeout(Geocoder::Configuration.timeout) do
           url = query_url(query, reverse)
+          uri = URI.parse(url)
           unless cache and response = cache[url]
-            response = http_client.get_response(URI.parse(url)).body
+            client = http_client.new(uri.host, uri.port)
+            client.use_ssl = true if Geocoder::Configuration.use_https
+            response = client.get(uri.request_uri).body
             if cache
               cache[url] = response
             end

data/lib/geocoder/lookups/geocoder_ca.rb

@@ -22,7 +22,8 @@ module Geocoder::Lookup
       params = {
         :geoit    => "xml",
         :jsonp    => 1,
-        :callback => "test"
+        :callback => "test",
+        :auth     => Geocoder::Configuration.api_key
       }
       if reverse
         lat,lon = query.split(',')

data/lib/geocoder/lookups/google.rb

@@ -15,7 +15,8 @@ module Geocoder::Lookup
       case doc['status']; when "OK" # OK status implies >0 results
         return doc['results']
       when "OVER_QUERY_LIMIT"
-        warn "Google Geocoding API error: over query limit."
+        raise_error(Geocoder::OverQueryLimitError) ||
+          warn("Google Geocoding API error: over query limit.")
       when "REQUEST_DENIED"
         warn "Google Geocoding API error: request denied."
       when "INVALID_REQUEST"

data/lib/geocoder/lookups/nominatim.rb

@@ -0,0 +1,37 @@
+require 'geocoder/lookups/base'
+require "geocoder/results/nominatim"
+
+module Geocoder::Lookup
+  class Nominatim < Base
+
+    def map_link_url(coordinates)
+      "http://www.openstreetmap.org/?lat=#{coordinates[0]}&lon=#{coordinates[1]}&zoom=15&layers=M"
+    end
+
+    private # ---------------------------------------------------------------
+
+    def results(query, reverse = false)
+      return [] unless doc = fetch_data(query, reverse)
+      doc.is_a?(Array) ? doc : [doc]
+    end
+
+    def query_url(query, reverse = false)
+      params = {
+        :format => "json",
+        :polygon => "1",
+        :addressdetails => "1",
+        :"accept-language" => Geocoder::Configuration.language
+      }
+      if (reverse)
+        method = 'reverse'
+        parts = query.split(/\s*,\s*/);
+        params[:lat] = parts[0]
+        params[:lon] = parts[1]
+      else
+        method = 'search'
+        params[:q] = query
+      end
+      "http://nominatim.openstreetmap.org/#{method}?" + hash_to_query(params)
+    end
+  end
+end

data/lib/geocoder/results/nominatim.rb

@@ -0,0 +1,67 @@
+require 'geocoder/results/base'
+
+module Geocoder::Result
+  class Nominatim < Base
+
+    def house_number
+      @data['address']['house_number']
+    end
+
+    def address
+      @data['display_name']
+    end
+
+    def street
+      @data['address']['road']
+    end
+
+    def city
+      @data['address']['city']
+    end
+
+    def village
+      @data['address']['villiage']
+    end
+
+    def town
+      @data['address']['town']
+    end
+
+    def state
+      @data['address']['state']
+    end
+
+    alias_method :state_code, :state
+
+    def postal_code
+      @data['address']['postcode']
+    end
+
+    def county
+      @data['address']['county']
+    end
+
+    def country
+      @data['address']['country']
+    end
+
+    def country_code
+      @data['address']['country_code']
+    end
+
+    def coordinates
+      [@data['lat'].to_f, @data['lon'].to_f]
+    end
+
+    def self.response_attributes
+      %w[place_id, osm_type, osm_id, boundingbox, license,
+         polygonpoints, display_name, class, type, stadium, suburb]
+    end
+
+    response_attributes.each do |a|
+      define_method a do
+        @data[a]
+      end
+    end
+  end
+end

data/lib/geocoder/results/yandex.rb

@@ -12,7 +12,11 @@ module Geocoder::Result
     end
 
     def city
-      address_details['Locality']['LocalityName']
+      if state.empty?
+        address_details['Locality']['LocalityName']
+      else
+        address_details['AdministrativeArea']['Locality']['LocalityName']
+      end
     end
 
     def country
@@ -24,7 +28,11 @@ module Geocoder::Result
     end
 
     def state
-      ""
+      if address_details['AdministrativeArea']
+        address_details['AdministrativeArea']['AdministrativeAreaName']
+      else
+        ""
+      end
     end
 
     def state_code

data/lib/geocoder/stores/active_record.rb

@@ -39,6 +39,25 @@ module Geocoder::Store
             where(:id => false) # no results if no lat/lon given
           end
         }
+
+
+        ##
+        # Find all objects within the area of a given bounding box.
+        # Bounds must be an array of locations specifying the southwest
+        # corner followed by the northeast corner of the box
+        # (<tt>[[sw_lat, sw_lon], [ne_lat, ne_lon]]</tt>).
+        #
+        scope :within_bounding_box, lambda{ |bounds|
+          sw_lat, sw_lng, ne_lat, ne_lng = bounds.flatten if bounds
+          return where(:id => false) unless sw_lat && sw_lng && ne_lat && ne_lng
+          spans = "latitude BETWEEN #{sw_lat} AND #{ne_lat} AND "
+          spans << if sw_lng > ne_lng   # Handle a box that spans 180
+            "longitude BETWEEN #{sw_lng} AND 180 OR longitude BETWEEN -180 AND #{ne_lng}"
+          else
+            "longitude BETWEEN #{sw_lng} AND #{ne_lng}"
+          end
+          { :conditions => spans }
+        }
       end
     end
 
@@ -114,12 +133,12 @@ module Geocoder::Store
           "POWER(SIN((#{latitude} - #{lat_attr}) * PI() / 180 / 2), 2) + " +
           "COS(#{latitude} * PI() / 180) * COS(#{lat_attr} * PI() / 180) * " +
           "POWER(SIN((#{longitude} - #{lon_attr}) * PI() / 180 / 2), 2) ))"
-        options[:order] ||= "#{distance} ASC"
+        conditions = ["#{distance} <= ?", radius]
         default_near_scope_options(latitude, longitude, radius, options).merge(
-          :select => "#{options[:select] || '*'}, " +
+          :select => "#{options[:select] || "#{table_name}.*"}, " +
             "#{distance} AS distance" +
             (bearing ? ", #{bearing} AS bearing" : ""),
-          :having => "#{distance} <= #{radius}"
+          :conditions => add_exclude_condition(conditions, options[:exclude])
         )
       end
 
@@ -155,11 +174,16 @@ module Geocoder::Store
 
         distance = "(#{dy} * ABS(#{lat_attr} - #{latitude}) * #{factor}) + " +
           "(#{dx} * ABS(#{lon_attr} - #{longitude}) * #{factor})"
+        b = Geocoder::Calculations.bounding_box([latitude, longitude], radius, options)
+        conditions = [
+          "#{lat_attr} BETWEEN ? AND ? AND #{lon_attr} BETWEEN ? AND ?"] +
+          [b[0], b[2], b[1], b[3]
+        ]
         default_near_scope_options(latitude, longitude, radius, options).merge(
-          :select => "#{options[:select] || '*'}, " +
+          :select => "#{options[:select] || "#{table_name}.*"}, " +
             "#{distance} AS distance" +
             (bearing ? ", #{bearing} AS bearing" : ""),
-          :order => distance
+          :conditions => add_exclude_condition(conditions, options[:exclude])
         )
       end
 
@@ -167,24 +191,24 @@ module Geocoder::Store
       # Options used for any near-like scope.
       #
       def default_near_scope_options(latitude, longitude, radius, options)
-        lat_attr = geocoder_options[:latitude]
-        lon_attr = geocoder_options[:longitude]
-        b = Geocoder::Calculations.bounding_box([latitude, longitude], radius, options)
-        conditions = \
-          ["#{lat_attr} BETWEEN ? AND ? AND #{lon_attr} BETWEEN ? AND ?"] +
-          [b[0], b[2], b[1], b[3]]
-        if obj = options[:exclude]
-          conditions[0] << " AND #{table_name}.id != ?"
-          conditions << obj.id
-        end
         {
-          :group  => columns.map{ |c| "#{table_name}.#{c.name}" }.join(','),
-          :order  => options[:order],
+          :order  => options[:order] || "distance",
           :limit  => options[:limit],
-          :offset => options[:offset],
-          :conditions => conditions
+          :offset => options[:offset]
         }
       end
+
+      ##
+      # Adds a condition to exclude a given object by ID.
+      # The given conditions MUST be an array.
+      #
+      def add_exclude_condition(conditions, exclude)
+        if exclude
+          conditions[0] << " AND #{table_name}.id != ?"
+          conditions << exclude.id
+        end
+        conditions
+      end
     end
 
     ##
@@ -193,12 +217,13 @@ module Geocoder::Store
     #
     def geocode
       do_lookup(false) do |o,rs|
-        r = rs.first
-        unless r.latitude.nil? or r.longitude.nil?
-          o.send :write_attribute, self.class.geocoder_options[:latitude],  r.latitude
-          o.send :write_attribute, self.class.geocoder_options[:longitude], r.longitude
+        if r = rs.first
+          unless r.latitude.nil? or r.longitude.nil?
+            o.send :write_attribute, self.class.geocoder_options[:latitude],  r.latitude
+            o.send :write_attribute, self.class.geocoder_options[:longitude], r.longitude
+          end
+          r.coordinates
         end
-        r.coordinates
       end
     end
 

data/lib/geocoder/stores/base.rb

@@ -98,18 +98,17 @@ module Geocoder
           return
         end
 
-        if (results = Geocoder.search(query)).size > 0
+        results = Geocoder.search(query)
 
-          # execute custom block, if specified in configuration
-          block_key = reverse ? :reverse_block : :geocode_block
-          if custom_block = options[block_key]
-            custom_block.call(self, results)
+        # execute custom block, if specified in configuration
+        block_key = reverse ? :reverse_block : :geocode_block
+        if custom_block = options[block_key]
+          custom_block.call(self, results)
 
-          # else execute block passed directly to this method,
-          # which generally performs the "auto-assigns"
-          elsif block_given?
-            yield(self, results)
-          end
+        # else execute block passed directly to this method,
+        # which generally performs the "auto-assigns"
+        elsif block_given?
+          yield(self, results)
         end
       end
     end

data/lib/geocoder/stores/mongo_base.rb

@@ -56,11 +56,12 @@ module Geocoder::Store
     #
     def geocode
       do_lookup(false) do |o,rs|
-        r = rs.first
-        unless r.coordinates.nil?
-          o.send :write_attribute, self.class.geocoder_options[:coordinates], r.coordinates.reverse
+        if r = rs.first
+          unless r.coordinates.nil?
+            o.send :write_attribute, self.class.geocoder_options[:coordinates], r.coordinates.reverse
+          end
+          r.coordinates
         end
-        r.coordinates
       end
     end
 

data/lib/geocoder/version.rb

@@ -1,3 +1,3 @@
 module Geocoder
-  VERSION = "1.0.5"
+  VERSION = "1.1.0"
 end

data/test/error_handling_test.rb

@@ -3,6 +3,10 @@ require 'test_helper'
 
 class ErrorHandlingTest < Test::Unit::TestCase
 
+  def teardown
+    Geocoder::Configuration.always_raise = []
+  end
+
   def test_does_not_choke_on_timeout
     # keep test output clean: suppress timeout warning
     orig = $VERBOSE; $VERBOSE = nil
@@ -21,7 +25,6 @@ class ErrorHandlingTest < Test::Unit::TestCase
         lookup.send(:results, "timeout")
       end
     end
-    Geocoder::Configuration.always_raise = []
   end
 
   def test_always_raise_socket_error
@@ -32,6 +35,5 @@ class ErrorHandlingTest < Test::Unit::TestCase
         lookup.send(:results, "socket_error")
       end
     end
-    Geocoder::Configuration.always_raise = []
   end
 end

data/test/fixtures/nominatim_madison_square_garden.json

@@ -0,0 +1,150 @@
+[
+
+    {
+        "place_id": "30632629",
+        "licence": "Data Copyright OpenStreetMap Contributors, Some Rights Reserved. CC-BY-SA 2.0.",
+        "osm_type": "way",
+        "osm_id": "24801588",
+        "boundingbox": [
+            "40.749828338623",
+            "40.7511596679688",
+            "-73.9943389892578",
+            "-73.9926528930664"
+        ],
+        "polygonpoints": [
+            [
+                "-73.9943346",
+                "40.7503638"
+            ],
+            [
+                "-73.9942745",
+                "40.7504158"
+            ],
+            [
+                "-73.9942593",
+                "40.750629"
+            ],
+            [
+                "-73.9941343",
+                "40.7508432"
+            ],
+            [
+                "-73.9939794",
+                "40.7509703"
+            ],
+            [
+                "-73.9938042",
+                "40.7510532"
+            ],
+            [
+                "-73.9938025",
+                "40.7511311"
+            ],
+            [
+                "-73.9936051",
+                "40.7511571"
+            ],
+            [
+                "-73.9935673",
+                "40.751105"
+            ],
+            [
+                "-73.9934095",
+                "40.7511089"
+            ],
+            [
+                "-73.9931235",
+                "40.7510548"
+            ],
+            [
+                "-73.9928863",
+                "40.7509311"
+            ],
+            [
+                "-73.9928068",
+                "40.750949"
+            ],
+            [
+                "-73.992721",
+                "40.7508515"
+            ],
+            [
+                "-73.9927444",
+                "40.7507889"
+            ],
+            [
+                "-73.9926693",
+                "40.7506457"
+            ],
+            [
+                "-73.9926597",
+                "40.7503657"
+            ],
+            [
+                "-73.9928305",
+                "40.7500953"
+            ],
+            [
+                "-73.9929757",
+                "40.7499911"
+            ],
+            [
+                "-73.9931281",
+                "40.7499238"
+            ],
+            [
+                "-73.993133",
+                "40.7498631"
+            ],
+            [
+                "-73.9932961",
+                "40.7498306"
+            ],
+            [
+                "-73.9933664",
+                "40.7498742"
+            ],
+            [
+                "-73.993471",
+                "40.7498701"
+            ],
+            [
+                "-73.9938023",
+                "40.7499263"
+            ],
+            [
+                "-73.9940703",
+                "40.7500756"
+            ],
+            [
+                "-73.9941876",
+                "40.7502038"
+            ],
+            [
+                "-73.9942831",
+                "40.7502142"
+            ],
+            [
+                "-73.9943346",
+                "40.7503638"
+            ]
+        ],
+        "lat": "40.7504928941818",
+        "lon": "-73.993466492276",
+        "display_name": "Madison Square Garden, West 31st Street, Long Island City, New York City, New York, 10001, United States of America",
+        "class": "leisure",
+        "type": "stadium",
+        "address": {
+            "stadium": "Madison Square Garden",
+            "road": "West 31st Street",
+            "suburb": "Long Island City",
+            "city": "New York City",
+            "county": "New York",
+            "state": "New York",
+            "postcode": "10001",
+            "country": "United States of America",
+            "country_code": "us"
+        }
+    }
+
+]

data/test/fixtures/nominatim_no_results.json

@@ -0,0 +1 @@
+[ ]

data/test/geocoder_test.rb

@@ -32,6 +32,12 @@ class GeocoderTest < Test::Unit::TestCase
     assert_equal coords, [v.latitude, v.longitude]
   end
 
+  def test_geocode_block_executed_when_no_results
+    v = Event.new("Nowhere", "no results")
+    v.geocode
+    assert_equal "NOT FOUND", v.coords_string
+  end
+
   def test_reverse_geocode_assigns_and_returns_address
     v = Landmark.new(*landmark_params(:msg))
     address = "4 Penn Plaza, New York, NY 10001, USA"

data/test/integration/smoke_test.rb

@@ -0,0 +1,24 @@
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), *%w[ .. .. lib]))
+require 'pathname'
+require 'rubygems'
+require 'test/unit'
+require 'geocoder'
+
+class SmokeTest < Test::Unit::TestCase
+
+  def test_simple_zip_code_search
+    result = Geocoder.search "27701"
+    assert_equal "Durham", result.first.city
+    assert_equal "North Carolina", result.first.state
+  end
+
+  def test_simple_zip_code_search_with_ssl
+    Geocoder::Configuration.use_https = true
+    result = Geocoder.search "27701"
+    assert_equal "Durham", result.first.city
+    assert_equal "North Carolina", result.first.state
+  ensure
+    Geocoder::Configuration.use_https = false
+  end
+
+end

data/test/services_test.rb

@@ -110,4 +110,19 @@ class ServicesTest < Test::Unit::TestCase
     results = Geocoder.search("no results")
     assert_equal 0, results.length
   end
+
+  # --- Nominatim ---
+
+   def test_nominatim_result_components
+    Geocoder::Configuration.lookup = :nominatim
+    result = Geocoder.search("Madison Square Garden, New York, NY").first
+    assert_equal "10001", result.postal_code
+  end
+
+  def test_nominatim_address_formatting
+    Geocoder::Configuration.lookup = :nominatim
+    result = Geocoder.search("Madison Square Garden, New York, NY").first
+    assert_equal "Madison Square Garden, West 31st Street, Long Island City, New York City, New York, 10001, United States of America",
+      result.address
+  end
 end

data/test/test_helper.rb

@@ -150,6 +150,19 @@ module Geocoder
       end
     end
 
+  class Nominatim < Base
+      private #-----------------------------------------------------------------
+      def fetch_raw_data(query, reverse = false)
+        raise TimeoutError if query == "timeout"
+        raise SocketError if query == "socket_error"
+        file = case query
+          when "no results";  :no_results
+          else                :madison_square_garden
+        end
+        read_fixture "nominatim_#{file}.json"
+      end
+    end
+
   end
 end
 
@@ -187,6 +200,8 @@ class Event < ActiveRecord::Base
   geocoded_by :address do |obj,results|
     if result = results.first
       obj.coords_string = "#{result.latitude},#{result.longitude}"
+    else
+      obj.coords_string = "NOT FOUND"
     end
   end
 

metadata

@@ -2,7 +2,7 @@
 name: geocoder
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.5
+  version: 1.1.0
 platform: ruby
 authors: 
 - Alex Reisner
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-26 00:00:00 -04:00
+date: 2011-12-03 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -35,12 +35,14 @@ files:
 - lib/geocoder/calculations.rb
 - lib/geocoder/cli.rb
 - lib/geocoder/configuration.rb
+- lib/geocoder/exceptions.rb
 - lib/geocoder/lookups/base.rb
 - lib/geocoder/lookups/bing.rb
 - lib/geocoder/lookups/freegeoip.rb
 - lib/geocoder/lookups/geocoder_ca.rb
 - lib/geocoder/lookups/google.rb
 - lib/geocoder/lookups/google_premier.rb
+- lib/geocoder/lookups/nominatim.rb
 - lib/geocoder/lookups/yahoo.rb
 - lib/geocoder/lookups/yandex.rb
 - lib/geocoder/models/active_record.rb
@@ -56,6 +58,7 @@ files:
 - lib/geocoder/results/geocoder_ca.rb
 - lib/geocoder/results/google.rb
 - lib/geocoder/results/google_premier.rb
+- lib/geocoder/results/nominatim.rb
 - lib/geocoder/results/yahoo.rb
 - lib/geocoder/results/yandex.rb
 - lib/geocoder/stores/active_record.rb
@@ -82,6 +85,8 @@ files:
 - test/fixtures/google_no_city_data.json
 - test/fixtures/google_no_locality.json
 - test/fixtures/google_no_results.json
+- test/fixtures/nominatim_madison_square_garden.json
+- test/fixtures/nominatim_no_results.json
 - test/fixtures/yahoo_garbage.json
 - test/fixtures/yahoo_madison_square_garden.json
 - test/fixtures/yahoo_no_results.json
@@ -91,6 +96,7 @@ files:
 - test/geocoder_test.rb
 - test/https_test.rb
 - test/input_handling_test.rb
+- test/integration/smoke_test.rb
 - test/lookup_test.rb
 - test/method_aliases_test.rb
 - test/mongoid_test.rb