wwo 0.2.0 → 0.3.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/wwo.rb +20 -3
- data/lib/wwo/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 296c54f744c87df1e4571d657c7156600b2499ec
|
4
|
+
data.tar.gz: f45d238b498ded94ab2cbc9c25f9881a6be56122
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 9ee2da28813a3b592b8eaeccf9973443227a8955d0cfad600e8cf77cdfd137c9c9a791d651a4a816068f1c8443de37172b2b81467adc729ba9fb6dc34343ba05
|
7
|
+
data.tar.gz: 1bdba18dbd7263014f1cac2b9d92ab06f634499450f56b1e9fd373f50239fd9b175119e44e723eca1948857c42d1df8438462d756e4c320372da674bcede91e9
|
data/lib/wwo.rb
CHANGED
@@ -23,10 +23,26 @@ module Wwo
|
|
23
23
|
|
24
24
|
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"
|
25
25
|
|
26
|
+
api_response = api_call(uri)
|
27
|
+
|
28
|
+
if end_date.to_i > Time.now.utc.to_i
|
29
|
+
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}"
|
30
|
+
forecast_response = api_call(forecast_uri)
|
31
|
+
else
|
32
|
+
forecast_response = {}
|
33
|
+
end
|
34
|
+
|
26
35
|
if forecast_compat
|
27
|
-
make_into_forecast_response(
|
36
|
+
past = make_into_forecast_response(api_response)
|
37
|
+
future = forecast_response.empty? ? {} : make_into_forecast_response(forecast_response)
|
38
|
+
|
39
|
+
unless future.empty?
|
40
|
+
past[:daily][:data] = (past[:daily][:data] + future[:daily][:data]).flatten.uniq
|
41
|
+
end
|
42
|
+
|
43
|
+
return Hashie::Mash.new(past)
|
28
44
|
else
|
29
|
-
|
45
|
+
return api_response
|
30
46
|
end
|
31
47
|
end
|
32
48
|
|
@@ -127,13 +143,14 @@ module Wwo
|
|
127
143
|
|
128
144
|
data[:daily][:data] << { icon: icon, "temperatureMax" => maxTemp, "temperatureMin" => minTemp, date: date }
|
129
145
|
end
|
146
|
+
return data
|
130
147
|
else
|
131
148
|
data = { daily: { data: [ { icon: '', 'temperatureMax' => 0, 'temperatureMin' => 0 } ] }, alerts: nil }
|
132
149
|
data[:daily][:data][0][:icon] = response.data.weather.first.hourly.first.weatherIconUrl.first.value
|
133
150
|
data[:daily][:data][0]['temperatureMax'] = response.data.weather.first.maxtempC
|
134
151
|
data[:daily][:data][0]['temperatureMin'] = response.data.weather.first.mintempC
|
152
|
+
return data
|
135
153
|
end
|
136
|
-
Hashie::Mash.new(data)
|
137
154
|
end
|
138
155
|
end
|
139
156
|
end
|
data/lib/wwo/version.rb
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: wwo
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.3.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- "株式会社アルム Allm Inc"
|
@@ -10,7 +10,7 @@ authors:
|
|
10
10
|
autorequire:
|
11
11
|
bindir: exe
|
12
12
|
cert_chain: []
|
13
|
-
date: 2016-02-
|
13
|
+
date: 2016-02-26 00:00:00.000000000 Z
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|
16
16
|
name: faraday
|