rest 2.0.2 → 2.0.3

data/Gemfile.lock

@@ -1,27 +1,27 @@
 PATH
   remote: .
   specs:
-    rest (2.0.1)
+    rest (2.0.2)
       net-http-persistent
       rest-client (>= 0.3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    excon (0.15.4)
-    ffi (1.1.0)
+    excon (0.16.3)
+    ffi (1.1.5)
     mime-types (1.19)
-    minitest (3.2.0)
+    minitest (3.5.0)
     net-http-persistent (2.7)
-    quicky (0.0.1)
+    quicky (0.1.1)
     rake (0.9.2.2)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    test-unit (2.5.1)
+    test-unit (2.5.2)
     typhoeus (0.4.2)
       ffi (~> 1.0)
       mime-types (~> 1.18)
-    uber_config (0.0.5)
+    uber_config (0.0.6)
 
 PLATFORMS
   ruby

data/Rakefile

@@ -16,7 +16,7 @@ Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
   rdoc.rdoc_dir = 'doc'
-  rdoc.title = "iron_mq #{version}"
+  rdoc.title = "rest #{version}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/lib/rest/client.rb

@@ -11,6 +11,14 @@ module Rest
 
   require_relative 'wrappers/base_wrapper'
 
+  def self.logger=(logger)
+    @logger = logger
+  end
+
+  def self.logger()
+    @logger
+  end
+
   class Client
 
     attr_accessor :options, :logger, :gem
@@ -18,9 +26,9 @@ module Rest
     # - :gem => specify gem explicitly
     #
     def initialize(options={})
-      @logger = Logger.new(STDOUT)
-      @logger.level=Logger::INFO
       @options = options
+      @logger = Logger.new(STDOUT)
+      Rest.logger = @logger
 
       @gem = options[:gem] if options[:gem]
 

data/lib/rest/version.rb

@@ -1,3 +1,3 @@
 module Rest
-  VERSION = "2.0.2"
+  VERSION = "2.0.3"
 end

data/lib/rest/wrappers/net_http_persistent_wrapper.rb

@@ -13,6 +13,14 @@ module Rest
     class NetHttpPersistentResponseWrapper < BaseResponseWrapper
       def initialize(response)
         @response = response
+
+        if response.header['content-encoding'].eql?('gzip')
+          Rest.logger.debug 'GZIPPED'
+          sio = StringIO.new( response.body )
+          gz = Zlib::GzipReader.new( sio )
+          page = gz.read()
+          @body = page
+        end
       end
 
       def code
@@ -20,6 +28,11 @@ module Rest
       end
 
       def body
+        @body || @response.body
+      end
+
+      # In case for some reason you want the unencoded body
+      def body_raw
         @response.body
       end
 
@@ -79,7 +92,11 @@ module Rest
           post = Net::HTTP::Get.new fix_path(uri.request_uri)
           add_headers(post, req_hash, default_headers)
           response = http.request uri, post
-          @client.logger.debug response.class.name
+          if @client.logger.debug?
+            @client.logger.debug "Response class: #{response.class.name}"
+            @client.logger.debug "Response headers: #{response.header.to_hash.inspect}"
+          end
+
           r = NetHttpPersistentResponseWrapper.new(response)
           case response
             when Net::HTTPClientError, Net::HTTPServerError
@@ -92,13 +109,13 @@ module Rest
           #    @client.logger.debug "moved to #{response['location']}"
           #    response = get(response['location'], req_hash, {limit: options[:limit]-1})
           #end
-        #rescue Net::HTTPClientError, Net::HTTPServerError => ex
-        #  raise NetHttpPersistentExceptionWrapper.new(ex)
-        #rescue Net::HTTPServerError => ex
-        #  if ex.code == 404
-        #    return NetHttpPersistentResponseWrapper.new(ex)
-        #  end
-        #  raise NetHttpPersistentExceptionWrapper.new(ex)
+          #rescue Net::HTTPClientError, Net::HTTPServerError => ex
+          #  raise NetHttpPersistentExceptionWrapper.new(ex)
+          #rescue Net::HTTPServerError => ex
+          #  if ex.code == 404
+          #    return NetHttpPersistentResponseWrapper.new(ex)
+          #  end
+          #  raise NetHttpPersistentExceptionWrapper.new(ex)
         end
         r
       end

data/test/test_base.rb

@@ -12,8 +12,7 @@ class TestBase < Test::Unit::TestCase
 
   def setup
     puts 'setup'
-    @rest = Rest::Client.new(:gem => :net_http_persistent)
-    @rest.logger.level = Logger::DEBUG
+    @rest = Rest::Client.new(:gem => :net_http_persistent, :log_level=>Logger::DEBUG)
     @request_bin = "http://requestb.in/13t6hs51"
 
   end

data/test/test_rest.rb

@@ -47,19 +47,6 @@ class TestRest < TestBase
   end
 
   def test_gets
-    @token = "abctoken"
-    headers = {
-        'Content-Type' => 'application/json',
-        'Authorization' => "OAuth #{@token}",
-        'User-Agent' => "someagent"
-    }
-    body = {"foo" => "bar"}
-    response = @rest.get("#{bin}?param1=x")
-
-    # params as hash
-    response = @rest.get("#{bin}?x=y#frag", :params => {:param2 => "abc"})
-    response = @rest.get("#{bin}", :params => {param3: "xyz"})
-    response = @rest.get("#{bin}")
 
     response = @rest.get("http://rest-test.iron.io/code/200")
     assert response.code == 200
@@ -70,6 +57,7 @@ class TestRest < TestBase
   end
 
   def test_404
+    puts 'test_404'
     begin
       response = @rest.get("http://rest-test.iron.io/code/404")
       assert false, "shouldn't get here"
@@ -86,6 +74,7 @@ class TestRest < TestBase
   end
 
   def test_400
+    puts 'test_400'
     begin
       response = @rest.get("http://rest-test.iron.io/code/400")
       assert false, "shouldn't get here"
@@ -141,5 +130,17 @@ class TestRest < 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
 

data/test/tmp.rb

@@ -9,19 +9,16 @@ class TestTemp < TestBase
 
   end
 
-  def test_500
-    puts '500'
-    begin
-      puts 'in block'
-      response = @rest.get("http://rest-test.iron.io/code/500")
-      assert false, "shouldn't get here"
-    rescue => ex
-      p ex
-      assert ex.is_a?(Rest::HttpError)
-      assert ex.response
-      assert ex.response.body
-      assert ex.code == 500
-    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.2
+  version: 2.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-19 00:00:00.000000000 Z
+date: 2012-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client