rest 2.0.4 → 2.1.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rest (2.0.3)
+    rest (2.0.4)
       net-http-persistent
       rest-client (>= 0.3.0)
 

data/lib/rest/version.rb

@@ -1,3 +1,3 @@
 module Rest
-  VERSION = "2.0.4"
+  VERSION = "2.1.0"
 end

data/lib/rest/wrappers/net_http_persistent_wrapper.rb

@@ -16,8 +16,8 @@ module Rest
 
         if response.header['content-encoding'].eql?('gzip')
           Rest.logger.debug 'GZIPPED'
-          sio = StringIO.new( response.body )
-          gz = Zlib::GzipReader.new( sio )
+          sio = StringIO.new(response.body)
+          gz = Zlib::GzipReader.new(sio)
           page = gz.read()
           @body = page
         end
@@ -127,20 +127,18 @@ module Rest
 
 
       def post(url, req_hash={})
-        response = nil
-        begin
-          uri = URI(url)
-          post = Net::HTTP::Post.new fix_path(uri.request_uri)
-          add_headers(post, req_hash, default_headers)
-          post.body = stringed_body(req_hash[:body]) if req_hash[:body]
-          response = http.request uri, post
-          response = NetHttpPersistentResponseWrapper.new(response)
-        rescue Net::HTTPClientError => ex
-          raise NetHttpPersistentExceptionWrapper.new(ex)
-        rescue Net::HTTPServerError => ex
-          raise NetHttpPersistentExceptionWrapper.new(ex)
+        r = nil
+        uri = URI(url)
+        post = Net::HTTP::Post.new fix_path(uri.request_uri)
+        add_headers(post, req_hash, default_headers)
+        post.body = stringed_body(req_hash[:body]) if req_hash[:body]
+        response = http.request uri, post
+        r = NetHttpPersistentResponseWrapper.new(response)
+        case response
+          when Net::HTTPClientError, Net::HTTPServerError
+            raise Rest::HttpError.new(r)
         end
-        response
+        r
       end
 
       def stringed_body(body)
@@ -152,36 +150,32 @@ module Rest
       end
 
       def put(url, req_hash={})
-        response = nil
-        begin
-          uri = URI(url)
-          post = Net::HTTP::Put.new fix_path(uri.request_uri)
-          add_headers(post, req_hash, default_headers)
-          post.body = stringed_body(req_hash[:body]) if req_hash[:body]
-          response = http.request uri, post
-          response = NetHttpPersistentResponseWrapper.new(response)
-        rescue Net::HTTPClientError => ex
-          raise NetHttpPersistentExceptionWrapper.new(ex)
-        rescue Net::HTTPServerError => ex
-          raise NetHttpPersistentExceptionWrapper.new(ex)
+        r = nil
+        uri = URI(url)
+        post = Net::HTTP::Put.new fix_path(uri.request_uri)
+        add_headers(post, req_hash, default_headers)
+        post.body = stringed_body(req_hash[:body]) if req_hash[:body]
+        response = http.request uri, post
+        r = NetHttpPersistentResponseWrapper.new(response)
+        case response
+          when Net::HTTPClientError, Net::HTTPServerError
+            raise Rest::HttpError.new(r)
         end
-        response
+        r
       end
 
       def delete(url, req_hash={})
-        response = nil
-        begin
-          uri = URI(url)
-          post = Net::HTTP::Delete.new fix_path(uri.request_uri)
-          add_headers(post, req_hash, default_headers)
-          response = http.request uri, post
-          response = NetHttpPersistentResponseWrapper.new(response)
-        rescue Net::HTTPClientError => ex
-          raise NetHttpPersistentExceptionWrapper.new(ex)
-        rescue Net::HTTPServerError => ex
-          raise NetHttpPersistentExceptionWrapper.new(ex)
+        r = nil
+        uri = URI(url)
+        post = Net::HTTP::Delete.new fix_path(uri.request_uri)
+        add_headers(post, req_hash, default_headers)
+        response = http.request uri, post
+        r = NetHttpPersistentResponseWrapper.new(response)
+        case response
+          when Net::HTTPClientError, Net::HTTPServerError
+            raise Rest::HttpError.new(r)
         end
-        response
+        r
       end
 
       def close

data/lib/rest/wrappers/rest_client_wrapper.rb

@@ -62,7 +62,13 @@ module Rest
         begin
           req_hash[:method] = :post
           req_hash[:url] = url
-          req_hash[:payload] = req_hash[:body] if req_hash[:body]
+          b = req_hash[:body]
+          if b
+            if b.is_a?(Hash)
+              b = b.to_json
+            end
+            req_hash[:payload] = b
+          end
           r2 = RestClient::Request.execute(req_hash)
           response = RestClientResponseWrapper.new(r2)
         rescue RestClient::Exception => ex

data/lib/rest/wrappers/typhoeus_wrapper.rb

@@ -63,8 +63,6 @@ module Rest
         r
       end
 
-
-
       def post(url, req_hash={})
         req_hash = default_typhoeus_options.merge(req_hash)
         to_json_parts(req_hash)

data/test/test_base.rb

@@ -13,12 +13,10 @@ class TestBase < Test::Unit::TestCase
   def setup
     puts 'setup'
     @rest = Rest::Client.new(:gem => :net_http_persistent, :log_level=>Logger::DEBUG)
-    @request_bin = "http://requestb.in/13t6hs51"
 
   end
 
-  def bin
-    @request_bin
-  end
+  ALL_OPS = [:get, :put, :post, :delete]
+
 
 end

data/test/test_rest.rb

@@ -9,7 +9,6 @@ class TestRest < TestBase
   def setup
     super
 
-
   end
 
   def test_basics
@@ -47,59 +46,72 @@ class TestRest < TestBase
   end
 
   def test_gets
-
-    response = @rest.get("http://rest-test.iron.io/code/200")
-    assert response.code == 200
-    assert response.body.include?("200")
-    p response.headers
-    assert response.headers.is_a?(Hash)
-
+    ALL_OPS.each do |op|
+      puts "Trying #{op}"
+      response = @rest.__send__(op, "http://rest-test.iron.io/code/200")
+      assert response.code == 200
+      assert response.body.include?("200")
+      p response.headers
+      assert response.headers.is_a?(Hash)
+    end
   end
 
+
   def test_404
     puts 'test_404'
-    begin
-      response = @rest.get("http://rest-test.iron.io/code/404")
-      assert false, "shouldn't get here"
-    rescue Rest::HttpError => ex
-      puts "EX: " + ex.inspect
-      p ex.backtrace
-      assert ex.is_a?(Rest::HttpError)
-      assert ex.response
-      assert ex.response.body
-      assert ex.code == 404
-      assert ex.response.body.include?("404")
-      assert ex.to_s.include?("404")
+    ALL_OPS.each do |op|
+      puts "Trying #{op}"
+      begin
+        response = @rest.__send__(op, "http://rest-test.iron.io/code/404")
+        assert false, "shouldn't get here"
+      rescue Rest::HttpError => ex
+        puts "Expected error: #{ex}"
+        #p ex.backtrace
+        assert ex.is_a?(Rest::HttpError)
+        assert ex.response
+        assert ex.response.body
+        assert ex.code == 404
+        assert ex.response.body.include?("404")
+        assert ex.to_s.include?("404")
+      end
     end
+
   end
 
   def test_400
     puts 'test_400'
-    begin
-      response = @rest.get("http://rest-test.iron.io/code/400")
-      assert false, "shouldn't get here"
-    rescue Rest::HttpError => ex
-      puts "EX: #{ex}"
-      p ex.backtrace
-      assert ex.is_a?(Rest::HttpError)
-      assert ex.response
-      assert ex.response.body
-      assert ex.code == 400
+    ALL_OPS.each do |op|
+      puts "Trying #{op}"
+      begin
+        response = @rest.__send__(op, "http://rest-test.iron.io/code/400")
+        assert false, "shouldn't get here"
+      rescue Rest::HttpError => ex
+        puts "Expected error: #{ex}"
+        #p ex.backtrace
+        assert ex.is_a?(Rest::HttpError)
+        assert ex.response
+        assert ex.response.body
+        assert ex.code == 400
+      end
     end
+
   end
 
   def test_500
-    puts '500'
-    begin
-      response = @rest.get("http://rest-test.iron.io/code/500")
-      assert false, "shouldn't get here"
-    rescue Rest::HttpError => ex
-      puts "EX: " + ex.inspect
-      p ex.backtrace
-      assert ex.is_a?(Rest::HttpError)
-      assert ex.response
-      assert ex.response.body
-      assert ex.code == 500
+    puts 'test_500'
+    ALL_OPS.each do |op|
+      puts "Trying #{op}"
+      begin
+        response = @rest.__send__(op, "http://rest-test.iron.io/code/500")
+        assert false, "shouldn't get here"
+      rescue Rest::HttpError => ex
+        puts "Expected error: #{ex}"
+        #p ex.backtrace
+        assert ex.is_a?(Rest::HttpError)
+        assert ex.response
+        assert ex.response.body
+        assert ex.code == 500
+      end
     end
   end
 
@@ -107,22 +119,39 @@ class TestRest < TestBase
   def test_post_with_headers
 
     @token = "abctoken"
+    oauth = "OAuth #{@token}"
     headers = {
         'Content-Type' => 'application/json',
-        'Authorization' => "OAuth #{@token}",
+        'Authorization' => oauth,
         'User-Agent' => "someagent"
     }
+    key = "rest-gem-post"
     body = {"foo" => "bar"}
-    response = @rest.post("#{bin}",
+    response = @rest.post("http://rest-test.iron.io/code/200?store=#{key}",
                           :body => body,
                           :headers => headers)
     p response
+    response = @rest.get("http://rest-test.iron.io/stored/#{key}")
+    parsed = JSON.parse(response.body)
+    p parsed
+    assert_equal body, JSON.parse(parsed['body'])
+    assert_equal oauth, parsed['headers']['Authorization'.upcase]
+
+    body2 = "hello world"
+    response = @rest.post("http://rest-test.iron.io/code/200?store=#{key}",
+                          :body => body2,
+                          :headers => headers)
+    p response
+    response = @rest.get("http://rest-test.iron.io/stored/#{key}")
+    parsed = JSON.parse(response.body)
+    assert_equal body2, parsed['body']
+
     response = @rest.post("http://rest-test.iron.io/code/200",
                           :body => body,
                           :headers => headers)
     p response
 
-    response = @rest.post("#{bin}",
+    response = @rest.post("http://rest-test.iron.io/code/200?store=#{key}",
                           :body => "some string body",
                           :headers => headers)
     p response

data/test/tmp.rb

@@ -9,16 +9,5 @@ class TestTemp < TestBase
 
   end
 
-  def test_gzip
-
-    options = {}
-    url = "http://api.stackexchange.com/2.1/users?order=desc&sort=reputation&site=stackoverflow"
-    rest = Rest::Client.new
-
-    res = rest.get(url, options)
-
-    puts res.body
-    assert res.body.include?("items")
-  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rest
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-02 00:00:00.000000000 Z
+date: 2012-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client