wwo 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ae33e5981b99fefd36ecdb1fbe07b00af621a18
-  data.tar.gz: ac031c224fbecacae3ac6c6f834abfac4be2ef45
+  metadata.gz: 296c54f744c87df1e4571d657c7156600b2499ec
+  data.tar.gz: f45d238b498ded94ab2cbc9c25f9881a6be56122
 SHA512:
-  metadata.gz: b7b59c7c8fb1df6f0055e3d27b99a9be3b4c2dc0aaf73f646eeeb7f5485b641dcde92e006daa98a967f921167ccc124ac4c706c22e234127615e08731f25ab3b
-  data.tar.gz: a2e756f02fa2ae3761c256108ae97a75a71342f3b332ea6fd032d85f73ffd35d13ce25eafd284e9b0485f36a24d2d50e9e02feaf2bd1666d37d3ebf0e6365336
+  metadata.gz: 9ee2da28813a3b592b8eaeccf9973443227a8955d0cfad600e8cf77cdfd137c9c9a791d651a4a816068f1c8443de37172b2b81467adc729ba9fb6dc34343ba05
+  data.tar.gz: 1bdba18dbd7263014f1cac2b9d92ab06f634499450f56b1e9fd373f50239fd9b175119e44e723eca1948857c42d1df8438462d756e4c320372da674bcede91e9

data/lib/wwo.rb

@@ -23,10 +23,26 @@ module Wwo
 
       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)
+
+      if 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 forecast_compat
-        make_into_forecast_response(api_call(uri))
+        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
-        api_call(uri)
+        return api_response
       end
     end
 
@@ -127,13 +143,14 @@ module Wwo
 
           data[:daily][:data] << { icon: icon, "temperatureMax" => maxTemp, "temperatureMin" => minTemp, date: date }
         end
+        return data
       else
         data = { daily: { data: [ { icon: '', 'temperatureMax' => 0, 'temperatureMin' => 0  } ] }, alerts: nil }
         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
+        return data
       end
-      Hashie::Mash.new(data)
     end
   end
 end

data/lib/wwo/version.rb

@@ -1,3 +1,3 @@
 module Wwo
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wwo
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - "株式会社アルム　Allm Inc"
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-22 00:00:00.000000000 Z
+date: 2016-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday