weatai 0.1.2 → 0.1.3

data/config/credentials.yml.example

@@ -1,3 +1,6 @@
 ---
-:dataid: ''
+:dataid1: ''
+:dataid2: ''
 :key: ''
+:format: ''
+:token: ''

data/lib/weatai/cwb.rb

@@ -4,14 +4,13 @@ module CWB
   class Weather
     attr_reader :dataid
 
-    def initialize(data:)
-      @dataid = data['dataid']
+    def initialize(dataid:)
+      @dataid = dataid
     end
 
-    def instant_weather
-      return @instant_weather if @instant_weather
-      raw_info = CWB::CWBApi.raw_info(@dataid)
-      all_location = {}
+    def self.instant_weather
+      raw_info = CWB::CWBApi.raw_info1(@dataid)
+      all_location1 = {}
       raw_info['cwbopendata']['location'].each do |item|
         location = {}
         place = item['locationName']
@@ -20,15 +19,9 @@ module CWB
         location['town'] = item['parameter'][2]['parameterValue']
         location['TEMP'] = item['weatherElement'][4]['elementValue']['value']
         location['HUMD'] = item['weatherElement'][5]['elementValue']['value']
-        all_location.store(place, location)
+        all_location1.store(place, location)
       end
-      # File.write('../../spec/fixtures/data.yml', all_location.to_yaml)
-      all_location
-    end
-
-    def self.find(dataid:)
-      raw_data = CWB::CWBApi.raw_info(dataid) 
-      new(data: raw_data)
+      all_location1
     end
 
     def weather_test

data/lib/weatai/cwb_api.rb

@@ -5,7 +5,8 @@ require 'http'
 module CWB
   # Service for all weather API calls
   class CWBApi
-    URL = 'http://opendata.cwb.gov.tw/opendataapi'
+    URL_cwb = 'http://opendata.cwb.gov.tw/opendataapi'
+    URL_psi = 'http://opendata.epa.gov.tw/webapi/api/rest/datastore/355000000I-000001/'
     
     def self.config=(credentials)
       @config ? @config.update(credentials) : @config = credentials
@@ -13,16 +14,36 @@ module CWB
     
     def self.config
       return @config if @config
-      @config = { dataid: ENV['DATA_ID'],
-                  key:    ENV['AUTH_KEY'] }
+      @config = { dataid1: ENV['DATA_ID1'],
+                  dataid2: ENV['DATA_ID2'],
+                  key:    ENV['AUTH_KEY'], 
+                  format: ENV['FORMAT'],
+                  token:  ENV['TOKEN']}
     end
 
-    def self.raw_info(dataid)
+    def self.raw_info1(dataid)
       info_response =
-        HTTP.get(URL,
-                 params: { dataid:           config[:dataid],
+        HTTP.get(URL_cwb,
+                 params: { dataid:           config[:dataid1],
                            authorizationkey: config[:key]})
       Hash.from_xml(info_response)
     end
+
+    def self.raw_info2(dataid)
+      info_response =
+        HTTP.get(URL_cwb,
+                 params: { dataid:           config[:dataid2],
+                           authorizationkey: config[:key]})
+      Hash.from_xml(info_response)
+    end
+
+    def self.raw_info3(dataid)
+      info_response =
+        HTTP.get(URL_psi,
+                 params: { format: config[:format],
+                           token:  config[:token]})
+      Hash.from_xml(info_response)
+    end
+
   end
 end

data/lib/weatai/cwb_psi.rb

@@ -0,0 +1,32 @@
+require_relative 'cwb_api'
+require_relative 'cwb'
+
+module CWB
+  # Class to parse the PSI data
+  class PSI
+    attr_reader :dataid
+
+    def initialize(dataid:)
+      @dataid = dataid
+    end
+
+    def self.instant_psi
+      raw_info = CWB::CWBApi.raw_info3(@dataid)
+      all_location3 = {}
+      raw_info['AQX']['Data'].each do |item|
+        location = {}
+        place = item['County']
+        location['city'] = item['County']
+        location['PSI'] = item['PSI']
+        location['Status'] = item['Status']
+        all_location3.store(place, location)
+      end
+      all_location3
+    end
+
+    def weather_test
+      return 'weather_test_yes'
+    end 
+    
+  end
+end

data/lib/weatai/cwb_rain.rb

@@ -0,0 +1,37 @@
+require_relative 'cwb_api'
+require_relative 'cwb'
+module CWB
+  # Class to parse the rain data
+  class Rain
+    attr_reader :dataid
+
+    def initialize(dataid:)
+      @dataid = dataid
+    end
+
+    def self.instant_rain
+      raw_info = CWB::CWBApi.raw_info2(@dataid)
+      all_location2 = {}
+      keys = CWB::Weather.instant_weather.keys
+      raw_info['cwbopendata']['location'].each do |item|
+        location = {}
+        if(item['locationName'].in?(keys))
+          place = item['locationName']
+          location['time'] = item['time']['obsTime']
+          location['city'] = item['parameter'][0]['parameterValue']
+          location['town'] = item['parameter'][2]['parameterValue']
+          location['MIN_10'] = item['weatherElement'][2]['elementValue']['value']
+          location['MIN_10'] = '0.00' if location['MIN_10'].to_f<0 
+          location['Daily Accumulated Rainfall'] = item['weatherElement'][7]['elementValue']['value']
+          all_location2.store(place, location)
+        end
+      end
+      all_location2
+    end
+
+    def weather_test
+      return 'weather_test_yes'
+    end
+     
+  end
+end

data/lib/weatai/instant.rb

@@ -0,0 +1,50 @@
+require_relative 'cwb_api'
+require_relative 'cwb'
+require_relative 'cwb_rain'
+require_relative 'cwb_psi'
+module CWB
+  # Class to organize all the data we need
+  class INSTANT
+    attr_reader :dataid
+
+    def initialize(dataid:)
+      @dataid = dataid
+    end
+
+    def self.instant
+      station = CWB::Rain.instant_rain.keys
+      all_location1 = CWB::Weather.instant_weather
+      all_location2 = CWB::Rain.instant_rain
+      all_location3 = CWB::PSI.instant_psi
+      all_location4 = {}
+      station.each do |item|
+        location = {}
+        place = item
+        location['time'] = all_location2[item]['time']
+        location['city'] = all_location2[item]['city']
+        location['town'] = all_location2[item]['town']
+        location['TEMP'] = all_location1[item]['TEMP']
+        location['HUMD'] = all_location1[item]['HUMD']
+        location['MIN_10'] = all_location2[item]['MIN_10'] 
+        location['Daily Accumulated Rainfall'] = all_location2[item]['Daily Accumulated Rainfall'] 
+        location['PSI'] = all_location3[location['city']]['PSI'] if location['city'].in?(all_location3.keys.uniq)
+        location['Status'] = all_location3[location['city']]['Status'] if location['city'].in?(all_location3.keys.uniq)
+        all_location4.store(place, location)
+      end
+      all_location4
+    end
+
+    def self.local(position)
+      station = CWB::Rain.instant_rain.keys
+      if (position.in?(station))
+        puts CWB::INSTANT.instant.assoc(position).to_yaml
+      else
+        puts "Please enter a station!"
+      end
+    end
+
+    def weather_test
+      return 'weather_test_yes'
+    end 
+  end
+end

data/lib/weatai/version.rb

@@ -1,3 +1,3 @@
-module CWB
-  VERSION = '0.1.2'
-end
+module CWB
+  VERSION = '0.1.3'
+end

data/spec/fixtures/data.yml

@@ -1,253 +1,253 @@
 ---
 基隆:
-  time: '2016-10-30T21:30:00+08:00'
+  time: '2016-11-04T11:20:00+08:00'
   city: 基隆市
   town: 中山區
-  TEMP: '22.8'
-  HUMD: '0.74'
+  TEMP: '21.9'
+  HUMD: '0.79'
 淡水:
-  time: '2016-10-30T21:30:00+08:00'
+  time: '2016-11-04T11:20:00+08:00'
   city: 新北市
   town: 淡水區
-  TEMP: '22.1'
-  HUMD: '0.72'
+  TEMP: '22.8'
+  HUMD: '0.75'
 板橋:
-  time: '2016-10-30T21:30:00+08:00'
+  time: '2016-11-04T11:20:00+08:00'
   city: 新北市
   town: 板橋區
-  TEMP: '22.7'
-  HUMD: '0.68'
+  TEMP: '21.7'
+  HUMD: '0.77'
 竹子湖:
-  time: '2016-10-30T21:30:00+08:00'
+  time: '2016-11-04T11:20:00+08:00'
   city: 臺北市
   town: 北投區
-  TEMP: '17.2'
-  HUMD: '0.92'
+  TEMP: '17.8'
+  HUMD: '0.90'
 鞍部:
-  time: '2016-10-30T21:30:00+08:00'
+  time: '2016-11-04T11:20:00+08:00'
   city: 臺北市
   town: 北投區
-  TEMP: '15.8'
+  TEMP: '15.7'
   HUMD: '0.99'
 新竹:
-  time: '2016-10-30T21:30:00+08:00'
+  time: '2016-11-04T11:20:00+08:00'
   city: 新竹縣
   town: 竹北市
-  TEMP: '23.0'
-  HUMD: '0.72'
+  TEMP: '25.4'
+  HUMD: '0.70'
 臺中:
-  time: '2016-10-30T21:30:00+08:00'
+  time: '2016-11-04T11:20:00+08:00'
   city: 臺中市
   town: 北區
-  TEMP: '24.3'
-  HUMD: '0.70'
+  TEMP: '27.9'
+  HUMD: '0.56'
 梧棲:
-  time: '2016-10-30T21:30:00+08:00'
+  time: '2016-11-04T11:20:00+08:00'
   city: 臺中市
   town: 梧棲區
-  TEMP: '22.5'
-  HUMD: '0.72'
+  TEMP: '26.4'
+  HUMD: '0.65'
 澎湖:
-  time: '2016-10-30T21:30:00+08:00'
+  time: '2016-11-04T11:20:00+08:00'
   city: 澎湖縣
   town: 馬公市
-  TEMP: '24.6'
-  HUMD: '0.72'
+  TEMP: '25.5'
+  HUMD: '0.73'
 日月潭:
-  time: '2016-10-30T21:30:00+08:00'
+  time: '2016-11-04T11:20:00+08:00'
   city: 南投縣
   town: 魚池鄉
-  TEMP: '20.1'
-  HUMD: '0.90'
+  TEMP: '20.4'
+  HUMD: '0.72'
 阿里山:
-  time: '2016-10-30T21:30:00+08:00'
+  time: '2016-11-04T11:20:00+08:00'
   city: 嘉義縣
   town: 阿里山鄉
-  TEMP: '12.6'
-  HUMD: '0.90'
+  TEMP: '11.5'
+  HUMD: '0.82'
 玉山:
-  time: '2016-10-30T21:30:00+08:00'
+  time: '2016-11-04T11:20:00+08:00'
   city: 南投縣
   town: 信義鄉
-  TEMP: '4.1'
-  HUMD: '0.53'
+  TEMP: '7.8'
+  HUMD: '0.50'
 嘉義:
-  time: '2016-10-30T21:30:00+08:00'
+  time: '2016-11-04T11:20:00+08:00'
   city: 嘉義市
   town: 西區
-  TEMP: '23.3'
-  HUMD: '0.80'
+  TEMP: '28.7'
+  HUMD: '0.57'
 高雄:
-  time: '2016-10-30T21:30:00+08:00'
+  time: '2016-11-04T11:20:00+08:00'
   city: 高雄市
   town: 前鎮區
-  TEMP: '27.6'
-  HUMD: '0.72'
+  TEMP: '28.4'
+  HUMD: '0.65'
 恆春:
-  time: '2016-10-30T21:30:00+08:00'
+  time: '2016-11-04T11:20:00+08:00'
   city: 屏東縣
   town: 恆春鎮
-  TEMP: '26.3'
-  HUMD: '0.70'
+  TEMP: '28.9'
+  HUMD: '0.55'
 宜蘭:
-  time: '2016-10-30T21:30:00+08:00'
+  time: '2016-11-04T11:20:00+08:00'
   city: 宜蘭縣
   town: 宜蘭市
-  TEMP: '20.7'
+  TEMP: '21.0'
   HUMD: '0.91'
 蘇澳:
-  time: '2016-10-30T21:30:00+08:00'
+  time: '2016-11-04T11:20:00+08:00'
   city: 宜蘭縣
   town: 蘇澳鎮
-  TEMP: '20.8'
-  HUMD: '0.92'
+  TEMP: '21.0'
+  HUMD: '0.91'
 花蓮:
-  time: '2016-10-30T21:30:00+08:00'
+  time: '2016-11-04T11:20:00+08:00'
   city: 花蓮縣
   town: 花蓮市
-  TEMP: '24.1'
-  HUMD: '0.71'
+  TEMP: '26.4'
+  HUMD: '0.68'
 成功:
-  time: '2016-10-30T21:30:00+08:00'
+  time: '2016-11-04T11:20:00+08:00'
   city: 臺東縣
   town: 成功鎮
-  TEMP: '24.0'
-  HUMD: '0.75'
+  TEMP: '26.2'
+  HUMD: '0.69'
 臺東:
-  time: '2016-10-30T21:30:00+08:00'
+  time: '2016-11-04T11:20:00+08:00'
   city: 臺東縣
   town: 臺東市
-  TEMP: '23.7'
-  HUMD: '0.77'
+  TEMP: '28.3'
+  HUMD: '0.62'
 大武:
-  time: '2016-10-30T21:30:00+08:00'
+  time: '2016-11-04T11:20:00+08:00'
   city: 臺東縣
   town: 大武鄉
-  TEMP: '25.5'
-  HUMD: '0.66'
+  TEMP: '28.1'
+  HUMD: '0.61'
 蘭嶼:
-  time: '2016-10-30T21:30:00+08:00'
+  time: '2016-11-04T11:20:00+08:00'
   city: 臺東縣
   town: 蘭嶼鄉
-  TEMP: '23.4'
-  HUMD: '0.79'
+  TEMP: '24.9'
+  HUMD: '0.77'
 彭佳嶼:
-  time: '2016-10-30T21:30:00+08:00'
+  time: '2016-11-04T11:20:00+08:00'
   city: 基隆市
   town: 中正區
-  TEMP: '21.8'
-  HUMD: '0.73'
+  TEMP: '22.2'
+  HUMD: '0.71'
 東吉島:
-  time: '2016-10-30T21:30:00+08:00'
+  time: '2016-11-04T11:20:00+08:00'
   city: 澎湖縣
   town: 望安鄉
-  TEMP: '25.0'
+  TEMP: '26.3'
   HUMD: '0.75'
 永康:
-  time: '2016-10-30T21:30:00+08:00'
+  time: '2016-11-04T11:20:00+08:00'
   city: 臺南市
   town: 永康區
-  TEMP: '25.1'
-  HUMD: '0.73'
+  TEMP: '28.4'
+  HUMD: '0.60'
 金門(合):
-  time: '2016-10-30T21:30:00+08:00'
+  time: '2016-11-04T11:20:00+08:00'
   city: 金門縣
   town: 金湖鎮
-  TEMP: '22.0'
-  HUMD: '0.67'
+  TEMP: '24.5'
+  HUMD: '0.53'
 拉拉山:
-  time: '2016-10-30T21:30:00+08:00'
+  time: '2016-11-04T11:20:00+08:00'
   city: 桃園市
   town: 復興區
-  TEMP: '15.1'
-  HUMD: '0.87'
+  TEMP: '17.7'
+  HUMD: '0.74'
 武陵:
-  time: '2016-10-30T21:30:00+08:00'
+  time: '2016-11-04T11:20:00+08:00'
   city: 臺中市
   town: 和平區
-  TEMP: '12.3'
-  HUMD: '0.95'
+  TEMP: '20.4'
+  HUMD: '0.44'
 太魯閣:
-  time: '2016-10-30T21:30:00+08:00'
+  time: '2016-11-04T11:20:00+08:00'
   city: 花蓮縣
   town: 秀林鄉
-  TEMP: '22.5'
-  HUMD: '0.89'
+  TEMP: '27.2'
+  HUMD: '0.69'
 新店:
-  time: '2016-10-30T21:30:00+08:00'
+  time: '2016-11-04T11:20:00+08:00'
   city: 新北市
   town: 新店區
-  TEMP: "-998.0"
-  HUMD: "-998.00"
+  TEMP: '20.8'
+  HUMD: '0.88'
 臺北:
-  time: '2016-10-30T21:30:00+08:00'
+  time: '2016-11-04T11:20:00+08:00'
   city: 臺北市
   town: 中正區
-  TEMP: '22.4'
-  HUMD: '0.75'
+  TEMP: '21.3'
+  HUMD: '0.83'
 彰師大:
-  time: '2016-10-30T21:30:00+08:00'
+  time: '2016-11-04T11:20:00+08:00'
   city: 彰化縣
   town: 彰化市
-  TEMP: '23.0'
-  HUMD: '0.67'
+  TEMP: '27.9'
+  HUMD: '0.49'
 臺南:
-  time: '2016-10-30T21:30:00+08:00'
+  time: '2016-11-04T11:20:00+08:00'
   city: 臺南市
   town: 中區
-  TEMP: '26.0'
-  HUMD: '0.69'
+  TEMP: '28.2'
+  HUMD: '0.57'
 合歡山莊:
-  time: '2016-10-30T21:30:00+08:00'
+  time: '2016-11-04T11:20:00+08:00'
   city: 花蓮縣
   town: 秀林鄉
-  TEMP: '7.7'
-  HUMD: '0.66'
+  TEMP: '9.8'
+  HUMD: '0.55'
 吉貝:
-  time: '2016-10-30T21:30:00+08:00'
+  time: '2016-11-04T11:20:00+08:00'
   city: 澎湖縣
   town: 白沙鄉
-  TEMP: '23.9'
-  HUMD: '0.73'
+  TEMP: '22.0'
+  HUMD: '0.82'
 東沙:
-  time: '2016-10-30T21:30:00+08:00'
+  time: '2016-11-04T11:20:00+08:00'
   city: 高雄市
   town: 東沙島
-  TEMP: '25.9'
-  HUMD: '1.00'
+  TEMP: '27.1'
+  HUMD: '0.99'
 金門:
-  time: '2016-10-30T21:30:00+08:00'
+  time: '2016-11-04T11:20:00+08:00'
   city: 金門縣
   town: 金城鎮
-  TEMP: '22.4'
-  HUMD: '0.67'
+  TEMP: '25.2'
+  HUMD: '0.55'
 馬祖:
-  time: '2016-10-30T21:30:00+08:00'
+  time: '2016-11-04T11:20:00+08:00'
   city: 連江縣
   town: 南竿鄉
-  TEMP: '20.6'
-  HUMD: '0.73'
+  TEMP: '20.1'
+  HUMD: '0.68'
 麥寮:
-  time: '2016-10-30T21:30:00+08:00'
+  time: '2016-11-04T11:20:00+08:00'
   city: 雲林縣
   town: 麥寮鄉
-  TEMP: '24.9'
-  HUMD: '0.90'
+  TEMP: '25.5'
+  HUMD: '0.87'
 新屋:
-  time: '2016-10-30T21:30:00+08:00'
+  time: '2016-11-04T11:20:00+08:00'
   city: 桃園市
   town: 新屋區
-  TEMP: '22.4'
-  HUMD: '0.76'
+  TEMP: '24.2'
+  HUMD: '0.73'
 古坑:
-  time: '2016-10-30T21:30:00+08:00'
+  time: '2016-11-04T11:20:00+08:00'
   city: 雲林縣
   town: 古坑鄉
-  TEMP: "-998.0"
-  HUMD: "-998.00"
+  TEMP: '27.6'
+  HUMD: '0.57'
 九宮碼頭:
-  time: '2016-10-30T21:30:00+08:00'
+  time: '2016-11-04T11:20:00+08:00'
   city: 金門縣
   town: 烈嶼鄉
-  TEMP: '23.2'
-  HUMD: '0.72'
+  TEMP: "-998.0"
+  HUMD: "-998.00"

data/spec/spec_helper.rb

@@ -3,6 +3,9 @@ SimpleCov.start
 
 require_relative '../lib/weatai/cwb.rb'
 require_relative '../lib/weatai/cwb_api.rb'
+require_relative '../lib/weatai/cwb_rain.rb'
+require_relative '../lib/weatai/cwb_psi.rb'
+require_relative '../lib/weatai/instant.rb'
 
 require 'minitest/autorun'
 require 'minitest/rg'
@@ -18,13 +21,15 @@ CWB_RESPONSE = YAML.load(File.read('spec/fixtures/data.yml'))
 if File.file?('config/credentials.yml')
   CREDENTIALS = YAML.load(File.read('config/credentials.yml'))
   ENV['AUTH_KEY'] = CREDENTIALS[:key]
-  ENV['DATA_ID'] = CREDENTIALS[:dataid]
+  ENV['DATA_ID1'] = CREDENTIALS[:dataid1]
+  ENV['DATA_ID2'] = CREDENTIALS[:dataid2]
+  ENV['FORMAT'] = CREDENTIALS[:format]
+  ENV['TOKEN'] = CREDENTIALS[:token]
 end
 
-WeatherStations = ['基隆','淡水','板橋','竹子湖','鞍部','新竹','臺中','澎湖',
-                   '日月潭','阿里山','玉山','嘉義','高雄','恆春','宜蘭','蘇澳',
-                   '花蓮','成功','臺東','大武','蘭嶼','彭佳嶼','東吉島','永康',
-                   '金門(合)','拉拉山','武陵','太魯閣','新店','臺北','彰師大',
-                   '臺南','合歡山莊','吉貝','東沙','金門','馬祖','麥寮','新屋',
-                   '古坑','九宮碼頭']
-WeatherStationsAmount = 41 
+WeatherStations = ['基隆','淡水','板橋','竹子湖','鞍部','新竹','臺中','梧棲',
+	               '澎湖','日月潭','阿里山','玉山','嘉義','臺南','高雄','恆春',
+	               '宜蘭','蘇澳','花蓮','成功','臺東','大武','蘭嶼','彭佳嶼',
+	               '東吉島','永康','拉拉山','武陵','太魯閣','新店','臺北',
+	               '彰師大','吉貝','金門','馬祖','麥寮','新屋','古坑']
+WeatherStationsAmount = 38