@@ -78,3 +78,215 @@ class String
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
+
+ def self.typecasts=(obj)
+ @@typecasts = obj
+ end
+
+ def self.available_typecasts
+ @@typecasts
+ end
+
+ def self.available_typecasts=(obj)
+ @@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| BigDecimal(v)}
+ 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.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(/</, "<").
+ gsub(/>/, ">").
+ gsub(/"/, '"').
+ gsub(/'/, "'").
+ gsub(/&/, "&")
+ 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
+ end
+ end
+ stack.pop.to_hash
+ end
+end
+
+class Hash
+ def self.from_xml(xml)
+ ToHashParser.from_xml(xml)
+ end
+end
\ No newline at end of file
lib/core_extensions.rb
@@ -5,6 +5,7 @@ require 'net/https'
require 'rubygems'
gem 'json', '>= 1.1.3'
require 'json'
+
require 'module_level_inheritable_attributes'
require 'core_extensions'
@@ -98,5 +99,4 @@ module HTTParty
end
require 'httparty/exceptions'
-require 'httparty/request'
-require 'httparty/xml'
\ No newline at end of file
+require 'httparty/request'
\ No newline at end of file
lib/httparty.rb
@@ -107,7 +107,7 @@ module HTTParty
return nil if body.nil? or body.empty?
case format
when :xml
- ToHashParser.from_xml(body)
+ Hash.from_xml(body)
when :json
JSON.parse(body)
else
lib/httparty/request.rb
lib/httparty/xml.rb
8a70a8ef40531def06c950bfb4902abc774b5b31
John Nunemaker
nunemaker@gmail.com
http://github.com/jnunemaker/httparty/commit/7fab301eb592353311a064c76e93c2363f8b7658
7fab301eb592353311a064c76e93c2363f8b7658
2008-12-06T19:51:18-08:00
2008-12-06T19:51:18-08:00
Moved xml stuff into core extensions where it should be for now.
747b16ec92b450b775f1ea64aab98f8931b16a91
John Nunemaker
nunemaker@gmail.com