ArseniysWeatherApp 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f4922b3cd32a82a547ad83f3716617be8d59a9b973f4b8f2b838f6536119c09
-  data.tar.gz: 78b4381b0da44be9555eb5c1b00034b5076cabcd4783d01a7239f92106797ce7
+  metadata.gz: 6c7b486feee9a4fc832cb2fa78b8a2647d16709bf0fb357d5ff535f45619628f
+  data.tar.gz: 034deb0b4180118f9d6248b69e5d6e264acc0005228924c4f66601fa5db40ca9
 SHA512:
-  metadata.gz: 933148f86e854cdb0337eff764b5f8ab5e49b7b3bd0a1b44ffa7ccf858cdc4b425e0e125e33a12e634a7b32f6cbd3764cbea1699aa3a4f7cfaa8cc55178a7f91
-  data.tar.gz: 5e6c8d1d367e6a09332bcfa005b6cd85aa88c31e64a9fc7f9982cfeed84d83eac70d8131ea3278c9c1af58fdd7864779219a717ef63d8b153b41c068648d063d
+  metadata.gz: 85090f66d32734b18e95f73c33e399b7e34ab7a7b01a0af0899a06fc266b483d7f0d713cfa7f94196f3da481b508211b66aed3c21705c1ecc9b1d1e7b7a693e1
+  data.tar.gz: 211c1bcf5232b4c4b9006f96f5aac89ddb6dbf515348250db215a7f1a9c5c7a67f2ce0ca7d82f5bcc456bab3d7be397c34474872245e7eaf3072601e471250cd

data/.gitignore

@@ -7,18 +7,11 @@
 /spec/reports/
 /tmp/
 /spec/
-/bin/
 /.idea/
 
 # rspec failure tracking
 .rspec_status
 .rspec
-.rubocop.yml
-.ruby-version
-arseniys_weather_app.gemspec
-Gemfile
-Gemfile.lock
-Rakefile
 *.gem
 test.rb
 *.json

data/exe/arseniys_weather_app

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require "ArseniysWeatherApp"
+
+my_weather = ["Run my_weather_today to see your weather forecast for today",
+              "Run my_weather_threedays to see your weather forecast for 3 days",
+              "Run location_avg_temp_today desired_latitude desired_longitude to see this location weather forecast for today",
+              "Run location_avg_temp_threedays desired_latitude desired_longitude to see this location weather forecast for 3 days"]
+puts my_weather

data/exe/location_avg_temp_threedays

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require "ArseniysWeatherApp"
+
+forecast = ArseniysWeatherApp::LocationWeatherForecast.new(lat: ARGV[0], lon: ARGV[1])
+puts forecast.today_avg_temperature

data/exe/location_avg_temp_today

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require "ArseniysWeatherApp"
+
+forecast = ArseniysWeatherApp::LocationWeatherForecast.new(lat: ARGV[0], lon: ARGV[1])
+puts forecast.three_days_avg_temperature

data/exe/my_weather_threedays

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require "ArseniysWeatherApp"
+
+forecast = ArseniysWeatherApp::MyWeatherForecast.new
+puts forecast.three_days_avg_temperature

data/exe/my_weather_today

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require "ArseniysWeatherApp"
+
+forecast = ArseniysWeatherApp::MyWeatherForecast.new
+puts forecast.today_avg_temperature

data/lib/ArseniysWeatherApp/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ArseniysWeatherApp
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/ArseniysWeatherApp.rb

@@ -7,126 +7,118 @@ require "geokit"
 module ArseniysWeatherApp
   class Error < StandardError; end
 
-  class Weather
-    def initialize
-      attach_yandex_api
-      attach_ip_stack_api
-      configure_geokit
-      @spb_location = { lat: 59.9573887, lon: 30.3430287 }
-    end
-
-    def weather_from_json
-      JSON.parse(File.read("WeatherForecasts.json"))
-    end
-
-    def weather_json(location: [59.9573887, 30.3430287],
-                     lang: "ru_RU", forecasts: 7,
-                     hours: false, extra: false)
-      attach_yandex_api if @yandex_api.nil?
+  class Requests
+    def self.weather_json(location: [59.9573887, 30.3430287],
+                          lang: "ru_RU", forecasts: 7,
+                          hours: false, extra: false)
       url = "https://api.weather.yandex.ru/v2/forecast"
       params = { "lat" => location[0], "lon" => location[1],
                  "lang" => lang, "limit" => forecasts,
                  "hours" => hours, "extra" => extra }
-      header = { "X-Yandex-API-Key" => @yandex_api }
+      header = { "X-Yandex-API-Key" => "01cafac0-8fd8-48ca-956a-f442580428a0" }
       response = Faraday.get(url, params, header)
       JSON.parse(response.body)
     end
 
-    def cleanup_forecast(parts)
-      parts["forecasts"][0]["parts"].delete_if { |key| %w[day_short night_short].include?(key) }
-    end
-
-    def cleanup_avg_temperature(parts)
-      parts.delete_if { |key| %w[day_short night_short].include?(key) }
-      { morning: parts["morning"]["temp_avg"], day: parts["day"]["temp_avg"],
-        evening: parts["evening"]["temp_avg"], night: parts["night"]["temp_avg"] }
+    def self.ip_addr
+      url = "https://obscure-temple-73986.herokuapp.com/"
+      response = Faraday.get(url, { "get_ip" => "yes" })
+      JSON.parse(response.body)["ip_addr"]
     end
+  end
 
-    def lat_lon_today_forecast(lat:, lon:)
-      cleanup_forecast(weather_json(location: [lat, lon], forecasts: 1, hours: true))
+  class GeoInfo
+    def self.spb_location
+      { lat: 59.9573887, lon: 30.3430287 }
     end
 
-    def lat_lon_today_avg_temperature(lat:, lon:)
-      cleanup_avg_temperature(lat_lon_today_forecast(lat: lat, lon: lon))
+    def self.location_by_ip
+      Geokit::Geocoders::IpstackGeocoder.api_key = "a1b3e41fa2284fb6fd4db50b8629e884"
+      geokit = Geokit::Geocoders::IpstackGeocoder.geocode(Requests.ip_addr)
+      { lat: geokit.lat, lon: geokit.longitude }
     end
+  end
 
-    def lat_lon_fact(lat:, lon:)
-      weather_json(location: [lat, lon], forecasts: 1)["fact"]
+  class Forecast
+    def initialize(lat:, lon:)
+      @location = [lat, lon]
     end
 
-    def lat_lon_fact_temperature(lat:, lon:)
-      lat_lon_fact(lat: lat, lon: lon)["temp"]
+    def today
+      Requests.weather_json(location: @location, forecasts: 1, hours: true)
     end
 
-    def spb_today_forecast
-      lat_lon_today_forecast(lat: @spb_location[:lat], lon: @spb_location[:lon])
+    def three_days
+      Requests.weather_json(location: @location, forecasts: 3, hours: true)
     end
+  end
 
-    def spb_today_avg_temperature
-      cleanup_avg_temperature(spb_today_forecast)
+  class Cleaners
+    def self.avg_temperature(forecast)
+      forecast = forecast_json(forecast)
+      avg_temperature = {}
+      day_name = ["today", "tomorrow", "day after tomorrow"]
+      forecast["forecasts"].each_with_index do |day, i|
+        avg_temperature[day_name[i]] = { morning: day["parts"]["morning"]["temp_avg"],
+                                         day: day["parts"]["day"]["temp_avg"],
+                                         evening: day["parts"]["evening"]["temp_avg"],
+                                         night: day["parts"]["night"]["temp_avg"] }
+      end
+      avg_temperature
     end
 
-    def spb_fact
-      lat_lon_fact(lat: @spb_location[:lat], lon: @spb_location[:lon])
+    def self.forecast_json(parts)
+      parts["forecasts"].each do |day|
+        day["parts"].delete_if { |key| %w[day_short night_short].include?(key) }
+      end
+      parts
     end
 
-    def spb_fact_temperature
-      spb_fact["temp"]
+    def self.fact(parts)
+      parts["fact"]["temp"]
     end
+  end
 
-    def my_today_forecast
-      location = acquire_location
-      lat_lon_today_forecast(lat: location[0], lon: location[1])
+  class LocationWeatherForecast
+    def initialize(lat:, lon:)
+      @forecast = Forecast.new(lat: lat, lon: lon)
     end
 
-    def my_today_avg_temperature
-      cleanup_avg_temperature(my_today_forecast)
+    def fact
+      Cleaners.fact(@forecast.today)
     end
 
-    def my_fact
-      location = acquire_location
-      lat_lon_fact(lat: location[0], lon: location[1])
+    def today_avg_temperature
+      Cleaners.avg_temperature(@forecast.today)
     end
 
-    def my_fact_temperature
-      my_fact["temp"]
+    def three_days_avg_temperature
+      Cleaners.avg_temperature(@forecast.three_days)
     end
 
-    private
-
-    def attach_yandex_api
-      return unless @yandex_api.nil?
-
-      url = "https://obscure-temple-73986.herokuapp.com/"
-      response = Faraday.get(url, { "weather" => "yes" })
-      @yandex_api = JSON.parse(response.body)["message"]
+    def today_forecast_json
+      Cleaners.forecast_json(@forecast.today)
     end
 
-    def configure_geokit
-      Geokit::Geocoders::IpstackGeocoder.api_key = @ip_stack_api
+    def three_days_forecast_json
+      Cleaners.forecast_json(@forecast.three_days)
     end
+  end
 
-    def acquire_location
-      geokit = Geokit::Geocoders::IpstackGeocoder.geocode(acquire_ip_addr)
-      [geokit.lat, geokit.longitude]
+  class MyWeatherForecast
+    def initialize
+      location = GeoInfo.location_by_ip
+      @location_weather = LocationWeatherForecast.new(lat: location[:lat], lon: location[:lon])
     end
 
-    def attach_ip_stack_api
-      return unless @ip_stack_api.nil?
+    def method_missing(method_name)
+      raise NoMethodError unless @location_weather.methods.include?(method_name)
 
-      url = "https://obscure-temple-73986.herokuapp.com/"
-      response = Faraday.get(url, { "get_ip" => "yes" })
-      @ip_stack_api = JSON.parse(response.body)["ip_stack_api"]
+      @location_weather.method(method_name).call
     end
 
-    def acquire_ip_addr
-      url = "https://obscure-temple-73986.herokuapp.com/"
-      response = Faraday.get(url, { "get_ip" => "yes" })
-      JSON.parse(response.body)["ip_addr"]
+    def respond_to_missing?(method_name, include_private = false)
+      @location_weather.methods.include?(method_name)
     end
   end
 end
-
-# f = File.new("WeatherForecasts.json", "w")
-# f.write(Application.new.weather_json(forecasts: 1).to_json)
-# f.close

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ArseniysWeatherApp
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Arseniy Chirkov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-08-12 00:00:00.000000000 Z
+date: 2021-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -43,13 +43,23 @@ description: |-
                            tells you what weather is right now
 email:
 - supernich19@gmail.com
-executables: []
+executables:
+- arseniys_weather_app
+- location_avg_temp_threedays
+- location_avg_temp_today
+- my_weather_threedays
+- my_weather_today
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
 - LICENSE.txt
 - README.md
+- exe/arseniys_weather_app
+- exe/location_avg_temp_threedays
+- exe/location_avg_temp_today
+- exe/my_weather_threedays
+- exe/my_weather_today
 - lib/ArseniysWeatherApp.rb
 - lib/ArseniysWeatherApp/version.rb
 homepage: https://github.com/Supernich/ArseniysWeatherApp