Permalink
Browse files

Now using crack for xml and json parsing instead of bundling that in …

…HTTParty. Hopefully panic will not ensue.
  • Loading branch information...
1 parent 8115056 commit 690eeb81f513763c5f02bdc5b9921cd6a6f07aec @jnunemaker committed Mar 29, 2009
View
@@ -14,6 +14,7 @@ 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 = [['jnunemaker-crack', '>= 0.1.0']]
p.need_tar_gz = false
p.docs_host = WebsitePath
end
View
@@ -1,175 +0,0 @@
-require 'time'
-
-# Copyright (c) 2008 Sam Smoot.
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# 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 #:nodoc:
- # @return <TrueClass, FalseClass>
- #
- # @example [].blank? #=> true
- # @example [1].blank? #=> false
- # @example [nil].blank? #=> false
- #
- # Returns true if the object is nil or empty (if applicable)
- def blank?
- nil? || (respond_to?(:empty?) && empty?)
- end unless method_defined?(:blank?)
-end # class Object
-
-class Numeric #:nodoc:
- # @return <TrueClass, FalseClass>
- #
- # Numerics can't be blank
- def blank?
- false
- end unless method_defined?(:blank?)
-end # class Numeric
-
-class NilClass #:nodoc:
- # @return <TrueClass, FalseClass>
- #
- # Nils are always blank
- def blank?
- true
- end unless method_defined?(:blank?)
-end # class NilClass
-
-class TrueClass #:nodoc:
- # @return <TrueClass, FalseClass>
- #
- # True is not blank.
- def blank?
- false
- end unless method_defined?(:blank?)
-end # class TrueClass
-
-class FalseClass #:nodoc:
- # False is always blank.
- def blank?
- true
- end unless method_defined?(:blank?)
-end # class FalseClass
-
-class String #:nodoc:
- # @example "".blank? #=> true
- # @example " ".blank? #=> true
- # @example " hey ho ".blank? #=> false
- #
- # @return <TrueClass, FalseClass>
- #
- # Strips out whitespace then tests if the string is empty.
- def blank?
- strip.empty?
- end unless method_defined?(:blank?)
-
- 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 #:nodoc:
- # @return <String> This hash as a query string
- #
- # @example
- # { :name => "Bob",
- # :address => {
- # :street => '111 Ruby Ave.',
- # :city => 'Ruby Central',
- # :phones => ['111-111-1111', '222-222-2222']
- # }
- # }.to_params
- # #=> "name=Bob&address[city]=Ruby Central&address[phones][]=111-111-1111&address[phones][]=222-222-2222&address[street]=111 Ruby Ave."
- def to_params
- params = self.map { |k,v| normalize_param(k,v) }.join
- params.chop! # trailing &
- params
- end
-
- # @param key<Object> The key for the param.
- # @param value<Object> The value for the param.
- #
- # @return <String> This key value pair as a param
- #
- # @example normalize_param(:name, "Bob Jones") #=> "name=Bob%20Jones&"
- def normalize_param(key, value)
- param = ''
- stack = []
-
- if value.is_a?(Array)
- param << value.map { |element| normalize_param("#{key}[]", element) }.join
- elsif value.is_a?(Hash)
- stack << [key,value]
- else
- param << "#{key}=#{URI.encode(value.to_s, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))}&"
- end
-
- stack.each do |parent, hash|
- hash.each do |key, value|
- if value.is_a?(Hash)
- stack << ["#{parent}[#{key}]", value]
- else
- param << normalize_param("#{parent}[#{key}]", value)
- end
- end
- end
-
- param
- end
-
- # @return <String> The hash as attributes for an XML tag.
- #
- # @example
- # { :one => 1, "two"=>"TWO" }.to_xml_attributes
- # #=> 'one="1" two="TWO"'
- def to_xml_attributes
- map do |k,v|
- %{#{k.to_s.snake_case.sub(/^(.{1,1})/) { |m| m.downcase }}="#{v}"}
- end.join(' ')
- end
-end
-
-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
View
@@ -2,8 +2,10 @@
require 'net/http'
require 'net/https'
-require 'core_extensions'
require 'httparty/module_inheritable_attributes'
+require 'rubygems'
+gem 'crack'
+require 'crack'
module HTTParty
@@ -195,7 +197,7 @@ def self.delete(*args)
end
require 'httparty/cookie_hash'
+require 'httparty/core_extensions'
require 'httparty/exceptions'
require 'httparty/request'
require 'httparty/response'
-require 'httparty/parsers'
@@ -0,0 +1,25 @@
+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
View
@@ -1,4 +0,0 @@
-Dir[File.dirname(__FILE__) + "/parsers/*.rb"].sort.each do |path|
- filename = File.basename(path)
- require "httparty/parsers/#{filename}"
-end
@@ -1,74 +0,0 @@
-# Copyright (c) 2004-2008 David Heinemeier Hansson
-# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-require 'yaml'
-require 'strscan'
-
-module HTTParty
- module Parsers #:nodoc:
- module JSON #:nodoc:
- class ParseError < StandardError #:nodoc:
- end
-
- def self.decode(json)
- YAML.load(unescape(convert_json_to_yaml(json)))
- rescue ArgumentError => e
- raise ParseError, "Invalid JSON string"
- end
-
- protected
-
- def self.unescape(str)
- str.gsub(/\\u([0-9a-f]{4})/) {
- [$1.hex].pack("U")
- }
- end
-
- # matches YAML-formatted dates
- DATE_REGEX = /^\d{4}-\d{2}-\d{2}|\d{4}-\d{1,2}-\d{1,2}[ \t]+\d{1,2}:\d{2}:\d{2}(\.[0-9]*)?(([ \t]*)Z|[-+]\d{2}?(:\d{2})?)?$/
-
- # Ensure that ":" and "," are always followed by a space
- def self.convert_json_to_yaml(json) #:nodoc:
- scanner, quoting, marks, pos, times = StringScanner.new(json), false, [], nil, []
- while scanner.scan_until(/(\\['"]|['":,\\]|\\.)/)
- case char = scanner[1]
- when '"', "'"
- if !quoting
- quoting = char
- pos = scanner.pos
- elsif quoting == char
- if json[pos..scanner.pos-2] =~ DATE_REGEX
- # found a date, track the exact positions of the quotes so we can remove them later.
- # oh, and increment them for each current mark, each one is an extra padded space that bumps
- # the position in the final YAML output
- total_marks = marks.size
- times << pos+total_marks << scanner.pos+total_marks
- end
- quoting = false
- end
- when ":",","
- marks << scanner.pos - 1 unless quoting
- end
- end
-
- if marks.empty?
- json.gsub(/\\\//, '/')
- else
- left_pos = [-1].push(*marks)
- right_pos = marks << json.length
- output = []
- left_pos.each_with_index do |left, i|
- output << json[left.succ..right_pos[i]]
- end
- output = output * " "
-
- times.each { |i| output[i-1] = ' ' }
- output.gsub!(/\\\//, '/')
- output
- end
- end
- end
- end
-end
Oops, something went wrong.

3 comments on commit 690eeb8

Ah, but it did — I got a “gem ‘crack’ is not installed” message, or something to that effect. Even when I explicitly installed this before HTTParty.

Er, by “this” I mean Crack. WHERE AM I

Owner

jnunemaker replied Mar 29, 2009

Dang. Good catch. Fixed it and pushed a patched version 0.4.1.

Please sign in to comment.