geonames 0.1.0 → 0.2.0

data/geonames.gemspec

@@ -3,11 +3,11 @@ require 'date'
 
 SPEC = Gem::Specification.new do |s| 
   s.name = "geonames" 
-  s.version = "0.1.0" 
+  s.version = "0.2.0" 
   s.author = "Adam Wisniewski" 
   s.email = "adamw@tbcn.ca" 
   s.date = s.date = Date.today.to_s
-  s.homepage = "http://www.tbcn.ca/geonames" 
+  s.homepage = "http://www.tbcn.ca/ruby_geonames" 
   s.platform = Gem::Platform::RUBY 
   s.summary = "Ruby library for Geonames Web Services (http://www.geonames.org/export/)" 
   candidates = Dir.glob("{bin,docs,lib,test}/**/*") 

data/lib/geonames.rb

@@ -28,6 +28,7 @@ require 'postal_code'
 require 'postal_code_search_criteria'
 require 'timezone'
 require 'country_subdivision'
+require 'wikipedia_article'
 
 module Geonames
   

data/lib/main.rb

@@ -17,7 +17,17 @@
 #=============================================================================
 
 require 'geonames'
+require 'pp'
 
+# get wikipedia articles by lat / long
+# articles_nearby = Geonames::WebService.findNearbyWikipedia :lat => 43.900120387, :long => -78.882869834
+# p articles_nearby
+
+# get wikipedia articles by bounding box
+articles_nearby = Geonames::WebService.findBoundingBoxWikipedia :north => 43.900120387, :east => -78.882869834, :south => 43.82, :west => 79.0
+p articles_nearby
+
+Process.exit
 # get list of places near by longitude/longitude location
 places_nearby = Geonames::WebService.find_nearby_place_name 43.900120387, -78.882869834
 p places_nearby

data/lib/web_service.rb

@@ -1,12 +1,12 @@
 #=============================================================================
 #
-# Copyright 2007 Adam Wisniewski <adamw@tbcn.ca> 
+# 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 
+# the License at
 #
-#  http://www.apache.org/licenses/LICENSE-2.0 
+#  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
@@ -18,313 +18,417 @@
 
 
 module Geonames
-    class WebService
-        def WebService.get_element_child_text( element, child )
-            if !element.elements[child].nil? 
-                element.elements[child][0].to_s
-            end
-        end
-        
-        def WebService.get_element_child_float( element, child )
-            if !element.elements[child].nil? 
-                element.elements[child][0].to_s.to_f
-            end
-        end
+  class WebService
+    def WebService.get_element_child_text( element, child )
+      if !element.elements[child].nil?
+        element.elements[child][0].to_s
+      end
+    end
 
-        def WebService.get_element_child_int( element, child )
-            if !element.elements[child].nil? 
-                element.elements[child][0].to_s.to_i
-            end
-        end
-        
-        def WebService.element_to_postal_code ( element )
-            postal_code = PostalCode.new
-            
-            postal_code.admin_code_1    = WebService::get_element_child_text( element, 'adminCode1' )
-            postal_code.admin_code_2    = WebService::get_element_child_text( element, 'adminCode2' )
-            postal_code.admin_name_1    = WebService::get_element_child_text( element, 'adminName1' )
-            postal_code.admin_name_2    = WebService::get_element_child_text( element, 'adminName2' )
-            postal_code.country_code    = WebService::get_element_child_text( element, 'countryCode' )
-            postal_code.distance        = WebService::get_element_child_float( element, 'distance' )
-            postal_code.longitude       = WebService::get_element_child_float( element, 'lat' )
-            postal_code.latitude        = WebService::get_element_child_float( element, 'lng' )
-            postal_code.place_name      = WebService::get_element_child_text( element, 'name' )
-            postal_code.postal_code     = WebService::get_element_child_text( element, 'postalcode' )
-            
-            return postal_code
+    def WebService.get_element_child_float( element, child )
+      if !element.elements[child].nil?
+        element.elements[child][0].to_s.to_f
+      end
+    end
 
-        end
+    def WebService.get_element_child_int( element, child )
+      if !element.elements[child].nil?
+        element.elements[child][0].to_s.to_i
+      end
+    end
 
-        def WebService.element_to_toponym ( element )
-            toponym = Toponym.new
-
-            toponym.name                = WebService::get_element_child_text( element, 'name' )
-            toponym.alternate_names     = WebService::get_element_child_text( element, 'alternateNames' )
-            toponym.latitude            = WebService::get_element_child_float( element, 'lat' )
-            toponym.longitude           = WebService::get_element_child_float( element, 'lng' )
-            toponym.geoname_id          = WebService::get_element_child_text( element, 'geonameId' )
-            toponym.country_code        = WebService::get_element_child_text( element, 'countryCode' )
-            toponym.country_name        = WebService::get_element_child_text( element, 'countryName' )
-            toponym.feature_class       = WebService::get_element_child_text( element, 'fcl' )
-            toponym.feature_code        = WebService::get_element_child_text( element, 'fcode' )
-            toponym.feature_class_name  = WebService::get_element_child_text( element, 'fclName' )
-            toponym.feature_code_name   = WebService::get_element_child_text( element, 'fCodeName' )
-            toponym.population          = WebService::get_element_child_int( element, 'population' )
-            toponym.elevation           = WebService::get_element_child_text( element, 'elevation' )
-            toponym.distance            = WebService::get_element_child_float( element, 'distance' )
-            
-            return toponym
+    def WebService.element_to_postal_code ( element )
+      postal_code = PostalCode.new
 
-        end
-                
-        def WebService.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
-            
-            WebService.postal_code_search postal_code_sc
-        end        
-
-        def WebService.postal_code_search( search_criteria )
-            # postal codes to reutrn
-            postal_codes = Array.new
-            
-            url = Geonames::GEONAMES_SERVER + "/postalCodeSearch?a=a"
-            url = url + search_criteria.to_query_params_string
-            
-            uri = URI.parse(url)
-
-            req = Net::HTTP::Get.new(uri.path + '?' + uri.query)
-
-            res = Net::HTTP.start( uri.host, uri.port ) { |http|
-                http.request( req )
-            }
-
-            doc = REXML::Document.new res.body
-            
-            doc.elements.each("geonames/code") do |element|
-                postal_codes << WebService::element_to_postal_code( element )
-            end
-
-            postal_codes
-            
-        end
+      postal_code.admin_code_1    = WebService::get_element_child_text( element, 'adminCode1' )
+      postal_code.admin_code_2    = WebService::get_element_child_text( element, 'adminCode2' )
+      postal_code.admin_name_1    = WebService::get_element_child_text( element, 'adminName1' )
+      postal_code.admin_name_2    = WebService::get_element_child_text( element, 'adminName2' )
+      postal_code.country_code    = WebService::get_element_child_text( element, 'countryCode' )
+      postal_code.distance        = WebService::get_element_child_float( element, 'distance' )
+      postal_code.longitude       = WebService::get_element_child_float( element, 'lat' )
+      postal_code.latitude        = WebService::get_element_child_float( element, 'lng' )
+      postal_code.place_name      = WebService::get_element_child_text( element, 'name' )
+      postal_code.postal_code     = WebService::get_element_child_text( element, 'postalcode' )
 
-        def WebService.find_nearby_postal_codes( search_criteria )
-            # postal codes to reutrn
-            postal_codes = Array.new
-            
-            url = Geonames::GEONAMES_SERVER + "/findNearbyPostalCodes?a=a"
-            url = url + search_criteria.to_query_params_string
-            
-            uri = URI.parse(url)
-
-            req = Net::HTTP::Get.new(uri.path + '?' + uri.query)
-
-            res = Net::HTTP.start( uri.host, uri.port ) { |http|
-                http.request( req )
-            }
-
-            doc = REXML::Document.new res.body
-            
-            doc.elements.each("geonames/code") do |element|
-                postal_codes << WebService::element_to_postal_code( element )
-            end
-
-            postal_codes
-            
-        end
-        
-        def WebService.find_nearby_place_name( lat, long )
-            places = Array.new
-            
-            url = Geonames::GEONAMES_SERVER + "/findNearbyPlaceName?a=a"
-            
-            url = url + "&lat=" + lat.to_s
-            url = url + "&lng=" + long.to_s
+      return postal_code
 
-            uri = URI.parse(url)
+    end
 
-            req = Net::HTTP::Get.new(uri.path + '?' + uri.query)
+    def WebService.element_to_wikipedia_article ( element )
+      article = WikipediaArticle.new
+
+      article.language              = WebService::get_element_child_text( element, 'lang' )
+      article.title                 = WebService::get_element_child_text( element, 'title' )
+      article.summary               = WebService::get_element_child_text( element, 'summary' )
+      article.wikipedia_url         = WebService::get_element_child_text( element, 'wikipediaUrl' )
+      article.feature               = WebService::get_element_child_text( element, 'feature' )
+      article.population            = WebService::get_element_child_text( element, 'population' )
+      article.elevation             = WebService::get_element_child_text( element, 'elevation' )
+      article.latitude              = WebService::get_element_child_float( element, 'lat' )
+      article.longitude             = WebService::get_element_child_float( element, 'lng' )
+      article.thumbnail_img         = WebService::get_element_child_text( element, 'thumbnailImg' )
+      article.distance              = WebService::get_element_child_float( element, 'distance' )
+      
+      return article
 
-            res = Net::HTTP.start( uri.host, uri.port ) { |http|
-                http.request( req )
-            }
+    end
+    
+    def WebService.element_to_toponym ( element )
+      toponym = Toponym.new
+
+      toponym.name                = WebService::get_element_child_text( element, 'name' )
+      toponym.alternate_names     = WebService::get_element_child_text( element, 'alternateNames' )
+      toponym.latitude            = WebService::get_element_child_float( element, 'lat' )
+      toponym.longitude           = WebService::get_element_child_float( element, 'lng' )
+      toponym.geoname_id          = WebService::get_element_child_text( element, 'geonameId' )
+      toponym.country_code        = WebService::get_element_child_text( element, 'countryCode' )
+      toponym.country_name        = WebService::get_element_child_text( element, 'countryName' )
+      toponym.feature_class       = WebService::get_element_child_text( element, 'fcl' )
+      toponym.feature_code        = WebService::get_element_child_text( element, 'fcode' )
+      toponym.feature_class_name  = WebService::get_element_child_text( element, 'fclName' )
+      toponym.feature_code_name   = WebService::get_element_child_text( element, 'fCodeName' )
+      toponym.population          = WebService::get_element_child_int( element, 'population' )
+      toponym.elevation           = WebService::get_element_child_text( element, 'elevation' )
+      toponym.distance            = WebService::get_element_child_float( element, 'distance' )
+
+      return toponym
 
-            doc = REXML::Document.new res.body
-            
-            doc.elements.each("geonames/geoname") do |element|
+    end
 
-                places << WebService::element_to_toponym( element )
-            
-            end
+    def WebService.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
 
-            return places
-          
-        end
-        
-        def WebService.timezone( lat, long )
-            timezone = Timezone.new
-            
-            url = Geonames::GEONAMES_SERVER + "/timezone?a=a"
-            
-            url = url + "&lat=" + lat.to_s
-            url = url + "&lng=" + long.to_s
-
-            uri = URI.parse(url)
-
-            req = Net::HTTP::Get.new(uri.path + '?' + uri.query)
-
-            res = Net::HTTP.start( uri.host, uri.port ) { |http|
-                http.request( req )
-            }
-
-            doc = REXML::Document.new res.body
-            
-            doc.elements.each("geonames/timezone") do |element|
-                timezone.timezone_id    = WebService::get_element_child_text( element, 'timezoneId' )
-                timezone.gmt_offset     = WebService::get_element_child_float( element, 'gmtOffset' )
-                timezone.dst_offset     = WebService::get_element_child_float( element, 'dstOffset' )
-            end
-
-            return timezone
-          
-        end
+      WebService.postal_code_search postal_code_sc
+    end
 
-        def WebService.country_subdivision ( lat, long )
-            country_subdivision = CountrySubdivision.new
-           
-            url = Geonames::GEONAMES_SERVER + "/countrySubdivision?a=a"
-            
-            url = url + "&lat=" + lat.to_s
-            url = url + "&lng=" + long.to_s
+    def WebService.postal_code_search( search_criteria )
+      # postal codes to reutrn
+      postal_codes = Array.new
 
-            uri = URI.parse(url)
+      url = Geonames::GEONAMES_SERVER + "/postalCodeSearch?a=a"
+      url = url + search_criteria.to_query_params_string
 
-            req = Net::HTTP::Get.new(uri.path + '?' + uri.query)
+      uri = URI.parse(url)
 
-            res = Net::HTTP.start( uri.host, uri.port ) { |http|
-                http.request( req )
-            }
+      req = Net::HTTP::Get.new(uri.path + '?' + uri.query)
 
-            doc = REXML::Document.new res.body
+      res = Net::HTTP.start( uri.host, uri.port ) { |http|
+        http.request( req )
+      }
 
-            doc.elements.each("geonames/countrySubdivision") do |element|
-                country_subdivision.country_code    = WebService::get_element_child_text( element, 'countryCode' )
-                country_subdivision.country_name    = WebService::get_element_child_text( element, 'countryName' )
-                country_subdivision.admin_code_1    = WebService::get_element_child_text( element, 'adminCode1' )
-                country_subdivision.admin_name_1    = WebService::get_element_child_text( element, 'adminName1' )
-            end
+      doc = REXML::Document.new res.body
 
-            return country_subdivision
-          
-        end
+      doc.elements.each("geonames/code") do |element|
+        postal_codes << WebService::element_to_postal_code( element )
+      end
+
+      postal_codes
 
-        def WebService.country_code ( lat, long )
-           
-            url = Geonames::GEONAMES_SERVER + "/countrycode?a=a"
-            
-            url = url + "&lat=" + lat.to_s
-            url = url + "&lng=" + long.to_s
+    end
 
-            uri = URI.parse(url)
+    def WebService.find_nearby_postal_codes( search_criteria )
+      # postal codes to reutrn
+      postal_codes = Array.new
 
-            req = Net::HTTP::Get.new(uri.path + '?' + uri.query)
+      url = Geonames::GEONAMES_SERVER + "/findNearbyPostalCodes?a=a"
+      url = url + search_criteria.to_query_params_string
 
-            res = Net::HTTP.start( uri.host, uri.port ) { |http|
-                http.request( req )
-            }
+      uri = URI.parse(url)
 
-            doc = REXML::Document.new res.body
+      req = Net::HTTP::Get.new(uri.path + '?' + uri.query)
 
-            return res.body.strip
-          
-        end
-        
-        def WebService.search( search_criteria )
-            #toponym search results to return
-            toponym_sr = ToponymSearchResult.new
-        
-            url = Geonames::GEONAMES_SERVER + "/search?a=a"
-
-            if !search_criteria.q.nil? 
-              url = url + "&q=" + CGI::escape( search_criteria.q )
-            end
-
-            if !search_criteria.name_equals.nil? 
-              url = url + "&name_equals=" + CGI::escape( search_criteria.name_equals )
-            end
-
-            if !search_criteria.name_starts_with.nil? 
-              url = url + "&name_startsWith=" + CGI::escape( search_criteria.name_starts_with )
-            end
-
-            if !search_criteria.name.nil? 
-              url = url + "&name=" + CGI::escape( search_criteria.name )
-            end
-
-            if !search_criteria.tag.nil? 
-              url = url + "&tag=" + CGI::escape( search_criteria.tag )
-            end
-
-            if !search_criteria.country_code.nil? 
-              url = url + "&country=" + CGI::escape( search_criteria.country_code )
-            end
-
-            if !search_criteria.admin_code_1.nil? 
-              url = url + "&adminCode1=" + CGI::escape( search_criteria.admin_code_1 )
-            end
-
-            if !search_criteria.language.nil? 
-              url = url + "&lang=" + CGI::escape( search_criteria.language )
-            end
-
-            if !search_criteria.feature_class.nil? 
-              url = url + "&featureClass=" + CGI::escape( search_criteria.feature_class )
-            end
-
-            if !search_criteria.feature_codes.nil?
-              for feature_code in search_criteria.feature_codes
-                url = url + "&fcode=" + CGI::escape( feature_code )
-              end
-            end
-
-            if !search_criteria.max_rows.nil? 
-              url = url + "&maxRows=" + CGI::escape( search_criteria.max_rows )
-            end
-
-            if !search_criteria.start_row.nil? 
-              url = url + "&startRow=" + CGI::escape( search_criteria.start_row )
-            end
-
-            if !search_criteria.style.nil? 
-              url = url + "&style=" + CGI::escape( search_criteria.style )
-            end
-
-            uri = URI.parse(url)
-
-            req = Net::HTTP::Get.new(uri.path + '?' + uri.query)
-
-            res = Net::HTTP.start( uri.host, uri.port ) { |http|
-                http.request( req )
-            }
-
-            doc = REXML::Document.new res.body
-            
-            toponym_sr.total_results_count = doc.elements["geonames/totalResultsCount"].text
-            
-            doc.elements.each("geonames/geoname") do |element|
-
-                toponym_sr.toponyms << WebService::element_to_toponym( element )
-            
-            end
-
-            return toponym_sr
-        end
+      res = Net::HTTP.start( uri.host, uri.port ) { |http|
+        http.request( req )
+      }
+
+      doc = REXML::Document.new res.body
+
+      doc.elements.each("geonames/code") do |element|
+        postal_codes << WebService::element_to_postal_code( element )
+      end
+
+      postal_codes
+
+    end
+
+    def WebService.find_nearby_place_name( lat, long )
+      places = Array.new
+
+      url = Geonames::GEONAMES_SERVER + "/findNearbyPlaceName?a=a"
+
+      url = url + "&lat=" + lat.to_s
+      url = url + "&lng=" + long.to_s
+
+      uri = URI.parse(url)
+
+      req = Net::HTTP::Get.new(uri.path + '?' + uri.query)
+
+      res = Net::HTTP.start( uri.host, uri.port ) { |http|
+        http.request( req )
+      }
+
+      doc = REXML::Document.new res.body
+
+      doc.elements.each("geonames/geoname") do |element|
+
+        places << WebService::element_to_toponym( element )
+
+      end
+
+      return places
+
+    end
+
+    def WebService.timezone( lat, long )
+      timezone = Timezone.new
+
+      url = Geonames::GEONAMES_SERVER + "/timezone?a=a"
+
+      url = url + "&lat=" + lat.to_s
+      url = url + "&lng=" + long.to_s
+
+      uri = URI.parse(url)
+
+      req = Net::HTTP::Get.new(uri.path + '?' + uri.query)
+
+      res = Net::HTTP.start( uri.host, uri.port ) { |http|
+        http.request( req )
+      }
+
+      doc = REXML::Document.new res.body
+
+      doc.elements.each("geonames/timezone") do |element|
+        timezone.timezone_id    = WebService::get_element_child_text( element, 'timezoneId' )
+        timezone.gmt_offset     = WebService::get_element_child_float( element, 'gmtOffset' )
+        timezone.dst_offset     = WebService::get_element_child_float( element, 'dstOffset' )
+      end
+
+      return timezone
+
+    end
+
+    def WebService.findNearbyWikipedia( 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 = url + "&lat=" + lat.to_s
+        url = url + "&lng=" + long.to_s
+        url = url + "&radius=" + radius.to_s unless radius.nil?
+        url = url + "&max_rows=" + max_rows.to_s unless max_rows.nil?
+
+      elsif !q.nil?
+        url = url + "&q=" + q
+        url = url + "&radius=" + radius.to_s unless radius.nil?
+        url = url + "&max_rows=" + max_rows.to_s unless max_rows.nil?
+      end
+
+      uri = URI.parse(url)
+
+      req = Net::HTTP::Get.new(uri.path + '?' + uri.query)
+
+      res = Net::HTTP.start( uri.host, uri.port ) { |http|
+        http.request( req )
+      }
+
+      doc = REXML::Document.new res.body
+
+      doc.elements.each("geonames/entry") do |element|
+        articles << WebService::element_to_wikipedia_article( element )
+      end
+
+      return articles
+
+    end
     
+    def WebService.findBoundingBoxWikipedia( 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 = url + "&north=" + north.to_s
+      url = url + "&east=" + east.to_s
+      url = url + "&south=" + south.to_s
+      url = url + "&west=" + west.to_s
+      url = url + "&radius=" + radius.to_s unless radius.nil?
+      url = url + "&max_rows=" + max_rows.to_s unless max_rows.nil?
+
+      uri = URI.parse(url)
+
+      req = Net::HTTP::Get.new(uri.path + '?' + uri.query)
+
+      res = Net::HTTP.start( uri.host, uri.port ) { |http|
+        http.request( req )
+      }
+
+      doc = REXML::Document.new res.body
+
+      doc.elements.each("geonames/entry") do |element|
+        articles << WebService::element_to_wikipedia_article( element )
+      end
+
+      return articles
+
+    end    
+
+    def WebService.country_subdivision ( lat, long )
+      country_subdivision = CountrySubdivision.new
+
+      url = Geonames::GEONAMES_SERVER + "/countrySubdivision?a=a"
+
+      url = url + "&lat=" + lat.to_s
+      url = url + "&lng=" + long.to_s
+
+      uri = URI.parse(url)
+
+      req = Net::HTTP::Get.new(uri.path + '?' + uri.query)
+
+      res = Net::HTTP.start( uri.host, uri.port ) { |http|
+        http.request( req )
+      }
+
+      doc = REXML::Document.new res.body
+
+      doc.elements.each("geonames/countrySubdivision") do |element|
+        country_subdivision.country_code    = WebService::get_element_child_text( element, 'countryCode' )
+        country_subdivision.country_name    = WebService::get_element_child_text( element, 'countryName' )
+        country_subdivision.admin_code_1    = WebService::get_element_child_text( element, 'adminCode1' )
+        country_subdivision.admin_name_1    = WebService::get_element_child_text( element, 'adminName1' )
+      end
+
+      return country_subdivision
 
     end
+
+    def WebService.country_code ( lat, long )
+
+      url = Geonames::GEONAMES_SERVER + "/countrycode?a=a"
+
+      url = url + "&lat=" + lat.to_s
+      url = url + "&lng=" + long.to_s
+
+      uri = URI.parse(url)
+
+      req = Net::HTTP::Get.new(uri.path + '?' + uri.query)
+
+      res = Net::HTTP.start( uri.host, uri.port ) { |http|
+        http.request( req )
+      }
+
+      doc = REXML::Document.new res.body
+
+      return res.body.strip
+
+    end
+
+    def WebService.search( search_criteria )
+      #toponym search results to return
+      toponym_sr = ToponymSearchResult.new
+
+      url = Geonames::GEONAMES_SERVER + "/search?a=a"
+
+      if !search_criteria.q.nil?
+        url = url + "&q=" + CGI::escape( search_criteria.q )
+      end
+
+      if !search_criteria.name_equals.nil?
+        url = url + "&name_equals=" + CGI::escape( search_criteria.name_equals )
+      end
+
+      if !search_criteria.name_starts_with.nil?
+        url = url + "&name_startsWith=" + CGI::escape( search_criteria.name_starts_with )
+      end
+
+      if !search_criteria.name.nil?
+        url = url + "&name=" + CGI::escape( search_criteria.name )
+      end
+
+      if !search_criteria.tag.nil?
+        url = url + "&tag=" + CGI::escape( search_criteria.tag )
+      end
+
+      if !search_criteria.country_code.nil?
+        url = url + "&country=" + CGI::escape( search_criteria.country_code )
+      end
+
+      if !search_criteria.admin_code_1.nil?
+        url = url + "&adminCode1=" + CGI::escape( search_criteria.admin_code_1 )
+      end
+
+      if !search_criteria.language.nil?
+        url = url + "&lang=" + CGI::escape( search_criteria.language )
+      end
+
+      if !search_criteria.feature_class.nil?
+        url = url + "&featureClass=" + CGI::escape( search_criteria.feature_class )
+      end
+
+      if !search_criteria.feature_codes.nil?
+        for feature_code in search_criteria.feature_codes
+          url = url + "&fcode=" + CGI::escape( feature_code )
+        end
+      end
+
+      if !search_criteria.max_rows.nil?
+        url = url + "&maxRows=" + CGI::escape( search_criteria.max_rows )
+      end
+
+      if !search_criteria.start_row.nil?
+        url = url + "&startRow=" + CGI::escape( search_criteria.start_row )
+      end
+
+      if !search_criteria.style.nil?
+        url = url + "&style=" + CGI::escape( search_criteria.style )
+      end
+
+      uri = URI.parse(url)
+
+      req = Net::HTTP::Get.new(uri.path + '?' + uri.query)
+
+      res = Net::HTTP.start( uri.host, uri.port ) { |http|
+        http.request( req )
+      }
+
+      doc = REXML::Document.new res.body
+
+      toponym_sr.total_results_count = doc.elements["geonames/totalResultsCount"].text
+
+      doc.elements.each("geonames/geoname") do |element|
+
+        toponym_sr.toponyms << WebService::element_to_toponym( element )
+
+      end
+
+      return toponym_sr
+    end
+
+
+  end
 end
 
 

data/lib/wikipedia_article.rb

@@ -1,12 +1,12 @@
 #=============================================================================
 #
-# Copyright 2007 Adam Wisniewski <adamw@tbcn.ca> 
+# 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 
+# the License at
 #
-#  http://www.apache.org/licenses/LICENSE-2.0 
+#  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
@@ -17,9 +17,26 @@
 #=============================================================================
 
 module Geonames
-    class WikipediaArticle
-    
-    end
+  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

@@ -3,13 +3,13 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: geonames
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
-date: 2007-02-25 00:00:00 -05:00
+  version: 0.2.0
+date: 2007-04-01 00:00:00 -04:00
 summary: Ruby library for Geonames Web Services (http://www.geonames.org/export/)
 require_paths: 
 - lib
 email: adamw@tbcn.ca
-homepage: http://www.tbcn.ca/geonames
+homepage: http://www.tbcn.ca/ruby_geonames
 rubyforge_project: 
 description: 
 autorequire: 
@@ -29,6 +29,8 @@ post_install_message:
 authors: 
 - Adam Wisniewski
 files: 
+- geonames-0.1.0.gem
+- geonames-0.2.0.gem
 - geonames.gemspec
 - lib
 - nbproject