tropical 0.1.4 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 953aca22adc93a3af8f07baa5e168a61c6e40d23731ce2df5bc25f7e0b3c2878
-  data.tar.gz: ea6d4bacb6cb117b354a670e4334d7d26f1f154d9c1844d99a3156f46e6282d9
+  metadata.gz: e476e340003d8dbeddffadbac3a5b832ec2de83e3b74fb188c4caf8bd9e69332
+  data.tar.gz: 8817fa2177338c740cedbf4089eefc47e768bb59192467bb090aa9a67b2de978
 SHA512:
-  metadata.gz: 0a5e95d3d0be81e1ac048d6f8c23bc4bfd39217024d91d0b346b1d673e7deb748abff6ac970c2b9f41fea6968930037436656eaa6a16b78ec78ac9b7a3078185
-  data.tar.gz: fd59c9c81c0da541ba21a4fe30d8fd437cce0c8940f92694e87bf76222d405b9fddee4f28e0a656064f094efe7d2893cbff9b7eedbef39d8560e94b1401e1a67
+  metadata.gz: 0142d337b7ec7dda644e3803dd74f401aa7f1d8df818fc242dac7ff0e3be09e34a3d16b2f043102661cf0d1b736d0ba57c74d504e15fb590933796ffc87fceaa
+  data.tar.gz: 6eaa1019d4d085d66e3802555ca1333d94dcac28a1eb1bf7cbd1b5f88875a14c807da8c1f9981615123ab60b2adce6fff2af376f77d31582ed4034c690ad7a00

data/.github/workflows/ci.yml

@@ -0,0 +1,40 @@
+name: Ruby Gem
+
+on:
+  push:
+    branches: [ teste-ci ]
+
+jobs:
+  build:
+    name: Build + Publish
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby 2.6
+      uses: actions/setup-ruby@v1
+      with:
+        ruby-version: 2.6.x
+
+    - name: Publish to GPR
+      run: |
+        mkdir -p $HOME/.gem
+        touch $HOME/.gem/credentials
+        chmod 0600 $HOME/.gem/credentials
+        printf -- "---\n:github: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
+        gem build *.gemspec
+        gem push --KEY github --host https://rubygems.pkg.github.com/${OWNER} *.gem
+      env:
+        GEM_HOST_API_KEY: "Bearer ${{secrets.GITHUB_TOKEN}}"
+        OWNER: ${{ github.repository_owner }}
+
+    - name: Publish to RubyGems
+      run: |
+        mkdir -p $HOME/.gem
+        touch $HOME/.gem/credentials
+        chmod 0600 $HOME/.gem/credentials
+        printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
+        gem build *.gemspec
+        gem push *.gem
+      env:
+        GEM_HOST_API_KEY: "${{secrets.RUBYGEMS_AUTH_TOKEN}}"

data/CODE_OF_CONDUCT.md

@@ -39,7 +39,7 @@ This Code of Conduct applies within all community spaces, and also applies when
 
 ## Enforcement
 
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement at valter.sandoval@redealumni.com. All complaints will be reviewed and investigated promptly and fairly.
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement at valterandrey@gmail.com. All complaints will be reviewed and investigated promptly and fairly.
 
 All community leaders are obligated to respect the privacy and security of the reporter of any incident.
 
@@ -69,8 +69,6 @@ Community leaders will follow these Community Impact Guidelines in determining t
 
 **Community Impact**: Demonstrating a pattern of violation of community standards, including sustained inappropriate behavior,  harassment of an individual, or aggression toward or disparagement of classes of individuals.
 
-**Consequence**: A permanent ban from any sort of public interaction within the community.
-
 ## Attribution
 
 This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 2.0,

data/Gemfile.lock

@@ -1,13 +1,24 @@
 PATH
   remote: .
   specs:
-    tropical (0.1.4)
+    tropical (0.1.9)
+      activesupport (~> 6.1.2.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    activesupport (6.1.2.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     ast (2.4.2)
+    concurrent-ruby (1.1.8)
     diff-lcs (1.4.4)
+    i18n (1.8.9)
+      concurrent-ruby (~> 1.0)
+    minitest (5.14.3)
     parallel (1.20.1)
     parser (3.0.0.0)
       ast (~> 2.4.1)
@@ -40,7 +51,10 @@ GEM
     rubocop-ast (1.4.1)
       parser (>= 2.7.1.5)
     ruby-progressbar (1.11.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
     unicode-display_width (2.0.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   x86_64-linux

data/README.md

@@ -1,18 +1,13 @@
 # Tropical
 
-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/tropical`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
+Gem to search weather forecast for 5 days:
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'tropical'
-
-# or
-gem 'tropical', git: 'https://github.com/valterandrei/tropical', branch: 'main'
+gem 'tropical', '~> 0.1.8'
 ```
 
 And then execute:
@@ -21,7 +16,105 @@ And then execute:
 
 ## Usage
 
-TODO: Write usage instructions here
+Ruby API
+```ruby
+tropical = Tropical::OpenWeatherMap.new(
+  {
+    appid: 'your_api_key', # required
+    q:     'São Paulo',    # required
+    lang:  'pt_br',        # optional
+    units: 'metric',       # optional
+    cnt:   '50'            # optional
+  }
+)
+```
+For more information about the params: [openweathermap](https://openweathermap.org/forecast5)
+
+Note: The `mode` param is not avaible.
+
+- City name
+```ruby
+tropical.city_name
+
+# => "São Paulo"
+```
+
+- Population
+```ruby
+tropical.population
+
+# => 10021295
+```
+
+- Country
+```ruby
+tropical.country
+
+# => "BR"
+```
+
+- Timezone
+```ruby
+tropical.timezone
+
+# => -3
+```
+
+- Current date
+```ruby
+tropical.current_date
+
+# => 2021-02-14 18:00:00 -0300
+```
+
+- Coord
+```ruby
+tropical.coord
+
+# => {:lat=>-23.5475, :lon=>-46.6361}
+```
+
+- Scale
+```ruby
+tropical.scale
+
+# => "°C"
+```
+
+- Current temperature
+```ruby
+tropical.current_temp
+
+# => 26.92
+```
+
+- Current weather
+```ruby
+tropical.current_weather
+
+# => "chuva moderada"
+```
+
+- Full sumary
+```ruby
+tropical.full_sumary
+
+# => "27°C e chuva moderada em São Paulo em 14/02. Média para os próximos dias: 26°C em 14/02, 26°C em 15/02, 26°C em 16/02, 26°C em 17/02, 25°C em 18/02 e 24°C em 19/02."
+```
+
+- Sumary current day
+```ruby
+tropical.sumary_current_day
+
+# => "27°C e chuva moderada em São Paulo em 14/02."
+```
+
+- Sumary days forecast
+```ruby
+tropical.sumary_days_forecast
+
+# => "26°C em 14/02, 26°C em 15/02, 26°C em 16/02, 26°C em 17/02, 25°C em 18/02 e 24°C em 19/02." 
+```
 
 ## Development
 
@@ -31,8 +124,8 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/tropical. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/[USERNAME]/tropical/blob/master/CODE_OF_CONDUCT.md).
+Bug reports and pull requests are welcome on GitHub at https://github.com/valterandrei/tropical. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/ValterAndrei/tropical/blob/main/CODE_OF_CONDUCT.md).
 
 ## Code of Conduct
 
-Everyone interacting in the Tropical project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/tropical/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the Tropical project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/ValterAndrei/tropical/blob/main/CODE_OF_CONDUCT.md).

data/lib/tropical.rb

@@ -1,5 +1,7 @@
+require "active_support/all"
 require "date"
 require "json"
+require "i18n"
 require "net/http"
 require "uri"
 
@@ -16,25 +18,28 @@ module Tropical
       load_data(response)
     end
 
-    def average_temp_by_days
-      group_by_days = list.group_by { |item| item[:datetime].to_date }
-      days = []
+    def city_name
+      data["city"]["name"]
+    end
 
-      group_by_days.each do |day, temps|
-        average = temps.sum { |time| time[:temp] } / temps.length
+    def country
+      data["city"]["country"]
+    end
 
-        days << { day: day, average: average.round }
-      end
+    def population
+      data["city"]["population"]
+    end
 
-      days
+    def timezone
+      Time.at(data["city"]["timezone"]).zone.to_i
     end
 
-    def city
-      data["city"]["name"]
+    def coord
+      data["city"]["coord"].transform_keys(&:to_sym)
     end
 
     def current_date
-      list.first[:datetime]
+      list.first[:dt]
     end
 
     def current_temp
@@ -45,16 +50,6 @@ module Tropical
       list.first[:description]
     end
 
-    def list
-      data["list"].map do |list_item|
-        {
-          datetime: Time.at(list_item["dt"]),
-          temp: list_item["main"]["temp"],
-          description: list_item["weather"].first["description"]
-        }
-      end
-    end
-
     def scale
       units = params[:units]
 
@@ -64,16 +59,23 @@ module Tropical
       "°K"
     end
 
-    def sumary
-      message = format_message
-
-      "#{message.current_temp}#{scale} e #{current_weather} em #{city} em #{message.current_date}. "\
+    def full_sumary
+      "#{sumary_current_day} "\
       "Média para os próximos dias: "\
-      "#{message.first_day_average}#{scale} em #{message.first_day_date}, "\
-      "#{message.second_day_average}#{scale} em #{message.second_day_date}, "\
-      "#{message.third_day_average}#{scale} em #{message.third_day_date}, "\
-      "#{message.fourth_day_average}#{scale} em #{message.fourth_day_date} "\
-      "e #{message.fifth_day_average}#{scale} em #{message.fifth_day_date}."
+      "#{sumary_days_forecast}"
+    end
+
+    def sumary_current_day
+      "#{current_temp.round}#{scale} e #{current_weather} em "\
+      "#{city_name} em #{current_date.strftime("%d/%m")}."
+    end
+
+    def sumary_days_forecast
+      list = average_temp_by_days.map do |x|
+        "#{x[:average]}#{scale} em #{x[:day].strftime("%d/%m")}"
+      end
+
+      "#{list.to_sentence(words_connector: ", ", last_word_connector: " e ")}."
     end
 
     private
@@ -82,29 +84,15 @@ module Tropical
       link = ""
 
       params.each do |k, v|
-        link += "&#{k}=#{v}" if v.is_a?(String) && !v.empty?
+        next if k == :mode
+        next unless v.is_a?(String) && v.present?
+
+        link += "&#{k}=#{I18n.transliterate(v)}"
       end
 
       BASE_URL + link
     end
 
-    def format_message
-      OpenStruct.new(
-        current_temp: current_temp.round,
-        current_date: current_date.strftime("%d/%m"),
-        first_day_average: average_temp_by_days[0][:average],
-        first_day_date: average_temp_by_days[0][:day].strftime("%d/%m"),
-        second_day_average: average_temp_by_days[1][:average],
-        second_day_date: average_temp_by_days[1][:day].strftime("%d/%m"),
-        third_day_average: average_temp_by_days[2][:average],
-        third_day_date: average_temp_by_days[2][:day].strftime("%d/%m"),
-        fourth_day_average: average_temp_by_days[3][:average],
-        fourth_day_date: average_temp_by_days[3][:day].strftime("%d/%m"),
-        fifth_day_average: average_temp_by_days[4][:average],
-        fifth_day_date: average_temp_by_days[4][:day].strftime("%d/%m")
-      )
-    end
-
     def load_data(response)
       @status = response.code
       @data = case response
@@ -117,6 +105,29 @@ module Tropical
               end
     end
 
+    def average_temp_by_days
+      group_by_days = list.group_by { |item| item[:dt].to_date }
+      days = []
+
+      group_by_days.each do |day, temps|
+        average = temps.sum { |time| time[:temp] } / temps.length
+
+        days << { day: day, average: average.round }
+      end
+
+      days
+    end
+
+    def list
+      data["list"].map do |list_item|
+        {
+          dt: Time.at(list_item["dt"]),
+          temp: list_item["main"]["temp"],
+          description: list_item["weather"].first["description"]
+        }
+      end
+    end
+
     def post(request_params)
       url          = URI(request_params)
       http         = Net::HTTP.new(url.host, url.port)

data/lib/tropical/version.rb

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

data/tropical.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.homepage    = "https://github.com/ValterAndrei/tropical"
   spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
-  spec.metadata["allowed_push_host"] = "https://rubygems.org"
+  # spec.metadata["allowed_push_host"] = "https://rubygems.org"
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/ValterAndrei/tropical"
   spec.metadata["changelog_uri"] = "https://github.com/ValterAndrei/tropical"
@@ -27,8 +27,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  # Uncomment to register a new dependency of your gem
-  # spec.add_dependency "example-gem", "~> 1.0"
+  spec.add_dependency "activesupport", "~> 6.1.2.1"
 
   # For more information and examples about making a new gem, checkout our
   # guide at: https://bundler.io/guides/creating_gem.html

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: tropical
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.9
 platform: ruby
 authors:
 - Valter
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-13 00:00:00.000000000 Z
-dependencies: []
+date: 2021-02-16 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 6.1.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 6.1.2.1
 description: Consultation weather forecast up to 5 days.
 email:
 - valterandrey@gmail.com
@@ -17,6 +31,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -34,7 +49,6 @@ files:
 homepage: https://github.com/ValterAndrei/tropical
 licenses: []
 metadata:
-  allowed_push_host: https://rubygems.org
   homepage_uri: https://github.com/ValterAndrei/tropical
   source_code_uri: https://github.com/ValterAndrei/tropical
   changelog_uri: https://github.com/ValterAndrei/tropical
@@ -53,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.9
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Weather forecast query