emmy-http-client 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52d1bbbfc9f210e48a6f7d8dd98631f3783e9202
-  data.tar.gz: 85c2d04387f9e94b8ec898f9c309e3521db19fe4
+  metadata.gz: c27535d963d40f0d17b129ab02e4cda3ac272b58
+  data.tar.gz: 69c59bb5c7e76c3b0b8b3b3b71f37f93669d8f48
 SHA512:
-  metadata.gz: 2a43d921938468c52fa7cfa850b5a42671831043a277f5207179e9bbb5f01905fba0bd30674337a9bc16b1e836153c333c38bdc132edb03a806f912df8401658
-  data.tar.gz: fb891ed56dc5f0a45622f9c88e460fe9c15a1a3bb77df63db70be8bcf182f7c6a49e79a63e8cb59193baff7e4c099ffb3be22a2b0179ba6f02e0e83819e1a109
+  metadata.gz: c65de5c246c347188b8b3fd1e58e91abbfa7bc332858d3d24cdddfb2da1ecaf47e50626908e58f647bcd15dc0a1a2d15109a5e828147dd8c5cd39c199a40edd5
+  data.tar.gz: 56043aa98b97cd0114967e50978106d3fee22f0a967e2ea6b4e9fcb2cbc22cad0a19f9ca45156f1ebeb76c206712ee5eddce381e1b36c5abc4d6dd1d8d36f44b

data/emmy-http-client.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   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.6"
 
   spec.add_development_dependency "bundler", "~> 1.9"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/emmy_http/client/adapter.rb

@@ -8,6 +8,11 @@ module EmmyHttp
     def delegate=(operation)
       @operation = operation
       @client = Client::Client.new(operation.request, self)
+      # if already connected
+      if operation.connection
+        client.initialize_connection(operation.connection)
+        client.connect
+      end
     end
 
     def to_a

data/lib/emmy_http/client/client.rb

@@ -13,6 +13,7 @@ module EmmyHttp
     attr_accessor :operation
     attr_accessor :adapter
     attr_accessor :parser
+    attr_accessor :stop_reason
 
     attr_accessor :redirects
 
@@ -26,7 +27,6 @@ module EmmyHttp
       change_state(:idle)
     end
 
-
     def initialize_connection(conn)
       @connection = conn
       @parser  = Client::Parser.new
@@ -36,50 +36,7 @@ module EmmyHttp
       conn.pending_connect_timeout = request.timeouts.connect
       conn.comm_inactivity_timeout = request.timeouts.inactivity
 
-      conn.on :connect do
-        conn.start_tls(client.request.ssl ? client.request.ssl.serializable_hash : {}) if client.request.ssl?
-        send_request
-        change_state(:wait_response)
-      end
-
-      conn.on :data do |chunk|
-        begin
-          parser << chunk
-        rescue EmmyHttp::ParserError => e
-          conn.error!(e.message)
-        end
-      end
-
-      conn.on :close do
-        if state == :body && !client.response.content_length?
-          client.response.finish
-        end
-
-        if client.response && client.response.redirection?
-          change_state(:redirect)
-          client.url = URI(client.response.location)
-          client.response = nil
-          parser.reset!
-          operation.reconnect
-        end
-
-        if client.response && client.response.finished?
-          change_state(:success)
-          operation.success!(response, operation, connection)
-        end
-      end
-
-      conn.on :error do |message|
-        change_state(:catch_error)
-      end
-
-      conn.on :handshake do
-
-      end
-
-      conn.on :verify_peer do
-
-      end
+      attach(conn)
 
       parser.on :head do |headers|
         #parser.http_version
@@ -99,12 +56,61 @@ module EmmyHttp
 
       parser.on :completed do
         client.response.finish
-        stop
+        if request.keep_alive?
+          change_state(:success)
+          dettach(conn)
+          operation.success!(response, operation, connection)
+        else
+          client.close
+        end
       end
 
       change_state(:wait_connect)
     end
 
+    def connect
+      connection.start_tls(request.ssl ? request.ssl.serializable_hash : {}) if request.ssl?
+      send_request
+      change_state(:wait_response)
+    end
+
+    def data(chunk)
+      begin
+        parser << chunk
+      rescue EmmyHttp::ParserError => e
+        stop(e.message)
+      end
+    end
+
+    def close(reason=nil)
+      if stop_reason
+        change_state(:catch_error)
+        operation.error!(stop_reason)
+        return
+      end
+
+      if state == :body && !response.content_length?
+        response.finish
+      end
+
+      if response && response.redirection?
+        change_state(:redirect)
+        self.url = URI(response.location)
+        self.response = nil
+        parser.reset!
+        operation.reconnect
+      end
+
+      if response && response.finished?
+        change_state(:success)
+        dettach(connection)
+        operation.success!(response, operation, connection)
+      else
+        change_state(:catch_error)
+        operation.error!('invalid response')
+      end
+    end
+
     def send_request
       headers = {}
       body    = prepare_body(headers)
@@ -187,7 +193,8 @@ module EmmyHttp
       url.query ? '/' + url.path + '?' + url.query : '/' + url.path
     end
 
-    def stop(reason='')
+    def stop(reason=nil)
+      @stop_reason ||= reason
       connection.close_connection if connection
     end
 
@@ -196,6 +203,18 @@ module EmmyHttp
       change!(state, self)
     end
 
+    def attach(conn)
+      listen conn, :connect, :connect
+      listen conn, :data, :data
+      listen conn, :close, :close
+    end
+
+    def dettach(conn)
+      stop_listen conn, :connect
+      stop_listen conn, :data
+      stop_listen conn, :close
+    end
+
     def to_a
       ["tcp://#{url.host}:#{url.port}", connection || EmmyMachine::Connection, method(:initialize_connection), self]
     end

data/lib/emmy_http/client/version.rb

@@ -1,5 +1,5 @@
 module EmmyHttp
   module Client
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emmy-http-client
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - inre
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-04-20 00:00:00.000000000 Z
+date: 2015-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
@@ -66,20 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.7
-- !ruby/object:Gem::Dependency
-  name: emmy-http
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.6
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement