ArseniysWeatherApp 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cbf1f318dd5763110dce0a345e139c73827192731bb3087a8648c16c640301f
-  data.tar.gz: 90781055cf6d34a5231c83113df7436f7bdd9ae1fc68db2b395ca7d45f28a728
+  metadata.gz: d55c2880714ebc0d6758364d0468849046d37782f387a188da0970db68606234
+  data.tar.gz: 6a15f0f7d028d963bdefac066c523c8e8fc546b7b0cd90ee90e2c2b10ca17d67
 SHA512:
-  metadata.gz: 37d1d54eb12765488ab4116d3e07dc7843383e73939de3d62453da17280c9f7e04be8f42180a794b1187cdbae9d349718e7440e2ed8938a9febb2a8de5fcc945
-  data.tar.gz: 1f55cd0187d370d47b8d3dd2e5ea581e1faf9395033e32dee1365728b4ede3168cc8599820798982359e946cfdb26b93112440a1f8ea478673db9333c61a6ad4
+  metadata.gz: 67930c8bc15ff5d0bd6580e5c340f72bfba7cb8f0e39ca23114c939d187871da8d701a08fcab392b6a5668d04ffa3c91ffc4112145888f6fd979ed92484ecdeb
+  data.tar.gz: 8bd17749b1a8460ecd6e7bd2405fd3cb88b59ab886bb3e2467e36fd8a3a0a185deecd7183025d232f1cbd04d386137c16e412f1341f35a9e2e054f4b3b710c86

data/.gitignore

@@ -15,7 +15,10 @@
 .rspec
 .rubocop.yml
 .ruby-version
-ArseniysWeatherApp.gemspec
+arseniys_weather_app.gemspec
 Gemfile
 Gemfile.lock
 Rakefile
+*.gem
+test.rb
+*.json

data/README.md

@@ -1,15 +1,15 @@
-# ArseniysWeatherApp
+# Arseniys Weather App
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/ArseniysWeatherApp`. To experiment with that code, run `bin/console` for an interactive prompt.
+Welcome!
 
-TODO: Delete this and the text above, and describe your gem
+This gem will work until 11 sep 2021, after that date yandex api key expires.
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'ArseniysWeatherApp'
+gem 'arseniys_weather_app'
 ```
 
 And then execute:
@@ -22,17 +22,15 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
-
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to [rubygems.org](https://rubygems.org).
-
-## Contributing
-
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/ArseniysWeatherApp.
+Use 
+```ruby
+ArseniysWeatherApp.attach_yandex_api
+```
+to attach yandex weather api key and then use 
+```ruby
+ArseniysWeatherApp.spb_weather
+```
+to see weather forecasts for today.
 
 ## License
 

data/lib/arseniys_weather_app.rb

@@ -0,0 +1,132 @@
+# frozen_string_literal: true
+
+require_relative "arseniys_weather_app/version"
+require "faraday"
+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?
+      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 }
+      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"] }
+    end
+
+    def lat_lon_today_forecast(lat:, lon:)
+      cleanup_forecast(weather_json(location: [lat, lon], forecasts: 1, hours: true))
+    end
+
+    def lat_lon_today_avg_temperature(lat:, lon:)
+      cleanup_avg_temperature(lat_lon_today_forecast(lat: lat, lon: lon))
+    end
+
+    def lat_lon_fact(lat:, lon:)
+      weather_json(location: [lat, lon], forecasts: 1)["fact"]
+    end
+
+    def lat_lon_fact_temperature(lat:, lon:)
+      lat_lon_fact(lat: lat, lon: lon)["temp"]
+    end
+
+    def spb_today_forecast
+      lat_lon_today_forecast(lat: @spb_location[:lat], lon: @spb_location[:lon])
+    end
+
+    def spb_today_avg_temperature
+      cleanup_avg_temperature(spb_today_forecast)
+    end
+
+    def spb_fact
+      lat_lon_fact(lat: @spb_location[:lat], lon: @spb_location[:lon])
+    end
+
+    def spb_fact_temperature
+      spb_fact["temp"]
+    end
+
+    def my_today_forecast
+      location = acquire_location
+      lat_lon_today_forecast(lat: location[0], lon: location[1])
+    end
+
+    def my_today_avg_temperature
+      cleanup_avg_temperature(my_today_forecast)
+    end
+
+    def my_fact
+      location = acquire_location
+      lat_lon_fact(lat: location[0], lon: location[1])
+    end
+
+    def my_fact_temperature
+      my_fact["temp"]
+    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"]
+    end
+
+    def configure_geokit
+      Geokit::Geocoders::IpstackGeocoder.api_key = @ip_stack_api
+    end
+
+    def acquire_location
+      geokit = Geokit::Geocoders::IpstackGeocoder.geocode(acquire_ip_addr)
+      [geokit.lat, geokit.longitude]
+    end
+
+    def attach_ip_stack_api
+      return unless @ip_stack_api.nil?
+
+      url = "https://obscure-temple-73986.herokuapp.com/"
+      response = Faraday.get(url, { "get_ip" => "yes" })
+      @ip_stack_api = JSON.parse(response.body)["ip_stack_api"]
+    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"]
+    end
+  end
+end
+
+# f = File.new("WeatherForecasts.json", "w")
+# f.write(Application.new.weather_json(forecasts: 1).to_json)
+# f.close

data/lib/{ArseniysWeatherApp → arseniys_weather_app}/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ArseniysWeatherApp
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Arseniy Chirkov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-08-11 00:00:00.000000000 Z
+date: 2021-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: geokit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.13.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.13.1
 description: |-
   This gem is searches your location and based on your location
                            tells you what weather is right now
@@ -36,14 +50,14 @@ files:
 - ".gitignore"
 - LICENSE.txt
 - README.md
-- lib/ArseniysWeatherApp.rb
-- lib/ArseniysWeatherApp/version.rb
-homepage: https://github.com/Supernich/ArseniysWeatherApp
+- lib/arseniys_weather_app.rb
+- lib/arseniys_weather_app/version.rb
+homepage: https://github.com/Supernich/arseniys_weather_app
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://github.com/Supernich/ArseniysWeatherApp
-  source_code_uri: https://github.com/Supernich/ArseniysWeatherApp
+  homepage_uri: https://github.com/Supernich/arseniys_weather_app
+  source_code_uri: https://github.com/Supernich/arseniys_weather_app
 post_install_message: 
 rdoc_options: []
 require_paths:

data/lib/ArseniysWeatherApp.rb

@@ -1,48 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "ArseniysWeatherApp/version"
-require "faraday"
-require "json"
-
-module ArseniysWeatherApp
-  class Error < StandardError; end
-
-  def self.attach_yandex_api
-    url = "https://obscure-temple-73986.herokuapp.com/"
-    response = Faraday.get(url, { "weather" => "yes" })
-    @yandex_api = JSON.parse(response.body)["message"]
-  end
-
-
-
-  def self.spb_weather
-    str = weather_json(location: [60, 30])
-    puts("Today's night average temperature: #{str["forecasts"][0]["parts"]["night"]["temp_avg"]}C")
-    puts("Today's morning average temperature: #{str["forecasts"][0]["parts"]["morning"]["temp_avg"]}C")
-    puts("Today's day average temperature: #{str["forecasts"][0]["parts"]["day"]["temp_avg"]}C")
-    puts("Today's evening average temperature: #{str["forecasts"][0]["parts"]["evening"]["temp_avg"]}C")
-  end
-
-  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 }
-    response = Faraday.get(url, params, header)
-    JSON.parse(response.body)
-  end
-
-  # f = File.new("WeatherForecast.json", "w")
-  # f.write(parse.to_json)
-  # f.close
-  # str = JSON.parse(File.read("WeatherForecast.json"))
-
-end