pm25 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc572dc7b0470481bf49d0af5120410fbcbdd331
-  data.tar.gz: cf76f74f9da3fb29c51d2bd74aa68a9bf7e08a0b
+  metadata.gz: 1d1ff063f038d524ba9fac5b0c1f6ee992a8c487
+  data.tar.gz: 2b375b5bae4a640267481a083c7d5829727bc22d
 SHA512:
-  metadata.gz: ef22e986f06fbece1d130fcb98ee0dcada03544fb621e8fa39e8df1d07b6512c9afc0cb6143bbf28ead2d3ce43896160205ede70aa6081fdc7768fc870197960
-  data.tar.gz: 048130ad1ac1f10a20dca49436173e32fc6ff9fef3dd6eaec442a72bc6bfdfc187551d0cf27f12af452b9eb9e960076a5fb8de4383993dfd885886905457ce60
+  metadata.gz: 0f32857cef830efd1c32e57d1b3ab5c3eb85860a44a09507877d8a678c64c611f2862952e3ecf8e798f05e98510f8ffc55f33cad0fdd356e85639c435b2fe8af
+  data.tar.gz: 9207780cc22623564bf281642ed02ba06926bbb61de26221a1853719435c58ffdf07110ea3ff16d323ddfdd161b9f0ea8693498fb0220a403c3605a581a5fe27

data/README.md

@@ -70,7 +70,7 @@ PM25::Beijing.all
 #   - 'Desc': string
 #   - 'ReadingDateTime': datetime
 
-PM25::Beijing.last
+PM25::Beijing.last # or PM25::Beijing.latest
 # => return a hash with the latest data, all value been parsed:
 # {"Conc"=>125.0,
 #  "AQI"=>187,

data/lib/pm25/base.rb

@@ -14,11 +14,14 @@ module PM25
     end
 
     def self.all
-      get.select{|x| x.key? 'AQI'}.map(&method(:slice)).map(&method(:parse))
+      get.select{|x| x.key? 'AQI'}.map(&method(:clean_up))
     end
 
     def self.last
-      parse slice(get.find{|x| x.key? 'AQI'})
+      clean_up(get.find{|x| x.key? 'AQI'})
+    end
+    class << self
+      alias_method :latest, :last
     end
 
     def self.uri
@@ -43,6 +46,10 @@ module PM25
       parsed_data['ReadingDateTime'] = DateTime.strptime(data['ReadingDateTime'], '%m/%d/%Y %I:%M:%S %p')
       parsed_data
     end
+
+    def self.clean_up(data)
+      parse slice(data)
+    end
   end
 end
 

data/lib/pm25/version.rb

@@ -1,3 +1,3 @@
 module PM25
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/pm25/base_spec.rb

@@ -34,6 +34,21 @@ describe PM25::Base  do
       hash_b['ReadingDateTime'].should be_a(DateTime)
       hash_b['ReadingDateTime'].should eq(DateTime.strptime(hash_a['ReadingDateTime'], '%m/%d/%Y %I:%M:%S %p'))
     end
+
+    it 'should slice and parse a hash when call `clean_up` method' do
+      hash_b = _class.clean_up(hash_a)
+      hash_b.should be_a(Hash)
+      _class::ATTRS.all?{|x| hash_b.key?(x)}.should eq(true)
+      hash_b.key?('a').should eq(false)
+      hash_b.key?('b').should eq(false)
+
+      hash_b['Conc'].should be_a(Float)
+      hash_b['Conc'].should eq(125.0)
+      hash_b['AQI'].should be_a(Integer)
+      hash_b['AQI'].should eq(187)
+      hash_b['ReadingDateTime'].should be_a(DateTime)
+      hash_b['ReadingDateTime'].should eq(DateTime.strptime(hash_a['ReadingDateTime'], '%m/%d/%Y %I:%M:%S %p'))
+    end
   end
 
   context 'Class attributes and constant' do

data/spec/pm25/cities_spec.rb

@@ -29,13 +29,22 @@ shared_examples "city common examples" do |city_class, city_id|
     end
 
     it 'should return the latest parsed data clice by ATTRS from remote when call `last` method' do
+      city_class.stub(:get) {
+         [{"title"=>"06/28/2013 11:00:00 AM", "description"=>"06-28-2013 11:00; PM2.5; 6.0; 25; Good (at 24-hour exposure at this level)", "Param"=>"PM2.5", "Conc"=>"6.0", "Desc"=>"Good (at 24-hour exposure at this level)", "ReadingDateTime"=>"06/28/2013 11:00:00 AM"},
+          {"title"=>"06/28/2013 10:00:00 AM", "description"=>"06-28-2013 10:00; PM2.5; 12.0; 50; Good (at 24-hour exposure at this level)", "Param"=>"PM2.5", "Conc"=>"12.0", "AQI"=>"50", "Desc"=>"Good (at 24-hour exposure at this level)", "ReadingDateTime"=>"06/28/2013 10:00:00 AM"}
+        ]
+      }
       data = city_class.last
       data.should be_a(Hash)
       data.keys.should eq(city_class::ATTRS)
       data['Conc'].should be_a(Float)
+      data['Conc'].should eq(12.0)
       data['AQI'].should be_a(Integer)
+      data['AQI'].should eq(50)
       data['Desc'].should be_a(String)
+      data['Desc'].should eq('Good (at 24-hour exposure at this level)')
       data['ReadingDateTime'].should be_a(DateTime)
+      data['ReadingDateTime'].should eq(DateTime.strptime('06/28/2013 10:00:00 AM', '%m/%d/%Y %I:%M:%S %p'))
     end
 
     it 'should return URI::HTTP object own context when call `uri` method' do

metadata

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