em-rest-client 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33ad6f9a9a457e88f3f1a141ded4d63f9922c99d
-  data.tar.gz: e865d4f6b1b46d7fbb9d990e1c37a19e34c8d0bf
+  metadata.gz: '06104576379630975ec5aaab0e871ed05e0e2548'
+  data.tar.gz: d864b33a587822a8e583ad01376f3fc4385af69e
 SHA512:
-  metadata.gz: 567fed64ed7e316a6876107affdd6fb227786bbc3e641ba3b62615cf2dea53df0c6ade0a459b828567c0b1b06cec5e0c53bef13351db967db2ad99356ead3a4d
-  data.tar.gz: d423bc5560975a5600213be2620ec208791095646121a0b319bf283d1f34f8a4039b1810d63d36aeac4c97ab5cea306c0aa5cd4b7a2bd21ce6bc0a9fa61c5f67
+  metadata.gz: 8e1a3d562a9fa9a5021ec1c7c9efdf8883e70a9385f1f744f7dfd7a36a592d72cd089f72f4c4d016fbe6d1c5ef1e4ecf8c47a8de510e9c1dcbf7ebd333025ab5
+  data.tar.gz: a777f0815fb079d4b0b3096327eea9651cbbbc795d0dc692c3e7fc584ae83fcd2cfee38991f9439028267135eb0b490c36a3b6d9674a84f8ffe7371ce8c2b861

data/.gitignore

@@ -1,5 +1,6 @@
 /.bundle/
 /.yardoc
+/Gemfile
 /Gemfile.lock
 /_yardoc/
 /coverage/

data/.travis.yml

@@ -1,3 +1,11 @@
 language: ruby
 rvm:
-  - 2.2.5
+  - 2.2.7
+  - 2.3.4
+  - 2.4.1
+gemfile:
+  - Gemfile1
+  - Gemfile2
+cache: bundler
+script:
+  - bundle exec rspec

data/CHANGELOG.md

@@ -0,0 +1,9 @@
+# Changelog
+
+## 0.1.0
+
+* Support RestClient v2.x.x
+
+## 0.0.1
+
+* Initial release

data/{Gemfile → Gemfile1}

@@ -1,3 +1,5 @@
 source 'https://rubygems.org'
 
 gemspec
+
+gem 'rest-client', '1.8.0'

data/Gemfile2

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gemspec
+
+gem 'rest-client', '2.0.2'

data/em-rest-client.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "em-rest-client"
-  spec.version       = "0.0.1"
+  spec.version       = "0.1.0"
   spec.authors       = ["Andriy Yanko"]
   spec.email         = ["andriy.yanko@railsware.com"]
 
@@ -17,11 +17,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "rest-client", "~> 1.8"
+  spec.add_development_dependency "rest-client", ">= 1.8"
   spec.add_development_dependency "em-http-request", "~> 1.1"
 
   spec.add_development_dependency "bundler", "~> 1.9"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.4.0"
-  spec.add_development_dependency "webmock", "~> 2.0"
+  spec.add_development_dependency "webmock", "~> 3.0"
 end

data/lib/em-rest-client.rb

@@ -1,2 +1,3 @@
-require 'em-rest-client/rest_client'
+require 'em-rest-client/configuration'
+require 'em-rest-client/request'
 require 'em-rest-client/em_http_request'

data/lib/em-rest-client/configuration.rb

@@ -0,0 +1,11 @@
+require 'rest_client'
+
+module RestClient
+  class << self
+    attr_reader :major_version
+    attr_accessor :adapter
+  end
+
+  self.instance_variable_set :@major_version, VERSION.to_i
+  self.adapter = :net_http
+end

data/lib/em-rest-client/em_http_request.rb

@@ -1,107 +1,2 @@
-require 'em-http'
-require 'fiber'
-
-module RestClient
-  class EmHttpRequest < Request
-
-    def initialize(args)
-      raise ArgumentError, ':block_response option is not supported' if args[:block_response]
-      super(args)
-    end
-
-    def execute(&block)
-      uri = parse_url_with_auth(url)
-      connection = build_connection(uri)
-      client = transmit(connection, &block)
-      raise client.error if client.error
-      net_http_response = build_net_http_response(client)
-      process_result(net_http_response, &block)
-    ensure
-      payload.close if payload
-    end
-
-    private
-
-    def transmit(connection, &block)
-      client = nil
-      if EM.reactor_running?
-        client = sync_transmit(connection, &block)
-      else
-        EM.run do
-          Fiber.new do
-            client = sync_transmit(connection, &block)
-            EM.stop
-          end.resume
-        end
-      end
-      client
-    end
-
-    def sync_transmit(connection, &block)
-      client = build_client(connection)
-      if client.error
-        client
-      else
-        fiber = Fiber.current
-        client.callback { fiber.resume(client) }
-        client.errback { fiber.resume(client) }
-        Fiber.yield
-      end
-    end
-
-    def build_connection(uri)
-      uri = uri.dup
-      uri.user = nil
-      uri.password = nil
-      EM::HttpRequest.new(uri, build_connection_options)
-    end
-
-    def build_client(connection)
-      connection.setup_request(method, build_request_options)
-    end
-
-    def build_connection_options
-      options = {}
-      options[:connect_timeout] = open_timeout if open_timeout
-      options[:inactivity_timeout] = timeout if timeout
-      if RestClient.proxy
-        proxy_uri = URI.parse(RestClient.proxy)
-        options[:proxy] = {
-          host: proxy_uri.host,
-          port: proxy_uri.port,
-          authorization: [proxy_uri.user, proxy_uri.password]
-        }
-      end
-      options
-    end
-
-    def build_request_options
-      options = {}
-      options[:decoding] = false
-      options[:head] = processed_headers
-      if user
-        options[:head]['authorization'] = [user, password]
-      end
-      options[:body] = payload.to_s
-      options
-    end
-
-    def build_net_http_response(client)
-      klass = Net::HTTPResponse.send(
-        :response_class,
-        client.response_header.status.to_s
-      )
-      response = klass.new(
-        client.response_header.http_version,
-        client.response_header.status.to_s,
-        client.response_header.http_reason
-      )
-      client.response_header.raw.each do |k, v|
-        response.add_field(k, v)
-      end
-      response.body = client.response
-      response.instance_variable_set :@read, true
-      response
-    end
-  end
-end
+require 'em-rest-client/em_http_request/base'
+require "em-rest-client/em_http_request/v#{RestClient::VERSION.to_i}"

data/lib/em-rest-client/em_http_request/base.rb

@@ -0,0 +1,114 @@
+require 'em-http'
+require 'fiber'
+
+module RestClient
+  class EmHttpRequest < Request
+
+    def initialize(args)
+      raise ArgumentError, ':block_response option is not supported' if args[:block_response]
+      super(args)
+    end
+
+    def execute(&block)
+      uri = parse_url_with_auth(url)
+      connection = build_connection(uri)
+      client = transmit(connection, &block)
+      raise client.error if client.error
+      net_http_response = build_net_http_response(client)
+      process_result(net_http_response, &block)
+    ensure
+      payload.close if payload
+    end
+
+    private
+
+    def transmit(connection, &block)
+      client = nil
+      if EM.reactor_running?
+        client = sync_transmit(connection, &block)
+      else
+        EM.run do
+          Fiber.new do
+            client = sync_transmit(connection, &block)
+            EM.stop
+          end.resume
+        end
+      end
+      client
+    end
+
+    def sync_transmit(connection, &block)
+      client = build_client(connection)
+      if client.error
+        client
+      else
+        fiber = Fiber.current
+        client.callback { fiber.resume(client) }
+        client.errback { fiber.resume(client) }
+        Fiber.yield
+      end
+    end
+
+    def build_connection(uri)
+      uri = uri.dup
+      uri.user = nil
+      uri.password = nil
+      EM::HttpRequest.new(uri, build_connection_options)
+    end
+
+    def build_client(connection)
+      connection.setup_request(method, build_request_options)
+    end
+
+    def build_connection_options
+      options = {}
+
+      if connect_timeout = build_connect_timeout
+        options[:connect_timeout] = connect_timeout
+      end
+
+      if inactivity_timeout = build_inactivity_timeout
+        options[:inactivity_timeout] = inactivity_timeout
+      end
+
+      if proxy_uri = build_proxy_uri
+        options[:proxy] = {
+          host: proxy_uri.host,
+          port: proxy_uri.port,
+          authorization: [proxy_uri.user, proxy_uri.password]
+        }
+      end
+
+      options
+    end
+
+    def build_request_options
+      options = {}
+      options[:decoding] = false
+      options[:head] = processed_headers
+      if user
+        options[:head]['authorization'] = [user, password]
+      end
+      options[:body] = payload.to_s
+      options
+    end
+
+    def build_net_http_response(client)
+      klass = Net::HTTPResponse.send(
+        :response_class,
+        client.response_header.status.to_s
+      )
+      response = klass.new(
+        client.response_header.http_version,
+        client.response_header.status.to_s,
+        client.response_header.http_reason
+      )
+      client.response_header.raw.each do |k, v|
+        response.add_field(k, v)
+      end
+      response.body = client.response
+      response.instance_variable_set :@read, true
+      response
+    end
+  end
+end

data/lib/em-rest-client/em_http_request/v1.rb

@@ -0,0 +1,18 @@
+RestClient::EmHttpRequest.class_eval do
+
+  private
+
+  def build_connect_timeout
+    open_timeout
+  end
+
+  def build_inactivity_timeout
+    timeout
+  end
+
+  def build_proxy_uri
+    return unless RestClient.proxy
+    URI.parse(RestClient.proxy)
+  end
+
+end

data/lib/em-rest-client/em_http_request/v2.rb

@@ -0,0 +1,19 @@
+RestClient::EmHttpRequest.class_eval do
+
+  private
+
+  alias_method :parse_url_with_auth, :parse_url_with_auth!
+
+  def build_connect_timeout
+    open_timeout
+  end
+
+  def build_inactivity_timeout
+    read_timeout
+  end
+
+  def build_proxy_uri
+    proxy_uri
+  end
+
+end

data/lib/em-rest-client/request.rb

@@ -0,0 +1,22 @@
+module RestClient
+  class Request
+    class << self
+      def execute(args, &block)
+        adapter_name = args.fetch(:adapter, RestClient.adapter)
+        klass = get_adapter_klass(adapter_name)
+        klass.new(args).execute(&block)
+      end
+
+      def get_adapter_klass(name)
+        case name
+        when :net_http
+          Request
+        when :em_http
+          EmHttpRequest
+        else
+          raise NotImplementedError, "Unsupported adapter: #{adapter.inspect}"
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: em-rest-client
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Andriy Yanko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-31 00:00:00.000000000 Z
+date: 2017-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 description: 
 email:
 - andriy.yanko@railsware.com
@@ -104,7 +104,9 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
-- Gemfile
+- CHANGELOG.md
+- Gemfile1
+- Gemfile2
 - LICENSE
 - README.md
 - Rakefile
@@ -112,8 +114,12 @@ files:
 - bin/setup
 - em-rest-client.gemspec
 - lib/em-rest-client.rb
+- lib/em-rest-client/configuration.rb
 - lib/em-rest-client/em_http_request.rb
-- lib/em-rest-client/rest_client.rb
+- lib/em-rest-client/em_http_request/base.rb
+- lib/em-rest-client/em_http_request/v1.rb
+- lib/em-rest-client/em_http_request/v2.rb
+- lib/em-rest-client/request.rb
 homepage: https://github.com/railsware/em-rest-client
 licenses:
 - MIT
@@ -134,8 +140,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: EventMachine::HttpRequest adapter for HTTP REST client
 test_files: []
+has_rdoc: 

data/lib/em-rest-client/rest_client.rb

@@ -1,27 +0,0 @@
-require 'rest_client'
-
-module RestClient
-  class << self
-    attr_accessor :adapter
-  end
-
-  class Request
-    class << self
-      def execute(args, &block)
-        adapter = args.fetch(:adapter, RestClient.adapter)
-        klass =
-          case adapter
-          when :net_http
-            Request
-          when :em_http
-            EmHttpRequest
-          else
-            raise NotImplementedError, "Unsupported adapter: #{adapter.inspect}"
-          end
-        klass.new(args).execute(&block)
-      end
-    end
-  end
-end
-
-RestClient.adapter = :net_http