forecastr 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9575109a60c5803a952035bf13e04107dd25f17a
-  data.tar.gz: fec0d1971cfbd5755ed2476f6720503cac9a021c
+  metadata.gz: 5cffd26866155781856d6e6502d6d1c11ca6db40
+  data.tar.gz: 89de042eefbdfb4e49b584203e5ba12346c2d5a3
 SHA512:
-  metadata.gz: aaf155808d600eb46cdae85b1f36607f7e5295176d9e11d1cf897898bfd2540c889c8b4e5042ed9216c18331a52aa1abf6f4a12777be95de39296830467c8f90
-  data.tar.gz: 1f1af391d6dc84c8662eae0c0f89bc1d05220c63f8079d00e007bd37dc4ebbc341556b7c919dc885f8f7697fa3aaa59013e98e2063435c3c85d947099adeeb35
+  metadata.gz: 893ce64e40851ab239770e65c5a023999f7b188e5d7f2330e4ed79dd4edd03fa71f3132cff0eefe71aed6ae4679a0f897c7a9595428925bedd1dc49d66bf8c0b
+  data.tar.gz: 29071cd3a3cf4a8e3498fd34df79859d769887282e22ec99f2036e5a136c0ad1eb819dfe66d0f0f1ce5acc11be8ff56a9df0319094d9baad5113ff6d9fc42fdd

data/lib/forecastr/data_container.rb

@@ -2,7 +2,7 @@ module Forecastr
   class DataContainer
 
     attr_reader :city, :longitude, :latitude, :pressure, :humidity, :clouds,
-      :temperature, :min_temperature, :max_temperature, :wind_speed, :wind_angle
+      :temperature, :min_temperature, :max_temperature, :wind_speed, :wind_angle, :sunrise, :sunset
 
     def initialize(json)
       @city = json['name']
@@ -16,6 +16,8 @@ module Forecastr
       @clouds = json['clouds']['all']
       @wind_speed = json['wind']['speed']
       @wind_angle = json['wind']['deg']
+      @sunrise = json['sys']['sunrise'].to_s
+      @sunset = json['sys']['sunset'].to_s
     end
   end
 end

data/lib/forecastr/forecast.rb

@@ -1,9 +1,11 @@
+require 'date'
+
 module Forecastr
   class Forecast
 
     attr_reader :city, :longitude, :latitude, :temperature,
                 :pressure, :humidity, :min_temperature,
-                :max_temperature, :clouds, :wind
+                :max_temperature, :clouds, :wind, :sunrise, :sunset
 
     def initialize(data)
       @city = data.city
@@ -16,6 +18,8 @@ module Forecastr
       @max_temperature = Forecastr::Temperature.new(data.max_temperature)
       @clouds = data.clouds
       @wind = Forecastr::Wind.new(data.wind_speed, data.wind_angle)
+      @sunset = DateTime.strptime(data.sunset, '%s')
+      @sunrise = DateTime.strptime(data.sunrise, '%s')
     end
 
   end

data/lib/forecastr/version.rb

@@ -1,3 +1,3 @@
 module Forecastr
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/spec/fixtures/data.json

@@ -1,12 +1 @@
-{"id":88319,"dt":1345284000,"name":"Benghazi",
-    "coord":{"lat":32.12,"lon":20.07},
-    "main":{"temp":306.15,"pressure":1013,"humidity":44,"temp_min":306,"temp_max":306},
-    "wind":{"speed":1,"deg":-7},
-    "weather":[
-                 {"id":520,"main":"Rain","description":"light intensity shower rain","icon":"09d"},
-                 {"id":500,"main":"Rain","description":"light rain","icon":"10d"},
-                 {"id":701,"main":"Mist","description":"mist","icon":"50d"}
-              ],
-    "clouds":{"all":90},
-    "rain":{"3h":3}
-}
+{"coord":{"lon":-0.13,"lat":51.51},"sys":{"message":0.0846,"country":"GB","sunrise":1395640357,"sunset":1395685239},"weather":[{"id":804,"main":"Clouds","description":"overcast clouds","icon":"04n"}],"base":"cmc stations","main":{"temp":279.64,"humidity":55,"pressure":1003,"temp_min":278.71,"temp_max":280.37},"wind":{"speed":2.06,"gust":3.6,"deg":350},"clouds":{"all":92},"dt":1395699452,"id":2643743,"name":"London","cod":200}

data/spec/forecastr/data_container_spec.rb

@@ -16,5 +16,7 @@ describe Forecastr::DataContainer do
     expect(container.clouds).to eq 0
     expect(container.wind_speed).to eq 1.16
     expect(container.wind_angle).to eq 128.501
+    expect(container.sunrise).to eq '1395376499'
+    expect(container.sunset).to eq '1395420461'
   end
 end

data/spec/forecastr/forecast_spec.rb

@@ -1,21 +1,29 @@
 require_relative '../spec_helper'
 
 describe Forecastr::Forecast do
-  let(:json) { JSON.parse(fixture('data.json').read) }
+  let(:json) { JSON.parse(fixture('london.json').read) }
   let(:data) { Forecastr::DataContainer.new(json) }
   let(:forecast) { Forecastr::Forecast.new(data) }
 
   it 'has a city' do
-    expect(forecast.city).to eq "Benghazi"
+    expect(forecast.city).to eq "London"
+  end
+
+  it 'has time of sunrise' do
+    expect(forecast.sunrise).to eq DateTime.parse("2014-03-21T05:59:29+00:00")
+  end
+
+  it 'has time of sunset' do
+    expect(forecast.sunset).to eq DateTime.parse("2014-03-21 19:15:36 +0100")
   end
 
   describe 'coordinates' do
     it 'has longitude' do
-      expect(forecast.longitude).to eq 20.07
+      expect(forecast.longitude).to eq -0.13
     end
 
     it 'has latitude' do
-      expect(forecast.latitude).to eq 32.12
+      expect(forecast.latitude).to eq 51.51
     end
   end
 
@@ -23,42 +31,42 @@ describe Forecastr::Forecast do
     describe 'temperatures' do
       context 'celsius' do
         it 'has current temperature' do
-          expect(forecast.temperature.to_celsius).to eq 33.0
+          expect(forecast.temperature.to_celsius).to eq 7.64
         end
 
         it 'has minimal temperature' do
-          expect(forecast.min_temperature.to_celsius).to eq 32.85
+          expect(forecast.min_temperature.to_celsius).to eq 6.11
         end
 
         it 'has maximal temperature' do
-          expect(forecast.max_temperature.to_celsius).to eq 32.85
+          expect(forecast.max_temperature.to_celsius).to eq 9.0
         end
       end
     end
 
     it 'has pressure' do
-      expect(forecast.pressure).to eq 1013
+      expect(forecast.pressure).to eq 1001
     end
 
     it 'has humidity' do
-      expect(forecast.humidity).to eq 44
+      expect(forecast.humidity).to eq 70
     end
 
   end
 
   describe 'clouds' do
     it 'has cloud coverage in %' do
-      expect(forecast.clouds).to eq 90
+      expect(forecast.clouds).to eq 92
     end
   end
 
   describe 'wind' do
     it 'has speed in m/s' do
-      expect(forecast.wind.speed).to eq "1 m/s"
+      expect(forecast.wind.speed).to eq "5.1 m/s"
     end
 
     it 'has direction' do
-      expect(forecast.wind.direction).to eq "N"
+      expect(forecast.wind.direction).to eq "S"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forecastr
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Ile Eftimov