lib/httparty/json.rb spec/httparty/json_spec.rb @@ -24,11 +24,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: README @@ -14,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 Rakefile @@ -82,7 +82,13 @@ else puts "Status: #{response.code}" case opts[:output_format] when :json - puts JSON.pretty_generate(response) + 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.body).write(STDOUT, 2) puts bin/httparty @@ -2,10 +2,6 @@ $:.unshift(File.dirname(__FILE__)) require 'net/http' require 'net/https' -require 'rubygems' -gem 'json', '>= 1.1.3' -require 'json' - require 'module_level_inheritable_attributes' require 'core_extensions' @@ -136,4 +132,5 @@ end require 'httparty/exceptions' require 'httparty/request' require 'httparty/response' +require 'httparty/json' require 'httparty/cookie_hash' lib/httparty.rb @@ -103,7 +103,7 @@ module HTTParty when :xml ToHashParser.from_xml(body) when :json - JSON.parse(body) + HTTParty::JSON.decode(body) else body end lib/httparty/request.rb @@ -1,6 +1,7 @@ module HTTParty class Response < BlankSlate #:nodoc: attr_accessor :body, :code, :headers + attr_reader :delegate def initialize(delegate, body, code, headers) @delegate = delegate lib/httparty/response.rb @@ -1,5 +1,4 @@ require File.join(File.dirname(__FILE__), 'spec_helper') - require 'activesupport' describe Hash do spec/as_buggery_spec.rb 0112a896b3eefb60de50f3914fd3ed73efbe0a45 John Nunemaker nunemaker@gmail.com http://github.com/wesmaldonado/httparty/commit/e5e3d54bbc213b94efe41e30ecd146eb254c61ee e5e3d54bbc213b94efe41e30ecd146eb254c61ee 2009-01-30T21:33:45-08:00 2009-01-30T21:33:45-08:00 JSON gem no longer dependency. Stole json decoding from ActiveSupport and bundled just that with HTTParty. a8de124fb2252216c15424acc90af6e6cca63a50 John Nunemaker nunemaker@gmail.com