wwo 0.1.1 → 0.1.2

data/.travis.yml

@@ -2,3 +2,6 @@ language: ruby
 rvm:
   - 2.1.2
 before_install: gem install bundler -v 1.11.2
+addons:
+  code_climate:
+    repo_token: 476a936cf9ebe214c887c57bd47716384b69dcd2ad5d3b63fff100e5470da0fa

data/Gemfile

@@ -2,3 +2,6 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in wwo.gemspec
 gemspec
+
+gem "simplecov", group: :test, require: false
+gem "codeclimate-test-reporter", group: :test, require: false

data/README.md

@@ -1,11 +1,19 @@
 # WWO - World Weather Online API Gem
 
+[![Gem Version](https://badge.fury.io/rb/wwo.svg)](https://badge.fury.io/rb/wwo) [![Build Status](https://travis-ci.org/sujrd/wwo.svg?branch=master)](https://travis-ci.org/sujrd/wwo) [![Join the chat at https://gitter.im/sujrd/wwo](https://badges.gitter.im/sujrd/wwo.svg)](https://gitter.im/sujrd/wwo?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Code Climate](https://codeclimate.com/github/sujrd/wwo/badges/gpa.svg)](https://codeclimate.com/github/sujrd/wwo) [![Test Coverage](https://codeclimate.com/github/sujrd/wwo/badges/coverage.svg)](https://codeclimate.com/github/sujrd/wwo/coverage) [![License](http://img.shields.io/:license-mit-blue.svg)](http://sujrd.mit-license.org)
+
 This gem provides a (for now) very opinionated interface to [World Weather Online's API][1]. It's based heavily on the
 [forecast-ruby gem](https://github.com/darkskyapp/forecast-ruby) by the wonderful people over at Dark Skies / Forecast.io
 and was bourne out of the need to have a drop in replacemnet for Forecast.io in an application.
 
-The plan is to ehance this over time so that it supports more of WWO's API. Right now it supports forecasts and historical
-weather for a lat / long pair of anywhere in the world.
+The plan is to enhance this over time so that it supports more of WWO's API and is a bit more developer friendly. Right now,
+however, there are the following assumptions / options that you need to be aware of:
+
+  * Temperatures are always returned in **degrees celcius**.
+  * For now we only expect requests for one day at a time, as per the way forecast-ruby works
+  * We only pull in **daily snapshot** information, that is, the predomanant weather over the 24h period of the day in question.
+  * We futz around with the response back, so it is in the same shape of JSON as you get back from `forecast.io`. This is intentional -
+    remember that we intend this to be (for now), a drop-in replacement for forecast.io.
 
 ## Installation
 
@@ -67,4 +75,4 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/sujrd/
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
 
 
-[1]: https://developer.worldweatheronline.com
+[1]: https://developer.worldweatheronline.com

data/lib/wwo.rb

@@ -26,9 +26,9 @@ module Wwo
       end
 
       if date.to_i < Time.now.to_i
-        historic(latitude, longitude, date)
+        make_into_forecast_response(historic(latitude, longitude, date))
       else
-        now_or_later(latitude, longitude, date)
+        make_into_forecast_response(now_or_later(latitude, longitude, date))
       end
     end
 
@@ -42,12 +42,7 @@ module Wwo
     def historic(latitude, longitude, date_or_timestamp)
       date = date_or_timestamp.is_a?(Numeric) ? Time.at(date_or_timestamp).strftime("%F") : date_or_timestamp.strftime("%F")
       uri = "#{Wwo.api_endpoint}/past-weather.ashx?q=#{latitude},#{longitude}&date=#{date}&tp=24&format=json&key=#{Wwo.api_key}"
-
-      api_response = get(uri)
-
-      if api_response.success?
-        return parse_response(Hashie::Mash.new(MultiJson.load(api_response.body)))
-      end
+      api_call(uri)
     end
 
     # Returns historic weather at the provided latitude and longitude coordinates, on a
@@ -60,14 +55,10 @@ module Wwo
     def now_or_later(latitude, longitude, date_or_timestamp = Date.today)
       date = date_or_timestamp.is_a?(Numeric) ? Time.at(date_or_timestamp).strftime("%F") : date_or_timestamp.strftime("%F")
       uri = "#{Wwo.api_endpoint}/weather.ashx?q=#{latitude},#{longitude}&date=#{date}&num_of_days=1&tp=24&format=json&key=#{Wwo.api_key}"
-
-      api_response = get(uri)
-
-      if api_response.success?
-        return parse_response(Hashie::Mash.new(MultiJson.load(api_response.body)))
-      end
+      api_call(uri)
     end
 
+
     # Build or get an HTTP connection object.
     def connection
       return @connection if @connection
@@ -83,6 +74,15 @@ module Wwo
 
     private
 
+    def api_call(uri)
+      api_response = get(uri)
+      if api_response.success?
+        return Hashie::Mash.new(MultiJson.load(api_response.body))
+      else
+        return {}
+      end
+    end
+
     def get(path, params = {})
       params = Wwo.default_params.merge(params || {})
       connection.get(path, params)
@@ -90,12 +90,12 @@ module Wwo
 
     # Munges the repsonse into one like what we would expect from Forecast.io
     #
-    def parse_response(response)
-      data = { daily: { data: [ { icon: '', 'temperatureMax' => 0, 'temperatureMin' => 0  } ] } }
+    def make_into_forecast_response(response)
+      data = { daily: { data: [ { icon: '', 'temperatureMax' => 0, 'temperatureMin' => 0  } ] }, alerts: nil }
       data[:daily][:data][0][:icon] = response.data.weather.first.hourly.first.weatherIconUrl.first.value
       data[:daily][:data][0]['temperatureMax'] = response.data.weather.first.maxtempC
       data[:daily][:data][0]['temperatureMin'] = response.data.weather.first.mintempC
-      data
+      Hashie::Mash.new(data)
     end
   end
 end

data/lib/wwo/configuration.rb

@@ -31,7 +31,7 @@ module Wwo
 
     # API endpoint
     def api_endpoint
-      @api_endpoint ||= ( use_premium_api? ? DEFAULT_PREMIUM_ENDPOINT : DEFAULT_FREE_ENDPOINT )
+      ( use_premium_api? ? DEFAULT_PREMIUM_ENDPOINT : DEFAULT_FREE_ENDPOINT )
     end
 
     # API key
@@ -51,7 +51,7 @@ module Wwo
     private
 
     def use_premium_api?
-      Wwo.use_premium_api == true
+      use_premium_api == true
     end
   end
 end

data/lib/wwo/version.rb

@@ -1,3 +1,3 @@
 module Wwo
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wwo
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - "株式会社アルム　Allm Inc"
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-05 00:00:00.000000000 Z
+date: 2016-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -145,8 +145,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".codeclimate.yml"
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile