emmy-extends 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8cd5850d2cf87a79c735d52200c3d96f86399c2c
-  data.tar.gz: 4393a9ae336742bd9df485b3700123e5cd016bc3
+  metadata.gz: 7088fa3fafc3fdc98958ff1734a2522928fe3170
+  data.tar.gz: b7863454fe8471690716ab1d003741af1c5dcdd4
 SHA512:
-  metadata.gz: 807638b36d9f9d3e474037781266fe791bb7e2e2478aacdd383c447af80859d3030eb8a87ab93f557131502eba257d50fd34805e455e553c43e515e21bc91fd3
-  data.tar.gz: f14d2c27a8087b01e346e06e49c652f7c360c153a1d8191d25e477fc66f4abbcde73af719970979651587a8b315a1d8e6cfe31de388b7a759738459018fcfcfa
+  metadata.gz: e10fbf26fcbed70fa700c6ef74493481da16c6a122f5851a904b6cfca0261f796adcc89e7a1947fc684416a465cf3416301a39ea15f2d335e11f01f5769d8f28
+  data.tar.gz: 07bb371f777657cda35cdebc31bfcc90ff61eacac44dd571c02fdd9b39baed50db70d4a1ec597607c651235c06befacad09fe6e108e98fd92b42d4b1fd3dacf3

data/lib/emmy_extends/em_http_request/adapter.rb

@@ -11,16 +11,65 @@ module EmmyExtends
     attr_reader :operation
     attr_reader :response
     attr_reader :url
+    attr_reader :headers
+    attr_reader :body
 
     # required for adapter
 
     def delegate=(operation)
       @operation = operation
-      @url = operation.request.real_url
+      prepare_url
+      @headers = operation.request.headers.clone
+      prepare_body
       setup_http_request
       setup_http_client
     end
 
+    def prepare_url
+      @url = operation.request.real_url
+      raise 'relative url' if url.relative?
+
+      @url.normalize!
+
+      if path = operation.request.real_path
+        raise 'path is not relative' unless path.relative?
+        @url += path
+      end
+      @url.user     = operation.request.user if operation.request.user
+      @url.password = operation.request.password if operation.request.password
+      @url.query = operation.request.query.is_a?(Hash) ? Encoders.query(operation.request.query) : operation.request.query.to_s if operation.request.query
+    end
+
+    def prepare_body
+      raise "attribute `file` unsupported" if operation.request.file
+      body, form, json, file = operation.request.body, operation.request.form, operation.request.json
+
+      @body = if body
+        raise "body cannot be hash" if body.is_a?(Hash)
+        body_text = body.is_a?(Array) ? body.join : body.to_s
+        headers['Content-Length'] = body_text.bytesize
+        body_text
+
+      elsif form
+        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
+
+      elsif json
+        json_string = json.is_a?(String) ? json : (json.respond_to?(:to_json) ? json.to_json : JSON.dump(json))
+        headers['Content-Type']   = 'application/json'
+        headers['Content-Length'] = json_string.size
+        json_string
+
+      else
+        headers['Content-Length'] = 0 if %w('POST PUT').include? operation.request.type
+        '' # empty body
+      end
+    end
+
+
     def to_a
       ["tcp://#{url.host}:#{url.port || url.default_port}", EmmyMachine::Connection, method(:initialize_connection), self]
     end
@@ -76,8 +125,8 @@ module EmmyExtends
         keepalive: false,
         path: url.path,
         query: url.query,
-        body: encode_body(operation.request.body),
-        head: operation.request.headers
+        body: encode_body(body),
+        head: headers
       }
     end
 

data/lib/emmy_extends/thin/backend.rb

@@ -16,7 +16,7 @@ module EmmyExtends
 
     # Stops the server
     def disconnect
-      puts "disconnect"
+      #puts "disconnect"
       #EventMachine.stop_server(@signature)
     end
 

data/lib/emmy_extends/version.rb

@@ -1,3 +1,3 @@
 module EmmyExtends
-  VERSION = "0.1.14"
+  VERSION = "0.1.15"
 end

data/spec/em_http_request_spec.rb

@@ -35,4 +35,38 @@ describe EmmyExtends::EmHttpRequest do
     expect(response.headers["Server"]).to eq("nginx")
     expect(response.body.empty?).to be false
   end
+
+  it "should send http get with params to httpbin.org" do
+    request = EmmyHttp::Request.new(
+      type: 'get',
+      url: 'http://httpbin.org',
+      path: '/bytes{/bytes}',
+      params: {
+        bytes: 1024
+      }
+    )
+    operation = EmmyHttp::Operation.new(request, EmmyExtends::EmHttpRequest::Adapter.new)
+    response = operation.sync
+
+    expect(response.status).to be 200
+    expect(response.headers).to include("Content-Type")
+    expect(response.headers["Server"]).to eq("nginx")
+    expect(response.body.empty?).to be false
+  end
+
+  it "should send http get with params to httpbin.org" do
+    request = EmmyHttp::Request.new(
+      type: 'POST',
+      url: 'http://httpbin.org',
+      path: '/post',
+      json: {points: [{x:5, y:6}, {x:3, y:2}]}
+
+    )
+    operation = EmmyHttp::Operation.new(request, EmmyExtends::EmHttpRequest::Adapter.new)
+    response = operation.sync
+
+    expect(response.status).to be 200
+    expect(response.content_type).to eq("application/json")
+    expect(response.content["json"]).to include('points' => [{'x' => 5, 'y' => 6}, {'x' => 3, 'y' => 2}])
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emmy-extends
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - inre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-25 00:00:00.000000000 Z
+date: 2015-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: emmy-machine