geonames_api 0.1.2 → 0.1.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b50c12c8caf88cb16c72e51b02e0899f9f6f76df
+  data.tar.gz: 31bf711659f22e768a31827e15d1577e1d138362
+SHA512:
+  metadata.gz: b09f7294b7b01b99732866b17fb59ae7b96a3065ed06c344a5219cd2737e2f1a6b133ca07d792c05b2b05fcafe63a56d2065bc97697a7df4246b5db7c63f463e
+  data.tar.gz: c6bc4c9b9326f9837f473231280a2f59a57169a46f453d4c21eee6c39d2635daccc15013746f7a777a63789f5d8c68a047c13d28f3d0ff963af9a22b98aee79c

data/.travis.yml

@@ -2,6 +2,5 @@ language: ruby
 rvm:
   - 2.0.0
   - 1.9.3
-# - 1.8.7 is not supported due to a 1.9-style hash in geonames_api.rb :\
 
 script: GEONAMES_USER=geonames_api_ci bundle exec rake --trace

data/lib/geonames_api/base.rb

@@ -28,7 +28,9 @@ module GeoNamesAPI
       rescue Timeout => e
         if retries_remaining > 0
           retries_remaining -= 1
-          sleep rand * GeoNamesAPI.max_sleep_time_between_retries
+          sleep_time = rand * GeoNamesAPI.max_sleep_time_between_retries
+          GeoNamesAPI.logger.info("GEONAMES RETRIABLE ERROR: #{e}. Retrying in #{sleep_time}s.") if GeoNamesAPI.logger
+          sleep sleep_time
           retry
         else
           raise e

data/lib/geonames_api/error.rb

@@ -23,7 +23,8 @@ module GeoNamesAPI
     ERROR_CODES = [11]
   end
   class Timeout < Error
-    ERROR_CODES = [13, 22]
+    # 12 is "other error", but is normally "Cannot get a connection, pool error Timeout waiting for idle object"
+    ERROR_CODES = [12, 13, 22]
   end
   class InvalidParameter < Error
     ERROR_CODES = [14]
@@ -37,13 +38,16 @@ module GeoNamesAPI
   class PostalCodeNotFound < Error
     ERROR_CODES = [17]
   end
-  class DailyLimitExceeded < Error
+  class LimitExceeded < Error
+    ERROR_CODES = []
+  end
+  class DailyLimitExceeded < LimitExceeded
     ERROR_CODES = [18]
   end
-  class HourlyLimitExceeded < Error
+  class HourlyLimitExceeded < LimitExceeded
     ERROR_CODES = [19]
   end
-  class WeeklyLimitExceeded < Error
+  class WeeklyLimitExceeded < LimitExceeded
     ERROR_CODES = [20]
   end
   class ServiceNotImplemented < Error

data/lib/geonames_api/nearest_intersection.rb

@@ -0,0 +1,9 @@
+module GeoNamesAPI
+  class NearestIntersection < SingletonEndpoint
+
+    METHOD = "findNearestIntersectionJSON"
+    FIND_PARAMS = %w(lat lng)
+
+  end
+end
+

data/lib/geonames_api/version.rb

@@ -1,3 +1,3 @@
 module GeoNamesAPI
-  VERSION = Gem::Version.new('0.1.2')
+  VERSION = Gem::Version.new('0.1.3')
 end

data/spec/geonames_api/nearest_intersection_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe GeoNamesAPI::NearestIntersection do
+  
+  describe '::find' do
+    
+    context 'given the latitude and longitude for a point inside the United States' do
+      
+      # Manhattan, Kansas, USA
+      let(:latitude)  { 39.191253   }
+      let(:longitude) { -96.573737  }
+      
+      it 'returns the two street names of the nearest intersection' do
+        response = described_class.find(latitude,longitude)
+        
+        response.intersection["street1"].should eq('Bertrand St')
+        response.intersection["street2"].should eq('N 11th St')
+      end
+    end
+  end
+end
+

data/spec/geonames_api/retry_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe GeoNamesAPI::Base do
   describe "retries" do
     before :each do
-      GeoNamesAPI.max_sleep_time_between_retries = 0
+      GeoNamesAPI.stub(:max_sleep_time_between_retries).and_return(0)
       @timeout = JSON.load <<-JSON
         {
           "status": {
@@ -28,7 +28,7 @@ describe GeoNamesAPI::Base do
 
     it "fails when geonames returns timeout errors too many times" do
       GeoNamesAPI::Hierarchy.stub(:make_request).and_return(@timeout, @timeout, @response)
-      GeoNamesAPI.retries = 1
+      GeoNamesAPI.stub(:retries).and_return(1)
       proc { GeoNamesAPI::Hierarchy.find(6295630) }.should raise_error GeoNamesAPI::Timeout
     end
   end

data/spec/spec_helper.rb

@@ -11,7 +11,7 @@ RSpec.configure do |config|
     name = $stdin.gets.chomp
     GeoNamesAPI.username = name if name.present?
   end
-  GeoNamesAPI.logger = Logger.new("test.log")
+  GeoNamesAPI.logger = ENV['CI'] ? Logger.new(STDERR) : Logger.new("test.log")
   GeoNamesAPI.retries = 10
   GeoNamesAPI.max_sleep_time_between_retries = 60
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geonames_api
 version: !ruby/object:Gem::Version
-  version: 0.1.2
-  prerelease: 
+  version: 0.1.3
 platform: ruby
 authors:
 - Sean Devine
@@ -10,86 +9,76 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-03 00:00:00.000000000 Z
+date: 2014-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Simple ruby client for the GeoNames API to get free and easy geographic
@@ -101,8 +90,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -125,6 +114,7 @@ files:
 - lib/geonames_api/hierarchy.rb
 - lib/geonames_api/list_endpoint.rb
 - lib/geonames_api/nearby_postal_code.rb
+- lib/geonames_api/nearest_intersection.rb
 - lib/geonames_api/neighbourhood.rb
 - lib/geonames_api/place.rb
 - lib/geonames_api/place_name.rb
@@ -140,6 +130,7 @@ files:
 - spec/geonames_api/country_spec.rb
 - spec/geonames_api/country_subdivision_spec.rb
 - spec/geonames_api/hierarchy_spec.rb
+- spec/geonames_api/nearest_intersection_spec.rb
 - spec/geonames_api/neighbourhood_spec.rb
 - spec/geonames_api/place_name_spec.rb
 - spec/geonames_api/place_search_spec.rb
@@ -150,27 +141,26 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/buytruckload/geonames_api
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: This is a lightweight client for the GeoNames API. Huge thanks to them for
   such a great service! There are many GeoNames API clients. BUT, most are rewritten
   versions of a Java API whose interface is a little funny =| This is a simplified
@@ -180,6 +170,7 @@ test_files:
 - spec/geonames_api/country_spec.rb
 - spec/geonames_api/country_subdivision_spec.rb
 - spec/geonames_api/hierarchy_spec.rb
+- spec/geonames_api/nearest_intersection_spec.rb
 - spec/geonames_api/neighbourhood_spec.rb
 - spec/geonames_api/place_name_spec.rb
 - spec/geonames_api/place_search_spec.rb
@@ -188,4 +179,3 @@ test_files:
 - spec/geonames_api/street_spec.rb
 - spec/geonames_api/weather_icao_spec.rb
 - spec/spec_helper.rb
-has_rdoc: