linode 0.7.9 → 0.7.10

data/CHANGELOG

@@ -1,4 +1,9 @@
 
+0.7.10 / 2012-10-19
+===================
+  * Version bump to 0.7.10
+  * Fixed problems with by using HTTParty.parsed_response (thanks to Arthur D'Antonio III <github:arthurD> for the patch!)
+
 0.7.9 / 2012-05-01
 ==================
 

data/README.md

@@ -136,6 +136,7 @@ irb> ^D@ Wed Aug 05 01:50:52 rick@Yer-Moms-Computer
 ## CREDITS:
 
 * Thanks to Kenn Ejima ([kenn](http://github.com/kenn)) for json library improvements, OStruct cleanups, README improvements, etc.
+* Thanks to Arthur D'Antonio III ([arthurD](http://github.com/arthurD)) for a patch to fix string decoding via HTTParty.parsed_response.
 * Thanks to Aditya Sanghi ([asanghi](http://github.com/asanghi)) for a patch to properly namespace stackscripts functionality.
 * Thanks to Dan Hodos ([danhodos](http://github.com/danhodos)) for diagnosing and fixing an issue with sending GET requests instead of POST request.
 * Thanks to Aaron Hamid for updates for RSpec 2 and work on user.getapikey + username/password initialization.

data/VERSION

@@ -1 +1 @@
-0.7.9
+0.7.10

data/lib/linode.rb

@@ -90,7 +90,7 @@ class Linode
   end
 
   def post(data)
-    JSON.parse(HTTParty.post(api_url, :body => data))
+    HTTParty.post(api_url, :body => data).parsed_response
   end
 
   def error?(response)

data/linode.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = "linode"
-  s.version = "0.7.9"
+  s.name = %q{linode}
+  s.version = "0.7.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rick Bradley"]
-  s.date = "2012-05-01"
-  s.description = "This is a wrapper around Linode's automation facilities."
-  s.email = "rick@rickbradley.com"
+  s.date = %q{2012-10-19}
+  s.description = %q{This is a wrapper around Linode's automation facilities.}
+  s.email = %q{rick@rickbradley.com}
   s.extra_rdoc_files = [
     "README.md"
   ]
@@ -57,10 +57,10 @@ Gem::Specification.new do |s|
     "spec/linode_spec.rb",
     "spec/spec_helper.rb"
   ]
-  s.homepage = "http://github.com/rick/linode"
+  s.homepage = %q{http://github.com/rick/linode}
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.11"
-  s.summary = "a Ruby wrapper for the Linode API"
+  s.rubygems_version = %q{1.6.2}
+  s.summary = %q{a Ruby wrapper for the Linode API}
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/spec/linode_spec.rb

@@ -70,6 +70,8 @@ describe 'Linode' do
 
     it 'should use the user.getapikey remote call to look up the API key associated with the username/password combo specified at creation time' do
       @json = '{"ERRORARRAY":[],"DATA":{"USERNAME":"ogc","API_KEY":"blahblahblah"},"ACTION":"user.getapikey"}'
+      @json.stubs(:parsed_response).returns(JSON.parse(@json))
+
       HTTParty.expects(:post).with(@api_url,
         :body => {
           :api_action => 'user.getapikey',
@@ -136,6 +138,7 @@ describe 'Linode' do
           "ACTION":"test.echo",
           "DATA":{"FOO":"bar"}
         }!
+      @json.stubs(:parsed_response).returns(JSON.parse(@json))
       HTTParty.stubs(:post).returns(@json)
       @linode.stubs(:api_url).returns('https://fake.linode.com/')
     end
@@ -216,21 +219,27 @@ describe 'Linode' do
 
     describe 'when the result is a list of hashes' do
       it 'should return a list of objects with lower-cased methods for the data fields' do
-        HTTParty.stubs(:post).returns(%Q!{
+        @json = %Q!{
             "ERRORARRAY":[],
             "ACTION":"test.echo",
             "DATA":[{"FOO":"bar"},{"BAR":"baz"}]
-        }!)
+        }!
+        @json.stubs(:parsed_response).returns(JSON.parse(@json))
+
+        HTTParty.stubs(:post).returns(@json)
         @linode.send_request('test.echo', {}).first.foo.should == 'bar'
         @linode.send_request('test.echo', {}).last.bar.should == 'baz'
       end
 
       it 'should return a list of objects which do not respond to upper-case URLs for the data fields' do
-        HTTParty.stubs(:post).returns(%Q!{
+        @json = %Q!{
             "ERRORARRAY":[],
             "ACTION":"test.echo",
             "DATA":[{"FOO":"bar"},{"BAR":"baz"}]
-        }!)
+        }!
+        @json.stubs(:parsed_response).returns(JSON.parse(@json))
+
+        HTTParty.stubs(:post).returns(@json)
         @linode.send_request('test.echo', {}).first.should_not respond_to(:FOO)
         @linode.send_request('test.echo', {}).last.should_not respond_to(:BAR)
       end
@@ -248,17 +257,20 @@ describe 'Linode' do
 
     describe 'when the result is neither a list nor a hash' do
       it 'should return the result unchanged' do
-        HTTParty.stubs(:post).returns(%Q!{
+        @json = %Q!{
             "ERRORARRAY":[],
             "ACTION":"test.echo",
             "DATA":"thingie"
-        }!)
+        }!
+        @json.stubs(:parsed_response).returns(JSON.parse(@json))
+        HTTParty.stubs(:post).returns(@json)
         @linode.send_request('test.echo', {}).should == "thingie"
       end
     end
 
     it 'should be able to parse real JSON when processing a request' do
       json = '{"ERRORARRAY":[],"DATA":[{"REQUIRESPVOPSKERNEL":1,"DISTRIBUTIONID":90,"IS64BIT":0,"LABEL":"Arch Linux 2011.08","MINIMAGESIZE":500,"CREATE_DT":"2011-09-26 17:18:05.0"},{"REQUIRESPVOPSKERNEL":1,"DISTRIBUTIONID":91,"IS64BIT":1,"LABEL":"Arch Linux 2011.08 64bit","MINIMAGESIZE":500,"CREATE_DT":"2011-09-26 17:18:05.0"},{"REQUIRESPVOPSKERNEL":1,"DISTRIBUTIONID":88,"IS64BIT":0,"LABEL":"CentOS 6.2","MINIMAGESIZE":800,"CREATE_DT":"2011-07-19 11:38:20.0"},{"REQUIRESPVOPSKERNEL":1,"DISTRIBUTIONID":89,"IS64BIT":1,"LABEL":"CentOS 6.2 64bit","MINIMAGESIZE":800,"CREATE_DT":"2011-07-19 11:38:20.0"},{"REQUIRESPVOPSKERNEL":1,"DISTRIBUTIONID":77,"IS64BIT":0,"LABEL":"Debian 6","MINIMAGESIZE":550,"CREATE_DT":"2011-02-08 16:54:31.0"},{"REQUIRESPVOPSKERNEL":1,"DISTRIBUTIONID":78,"IS64BIT":1,"LABEL":"Debian 6 64bit","MINIMAGESIZE":550,"CREATE_DT":"2011-02-08 16:54:31.0"},{"REQUIRESPVOPSKERNEL":1,"DISTRIBUTIONID":94,"IS64BIT":0,"LABEL":"Fedora 16","MINIMAGESIZE":1000,"CREATE_DT":"2012-04-09 14:12:04.0"},{"REQUIRESPVOPSKERNEL":1,"DISTRIBUTIONID":95,"IS64BIT":1,"LABEL":"Fedora 16 64bit","MINIMAGESIZE":1000,"CREATE_DT":"2012-04-09 14:12:32.0"},{"REQUIRESPVOPSKERNEL":1,"DISTRIBUTIONID":72,"IS64BIT":0,"LABEL":"Gentoo","MINIMAGESIZE":1000,"CREATE_DT":"2010-09-13 00:00:00.0"},{"REQUIRESPVOPSKERNEL":1,"DISTRIBUTIONID":53,"IS64BIT":1,"LABEL":"Gentoo 64bit","MINIMAGESIZE":1000,"CREATE_DT":"2009-04-04 00:00:00.0"},{"REQUIRESPVOPSKERNEL":1,"DISTRIBUTIONID":96,"IS64BIT":0,"LABEL":"openSUSE 12.1","MINIMAGESIZE":1000,"CREATE_DT":"2012-04-13 11:43:30.0"},{"REQUIRESPVOPSKERNEL":1,"DISTRIBUTIONID":97,"IS64BIT":1,"LABEL":"openSUSE 12.1 64bit","MINIMAGESIZE":1000,"CREATE_DT":"2012-04-13 11:43:30.0"},{"REQUIRESPVOPSKERNEL":1,"DISTRIBUTIONID":86,"IS64BIT":0,"LABEL":"Slackware 13.37","MINIMAGESIZE":600,"CREATE_DT":"2011-06-05 15:11:59.0"},{"REQUIRESPVOPSKERNEL":1,"DISTRIBUTIONID":87,"IS64BIT":1,"LABEL":"Slackware 13.37 64bit","MINIMAGESIZE":600,"CREATE_DT":"2011-06-05 15:11:59.0"},{"REQUIRESPVOPSKERNEL":1,"DISTRIBUTIONID":64,"IS64BIT":0,"LABEL":"Ubuntu 10.04 LTS","MINIMAGESIZE":450,"CREATE_DT":"2010-04-29 00:00:00.0"},{"REQUIRESPVOPSKERNEL":1,"DISTRIBUTIONID":65,"IS64BIT":1,"LABEL":"Ubuntu 10.04 LTS 64bit","MINIMAGESIZE":450,"CREATE_DT":"2010-04-29 00:00:00.0"},{"REQUIRESPVOPSKERNEL":1,"DISTRIBUTIONID":92,"IS64BIT":0,"LABEL":"Ubuntu 11.10","MINIMAGESIZE":750,"CREATE_DT":"2011-10-14 14:29:42.0"},{"REQUIRESPVOPSKERNEL":1,"DISTRIBUTIONID":93,"IS64BIT":1,"LABEL":"Ubuntu 11.10 64bit","MINIMAGESIZE":850,"CREATE_DT":"2011-10-14 14:29:42.0"},{"REQUIRESPVOPSKERNEL":1,"DISTRIBUTIONID":59,"IS64BIT":0,"LABEL":"CentOS 5.6","MINIMAGESIZE":950,"CREATE_DT":"2009-08-17 00:00:00.0"},{"REQUIRESPVOPSKERNEL":1,"DISTRIBUTIONID":60,"IS64BIT":1,"LABEL":"CentOS 5.6 64bit","MINIMAGESIZE":950,"CREATE_DT":"2009-08-17 00:00:00.0"},{"REQUIRESPVOPSKERNEL":1,"DISTRIBUTIONID":50,"IS64BIT":0,"LABEL":"Debian 5.0","MINIMAGESIZE":350,"CREATE_DT":"2009-02-19 00:00:00.0"},{"REQUIRESPVOPSKERNEL":1,"DISTRIBUTIONID":51,"IS64BIT":1,"LABEL":"Debian 5.0 64bit","MINIMAGESIZE":350,"CREATE_DT":"2009-02-19 00:00:00.0"},{"REQUIRESPVOPSKERNEL":1,"DISTRIBUTIONID":84,"IS64BIT":0,"LABEL":"Fedora 15","MINIMAGESIZE":900,"CREATE_DT":"2011-05-25 18:57:36.0"},{"REQUIRESPVOPSKERNEL":1,"DISTRIBUTIONID":85,"IS64BIT":1,"LABEL":"Fedora 15 64bit","MINIMAGESIZE":900,"CREATE_DT":"2011-05-25 18:58:07.0"},{"REQUIRESPVOPSKERNEL":1,"DISTRIBUTIONID":79,"IS64BIT":0,"LABEL":"openSUSE 11.4","MINIMAGESIZE":650,"CREATE_DT":"2011-03-10 11:36:46.0"},{"REQUIRESPVOPSKERNEL":1,"DISTRIBUTIONID":80,"IS64BIT":1,"LABEL":"openSUSE 11.4 64bit","MINIMAGESIZE":650,"CREATE_DT":"2011-03-10 11:36:46.0"},{"REQUIRESPVOPSKERNEL":1,"DISTRIBUTIONID":68,"IS64BIT":0,"LABEL":"Slackware 13.1","MINIMAGESIZE":512,"CREATE_DT":"2010-05-10 00:00:00.0"},{"REQUIRESPVOPSKERNEL":1,"DISTRIBUTIONID":69,"IS64BIT":1,"LABEL":"Slackware 13.1 64bit","MINIMAGESIZE":512,"CREATE_DT":"2010-05-10 00:00:00.0"},{"REQUIRESPVOPSKERNEL":1,"DISTRIBUTIONID":73,"IS64BIT":0,"LABEL":"Ubuntu 10.10","MINIMAGESIZE":500,"CREATE_DT":"2010-10-11 15:19:00.0"},{"REQUIRESPVOPSKERNEL":1,"DISTRIBUTIONID":74,"IS64BIT":1,"LABEL":"Ubuntu 10.10 64bit","MINIMAGESIZE":500,"CREATE_DT":"2010-10-11 15:19:00.0"},{"REQUIRESPVOPSKERNEL":1,"DISTRIBUTIONID":82,"IS64BIT":0,"LABEL":"Ubuntu 11.04","MINIMAGESIZE":500,"CREATE_DT":"2011-04-28 16:28:48.0"},{"REQUIRESPVOPSKERNEL":1,"DISTRIBUTIONID":83,"IS64BIT":1,"LABEL":"Ubuntu 11.04 64bit","MINIMAGESIZE":500,"CREATE_DT":"2011-04-28 16:28:48.0"},{"REQUIRESPVOPSKERNEL":1,"DISTRIBUTIONID":41,"IS64BIT":0,"LABEL":"Ubuntu 8.04 LTS","MINIMAGESIZE":350,"CREATE_DT":"2008-04-23 15:11:29.0"},{"REQUIRESPVOPSKERNEL":1,"DISTRIBUTIONID":42,"IS64BIT":1,"LABEL":"Ubuntu 8.04 LTS 64bit","MINIMAGESIZE":350,"CREATE_DT":"2008-06-03 12:51:11.0"}],"ACTION":"avail.distributions"}'
+      json.stubs(:parsed_response).returns(JSON.parse(json))
       HTTParty.stubs(:post).returns(json)
       @linode.stubs(:api_url).returns('https://fake.linode.com/')
 

data/spec/spec_helper.rb

@@ -15,6 +15,8 @@ rescue LoadError
   require 'mocha'
 end
 
+require 'httparty'
+
 RSpec.configure do |config|
   config.mock_with :mocha
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: linode
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 7
-  - 9
-  version: 0.7.9
+  - 10
+  version: 0.7.10
 platform: ruby
 authors: 
 - Rick Bradley
@@ -15,9 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-01 00:00:00 Z
+date: 2012-10-19 00:00:00 -05:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -27,11 +30,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id001
   name: httparty
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency 
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -41,11 +44,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id002
   name: json
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency 
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -57,11 +60,11 @@ dependencies:
         - 4
         - 4
         version: 0.4.4
-  version_requirements: *id003
   name: httparty
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency 
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -73,10 +76,8 @@ dependencies:
         - 3
         - 1
         version: 0.3.1
-  version_requirements: *id004
   name: crack
-  prerelease: false
-  type: :runtime
+  version_requirements: *id004
 description: This is a wrapper around Linode's automation facilities.
 email: rick@rickbradley.com
 executables: []
@@ -126,6 +127,7 @@ files:
 - spec/linode/user_spec.rb
 - spec/linode_spec.rb
 - spec/spec_helper.rb
+has_rdoc: true
 homepage: http://github.com/rick/linode
 licenses: []
 
@@ -155,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: a Ruby wrapper for the Linode API