wwo 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7cec9c308673d100b324ac161fd5417c94917dc5
-  data.tar.gz: 15e89edc4574ea9ecb1358454671642280116973
+  metadata.gz: 3a076a4d5c336c3d2e63e0ab8e7400dd089264d1
+  data.tar.gz: ea747d1cfaf4f52eda78ed741b0aff8905e54457
 SHA512:
-  metadata.gz: cd0b1dfd6df7c88c429cb643add5b39f17bc6ec2d2e051b85beaed3cae7d54e9e08225dae5e0ec44bb4ae7888e0bf6552d69effcd1fd056091d612ee0fb720de
-  data.tar.gz: 0e59dfcd54c73f5baf6f428f26919fd245c5c1aaef95c5a01725eb1430d8c637ec7b8be16d3e4dbbcd4877878c4e2cc9134299ffcbe967e3d70b4b83a4e3560a
+  metadata.gz: 228ff65f744f58bb7820bca7779aca3ebc261ef6313b9fa2c28e1ea00c8c657579848a909a4c4c08bf69d2dbd387264734289156070a10910d260a428c0dc357
+  data.tar.gz: 6ae0e0b0a6ae53794acf559e459c0536c4e7d7b4389a160b8d7491eddb4580667e8d0c1d39bfe0614ab582eba40063457677a58df51933e0ad7e56b7aec368cd

data/lib/wwo.rb

@@ -14,10 +14,61 @@ module Wwo
 
   class << self
 
+    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')
+      today_date_string = Time.now.strftime('%F')
+
+      if start_date_string == today_date_string || range_in_future?(start_date, end_date)
+        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}"
+        response = Hashie::Mash.new(api_call(uri))
+        if forecast_compat
+          return make_into_forecast_response(response)
+        else
+          return response
+        end
+
+      elsif starts_in_past_but_ends_in_future?(start_date, end_date)
+        yesterday_date_string = (Time.now - (24 *(60 * 60))).strftime('%F')
+
+        uri = "#{Wwo.api_endpoint}/past-weather.ashx?q=#{latitude},#{longitude}&format=json&extra=utcDateTime&date=#{start_date_string}&enddate=#{yesterday_date_string}&show_comments=no&tp=24&key=#{Wwo.api_key}&mca=false&show_comments=false"
+        past_response = Hashie::Mash.new(api_call(uri))
+        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}"
+        future_response = Hashie::Mash.new(api_call(uri))
+
+        if forecast_compat
+          past    = make_into_forecast_response(past_response)
+          future  = make_into_forecast_response(future_response)
+          past[:daily][:data] = (past[:daily][:data] + future[:daily][:data]).flatten.uniq
+
+          return past
+        else
+          return past_response.deep_merge(future_response)
+        end
+
+      else
+        uri = "#{Wwo.api_endpoint}/past-weather.ashx?q=#{latitude},#{longitude}&format=json&extra=utcDateTime&date=#{start_date_string}&enddate=#{end_date_string}&show_comments=no&tp=24&key=#{Wwo.api_key}&mca=false&show_comments=false"
+        response = Hashie::Mash.new(api_call(uri))
+        if forecast_compat
+          return make_into_forecast_response(response)
+        else
+          return response
+        end
+      end
+    end
+
+    def starts_in_past_but_ends_in_future?(start_date, end_date)
+      start_date.to_i < Time.now.to_i && end_date.to_i >= Time.now.to_i
+    end
+
+    def range_in_future?(start_date, end_date)
+      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 date_range(start_date, end_date, latitude, longitude, forecast_compat = false)
+    def old_date_range(start_date, end_date, latitude, longitude, forecast_compat = false)
       starting  = start_date.strftime('%F')
       ending    = end_date.strftime('%F')
 

data/lib/wwo/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wwo
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - 株式会社アルム　Allm Inc