alexvollmer-httparty 0.3.1 → 0.4.3

data/spec/httparty/response_spec.rb

@@ -5,8 +5,9 @@ describe HTTParty::Response do
     before do
       @response_object = {'foo' => 'bar'}
       @body = "{foo:'bar'}"
-      @code = 200
-      @response = HTTParty::Response.new(@response_object, @body, @code)
+      @code = '200'
+      @message = 'OK'
+      @response = HTTParty::Response.new(@response_object, @body, @code, @message)
     end
     
     it "should set delegate" do
@@ -18,22 +19,30 @@ describe HTTParty::Response do
     end
     
     it "should set code" do
-      @response.code.should == @code
+      @response.code.should.to_s == @code
+    end
+
+    it "should set code as a Fixnum" do
+      @response.code.should be_an_instance_of(Fixnum)
+    end
+    
+    it "should set body" do
+      @response.body.should == @body
     end
   end
   
   it "should be able to set headers during initialization" do
-    response = HTTParty::Response.new({'foo' => 'bar'}, "{foo:'bar'}", 200, {'foo' => 'bar'})
+    response = HTTParty::Response.new({'foo' => 'bar'}, "{foo:'bar'}", 200, 'OK', {'foo' => 'bar'})
     response.headers.should == {'foo' => 'bar'}
   end
   
   it "should send missing methods to delegate" do
-    response = HTTParty::Response.new({'foo' => 'bar'}, "{foo:'bar'}", 200)
+    response = HTTParty::Response.new({'foo' => 'bar'}, "{foo:'bar'}", 200, 'OK')
     response['foo'].should == 'bar'
   end
   
   it "should be able to iterate delegate if it is array" do
-    response = HTTParty::Response.new([{'foo' => 'bar'}, {'foo' => 'baz'}], "[{foo:'bar'}, {foo:'baz'}]", 200)
+    response = HTTParty::Response.new([{'foo' => 'bar'}, {'foo' => 'baz'}], "[{foo:'bar'}, {foo:'baz'}]", 200, 'OK')
     response.size.should == 2
     lambda {
       response.each { |item| }
@@ -41,12 +50,12 @@ describe HTTParty::Response do
   end
   
   xit "should allow hashes to be accessed with dot notation" do
-    response = HTTParty::Response.new({'foo' => 'bar'}, "{foo:'bar'}", 200)
+    response = HTTParty::Response.new({'foo' => 'bar'}, "{foo:'bar'}", 200, 'OK')
     response.foo.should == 'bar'
   end
   
   xit "should allow nested hashes to be accessed with dot notation" do
-    response = HTTParty::Response.new({'foo' => {'bar' => 'baz'}}, "{foo: {bar:'baz'}}", 200)
+    response = HTTParty::Response.new({'foo' => {'bar' => 'baz'}}, "{foo: {bar:'baz'}}", 200, 'OK')
     response.foo.should == {'bar' => 'baz'}
     response.foo.bar.should == 'baz'
   end

data/spec/httparty_spec.rb

@@ -21,6 +21,12 @@ describe HTTParty do
       @klass.base_uri('http://api.foobar.com')
       @klass.base_uri.should == 'http://api.foobar.com'
     end
+
+    it 'should not modify the parameter during assignment' do
+      uri = 'http://api.foobar.com'
+      @klass.base_uri(uri)
+      uri.should == 'http://api.foobar.com'
+    end
   end
   
   describe "#normalize_base_uri" do
@@ -38,6 +44,12 @@ describe HTTParty do
       uri = HTTParty.normalize_base_uri('https://api.foo.com/v1:443')
       uri.should == 'https://api.foo.com/v1:443'
     end
+
+    it 'should not modify the parameter' do
+      uri = 'http://api.foobar.com'
+      HTTParty.normalize_base_uri(uri)
+      uri.should == 'http://api.foobar.com'
+    end
   end
   
   describe "headers" do
@@ -151,11 +163,23 @@ describe HTTParty do
       @klass.default_options[:format].should == :yaml
     end
     
+    it "should allow plain" do
+      @klass.format :plain
+      @klass.default_options[:format].should == :plain
+    end
+    
     it 'should not allow funky format' do
       lambda do
         @klass.format :foobar
       end.should raise_error(HTTParty::UnsupportedFormat)
     end
+
+    it 'should only print each format once with an exception' do
+      lambda do
+        @klass.format :foobar
+      end.should raise_error(HTTParty::UnsupportedFormat, "Must be one of: json, plain, html, yaml, xml")
+    end
+
   end
 
   describe "with multiple class definitions" do
@@ -182,9 +206,7 @@ describe HTTParty do
   describe "#get" do
     it "should be able to get html" do
       stub_http_response_with('google.html')
-      resp = HTTParty.get('http://www.google.com')
-      resp.should == file_fixture('google.html')
-      resp.body.should == file_fixture('google.html')
+      HTTParty.get('http://www.google.com').should == file_fixture('google.html')
     end
     
     it "should be able parse response type json automatically" do
@@ -202,7 +224,6 @@ describe HTTParty do
         "location"          => "Opera Plaza, California", 
         "profile_image_url" => "http://static.twitter.com/images/default_profile_normal.png"
       }
-      tweets.body.should == file_fixture('twitter.json')
     end
     
     it "should be able parse response type xml automatically" do
@@ -220,7 +241,6 @@ describe HTTParty do
         "profile_image_url" => "http://s3.amazonaws.com/twitter_production/profile_images/65565851/8ball_large_normal.jpg", 
         "location"          => nil
       }
-      tweets.body.should == file_fixture('twitter.xml')
     end
     
     it "should not get undefined method add_node for nil class for the following xml" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: alexvollmer-httparty
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.4.3
 platform: ruby
 authors: 
 - John Nunemaker
@@ -9,9 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-10 00:00:00 -08:00
+date: 2009-04-23 00:00:00 -07:00
 default_executable: httparty
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: crack
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.1.1
+    version: 
 - !ruby/object:Gem::Dependency 
   name: echoe
   type: :development
@@ -30,13 +40,10 @@ extensions: []
 
 extra_rdoc_files: 
 - bin/httparty
-- lib/core_extensions.rb
 - lib/httparty/cookie_hash.rb
+- lib/httparty/core_extensions.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
@@ -64,13 +71,10 @@ files:
 - features/supports_redirection.feature
 - History
 - httparty.gemspec
-- lib/core_extensions.rb
 - lib/httparty/cookie_hash.rb
+- lib/httparty/core_extensions.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
@@ -88,8 +92,6 @@ files:
 - 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

data/lib/core_extensions.rb

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

data/lib/httparty/parsers.rb

@@ -1,4 +0,0 @@
-Dir[File.dirname(__FILE__) + "/parsers/*.rb"].sort.each do |path|
-  filename = File.basename(path)
-  require "httparty/parsers/#{filename}"
-end

data/lib/httparty/parsers/json.rb

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