emmy-http-client 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35283fd9ab14415f3033f0f384cf8f2596a1c21c
-  data.tar.gz: a93d21ba7741067a021714a507c0d7e53b704bda
+  metadata.gz: 2c7fc57b8e4db179543db0f0c952b9a83ac21c21
+  data.tar.gz: e67dc588346d1b4d4890c2f8e3b5108c66a635de
 SHA512:
-  metadata.gz: d93a2971c251fcc46f7b067249ad4a9e23ad8863fefc3a99c4677dbbccb1a08e2c1a233f7f23ee1718e0359538667ae0680df2586785e721fd17766ee891248d
-  data.tar.gz: 1c10235bcae47cc4b7135398a754caf9a677f81489e41b34902bdd01303c38ddfb08dca30c21bc414dc248d5e3b139c4619d95c925a1a24aa2c970f08306abd6
+  metadata.gz: b41434ae7b141ff5dd5792d715a4634a12d89fb0f1fca5f486c0021f46942ada2635c15c3d5e0f2945fb6912c6f540d092c3c28be8d64762eb398beca5384dc8
+  data.tar.gz: d531c99e24c15f9824730031635a074da2bc16a395c6d6e881e7df36384c099055b9a557bf4b88110e2c0c8e5dd8ff267841e087b29b71c3412230ed17c48383

data/.rspec

@@ -1,2 +1,3 @@
 --format documentation
 --color
+--tag ~skip

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in emmy-http-client.gemspec
 gemspec
+
+gem 'emmy-http', path: '~/Dropbox/Projects/emmy/emmy-http'

data/emmy-http-client.gemspec

@@ -20,10 +20,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "http_parser.rb", "0.6.0"
+  spec.add_dependency "addressable", ">= 2.3.8"
   spec.add_dependency "event_object", "~> 0.9.1"
   spec.add_dependency "fibre", "~> 0.9.7"
   spec.add_dependency "emmy-machine", "~> 0.1.7"
-  spec.add_dependency "emmy-http", "~> 0.1.6"
+  #spec.add_dependency "emmy-http", "~> 0.1.7"
 
   spec.add_development_dependency "bundler", "~> 1.9"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/emmy_http/client.rb

@@ -1,3 +1,4 @@
+require 'base64'
 require 'event_object'
 require 'emmy_http'
 require 'fibre'
@@ -8,7 +9,7 @@ require "emmy_http/client/cookie"
 require "emmy_http/client/parser"
 require "emmy_http/client/adapter"
 require "emmy_http/client/client"
-require "emmy_http/client/encoding"
+require "emmy_http/client/encoders"
 
 module EmmyHttp
   module Client
@@ -16,5 +17,10 @@ module EmmyHttp
     HTTP_VERSION = 'HTTP/1.1'.freeze
 
     autoload :Monitor, "emmy_http/client/monitor"
+
+    module Decoders
+      autoload :Deflate, "emmy_http/client/decoders/deflate"
+      autoload :GZip,    "emmy_http/client/decoders/gzip"
+    end
   end
 end

data/lib/emmy_http/client/client.rb

@@ -14,6 +14,7 @@ module EmmyHttp
     attr_accessor :adapter
     attr_accessor :parser
     attr_accessor :stop_reason
+    attr_accessor :decoder
 
     attr_accessor :redirects
 
@@ -46,31 +47,25 @@ module EmmyHttp
           headers: headers,
           body: ''
         )
+        client.decoder = new_decoder_by_encoding(headers['Content-Encoding']) if request.decoding
         operation.head!(response, operation, connection)
         #parser.reset = true if request.no_body?
       end
 
       parser.on :body do |chunk|
-        response.data!(chunk)
+        response.data!(client.decoder ? (client.decoder.decompress(chunk) || '') : chunk)
       end
 
       parser.on :completed do
         client.response.finish
-
-        if request.keep_alive?
-          change_state(:success)
-          dettach(conn)
-          operation.success!(response, operation, connection)
-        else
-          client.stop
-        end
+        request.keep_alive? ? finalize : client.stop
       end
 
       change_state(:wait_connect)
     end
 
     def connect
-      connection.start_tls(request.ssl ? request.ssl.serializable_hash : {}) if request.ssl?
+      connection.start_tls(request.ssl ? request.ssl.serializable_hash : {}) if ssl?
       send_request
       change_state(:wait_response)
     end
@@ -96,35 +91,32 @@ module EmmyHttp
 
       if response && response.redirection?
         change_state(:redirect)
-        self.url = URI(response.location)
+        self.url = url + response.location
         self.response = nil
         parser.reset!
         operation.reconnect
         return
       end
 
-      if response && response.finished?
-        change_state(:success)
-        dettach(connection)
-        operation.success!(response, operation, connection)
-      else
-        change_state(:catch_error)
-        operation.error!(reason.new.to_s || 'Invalid response')
-      end
+      finalize(reason)
     end
 
     def send_request
       headers = {}
       body    = prepare_body(headers)
+      body    = Encoders.encode_body(request.headers["Content-Encoding"], body) if request.encoding?
 
       prepare_headers(headers)
       send_http_request(headers, body)
     end
 
     def prepare_url
-      @url       = request.url
+      @url = request.real_url
+      raise 'relative url' if @url.relative?
+
+      @url.normalize!
       @url.path  = request.path.to_s if request.path
-      @url.query = request.query.is_a?(Hash) ? Encoding.query(request.query) : request.query.to_s if request.query
+      @url.query = request.query.is_a?(Hash) ? Encoders.query(request.query) : request.query.to_s if request.query
     end
 
     def prepare_body(headers)
@@ -137,8 +129,8 @@ module EmmyHttp
         body_text
 
       elsif form
-        form_encoded = form.is_a?(String) ? form : Encoding.www_form(form)
-        body_text = Encoding.rfc3986(form_encoded)
+        form_encoded = form.is_a?(String) ? form : Encoders.www_form(form)
+        body_text = Encoders.rfc3986(form_encoded)
         headers['Content-Type'] = 'application/x-www-form-urlencoded'
         headers['Content-Length'] = body_text.bytesize
         body_text
@@ -165,9 +157,9 @@ module EmmyHttp
 
       # TODO: cookie
 
-      headers['Connection']    = 'close' unless request.keep_alive?
-      headers['User-Agent']    =  Client::USER_AGENT unless headers.key? 'User-Agent'
-      headers['Authorization'] = url.userinfo.split(/:/, 2) if url.userinfo
+      headers['Connection']      = 'close' unless request.keep_alive?
+      headers['User-Agent']      =  Client::USER_AGENT unless headers.key? 'User-Agent'
+      headers['Authorization'] ||= Encoders.encode_auth(url.userinfo) if url.userinfo
 
       unless headers.key? 'Host'
         headers['Host']  = url.host
@@ -191,10 +183,26 @@ module EmmyHttp
       connection.send_stream_file_data request.file if request.file
     end
 
+    def finalize(reason=nil)
+      dettach(connection)
+      if response && response.finished?
+        change_state(:success)
+        response.data!(decoder.finalize || '') if decoder
+        operation.success!(response, operation, connection)
+      else
+        change_state(:catch_error)
+        operation.error!(reason ? reason.new.to_s : 'Invalid response')
+      end
+    end
+
     def url_path
       url.query ? '/' + url.path + '?' + url.query : '/' + url.path
     end
 
+    def ssl?
+      request.ssl || url.scheme == 'https' || url.port == 443
+    end
+
     def stop(reason=nil)
       @stop_reason ||= reason
       connection.close_connection if connection
@@ -217,8 +225,19 @@ module EmmyHttp
       stop_listen conn, :close
     end
 
+    def new_decoder_by_encoding(encoding)
+      case encoding
+      when 'deflate', 'compressed'
+        EmmyHttp::Client::Decoders::Deflate.new
+      when 'gzip'
+        EmmyHttp::Client::Decoders::GZip.new
+      else
+        nil
+      end
+    end
+
     def to_a
-      ["tcp://#{url.host}:#{url.port}", connection || EmmyMachine::Connection, method(:initialize_connection), self]
+      ["tcp://#{url.host}:#{url.port || url.default_port}", connection || EmmyMachine::Connection, method(:initialize_connection), self]
     end
 
     #<<<

data/lib/emmy_http/client/decoders/deflate.rb

@@ -0,0 +1,24 @@
+require 'zlib'
+
+module EmmyHttp
+  # rfc1951
+  class Client::Decoders::Deflate
+    def initialize
+      @i_gz = Zlib::Inflate.new(Zlib::MAX_WBITS)
+    end
+
+    def decompress(chunk)
+      @i_gz.inflate(chunk)
+    rescue Zlib::Error => e
+      raise EmmyHttp::DecoderError, e
+    end
+
+    def finalize
+      decompress(nil)
+    ensure
+      @i_gz.close
+    end
+
+    #<<<
+  end
+end

data/lib/emmy_http/client/{encoding.rb → encoders.rb}

@@ -1,5 +1,5 @@
 module EmmyHttp
-  module Encoding
+  module Encoders
     extend self
 
     def escape(str)
@@ -26,6 +26,31 @@ module EmmyHttp
       end
     end
 
+    def encode_auth(userinfo)
+      "Basic #{Base64.strict_encode64(userinfo)}"
+    end
+
+    def encode_body(encoding, body)
+      require 'zlib'
+      require 'stringio'
+
+      case encoding
+      when "gzip"
+        wio = StringIO.new("w")
+        begin
+          w_gz = Zlib::GzipWriter.new(wio)
+          w_gz.write(body)
+        rescue
+          raise EmmyHttp::EncoderError
+        ensure
+          w_gz.close
+        end
+        wio.string
+      else
+        body
+      end
+    end
+
     #<<<
   end
 end

data/lib/emmy_http/client/version.rb

@@ -1,5 +1,5 @@
 module EmmyHttp
   module Client
-    VERSION = "0.1.4"
+    VERSION = "0.1.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emmy-http-client
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - inre
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-04-22 00:00:00.000000000 Z
+date: 2015-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
@@ -25,61 +25,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.6.0
 - !ruby/object:Gem::Dependency
-  name: event_object
+  name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 2.3.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 2.3.8
 - !ruby/object:Gem::Dependency
-  name: fibre
+  name: event_object
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.7
+        version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.7
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
-  name: emmy-machine
+  name: fibre
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.7
+        version: 0.9.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.7
+        version: 0.9.7
 - !ruby/object:Gem::Dependency
-  name: emmy-http
+  name: emmy-machine
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: 0.1.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: 0.1.7
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -128,7 +128,8 @@ files:
 - lib/emmy_http/client/adapter.rb
 - lib/emmy_http/client/client.rb
 - lib/emmy_http/client/cookie.rb
-- lib/emmy_http/client/encoding.rb
+- lib/emmy_http/client/decoders/deflate.rb
+- lib/emmy_http/client/encoders.rb
 - lib/emmy_http/client/monitor.rb
 - lib/emmy_http/client/parser.rb
 - lib/emmy_http/client/version.rb