pm25 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2ff8a87d9a989a23ccbac7f456fe7991fde761a
-  data.tar.gz: 46a4b233864cbeb0f1288dab7d1cb8a246c2c20e
+  metadata.gz: 9ab93196de911f044eddb954a668c5d22d4a91db
+  data.tar.gz: e95313819d4b17c7c1000fed8b5edd53803541fd
 SHA512:
-  metadata.gz: bef052ab41a4a9c59235066d64cee2e9ce6e4704e90c5012fa86d72cf9b806e2d195d677c920642670f2868d52ae497737425e7556ec42ced8164418b564176a
-  data.tar.gz: 74bdaec6a5989ca25f2dbb7aade5a55e06fbc730e3347029e604367241077fa8a9f6aec2a9ae7cd01ffa1ff90069f5cbe40adbce9c0044814c7283b032eb8e23
+  metadata.gz: da1aa51442b263b4f2bb552da55317207598817d0ba3386d3a5beec3122eb377960f0477f581bd9f34b843f2aefacb653beaa0a34e2b8ff4e5a87b83445cfceb
+  data.tar.gz: 4baf7cf46b287ce60cd211b78f3187f59156e2b710443b55ecdf94d1fd1ba51290925ff921d941b8455848be96ab2fd10b56b59a8e7016fa6c8796e28d476c1e

data/README.md

@@ -45,13 +45,21 @@ PM25::Beijing.get
 #  {"title"=>"06/04/2013 5:00:00 PM",
 # ......
 
-PM25::Beijing.latest
-# => return a hash with the latest data, all value was parsed:
-# {"Conc"=>162.0,
-#  "AQI"=>212,
-#  "Desc"=>"Very Unhealthy (at 24-hour exposure at this level)",
-#  "ReadingDateTime"=>Sat, 06 Jul 2013 17:00:00 +0000}
-#  "ReadingDateTime"=>"06/07/2013 5:00:00 PM"}
+PM25::Beijing.all
+# => return an array with all data, all value been parsed:
+# [{"Conc"=>125.0,
+#   "AQI"=>187,
+#   "Desc"=>"Unhealthy (at 24-hour exposure at this level)",
+#   "ReadingDateTime"=>Thu, 13 Jun 2013 12:00:00 +0000},
+#  {"Conc"=>121.0,
+#   "AQI"=>185,
+#   "Desc"=>"Unhealthy (at 24-hour exposure at this level)",
+#   "ReadingDateTime"=>Thu, 13 Jun 2013 11:00:00 +0000},
+#  {"Conc"=>110.0,
+#   "AQI"=>179,
+#   "Desc"=>"Unhealthy (at 24-hour exposure at this level)",
+#   "ReadingDateTime"=>Thu, 13 Jun 2013 10:00:00 +0000},
+#  ......
 #
 # column types:
 #   - 'Conc': float
@@ -59,20 +67,33 @@ PM25::Beijing.latest
 #   - 'Desc': string
 #   - 'ReadingDateTime': datetime
 
+PM25::Beijing.last
+# => return a hash with the latest data, all value been parsed:
+# {"Conc"=>125.0,
+#  "AQI"=>187,
+#  "Desc"=>"Unhealthy (at 24-hour exposure at this level)",
+#  "ReadingDateTime"=>Thu, 13 Jun 2013 12:00:00 +0000}
+
+
 # Shanghai
 PM25::Shanghai.get
-PM25::Shanghai.latest
+PM25::Shanghai.all
+PM25::Shanghai.last
 
 # Chengdu
 PM25::Chengdu.get
-PM25::Chengdu.latest
+PM25::Chengdu.all
+PM25::Chengdu.last
 
 # Guangzhou
 PM25::Guangzhou.get
-PM25::Guangzhou.latest
+PM25::Guangzhou.all
+PM25::Guangzhou.last
 
 # Shenyang
 PM25::Shenyang.get
+PM25::Shenyang.all
+PM25::Shenyang.last
 ```
 
 ## Contributing

data/lib/pm25/base.rb

@@ -12,8 +12,12 @@ module PM25
       Hash.from_xml(HTTParty.get(url).body)['rss']['channel']['item']
     end
 
-    def self.latest
-      parse(get.find{|x| x.key? 'AQI'}.slice(*ATTRS))
+    def self.all
+      get.select{|x| x.key? 'AQI'}.map(&method(:slice)).map(&method(:parse))
+    end
+
+    def self.last
+      parse slice(get.find{|x| x.key? 'AQI'})
     end
 
     def self.uri
@@ -26,10 +30,14 @@ module PM25
       uri.to_s
     end
 
+    def self.slice(data)
+      data.slice(*ATTRS)
+    end
+
     def self.parse(data)
       data['Conc'] = data['Conc'].to_f
       data['AQI'] = data['AQI'].to_i
-      data['ReadingDateTime'] = DateTime.parse(data['ReadingDateTime'])
+      data['ReadingDateTime'] = DateTime.strptime(data['ReadingDateTime'], '%m/%d/%Y %I:%M:%S %p')
       data
     end
   end

data/lib/pm25/version.rb

@@ -1,3 +1,3 @@
 module Pm25
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pm25
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Xuhao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-07 00:00:00.000000000 Z
+date: 2013-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler