emmy-extends 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3445b83150979fc91751faea105e47ab4959f2a4
-  data.tar.gz: bb928f912f37a0f3517b5a9b7da756ac8d0f494e
+  metadata.gz: 62c3d3f001e9b3d11387006dac45b263cc5c5b58
+  data.tar.gz: 2604f4f3c1bf4574bc01b764dc2c33195d96f330
 SHA512:
-  metadata.gz: 29b398950507b0298e357c9338ceb5ff746509773fbf0f57b3e2c5aadefa954f8a1f638b4a8ff6cfb41f5da8a23a80bcd420500d855c4e15d9122c892cceb06a
-  data.tar.gz: be3c1b5191ca3f576b4eaae238a08a9fc875d65d24231d8c5e0983841f16f1a7d63c534b00ba2bc104f61b853464fa68fa7ad502ee2dd33929076729df5c7591
+  metadata.gz: 53f5b935129d09a71a202715b3a30dc3f07f3d33aff5964cebcd163e34f00c764f5199696ad78753916b74721891d60573d75359c560471d14f087b69292f40b
+  data.tar.gz: 9e81ebdc54bcac45cf9db94ae0fced2b06efd296b995090134ff60e11e9833ce9bfbe46ea7c9ced6cfa7da9f9653eed3009a69eed607c10a23427f83b1e67b35

data/README.md

@@ -5,7 +5,7 @@
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'em-http-request' # if savon em-http-request
+gem 'em-http-request' # if em-http-request required
 gem 'httpi'           # if httpi required
 gem 'mysql2'          # if mysql2 required
 gem 'savon', github: 'chelovekov/savon' # if savon required
@@ -20,7 +20,7 @@ require 'emmy_extends/em_http_request'
 EmmyMachine.run_block do
   using Fibre::Synchrony
   request = EmmyHttp::Request.new(
-    method: 'get',
+    type: 'get',
     url: 'http://github.com'
   )
   operation1 = EmmyHttp::Operation.new(request, EmmyExtends::EmHttpRequest::Adapter.new)

data/emmy-extends.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "eventmachine", "~> 1.0.3"
   spec.add_dependency "emmy-machine", "~> 0.1.6"
-  spec.add_dependency "emmy-http", "~> 0.1.1"
+  spec.add_dependency "emmy-http", "~> 0.1.2"
 
   spec.add_development_dependency "rspec", "~> 3"
   spec.add_development_dependency "bundler", "~> 1.7"

data/lib/emmy_extends/em_http_request/adapter.rb

@@ -81,8 +81,8 @@ module EmmyExtends
 
     def setup_http_client
       @http_client = begin
-        method = delegate.request.method.to_s.upcase
-        http_client_options = HttpClientOptions.new(delegate.request.url, request_options, method)
+        type = delegate.request.type.to_s.upcase # http method
+        http_client_options = HttpClientOptions.new(delegate.request.url, request_options, type)
         EventMachine::HttpClient.new(@http_request, http_client_options).tap do |client|
           client.stream do |chunk|
             @body << chunk

data/lib/emmy_extends/httpi/adapter.rb

@@ -23,7 +23,7 @@ module EmmyExtends
       }
     end
 
-    def request(method)
+    def request(type)
       if @request.on_body
         raise NotSupportedError, "EM-HTTP-Request does not support response streaming"
       end
@@ -37,7 +37,7 @@ module EmmyExtends
 
       @http_request = EmmyHttp::Request.new(
         url: build_request_url(@request.url),
-        method: method,
+        type: type,
         timeouts: { connect: @request.open_timeout, inactivity: @request.read_timeout },
         headers: @request.headers.to_hash,
         body: @request.body,

data/lib/emmy_extends/thin/backend.rb

@@ -29,8 +29,7 @@ module EmmyExtends
       conn.delegate = thin_connection
       super(thin_connection)
       @running = true # FIXME: maybe not here
-
-      conn.following.post_init
+      conn.delegate.post_init
     end
 
     def to_a

data/lib/emmy_extends/thin/class_methods.rb

@@ -1,3 +1,5 @@
+require "emmy_extends/core_ext"
+
 module EmmyExtends
   module Thin::ClassMethods
     using CoreExt

data/lib/emmy_extends/thin/connection.rb

@@ -6,6 +6,11 @@ module EmmyExtends
       @delegate.unbind
     end
 
+    def receive_data(*a)
+      @delegate.receive_data(*a)
+    end
+
+    # fix me did not works
     def method_missing(name, *a, &b)
       @delegate.send(name, *a, &b)
     end

data/lib/emmy_extends/thin/controller.rb

@@ -8,8 +8,7 @@ module EmmyExtends
     def initialize(url, app, options={})
       @url = URI(url.to_s)
       @app = app
-      options[:backend] ||= EmmyExtends::Thin::Backend
-      super(options)
+      super(options_with_defaults(options))
     end
 
     def start
@@ -33,7 +32,11 @@ module EmmyExtends
       # ssl support
       if @options[:ssl]
         server.ssl = true
-        server.ssl_options = { :private_key_file => @options[:ssl_key_file], :cert_chain_file => @options[:ssl_cert_file], :verify_peer => !@options[:ssl_disable_verify] }
+        server.ssl_options = {
+          private_key_file: @options[:ssl_key_file],
+          cert_chain_file: @options[:ssl_cert_file],
+          verify_peer: !@options[:ssl_disable_verify]
+        }
       end
 
       # Detach the process, after this line the current process returns
@@ -56,8 +59,11 @@ module EmmyExtends
 
       def options_with_defaults(opt)
         {
+          backend:              EmmyExtends::Thin::Backend,
+          threaded:             false,
+          no_epoll:             false,
           chdir:                Dir.pwd,
-          environment:          env,
+          environment:          'development',
           address:              '0.0.0.0',
           port:                 3434,
           timeout:              30, #sec

data/lib/emmy_extends/version.rb

@@ -1,3 +1,3 @@
 module EmmyExtends
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/spec/em_http_request_spec.rb

@@ -9,7 +9,7 @@ describe EmmyExtends::EmHttpRequest do
 
   it "should send request to httpbin.org" do
     request = EmmyHttp::Request.new(
-      method: 'get',
+      type: 'get',
       url: 'http://httpbin.org'
     )
     operation = EmmyHttp::Operation.new(request, EmmyExtends::EmHttpRequest::Adapter.new)
@@ -23,7 +23,7 @@ describe EmmyExtends::EmHttpRequest do
 
   it "should send https request to httpbin.org" do
     request = EmmyHttp::Request.new(
-      method: 'get',
+      type: 'get',
       url: 'https://httpbin.org'
     )
     operation = EmmyHttp::Operation.new(request, EmmyExtends::EmHttpRequest::Adapter.new)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emmy-extends
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - che
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-07 00:00:00.000000000 Z
+date: 2014-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement