geonames_api 0.0.6 → 0.1.0

data/spec/geonames_api/hierarchy_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+describe GeoNamesAPI::Hierarchy do
+  def should_be_sb(h)
+    h.first.name.should == 'Earth'
+    h.map { |ea| ea.name }.should ==
+      ['Earth', 'North America', 'United States', 'California', 'Santa Barbara County', 'Santa Barbara']
+  end
+
+  def should_be_roma(h)
+    h.map { |ea| ea.name }.should ==
+      ['Terra', 'Europa', 'Italia', 'Lazio', 'Roma', 'Roma', 'Roma']
+  end
+
+  describe '::find' do
+    it 'works for Santa Barbara' do
+      h = GeoNamesAPI::Hierarchy.find(5392952)
+      should_be_sb(h)
+    end
+
+    it 'works for Roma ' do
+      begin
+        GeoNamesAPI.lang = :it
+        h = GeoNamesAPI::Hierarchy.find(3169070)
+        should_be_roma(h)
+      ensure
+        GeoNamesAPI.lang = :en
+      end
+    end
+  end
+
+  describe '::where' do
+    it 'works for Santa Barbara' do
+      h = GeoNamesAPI::Hierarchy.where(geonameId: 5392952)
+      should_be_sb(h)
+    end
+  end
+end

data/spec/geonames_api/place_name_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe GeoNamesAPI::PlaceName do
+  describe "::find" do
+    it "should find one place" do
+      result = GeoNamesAPI::PlaceName.find("50.01","10.2")
+      result.should be_present
+    end
+
+     it 'should find one place with a hash' do
+      result = GeoNamesAPI::PlaceName.find(lat: 50.01, lng: 10.2)
+      result.should be_present
+    end
+  end
+
+  describe "::all" do
+    it "should find maxRow places in 100km radius" do
+      result = GeoNamesAPI::PlaceName.all("50.01","10.2","100", "3")
+      result.count.should == 3
+    end
+  end
+end

data/spec/geonames_api/place_search_spec.rb

@@ -0,0 +1,50 @@
+require 'spec_helper'
+
+describe GeoNamesAPI::PlaceSearch do
+  describe "::where" do
+    it "should search for places dealing with ohio" do
+      search = GeoNamesAPI::PlaceSearch.where(name: 'idaho', maxRows: 10)
+      search.should be_present
+      search.size.should == 10
+      search.results.size.should == 10
+    end
+  end
+
+  describe "::find_by_place_name" do
+    it "should find the place by name" do
+      search = GeoNamesAPI::PlaceSearch.find_by_place_name("idaho", 10)
+      search.total_results_count.should > 0
+      search.results.each{|place| place.name.should =~ /idaho/i }
+    end
+  end
+
+  describe "::find_by_exact_place_name" do
+    it "should find the place by the exact name" do
+      search = GeoNamesAPI::PlaceSearch.find_by_exact_place_name('columbus', 10)
+      search.total_results_count.should > 0
+      search.results.each{|place| place.name.downcase.should == 'columbus' }
+    end
+  end
+
+  describe "#next_page" do
+    it "should grab the next page of results from the same search" do
+      big_search = GeoNamesAPI::PlaceSearch.where(name: 'columbus', maxRows: 9)
+      search_pg1 = GeoNamesAPI::PlaceSearch.where(name: 'columbus', maxRows: 3)
+      search_pg2 = search_pg1.next_page
+      search_pg3 = search_pg2.next_page
+      search_pg1.size.should == 3
+      search_pg2.size.should == 3
+      search_pg3.size.should == 3
+      search_pg3.request_params[:startRow].should == 6
+      (search_pg1.results + search_pg2.results + search_pg3.results).map{|ea|ea.geoname_id}.should == big_search.results.map{|ea|ea.geoname_id}
+    end
+  end
+
+  describe "#to_page" do
+    it "should grab the specified page of results from the same search" do
+      search10 = GeoNamesAPI::PlaceSearch.all("columbus", 10)
+      search2 = GeoNamesAPI::PlaceSearch.all("columbus", 2)
+      search2.to_page(4).first.geoname_id.should == search10.results[8].geoname_id
+    end
+  end
+end

data/spec/geonames_api/place_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe GeoNamesAPI::Place do
+  describe "::find" do
+    it "should find one place" do
+      result = GeoNamesAPI::Place.find("50.01","10.2")
+      result.should be_present
+    end
+  end
+
+  describe "::all" do
+    it "should find multiple places in 100km radius" do
+      result = GeoNamesAPI::Place.all("50.01","10.2","100")
+      result.size.should > 0
+    end
+  end
+end

data/spec/geonames_api/retry_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+describe GeoNamesAPI::Base do
+  TIMEOUT = JSON.load <<-JSON
+    {
+      "status": {
+        "message": "ERROR: canceling statement due to statement timeout",
+        "value": 13
+      }
+    }
+  JSON
+
+  # This is not a correct, complete response, but that's not relevant to the spec:
+  EXAMPLE_RESPONSE = JSON.load <<-JSON
+    {"geonames": [{ "name": "Earth" }]}
+  JSON
+
+  describe "::find" do
+    before :each do
+      GeoNamesAPI.max_sleep_time_between_retries = 0
+    end
+
+    it "retries when geonames returns timeout errors" do
+      GeoNamesAPI::Hierarchy.stub(:make_request).and_return(TIMEOUT, EXAMPLE_RESPONSE)
+      hierarchy = GeoNamesAPI::Hierarchy.find(6295630)
+      earth = hierarchy.first
+      earth.should be_present
+      earth.name.should == "Earth"
+    end
+
+    it "fails when geonames returns timeout errors too many times" do
+      GeoNamesAPI::Hierarchy.stub(:make_request).and_return(TIMEOUT, TIMEOUT, EXAMPLE_RESPONSE)
+      GeoNamesAPI.retries = 1
+      proc { GeoNamesAPI::Hierarchy.find(6295630) }.should raise_error GeoNamesAPI::Timeout
+    end
+  end
+end

data/spec/geonames_api/street_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe GeoNamesAPI::Street do
+  describe "::find" do
+    it "should find one Street" do
+      result = GeoNamesAPI::Street.find(37.451, -122.18)
+      result.should be_present
+    end
+
+    it "should not find streets outside of the US" do
+      result = GeoNamesAPI::Street.find(50.01, 10.2)
+      result.should == nil
+    end
+  end
+
+  describe "::all" do
+    it "should find multiple Streets in 100km radius" do
+      result = GeoNamesAPI::Street.all(37.8, -122.4, 1, 3)
+      result.size.should == 3
+    end
+  end
+end

data/spec/geonames_api/weather_icao_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+describe GeoNamesAPI::WeatherICAO do
+  describe "::find" do
+    it "should find one station" do
+      result = GeoNamesAPI::WeatherICAO.find('KHAF')
+      result.should be_present
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,15 @@
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'rspec'
+require 'geonames_api'
+
+RSpec.configure do |config|
+  if ENV['GEONAMES_USER']
+    GeoNamesAPI.username = ENV['GEONAMES_USER']
+  else
+    puts "Enter your GeoNames WebServices username for running functional specs (press enter to just use default)"
+    name = $stdin.gets.chomp
+    GeoNamesAPI.username = name if name.present?
+  end
+  GeoNamesAPI.logger = Logger.new("test.log")
+end

metadata

@@ -1,97 +1,173 @@
 --- !ruby/object:Gem::Specification
 name: geonames_api
 version: !ruby/object:Gem::Version
-  version: 0.0.6
-  prerelease: 
+  version: 0.1.0
 platform: ruby
 authors:
 - Sean Devine
+- Matthew McEachen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-02 00:00:00.000000000 Z
+date: 2013-12-08 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
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: zipruby
   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
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Simple ruby client for the GeoNames API to get free and easy geographic
   info.
 email:
 - barelyknown@icloud.com
+- matthew-github@mceachen.org
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - geonames_api.gemspec
 - lib/geonames_api.rb
+- lib/geonames_api/alternate_names.rb
+- lib/geonames_api/base.rb
+- lib/geonames_api/children.rb
+- lib/geonames_api/city.rb
 - lib/geonames_api/country.rb
+- lib/geonames_api/country_code.rb
+- lib/geonames_api/country_subdivision.rb
+- lib/geonames_api/earthquake.rb
+- lib/geonames_api/elevation.rb
+- lib/geonames_api/entity.rb
 - lib/geonames_api/error.rb
-- lib/geonames_api/hash.rb
-- lib/geonames_api/object.rb
+- lib/geonames_api/geoname.rb
+- lib/geonames_api/hierarchy.rb
+- lib/geonames_api/list_endpoint.rb
+- lib/geonames_api/nearby_postal_code.rb
+- lib/geonames_api/place.rb
+- lib/geonames_api/place_name.rb
+- lib/geonames_api/place_search.rb
+- lib/geonames_api/postal_code.rb
+- lib/geonames_api/singleton_endpoint.rb
+- lib/geonames_api/street.rb
 - lib/geonames_api/time_zone.rb
 - lib/geonames_api/version.rb
 - lib/geonames_api/weather.rb
+- lib/geonames_api/weather_i_c_a_o.rb
 - lib/geonames_api/wikipedia.rb
+- spec/geonames_api/country_subdivision_spec.rb
+- spec/geonames_api/hierarchy_spec.rb
+- spec/geonames_api/place_name_spec.rb
+- spec/geonames_api/place_search_spec.rb
+- spec/geonames_api/place_spec.rb
+- spec/geonames_api/retry_spec.rb
+- spec/geonames_api/street_spec.rb
+- spec/geonames_api/weather_icao_spec.rb
+- 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.24
+rubygems_version: 2.0.3
 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
-  ruby implementation that does not implement the entire API. But, its lightweight
+  ruby implementation that does not implement the entire API. But, it's lightweight
   and has a nice interface and will be easy to extend :)
-test_files: []
+test_files:
+- spec/geonames_api/country_subdivision_spec.rb
+- spec/geonames_api/hierarchy_spec.rb
+- spec/geonames_api/place_name_spec.rb
+- spec/geonames_api/place_search_spec.rb
+- spec/geonames_api/place_spec.rb
+- spec/geonames_api/retry_spec.rb
+- spec/geonames_api/street_spec.rb
+- spec/geonames_api/weather_icao_spec.rb
+- spec/spec_helper.rb

data/lib/geonames_api/hash.rb

@@ -1,5 +0,0 @@
-class Hash
-  def to_url
-    "?" + collect { |key, value| "#{key}=#{value}" }.join("&")
-  end
-end

data/lib/geonames_api/object.rb

@@ -1,72 +0,0 @@
-module GeoNamesAPI
-  class Object
-    
-    NESTED = true
-        
-    def self.find(*names)
-      if response = where(name_params(names)).first
-        new(response)
-      end
-    end
-    
-    def self.all(*names)
-      where(name_params(names)).collect { |response| new(response) if response }.compact
-    end
-    
-    def self.where(params={})
-      response = JSON.load(open(url(params)).read)
-      case response.keys.first
-      when /\Astatus\Z/
-        message = response["status"]["message"]
-        raise GeoNamesAPI::Error, message[0,1].capitalize + message[1,message.length - 1]
-      end
-      if self::NESTED
-        [response.values].flatten
-      else
-        [response]
-      end
-    end
-    
-    def self.url(params={})
-      GeoNamesAPI.url + self::METHOD + GeoNamesAPI.params.merge(params).to_url
-    end
-    
-    def self.name_params(names)
-      params, n = {}, 0
-      if names.any?
-        [self::ID].flatten.each { |i| params[i] = names[n]; n+= 1 }
-      end
-      params
-    end
-
-    def initialize(response)
-      parse(response)
-    end 
-
-    def parse(response)
-      response.each do |key, value|
-        attr_name = create_attribute(key)
-        value = set_default_type(value)
-        send("#{attr_name}=", value)
-      end
-    end
-
-    def create_attribute(attribute)
-      attr_name = attribute.underscore.to_sym
-      self.class.send(:attr_accessor, attr_name) unless respond_to?(attr_name)
-      attr_name
-    end
-    
-    def set_default_type(value)
-      case value
-      when /\A-?\d+\Z/
-        value.to_i
-      when /\A-?\d*\.\d*\Z/
-        value.to_f
-      else
-        value
-      end
-    end
-         
-  end
-end