clientura 0.0.7 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74d80146176c18861d4110a3480cfae4c931a2ca
-  data.tar.gz: 1f8158c8cbe76a740a9cb52ac01b29250f6a7708
+  metadata.gz: be51c881a9b38b3acadcb17ec24e188e6482c2ea
+  data.tar.gz: b67af8babfc9eeef876ca57d7bca2c7631b11951
 SHA512:
-  metadata.gz: b8986b83c18bd5bc284f7b0d98a4f72a61af527dfdac9adec9a60c4779d751b567e4101fe32c2d2b8308c69ba236264facf363296d989159ac5062a3cd75b6dd
-  data.tar.gz: a7c334c6b17508d7b6d35eba0a0fe6af189d4e7c5aad81f37ac4d0991a491f1ce931fa7b0b69877b8ae0d5bfaf1ddee31017db96bc4dc2828da90beaf861ff12
+  metadata.gz: 9a816ec51add374c410513923b9d079d96a04ab16d914e6411ee84beab0c75758d3518dbfdcdc7c79c69f6ad864cfc773a46f1c6f4cfdc66a250e343196f8910
+  data.tar.gz: 80513c9a5c307c6156232766c829a305f057f137bf9c0fae66a5485cc5f8c00cb5dea1d05e60944261aae20230f01de74e2aa9767227fede48b882d669492c18

data/Gemfile

@@ -6,7 +6,7 @@ source 'http://rubygems.org'
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 
-gem 'http', '~> 1.0'
+gem 'typhoeus', '~> 1.0'
 gem 'concurrent-ruby', '~> 1.0'
 gem 'concurrent-ruby-edge', '~> 0.2'
 gem 'concurrent-ruby-ext', '~> 1.0'

data/Gemfile.lock

@@ -24,11 +24,12 @@ GEM
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    domain_name (0.5.20160128)
-      unf (>= 0.0.5, < 1.0.0)
+    ethon (0.8.1)
+      ffi (>= 1.3.0)
     eventmachine (1.0.9.1)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
+    ffi (1.9.10)
     git (1.2.9.1)
     github_api (0.13.1)
       addressable (~> 2.4.0)
@@ -39,15 +40,6 @@ GEM
       oauth2
     hashie (3.4.3)
     highline (1.7.8)
-    http (1.0.2)
-      addressable (~> 2.3)
-      http-cookie (~> 1.0)
-      http-form_data (~> 1.0.1)
-      http_parser.rb (~> 0.6.0)
-    http-cookie (1.0.2)
-      domain_name (~> 0.5)
-    http-form_data (1.0.1)
-    http_parser.rb (0.6.0)
     i18n (0.7.0)
     jeweler (2.0.1)
       builder
@@ -133,11 +125,10 @@ GEM
       rack (~> 1.0)
     thread_safe (0.3.5)
     tilt (2.0.2)
+    typhoeus (1.0.1)
+      ethon (>= 0.8.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.2)
     unicode-display_width (0.3.1)
 
 PLATFORMS
@@ -150,7 +141,6 @@ DEPENDENCIES
   concurrent-ruby (~> 1.0)
   concurrent-ruby-edge (~> 0.2)
   concurrent-ruby-ext (~> 1.0)
-  http (~> 1.0)
   jeweler
   pry
   rack
@@ -161,6 +151,7 @@ DEPENDENCIES
   sinatra
   sinatra-contrib
   thin
+  typhoeus (~> 1.0)
 
 BUNDLED WITH
    1.11.2

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.1.0

data/clientura.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: clientura 0.0.7 ruby lib
+# stub: clientura 0.1.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "clientura"
-  s.version = "0.0.7"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Vlad Shmyhlo"]
-  s.date = "2016-03-04"
+  s.date = "2016-04-02"
   s.description = "DSL for defining HTTP clients"
   s.email = "aion.stu@gmail.com"
   s.extra_rdoc_files = [
@@ -55,7 +55,7 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<http>, ["~> 1.0"])
+      s.add_runtime_dependency(%q<typhoeus>, ["~> 1.0"])
       s.add_runtime_dependency(%q<concurrent-ruby>, ["~> 1.0"])
       s.add_runtime_dependency(%q<concurrent-ruby-edge>, ["~> 0.2"])
       s.add_runtime_dependency(%q<concurrent-ruby-ext>, ["~> 1.0"])
@@ -73,7 +73,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<thin>, [">= 0"])
       s.add_development_dependency(%q<codeclimate-test-reporter>, [">= 0"])
     else
-      s.add_dependency(%q<http>, ["~> 1.0"])
+      s.add_dependency(%q<typhoeus>, ["~> 1.0"])
       s.add_dependency(%q<concurrent-ruby>, ["~> 1.0"])
       s.add_dependency(%q<concurrent-ruby-edge>, ["~> 0.2"])
       s.add_dependency(%q<concurrent-ruby-ext>, ["~> 1.0"])
@@ -92,7 +92,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<codeclimate-test-reporter>, [">= 0"])
     end
   else
-    s.add_dependency(%q<http>, ["~> 1.0"])
+    s.add_dependency(%q<typhoeus>, ["~> 1.0"])
     s.add_dependency(%q<concurrent-ruby>, ["~> 1.0"])
     s.add_dependency(%q<concurrent-ruby-edge>, ["~> 0.2"])
     s.add_dependency(%q<concurrent-ruby-ext>, ["~> 1.0"])

data/lib/clientura/client/request.rb

@@ -1,33 +1,27 @@
 module Clientura
   module Client
-    class Request < SimpleDelegator
+    class Request
       attr_reader :config, :http
 
-      def initialize(http = HTTP.headers({}),
-                     config = { uri: '', params: {}, json: nil })
-        super http
-        @http   = http
-        @config = config
+      def initialize(options = { uri: '', headers: {}, params: {} })
+        @options = options
       end
 
       def update(key)
-        Request.new http, config.merge(key => yield(config[key]))
+        Request.new @options.merge key => yield(@options[key])
       end
 
-      [:get, :post, :put, :patch, :delete].each do |verb|
-        define_method verb do |path, **opts|
-          super(*build_request_arguments(path, opts))
-        end
+      def call
+        uri            = @options[:uri]
+        path           = @options[:path]
+        json           = @options[:json]
+        options        = @options.slice(*@options.keys - [:uri, :path, :json])
+        options[:body] = JSON.dump(json) if json
+        Typhoeus::Request.new(URI.join(uri, path), options).run
       end
 
-      def build_request_arguments(path, **opts)
-        opts[:params] = config.fetch(:params) if config[:params].present?
-        opts[:json] = config.fetch(:json) if config[:json].present?
-        [URI.join(config.fetch(:uri), path), opts]
-      end
-
-      def headers(*args)
-        Request.new(http.headers(*args), config)
+      def headers(args)
+        update(:headers) { |h| h.merge args }
       end
     end
   end

data/lib/clientura/client.rb

@@ -28,9 +28,17 @@ module Clientura
         end
       end
 
+      def normalize_path(path)
+        if path.respond_to?(:call)
+          path
+        else
+          -> (_) { path }
+        end
+      end
+
       def register_endpoint(name, verb:, path:)
         registered_endpoints[name] = Endpoint.new verb,
-                                                  path,
+                                                  normalize_path(path),
                                                   [*@middleware_context],
                                                   [*@pipes_context]
 
@@ -106,13 +114,7 @@ module Clientura
       end
 
       def call_endpoint(name_, args)
-        endpoint = registered_endpoints.fetch(name_)
-
-        path = if endpoint.path.respond_to?(:call)
-                 endpoint.path.call(args)
-               else
-                 endpoint.path
-               end
+        endpoint = registered_endpoints.fetch name_
 
         middlewares = endpoint.middleware.map do |name:, config:|
           { callable: registered_middleware.fetch(name), config: config }
@@ -128,7 +130,9 @@ module Clientura
           middleware.call
         end
 
-        response = request.send(endpoint.verb, path)
+        request  = request.update(:method) { endpoint.verb }
+        request  = request.update(:path) { endpoint.path.call(args) }
+        response = request.call
 
         endpoints = endpoint.pipes.map do |name:, config:|
           -> (res) { registered_pipes.fetch(name).call(res, *config) }

data/lib/clientura.rb

@@ -1,4 +1,4 @@
-require 'http'
+require 'typhoeus'
 require 'concurrent'
 require 'concurrent-edge'
 require 'active_support/core_ext/object'

data/spec/clientura/adequate_spec.rb

@@ -75,7 +75,7 @@ describe 'Ability to use this for solving real world problems' do
   end
 
   describe 'My wish to see this at least working' do
-    subject { super().root.status }
+    subject { super().root.code }
 
     it { should eq 200 }
   end
@@ -125,7 +125,7 @@ describe 'Ability to use this for solving real world problems' do
       it { should be_pending }
 
       it 'has correct value' do
-        expect(subject.value.status).to eq 200
+        expect(subject.value.code).to eq 200
       end
 
       context 'when awaited' do
@@ -161,7 +161,7 @@ describe 'Ability to use this for solving real world problems' do
   end
 
   describe 'My desire to pass some token in header' do
-    subject { super().pass_token.status }
+    subject { super().pass_token.code }
 
     let(:client_config) { super().merge token: token }
 
@@ -197,7 +197,7 @@ describe 'Ability to use this for solving real world problems' do
   end
 
   describe 'My desire to namespace routes' do
-    subject { super().namespaced.status }
+    subject { super().namespaced.code }
 
     it { should eq 200 }
   end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: clientura
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.0
 platform: ruby
 authors:
 - Vlad Shmyhlo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-04 00:00:00.000000000 Z
+date: 2016-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: http
+  name: typhoeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"