hg-weather 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90cd9bd02cbd13eed635c443f44bb5e8fcdfb81a
-  data.tar.gz: f517d2c150624a901a2c915401be1bf8567c3abf
+  metadata.gz: f4fdfeecb4484bfd67647bcce854bd82892dc38f
+  data.tar.gz: 4b36946f59a97023f69607712cc2d0ea0877b2c8
 SHA512:
-  metadata.gz: 574a8ea89dc7f2426eb28034b42b2a73a0ffbea635fd18b60bbc978e04224dfb75814527c454f7a2b5f9cbad94fb8122b7695c63c89770acdf6f539a0c832f01
-  data.tar.gz: f583a3ee34023c08c0682bc42e7a1fbd3337c2916a0b19f5e7a98ddad769d7ec2d8eb02e2dab608f96e1a4c15f266ad395f19876b3ad9125e9b493c9f5a9c812
+  metadata.gz: 09aa3c8dffd9c81225f6ed0c853dcde9df95a5499db008d6b9603f0feb9249d3efac0d251f06a2777e6b8921b0f94c4f1cc3afb29ca6ddab4f475b83eb499e6b
+  data.tar.gz: 7adc4d68ba440bf90ee797e114d398a6dca054c0c592deb52cb6c1bf0a69ff1d09804aebba77645e52ce56031cb1cc82513bfd92e42ec716214b7a14d7411a45

data/lib/hg/weather.rb

@@ -11,24 +11,45 @@ module HG
     class << self
       # API Key
       attr_accessor :api_key
-      @@api_key = nil
+
+      # Locale
+      attr_accessor :locale
+
+      # Default temperature format
+      attr_accessor :temperature
+
+      # Default speed format
+      attr_accessor :speed
 
       # API Key status
       attr_reader :api_key_status
-      @@api_key_status = :unknown
 
       # Use SSL to access the API
       attr_accessor :use_ssl
-      @@use_ssl = true
 
       # Use Rails cache for recieved data (realy recommended)
       attr_accessor :use_rails_cache
-      @@use_rails_cache = true
 
-      attr_accessor :cid, :city_name, :latitude, :longitude, :client_ip
+      attr_accessor :cid, :woeid, :city_name, :latitude, :longitude, :client_ip
       @@client_ip = :remote
     end
 
+    def self.locale
+      @locale || :en
+    end
+
+    def self.temperature
+      @temperature || Locale.get_format(:temperature)
+    end
+
+    def self.speed
+      @speed || Locale.get_format(:speed)
+    end
+
+    def self.use_ssl
+      @use_ssl || true
+    end
+
     def self.setup(&block)
       yield self
     end
@@ -37,7 +58,7 @@ module HG
       to_request = {
         lat: options[:latitude], lon: options[:longitude],
         cid: options[:cid], city_name: options[:city_name],
-        user_ip: options[:client_ip]
+        user_ip: options[:client_ip], woeid: options[:woeid]
       }.delete_if{|k,v| v.nil?}
 
       process(to_request)
@@ -55,8 +76,10 @@ module HG
         lon: self.longitude,
         user_ip: self.client_ip,
         cid: self.cid,
+        woeid: self.woeid,
         city_name: self.city_name,
         key: self.api_key,
+        locale: self.locale,
         format: :json,
         sdk_version: "ruby_#{HG::Weather::VERSION}"
       }

data/lib/hg/weather/condition.rb

@@ -1,5 +1,6 @@
 require 'hg/weather/temperature'
 require 'hg/weather/speed'
+require 'hg/weather/locale'
 
 module HG
   module Weather
@@ -56,7 +57,7 @@ module HG
           @description      = options[:description] if options[:description]
           @slug             = options[:slug].to_sym if options[:slug]
           @wind_speed       = Speed.new(options[:wind_speed]) if options[:wind_speed]
-          @currently        = (options[:currently] == 'dia' ? :day : :night) if options[:currently]
+          @currently        = (options[:currently] == Locale.get_format(:day).to_s ? :day : :night) if options[:currently]
           @datetime         = process_datetime(options[:date], options[:time]) if options[:date]
           @sunrise          = process_sunrise(options[:sunrise]) if options[:sunrise]
           @sunset           = process_sunset(options[:sunset]) if options[:sunset]
@@ -77,7 +78,7 @@ module HG
       def to_s separator = ' - '
         to_return = []
 
-        to_return << self.datetime.strftime('%d/%m') if self.datetime && self.datetime.kind_of?(Time) && self.is_forecast
+        to_return << self.datetime.strftime(Locale.get_format(:short_date)) if self.datetime && self.datetime.kind_of?(Time) && self.is_forecast
 
         to_return << self.temperature.to_s if self.temperature
         to_return << 'Max: ' + self.max_temperature.to_s if self.max_temperature
@@ -86,19 +87,23 @@ module HG
         to_return << self.humidity.to_s + ' %' if self.humidity
         to_return << self.wind_speed.to_s if self.wind_speed
 
-        to_return << 'Sunrise: ' + self.sunrise.strftime('%H:%M') if self.sunrise && self.sunrise.kind_of?(Time)
-        to_return << 'Sunset: ' + self.sunset.strftime('%H:%M') if self.sunset && self.sunset.kind_of?(Time)
+        to_return << "#{Locale.get_format(:sunrise).to_s.capitalize}: " + self.sunrise.strftime('%H:%M') if self.sunrise && self.sunrise.kind_of?(Time)
+        to_return << "#{Locale.get_format(:sunset).to_s.capitalize}: " + self.sunset.strftime('%H:%M') if self.sunset && self.sunset.kind_of?(Time)
 
         to_return << self.description.to_s if self.description
 
         return to_return.join(separator)
       end
 
+      def inspect
+        self.to_s
+      end
+
       protected
       def process_datetime date, time = nil
         return Time.now if date.nil?
 
-        return Time.strptime((date + ' ' + (time ? time : '00:00')), '%d/%m/%Y %H:%M')
+        return Time.strptime((date + ' ' + (time ? time : '00:00')), Locale.get_format(:datetime))
       end
 
       def process_sunset sunset

data/lib/hg/weather/data.rb

@@ -6,7 +6,7 @@ module HG
     class Data
 
       attr_accessor :request, :requested_at, :key_status
-      attr_accessor :condition, :forecast
+      attr_accessor :condition, :forecast, :woeid
       attr_accessor :cid, :city_name, :search_method
 
       def initialize params, host_name, use_ssl = true
@@ -19,11 +19,12 @@ module HG
         if request_data['results']
           results = request_data['results']
 
-          @key_status = (params[:key] ? (request_data['key_status'] == 'valida' ? :valid : :invalid) : :empty)
+          @key_status = (params[:key] ? (request_data['key_status'] ? :valid : :invalid) : :empty)
 
           @city_name = results['city_name']
           @search_method = request_data['by']
           @cid = results['cid']
+          @woeid = params[:woeid] if request_data['by'] == 'woeid'
 
           @condition = Condition.new(to_current(results))
 
@@ -57,7 +58,7 @@ module HG
       # TODO: Improve to get year of date
       def to_forecast r
         {
-          date: r['date'] + '/' + Time.now.year.to_s,
+          date: (Weather.locale == :en ? Time.now.year.to_s + '-' + r['date'] : r['date'] + '/' + Time.now.year.to_s),
           max_temperature: r['max'],
           min_temperature: r['min'],
           description: r['description'],

data/lib/hg/weather/locale.rb

@@ -0,0 +1,38 @@
+module HG
+  module Weather
+
+    class Locale
+
+      @formats = {
+        en: {
+          date: '%Y-%m-%d',
+          short_date: '%m-%d',
+          datetime: '%Y-%m-%d %H:%M',
+          temperature: :fahrenheit,
+          speed: :miles,
+          day: :day,
+          sunrise: 'sunrise',
+          sunset: 'sunset'
+        },
+        :'pt-br' => {
+          date: '%d/%m/%Y',
+          short_date: '%d/%m',
+          datetime: '%d/%m/%Y %H:%M',
+          temperature: :celsius,
+          speed: :km,
+          day: :dia,
+          sunrise: 'nascer do sol',
+          sunset: 'por do sol'
+        }
+      }
+
+      def self.get_format item
+        Weather.locale = :en unless @formats.has_key?(Weather.locale.to_sym)
+
+        return @formats[Weather.locale.to_sym][item]
+      end
+
+    end
+
+  end
+end

data/lib/hg/weather/speed.rb

@@ -13,10 +13,19 @@ module HG
 
         if format == :km
           @km_h = speed
-          @miles_h = speed * 0.621371
+          @miles_h = (speed * 0.621371).round(2)
         else
           @miles_h = speed
-          @km_h = speed * 1.60934
+          @km_h = (speed * 1.60934).round(2)
+        end
+      end
+
+      def get_with_format
+        case Weather.speed
+        when :km
+          @km_h
+        when :miles
+          @miles_h
         end
       end
 
@@ -25,7 +34,15 @@ module HG
       end
 
       def to_s
-        "#{@km_h} km/h"
+        "#{self.get_with_format} #{Weather.speed.to_s.downcase}/h"
+      end
+
+      def to_f
+        self.get_with_format
+      end
+
+      def to_i
+        self.get_with_format.to_i
       end
     end
 

data/lib/hg/weather/temperature.rb

@@ -11,10 +11,19 @@ module HG
 
         if format == :c
           @celsius = temperature
-          @fahrenheit = (temperature * 1.8) + 32
+          @fahrenheit = ((temperature * 1.8) + 32).round(2)
         else
           @fahrenheit = temperature
-          @celsius = (temperature - 32) / 1.8
+          @celsius = ((temperature - 32) / 1.8).round(2)
+        end
+      end
+
+      def get_with_format
+        case Weather.temperature
+        when :celsius
+          @celsius
+        when :fahrenheit
+          @fahrenheit
         end
       end
 
@@ -23,7 +32,15 @@ module HG
       end
 
       def to_s
-        "#{@celsius}º C"
+        "#{self.get_with_format}º #{Weather.temperature.to_s[0].upcase}"
+      end
+
+      def to_f
+        self.get_with_format
+      end
+
+      def to_i
+        self.get_with_format.to_i
       end
     end
 

data/lib/hg/weather/version.rb

@@ -1,5 +1,5 @@
 module HG
   module Weather
-    VERSION = "1.0.0"
+    VERSION = "1.1.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hg-weather
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Hugo Demiglio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-06 00:00:00.000000000 Z
+date: 2016-07-17 00:00:00.000000000 Z
 dependencies: []
 description: Get current and forecast weather using HG Weather API.
 email:
@@ -20,6 +20,7 @@ files:
 - lib/hg/weather.rb
 - lib/hg/weather/condition.rb
 - lib/hg/weather/data.rb
+- lib/hg/weather/locale.rb
 - lib/hg/weather/speed.rb
 - lib/hg/weather/temperature.rb
 - lib/hg/weather/version.rb