sunweather 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74ce93abd217f69b927922cb69b857699810c3f5
-  data.tar.gz: 460c4ac85a395ea184fb621cfb9efa132a6fe88c
+  metadata.gz: 2ca51bd687910ce30b1ed0723f7184483620d95c
+  data.tar.gz: c436170147ab0cd4f608dca0af7c730a5e8372fb
 SHA512:
-  metadata.gz: f3849b914b070724e309ffb2b2840585dc2e4437e9ceb49db1118f207c33194735ed287756262591a3eb93a7d1a6eabe931dd353cc1395f98835a8cf7bd7f226
-  data.tar.gz: f7713dcf2adb8158f542ee30a831cb3b2e1313743d56a7630233f78844d607d439fb25d4b927bf245072e6ad89af50926e10ae4905085651d82b7f20278a8070
+  metadata.gz: a8807130f624a19b61bb949d612a784fba4381d7f2561d4eb6f525291facfe4f5061831f27ecbaa7c4c8fc0ff47ab33688f705fea56e130f4eef9ea055bbab0d
+  data.tar.gz: 753ef1d2e8a0455c690f8b3dcd906ac89efaa75884bea46f8a6480b61ad10f86848d3f473f85c43ca11ed722258d48a90f4e00a6b953fa9329a05d6e8795f64f

data/README.rdoc

@@ -1,8 +1,26 @@
-= sunweather
+= Sunweather
 
-Description goes here.
+Sunweather
 
-== Contributing to sunweather
+Sunweather produces information about dawn and dusk times as well as temperature and weather information for a requested location.
+
+Thanks go to Ruby Geocoder for looking up geocoordinates from queries. Ruby Geocoder uses the Google Maps API as default.
+
+Thanks also go to Wunderground. Sunweather consults the Wunderground Astronomy and Conditions APIs for sunrise/sunset times and weather information.
+
+Finally, thanks go to EarthTools. EarthTools provides information about the durations of dawn and dusk.
+
+== Usage notes
+
+Sunweather is not yet in a state meant for use. However, you can provide a Wunderground API key as an environment variable, so that Ruby can access it via ENV["SUNWEATHER_DEV_WUNDERGROUND_API"]. If you do, a query on the console goes like 
+
+    $ sunweather Berlin
+    Dawn from 7:14 to 7:53.
+    Dusk from 15:56 to 16:35.
+    Temperature: 5.8°C, feels like 4.0°C.
+    Weather: Overcast, Winds from the wnw at 4.4 mph gusting to 6.4 mph, direction WNW.
+
+== Contributing to Sunweather
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
 * Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it.

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/lib/data.rb

@@ -0,0 +1,86 @@
+require 'xmlsimple'
+require 'open-uri'
+require 'date'
+
+module Sunweather
+	class Data
+		attr_reader :data_astro_conditions, :data_forecast, :data_twilight
+
+		def initialize lat, lng
+			file = open("http://api.wunderground.com/api/#{ENV["SUNWEATHER_DEV_WUNDERGROUND_API"]}/astronomy/conditions/q/#{lat},#{lng}.xml")
+			@data_astro_conditions = XmlSimple.xml_in(file)
+			file = open("http://api.worldweatheronline.com/free/v1/weather.ashx?q=#{lat},#{lng}&format=xml&extra=localObsTime&num_of_days=5&includelocation=yes&key=#{ENV['SUNWEATHER_DEV_WWO_API']}")
+			@data_forecast = XmlSimple.xml_in(file)
+			file = open("http://www.earthtools.org/sun/#{lat}/#{lng}/#{Time.now.mday}/#{Time.now.mon}/99/0")
+			@data_twilight = XmlSimple.xml_in(file)
+		end
+
+		def temperature
+			Float(self.data_astro_conditions["current_observation"][0]["temp_c"][0])
+		end
+
+		def feels_like
+			Float(self.data_astro_conditions["current_observation"][0]["feelslike_c"][0])
+		end
+
+		def observation_time
+			Time.at(Integer(self.data_astro_conditions["current_observation"][0]["observation_epoch"][0]))
+		end
+
+		def conditions
+			self.data_astro_conditions["current_observation"][0]["weather"][0]
+		end
+
+		def wind_speed
+			self.data_astro_conditions["current_observation"][0]["wind_string"][0]
+		end
+
+		def wind_direction
+			self.data_astro_conditions["current_observation"][0]["wind_dir"][0]
+		end
+
+		def sunrise
+			Time.new(1970,1,1,self.data_astro_conditions["sun_phase"][0]["sunrise"][0]["hour"][0],self.data_astro_conditions["sun_phase"][0]["sunrise"][0]["minute"][0])
+		end
+
+		def sunset
+			Time.new(1970,1,1,self.data_astro_conditions["sun_phase"][0]["sunset"][0]["hour"][0],self.data_astro_conditions["sun_phase"][0]["sunset"][0]["minute"][0])
+		end
+
+		def sunrise_earthtools
+			DateTime.parse(self.data_twilight["morning"][0]["sunrise"][0]).to_time
+		end
+
+		def sunset_earthtools
+			DateTime.parse(self.data_twilight["evening"][0]["sunset"][0]).to_time
+		end
+
+		def start_of_dawn_earthtools
+			DateTime.parse(self.data_twilight["morning"][0]["twilight"][0]["civil"][0]).to_time
+		end
+
+		def end_of_dusk_earthtools
+			DateTime.parse(self.data_twilight["evening"][0]["twilight"][0]["civil"][0]).to_time
+		end
+
+		def dawn_length
+			Time.at(self.sunrise_earthtools - self.start_of_dawn_earthtools)
+		end
+
+		def dusk_length
+			Time.at(self.end_of_dusk_earthtools - self.sunset_earthtools)
+		end
+
+		def start_of_dawn
+			Time.at(self.sunrise - self.dawn_length)
+		end
+
+		def end_of_dusk
+			Time.at(self.sunset.to_i + self.dawn_length.to_i)
+		end
+
+		def hours_minutes time
+			"#{time.hour}:#{time.minute+time.second/30}"
+		end
+	end
+end

data/lib/runner.rb

@@ -1,6 +1,5 @@
 require_relative 'geo'
-require_relative 'sun'
-require_relative 'weather'
+require_relative 'data'
 
 module Sunweather
 	class Runner
@@ -10,12 +9,11 @@ module Sunweather
 
 		def run
 			@geo = (ARGV[0] ? Geo.new(ARGV[0]) : Geo.new)
-			@sun = Sun.new(@geo.lat, @geo.lng)
-			@weather = Weather.new(@geo.lat, @geo.lng)
-			puts "Dawn from #{hours_minutes(@sun.start_of_dawn)} to #{hours_minutes(@sun.sunrise)}."
-			puts "Dusk from #{hours_minutes(@sun.sunset)} to #{hours_minutes(@sun.end_of_dusk)}."
-			puts "Temperature: #{@weather.temperature}°C, feels like #{@weather.feels_like}°C."
-			puts "Weather: #{@weather.conditions}, Winds #{@weather.wind_speed.downcase}, direction #{@weather.wind_direction}."
+			@data = Data.new(@geo.lat, @geo.lng)
+			puts "Dawn from #{hours_minutes(@data.start_of_dawn)} to #{hours_minutes(@data.sunrise)}."
+			puts "Dusk from #{hours_minutes(@data.sunset)} to #{hours_minutes(@data.end_of_dusk)}."
+			puts "Temperature: #{@data.temperature}°C, feels like #{@data.feels_like}°C."
+			puts "Weather: #{@data.conditions}, Winds #{@data.wind_speed.downcase}, direction #{@data.wind_direction}."
 		end
 
 		def hours_minutes time