china_aqi 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 281c9788d6683f23bc1a341af1e7521aa6f5a74d
-  data.tar.gz: 0a566a4cfd260d9582641c9fcc4b93145edaf50e
+  metadata.gz: 5629478b4a11380f5cf5768d6e93381dcef35081
+  data.tar.gz: 73938de2bcb5dcbd52b3607f391759823dccdc6b
 SHA512:
-  metadata.gz: bd5bf0b0d3a03a68c19fe13374d2c9cb66d57d401b1e26d23fc84af1a7ddf90fa546590b743a62dc043530d8a6b9a8f79b28ef4bbfc0f246310f451c3a41e94e
-  data.tar.gz: b7c90e31f224fa17f05f47b57671bd7b1dcd8e2d3d6da0fffe96b91ab96ff27c5468a434c04fd0ee45c94cfbf05f1a35ad8992ffee8ed3d28e0fe5912598051c
+  metadata.gz: 54948bc0de829400be061cda90c2b810f87440cfb2d390dfc1188a0763186ad4744341fe6da42061f91c90399a02cda896d94b70e5532a77f1fbd5a678082ce5
+  data.tar.gz: 53c0da5802bc59812543ada719f660d20a47ab24e8d40eeee438fe41b6da8a936b48ac48d5f80900ba9755a4e21087af83fa0f57b10b930d139140da7fabfb43

data/lib/china_aqi/base.rb

@@ -54,6 +54,10 @@ module ChinaAqi
         #{'*' * 66}~ unless ChinaAqi.token
       @token = ChinaAqi.token
     end
+
+    def self.get(*args)
+      self.new(*args).get
+    end
   end
 
   # APIs with some parameters

data/lib/china_aqi/utility.rb

@@ -14,12 +14,6 @@ module ChinaAqi
       self.base_uri = URI::HTTP.build({host: 'www.pm25.in'})
     end
 
-    module ClassMethods
-      def get(*args)
-        self.new(*args).get
-      end
-    end
-
     def get
       ::ActiveSupport::JSON.decode(HTTParty.get(url).body)
     end

data/lib/china_aqi/version.rb

@@ -1,3 +1,3 @@
 module ChinaAqi
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/china_aqi/aqi_spec.rb

@@ -0,0 +1,145 @@
+# coding: utf-8
+require 'spec_helper'
+
+describe ChinaAqi do
+  before(:each) { ChinaAqi.token = '5j1znBVAsnSf5xQyNQyq' }
+
+  describe 'Shared examples' do
+    shared_examples "common examples" do |klass, obj|
+      it 'should return URI::HTTP object own context when call "uri" method' do
+        uri = obj.uri
+        uri.should be_a(URI::HTTP)
+        uri.host.should eq('www.pm25.in')
+        uri.path.should eq("/api/querys/#{klass.method.to_s}.json")
+      end
+
+      it 'should return url string with own context when call "url" method' do
+        obj.url.should be_a(String)
+        obj.url.include?("http://www.pm25.in/api/querys/#{klass.method.to_s}.json").should be_true
+      end
+
+      it 'should return an array or hash with aqi data when call "get" method' do
+        data = obj.get
+        data.class.should satisfy{|k| [Array, Hash].include?(k)}
+      end
+    end
+
+    shared_examples 'class attribute' do |klass, value|
+      it "should have class attribute 'method' equal #{value}" do
+        klass.method.should eq(value)
+      end
+    end
+
+    shared_examples "common dynamic examples" do |klass|
+      ChinaAqi.token = '5j1znBVAsnSf5xQyNQyq'
+      obj = klass.new('shanghai')
+
+      include_examples "common examples", klass, obj
+    end
+
+    shared_examples "common static examples" do |klass|
+      ChinaAqi.token = '5j1znBVAsnSf5xQyNQyq'
+      obj = klass.new
+
+      include_examples "common examples", klass, obj
+    end
+  end
+
+  describe 'Dynamic models' do
+    describe ChinaAqi::City do
+      include_examples "common dynamic examples", ChinaAqi::City
+      include_examples "class attribute", ChinaAqi::City, :only_aqi
+    end
+
+    describe ChinaAqi::CityPro do
+      include_examples "common dynamic examples", ChinaAqi::CityPro
+      include_examples "class attribute", ChinaAqi::CityPro, :aqi_details
+    end
+
+    describe ChinaAqi::CO do
+      include_examples "common dynamic examples", ChinaAqi::CO
+      include_examples "class attribute", ChinaAqi::CO, :co
+    end
+
+    describe ChinaAqi::NO2 do
+      include_examples "common dynamic examples", ChinaAqi::NO2
+      include_examples "class attribute", ChinaAqi::NO2, :no2
+    end
+
+    describe ChinaAqi::O3 do
+      include_examples "common dynamic examples", ChinaAqi::O3
+      include_examples "class attribute", ChinaAqi::O3, :o3
+    end
+
+    describe ChinaAqi::PM10 do
+      include_examples "common dynamic examples", ChinaAqi::PM10
+      include_examples "class attribute", ChinaAqi::PM10, :pm10
+    end
+
+    describe ChinaAqi::PM25 do
+      include_examples "common dynamic examples", ChinaAqi::PM25
+      include_examples "class attribute", ChinaAqi::PM25, :pm2_5
+    end
+
+    describe ChinaAqi::SO2 do
+      include_examples "common dynamic examples", ChinaAqi::SO2
+      include_examples "class attribute", ChinaAqi::SO2, :so2
+    end
+  end
+
+  describe 'Static models' do
+    describe ChinaAqi::Global do
+      include_examples "common static examples", ChinaAqi::Global
+      include_examples "class attribute", ChinaAqi::Global, :all_cities
+    end
+
+    describe ChinaAqi::Ranking do
+      include_examples "common static examples", ChinaAqi::Ranking
+      include_examples "class attribute", ChinaAqi::Ranking, :aqi_ranking
+    end
+  end
+
+  describe 'Station' do
+    describe ChinaAqi::Station do
+      ChinaAqi.token = '5j1znBVAsnSf5xQyNQyq'
+      obj = ChinaAqi::Station.new('1141A')
+
+      include_examples "common examples", ChinaAqi::Station, obj
+      include_examples "class attribute", ChinaAqi::Station, :aqis_by_station
+
+      it 'should have station_code instance variable' do
+        obj = ChinaAqi::Station.new('1141A')
+        obj.instance_variable_defined?(:@station_code).should be_true
+      end
+    end
+  end
+
+  describe 'Helper' do
+    describe ChinaAqi::CityStations do
+      include_examples "common dynamic examples", ChinaAqi::CityStations
+      include_examples "class attribute", ChinaAqi::CityStations, :station_names
+
+      before(:each) { ChinaAqi.token = '5j1znBVAsnSf5xQyNQyq' }
+
+      it 'should have module function called get_stations_for_city to get stations for one city' do
+        ChinaAqi.respond_to?(:get_stations_for_city).should be_true
+        stations = ChinaAqi.get_stations_for_city('shanghai')
+        stations.should be_a(Hash)
+        stations.key?('city').should be_true
+        stations.key?('stations').should be_true
+        stations['stations'].should be_a(Array)
+        stations['city'].should eq('上海')
+      end
+
+      it 'should return a hash with aqi data when call "get" instance method' do
+        stations = ChinaAqi::CityStations.new('shanghai').get
+        stations.should be_a(Hash)
+        stations.key?('city').should be_true
+        stations.key?('stations').should be_true
+        stations['stations'].should be_a(Array)
+        stations['city'].should eq('上海')
+      end
+    end
+  end
+
+end

data/spec/spec_helper.rb

@@ -2,5 +2,3 @@ require 'coveralls'
 Coveralls.wear!
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'china_aqi'
-
-require 'china_aqi/shared_spec'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: china_aqi
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Xuhao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-03 00:00:00.000000000 Z
+date: 2013-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -114,12 +114,8 @@ files:
 - lib/china_aqi/version.rb
 - lib/generators/china_aqi/install/USAGE
 - lib/generators/china_aqi/install/install_generator.rb
-- spec/china_aqi/aqi/dynamic_spec.rb
-- spec/china_aqi/aqi/static_spec.rb
-- spec/china_aqi/aqi/station_spec.rb
+- spec/china_aqi/aqi_spec.rb
 - spec/china_aqi/base_spec.rb
-- spec/china_aqi/helper/city_stations_spec.rb
-- spec/china_aqi/shared_spec.rb
 - spec/china_aqi_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/Xuhao/china_aqi
@@ -147,11 +143,7 @@ signing_key:
 specification_version: 4
 summary: China AQI API from PM25.in
 test_files:
-- spec/china_aqi/aqi/dynamic_spec.rb
-- spec/china_aqi/aqi/static_spec.rb
-- spec/china_aqi/aqi/station_spec.rb
+- spec/china_aqi/aqi_spec.rb
 - spec/china_aqi/base_spec.rb
-- spec/china_aqi/helper/city_stations_spec.rb
-- spec/china_aqi/shared_spec.rb
 - spec/china_aqi_spec.rb
 - spec/spec_helper.rb

data/spec/china_aqi/aqi/dynamic_spec.rb

@@ -1,47 +0,0 @@
-require 'spec_helper'
-
-describe ChinaAqi do
-  before(:each) { ChinaAqi.token = '5j1znBVAsnSf5xQyNQyq' }
-
-  ChinaAqi.token = '5j1znBVAsnSf5xQyNQyq'
-
-  describe ChinaAqi::City do
-    include_examples "common dynamic examples", ChinaAqi::City
-    include_examples "class attribute", ChinaAqi::City, :only_aqi
-  end
-
-  describe ChinaAqi::CityPro do
-    include_examples "common dynamic examples", ChinaAqi::CityPro
-    include_examples "class attribute", ChinaAqi::CityPro, :aqi_details
-  end
-
-  describe ChinaAqi::CO do
-    include_examples "common dynamic examples", ChinaAqi::CO
-    include_examples "class attribute", ChinaAqi::CO, :co
-  end
-
-  describe ChinaAqi::NO2 do
-    include_examples "common dynamic examples", ChinaAqi::NO2
-    include_examples "class attribute", ChinaAqi::NO2, :no2
-  end
-
-  describe ChinaAqi::O3 do
-    include_examples "common dynamic examples", ChinaAqi::O3
-    include_examples "class attribute", ChinaAqi::O3, :o3
-  end
-
-  describe ChinaAqi::PM10 do
-    include_examples "common dynamic examples", ChinaAqi::PM10
-    include_examples "class attribute", ChinaAqi::PM10, :pm10
-  end
-
-  describe ChinaAqi::PM25 do
-    include_examples "common dynamic examples", ChinaAqi::PM25
-    include_examples "class attribute", ChinaAqi::PM25, :pm2_5
-  end
-
-  describe ChinaAqi::SO2 do
-    include_examples "common dynamic examples", ChinaAqi::SO2
-    include_examples "class attribute", ChinaAqi::SO2, :so2
-  end
-end

data/spec/china_aqi/aqi/static_spec.rb

@@ -1,17 +0,0 @@
-require 'spec_helper'
-
-describe ChinaAqi do
-  before(:each) { ChinaAqi.token = '5j1znBVAsnSf5xQyNQyq' }
-
-  ChinaAqi.token = '5j1znBVAsnSf5xQyNQyq'
-
-  describe ChinaAqi::Global do
-    include_examples "common static examples", ChinaAqi::Global
-    include_examples "class attribute", ChinaAqi::Global, :all_cities
-  end
-
-  describe ChinaAqi::Ranking do
-    include_examples "common static examples", ChinaAqi::Ranking
-    include_examples "class attribute", ChinaAqi::Ranking, :aqi_ranking
-  end
-end

data/spec/china_aqi/aqi/station_spec.rb

@@ -1,16 +0,0 @@
-require 'spec_helper'
-
-describe ChinaAqi::Station do
-  before(:each) { ChinaAqi.token = '5j1znBVAsnSf5xQyNQyq' }
-
-  ChinaAqi.token = '5j1znBVAsnSf5xQyNQyq'
-  obj = ChinaAqi::Station.new('1141A')
-
-  include_examples "common examples", ChinaAqi::Station, obj
-  include_examples "class attribute", ChinaAqi::Station, :aqis_by_station
-
-  it 'should have station_code instance variable' do
-    obj = ChinaAqi::Station.new('1141A')
-    obj.instance_variable_defined?(:@station_code).should be_true
-  end
-end

data/spec/china_aqi/helper/city_stations_spec.rb

@@ -1,30 +0,0 @@
-# coding: utf-8
-require 'spec_helper'
-
-describe ChinaAqi do
-  describe ChinaAqi::CityStations do
-    include_examples "common dynamic examples", ChinaAqi::CityStations
-    include_examples "class attribute", ChinaAqi::CityStations, :station_names
-
-    before(:each) { ChinaAqi.token = '5j1znBVAsnSf5xQyNQyq' }
-
-    it 'should have module function called get_stations_for_city to get stations for one city' do
-      ChinaAqi.respond_to?(:get_stations_for_city).should be_true
-      stations = ChinaAqi.get_stations_for_city('Shanghai')
-      stations.should be_a(Hash)
-      stations.key?('city').should be_true
-      stations.key?('stations').should be_true
-      stations['stations'].should be_a(Array)
-      stations['city'].should eq('上海')
-    end
-
-    it 'should return a hash with aqi data when call "get" instance method' do
-      stations = ChinaAqi::CityStations.new('Shanghai').get
-      stations.should be_a(Hash)
-      stations.key?('city').should be_true
-      stations.key?('stations').should be_true
-      stations['stations'].should be_a(Array)
-      stations['city'].should eq('上海')
-    end
-  end
-end

data/spec/china_aqi/shared_spec.rb

@@ -1,49 +0,0 @@
-require 'spec_helper'
-
-describe ChinaAqi do
-  shared_examples "common examples" do |klass, obj|
-    it 'should return URI::HTTP object own context when call "uri" method' do
-      uri = obj.uri
-      uri.should be_a(URI::HTTP)
-      uri.host.should eq('www.pm25.in')
-      uri.path.should eq("/api/querys/#{klass.method.to_s}.json")
-    end
-
-    it 'should return url string with own context when call "url" method' do
-      obj.url.should be_a(String)
-      obj.url.include?("http://www.pm25.in/api/querys/#{klass.method.to_s}.json").should be_true
-    end
-  end
-
-  shared_examples 'class attribute' do |klass, value|
-    it "should have class attribute 'method' equal #{value}" do
-      klass.method.should eq(value)
-    end
-  end
-
-  shared_examples 'get array' do |klass|
-    before(:each) { ChinaAqi.token = '5j1znBVAsnSf5xQyNQyq' }
-    let(:obj) { klass.new('Shanghai') }
-
-    it 'should return an array with aqi data when call "get" method' do
-      data = obj.get
-      data.should be_a(Array)
-      data.all? {|aqi| aqi.key? 'aqi'}.should be_true
-    end
-  end
-
-  shared_examples "common dynamic examples" do |klass|
-    ChinaAqi.token = '5j1znBVAsnSf5xQyNQyq'
-    obj = klass.new('Shanghai')
-
-    include_examples "common examples", klass, obj
-
-  end
-
-  shared_examples "common static examples" do |klass|
-    ChinaAqi.token = '5j1znBVAsnSf5xQyNQyq'
-    obj = klass.new
-
-    include_examples "common examples", klass, obj
-  end
-end