darksky 1.0.2 → 1.0.3

data/CHANGELOG.markdown

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 1.0.3
+
+* Added `interesting` API endpoint to return a list of interesting storms happening right now.
+* Fixed bug in `precipitation` API endpoint where multiple locations were not correctly passed to the API.
+
 ## 1.0.2
 
 * Removed default to disable SSL peer verification now that the DarkSky API server has a signed certificate.

data/README.markdown

@@ -17,8 +17,15 @@ gem 'darksky'
 
 ```ruby
 darksky = Darksky::API.new('d41d8cd98f00b204e9800998ecf8427e')
+
+# Returns a forecast for the next hour at a given location.
 forecast = darksky.forecast('42.7243','-73.6927')
+
+# Returns forecasts for a collection of arbitrary points.
 precipitation = darksky.precipitation(['42.7','-73.6',1325607100,'42.0','-73.0',1325607791])
+
+# Returns a list of interesting storms happening right now.
+interesting_storms = darksky.interesting
 ```
 
 ## Contributing to darksky

data/darksky.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.name        = "darksky"
   s.version     = Darksky::VERSION
   s.authors     = ["David Czarnecki"]
-  s.email       = ["me@davidczarnecki"]
+  s.email       = ["me@davidczarnecki.com"]
   s.homepage    = "https://github.com/czarneckid/darksky"
   s.summary     = %q{Ruby gem for retrieving data from the Dark Sky API}
   s.description = %q{Ruby gem for retrieving data from the Dark Sky API}
@@ -22,4 +22,5 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency('rake')
   s.add_development_dependency('rspec')
+  s.add_development_dependency('vcr')
 end

data/lib/darksky/api.rb

@@ -30,8 +30,20 @@ module Darksky
     # @param option [Hash] (Optional) Options to be passed to the Typhoeus::Request
     def precipitation(latitudes_longitudes_times, options = {})
       return if latitudes_longitudes_times.size % 3 != 0
-      response = Typhoeus::Request.get("#{DARKSKY_API_URL}/precipitation/#{@api_key}/#{latitudes_longitudes_times.join(',')}", DEFAULT_OPTIONS.dup.merge(options))
+      params = []      
+      latitudes_longitudes_times.each_slice(3) do |data|
+        params << data.join(',')
+      end
+      response = Typhoeus::Request.get("#{DARKSKY_API_URL}/precipitation/#{@api_key}/#{params.join(';')}", DEFAULT_OPTIONS.dup.merge(options))
       JSON.parse(response.body) if response.code == 200
     end
+
+    # Returns a list of interesting storms happening right now.
+    #
+    # @param option [Hash] (Optional) Options to be passed to the Typhoeus::Request
+    def interesting(options = {})
+      response = Typhoeus::Request.get("#{DARKSKY_API_URL}/interesting/#{@api_key}", DEFAULT_OPTIONS.dup.merge(options))
+      JSON.parse(response.body) if response.code == 200      
+    end
   end
 end

data/lib/darksky/version.rb

@@ -1,3 +1,3 @@
 module Darksky
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/spec/cassettes/forecast.yml

@@ -0,0 +1,28 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://api.darkskyapp.com/v1/forecast/this-is-your-dark-sky-api-key/42.7243,-73.6927
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers: {}
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      X-Powered-By:
+      - Express
+      Content-Type:
+      - application/json; charset=utf-8
+      Content-Length:
+      - '5911'
+      Connection:
+      - keep-alive
+    body:
+      encoding: ASCII-8BIT
+      string: ! '{"isPrecipitating":false,"minutesUntilChange":0,"currentSummary":"clear","hourSummary":"clear","radarStation":"enx","hourPrecipitation":[{"probability":0,"intensity":0,"error":0,"type":"rain","time":1331857375},{"probability":0,"intensity":0,"error":0,"type":"rain","time":1331857435},{"probability":0,"intensity":0,"error":0,"type":"rain","time":1331857495},{"probability":0,"intensity":0,"error":0,"type":"rain","time":1331857555},{"probability":0,"intensity":0,"error":0,"type":"rain","time":1331857615},{"probability":0,"intensity":0,"error":0,"type":"rain","time":1331857675},{"probability":0,"intensity":0,"error":0,"type":"rain","time":1331857735},{"probability":0,"intensity":0,"error":0,"type":"rain","time":1331857795},{"probability":0,"intensity":0,"error":0,"type":"rain","time":1331857855},{"probability":0,"intensity":0,"error":0,"type":"rain","time":1331857915},{"probability":0,"intensity":0,"error":0,"type":"rain","time":1331857975},{"probability":0,"intensity":0,"error":0,"type":"rain","time":1331858035},{"probability":0,"intensity":0,"error":0,"type":"rain","time":1331858095},{"probability":0,"intensity":0,"error":0,"type":"rain","time":1331858155},{"probability":0,"intensity":0,"error":0,"type":"rain","time":1331858215},{"probability":0,"intensity":0,"error":0,"type":"rain","time":1331858275},{"probability":0,"intensity":0,"error":0,"type":"rain","time":1331858335},{"probability":0,"intensity":0,"error":0,"type":"rain","time":1331858395},{"probability":0,"intensity":0,"error":0,"type":"rain","time":1331858455},{"probability":0,"intensity":0,"error":0,"type":"rain","time":1331858515},{"probability":0,"intensity":0,"error":0,"type":"rain","time":1331858575},{"probability":0,"intensity":0,"error":0,"type":"rain","time":1331858635},{"probability":0,"intensity":0,"error":0,"type":"rain","time":1331858695},{"probability":0,"intensity":0,"error":0,"type":"rain","time":1331858755},{"probability":0,"intensity":0,"error":0,"type":"rain","time":1331858815},{"probability":0,"intensity":0,"error":0,"type":"rain","time":1331858875},{"probability":0,"intensity":0,"error":0,"type":"rain","time":1331858935},{"probability":0,"intensity":0,"error":0,"type":"rain","time":1331858995},{"probability":0,"intensity":0,"error":0,"type":"rain","time":1331859055},{"probability":0,"intensity":0,"error":0,"type":"rain","time":1331859115},{"probability":0,"intensity":0,"error":0,"type":"rain","time":1331859175},{"probability":0,"intensity":0,"error":0,"type":"rain","time":1331859235},{"probability":0,"intensity":0,"error":0,"type":"rain","time":1331859295},{"probability":0,"intensity":0,"error":0,"type":"rain","time":1331859355},{"probability":0,"intensity":0,"error":0,"type":"rain","time":1331859415},{"probability":0,"intensity":0,"error":0,"type":"rain","time":1331859475},{"probability":0,"intensity":0,"error":0,"type":"rain","time":1331859535},{"probability":0,"intensity":0,"error":0,"type":"rain","time":1331859595},{"probability":0,"intensity":0,"error":0,"type":"rain","time":1331859655},{"probability":0,"intensity":0,"error":0,"type":"rain","time":1331859715},{"probability":0,"intensity":0,"error":0,"type":"rain","time":1331859775},{"probability":0,"intensity":0,"error":0,"type":"rain","time":1331859835},{"probability":0,"intensity":0,"error":0,"type":"rain","time":1331859895},{"probability":0,"intensity":0,"error":0,"type":"rain","time":1331859955},{"probability":0,"intensity":0,"error":0,"type":"rain","time":1331860015},{"probability":0,"intensity":0,"error":0,"type":"rain","time":1331860075},{"probability":0,"intensity":0,"error":0,"type":"rain","time":1331860135},{"probability":0,"intensity":0,"error":0,"type":"rain","time":1331860195},{"probability":0,"intensity":0,"error":0,"type":"rain","time":1331860255},{"probability":0,"intensity":0,"error":0,"type":"rain","time":1331860315},{"probability":0,"intensity":0,"error":0,"type":"rain","time":1331860375},{"probability":0,"intensity":0,"error":0,"type":"rain","time":1331860435},{"probability":0,"intensity":0,"error":0,"type":"rain","time":1331860495},{"probability":0,"intensity":0,"error":0,"type":"rain","time":1331860555},{"probability":0,"intensity":0,"error":0,"type":"rain","time":1331860615},{"probability":0,"intensity":0,"error":0,"type":"rain","time":1331860675},{"probability":0,"intensity":0,"error":0,"type":"rain","time":1331860735},{"probability":0,"intensity":0,"error":0,"type":"rain","time":1331860795},{"probability":0,"intensity":0,"error":0,"type":"rain","time":1331860855},{"probability":0,"intensity":0,"error":0,"type":"rain","time":1331860915}],"dayPrecipitation":[{"time":1331769600,"probability":0.69,"type":"rain"},{"time":1331773200,"probability":0.37,"type":"rain"},{"time":1331776800,"probability":0.28,"type":"rain"},{"time":1331780400,"probability":0.09,"type":"rain"},{"time":1331784000,"probability":0.06,"type":"rain"},{"time":1331787600,"probability":0.04,"type":"rain"},{"time":1331791200,"probability":0.04,"type":"rain"},{"time":1331794800,"probability":0.04,"type":"rain"},{"time":1331798400,"probability":0.07,"type":"rain"},{"time":1331802000,"probability":0.09,"type":"rain"},{"time":1331805600,"probability":0.12,"type":"rain"},{"time":1331809200,"probability":0.15,"type":"rain"},{"time":1331812800,"probability":0.17,"type":"rain"},{"time":1331816400,"probability":0.2,"type":"rain"},{"time":1331820000,"probability":0.22,"type":"rain"},{"time":1331823600,"probability":0.25,"type":"rain"},{"time":1331827200,"probability":0.16,"type":"rain"},{"time":1331830800,"probability":0.12,"type":"rain"},{"time":1331834400,"probability":0.06,"type":"rain"},{"time":1331838000,"probability":0.04,"type":"rain"},{"time":1331841600,"probability":0.01,"type":"rain"},{"time":1331845200,"probability":0,"type":"rain"},{"time":1331848800,"probability":0,"type":"rain"},{"time":1331852400,"probability":0,"type":"rain"},{"time":1331856000,"probability":0,"type":"rain"}]}'
+    http_version: '1.1'
+  recorded_at: Fri, 16 Mar 2012 00:22:55 GMT
+recorded_with: VCR 2.0.0

data/spec/cassettes/interesting.yml

@@ -0,0 +1,37 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://api.darkskyapp.com/v1/interesting/this-is-your-dark-sky-api-key
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers: {}
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      X-Powered-By:
+      - Express
+      Content-Type:
+      - application/json; charset=utf-8
+      Content-Length:
+      - '1213'
+      Connection:
+      - keep-alive
+    body:
+      encoding: ASCII-8BIT
+      string: ! '{"storms":[{"station":"gwx","intensity":59.1176,"city":"Triana, AL","longitude":-86.75493150419186,"latitude":34.641395125358194},{"station":"dtx","intensity":57.9412,"city":"South
+        Monroe, MI","longitude":-83.39335852861447,"latitude":41.86838558543463},{"station":"htx","intensity":56.4706,"city":"Huntsville,
+        AL","longitude":-86.62052879383518,"latitude":34.79127010512976},{"station":"jkl","intensity":56.1765,"city":"Manchester,
+        KY","longitude":-83.749418868936,"latitude":37.05544557347635},{"station":"iwx","intensity":56.1765,"city":"Bass
+        Lake, IN","longitude":-86.55524444156121,"latitude":41.19456019130322},{"station":"pah","intensity":56.1765,"city":"Centerville,
+        MO","longitude":-91.05466740454301,"latitude":37.54925976072387},{"station":"lot","intensity":55.5882,"city":"Bass
+        Lake, IN","longitude":-86.63659365658056,"latitude":41.211492393559716},{"station":"ilx","intensity":55,"city":"Winchester,
+        IL","longitude":-90.42692738243768,"latitude":39.68433565620716},{"station":"lsx","intensity":55,"city":"Centerville,
+        MO","longitude":-91.07445695965303,"latitude":37.37996424972698},{"station":"sgf","intensity":54.7059,"city":"Salem,
+        MO","longitude":-91.53280101446386,"latitude":37.788012812361}]}'
+    http_version: '1.1'
+  recorded_at: Fri, 16 Mar 2012 00:21:37 GMT
+recorded_with: VCR 2.0.0

data/spec/cassettes/precipitation.yml

@@ -0,0 +1,28 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://api.darkskyapp.com/v1/precipitation/this-is-your-dark-sky-api-key/42.7,-73.6,1325607100;42.0,-73.0,1325607791
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers: {}
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      X-Powered-By:
+      - Express
+      Content-Type:
+      - application/json; charset=utf-8
+      Content-Length:
+      - '167'
+      Connection:
+      - keep-alive
+    body:
+      encoding: ASCII-8BIT
+      string: ! '{"precipitation":[{"probability":0,"intensity":0,"error":0,"type":"rain","time":1325607100},{"probability":0,"intensity":0,"error":0,"type":"rain","time":1325607791}]}'
+    http_version: '1.1'
+  recorded_at: Fri, 16 Mar 2012 00:36:48 GMT
+recorded_with: VCR 2.0.0

data/spec/darksky/api_spec.rb

@@ -1,68 +1,35 @@
 require 'spec_helper'
 
 describe Darksky::API do
-  let(:darksky_api) { Darksky::API.new('d41d8cd98f00b204e9800998ecf8427e') }
+  let(:darksky_api) { Darksky::API.new('this-is-your-dark-sky-api-key') }
 
   describe '#forecast' do
-    it 'should return a valid forecast for a latitude and longitude' do
-      darksky_api.stub(:forecast).and_return(JSON.parse(%q(
-      {
-        "currentSummary":"Rain",
-        "hourSummary":"Rain will stop in 25 minutes.",
-        "station":"enx",
-        
-        "precipitation":[
-            {"probability":1.0,
-            "intensity":15.6,
-            "stdev":1.0,
-            "type":"rain",
-            "time":1325607311},
-            
-            {"probability":0.84,
-            "intensity":12.0,
-            "stdev":2.34,
-            "type":"rain",
-            "time":1325607431},
-            
-            {"probability":0.8,
-            "intensity":20.5,
-            "stdev":5.1,
-            "type":"rain",
-            "time":1325607551}
-          ]
-        } 
-      )))
-      
-      forecast = darksky_api.forecast('42.7243','-73.6927')
-      forecast['currentSummary'].should == 'Rain'
-      forecast['station'].should == 'enx'
+    it 'should return a valid forecast for a latitude and longitude' do    
+      VCR.use_cassette('forecast', :record => :once) do
+        forecast = darksky_api.forecast('42.7243','-73.6927')
+        forecast['currentSummary'].should == 'clear'
+        forecast['radarStation'].should == 'enx'
+      end
     end
   end
 
   describe '#precipitation' do
     it 'should return forecasts for a collection of arbitrary points' do
-      darksky_api.stub(:precipitation).and_return(JSON.parse(%q(
-      {
-        "precipitation":[
-            {"probability":1.0,
-            "intensity":15.6,
-            "stdev":1.0,
-            "type":"rain",
-            "time":1325607100},
-            
-            {"probability":0.0,
-            "intensity":0.0,
-            "stdev":0.0,
-            "type":"rain",
-            "time":1325607791}
-        ]
-      }
-      )))
+      VCR.use_cassette('precipitation', :record => :once) do
+        precipitation = darksky_api.precipitation(['42.7','-73.6',1325607100,'42.0','-73.0',1325607791])
+        precipitation['precipitation'].size.should == 2
+        precipitation['precipitation'].first['probability'].should == 0
+        precipitation['precipitation'].first['type'].should == 'rain'
+      end
+    end
+  end
 
-      precipitation = darksky_api.precipitation(['42.7','-73.6',1325607100,'42.0','-73.0',1325607791])
-      precipitation['precipitation'].size.should == 2
-      precipitation['precipitation'].first['probability'].should == 1.0
-      precipitation['precipitation'].first['type'].should == 'rain'
+  describe '#interesting' do
+    it 'should return a list of interesting storms happening right now' do
+      VCR.use_cassette('interesting', :record => :once) do
+        interesting_storms = darksky_api.interesting
+        interesting_storms.size.should == 1
+      end
     end
   end
 end

data/spec/darksky/version_spec.rb

@@ -2,6 +2,6 @@ require 'spec_helper'
 
 describe Darksky::VERSION do
   it 'should be the correct version' do
-    Darksky::VERSION.should == '1.0.2'
+    Darksky::VERSION.should == '1.0.3'
   end
 end

data/spec/spec_helper.rb

@@ -1,7 +1,14 @@
 require 'rspec'
 require 'darksky'
+require 'vcr'
 
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
+VCR.configure do |c|
+  c.cassette_library_dir = 'spec/cassettes'
+  c.hook_into :typhoeus
+  c.allow_http_connections_when_no_cassette = false
+end
+
 RSpec.configure do |config|
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: darksky
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-12 00:00:00.000000000 Z
+date: 2012-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
-  requirement: &70155687633380 !ruby/object:Gem::Requirement
+  requirement: &70289250869220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70155687633380
+  version_requirements: *70289250869220
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70155687632960 !ruby/object:Gem::Requirement
+  requirement: &70289250868760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70155687632960
+  version_requirements: *70289250868760
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70155687632540 !ruby/object:Gem::Requirement
+  requirement: &70289250868320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70155687632540
+  version_requirements: *70289250868320
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: &70289250867900 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70289250867900
 description: Ruby gem for retrieving data from the Dark Sky API
 email:
-- me@davidczarnecki
+- me@davidczarnecki.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -62,6 +73,9 @@ files:
 - lib/darksky.rb
 - lib/darksky/api.rb
 - lib/darksky/version.rb
+- spec/cassettes/forecast.yml
+- spec/cassettes/interesting.yml
+- spec/cassettes/precipitation.yml
 - spec/darksky/api_spec.rb
 - spec/darksky/version_spec.rb
 - spec/spec_helper.rb
@@ -79,7 +93,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1879961532628065117
+      hash: -3864416475470659420
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -88,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1879961532628065117
+      hash: -3864416475470659420
 requirements: []
 rubyforge_project: darksky
 rubygems_version: 1.8.10
@@ -96,6 +110,9 @@ signing_key:
 specification_version: 3
 summary: Ruby gem for retrieving data from the Dark Sky API
 test_files:
+- spec/cassettes/forecast.yml
+- spec/cassettes/interesting.yml
+- spec/cassettes/precipitation.yml
 - spec/darksky/api_spec.rb
 - spec/darksky/version_spec.rb
 - spec/spec_helper.rb