alexvollmer-httparty 0.2.6 → 0.3.1

data/History

@@ -1,3 +1,37 @@
+== 0.3.1 2009-02-10
+* 1 minor fix, 1 minor enhancement
+  * Fixed unescaping umlauts (siebertm)
+  * Added yaml response parsing (Miha Filej)
+  
+== 0.3.0 2009-01-31
+* 1 major enhancement, 1 bug fix
+  * JSON gem no longer a requirement. It was conflicting with rails json stuff so I just stole ActiveSupport's json decoding and bundled it with HTTParty.
+  * Fixed bug where query strings were being duplicated on redirects
+  * Added a bunch of specs and moved some code around.
+  
+== 0.2.10 2009-01-29
+* 1 minor enhancement
+  * Made encoding on query parameters treat everything except URI::PATTERN::UNRESERVED as UNSAFE to force encoding of '+' character (Julian Russell)
+  
+== 0.2.9 2009-01-29
+* 3 minor enhancements
+  * Added a 'headers' accessor to the response with a hash of any HTTP headers. (Don Peterson)
+  * Add support for a ":cookies" option to be used at the class level, or as an option on any individual call.  It should be passed a hash, which will be converted to the proper format and added to the request headers when the call is made. (Don Peterson)
+  * Refactored several specs and added a full suite of cucumber features (Don Peterson)
+  
+== 0.2.8 2009-01-28
+* 1 major fix
+  * fixed major bug with response where it wouldn't iterate or really work at all with parsed responses
+  
+== 0.2.7 2009-01-28
+* 2 minor fixes, 2 minor enhancements, 2 major enhancements
+  * fixed undefined method add_node for nil class error that occasionally happened (juliocesar)
+  * Handle nil or unexpected values better when typecasting. (Brian Landau)
+  * More robust handling of mime types (Alex Vollmer)
+  * Fixed support for specifying headers and added support for basic auth to CLI. (Alex Vollmer)
+  * Added first class response object that includes original body and status code (Alex Vollmer)
+  * Now parsing all response types as some non-200 responses provide important information, this means no more exception raising (Alex Vollmer)
+
 == 0.2.6 2009-01-05
 * 1 minor bug fix
   * added explicit require of time as Time#parse failed outside of rails (willcodeforfoo)

data/Manifest

@@ -1,4 +1,5 @@
 bin/httparty
+cucumber.yml
 examples/aaws.rb
 examples/basic.rb
 examples/delicious.rb
@@ -6,27 +7,49 @@ examples/google.rb
 examples/rubyurl.rb
 examples/twitter.rb
 examples/whoismyrep.rb
+features/basic_authentication.feature
+features/command_line.feature
+features/deals_with_http_error_codes.feature
+features/handles_multiple_formats.feature
+features/steps/env.rb
+features/steps/httparty_response_steps.rb
+features/steps/httparty_steps.rb
+features/steps/mongrel_helper.rb
+features/steps/remote_service_steps.rb
+features/supports_redirection.feature
 History
 httparty.gemspec
 lib/core_extensions.rb
+lib/httparty/cookie_hash.rb
 lib/httparty/exceptions.rb
+lib/httparty/module_inheritable_attributes.rb
+lib/httparty/parsers/json.rb
+lib/httparty/parsers/xml.rb
+lib/httparty/parsers.rb
 lib/httparty/request.rb
+lib/httparty/response.rb
 lib/httparty/version.rb
 lib/httparty.rb
-lib/module_level_inheritable_attributes.rb
 Manifest
 MIT-LICENSE
 Rakefile
 README
 setup.rb
-spec/as_buggery_spec.rb
 spec/fixtures/delicious.xml
+spec/fixtures/empty.xml
 spec/fixtures/google.html
 spec/fixtures/twitter.json
 spec/fixtures/twitter.xml
+spec/fixtures/undefined_method_add_node_for_nil.xml
+spec/hash_spec.rb
+spec/httparty/cookie_hash_spec.rb
+spec/httparty/parsers/json_spec.rb
+spec/httparty/parsers/xml_spec.rb
 spec/httparty/request_spec.rb
+spec/httparty/response_spec.rb
 spec/httparty_spec.rb
 spec/spec.opts
 spec/spec_helper.rb
+spec/string_spec.rb
 website/css/common.css
 website/index.html

data/README

@@ -25,11 +25,11 @@ grokking the structure of output). This can also be overridden to output
 formatted XML or JSON. Execute <tt>httparty --help</tt> for all the
 options. Below is an example of how easy it is.
 
-  httparty "http://twitter.com/statuses/public_timeline.json" -f json
+  httparty "http://twitter.com/statuses/public_timeline.json"
 
 == REQUIREMENTS:
 
-* JSON ~> 1.1
+* You like to party!
 
 == INSTALL:
 

data/Rakefile

@@ -6,6 +6,7 @@ require 'rake'
 require 'echoe'
 require 'spec/rake/spectask'
 require "lib/#{ProjectName}/version"
+require 'cucumber/rake/task'
 
 Echoe.new(ProjectName, HTTParty::Version) do |p|
   p.description     = "Makes http fun! Also, makes consuming restful web services dead easy."
@@ -13,7 +14,6 @@ Echoe.new(ProjectName, HTTParty::Version) do |p|
   p.url             = "http://#{ProjectName}.rubyforge.org"
   p.author          = "John Nunemaker"
   p.email           = "nunemaker@gmail.com"
-  p.extra_deps      = [['json', '~> 1.1']]
   p.need_tar_gz     = false
   p.docs_host       = WebsitePath
 end
@@ -40,4 +40,8 @@ Rake::Task[:default].prerequisites.clear
 task :default => :spec
 Spec::Rake::SpecTask.new do |t|
   t.spec_files = FileList["spec/**/*_spec.rb"]
-end
+end
+
+Cucumber::Rake::Task.new(:features) do |t|
+  t.cucumber_opts = "--format pretty" 
+end

data/bin/httparty

@@ -2,7 +2,6 @@
 
 require "optparse"
 require "pp"
-require "rexml/document"
 
 $:.unshift(File.join(File.dirname(__FILE__), "/../lib"))
 require "httparty"
@@ -10,26 +9,30 @@ require "httparty"
 opts = {
   :action => :get,
   :headers => {},
-  :keep_body => true,
-  :verbose => false,
-  :pretty_print => false
+  :verbose => false
 }
 
+def die(msg)
+  STDERR.puts(msg)
+  exit 1
+end
+
 OptionParser.new do |o|
   o.banner = "USAGE: #{$0} [options] [url]"
+  
   o.on("-f",
        "--format [FORMAT]",
-       "Body format: plain, json or xml") do |f|
-    opts[:format] = f.downcase.to_sym
-  end
-  o.on("-r", "--ruby", "Dump output in Ruby pretty-print format") do |r|
-    opts[:pretty_print] = true
+       "Output format to use instead of pretty-print ruby: " +
+       "plain, json or xml") do |f|
+    opts[:output_format] = f.downcase.to_sym
   end
+  
   o.on("-a",
        "--action [ACTION]",
        "HTTP action: get (default), post, put or delete") do |a|
     opts[:action] = a.downcase.to_sym
   end
+  
   o.on("-d",
        "--data [BODY]",
        "Data to put in request body (prefix with '@' for file)") do |d|
@@ -39,13 +42,23 @@ OptionParser.new do |o|
       opts[:data] = d
     end
   end
+  
   o.on("-H", "--header [NAME=VALUE]", "Additional HTTP headers in NAME=VALUE form") do |h|
-    name, value = h.split('=')
-    opts[:headers][name] = value
+    die "Invalid header specification, should be Name:Value" unless h =~ /.+:.+/
+    name, value = h.split(':')
+    opts[:headers][name.strip] = value.strip
   end
+  
   o.on("-v", "--verbose", "If set, print verbose output") do |v|
     opts[:verbose] = true
   end
+  
+  o.on("-u", "--user [CREDS]", "Use basic authentication. Value should be user:password") do |u|
+    die "Invalid credentials format. Must be user:password" unless u =~ /.+:.+/
+    user, password = u.split(':')
+    opts[:basic_auth] = { :username => user, :password => password }
+  end
+  
   o.on("-h", "--help", "Show help documentation") do |h|
     puts o
     exit
@@ -59,45 +72,27 @@ if ARGV.empty?
   STDERR.puts "USAGE: #{$0} [options] [url]"
 end
 
-# 1.8.6 has mistyping of transitive in if statement
-module REXML
-  class Document < Element
-    def write( output=$stdout, indent=-1, transitive=false, ie_hack=false )
-      if xml_decl.encoding != "UTF-8" && !output.kind_of?(Output)
-        output = Output.new( output, xml_decl.encoding )
-      end
-      formatter = if indent > -1
-          if transitive
-            REXML::Formatters::Transitive.new( indent, ie_hack )
-          else
-            REXML::Formatters::Pretty.new( indent, ie_hack )
-          end
-        else
-          REXML::Formatters::Default.new( ie_hack )
-        end
-      formatter.write( self, output )
-    end
-  end
-end
-
-if opts[:pretty_print] || opts[:format].nil?
-  pp HTTParty.send(opts[:action], ARGV.first, opts)
+if opts[:output_format].nil?
+  response = HTTParty.send(opts[:action], ARGV.first, opts)
+  puts "Status: #{response.code}"
+  pp response
 else
-  print_format = opts[:format]
-  opts.merge!(:format => :plain) if opts[:format]
+  print_format = opts[:output_format]
   response = HTTParty.send(opts[:action], ARGV.first, opts)
-
-  if print_format.nil?
-    pp response
-  else
-    case print_format
+  puts "Status: #{response.code}"
+  case opts[:output_format]
     when :json
-      puts JSON.pretty_generate(response.original_body)
+      begin
+        require 'rubygems'
+        require 'json'
+        puts JSON.pretty_generate(response.delegate)
+      rescue LoadError
+        puts YAML.dump(response.delegate)
+      end
     when :xml
-      REXML::Document.new(response.original_body).write(STDOUT, 2)
+      REXML::Document.new(response.body).write(STDOUT, 2)
       puts
     else
       puts response
-    end
   end
 end

data/cucumber.yml

@@ -0,0 +1 @@
+default: features

data/examples/basic.rb

@@ -3,4 +3,9 @@ require File.join(dir, 'httparty')
 require 'pp'
 
 # You can also use post, put, delete in the same fashion
-pp HTTParty.get('http://twitter.com/statuses/public_timeline.json')
+response = HTTParty.get('http://twitter.com/statuses/public_timeline.json')
+puts response.body, response.code, response.headers.inspect
+
+response.each do |item|
+  puts item['user']['screen_name']
+end

data/examples/delicious.rb

@@ -34,3 +34,4 @@ delicious = Delicious.new(config['username'], config['password'])
 pp delicious.posts(:query => {:tag => 'ruby'})
 pp delicious.recent
 
+delicious.recent['posts']['post'].each { |post| puts post['href'] }

data/examples/rubyurl.rb

@@ -11,4 +11,4 @@ class Rubyurl
   end
 end
 
-pp Rubyurl.shorten( 'http://istwitterdown.com/' )
+pp Rubyurl.shorten( 'http://istwitterdown.com/')

data/features/basic_authentication.feature

@@ -0,0 +1,20 @@
+Feature:  Basic Authentication
+
+  As a developer
+  I want to be able to use a service that requires Basic Authentication
+  Because that is not an uncommon requirement
+
+  Scenario: Passing no credentials to a page requiring Basic Authentication
+    Given a restricted page at '/protected.html'
+    When I call HTTParty#get with '/protected.html'
+    Then it should return a response with a 401 response code
+
+  Scenario: Passing proper credentials to a page requiring Basic Authentication
+    Given a remote service that returns 'Authenticated Page'
+    And that service is accessed at the path '/protected.html'
+    And that service is protected by Basic Authentication
+    And that service requires the username 'jcash' with the password 'maninblack'
+    When I call HTTParty#get with '/protected.html' and a basic_auth hash:
+       | username | password   |
+       | jcash    | maninblack |
+    Then the return value should match 'Authenticated Page'

data/features/command_line.feature

@@ -0,0 +1,7 @@
+Feature: Command Line
+
+  As a developer
+  I want to be able to harness the power of HTTParty from the command line
+  Because that would make quick testing and debugging easy
+  And 'easy' is my middle name
+  And I'm kidding it's actually 'Danger'!

data/features/deals_with_http_error_codes.feature

@@ -0,0 +1,26 @@
+Feature: Deals with HTTP error codes
+
+  As a developer
+  I want to be informed of non-successful responses
+  Because sometimes thing explode
+  And I should probably know what happened
+
+  Scenario: A response of '404 - Not Found'
+    Given a remote service that returns a 404 status code
+    And that service is accessed at the path '/service.html'
+    When I call HTTParty#get with '/service.html'
+    Then it should return a response with a 404 response code
+
+  Scenario: A response of '500 - Internal Server Error'
+    Given a remote service that returns a 500 status code
+    And that service is accessed at the path '/service.html'
+    When I call HTTParty#get with '/service.html'
+    Then it should return a response with a 500 response code
+
+  Scenario: A non-successful response where I need the body
+    Given a remote service that returns a 400 status code
+    And the response from the service has a body of 'Bad response'
+    And that service is accessed at the path '/service.html'
+    When I call HTTParty#get with '/service.html'
+    Then it should return a response with a 400 response code
+    And the return value should match 'Bad response'

data/features/handles_multiple_formats.feature

@@ -0,0 +1,34 @@
+Feature: Handles Multiple Formats
+
+  As a developer
+  I want to be able to consume remote services of many different formats
+  And I want those formats to be automatically detected and handled
+  Because web services take many forms
+  And I don't want to have to do any extra work
+
+  Scenario: An HTML service
+    Given a remote service that returns '<h1>Some HTML</h1>'
+    And that service is accessed at the path '/service.html'
+    And the response from the service has a Content-Type of 'text/html'
+    When I call HTTParty#get with '/service.html'
+    Then it should return a String
+    And the return value should match '<h1>Some HTML</h1>'
+
+  Scenario: A JSON service
+    Given a remote service that returns '{ "jennings": "waylon", "cash": "johnny" }'
+    And that service is accessed at the path '/service.json'
+    And the response from the service has a Content-Type of 'application/json'
+    When I call HTTParty#get with '/service.json'
+    Then it should return a Hash equaling:
+       | key      | value  |
+       | jennings | waylon |
+       | cash     | johnny |
+
+  Scenario: An XML Service
+    Given a remote service that returns '<singer>waylon jennings</singer>'
+    And that service is accessed at the path '/service.xml'
+    And the response from the service has a Content-Type of 'text/xml'
+    When I call HTTParty#get with '/service.xml'
+    Then it should return a Hash equaling:
+       | key    | value           |
+       | singer | waylon jennings |

data/features/steps/env.rb

@@ -0,0 +1,15 @@
+require 'mongrel'
+require 'activesupport'
+require 'lib/httparty'
+require 'spec/expectations'
+
+Before do
+  port = ENV["HTTPARTY_PORT"] || 31981
+  @host_and_port = "0.0.0.0:#{port}"
+  @server = Mongrel::HttpServer.new("0.0.0.0", port)
+  @server.run
+end
+
+After do
+  @server.stop
+end

data/features/steps/httparty_response_steps.rb

@@ -0,0 +1,26 @@
+Then /it should return an? (\w+)$/ do |class_string|
+  @response_from_httparty.should be_an_instance_of(class_string.constantize)
+end
+
+Then /the return value should match '(.*)'/ do |expected_text|
+  @response_from_httparty.should eql(expected_text)
+end
+
+Then /it should return a Hash equaling:/ do |hash_table|
+  @response_from_httparty.should be_an_instance_of(Hash)
+  @response_from_httparty.keys.length.should eql(hash_table.rows.length)
+  hash_table.hashes.each do |pair|
+    key, value = pair["key"], pair["value"]
+    @response_from_httparty.keys.should include(key)
+    @response_from_httparty[key].should eql(value)
+  end
+end
+
+Then /it should return a response with a (\d+) response code/ do |code|
+  @response_from_httparty.code.should eql(code)
+end
+
+Then /it should raise an HTTParty::RedirectionTooDeep exception/ do
+  @exception_from_httparty.should_not be_nil
+  @exception_from_httparty.class.should eql(HTTParty::RedirectionTooDeep)
+end

data/features/steps/httparty_steps.rb

@@ -0,0 +1,15 @@
+When /I call HTTParty#get with '(.*)'$/ do |url|
+  begin
+    @response_from_httparty = HTTParty.get("http://#{@host_and_port}#{url}")
+  rescue HTTParty::RedirectionTooDeep => e
+    @exception_from_httparty = e
+  end
+end
+
+When /I call HTTParty#get with '(.*)' and a basic_auth hash:/ do |url, auth_table|
+  h = auth_table.hashes.first
+  @response_from_httparty = HTTParty.get(
+    "http://#{@host_and_port}#{url}",
+    :basic_auth => { :username => h["username"], :password => h["password"] }
+  )
+end

data/features/steps/mongrel_helper.rb

@@ -0,0 +1,55 @@
+def basic_mongrel_handler
+  Class.new(Mongrel::HttpHandler) do
+    attr_writer :content_type, :response_body, :response_code
+
+    def initialize
+      @content_type = "text/html"
+      @response_body = ""
+      @response_code = 200
+      @custom_headers = {}
+    end
+
+    def process(request, response)
+      reply_with(response, @response_code, @response_body)
+    end
+
+    def reply_with(response, code, response_body)
+      response.start(code) do |head, body|
+        head["Content-Type"] = @content_type
+        @custom_headers.each { |k,v| head[k] = v }
+        body.write(response_body)
+      end
+    end
+  end
+end
+
+def new_mongrel_handler
+  basic_mongrel_handler.new
+end
+
+def add_basic_authentication_to(handler)
+  m = Module.new do
+    attr_writer :username, :password
+
+    def self.extended(base)
+      base.instance_eval { @custom_headers["WWW-Authenticate"] = 'Basic Realm="Super Secret Page"' }
+      base.class_eval { alias_method_chain :process, :basic_authentication }
+    end
+
+    def process_with_basic_authentication(request, response)
+      if authorized?(request) then process_without_basic_authentication(request, response)
+      else reply_with(response, 401, "Incorrect.  You have 20 seconds to comply.")
+      end
+    end
+
+    def authorized?(request)
+      request.params["HTTP_AUTHORIZATION"] == "Basic " + Base64.encode64("#{@username}:#{@password}").strip
+    end
+  end
+  handler.extend(m)
+end
+
+def new_mongrel_redirector(target_url, relative_path = false)
+  target_url = "http://#{@host_and_port}#{target_url}" unless relative_path
+  Mongrel::RedirectHandler.new(target_url)
+end

data/features/steps/remote_service_steps.rb

@@ -0,0 +1,47 @@
+Given /a remote service that returns '(.*)'/ do |response_body|
+  @handler = new_mongrel_handler
+  Given "the response from the service has a body of '#{response_body}'"
+end
+
+Given /a remote service that returns a (\d+) status code/ do |code|
+  @handler = new_mongrel_handler
+  @handler.response_code = code
+end
+
+Given /that service is accessed at the path '(.*)'/ do |path|
+  @server.register(path, @handler)
+end
+
+Given /the response from the service has a Content-Type of '(.*)'/ do |content_type|
+  @handler.content_type = content_type
+end
+
+Given /the response from the service has a body of '(.*)'/ do |response_body|
+  @handler.response_body = response_body
+end
+
+Given /the url '(.*)' redirects to '(.*)'/ do |redirection_url, target_url|
+  @server.register redirection_url, new_mongrel_redirector(target_url)
+end
+
+Given /that service is protected by Basic Authentication/ do
+  add_basic_authentication_to @handler
+end
+
+Given /that service requires the username '(.*)' with the password '(.*)'/ do |username, password|
+  @handler.username = username
+  @handler.password = password
+end
+
+Given /a restricted page at '(.*)'/ do |url|
+  Given "a remote service that returns 'A response I will never see'"
+  And "that service is accessed at the path '#{url}'"
+  And "that service is protected by Basic Authentication"
+  And "that service requires the username 'something' with the password 'secret'"
+end
+
+# This joins the server thread, and halts cucumber, so you can actually hit the
+# server with a browser.  Runs until you kill it with Ctrl-c
+Given /I want to hit this in a browser/ do
+  @server.acceptor.join
+end

data/features/supports_redirection.feature

@@ -0,0 +1,22 @@
+Feature: Supports Redirection
+
+  As a developer
+  I want to work with services that may redirect me
+  And I want it to follow a reasonable number of redirects
+  Because sometimes web services do that
+
+  Scenario: A service that redirects once
+    Given a remote service that returns 'Service Response'
+    And that service is accessed at the path '/service.html'
+    And the url '/redirector.html' redirects to '/service.html'
+    When I call HTTParty#get with '/redirector.html'
+    Then the return value should match 'Service Response'
+
+  # TODO: Look in to why this actually fails...
+  Scenario: A service that redirects to a relative URL
+
+  Scenario: A service that redirects infinitely
+    Given the url '/first.html' redirects to '/second.html'
+    And the url '/second.html' redirects to '/first.html'
+    When I call HTTParty#get with '/first.html'
+    Then it should raise an HTTParty::RedirectionTooDeep exception

data/httparty.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{httparty}
-  s.version = "0.2.6"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Nunemaker"]
-  s.date = %q{2009-01-05}
+  s.date = %q{2009-02-10}
   s.default_executable = %q{httparty}
   s.description = %q{Makes http fun! Also, makes consuming restful web services dead easy.}
   s.email = %q{nunemaker@gmail.com}
   s.executables = ["httparty"]
-  s.extra_rdoc_files = ["bin/httparty", "lib/core_extensions.rb", "lib/httparty/exceptions.rb", "lib/httparty/request.rb", "lib/httparty/version.rb", "lib/httparty.rb", "lib/module_level_inheritable_attributes.rb", "README"]
-  s.files = ["bin/httparty", "examples/aaws.rb", "examples/basic.rb", "examples/delicious.rb", "examples/google.rb", "examples/rubyurl.rb", "examples/twitter.rb", "examples/whoismyrep.rb", "History", "httparty.gemspec", "lib/core_extensions.rb", "lib/httparty/exceptions.rb", "lib/httparty/request.rb", "lib/httparty/version.rb", "lib/httparty.rb", "lib/module_level_inheritable_attributes.rb", "Manifest", "MIT-LICENSE", "Rakefile", "README", "setup.rb", "spec/as_buggery_spec.rb", "spec/fixtures/delicious.xml", "spec/fixtures/google.html", "spec/fixtures/twitter.json", "spec/fixtures/twitter.xml", "spec/httparty/request_spec.rb", "spec/httparty_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "website/css/common.css", "website/index.html"]
+  s.extra_rdoc_files = ["bin/httparty", "lib/core_extensions.rb", "lib/httparty/cookie_hash.rb", "lib/httparty/exceptions.rb", "lib/httparty/module_inheritable_attributes.rb", "lib/httparty/parsers/json.rb", "lib/httparty/parsers/xml.rb", "lib/httparty/parsers.rb", "lib/httparty/request.rb", "lib/httparty/response.rb", "lib/httparty/version.rb", "lib/httparty.rb", "README"]
+  s.files = ["bin/httparty", "cucumber.yml", "examples/aaws.rb", "examples/basic.rb", "examples/delicious.rb", "examples/google.rb", "examples/rubyurl.rb", "examples/twitter.rb", "examples/whoismyrep.rb", "features/basic_authentication.feature", "features/command_line.feature", "features/deals_with_http_error_codes.feature", "features/handles_multiple_formats.feature", "features/steps/env.rb", "features/steps/httparty_response_steps.rb", "features/steps/httparty_steps.rb", "features/steps/mongrel_helper.rb", "features/steps/remote_service_steps.rb", "features/supports_redirection.feature", "History", "httparty.gemspec", "lib/core_extensions.rb", "lib/httparty/cookie_hash.rb", "lib/httparty/exceptions.rb", "lib/httparty/module_inheritable_attributes.rb", "lib/httparty/parsers/json.rb", "lib/httparty/parsers/xml.rb", "lib/httparty/parsers.rb", "lib/httparty/request.rb", "lib/httparty/response.rb", "lib/httparty/version.rb", "lib/httparty.rb", "Manifest", "MIT-LICENSE", "Rakefile", "README", "setup.rb", "spec/fixtures/delicious.xml", "spec/fixtures/empty.xml", "spec/fixtures/google.html", "spec/fixtures/twitter.json", "spec/fixtures/twitter.xml", "spec/fixtures/undefined_method_add_node_for_nil.xml", "spec/hash_spec.rb", "spec/httparty/cookie_hash_spec.rb", "spec/httparty/parsers/json_spec.rb", "spec/httparty/parsers/xml_spec.rb", "spec/httparty/request_spec.rb", "spec/httparty/response_spec.rb", "spec/httparty_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "spec/string_spec.rb", "website/css/common.css", "website/index.html"]
   s.has_rdoc = true
   s.homepage = %q{http://httparty.rubyforge.org}
   s.post_install_message = %q{When you HTTParty, you must party hard!}
@@ -27,14 +27,11 @@ Gem::Specification.new do |s|
     s.specification_version = 2
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<json>, ["~> 1.1"])
       s.add_development_dependency(%q<echoe>, [">= 0"])
     else
-      s.add_dependency(%q<json>, ["~> 1.1"])
       s.add_dependency(%q<echoe>, [">= 0"])
     end
   else
-    s.add_dependency(%q<json>, ["~> 1.1"])
     s.add_dependency(%q<echoe>, [">= 0"])
   end
 end