jnunemaker-httparty 0.3.0 → 0.3.1

data/History

@@ -1,3 +1,8 @@
+== 0.3.1 2009-02-10
+* 1 minor fix, 1 minor enhancement
+  * Fixed unescaping umlauts (siebertm)
+  * Added yaml response parsing (Miha Filej)
+  
 == 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.

data/Manifest

@@ -35,7 +35,6 @@ MIT-LICENSE
 Rakefile
 README
 setup.rb
-spec/core_extensions_spec.rb
 spec/fixtures/delicious.xml
 spec/fixtures/empty.xml
 spec/fixtures/google.html

data/httparty.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{httparty}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   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-31}
+  s.date = %q{2009-02-10}
   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/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_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "spec/string_spec.rb", "website/css/common.css", "website/index.html"]
+  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/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!}

data/lib/httparty/parsers/json.rb

@@ -13,12 +13,19 @@ module HTTParty
       end
 
       def self.decode(json)
-        YAML.load(convert_json_to_yaml(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})?)?$/
 

data/lib/httparty/request.rb

@@ -110,6 +110,8 @@ module HTTParty
             HTTParty::Parsers::XML.parse(body)
           when :json
             HTTParty::Parsers::JSON.decode(body)
+          when :yaml
+            YAML::load(body)
           else
             body
           end

data/lib/httparty/version.rb

@@ -1,3 +1,3 @@
 module HTTParty #:nodoc:
-  Version = '0.3.0'
+  Version = '0.3.1'
 end

data/lib/httparty.rb

@@ -14,7 +14,9 @@ module HTTParty
     'text/json'              => :json,
     'application/javascript' => :json,
     'text/javascript'        => :json,
-    'text/html'              => :html
+    'text/html'              => :html,
+    'application/x-yaml'     => :yaml,
+    'text/yaml'              => :yaml
   } unless defined?(AllowedFormats)
   
   def self.included(base)

data/spec/hash_spec.rb

@@ -41,4 +41,9 @@ describe Hash, 'to_params' do
   it 'should not leave a trailing &' do
     { :name => 'Bob', :address => { :street => '111 Ruby Ave.', :city => 'Ruby Central', :phones => ['111-111-1111', '222-222-2222'] } }.to_params.should_not match(/&$/)
   end
+  
+  it 'should URL encode unsafe characters' do
+    {:q => "?&\" +"}.to_params.should == "q=%3F%26%22%20%2B"
+  end
+  
 end

data/spec/httparty/parsers/json_spec.rb

@@ -2,18 +2,19 @@ require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
 
 describe HTTParty::Parsers::JSON do
   TESTS = {
+    %q({"data": "G\u00fcnter"})                   => {"data" => "Günter"},
     %q({"returnTo":{"\/categories":"\/"}})        => {"returnTo" => {"/categories" => "/"}},
     %q({returnTo:{"\/categories":"\/"}})          => {"returnTo" => {"/categories" => "/"}},
     %q({"return\\"To\\":":{"\/categories":"\/"}}) => {"return\"To\":" => {"/categories" => "/"}},
-    %q({"returnTo":{"\/categories":1}})          => {"returnTo" => {"/categories" => 1}},
-    %({"returnTo":[1,"a"]})                    => {"returnTo" => [1, "a"]},
-    %({"returnTo":[1,"\\"a\\",", "b"]})        => {"returnTo" => [1, "\"a\",", "b"]},
-    %({a: "'", "b": "5,000"})                  => {"a" => "'", "b" => "5,000"},
-    %({a: "a's, b's and c's", "b": "5,000"})   => {"a" => "a's, b's and c's", "b" => "5,000"},
-    %({a: "2007-01-01"})                       => {'a' => Date.new(2007, 1, 1)}, 
-    %({a: "2007-01-01 01:12:34 Z"})            => {'a' => Time.utc(2007, 1, 1, 1, 12, 34)}, 
-    # no time zone
-    %({a: "2007-01-01 01:12:34"})              => {'a' => "2007-01-01 01:12:34"}, 
+    %q({"returnTo":{"\/categories":1}})           => {"returnTo" => {"/categories" => 1}},
+    %({"returnTo":[1,"a"]})                       => {"returnTo" => [1, "a"]},
+    %({"returnTo":[1,"\\"a\\",", "b"]})           => {"returnTo" => [1, "\"a\",", "b"]},
+    %({a: "'", "b": "5,000"})                     => {"a" => "'", "b" => "5,000"},
+    %({a: "a's, b's and c's", "b": "5,000"})      => {"a" => "a's, b's and c's", "b" => "5,000"},
+    %({a: "2007-01-01"})                          => {'a' => Date.new(2007, 1, 1)}, 
+    %({a: "2007-01-01 01:12:34 Z"})               => {'a' => Time.utc(2007, 1, 1, 1, 12, 34)}, 
+    # no time zone                                
+    %({a: "2007-01-01 01:12:34"})                 => {'a' => "2007-01-01 01:12:34"}, 
     %([])    => [],
     %({})    => {},
     %(1)     => 1,

data/spec/httparty/request_spec.rb

@@ -94,6 +94,12 @@ describe HTTParty::Request do
       @request.send(:parse_response, json).should == {'books' => {'book' => {'id' => '1234', 'name' => 'Foo Bar!'}}}
     end
 
+    it 'should handle yaml automatically' do
+      yaml = "books: \n  book: \n    name: Foo Bar!\n    id: \"1234\"\n"
+      @request.options[:format] = :yaml
+      @request.send(:parse_response, yaml).should == {'books' => {'book' => {'id' => '1234', 'name' => 'Foo Bar!'}}}
+    end
+
     it "should include any HTTP headers in the returned response" do
       @request.options[:format] = :html
       response = stub_response "Content"

data/spec/httparty/response_spec.rb

@@ -0,0 +1,53 @@
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+
+describe HTTParty::Response do
+  describe "initialization" do
+    before do
+      @response_object = {'foo' => 'bar'}
+      @body = "{foo:'bar'}"
+      @code = 200
+      @response = HTTParty::Response.new(@response_object, @body, @code)
+    end
+    
+    it "should set delegate" do
+      @response.delegate.should == @response_object
+    end
+    
+    it "should set body" do
+      @response.body.should == @body
+    end
+    
+    it "should set code" do
+      @response.code.should == @code
+    end
+  end
+  
+  it "should be able to set headers during initialization" do
+    response = HTTParty::Response.new({'foo' => 'bar'}, "{foo:'bar'}", 200, {'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['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.size.should == 2
+    lambda {
+      response.each { |item| }
+    }.should_not raise_error
+  end
+  
+  xit "should allow hashes to be accessed with dot notation" do
+    response = HTTParty::Response.new({'foo' => 'bar'}, "{foo:'bar'}", 200)
+    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.foo.should == {'bar' => 'baz'}
+    response.foo.bar.should == 'baz'
+  end
+end

data/spec/httparty_spec.rb

@@ -144,6 +144,11 @@ describe HTTParty do
       @klass.default_options[:format].should == :json
     end
     
+    it "should allow yaml" do
+      @klass.format :yaml
+      @klass.default_options[:format].should == :yaml
+    end
+    
     it 'should not allow funky format' do
       lambda do
         @klass.format :foobar

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jnunemaker-httparty
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - John Nunemaker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-31 00:00:00 -08:00
+date: 2009-02-10 00:00:00 -08:00
 default_executable: httparty
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -79,7 +79,6 @@ files:
 - Rakefile
 - README
 - setup.rb
-- spec/core_extensions_spec.rb
 - spec/fixtures/delicious.xml
 - spec/fixtures/empty.xml
 - spec/fixtures/google.html
@@ -91,6 +90,7 @@ files:
 - 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

data/spec/core_extensions_spec.rb

@@ -1,30 +0,0 @@
-require File.join(File.dirname(__FILE__), 'spec_helper')
-
-describe "Core Extensions" do  
-  describe Hash do
-    describe "#to_params" do
-      def should_be_same_params(query_string, expected)
-        query_string.split(/&/).sort.should == expected.split(/&/).sort
-      end
-      
-      it "should encode characters in URL parameters" do
-        {:q => "?&\" +"}.to_params.should == "q=%3F%26%22%20%2B"
-      end
-      
-      it "should handle multiple parameters" do
-        should_be_same_params({:q1 => "p1", :q2 => "p2"}.to_params, "q1=p1&q2=p2")
-      end
-      
-      it "should handle nested hashes like rails does" do
-        should_be_same_params({
-          :name => "Bob",
-            :address => {
-              :street => '111 Ruby Ave.',
-              :city => 'Ruby Central',
-              :phones => ['111-111-1111', '222-222-2222']
-            }
-          }.to_params, "name=Bob&address[city]=Ruby%20Central&address[phones][]=111-111-1111&address[phones][]=222-222-2222&address[street]=111%20Ruby%20Ave.")
-      end
-    end
-  end
-end