weather_handler 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 932b86fc3dfa249cd24143a15528a69b24073d6ee8f4e6e9e9d950810751e6a8
-  data.tar.gz: 52bbef68e094e955f313039c8092c86a3d9620f7b53a18557a15a84b762c704d
+  metadata.gz: acf49f41b812a13f406b6a56094b8b4c5be8f9a5573190c0a24633589fc343d1
+  data.tar.gz: 703e40cf12dfafcdc6f4e213494a4be4eaa89b0137a4749b6fb65c3d1e789d63
 SHA512:
-  metadata.gz: d4e98e51c4ef51f756ea9d0f79e0442b03e90e29410f7ba77b1b41d48af52703a1ca3a3d1004ab6b06bccfdde899ef6dd53dc5fe16f4aac11f551396dc853ef7
-  data.tar.gz: fef912cec5e714ce5ebf878e1f6ff6ffb783e595010fa8119fd4ff8763ab9840ff5adfe720c57b2e1cd547ecbf8c52cb9341649f001c60c06434140c673454f4
+  metadata.gz: 14c6524569a6336f247502da745cef01e6598f234f47a7d56e722898a68ab1342d2832cd759e89041df92ba2622399e0dca4ed494e2f12cadefe86eb2e143c83
+  data.tar.gz: 921896d617a58470d269afab691ed192593afad34d1faf77cefa571290cc3b6312122bbe41eac44a88957072856b6949915c13062666b1b411962a4b111c3b8d

data/Gemfile.lock

@@ -1,7 +1,9 @@
 PATH
   remote: .
   specs:
-    weather_handler (0.1.0)
+    weather_handler (0.1.2)
+      rest-client (~> 2.1)
+      retryable (~> 3.0, >= 3.0.5)
 
 GEM
   remote: https://rubygems.org/
@@ -11,11 +13,11 @@ GEM
       unf (>= 0.0.5, < 1.0.0)
     dotenv (2.7.6)
     http-accept (1.7.0)
-    http-cookie (1.0.3)
+    http-cookie (1.0.4)
       domain_name (~> 0.5)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0225)
+    mime-types-data (3.2021.0704)
     netrc (0.11.0)
     rake (12.3.3)
     rest-client (2.1.0)
@@ -23,6 +25,7 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
+    retryable (3.0.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
@@ -46,7 +49,6 @@ PLATFORMS
 DEPENDENCIES
   dotenv (~> 2.7, >= 2.7.6)
   rake (~> 12.0)
-  rest-client (~> 2.1)
   rspec (~> 3.0)
   weather_handler!
 

data/README.md

@@ -24,8 +24,8 @@ After installation you new need to create instance of `WeatherHandler::Weather`
 
 For example: `weather = WeatherHandler::Weather.new('london')`. Now you have new instance of WeatherHandler::Weather which you can use to find out such information as:
 
-* current temperature (just call `weather.current_temperature('celsium')` and pass celsium, kelvin or fahrenheit argument dimension as string.)
-* feels like temperature (just call `weather.feels_like_temperature('fahrenheit')` and pass celsium, kelvin or fahrenheit argument dimension as string.)
+* current temperature (just call `weather.current_temperature('celsium')` and pass celsium, kelvin or fahrenheit argument dimension as string. Default attribute is 'celsium'. So for this case you can use just as: `weather.current_temperature` and you will receive celsium value.
+* feels like temperature (just call `weather.feels_like_temperature('fahrenheit')` and pass celsium, kelvin or fahrenheit argument dimension as string. Default attribute is 'celsium'. So for this case you can use just as: `weather.feels_like_temperature` and you will receive celsium value.
 * weather description (just call `weather.weather_description`)
 * humidity (just call `weather.humidity`)
 * pressure (just call `weather.pressure`)

data/lib/adapters/weather.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module Adapters
+  class Weather
+    CONVERTATION_KELVIN_VALUE = 273.15
+    CONVERTATION_FAHRENHEIT_VALUE = 459.67
+    FAHRENHEIT_COEFFICIENT = 1.8
+    CELSIUM = 'celsium'
+    KELVIN = 'kelvin'
+    FAHRENHEIT = 'fahrenheit'
+    ERROR_MESSAGE = 'Please, try to type correct dimension. Correct types are: Celsium, Kelvin and Fahrenheit.'
+
+    def initialize(dimension, standard_amount)
+      @dimension = dimension
+      @standard_amount = standard_amount
+    end
+
+    def call
+      converter(dimension, standard_amount)
+    end
+
+    private
+
+    attr_reader :standard_amount, :dimension, :amount
+
+    def converter(dimension, quantity)
+      case dimension.downcase
+      when CELSIUM
+        "#{degrees_to_c(quantity)} C"
+      when KELVIN
+        "#{quantity} K"
+      when FAHRENHEIT
+        "#{degrees_to_f(quantity)} F"
+      else
+        ERROR_MESSAGE
+      end
+    end
+
+    def degrees_to_c(quantity)
+      (quantity - CONVERTATION_KELVIN_VALUE).round(1)
+    end
+
+    def degrees_to_f(quantity)
+      (quantity * FAHRENHEIT_COEFFICIENT - CONVERTATION_FAHRENHEIT_VALUE).round(1)
+    end
+  end
+end

data/lib/decorators/open_weather_response.rb

@@ -0,0 +1,23 @@
+module Decorators
+  class OpenWeatherResponse
+    def initialize(data)
+      @data = data
+    end
+
+    def amount_in_kelvins
+      parsed_data['temp'].round(1)
+    end
+
+    def parsed_data
+      JSON.parse(data.body)['main']
+    end
+
+    def parsed_weather_description
+      JSON.parse(data.body)['weather'].first['description'].split.map(&:capitalize).join(' ')
+    end
+
+    private
+
+    attr_reader :data
+  end
+end

data/lib/open_weather_client.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class OpenWeatherClient
+  def initialize(city)
+    @city = city
+  end
+
+  def call
+    Decorators::OpenWeatherResponse.new(weather_data)
+  end
+
+  private
+
+  attr_reader :city
+
+  def weather_data
+    Retryable.retryable(tries: 5) do
+      @weather_data ||= RestClient.get(location_url)
+    end
+  end
+
+  def location_url
+    "api.openweathermap.org/data/2.5/weather?q=#{city}&appid=#{ENV['OPEN_WEATHER_API_KEY']}"
+  end
+end

data/lib/weather_handler/version.rb

@@ -1,3 +1,3 @@
 module WeatherHandler
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/weather_handler.rb

@@ -4,78 +4,45 @@ require 'weather_handler/version'
 require 'rest-client'
 require 'dotenv/load'
 require 'json'
+require 'retryable'
+require 'open_weather_client'
+require 'adapters/weather'
+require 'decorators/open_weather_response'
 
 module WeatherHandler
   class Weather
-    CONVERTATION_KELVIN_VALUE = 273.15
-    CONVERTATION_FAHRENHEIT_VALUE = 459.67
-    FAHRENHEIT_COEFFICIENT = 1.8
-    ERROR_MESSAGE = 'Please, try to type correct dimension. Correct types are: Celsium, Kelvin and Fahrenheit.'
     CELSIUM = 'celsium'
-    KELVIN = 'kelvin'
-    FAHRENHEIT = 'fahrenheit'
 
     def initialize(city)
-      @city = city
+      @response = OpenWeatherClient.new(city).call
+      @converter = Adapters::Weather
+      @kelvin_amount = response.amount_in_kelvins
     end
 
-    def current_temperature(dimension)
-      converter(dimension)
+    def current_temperature(dimension = CELSIUM)
+      converter.new(dimension, kelvin_amount).call
     end
 
-    def feels_like_temperature(dimension)
-      amount = (JSON.parse(weather_data.body)['main']['feels_like']).round(1)
+    def feels_like_temperature(dimension = CELSIUM)
+      amount = (response.parsed_data['feels_like']).round(1)
 
-      converter(dimension, amount)
+      converter.new(dimension, amount).call
     end
 
     def weather_description
-      JSON.parse(weather_data.body)['weather'].first['description'].split.map(&:capitalize).join(' ')
+      response.parsed_weather_description
     end
 
     def humidity
-      "#{JSON.parse(weather_data.body)['main']['humidity']} %"
+      "#{response.parsed_data['humidity']} %"
     end
 
     def pressure
-      "#{JSON.parse(weather_data.body)['main']['pressure']} mb"
+      "#{response.parsed_data['pressure']} mb"
     end
 
     private
 
-    attr_reader :city
-
-    def weather_data
-      @weather_data ||= RestClient.get(location_url)
-    end
-
-    def location_url
-      "api.openweathermap.org/data/2.5/weather?q=#{city}&appid=#{ENV['OPEN_WEATHER_API_KEY']}"
-    end
-
-    def converter(dimension, quantity = degrees_in_k)
-      case dimension.downcase
-      when CELSIUM
-        "#{degrees_to_c(quantity)} C"
-      when KELVIN
-        "#{quantity} K"
-      when FAHRENHEIT
-        "#{degrees_to_f(quantity)} F"
-      else
-        ERROR_MESSAGE
-      end
-    end
-
-    def degrees_to_c(quantity)
-      (quantity - CONVERTATION_KELVIN_VALUE).round(1)
-    end
-
-    def degrees_in_k
-      (JSON.parse(weather_data.body)['main']['temp']).round(1)
-    end
-
-    def degrees_to_f(quantity)
-      (quantity * FAHRENHEIT_COEFFICIENT - CONVERTATION_FAHRENHEIT_VALUE).round(1)
-    end
+    attr_reader :response, :converter, :kelvin_amount
   end
 end

data/weather_handler.gemspec

@@ -29,7 +29,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency('rake', '~> 12.0')
   spec.add_development_dependency('rspec', '~> 3.0')
   spec.add_development_dependency('dotenv', '~> 2.7', '>= 2.7.6')
-  spec.add_development_dependency('rest-client', '~> 2.1')
+  spec.add_dependency('rest-client', '~> 2.1')
+  spec.add_dependency('retryable', '~> 3.0', '>= 3.0.5')
 
   spec.required_ruby_version = Gem::Requirement.new('>= 2.3.0')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: weather_handler
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Ivan Viter
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-05-09 00:00:00.000000000 Z
+date: 2021-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -65,13 +65,33 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: retryable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.5
 description: This gem will find weather for your city
 email:
 - ivanviter@i.ua
@@ -92,6 +112,9 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- lib/adapters/weather.rb
+- lib/decorators/open_weather_response.rb
+- lib/open_weather_client.rb
 - lib/weather_handler.rb
 - lib/weather_handler/version.rb
 - weather_handler.gemspec
@@ -118,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.5
 signing_key: 
 specification_version: 4
 summary: Weather Handler gem is created for purpose of finding weather on any city