geonames_api 0.0.1 → 0.0.2

data/README.md

@@ -45,7 +45,7 @@ For a complete list of the config options, take a look at the `geonames_api.rb`
 
 The geonames api uses the ISO code of the country as its natural key. 
 
-    > GeoNamesAPI::Country.new("US").find
+    > GeoNamesAPI::Country.find("US")
     
     => #<GeoNamesAPI::Country:0x007fd43503dfc0 @country_code="US", @country_name="United States", @currency_code="USD", @fips_code="US", @iso_numeric=840, @north=49.388611, @capital="Washington", @continent_name="North America", @area_in_sq_km=9629091.0, @languages="en-US,es-US,haw,fr", @iso_alpha3="USA", @continent="NA", @south=24.544245, @east=-66.954811, @geoname_id=6252001, @west=-124.733253, @population=310232863>
 
@@ -57,7 +57,7 @@ The geonames api uses the ISO code of the country as its natural key.
 
 The geonames api uses the latitude and longitude of the place as the parameters for its weather service.
 
-    > GeoNamesAPI::Weather.new(41.88,-87.68).find
+    > GeoNamesAPI::Weather.find(41.88,-87.68)
     
     => #<GeoNamesAPI::Weather:0x007fab1c80dc10 @latitude=41.88, @longitude=-87.68, @weather_condition="n/a", @clouds="few clouds", @observation="KMDW 012051Z 28009KT 10SM FEW049 BKN070 11/M02 A2983 RMK AO2 SLP105 T01111022 55010", @wind_direction=280, @icao="KMDW", @sea_level_pressure=1010.5, @elevation=188, @country_code="US", @clouds_code="FEW", @lng=-87.75, @temperature=11.1, @dew_point="-2.2", @wind_speed=9, @humidity=39, @station_name="Chicago, Chicago Midway Airport", @datetime="2012-11-01 20:51:00", @lat=41.78333333333333>
 

data/lib/geonames_api.rb

@@ -2,16 +2,16 @@ require 'open-uri'
 require 'json'
 require 'active_support/all'
 require "geonames_api/version"
+require "geonames_api/hash"
+require "geonames_api/object"
 require "geonames_api/country"
 require "geonames_api/weather"
 
 module GeoNamesAPI
-  BASE_URL = "http://api.geonames.org/"
-  
-  def self.to_url_params(params)
-    "?" + params.collect { |key, value| "#{key}=#{value}" }.join("&")
-  end
   
+  mattr_accessor :url
+  @@url = "http://api.geonames.org/"
+
   mattr_accessor :formatted
   @@formatted = true
   
@@ -28,15 +28,5 @@ module GeoNamesAPI
     { formatted: formatted, lang: lang, username: username, style: style }
   end
   
-  def self.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

data/lib/geonames_api/country.rb

@@ -1,47 +1,16 @@
 module GeoNamesAPI
-  class Country
+  class Country < GeoNamesAPI::Object
 
     METHOD = "countryInfoJSON"
+    ID = ["country"]
         
     def self.all
-      JSON.load(open(url).read)["geonames"].collect do |response|
-        new.parse(response)
-      end
-    end
-    
-    attr_accessor :country_code
-    
-    def initialize(country_code=nil)
-      self.country_code = country_code
-    end 
-
-    def find
-      parse(JSON.load(open(url).read)["geonames"].first)
-      self
-    end
-    
-    def parse(response)
-      response.each do |key, value|
-        attr_name = key.underscore.to_sym
-        self.class.send(:attr_accessor, attr_name) unless respond_to? attr_name
-        value = GeoNamesAPI.set_default_type(value)
-        send("#{attr_name}=", value)
-      end 
-      self
-    end
-
-    def params
-      GeoNamesAPI.params.merge({ country: country_code })
-    end
-    
-    def url
-      self.class.url(params)
+      where.collect { |response| new(response) }
     end
         
-    def self.url(params={})
-      params = GeoNamesAPI.params.merge(params)
-      GeoNamesAPI::BASE_URL + METHOD + GeoNamesAPI.to_url_params(params)
+    def self.where(params={})
+      JSON.load(open(url(params)).read)["geonames"]
     end
-        
+
   end
 end

data/lib/geonames_api/hash.rb

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

data/lib/geonames_api/object.rb

@@ -0,0 +1,44 @@
+module GeoNamesAPI
+  class Object
+        
+    def self.find(*names)
+      params, n = {}, 0
+      self::ID.each { |i| params[i] = names[n]; n+= 1 }
+      new(where(params).first)
+    end
+    
+    def self.url(params={})
+      GeoNamesAPI.url + self::METHOD + GeoNamesAPI.params.merge(params).to_url
+    end
+
+    def initialize(response)
+      parse(response)
+    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
+    
+    def parse(response)
+      response.each do |key, value|
+        attr_name = create_attribute(key)
+        value = set_default_type(value)
+        send("#{attr_name}=", value)
+      end 
+    end
+     
+  end
+end

data/lib/geonames_api/version.rb

@@ -1,3 +1,3 @@
 module GeoNamesAPI
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/geonames_api/weather.rb

@@ -1,35 +1,20 @@
 module GeoNamesAPI
-  class Weather
-    METHOD = "findNearByWeatherJSON"
+  class Weather < GeoNamesAPI::Object
     
-    attr_accessor :latitude, :longitude
+    METHOD = "findNearByWeatherJSON"
+    ID = ["lat", "lng"]
     
-    def initialize(latitude, longitude)
-      self.latitude, self.longitude = latitude, longitude
+    def self.where(params={})
+      JSON.load(open(url(params)).read)["weatherObservation"]
     end
     
-    def find
-      parse(JSON.load(open(url).read)["weatherObservation"])
-      self
+    def self.url(params)
+      GeoNamesAPI.url + METHOD + GeoNamesAPI.params.merge(params).to_url
     end
-    
-    def parse(response)
-      response.each do |key, value|
-        attr_name = key.underscore.to_sym
-        self.class.send(:attr_accessor, attr_name) unless respond_to? attr_name
-        value = GeoNamesAPI.set_default_type(value)
-        send("#{attr_name}=", value)
-      end 
-      self
+
+    def initialize(response)
+      parse(response)
     end
     
-    def params
-      GeoNamesAPI.params.merge({ lat: latitude, lng: longitude })
-    end
-        
-    def url
-      GeoNamesAPI::BASE_URL + METHOD + GeoNamesAPI.to_url_params(params)
-    end
-
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geonames_api
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-01 00:00:00.000000000 Z
+date: 2012-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -43,6 +43,8 @@ files:
 - geonames_api.gemspec
 - lib/geonames_api.rb
 - lib/geonames_api/country.rb
+- lib/geonames_api/hash.rb
+- lib/geonames_api/object.rb
 - lib/geonames_api/version.rb
 - lib/geonames_api/weather.rb
 homepage: https://github.com/buytruckload/geonames_api