geonames-with-proxy 0.2.3

data/README.rdoc

@@ -0,0 +1,8 @@
+Git repo of http://code.google.com/p/ruby-geonames project with proxy settings.
+
+See http://www.tbcn.ca/ruby_geonames for more info.
+
+== Proxy settings
+
+Geonames.proxy_host = 'proxy.example.org'
+Geonames.proxy_port = 3128

data/Rakefile

@@ -0,0 +1,24 @@
+require 'rspec/core/rake_task'
+require 'rake/rdoctask'
+
+$LOAD_PATH.unshift(File.expand_path('../lib', __FILE__))
+
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.rspec_opts = ["-c", "-f progress", "-r ./spec/spec_helper.rb"]
+  t.pattern = FileList['spec/**/*_spec.rb']
+end
+
+RSpec::Core::RakeTask.new(:rcov) do |t|
+  t.pattern = 'spec/**/*_spec.rb'
+  t.rcov = true
+end
+
+Rake::RDocTask.new do |rdoc|
+  require 'geonames'
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "geonames #{Geonames::VERSION}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
+
+task :default => :spec

data/lib/address.rb

@@ -0,0 +1,25 @@
+#=============================================================================
+#
+# Copyright 2007 Adam Wisniewski <adamw@tbcn.ca> 
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at 
+#
+#  http://www.apache.org/licenses/LICENSE-2.0 
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+#=============================================================================
+
+module Geonames
+  class Address
+    
+  end
+end
+
+

data/lib/country_subdivision.rb

@@ -0,0 +1,32 @@
+#=============================================================================
+#
+# Copyright 2007 Adam Wisniewski <adamw@tbcn.ca> 
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at 
+#
+#  http://www.apache.org/licenses/LICENSE-2.0 
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+#=============================================================================
+
+module Geonames
+    class CountrySubdivision
+        attr :country_code
+        attr :country_name
+        attr :admin_code_1
+        attr :admin_name_1
+        
+        attr_writer :country_code, :country_name
+        attr_writer :admin_name_1, :admin_code_1
+        
+    end
+end
+
+

data/lib/geonames.rb

@@ -0,0 +1,55 @@
+#=============================================================================
+#
+# Copyright 2007 Adam Wisniewski <adamw@tbcn.ca> 
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at 
+#
+#  http://www.apache.org/licenses/LICENSE-2.0 
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+#=============================================================================
+
+require 'cgi'
+require 'net/http'
+require 'rexml/document'
+
+module Geonames
+  VERSION         = "0.2.3"
+  GEONAMES_SERVER = "http://ws.geonames.org"
+  USER_AGENT      = "geonames ruby webservice client #{VERSION}"
+  
+  def self.proxy_host
+    @@proxy_host
+  end
+  def self.proxy_host=(phost)
+    @@proxy_host = phost
+  end
+  self.proxy_host = nil
+  
+  def self.proxy_port
+    @@proxy_port
+  end
+  def self.proxy_port=(pport)
+    @@proxy_port = pport
+  end
+  proxy_port = nil
+end
+
+require 'web_service'
+require 'toponym'
+require 'toponym_search_result'
+require 'toponym_search_criteria'
+require 'postal_code'
+require 'postal_code_search_criteria'
+require 'timezone'
+require 'country_subdivision'
+require 'wikipedia_article'
+require 'intersection'
+

data/lib/intersection.rb

@@ -0,0 +1,42 @@
+#=============================================================================
+#
+# Copyright 2007 Adam Wisniewski <adamw@tbcn.ca> 
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at 
+#
+#  http://www.apache.org/licenses/LICENSE-2.0 
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+#=============================================================================
+
+module Geonames
+    class Intersection
+        attr :street_1
+        attr :street_2
+        attr :latitude
+        attr :longitude
+        attr :distance
+        attr :postal_code
+        attr :place_name
+        attr :country_code
+        attr :admin_code_1
+        attr :admin_name_2
+        attr :admin_code_2
+        attr :admin_name_1
+        
+        attr_writer :street_1, :street_2
+        attr_writer :postal_code, :place_name, :country_code
+        attr_writer :latitude, :longitude, :admin_name_1
+        attr_writer :admin_code_1, :admin_name_2, :admin_code_2
+        attr_writer :distance 
+    end
+end
+
+

data/lib/postal_code.rb

@@ -0,0 +1,40 @@
+#=============================================================================
+#
+# Copyright 2007 Adam Wisniewski <adamw@tbcn.ca> 
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at 
+#
+#  http://www.apache.org/licenses/LICENSE-2.0 
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+#=============================================================================
+
+module Geonames
+    class PostalCode
+        attr :postal_code
+        attr :place_name
+        attr :country_code
+        attr :latitude
+        attr :longitude
+        attr :admin_name_1
+        attr :admin_code_1
+        attr :admin_name_2
+        attr :admin_code_2
+        attr :distance
+        
+        attr_writer :postal_code, :place_name, :country_code
+        attr_writer :latitude, :longitude, :admin_name_1
+        attr_writer :admin_code_1, :admin_name_2, :admin_code_2
+        attr_writer :distance
+        
+    end
+end
+
+

data/lib/postal_code_search_criteria.rb

@@ -0,0 +1,84 @@
+#=============================================================================
+#
+# Copyright 2007 Adam Wisniewski <adamw@tbcn.ca> 
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at 
+#
+#  http://www.apache.org/licenses/LICENSE-2.0 
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+#=============================================================================
+
+module Geonames
+    class PostalCodeSearchCriteria
+
+	attr :postal_code
+        attr :place_name
+        attr :country_code
+        attr :latitude
+        attr :longitude
+        attr :style
+        attr :max_rows
+        attr :is_or_operator
+        attr :radius
+        
+        attr_writer :postal_code, :place_name, :country_code
+        attr_writer :latitude, :longitude, :style
+        attr_writer :max_rows,  :is_or_operator, :radius
+        
+        def initialize
+          @is_or_operator = false
+        end
+
+        def to_query_params_string
+            url = ''
+
+            if !@postal_code.nil? 
+              url = url + "&postalcode=" + CGI::escape( @postal_code )
+            end
+            
+            if !@place_name.nil? 
+              url = url + "&placename=" + CGI::escape( @place_name )
+            end
+            
+            if !@latitude.nil?
+                url = url + "&lat" + CGI::escape( @latitude )
+            end
+            
+            if !@longitude.nil?
+                url = url + "&lng" + CGI::escape( @longitude )
+            end
+
+            if !@style.nil?
+                url = url + "&style" + CGI::escape( @style )
+            end
+            
+            if !@country_code.nil? 
+              url = url + "&country=" + CGI::escape( @country_code )
+            end
+            
+            if !@max_rows.nil? 
+              url = url + "&maxRows=" + CGI::escape( @max_rows )
+            end
+
+            if !@radius.nil? 
+              url = url + "&radius=" + CGI::escape( @radius.to_s )
+            end
+            
+            if @is_or_operator 
+              url = url + "&operator=OR"
+            end
+            
+            url
+        end
+    end
+end
+
+

data/lib/timezone.rb

@@ -0,0 +1,29 @@
+#=============================================================================
+#
+# Copyright 2007 Adam Wisniewski <adamw@tbcn.ca> 
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at 
+#
+#  http://www.apache.org/licenses/LICENSE-2.0 
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+#=============================================================================
+
+module Geonames
+    class Timezone
+        attr :timezone_id
+        attr :gmt_offset
+        attr :dst_offset
+        
+        attr_writer :timezone_id, :gmt_offset, :dst_offset
+  end
+end
+
+

data/lib/toponym.rb

@@ -0,0 +1,45 @@
+#=============================================================================
+#
+# Copyright 2007 Adam Wisniewski <adamw@tbcn.ca> 
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at 
+#
+#  http://www.apache.org/licenses/LICENSE-2.0 
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+#=============================================================================
+
+module Geonames
+    class Toponym
+
+        attr :geoname_id
+        attr :name
+        attr :alternate_names
+        attr :country_code
+        attr :country_name
+        attr :population
+        attr :elevation
+        attr :feature_class
+        attr :feature_class_name
+        attr :feature_code
+        attr :feature_code_name
+        attr :latitude
+        attr :longitude
+        attr :distance
+
+        attr_writer :geoname_id, :name, :alternate_names, :country_code
+        attr_writer :country_name, :population, :elevation, :feature_class
+        attr_writer :feature_class_name, :feature_code,:feature_code_name
+        attr_writer :latitude, :longitude, :distance
+    
+    end
+end
+
+

data/lib/toponym_search_criteria.rb

@@ -0,0 +1,44 @@
+#=============================================================================
+#
+# Copyright 2007 Adam Wisniewski <adamw@tbcn.ca> 
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at 
+#
+#  http://www.apache.org/licenses/LICENSE-2.0 
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+#=============================================================================
+
+module Geonames
+    class ToponymSearchCriteria
+    
+        attr :q
+        attr :country_code
+        attr :name
+        attr :name_equals
+        attr :name_starts_with
+        attr :tag
+        attr :language
+        attr :style
+        attr :feature_class
+        attr :feature_codes
+        attr :admin_code_1
+        attr :max_rows
+        attr :start_row
+
+        attr_writer :q, :country_code, :name, :name_equals
+        attr_writer :name_starts_with, :tag, :language, :style
+        attr_writer :feature_class, :feature_codes, :admin_code_1
+        attr_writer :max_rows, :start_row
+    
+    end
+end
+
+

data/lib/toponym_search_result.rb

@@ -0,0 +1,33 @@
+#=============================================================================
+#
+# Copyright 2007 Adam Wisniewski <adamw@tbcn.ca> 
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at 
+#
+#  http://www.apache.org/licenses/LICENSE-2.0 
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+#=============================================================================
+
+module Geonames
+    class ToponymSearchResult
+        
+        attr :total_results_count
+        attr :toponyms
+    
+        attr_writer :total_results_count, :toponyms
+        
+        def initialize
+            @toponyms = Array.new
+        end
+    end
+end
+
+

data/lib/web_service.rb

@@ -0,0 +1,350 @@
+#=============================================================================
+#
+# Copyright 2007 Adam Wisniewski <adamw@tbcn.ca>
+# Contributions by Andrew Turner, High Earth Orbit
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+#=============================================================================
+
+module Geonames
+  class WebService
+    def self.get_element_child_text(element, child)
+      unless element.elements[child].nil?
+        element.elements[child][0].to_s
+      end
+    end
+
+    def self.get_element_child_float(element, child)
+      if !element.elements[child].nil?
+        element.elements[child][0].to_s.to_f
+      end
+    end
+
+    def self.get_element_child_int(element, child)
+      if !element.elements[child].nil?
+        element.elements[child][0].to_s.to_i
+      end
+    end
+
+    def self.element_to_postal_code(element)
+      postal_code = PostalCode.new
+
+      postal_code.admin_code_1    = get_element_child_text element, 'adminCode1'
+      postal_code.admin_code_2    = get_element_child_text element, 'adminCode2'
+      postal_code.admin_name_1    = get_element_child_text element, 'adminName1'
+      postal_code.admin_name_2    = get_element_child_text element, 'adminName2'
+      postal_code.country_code    = get_element_child_text element, 'countryCode'
+      postal_code.distance        = get_element_child_float element, 'distance'
+      postal_code.longitude       = get_element_child_float element, 'lat'
+      postal_code.latitude        = get_element_child_float element, 'lng'
+      postal_code.place_name      = get_element_child_text element, 'name'
+      postal_code.postal_code     = get_element_child_text element, 'postalcode'
+
+      postal_code
+    end
+
+    def self.element_to_wikipedia_article(element)
+      article = WikipediaArticle.new
+
+      article.language              = get_element_child_text element, 'lang'
+      article.title                 = get_element_child_text element, 'title'
+      article.summary               = get_element_child_text element, 'summary'
+      article.wikipedia_url         = get_element_child_text element, 'wikipediaUrl'
+      article.feature               = get_element_child_text element, 'feature'
+      article.population            = get_element_child_text element, 'population'
+      article.elevation             = get_element_child_text element, 'elevation'
+      article.latitude              = get_element_child_float element, 'lat'
+      article.longitude             = get_element_child_float element, 'lng'
+      article.thumbnail_img         = get_element_child_text element, 'thumbnailImg'
+      article.distance              = get_element_child_float element, 'distance'
+
+      article
+    end
+
+    def self.element_to_toponym(element)
+      toponym = Toponym.new
+
+      toponym.name                = get_element_child_text element, 'name'
+      toponym.alternate_names     = get_element_child_text element, 'alternateNames'
+      toponym.latitude            = get_element_child_float element, 'lat'
+      toponym.longitude           = get_element_child_float element, 'lng'
+      toponym.geoname_id          = get_element_child_text element, 'geonameId'
+      toponym.country_code        = get_element_child_text element, 'countryCode'
+      toponym.country_name        = get_element_child_text element, 'countryName'
+      toponym.feature_class       = get_element_child_text element, 'fcl'
+      toponym.feature_code        = get_element_child_text element, 'fcode'
+      toponym.feature_class_name  = get_element_child_text element, 'fclName'
+      toponym.feature_code_name   = get_element_child_text element, 'fCodeName'
+      toponym.population          = get_element_child_int element, 'population'
+      toponym.elevation           = get_element_child_text element, 'elevation'
+      toponym.distance            = get_element_child_float element, 'distance'
+
+      toponym
+    end
+
+    def self.element_to_intersection(element)
+      intersection = Intersection.new
+
+      intersection.street_1        = get_element_child_text element, 'street1'
+      intersection.street_2        = get_element_child_text element, 'street2'
+      intersection.admin_code_1    = get_element_child_text element, 'adminCode1'
+      intersection.admin_code_1    = get_element_child_text element, 'adminCode1'
+      intersection.admin_code_2    = get_element_child_text element, 'adminCode2'
+      intersection.admin_name_1    = get_element_child_text element, 'adminName1'
+      intersection.admin_name_2    = get_element_child_text element, 'adminName2'
+      intersection.country_code    = get_element_child_text element, 'countryCode'
+      intersection.distance        = get_element_child_float element, 'distance'
+      intersection.longitude       = get_element_child_float element, 'lat'
+      intersection.latitude        = get_element_child_float element, 'lng'
+      intersection.place_name      = get_element_child_text element, 'name'
+      intersection.postal_code     = get_element_child_text element, 'postalcode'
+
+      intersection
+    end
+
+    def self.postal_code_search(postal_code, place_name, country_code)
+      postal_code_sc = PostalCodeSearchCriteria.new
+      postal_code_sc.postal_code = postal_code
+      postal_code_sc.place_name = place_name
+      postal_code_sc.coutry_code = country_code
+
+      postal_code_search postal_code_sc
+    end
+
+    def self.postal_code_search(search_criteria)
+      # postal codes to reutrn
+      postal_codes = Array.new
+
+      url = Geonames::GEONAMES_SERVER + "/postalCodeSearch?a=a"
+      url += search_criteria.to_query_params_string
+
+      res = fetch_results(url)
+
+      REXML::Document.new(res.body).elements.each("geonames/code") do |element|
+        postal_codes << element_to_postal_code( element )
+      end
+
+      postal_codes
+    end
+
+    def self.find_nearby_postal_codes( search_criteria )
+      # postal codes to reutrn
+      postal_codes = Array.new
+
+      url = Geonames::GEONAMES_SERVER + "/findNearbyPostalCodes?a=a"
+      url += search_criteria.to_query_params_string
+      uri = URI.parse(url)
+
+      res = fetch_results(url)
+
+      REXML::Document.new(res.body).elements.each("geonames/code") do |element|
+        postal_codes << element_to_postal_code( element )
+      end
+
+      postal_codes
+    end
+
+    def self.find_nearby_place_name(lat, long)
+      places = Array.new
+
+      url = Geonames::GEONAMES_SERVER + "/findNearbyPlaceName?a=a"
+      url += "&lat=" + lat.to_s
+      url += "&lng=" + long.to_s
+
+      res = fetch_results(url)
+
+      REXML::Document.new(res.body).elements.each("geonames/geoname") do |element|
+        places << element_to_toponym( element )
+      end
+
+      places
+    end
+
+    def self.find_nearest_intersection(lat, long)
+      url = Geonames::GEONAMES_SERVER + "/findNearestIntersection?a=a"
+      url += "&lat=" + lat.to_s
+      url += "&lng=" + long.to_s
+
+      res = fetch_results(url)
+
+      intersection = []
+      REXML::Document.new(res.body).elements.each("geonames/intersection") do |element|
+        intersection = element_to_intersection( element )
+      end
+
+      intersection
+    end
+
+    def self.timezone(lat, long)
+      timezone = Timezone.new
+
+      url = Geonames::GEONAMES_SERVER + "/timezone?a=a"
+      url += "&lat=" + lat.to_s
+      url += "&lng=" + long.to_s
+      
+      res = fetch_results(url)
+
+      REXML::Document.new(res.body).elements.each("geonames/timezone") do |element|
+        timezone.timezone_id    = get_element_child_text( element, 'timezoneId' )
+        timezone.gmt_offset     = get_element_child_float( element, 'gmtOffset' )
+        timezone.dst_offset     = get_element_child_float( element, 'dstOffset' )
+      end
+
+      timezone
+    end
+
+    def self.findNearbyWikipedia(hashes)
+      # here for backwards compatibility
+      find_nearby_wikipedia( hashes )
+    end
+    
+    def self.find_nearby_wikipedia(hashes)
+      articles = Array.new
+
+      lat = hashes[:lat]
+      long = hashes[:long]
+      lang = hashes[:lang]
+      radius = hashes[:radius]
+      max_rows = hashes[:max_rows]
+      country = hashes[:country]
+      postalcode = hashes[:postalcode]
+      q = hashes[:q]
+
+      url = Geonames::GEONAMES_SERVER + "/findNearbyWikipedia?a=a"
+
+      if !lat.nil? && !long.nil?
+        url += "&lat=" + lat.to_s
+        url += "&lng=" + long.to_s
+        url += "&radius=" + radius.to_s unless radius.nil?
+        url += "&max_rows=" + max_rows.to_s unless max_rows.nil?
+
+      elsif !q.nil?
+        url += "&q=" + q
+        url += "&radius=" + radius.to_s unless radius.nil?
+        url += "&max_rows=" + max_rows.to_s unless max_rows.nil?
+      end
+
+      res = fetch_results(url)
+
+      REXML::Document.new(res.body).elements.each("geonames/entry") do |element|
+        articles << element_to_wikipedia_article( element )
+      end
+
+      articles
+    end
+
+    def self.findBoundingBoxWikipedia(hashes)
+      # here for backwards compatibility
+      find_bounding_box_wikipedia( hashes )
+    end
+    
+    def self.find_bounding_box_wikipedia(hashes)
+      articles = Array.new
+
+      north = hashes[:north]
+      east = hashes[:east]
+      south = hashes[:south]
+      west = hashes[:west]
+      lang = hashes[:lang]
+      radius = hashes[:radius]
+      max_rows = hashes[:max_rows]
+      country = hashes[:country]
+      postalcode = hashes[:postalcode]
+      q = hashes[:q]
+
+      url = Geonames::GEONAMES_SERVER + "/wikipediaBoundingBox?a=a"
+
+      url += "&north=" + north.to_s
+      url += "&east=" + east.to_s
+      url += "&south=" + south.to_s
+      url += "&west=" + west.to_s
+      url += "&radius=" + radius.to_s unless radius.nil?
+      url += "&max_rows=" + max_rows.to_s unless max_rows.nil?
+
+      res = fetch_results(url)
+
+      REXML::Document.new(res.body).elements.each("geonames/entry") do |element|
+        articles << element_to_wikipedia_article( element )
+      end
+
+      articles
+    end
+
+    def self.country_subdivision(lat, long)
+      country_subdivision = CountrySubdivision.new
+
+      url = Geonames::GEONAMES_SERVER + "/countrySubdivision?a=a"
+      url += "&lat=" + lat.to_s
+      url += "&lng=" + long.to_s
+
+      res = fetch_results(url)
+
+      REXML::Document.new(res.body).elements.each("geonames/countrySubdivision") do |element|
+        country_subdivision.country_code    = get_element_child_text(element, 'countryCode')
+        country_subdivision.country_name    = get_element_child_text(element, 'countryName')
+        country_subdivision.admin_code_1    = get_element_child_text(element, 'adminCode1')
+        country_subdivision.admin_name_1    = get_element_child_text(element, 'adminName1')
+      end
+
+      country_subdivision
+    end
+
+    def self.country_code ( lat, long )
+      url = Geonames::GEONAMES_SERVER + "/countrycode?a=a"
+      url += "&lat=" + lat.to_s
+      url += "&lng=" + long.to_s
+
+      fetch_results(url).body.strip
+    end
+
+    def self.search(search_criteria)
+      toponym_sr = ToponymSearchResult.new
+
+      url = Geonames::GEONAMES_SERVER + "/search?a=a"
+      url += "&q=" + CGI::escape(search_criteria.q) unless search_criteria.q.nil?
+      url += "&name_equals=" + CGI::escape(search_criteria.name_equals) unless search_criteria.name_equals.nil?
+      url += "&name_startsWith=" + CGI::escape(search_criteria.name_starts_with) unless search_criteria.name_starts_with.nil?
+      url += "&name=" + CGI::escape(search_criteria.name) unless search_criteria.name.nil?
+      url += "&tag=" + CGI::escape(search_criteria.tag) unless search_criteria.tag.nil?
+      url += "&country=" + CGI::escape(search_criteria.country_code) unless search_criteria.country_code.nil?
+      url += "&adminCode1=" + CGI::escape(search_criteria.admin_code_1) unless search_criteria.admin_code_1.nil?
+      url += "&lang=" + CGI::escape(search_criteria.language) unless search_criteria.language.nil?
+      url += "&featureClass=" + CGI::escape(search_criteria.feature_class) unless search_criteria.feature_class.nil?
+      url += "&maxRows=" + CGI::escape(search_criteria.max_rows) unless search_criteria.max_rows.nil?
+      url += "&startRow=" + CGI::escape(search_criteria.start_row) unless search_criteria.start_row.nil?
+      url += "&style=" + CGI::escape( search_criteria.style ) unless search_criteria.style.nil?
+      for feature_code in search_criteria.feature_codes
+        url += "&fcode=" + CGI::escape(feature_code)
+      end unless search_criteria.feature_codes.nil?
+
+      doc = REXML::Document.new fetch_results(url).body
+
+      toponym_sr.total_results_count = doc.elements["geonames/totalResultsCount"].text
+      doc.elements.each("geonames/geoname") do |element|
+        toponym_sr.toponyms << element_to_toponym(element)
+      end
+
+      toponym_sr
+    end
+    
+    def self.fetch_results(url)
+      uri = URI.parse(url)
+      req = Net::HTTP::Get.new(uri.path + '?' + uri.query)
+      
+      Net::HTTP::Proxy(Geonames.proxy_host, Geonames.proxy_port).start(uri.host, uri.port) { |http| 
+        http.request(req) 
+      }
+    end
+  end
+end

data/lib/wikipedia_article.rb

@@ -0,0 +1,42 @@
+#=============================================================================
+#
+# Copyright 2007 Adam Wisniewski <adamw@tbcn.ca>
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+#=============================================================================
+
+module Geonames
+  class WikipediaArticle
+
+    attr :language
+    attr :title
+    attr :summary
+    attr :wikipedia_url
+    attr :feature
+    attr :population
+    attr :elevation
+    attr :latitude
+    attr :longitude
+    attr :thumbnail_img
+    attr :distance
+
+    attr_writer :language, :title, :summary
+    attr_writer :wikipedia_url, :feature, :population
+    attr_writer :elevation, :latitude, :longitude
+    attr_writer :thumbnail_img, :distance
+
+  end
+end
+
+

metadata

@@ -0,0 +1,113 @@
+--- !ruby/object:Gem::Specification 
+name: geonames-with-proxy
+version: !ruby/object:Gem::Version 
+  hash: 17
+  prerelease: 
+  segments: 
+  - 0
+  - 2
+  - 3
+  version: 0.2.3
+platform: ruby
+authors: 
+- Adam Wisniewski
+- alex
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2011-01-20 00:00:00 +01:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
+description: 
+email: 
+- adamw@tbcn.ca
+- alex@cloudware.it
+executables: []
+
+extensions: []
+
+extra_rdoc_files: []
+
+files: 
+- lib/address.rb
+- lib/country_subdivision.rb
+- lib/geonames.rb
+- lib/intersection.rb
+- lib/postal_code.rb
+- lib/postal_code_search_criteria.rb
+- lib/timezone.rb
+- lib/toponym.rb
+- lib/toponym_search_criteria.rb
+- lib/toponym_search_result.rb
+- lib/web_service.rb
+- lib/wikipedia_article.rb
+- spec/spec_helper.rb
+- Rakefile
+- README.rdoc
+has_rdoc: true
+homepage: http://www.tbcn.ca/ruby_geonames
+licenses: []
+
+post_install_message: 
+rdoc_options: []
+
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 31
+      segments: 
+      - 1
+      - 8
+      version: "1.8"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 9
+      segments: 
+      - 1
+      - 3
+      version: "1.3"
+requirements: []
+
+rubyforge_project: 
+rubygems_version: 1.4.1
+signing_key: 
+specification_version: 3
+summary: Ruby library for Geonames Web Services (http://www.geonames.org/export/)
+test_files: []
+