sunweather 0.3.1 → 0.3.2

data/spec/data_spec.rb

@@ -0,0 +1,73 @@
+require_relative "../lib/geo"
+require_relative "../lib/data"
+
+describe Sunweather::Data, "after initializing with geocoordinates from default Geo object" do
+  let(:geo) { Sunweather::Geo.new }
+  let(:data) { Sunweather::Data.new(geo.lat, geo.lng) }
+
+  it "contains the required data from World Weather Online, Wunderground and Earthtools" do
+    expect(data.data_astro_conditions).not_to be_nil
+    expect(data.data_astro_conditions["current_observation"][0]["observation_epoch"][0].to_i).to be_within(7*86400).of(Time.now.to_i)
+    expect(Float(data.data_astro_conditions["current_observation"][0]["temp_c"][0])).to be_within(100).of(0)
+    expect(Float(data.data_astro_conditions["current_observation"][0]["feelslike_c"][0])).to be_within(100).of(0)
+    expect(data.data_astro_conditions["current_observation"][0]["weather"][0]).to_not be_empty
+    expect(data.data_astro_conditions["current_observation"][0]["wind_string"][0]).to_not be_empty
+    expect(data.data_astro_conditions["current_observation"][0]["wind_dir"][0]).to_not be_empty
+    expect(data.data_forecast).not_to be_nil
+    expect(data.data_forecast["weather"][0]["tempMinC"][0].to_i).to be_within(100).of(0)
+    expect(data.data_forecast["weather"][0]["tempMaxC"][0].to_i).to be_within(100).of(0)
+    expect(data.data_forecast["weather"][0]["weatherDesc"][0]).to_not be_empty
+    expect(data.data_forecast["weather"][0]["windspeedKmph"][0].to_i).to be_within(100).of(100)
+    expect(data.data_forecast["weather"][0]["winddir16Point"][0]).to_not be_empty
+    expect(data.data_forecast["weather"][4]["tempMinC"][0].to_i).to be_within(100).of(0)
+    expect(data.data_forecast["weather"][4]["tempMaxC"][0].to_i).to be_within(100).of(0)
+    expect(data.data_forecast["weather"][4]["weatherDesc"][0]).to_not be_empty
+    expect(data.data_forecast["weather"][4]["windspeedKmph"][0].to_i).to be_within(100).of(100)
+    expect(data.data_forecast["weather"][4]["winddir16Point"][0]).to_not be_empty
+    expect(data.temperature).to be_within(100).of(0)
+    expect(data.feels_like).to be_within(100).of(0)
+    expect(data.observation_time.min).to be_within(30).of(30)
+    expect(data.conditions).to_not be_empty
+    expect(data.wind_speed).to_not be_empty
+    expect(data.data_astro_conditions).not_to be_nil
+    expect(data.data_astro_conditions["sun_phase"][0]["sunrise"][0]["hour"][0].to_i).to be_within(12).of(12)
+    expect(data.data_astro_conditions["sun_phase"][0]["sunrise"][0]["minute"][0].to_i).to be_within(30).of(30)
+    expect(data.data_astro_conditions["sun_phase"][0]["sunset"][0]["hour"][0].to_i).to be_within(12).of(12)
+    expect(data.data_astro_conditions["sun_phase"][0]["sunset"][0]["minute"][0].to_i).to be_within(30).of(30)
+    expect(data.sunrise.min).to be_within(30).of(30)
+    expect(data.sunrise.hour).to be_within(12).of(12)
+    expect(data.sunset.min).to be_within(30).of(30)
+    expect(data.sunset.hour).to be_within(12).of(12)
+    expect(data.data_twilight).not_to be_nil
+    expect(DateTime.parse(data.data_twilight["morning"][0]["twilight"][0]["civil"][0]).sec).to be_within(30).of(30)
+    expect(DateTime.parse(data.data_twilight["morning"][0]["twilight"][0]["civil"][0]).min).to be_within(30).of(30)
+    expect(DateTime.parse(data.data_twilight["morning"][0]["twilight"][0]["civil"][0]).hour).to be_within(30).of(30)
+    expect(DateTime.parse(data.data_twilight["evening"][0]["twilight"][0]["civil"][0]).hour).to be_within(30).of(30)
+    expect(DateTime.parse(data.data_twilight["morning"][0]["sunrise"][0]).hour).to be_within(30).of(30)
+    expect(DateTime.parse(data.data_twilight["evening"][0]["sunset"][0]).hour).to be_within(30).of(30)
+    expect(data.sunrise_earthtools.sec).to be_within(30).of(30)
+    expect(data.sunrise_earthtools.min).to be_within(30).of(30)
+    expect(data.sunrise_earthtools.hour).to be_within(12).of(12)
+    expect(data.sunset_earthtools.sec).to be_within(30).of(30)
+    expect(data.sunset_earthtools.min).to be_within(30).of(30)
+    expect(data.sunset_earthtools.hour).to be_within(12).of(12)
+    expect(data.start_of_dawn_earthtools.sec).to be_within(30).of(30)
+    expect(data.start_of_dawn_earthtools.min).to be_within(30).of(30)
+    expect(data.start_of_dawn_earthtools.hour).to be_within(12).of(12)
+    expect(data.end_of_dusk_earthtools.sec).to be_within(30).of(30)
+    expect(data.end_of_dusk_earthtools.min).to be_within(30).of(30)
+    expect(data.end_of_dusk_earthtools.hour).to be_within(12).of(12)
+    expect(data.start_of_dawn.sec).to be_within(30).of(30)
+    expect(data.start_of_dawn.min).to be_within(30).of(30)
+    expect(data.start_of_dawn.hour).to be_within(12).of(12)
+    expect(data.end_of_dusk.sec).to be_within(30).of(30)
+    expect(data.end_of_dusk.min).to be_within(30).of(30)
+    expect(data.end_of_dusk.hour).to be_within(12).of(12)
+    expect(data.dawn_length.sec).to be_within(30).of(30)
+    expect(data.dawn_length.min).to be_within(30).of(30)
+    expect(data.dawn_length.hour).to be_within(12).of(12)
+    expect(data.dusk_length.sec).to be_within(30).of(30)
+    expect(data.dusk_length.min).to be_within(30).of(30)
+    expect(data.dusk_length.hour).to be_within(12).of(12)
+  end
+end

data/sunweather.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "sunweather"
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tobi Frank"]
-  s.date = "2013-10-18"
+  s.date = "2013-12-01"
   s.description = "Provides sunrise/sunset and weather info for given address."
   s.email = "tobifrank38@gmail.com"
   s.executables = ["sunweather"]
@@ -27,14 +27,13 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "bin/sunweather",
+    "lib/data.rb",
     "lib/geo.rb",
     "lib/runner.rb",
-    "lib/sun.rb",
-    "lib/weather.rb",
+    "meditation",
+    "spec/data_spec.rb",
     "spec/geo_spec.rb",
     "spec/spec_helper.rb",
-    "spec/sun_spec.rb",
-    "spec/weather_spec.rb",
     "sunweather.gemspec",
     "temp"
   ]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sunweather
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Tobi Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-18 00:00:00.000000000 Z
+date: 2013-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -168,14 +168,13 @@ files:
 - Rakefile
 - VERSION
 - bin/sunweather
+- lib/data.rb
 - lib/geo.rb
 - lib/runner.rb
-- lib/sun.rb
-- lib/weather.rb
+- meditation
+- spec/data_spec.rb
 - spec/geo_spec.rb
 - spec/spec_helper.rb
-- spec/sun_spec.rb
-- spec/weather_spec.rb
 - sunweather.gemspec
 - temp
 homepage: http://github.com/tobifrank/sunweather

data/lib/sun.rb

@@ -1,60 +0,0 @@
-require 'xmlsimple'
-require 'open-uri'
-require 'date'
-
-module Sunweather
-	class Sun
-		attr_reader :data_sunrise_sunset, :data_twilight
-
-		def initialize lat, lng
-			file = open("http://api.wunderground.com/api/#{ENV["SUNWEATHER_DEV_WUNDERGROUND_API"]}/astronomy/q/#{lat},#{lng}.xml")
-			@data_sunrise_sunset = 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 sunrise
-			Time.new(1970,1,1,self.data_sunrise_sunset["sun_phase"][0]["sunrise"][0]["hour"][0],self.data_sunrise_sunset["sun_phase"][0]["sunrise"][0]["minute"][0])
-		end
-
-		def sunset
-			Time.new(1970,1,1,self.data_sunrise_sunset["sun_phase"][0]["sunset"][0]["hour"][0],self.data_sunrise_sunset["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/weather.rb

@@ -1,39 +0,0 @@
-require 'xmlsimple'
-require 'open-uri'
-
-module Sunweather
-	class Weather
-		attr_reader :data_current, :data_forecast
-
-		def initialize lat, lng
-			file = open("http://api.wunderground.com/api/#{ENV["SUNWEATHER_DEV_WUNDERGROUND_API"]}/conditions/q/#{lat},#{lng}.xml")
-			@data_current = 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)
-		end
-
-		def temperature
-			Float(self.data_current["current_observation"][0]["temp_c"][0])
-		end
-
-		def feels_like
-			Float(self.data_current["current_observation"][0]["feelslike_c"][0])
-		end
-
-		def observation_time
-			Time.at(Integer(self.data_current["current_observation"][0]["observation_epoch"][0]))
-		end
-
-		def conditions
-			self.data_current["current_observation"][0]["weather"][0]
-		end
-
-		def wind_speed
-			self.data_current["current_observation"][0]["wind_string"][0]
-		end
-
-		def wind_direction
-			self.data_current["current_observation"][0]["wind_dir"][0]
-		end
-	end
-end

data/spec/sun_spec.rb

@@ -1,50 +0,0 @@
-require_relative "../lib/geo"
-require_relative "../lib/sun"
-
-describe Sunweather::Sun, "after initializing with geocoordinates from default Geo object" do
-  let(:geo) { Sunweather::Geo.new }
-  let(:sun) { Sunweather::Sun.new(geo.lat, geo.lng) }
-
-  it "contains the required data from Wunderground and Earthtools" do
-    expect(sun.data_sunrise_sunset).not_to be_nil
-    expect(Integer(sun.data_sunrise_sunset["sun_phase"][0]["sunrise"][0]["hour"][0])).to be_within(12).of(12)
-    expect(Integer(sun.data_sunrise_sunset["sun_phase"][0]["sunrise"][0]["minute"][0])).to be_within(30).of(30)
-    expect(Integer(sun.data_sunrise_sunset["sun_phase"][0]["sunset"][0]["hour"][0])).to be_within(12).of(12)
-    expect(Integer(sun.data_sunrise_sunset["sun_phase"][0]["sunset"][0]["minute"][0])).to be_within(30).of(30)
-    expect(sun.sunrise.min).to be_within(30).of(30)
-    expect(sun.sunrise.hour).to be_within(12).of(12)
-    expect(sun.sunset.min).to be_within(30).of(30)
-    expect(sun.sunset.hour).to be_within(12).of(12)
-    expect(sun.data_twilight).not_to be_nil
-    expect(DateTime.parse(sun.data_twilight["morning"][0]["twilight"][0]["civil"][0]).sec).to be_within(30).of(30)
-    expect(DateTime.parse(sun.data_twilight["morning"][0]["twilight"][0]["civil"][0]).min).to be_within(30).of(30)
-    expect(DateTime.parse(sun.data_twilight["morning"][0]["twilight"][0]["civil"][0]).hour).to be_within(30).of(30)
-    expect(DateTime.parse(sun.data_twilight["evening"][0]["twilight"][0]["civil"][0]).hour).to be_within(30).of(30)
-    expect(DateTime.parse(sun.data_twilight["morning"][0]["sunrise"][0]).hour).to be_within(30).of(30)
-    expect(DateTime.parse(sun.data_twilight["evening"][0]["sunset"][0]).hour).to be_within(30).of(30)
-    expect(sun.sunrise_earthtools.sec).to be_within(30).of(30)
-    expect(sun.sunrise_earthtools.min).to be_within(30).of(30)
-    expect(sun.sunrise_earthtools.hour).to be_within(12).of(12)
-    expect(sun.sunset_earthtools.sec).to be_within(30).of(30)
-    expect(sun.sunset_earthtools.min).to be_within(30).of(30)
-    expect(sun.sunset_earthtools.hour).to be_within(12).of(12)
-    expect(sun.start_of_dawn_earthtools.sec).to be_within(30).of(30)
-    expect(sun.start_of_dawn_earthtools.min).to be_within(30).of(30)
-    expect(sun.start_of_dawn_earthtools.hour).to be_within(12).of(12)
-    expect(sun.end_of_dusk_earthtools.sec).to be_within(30).of(30)
-    expect(sun.end_of_dusk_earthtools.min).to be_within(30).of(30)
-    expect(sun.end_of_dusk_earthtools.hour).to be_within(12).of(12)
-    expect(sun.start_of_dawn.sec).to be_within(30).of(30)
-    expect(sun.start_of_dawn.min).to be_within(30).of(30)
-    expect(sun.start_of_dawn.hour).to be_within(12).of(12)
-    expect(sun.end_of_dusk.sec).to be_within(30).of(30)
-    expect(sun.end_of_dusk.min).to be_within(30).of(30)
-    expect(sun.end_of_dusk.hour).to be_within(12).of(12)
-    expect(sun.dawn_length.sec).to be_within(30).of(30)
-    expect(sun.dawn_length.min).to be_within(30).of(30)
-    expect(sun.dawn_length.hour).to be_within(12).of(12)
-    expect(sun.dusk_length.sec).to be_within(30).of(30)
-    expect(sun.dusk_length.min).to be_within(30).of(30)
-    expect(sun.dusk_length.hour).to be_within(12).of(12)
-  end
-end

data/spec/weather_spec.rb

@@ -1,33 +0,0 @@
-require_relative "../lib/geo"
-require_relative "../lib/weather"
-
-describe Sunweather::Weather, "after initializing with geocoordinates from default Geo object" do
-  let(:geo) { Sunweather::Geo.new }
-  let(:weather) { Sunweather::Weather.new(geo.lat, geo.lng) }
-
-  it "contains the required data from World Weather Online" do
-    expect(weather.data_current).not_to be_nil
-    expect(Integer(weather.data_current["current_observation"][0]["observation_epoch"][0])).to be_within(7*86400).of(Time.now.to_i)
-    expect(Float(weather.data_current["current_observation"][0]["temp_c"][0])).to be_within(100).of(0)
-    expect(Float(weather.data_current["current_observation"][0]["feelslike_c"][0])).to be_within(100).of(0)
-    expect(weather.data_current["current_observation"][0]["weather"][0]).to_not be_empty
-    expect(weather.data_current["current_observation"][0]["wind_string"][0]).to_not be_empty
-    expect(weather.data_current["current_observation"][0]["wind_dir"][0]).to_not be_empty
-    expect(weather.data_forecast).not_to be_nil
-    expect(Integer(weather.data_forecast["weather"][0]["tempMinC"][0])).to be_within(100).of(0)
-    expect(Integer(weather.data_forecast["weather"][0]["tempMaxC"][0])).to be_within(100).of(0)
-    expect(weather.data_forecast["weather"][0]["weatherDesc"][0]).to_not be_empty
-    expect(Integer(weather.data_forecast["weather"][0]["windspeedKmph"][0])).to be_within(100).of(100)
-    expect(weather.data_forecast["weather"][0]["winddir16Point"][0]).to_not be_empty
-    expect(Integer(weather.data_forecast["weather"][4]["tempMinC"][0])).to be_within(100).of(0)
-    expect(Integer(weather.data_forecast["weather"][4]["tempMaxC"][0])).to be_within(100).of(0)
-    expect(weather.data_forecast["weather"][4]["weatherDesc"][0]).to_not be_empty
-    expect(Integer(weather.data_forecast["weather"][4]["windspeedKmph"][0])).to be_within(100).of(100)
-    expect(weather.data_forecast["weather"][4]["winddir16Point"][0]).to_not be_empty
-    expect(weather.temperature).to be_within(100).of(0)
-    expect(weather.feels_like).to be_within(100).of(0)
-    expect(weather.observation_time.min).to be_within(30).of(30)
-    expect(weather.conditions).to_not be_empty
-    expect(weather.wind_speed).to_not be_empty
-	end
-end