waqi 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c007eefec0933a9ee71b23f34d1e10fb8ab735c
-  data.tar.gz: e42046b21152bf858860b241a2ae7e69506c1621
+  metadata.gz: 46dc595364fbe07431b7c7de93d8ba223fa85f6d
+  data.tar.gz: fbe77ac97806f77eea4ff7f5b43af9b859d9c61c
 SHA512:
-  metadata.gz: f28fab63e0a514ecf219ead617a9e66beb8d01cec590fec892978fd4b2636265f54169578308366555ab577f90116554e4a5fd7f00f3e45f3dc77553226c1e8a
-  data.tar.gz: 9f2886682a72158aa1af31d4addfa8d2bfbe2e07f3fdd3cd0177f8a98016a26ff5e4cfeef0b91eb92e6d0d33ddd94c8c4b4d39e48df5175aa5616ac9264c4641
+  metadata.gz: 637f79ab3e7506a161a71a7c61dcf6606fc129ed87ee5a563973f9f9d2630eb6113e39e9d9323b1a8d5349c8a915fe8ee2cbe2d1ffd50c42026f6580e826a662
+  data.tar.gz: 63eced401a75af6e19bec5f9f39a165cd2b5d1522788b046e4d92ff1042770dfb115163ba839aa9fabd91337f93f789230187e0a8adfe2b59bb93faa99393658

data/.travis.yml

@@ -1,5 +1,8 @@
 sudo: false
 language: ruby
+addons:
+  code_climate:
+    repo_token: d61928e11ae93b704d1957348d005a9a87bd9b638f15a791cda062dd11766939
 rvm:
   - 2.4.0
   - 2.3.3

data/README.md

@@ -1,7 +1,7 @@
 # Waqi
-[![Build Status](https://travis-ci.org/3zcurdia/waqi.svg?branch=master)](https://travis-ci.org/3zcurdia/waqi)
+[![Build Status](https://travis-ci.org/3zcurdia/waqi.svg?branch=master)](https://travis-ci.org/3zcurdia/waqi) [![Code Climate](https://lima.codeclimate.com/github/3zcurdia/waqi/badges/gpa.svg)](https://lima.codeclimate.com/github/3zcurdia/waqi)
 
-Air Quality Open Data Platform gem wrapper
+[Air Quality Open Data Platform](http://aqicn.org/api/) ruby wrapper
 
 ## Installation
 
@@ -19,7 +19,47 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+Initialize the client
+
+```ruby
+  require 'waqi'
+  client = Waqi::Client.new(token: 'secret token')
+```
+City feed, it returns StationData
+
+```ruby
+  client.city_feed('shanghai')
+```
+
+Station feed, it returns StationData
+
+```ruby
+  client.station_feed(400)
+```
+
+Geolocalized feed, it returns StationData
+
+```ruby
+  client.geo_feed(37.774929, -122.419416)
+```
+
+Local feed, it returns the nearest StationData
+
+```ruby
+  client.local_feed
+```
+
+Feed map within bounds, it returns an array of  StationPin
+
+```ruby
+  client.map_stations(39.379436, 116.091230, 40.235643, 116.784382)
+```
+
+Search by keyword, it returns an array of StationData
+
+```ruby
+  client.search('bangalore')
+```
 
 ## Contributing
 

data/changelog.md

@@ -0,0 +1,14 @@
+# Changelog
+
+## v0.0.1..v0.0.2 
+
+* [de87561](https://github.com/3zcurdia/waqi/commit/de875614abdfd1c01b73ae8d73b9e16be6916e1b) update version [Luis Ezcurdia](mailto:ing.ezcurdia@gmail.com)
+* [ca6765c](https://github.com/3zcurdia/waqi/commit/ca6765cab08de087f8101948abdd92bf90c7dc46) update readme [Luis Ezcurdia](mailto:ing.ezcurdia@gmail.com)
+* [105b7c9](https://github.com/3zcurdia/waqi/commit/105b7c9dda8cf8021b94cb83e074d43ed59889cd) station feed wrapper [Luis Ezcurdia](mailto:ing.ezcurdia@gmail.com)
+* [a937425](https://github.com/3zcurdia/waqi/commit/a93742511df0d9702d7547b4c3cedb5fadf45261) specify ruby required version [Luis Ezcurdia](mailto:ing.ezcurdia@gmail.com)
+* [7c2bde1](https://github.com/3zcurdia/waqi/commit/7c2bde1ddec85502edb6268221c2106f74e80ad8) minor parsing corrections [Luis Ezcurdia](mailto:ing.ezcurdia@gmail.com)
+* [4e30065](https://github.com/3zcurdia/waqi/commit/4e30065aec714a5ad4c14425342d71217f040410) add usage on readme [Luis Ezcurdia](mailto:ing.ezcurdia@gmail.com)
+* [c7bf946](https://github.com/3zcurdia/waqi/commit/c7bf9460cfad0ab1b56e0c43cf58ec4f9ca76a11) clearup args [Luis Ezcurdia](mailto:ing.ezcurdia@gmail.com)
+* [066c736](https://github.com/3zcurdia/waqi/commit/066c736b2ffbde1442b0e79d3b6cfd67e95ce2d8) create stations service [Luis Ezcurdia](mailto:ing.ezcurdia@gmail.com)
+* [8927258](https://github.com/3zcurdia/waqi/commit/89272584dec40048f33481425b11c763811971eb) Update README.md [Luis Ezcurdia](mailto:ing.ezcurdia@gmail.com)
+

data/lib/waqi/client.rb

@@ -1,4 +1,3 @@
-require 'json'
 require 'waqi/services'
 
 module Waqi
@@ -7,6 +6,11 @@ module Waqi
       @token = token
     end
 
+    def station_feed(station_id)
+      response = Service::Station.new(station_id).get(token: @token)
+      StationData.parse(response)
+    end
+
     def city_feed(city_name)
       response = Service::City.new(city_name).get(token: @token)
       StationData.parse(response)

data/lib/waqi/models/station.rb

@@ -2,7 +2,7 @@ module Waqi
   class Station
     attr_reader :city, :attributions
     def self.parse(hash)
-      city = hash[:city] ? City.parse(hash[:city]) : (hash[:name] ? City.parse(hash) : {})
+      city = hash[:city] ? City.parse(hash[:city]) : (hash[:name] ? City.parse(hash) : nil)
       attributions = hash[:attributions] ? hash[:attributions] : []
       new(city: city, attributions: attributions.map { |a| Attribution.parse(a) })
     end

data/lib/waqi/models/station_data.rb

@@ -2,7 +2,7 @@ module Waqi
   class StationData
     attr_reader :aqi, :idx, :uid, :station, :dominant_pollution, :weather_condition, :timestamp
     def self.parse(data)
-      wheather_condition = data[:iaqi] ? WeatherCondition.new(data[:iaqi]) : {}
+      wheather_condition = data[:iaqi] ? WeatherCondition.new(data[:iaqi]) : nil
       station = data[:station] ? Station.parse(data[:station]) : Station.parse(data)
       new(
         aqi: data[:aqi],
@@ -11,18 +11,22 @@ module Waqi
         dominant_pollution: data[:dominentpol],
         station: station,
         weather_condition: wheather_condition,
-        timestamp: DateTime.parse("#{data[:time][:s] || data[:time][:stime]}#{data[:time][:tz]}")
+        timestamp: parse_time(data[:time])
       )
     end
 
-    def initialize(aqi: nil, idx: nil, uid: nil, station: nil, dominant_pollution: nil, weather_condition: nil, timestamp: nil)
-      @aqi = aqi
-      @idx = idx
-      @uid = uid
-      @station = station
-      @dominant_pollution = dominant_pollution
-      @weather_condition = weather_condition
-      @timestamp = timestamp
+    def self.parse_time(time_data)
+      DateTime.parse("#{time_data[:s] || time_data[:stime]}#{time_data[:tz]}") rescue nil
+    end
+
+    def initialize(args = {})
+      @aqi = args[:aqi]
+      @idx = args[:idx]
+      @uid = args[:uid]
+      @station = args[:station]
+      @dominant_pollution = args[:dominant_pollution]
+      @weather_condition = args[:weather_condition]
+      @timestamp = args[:timestamp]
     end
   end
 end

data/lib/waqi/services.rb

@@ -2,4 +2,5 @@ require 'waqi/services/base'
 require 'waqi/services/city'
 require 'waqi/services/geolocation'
 require 'waqi/services/map'
+require 'waqi/services/station'
 require 'waqi/services/search'

data/lib/waqi/services/city.rb

@@ -7,7 +7,7 @@ module Waqi
       end
 
       def path
-        "/feed/#{@name}/"
+        URI.escape("/feed/#{@name}/")
       end
     end
   end

data/lib/waqi/services/station.rb

@@ -0,0 +1,9 @@
+module Waqi
+  module Service
+    class Station < City
+      def initialize(uid)
+        super("@#{uid}")
+      end
+    end
+  end
+end

data/lib/waqi/version.rb

@@ -1,3 +1,3 @@
 module Waqi
-  VERSION = '0.0.1'.freeze
+  VERSION = '0.0.2'.freeze
 end

data/waqi.gemspec

@@ -18,6 +18,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.required_ruby_version = '~> 2.3'
+
   spec.add_development_dependency 'pry', '~> 0.10.3'
   spec.add_development_dependency 'bundler', '~> 1.13'
   spec.add_development_dependency 'rake', '~> 10.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: waqi
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Luis Ezcurdia
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-16 00:00:00.000000000 Z
+date: 2017-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -137,6 +137,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- changelog.md
 - lib/waqi.rb
 - lib/waqi/client.rb
 - lib/waqi/models.rb
@@ -152,6 +153,7 @@ files:
 - lib/waqi/services/geolocation.rb
 - lib/waqi/services/map.rb
 - lib/waqi/services/search.rb
+- lib/waqi/services/station.rb
 - lib/waqi/version.rb
 - waqi.gemspec
 homepage: https://github.com/3zcurdia/waqi
@@ -164,9 +166,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="