tropical 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 773b86e10df59f914fc84c955a6c9098f51cce682b027eb8b3052e4f7f622d2e
-  data.tar.gz: 7dd04dfbcaa8bf919f40edb1f4a8be500d4c18b40a4c293dd6cc87675677c118
+  metadata.gz: 951846b67756ef790d084887e5656c8073d78ca755a8503807ad99a283afdb5d
+  data.tar.gz: a56eeb6e6d44724aacfc237fbd3a1d0d82a9d688c429ba6c971794a5bcf445c0
 SHA512:
-  metadata.gz: 99efe601b047c5bc204d9a70c403e23a559f1a321e3f55531d32c82daefa1981e498a54625056cdc0be93729708e47805e2e4672913e54df4affa0abb54372d5
-  data.tar.gz: bff9a8af48ec17d96be5f7b6b3749de6681acc227a1ac058bcb2f4221e2b3205bb2009499d0c7e904a4e520c1ad2feedc182985233aed38c22241cade4f8fea5
+  metadata.gz: a9b99a891cc45d53c9dce81d02ef5356ee972bbfca519240d4ef7234bdd5fe6b84810240b37a352ad56bb105482cbdf88aa72f6051b4bb0e3eaeb56e8a996405
+  data.tar.gz: ba09b867c7ea1dc302d2573cf0190205611667a7a83069107a648a49040d99c37a24ffed0ffc51bab23081397b8cee45631b68de6ea8c30f8b63f7694697cae1

data/CODE_OF_CONDUCT.md

@@ -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,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tropical (0.1.5)
+    tropical (0.1.6)
       activesupport (~> 6.1.2.1)
 
 GEM

data/lib/tropical.rb

@@ -17,25 +17,12 @@ module Tropical
       load_data(response)
     end
 
-    def average_temp_by_days
-      group_by_days = list.group_by { |item| item[:datetime].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 city
       data["city"]["name"]
     end
 
     def current_date
-      list.first[:datetime]
+      list.first[:dt]
     end
 
     def current_temp
@@ -46,35 +33,55 @@ module Tropical
       list.first[:description]
     end
 
+    def scale
+      units = params[:units]
+
+      return "°C" if units == "metric"
+      return "°F" if units == "imperial"
+
+      "°K"
+    end
+
+    def full_sumary
+      "#{sumary_current_day} "\
+      "Média para os próximos dias: "\
+      "#{sumary_days_forecast}"
+    end
+
+    def sumary_current_day
+      "#{current_temp.round}#{scale} e #{current_weather} em "\
+      "#{city} 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
+
     def list
       data["list"].map do |list_item|
         {
-          datetime: Time.at(list_item["dt"]),
+          dt: Time.zone.at(list_item["dt"]),
           temp: list_item["main"]["temp"],
           description: list_item["weather"].first["description"]
         }
       end
     end
 
-    def scale
-      units = params[:units]
-
-      return "°C" if units == "metric"
-      return "°F" if units == "imperial"
+    def average_temp_by_days
+      group_by_days = list.group_by { |item| item[:dt].to_date }
+      days = []
 
-      "°K"
-    end
+      group_by_days.each do |day, temps|
+        average = temps.sum { |time| time[:temp] } / temps.length
 
-    def sumary
-      message = format_message
+        days << { day: day, average: average.round }
+      end
 
-      "#{message.current_temp}#{scale} e #{current_weather} em #{city} em #{message.current_date}. "\
-      "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}."
+      days
     end
 
     private
@@ -89,23 +96,6 @@ module Tropical
       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

data/lib/tropical/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tropical
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Valter
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-13 00:00:00.000000000 Z
+date: 2021-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport