wunderground_ruby 0.1.0 → 0.2.0

data/README.markdown

@@ -40,7 +40,7 @@ Standard request breakdown:
 	
 ##Optional Hash
 
-This ugly little guy handles the nonconformists in Wunderground's API request structure. Luckily there are only two of these baddies. (details below)
+This ugly little guy handles the nonconformists in Wunderground's API request structure. Luckily there are only two of these baddies, and only if you need them. (details below)
 
 	optional_hash = {lang: "FR", geo_ip:"127.0.0.1"}
 	
@@ -70,7 +70,7 @@ Any location string that Wunderground accepts will pass straight through this wr
 	
 	w_api.get_conditions_for("autoip") #passes straight through, but only gets the weather for your server's IP, so not very useful probably
 	
-For geocoding a specific ip address, just provide in a an IP like this:
+For geocoding a specific ip address as the location, just provide an IP like this:
 	
 	w_api.get_alerts_for({geo_ip: "127.0.0.1"})
 	
@@ -90,20 +90,24 @@ Also, you can set the default language in the constructor or with a setter.
 	w_api.get_forecast_for("France","Paris") #automatically includes /lang:FR/ in the request url, so results will be in French
 	w_api.get_forecast_for({lang:"DE"},"France","Paris") #this will override the French(FR) default with German(DE)
 	
-##History Support
+##History and Planner Helpers
 
 While it is possible to call
 
 	w_api.get_history20101231_for("77789")
+	w_api.get_planner03150323_for("FL","Destin")
 
-to get the history data for this date/location. You may enjoy more flexibility when using get_history_for:
+to get the history/planner data for this date/location. You may enjoy more flexibility when using get_history_for and get_planner_for:
 
 	w_api.get_history_for("20101010","AL","Birmingham")
 	w_api.get_history_for(1.year.ago,"33909")
 	w_api.get_history_for(Date.now, {lang: "FR"}, "France/Paris")
 	w_api.get_history_for(Date.now, {lang: "DE", geo_ip:"123.4.5.6"})
+	w_api.get_planner_for("03150323","AL","Gulf Shores")
+	w_api.get_planner_for(Time.now,Time.now+7.days,{geo_ip: "10.0.0.1"})
+	w_api.get_planner_for(Time.now,Time.now+7.days,"33030")
 
-.get_history_for accepts a string or any Date/Time/DateTime object that responds to .strftime("%Y%m%d") to auto-format the date.
+.get_history_for and .get_planner_for accepts a string or any Date/Time/DateTime-like object that responds to .strftime("%Y%m%d") to auto-format the date.
 
 
 ### Other Stuff
@@ -127,7 +131,7 @@ Do eet.
 
 ##Thanks
 
-* [Amro Mousa](https://github.com/amro) - design inspiration (*cough* stolen)
+* [Amro Mousa](https://github.com/amro) - design inspiration
 
 
 ##Copyrights

data/Rakefile

@@ -19,14 +19,6 @@ Jeweler::Tasks.new do |gem|
   gem.description = %Q{A simple ruby API wrapper for interacting with the Wunderground API}
   gem.email = "winfred.nadeau@gmail.com"
   gem.authors = ["Winfred Nadeau"]
-  # Include your dependencies below. Runtime dependencies are required when using your gem,
-  # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
-  gem.add_runtime_dependency 'httparty', '> 0.6.0'
-  gem.add_runtime_dependency 'json', '> 1.4.0'
-  gem.add_development_dependency 'shoulda', '> 0.0.0'
-  gem.add_development_dependency 'mocha', '> 0.9.11'
-  gem.add_development_dependency 'simplecov', '> 0'
-  #gem.add_development_dependency 'rspec', '> 1.2.3'
 end
 Jeweler::RubygemsDotOrgTasks.new
 
@@ -50,5 +42,5 @@ Rake::RDocTask.new do |rdoc|
 end
 desc "Open an irb session preloaded with this library"
 task :console do
-  sh "irb -rubygems -I lib -r wunderground_pound"
+  exec "irb -rubygems -I lib -r wunderground"
 end

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/wunderground.rb

@@ -25,7 +25,13 @@ class Wunderground
   end
   def get_history_for(date,*args)
     history = (date.class == String ? "history_#{date}" : "history_#{date.strftime("%Y%m%d")}")
-    send("get_#{history}_for",args)
+    send("get_#{history}_for",*args)
+  end
+  def get_planner_for(date,*args)
+    send("get_planner_#{date}_for",args) and return if date.class == String
+    range = date.strftime("%m%d") << args[0].strftime("%m%d")    
+    args.delete_at(0)
+    send("get_planner_#{range}_for",*args)
   end
 
 protected
@@ -49,8 +55,8 @@ protected
   def method_missing(method, *args)
     raise NoMethodError, "undefined method: #{method} for Wunderground" unless method.to_s.start_with?("get_") and method.to_s.end_with?("_for") 
     url = method.to_s.gsub("get_","").gsub("_for","").gsub("_and_","/")
-    url << "/lang:#{@language}" if @language 
-    if Hash.try_convert(args[0]) 
+    url << "/lang:#{@language}" if @language
+    if args[0].class == Hash
       url = url.sub(/\/lang:.*/,'') and url << "/lang:#{args[0][:lang]}" if args[0][:lang] 
       ip_address = args[0][:geo_ip] and args.push("autoip") if args[0][:geo_ip]
       args.delete_at(0) 

data/test/test_wunderground.rb

@@ -99,7 +99,7 @@ class TestWunderground < Test::Unit::TestCase
         @wunderground.get_forecast_for({geo_ip: "127.0.0.1"})
       end
     end
-    context 'default language' do
+    context 'language support' do
       setup {@wunderground.language = "FR"}
       should 'automatically set language for all location types' do
         expect_get(@url+"123/forecast/lang:FR/q/pws:KCATAHOE2.json",{timeout: 30})
@@ -109,8 +109,21 @@ class TestWunderground < Test::Unit::TestCase
         expect_get(@url+"123/forecast/lang:DE/q/ME/Portland.json",{timeout: 30})
         @wunderground.get_forecast_for({lang: "DE"},"ME","Portland")
       end
+      should 'pass language through history helper' do
+        expect_get(@url+"123/history_#{Time.now.strftime("%Y%m%d")}/lang:DE/q/ME/Portland.json",{timeout: 30})
+        @wunderground.get_history_for(Time.now,{lang: "DE"},"ME","Portland")
+      end
+      should 'pass language through planner helper' do
+        expect_get(@url+"123/planner_#{Time.now.strftime("%m%d")}#{(Time.now + 700000).strftime('%m%d')}/lang:DE/q/ME/Portland.json",{timeout: 30})
+        @wunderground.get_planner_for(Time.now,(Time.now+700000),{lang: "DE"},"ME","Portland")
+      end
+      should 'pass language through planner helper with IP' do
+        expect_get(@url+"123/planner_#{Time.now.strftime('%m%d')}#{(Time.now +  
+              700000).strftime('%m%d')}/lang:DE/q/autoip.json?geo_ip=127.0.0.1",{timeout: 30})
+        @wunderground.get_planner_for(Time.now,(Time.now+700000),{lang: "DE",geo_ip: "127.0.0.1"})
+      end
     end
-    context 'for optional get_history_for(date,location)' do
+    context 'for get_history_for(date,location) helper' do
       should 'pass string dates straight to URL' do
         expect_get(@url+"123/history_20110121/q/ME/Portland.json",{timeout: 30})
         @wunderground.get_history_for("20110121","ME","Portland")
@@ -123,9 +136,19 @@ class TestWunderground < Test::Unit::TestCase
         expect_get(@url+"123/history_#{Time.now.strftime("%Y%m%d")}/q/ME/Portland.json",{timeout: 30})
         @wunderground.get_history_for(Time.now.to_date,"ME","Portland")
       end
-      should 'accept DateTime objects' do
-        expect_get(@url+"123/history_#{Time.now.strftime("%Y%m%d")}/q/ME/Portland.json",{timeout: 30})
-        @wunderground.get_history_for(Time.now.to_datetime,"ME","Portland")
+      should 'accept Date object and pass optional hash object' do
+        expect_get(@url+"123/history_#{Time.now.strftime("%Y%m%d")}/q/autoip.json?geo_ip=127.0.0.1",{timeout: 30})
+        @wunderground.get_history_for(Time.now.to_datetime,{geo_ip: '127.0.0.1'})
+      end
+    end
+    context 'for get_planner_for helper' do
+      should 'pass string date ranges through' do
+        expect_get(@url+"123/planner_03130323/q/ME/Portland.json",{timeout: 30})
+        @wunderground.get_planner_for("03130323","ME","Portland")
+      end
+      should 'turn two date objects into a properly formatted string' do
+        expect_get(@url+"123/planner_#{Time.now.strftime('%m%d')}#{(Time.now + 700000).strftime('%m%d')}/q/autoip.json?geo_ip=127.0.0.1",{timeout: 30})
+        @wunderground.get_planner_for(Time.now,(Time.now + 700000),{geo_ip: '127.0.0.1'})
       end
     end
   end

data/wunderground_ruby.gemspec

@@ -0,0 +1,79 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "wunderground_ruby"
+  s.version = "0.2.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Winfred Nadeau"]
+  s.date = "2012-01-22"
+  s.description = "A simple ruby API wrapper for interacting with the Wunderground API"
+  s.email = "winfred.nadeau@gmail.com"
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.markdown"
+  ]
+  s.files = [
+    "Gemfile",
+    "LICENSE.txt",
+    "README.markdown",
+    "Rakefile",
+    "VERSION",
+    "lib/wunderground.rb",
+    "test/helper.rb",
+    "test/test_wunderground.rb",
+    "wunderground_ruby.gemspec"
+  ]
+  s.homepage = "http://github.com/wnadeau/wunderground_ruby"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.10"
+  s.summary = "A simple ruby API wrapper for interacting with the Wunderground API"
+  s.test_files = [
+    "test/helper.rb",
+    "test/test_wunderground.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<json>, ["> 1.4.0"])
+      s.add_runtime_dependency(%q<httparty>, ["> 0.6.0"])
+      s.add_runtime_dependency(%q<addressable>, [">= 0"])
+      s.add_development_dependency(%q<shoulda>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.5.1"])
+      s.add_development_dependency(%q<simplecov>, [">= 0"])
+      s.add_development_dependency(%q<mocha>, ["> 0.9.11"])
+      s.add_development_dependency(%q<ruby-debug19>, [">= 0"])
+      s.add_development_dependency(%q<ruby-debug>, [">= 0"])
+    else
+      s.add_dependency(%q<json>, ["> 1.4.0"])
+      s.add_dependency(%q<httparty>, ["> 0.6.0"])
+      s.add_dependency(%q<addressable>, [">= 0"])
+      s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
+      s.add_dependency(%q<simplecov>, [">= 0"])
+      s.add_dependency(%q<mocha>, ["> 0.9.11"])
+      s.add_dependency(%q<ruby-debug19>, [">= 0"])
+      s.add_dependency(%q<ruby-debug>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<json>, ["> 1.4.0"])
+    s.add_dependency(%q<httparty>, ["> 0.6.0"])
+    s.add_dependency(%q<addressable>, [">= 0"])
+    s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
+    s.add_dependency(%q<simplecov>, [">= 0"])
+    s.add_dependency(%q<mocha>, ["> 0.9.11"])
+    s.add_dependency(%q<ruby-debug19>, [">= 0"])
+    s.add_dependency(%q<ruby-debug>, [">= 0"])
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wunderground_ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-21 00:00:00.000000000Z
+date: 2012-01-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70152356297300 !ruby/object:Gem::Requirement
+  requirement: &70237028968260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -21,10 +21,10 @@ dependencies:
         version: 1.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70152356297300
+  version_requirements: *70237028968260
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &70152356296360 !ruby/object:Gem::Requirement
+  requirement: &70237028967400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -32,10 +32,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70152356296360
+  version_requirements: *70237028967400
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &70152356295400 !ruby/object:Gem::Requirement
+  requirement: &70237028966500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70152356295400
+  version_requirements: *70237028966500
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70152356294520 !ruby/object:Gem::Requirement
+  requirement: &70237028965620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70152356294520
+  version_requirements: *70237028965620
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70152356272440 !ruby/object:Gem::Requirement
+  requirement: &70237028964540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70152356272440
+  version_requirements: *70237028964540
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70152356271540 !ruby/object:Gem::Requirement
+  requirement: &70237028963480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.5.1
   type: :development
   prerelease: false
-  version_requirements: *70152356271540
+  version_requirements: *70237028963480
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70152356270760 !ruby/object:Gem::Requirement
+  requirement: &70237028960840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70152356270760
+  version_requirements: *70237028960840
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70152356269880 !ruby/object:Gem::Requirement
+  requirement: &70237028960200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -98,10 +98,10 @@ dependencies:
         version: 0.9.11
   type: :development
   prerelease: false
-  version_requirements: *70152356269880
+  version_requirements: *70237028960200
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70152356268860 !ruby/object:Gem::Requirement
+  requirement: &70237028959400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70152356268860
+  version_requirements: *70237028959400
 - !ruby/object:Gem::Dependency
   name: ruby-debug
-  requirement: &70152356267820 !ruby/object:Gem::Requirement
+  requirement: &70237028958340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,62 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70152356267820
-- !ruby/object:Gem::Dependency
-  name: httparty
-  requirement: &70152356267000 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>'
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *70152356267000
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: &70152356265660 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>'
-      - !ruby/object:Gem::Version
-        version: 1.4.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *70152356265660
-- !ruby/object:Gem::Dependency
-  name: shoulda
-  requirement: &70152356249020 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>'
-      - !ruby/object:Gem::Version
-        version: 0.0.0
-  type: :development
-  prerelease: false
-  version_requirements: *70152356249020
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: &70152356247860 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>'
-      - !ruby/object:Gem::Version
-        version: 0.9.11
-  type: :development
-  prerelease: false
-  version_requirements: *70152356247860
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: &70152356246360 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>'
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70152356246360
+  version_requirements: *70237028958340
 description: A simple ruby API wrapper for interacting with the Wunderground API
 email: winfred.nadeau@gmail.com
 executables: []
@@ -192,6 +137,7 @@ files:
 - lib/wunderground.rb
 - test/helper.rb
 - test/test_wunderground.rb
+- wunderground_ruby.gemspec
 homepage: http://github.com/wnadeau/wunderground_ruby
 licenses:
 - MIT
@@ -207,7 +153,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 431265459336154521
+      hash: -306578686232459491
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: