noaa-weather 0.1.0 → 0.1.1

data/History.txt

@@ -1,59 +1,6 @@
-commit 9821b5425f76bed852282937893949ef7047007d
-Author: Joshua Smith <kognate@gmail.com>
-Date:   Wed Mar 18 23:45:49 2009 -0400
+=== 1.0.0 / 2009-03-17
 
-    added icon return
+* 1 major enhancement
 
-commit 45979bf0cbfb335a3a95cdf60522dcccc8c7ea27
-Author: Joshua Smith <kognate@gmail.com>
-Date:   Wed Mar 18 23:45:39 2009 -0400
+  * Birthday!
 
-    added icon download and method to return the current icon from NOAA
-
-commit 67886568c353c8488f268e609cf89972e83e243c
-Author: Joshua Smith <kognate@gmail.com>
-Date:   Wed Mar 18 16:50:19 2009 -0400
-
-    fixed file caching (still pretty niave)
-
-commit 6c5e0f92cb83b271ea50e91cbec8bb50de41b6c7
-Author: Joshua Smith <kognate@gmail.com>
-Date:   Wed Mar 18 10:57:06 2009 -0400
-
-    fixed file based caching and fetching, made calls to private methods for specific stuff (like fetching from noaa)
-
-commit c202409a54553295ee8002564e9294fb28bfe18b
-Author: Joshua Smith <kognate@gmail.com>
-Date:   Wed Mar 18 10:56:27 2009 -0400
-
-    added logger
-
-commit e96f79f00a757a102fd0cc5c724e924a6768a8d2
-Author: Joshua Smith <kognate@gmail.com>
-Date:   Wed Mar 18 10:56:07 2009 -0400
-
-    changed conditions to actually work
-
-commit 6d9b1d79e2171f11c5d956cbb5e1cefdc2f8fdee
-Author: Joshua Smith <kognate@gmail.com>
-Date:   Wed Mar 18 10:54:55 2009 -0400
-
-    missed a name change
-
-commit 14e253f305a1e50aaf8ce0dec04d8aaa6064a5b7
-Author: Joshua Smith <kognate@gmail.com>
-Date:   Wed Mar 18 10:08:50 2009 -0400
-
-    renamed all the files to their final name.  removed bogus packages
-
-commit a0f70d4969d9cbf019bd65bf0c5e360198633305
-Author: Joshua B. Smith <jsmith@dixcom.com>
-Date:   Wed Mar 18 10:00:51 2009 -0400
-
-    refactored the fetch method and added some more behaviors
-
-commit 5e37508bcac786de6a78eb12300ebd156b25ae7d
-Author: Joshua B. Smith <jsmith@dixcom.com>
-Date:   Wed Mar 18 09:32:47 2009 -0400
-
-    initial commit

data/lib/noaa-weather.rb

@@ -1,21 +1,65 @@
 require 'soap/wsdlDriver'
 require 'logger'
 require 'libxml'
+require 'geokit'
 require 'xml'
+require 'digest'
 
-class Noaaweather
-  VERSION = '0.1.0'
-  attr_accessor :lattitude,:longitude, :start_time
+class BadLocation < Exception
+end
 
-  def initialize(site)
+class CachedGeocode
+  attr_accessor :address, :geocoding
+  include GeoKit::Geocoders
+  def geocode
+    self.geocoding = gcode_cache_read
     
- 	self.lattitude = 41.190856
-	self.longitude = -81.446962
+    {:lat => self.geocoding.lat, 
+      :lon => self.geocoding.lng, 
+      :site => self.geocoding.city.gsub(/[^a-zA-Z0-9]/,'_')}
+  end
 
-    @logger = Logger.new(STDOUT)
+  def cached?
+    @cached ||= false
+  end
 
-    @site = site
+  private
+  def gcode_cache_read
+    _hdad = Digest::SHA1.hexdigest(self.address)
+    if File.exists?("/tmp/#{_hdad}")
+      @cached = true
+      YAML::load_file("/tmp/#{_hdad}")
+    else
+      _z = MultiGeocoder.geocode(self.address)
+      raise BadLocation.new("Address Not Found: #{self.address}") unless _z.success
+      f = open("/tmp/#{_hdad}","w")
+      f.write(_z.to_yaml)
+      f.close
+      @cached = true
+      _z
+    end
+  end
+end
 
+class Noaaweather < CachedGeocode
+  VERSION = '0.1.1'
+  attr_accessor :lattitude,:longitude, :start_time
+  
+  def initialize(site,as_address=false)
+    
+    if as_address
+      self.address = site
+      _z = geocode
+      self.lattitude = _z[:lat]
+      self.longitude = _z[:lon]
+      @site = _z[:site]
+    else    
+      self.lattitude = 41.190856
+      self.longitude = -81.446962
+      @site = site
+    end
+
+    @logger = Logger.new(STDOUT)
     self.start_time = Time.now()
     @is_cached = false
   end	
@@ -74,5 +118,11 @@ class Noaaweather
     f.write(dat.to_s)
     f.close()
   end
+
+  def cache_geo_to_file(site,dat)
+  end
+
+  def load_geo_from_file(site)
+  end
   
 end

data/spec/noaa-weather.spec

@@ -1,9 +1,32 @@
 require 'rubygems'
 require 'lib/noaa-weather'
+
+describe CachedGeocode do
+    before(:each) do
+	  @cg = CachedGeocode.new
+	  @cg.address = "1060 W. Addison St., Chicago, IL"
+	end
+
+	it "should respond to address and address=" do
+     	@cg.should respond_to(:address)
+		@cg.should respond_to(:address=)
+	end
+
+	it "should respond to geocode and not be nil" do
+	    @cg.should respond_to(:geocode)
+		@cg.geocode.should_not be_nil
+	end
+	
+	it "should respond to cached?" do
+	   @cg.should respond_to(:cached?)
+	   @cg.cached?.should satisfy {|x| [true,false].include?(x) }
+	end
+end
+
 describe Noaaweather do
 
     before(:each) do
-	   @w = Noaaweather.new(:ravenna)
+	   @w = Noaaweather.new("1060 W. Addison St., Chicago, IL",true)
 	end
 
     it "should have lattitude as a float" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: noaa-weather
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - kognate
@@ -30,7 +30,7 @@ cert_chain:
   M36Zgg==
   -----END CERTIFICATE-----
 
-date: 2009-03-20 00:00:00 -04:00
+date: 2009-03-21 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency