wwo 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a076a4d5c336c3d2e63e0ab8e7400dd089264d1
-  data.tar.gz: ea747d1cfaf4f52eda78ed741b0aff8905e54457
+  metadata.gz: 235b3b66844641b8c428a44a2ac5bc95c81406d8
+  data.tar.gz: 033258d57a8fead1f35c700d6d4a0d4d357210e8
 SHA512:
-  metadata.gz: 228ff65f744f58bb7820bca7779aca3ebc261ef6313b9fa2c28e1ea00c8c657579848a909a4c4c08bf69d2dbd387264734289156070a10910d260a428c0dc357
-  data.tar.gz: 6ae0e0b0a6ae53794acf559e459c0536c4e7d7b4389a160b8d7491eddb4580667e8d0c1d39bfe0614ab582eba40063457677a58df51933e0ad7e56b7aec368cd
+  metadata.gz: 6ff0aeb574c2dd5bc3d966f58af24f2563ba61adc8c4cadf8febccadae39b18474a0f91d9b624abbe51b78681d36df3453ea1dd60508b7a3dae9efbcc7e3087c
+  data.tar.gz: 3eb440c6340ca943b6d9c08ebf4e4e23bf3f94fec39fb413887b53f1571f7010f60a8378830683ef3eec93db28cd657505e34c66eaa073ff11cb571e4c3a8297

data/lib/wwo.rb

@@ -14,6 +14,9 @@ module Wwo
 
   class << self
 
+    # Returns a daily breakdown for weather for the provided start and end data at the
+    # specified location.
+    #
     def date_range(start_date, end_date, latitude, longitude, forecast_compat = false)
       start_date_string = start_date.strftime('%F')
       end_date_string   = end_date.strftime('%F')
@@ -65,41 +68,6 @@ module Wwo
       end_date.to_i >= Time.now.to_i && start_date.to_i >= Time.now.to_i
     end
 
-    # Returns a daily breakdown for weather for the provided start and end data at the
-    # specified location.
-    #
-    def old_date_range(start_date, end_date, latitude, longitude, forecast_compat = false)
-      starting  = start_date.strftime('%F')
-      ending    = end_date.strftime('%F')
-
-      if starting == Time.now.strftime('%F') || start_date.to_i > Time.now.utc.to_i ||  end_date.to_i > Time.now.utc.to_i
-        forecast_uri = "#{Wwo.api_endpoint}/weather.ashx?q=#{latitude},#{longitude}&format=json&num_of_days=7&date=today&cc=no&mca=no&tp=24&key=#{Wwo.api_key}"
-        forecast_response = api_call(forecast_uri)
-      else
-        forecast_response = {}
-      end
-
-      if starting == Time.now.strftime('%F') || start_date.to_i > Time.now.utc.to_i
-        uri = "#{Wwo.api_endpoint}/past-weather.ashx?q=#{latitude},#{longitude}&format=json&extra=utcDateTime&date=#{starting}&enddate=#{ending}&show_comments=no&tp=24&key=#{Wwo.api_key}&mca=false&show_comments=false"
-        api_response = api_call(uri)
-      else
-        api_response = {}
-      end
-
-      if forecast_compat
-        past    = make_into_forecast_response(api_response)
-        future  = forecast_response.empty? ? {} : make_into_forecast_response(forecast_response)
-
-        unless future.empty?
-          past[:daily][:data] = (past[:daily][:data] + future[:daily][:data]).flatten.uniq
-        end
-
-        return Hashie::Mash.new(past)
-      else
-        return api_response
-      end
-    end
-
     # Returns an hourly breakdown for the weather "today" at the given location. We get
     # the current time and then turn it into UTC. Returns a Hashie Mash with every hour of
     # weather broken down.
@@ -195,9 +163,10 @@ module Wwo
           icon = weather.hourly.first.weatherIconUrl.first.value
           maxTemp = weather.maxtempC
           minTemp = weather.mintempC
+          condition = weather.weatherCode
           date = Time.parse("#{weather.date} 12:00:00")
 
-          data[:daily][:data] << { icon: icon, "temperatureMax" => maxTemp, "temperatureMin" => minTemp, date: date }
+          data[:daily][:data] << { icon: icon, "temperatureMax" => maxTemp, "temperatureMin" => minTemp, date: date, conditionCode: condition }
         end
         return data
       else
@@ -205,6 +174,8 @@ module Wwo
         data[:daily][:data][0][:icon] = response.data.weather.first.hourly.first.weatherIconUrl.first.value
         data[:daily][:data][0]['temperatureMax'] = response.data.weather.first.maxtempC
         data[:daily][:data][0]['temperatureMin'] = response.data.weather.first.mintempC
+        data[:daily][:data][0]["conditionCode"] = response.data.weather.first.weatherCode
+
         return data
       end
     end

data/lib/wwo/version.rb

@@ -1,3 +1,3 @@
 module Wwo
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wwo
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - 株式会社アルム　Allm Inc
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-01 00:00:00.000000000 Z
+date: 2016-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday