httparty 0.2.10 → 0.3.0

data/History

@@ -1,3 +1,9 @@
+== 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)

data/Manifest

@@ -22,17 +22,19 @@ 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/core_extensions_spec.rb
 spec/fixtures/delicious.xml
 spec/fixtures/empty.xml
@@ -40,10 +42,15 @@ 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

@@ -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:
 

data/Rakefile

@@ -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

data/bin/httparty

@@ -2,7 +2,6 @@
 
 require "optparse"
 require "pp"
-require "rexml/document"
 
 $:.unshift(File.join(File.dirname(__FILE__), "/../lib"))
 require "httparty"
@@ -73,27 +72,6 @@ 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[:output_format].nil?
   response = HTTParty.send(opts[:action], ARGV.first, opts)
   puts "Status: #{response.code}"
@@ -103,12 +81,18 @@ else
   response = HTTParty.send(opts[:action], ARGV.first, opts)
   puts "Status: #{response.code}"
   case opts[:output_format]
-  when :json
-    puts JSON.pretty_generate(response)
-  when :xml
-    REXML::Document.new(response.body).write(STDOUT, 2)
-    puts
-  else
-    puts response
+    when :json
+      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
+    else
+      puts response
   end
 end

data/httparty.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{httparty}
-  s.version = "0.2.10"
+  s.version = "0.3.0"
 
   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-29}
+  s.date = %q{2009-01-31}
   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/cookie_hash.rb", "lib/httparty/exceptions.rb", "lib/httparty/request.rb", "lib/httparty/response.rb", "lib/httparty/version.rb", "lib/httparty.rb", "lib/module_level_inheritable_attributes.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/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/core_extensions_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/httparty/cookie_hash_spec.rb", "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/core_extensions_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"]
   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

data/lib/core_extensions.rb

@@ -21,7 +21,7 @@ require 'time'
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-class Object
+class Object #:nodoc:
   # @return <TrueClass, FalseClass>
   #
   # @example [].blank?         #=>  true
@@ -31,44 +31,44 @@ class Object
   # Returns true if the object is nil or empty (if applicable)
   def blank?
     nil? || (respond_to?(:empty?) && empty?)
-  end
+  end unless method_defined?(:blank?)
 end # class Object
 
-class Numeric
+class Numeric #:nodoc:
   # @return <TrueClass, FalseClass>
   # 
   # Numerics can't be blank
   def blank?
     false
-  end
+  end unless method_defined?(:blank?)
 end # class Numeric
 
-class NilClass
+class NilClass #:nodoc:
   # @return <TrueClass, FalseClass>
   # 
   # Nils are always blank
   def blank?
     true
-  end
+  end unless method_defined?(:blank?)
 end # class NilClass
 
-class TrueClass
+class TrueClass #:nodoc:
   # @return <TrueClass, FalseClass>
   # 
   # True is not blank.  
   def blank?
     false
-  end
+  end unless method_defined?(:blank?)
 end # class TrueClass
 
-class FalseClass
+class FalseClass #:nodoc:
   # False is always blank.
   def blank?
     true
-  end
+  end unless method_defined?(:blank?)
 end # class FalseClass
 
-class String
+class String #:nodoc:
   # @example "".blank?         #=>  true
   # @example "     ".blank?    #=>  true
   # @example " hey ho ".blank? #=>  false
@@ -78,216 +78,16 @@ class String
   # Strips out whitespace then tests if the string is empty.
   def blank?
     strip.empty?
-  end
-end # class String
-
-require 'rexml/parsers/streamparser'
-require 'rexml/parsers/baseparser'
-require 'rexml/light/node'
-
-# This is a slighly modified version of the XMLUtilityNode from
-# http://merb.devjavu.com/projects/merb/ticket/95 (has.sox@gmail.com)
-# It's mainly just adding vowels, as I ht cd wth n vwls :)
-# This represents the hard part of the work, all I did was change the
-# underlying parser.
-class REXMLUtilityNode
-  attr_accessor :name, :attributes, :children, :type
-  
-  def self.typecasts
-    @@typecasts
-  end
+  end unless method_defined?(:blank?)
   
-  def self.typecasts=(obj)
-    @@typecasts = obj
-  end
-  
-  def self.available_typecasts
-    @@available_typecasts
-  end
-  
-  def self.available_typecasts=(obj)
-    @@available_typecasts = obj
-  end
-
-  self.typecasts = {}
-  self.typecasts["integer"]       = lambda{|v| v.nil? ? nil : v.to_i}
-  self.typecasts["boolean"]       = lambda{|v| v.nil? ? nil : (v.strip != "false")}
-  self.typecasts["datetime"]      = lambda{|v| v.nil? ? nil : Time.parse(v).utc}
-  self.typecasts["date"]          = lambda{|v| v.nil? ? nil : Date.parse(v)}
-  self.typecasts["dateTime"]      = lambda{|v| v.nil? ? nil : Time.parse(v).utc}
-  self.typecasts["decimal"]       = lambda{|v| v.nil? ? nil : BigDecimal(v.to_s)}
-  self.typecasts["double"]        = lambda{|v| v.nil? ? nil : v.to_f}
-  self.typecasts["float"]         = lambda{|v| v.nil? ? nil : v.to_f}
-  self.typecasts["symbol"]        = lambda{|v| v.nil? ? nil : v.to_sym}
-  self.typecasts["string"]        = lambda{|v| v.to_s}
-  self.typecasts["yaml"]          = lambda{|v| v.nil? ? nil : YAML.load(v)}
-  self.typecasts["base64Binary"]  = lambda{|v| v.unpack('m').first }
-
-  self.available_typecasts = self.typecasts.keys
-
-  def initialize(name, attributes = {})
-    @name         = name.tr("-", "_")
-    # leave the type alone if we don't know what it is
-    @type         = self.class.available_typecasts.include?(attributes["type"]) ? attributes.delete("type") : attributes["type"]
-
-    @nil_element  = attributes.delete("nil") == "true"
-    @attributes   = undasherize_keys(attributes)
-    @children     = []
-    @text         = false
-  end
-
-  def add_node(node)
-    @text = true if node.is_a? String
-    @children << node
-  end
-
-  def to_hash
-    if @type == "file"
-      f = StringIO.new((@children.first || '').unpack('m').first)
-      class << f
-        attr_accessor :original_filename, :content_type
-      end
-      f.original_filename = attributes['name'] || 'untitled'
-      f.content_type = attributes['content_type'] || 'application/octet-stream'
-      return {name => f}
-    end
-
-    if @text
-      return { name => typecast_value( translate_xml_entities( inner_html ) ) }
-    else
-      #change repeating groups into an array
-      groups = @children.inject({}) { |s,e| (s[e.name] ||= []) << e; s }
-
-      out = nil
-      if @type == "array"
-        out = []
-        groups.each do |k, v|
-          if v.size == 1
-            out << v.first.to_hash.entries.first.last
-          else
-            out << v.map{|e| e.to_hash[k]}
-          end
-        end
-        out = out.flatten
-
-      else # If Hash
-        out = {}
-        groups.each do |k,v|
-          if v.size == 1
-            out.merge!(v.first)
-          else
-            out.merge!( k => v.map{|e| e.to_hash[k]})
-          end
-        end
-        out.merge! attributes unless attributes.empty?
-        out = out.empty? ? nil : out
-      end
-
-      if @type && out.nil?
-        { name => typecast_value(out) }
-      else
-        { name => out }
-      end
-    end
-  end
-
-  # Typecasts a value based upon its type. For instance, if
-  # +node+ has #type == "integer",
-  # {{[node.typecast_value("12") #=> 12]}}
-  #
-  # @param value<String> The value that is being typecast.
-  #
-  # @details [:type options]
-  #   "integer"::
-  #     converts +value+ to an integer with #to_i
-  #   "boolean"::
-  #     checks whether +value+, after removing spaces, is the literal
-  #     "true"
-  #   "datetime"::
-  #     Parses +value+ using Time.parse, and returns a UTC Time
-  #   "date"::
-  #     Parses +value+ using Date.parse
-  #
-  # @return <Integer, TrueClass, FalseClass, Time, Date, Object>
-  #   The result of typecasting +value+.
-  #
-  # @note
-  #   If +self+ does not have a "type" key, or if it's not one of the
-  #   options specified above, the raw +value+ will be returned.
-  def typecast_value(value)
-    return value unless @type
-    proc = self.class.typecasts[@type]
-    proc.nil? ? value : proc.call(value)
-  end
-
-  # Convert basic XML entities into their literal values.
-  #
-  # @param value<#gsub> An XML fragment.
-  #
-  # @return <#gsub> The XML fragment after converting entities.
-  def translate_xml_entities(value)
-    value.gsub(/&lt;/,   "<").
-          gsub(/&gt;/,   ">").
-          gsub(/&quot;/, '"').
-          gsub(/&apos;/, "'").
-          gsub(/&amp;/,  "&")
-  end
-
-  # Take keys of the form foo-bar and convert them to foo_bar
-  def undasherize_keys(params)
-    params.keys.each do |key, value|
-      params[key.tr("-", "_")] = params.delete(key)
-    end
-    params
-  end
-
-  # Get the inner_html of the REXML node.
-  def inner_html
-    @children.join
-  end
-
-  # Converts the node into a readable HTML node.
-  #
-  # @return <String> The HTML node in text form.
-  def to_html
-    attributes.merge!(:type => @type ) if @type
-    "<#{name}#{attributes.to_xml_attributes}>#{@nil_element ? '' : inner_html}</#{name}>"
-  end
-
-  # @alias #to_html #to_s
-  def to_s
-    to_html
-  end
-end
-
-class ToHashParser
-  def self.from_xml(xml)
-    stack = []
-    parser = REXML::Parsers::BaseParser.new(xml)
-
-    while true
-      event = parser.pull
-      case event[0]
-      when :end_document
-        break
-      when :end_doctype, :start_doctype
-        # do nothing
-      when :start_element
-        stack.push REXMLUtilityNode.new(event[1], event[2])
-      when :end_element
-        if stack.size > 1
-          temp = stack.pop
-          stack.last.add_node(temp)
-        end
-      when :text, :cdata
-        stack.last.add_node(event[1]) unless event[1].strip.length == 0 || stack.empty?
-      end
-    end
-    stack.pop.to_hash
-  end
-end
+  def snake_case
+    return self.downcase if self =~ /^[A-Z]+$/
+    self.gsub(/([A-Z]+)(?=[A-Z][a-z]?)|\B[A-Z]/, '_\&') =~ /_*(.*)/
+    return $+.downcase
+  end unless method_defined?(:snake_case)
+end # class String
 
-class Hash  
+class Hash #:nodoc:
   # @return <String> This hash as a query string
   #
   # @example
@@ -348,6 +148,28 @@ class Hash
   end
 end
 
-class BlankSlate
+class BlankSlate #:nodoc:
   instance_methods.each { |m| undef_method m unless m =~ /^__/ }
 end
+
+# 1.8.6 has mistyping of transitive in if statement
+require "rexml/document"
+module REXML #:nodoc:
+  class Document < Element #:nodoc:
+    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