forecastr 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d09ac7372c7875677def284d8b97e62b74a47604
-  data.tar.gz: b55a4a49c0f5ee1fe44007aa3cb1e5b048d6a7f5
+  metadata.gz: 9575109a60c5803a952035bf13e04107dd25f17a
+  data.tar.gz: fec0d1971cfbd5755ed2476f6720503cac9a021c
 SHA512:
-  metadata.gz: e504546129d1d47ef83a5f5fc2b3656c5d9c94b6b3ca3285c62fc9f761760b740ab6a56f8d7ed53ec8603ce5899f19710347f42212141ed592f3b600c64557a0
-  data.tar.gz: 087a4248703e4f8f8b2d06034ea01814459b9ffa501f50d2f3d3c807354f5ad401a1f244302c35c1f38cccae63e99ffba5ee4366e2a3ec211a6549f225f38a51
+  metadata.gz: aaf155808d600eb46cdae85b1f36607f7e5295176d9e11d1cf897898bfd2540c889c8b4e5042ed9216c18331a52aa1abf6f4a12777be95de39296830467c8f90
+  data.tar.gz: 1f1af391d6dc84c8662eae0c0f89bc1d05220c63f8079d00e007bd37dc4ebbc341556b7c919dc885f8f7697fa3aaa59013e98e2063435c3c85d947099adeeb35

data/lib/forecastr.rb

@@ -3,3 +3,5 @@ require 'forecastr/radar'
 require 'forecastr/forecast'
 require 'forecastr/wind'
 require 'forecastr/temperature'
+require 'forecastr/data_container'
+require 'forecastr/client'

data/lib/forecastr/client.rb

@@ -0,0 +1,23 @@
+require "net/http"
+require 'json'
+
+module Forecastr
+  class Client
+    API_URL = "http://api.openweathermap.org/data/2.5/weather?"
+
+    class << self
+      def search_by_city(city_name)
+        uri = URI(API_URL + "q=" + city_name)
+        json = JSON.parse(Net::HTTP.get(uri))
+        Forecastr::DataContainer.new(json)
+      end
+
+      def search_by_coordinates(lat, lon)
+        uri = URI(API_URL + "lat=#{lat}&lon=#{lon}")
+        json = JSON.parse(Net::HTTP.get(uri))
+        Forecastr::DataContainer.new(json)
+      end
+    end
+
+  end
+end

data/lib/forecastr/data_container.rb

@@ -0,0 +1,21 @@
+module Forecastr
+  class DataContainer
+
+    attr_reader :city, :longitude, :latitude, :pressure, :humidity, :clouds,
+      :temperature, :min_temperature, :max_temperature, :wind_speed, :wind_angle
+
+    def initialize(json)
+      @city = json['name']
+      @longitude = json['coord']['lon']
+      @latitude = json['coord']['lat']
+      @temperature = json['main']['temp']
+      @pressure = json['main']['pressure']
+      @humidity = json['main']['humidity']
+      @min_temperature = json['main']['temp_min']
+      @max_temperature = json['main']['temp_max']
+      @clouds = json['clouds']['all']
+      @wind_speed = json['wind']['speed']
+      @wind_angle = json['wind']['deg']
+    end
+  end
+end

data/lib/forecastr/forecast.rb

@@ -5,17 +5,17 @@ module Forecastr
                 :pressure, :humidity, :min_temperature,
                 :max_temperature, :clouds, :wind
 
-    def initialize(json)
-      @city = json['name']
-      @longitude = json['coord']['lon']
-      @latitude = json['coord']['lat']
-      @temperature = Forecastr::Temperature.new(json['main']['temp'])
-      @pressure = json['main']['pressure']
-      @humidity = json['main']['humidity']
-      @min_temperature = Forecastr::Temperature.new(json['main']['temp_min'])
-      @max_temperature = Forecastr::Temperature.new(json['main']['temp_max'])
-      @clouds = json['clouds']['all']
-      @wind = Forecastr::Wind.new(json)
+    def initialize(data)
+      @city = data.city
+      @longitude = data.longitude
+      @latitude = data.latitude
+      @temperature = Forecastr::Temperature.new(data.temperature)
+      @pressure = data.pressure
+      @humidity = data.humidity
+      @min_temperature = Forecastr::Temperature.new(data.min_temperature)
+      @max_temperature = Forecastr::Temperature.new(data.max_temperature)
+      @clouds = data.clouds
+      @wind = Forecastr::Wind.new(data.wind_speed, data.wind_angle)
     end
 
   end

data/lib/forecastr/radar.rb

@@ -3,30 +3,24 @@ require 'json'
 
 module Forecastr
   class Radar
-    API_URL = "http://api.openweathermap.org/data/2.5/weather?"
-
     class << self
       def find_by_city(city_name)
-        radar = new
-        radar.find_by_city(city_name)
+        new.find_by_city(city_name)
       end
 
       def find_by_coordinates(lat, lon)
-        radar = new
-        radar.find_by_coordinates(lat, lon)
+        new.find_by_coordinates(lat, lon)
       end
     end
 
-    def find_by_city(city_name)
-      uri = URI(API_URL + "q=" + city_name)
-      @json = JSON.parse(Net::HTTP.get(uri))
-      Forecastr::Forecast.new(@json)
+    def find_by_city(name)
+      data = Forecastr::Client.search_by_city(name)
+      Forecastr::Forecast.new(data)
     end
 
     def find_by_coordinates(lat, lon)
-      uri = URI(API_URL + "lat=#{lat}&lon=#{lon}")
-      @json = JSON.parse(Net::HTTP.get(uri))
-      Forecastr::Forecast.new(@json)
+      data = Forecastr::Client.search_by_coordinates(lat, lon)
+      Forecastr::Forecast.new(data)
     end
 
   end

data/lib/forecastr/temperature.rb

@@ -12,5 +12,9 @@ module Forecastr
     def to_farenheit
       (1.8 * (@kelvin - 273.15) + 32).round(2)
     end
+
+    def to_s
+      "#{to_celsius} °C"
+    end
   end
 end

data/lib/forecastr/version.rb

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

data/lib/forecastr/wind.rb

@@ -4,18 +4,22 @@ module Forecastr
 
     attr_reader :speed, :direction
 
-    def initialize(json)
-      @json = json
+    def initialize(speed, angle)
+      @speed = speed
+      @angle = angle
     end
 
     def speed
-      "#{@json['wind']['speed']} m/s"
+      "#{@speed} m/s"
     end
 
     def direction
-      degrees = @json['wind']['deg']
-      val = ((degrees/22.5) + 0.5).to_i
+      val = ((@angle/22.5) + 0.5).to_i
       DIRECTIONS[val % 16]
     end
+
+    def to_s
+      "#{speed} #{direction}"
+    end
   end
 end

data/spec/forecastr/client_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe Forecastr::Client do
+  describe '#search_by_city' do
+    it 'gets data from API for city' do
+      stub_get("http://api.openweathermap.org/data/2.5/weather?q=London,UK").to_return(:body => fixture('london.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+      results = Forecastr::Client.search_by_city('London,UK')
+
+      expect(results.city).to eq "London"
+    end
+  end
+
+  describe '#search_by_coordinates' do
+    it 'gets data from API by coordinates' do
+      stub_get("http://api.openweathermap.org/data/2.5/weather?lat=42.0&lon=21.4333").to_return(:body => fixture('skopje.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+      results = Forecastr::Client.search_by_coordinates(42.0, 21.4333)
+
+      expect(results.city).to eq "Opština Karpoš"
+    end
+  end
+
+end

data/spec/forecastr/data_container_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe Forecastr::DataContainer do
+  let(:json) { JSON.parse(fixture('skopje.json').read) }
+  let(:container) { Forecastr::DataContainer.new(json) }
+
+  it 'contains json results' do
+    expect(container.city).to eq "Opština Karpoš"
+    expect(container.longitude).to eq 21.43
+    expect(container.latitude).to eq 42
+    expect(container.temperature).to eq 283.85
+    expect(container.pressure).to eq 1021
+    expect(container.humidity).to eq 70
+    expect(container.min_temperature).to eq 280.15
+    expect(container.max_temperature).to eq 285.93
+    expect(container.clouds).to eq 0
+    expect(container.wind_speed).to eq 1.16
+    expect(container.wind_angle).to eq 128.501
+  end
+end

data/spec/forecastr/forecast_spec.rb

@@ -1,8 +1,9 @@
-require 'spec_helper'
+require_relative '../spec_helper'
 
 describe Forecastr::Forecast do
   let(:json) { JSON.parse(fixture('data.json').read) }
-  let(:forecast) { Forecastr::Forecast.new(json) }
+  let(:data) { Forecastr::DataContainer.new(json) }
+  let(:forecast) { Forecastr::Forecast.new(data) }
 
   it 'has a city' do
     expect(forecast.city).to eq "Benghazi"

data/spec/forecastr/wind_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Forecastr::Wind do
-  let(:wind) { Forecastr::Wind.new("wind" => {"speed" => 2.5,"deg" => -37}) }
+  let(:wind) { Forecastr::Wind.new(2.5, -37) }
 
   it 'has speed in m/s' do
     expect(wind.speed).to eq "2.5 m/s"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forecastr
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Ile Eftimov
@@ -80,6 +80,8 @@ files:
 - Rakefile
 - forecastr.gemspec
 - lib/forecastr.rb
+- lib/forecastr/client.rb
+- lib/forecastr/data_container.rb
 - lib/forecastr/forecast.rb
 - lib/forecastr/radar.rb
 - lib/forecastr/temperature.rb
@@ -88,6 +90,8 @@ files:
 - spec/fixtures/data.json
 - spec/fixtures/london.json
 - spec/fixtures/skopje.json
+- spec/forecastr/client_spec.rb
+- spec/forecastr/data_container_spec.rb
 - spec/forecastr/forecast_spec.rb
 - spec/forecastr/radar_spec.rb
 - spec/forecastr/temperature_spec.rb
@@ -121,6 +125,8 @@ test_files:
 - spec/fixtures/data.json
 - spec/fixtures/london.json
 - spec/fixtures/skopje.json
+- spec/forecastr/client_spec.rb
+- spec/forecastr/data_container_spec.rb
 - spec/forecastr/forecast_spec.rb
 - spec/forecastr/radar_spec.rb
 - spec/forecastr/temperature_spec.rb