muxer 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9fdf620ee075fb5ecd4d369432354e23e1aeb303
-  data.tar.gz: c86862b06e44353d5b23d6f5b151d03d4212af1b
+  metadata.gz: 8939fea35a80bfeef5db55769e7a33139fa6b56d
+  data.tar.gz: 25e24c9494a923b310fb3148711f0edb974535b5
 SHA512:
-  metadata.gz: 44aecd28114fcd816ff56d3805ba3ed0fcf187f5e2ed526b5a5c8171c25574beb9037670765aaf6c1f11f952517c1678efcefa5f545feff8cc8f8d562e08bdc6
-  data.tar.gz: 8bb309f0a9876ca7c0f2856f234271e41d6195752b0f6ff2970c7c53c730227ca37084713591ebca76180e03c2315a0547da2c29b5db13bb982b7bfc6c0510bd
+  metadata.gz: 2dc03106231b3d0878709abfd4fabec810bdf9a322b7636eb048430743dbccde95ab2ca026a0caebb92d6732d5a1ddca6ad46e6e91daa84ac87560ba7e807d6c
+  data.tar.gz: 2e627c3684ceddc10c56a7f6dd2e73be297d1a2e85c0b02eea69d00edc8dd902e84afb9ca40661210452cf97d5407679607155b0f17d5e849bae2d7e14fdc9a0

data/.travis.yml

@@ -9,4 +9,8 @@ rvm:
 script: bundle exec rspec spec
 addons:
   code_climate:
-    repo_token: 6aa82237af30a07e040f64f0a184915522cdeead2da8df84b3a634bc9f189064
+    repo_token: 6aa82237af30a07e040f64f0a184915522cdeead2da8df84b3a634bc9f189064
+notifications:
+  email:
+    on_success: never
+    on_failure: change

data/lib/muxer/multiplexer.rb

@@ -7,10 +7,22 @@ module Muxer
       @timeout = nil
     end
 
-    def add_url(url, timeout = nil)
+    def add_url(url, options = {})
+      options.keys.each do |key|
+        options[key.to_sym] = options.delete(key)
+      end
+      options = {timeout: nil, method: :get, params: {}}.merge(options)
+      timeout = 
       request = Request.new
       request.url = url
-      request.timeout = timeout if timeout
+      options.each do |key, val|
+        next unless request.respond_to? ("#{key}=".to_sym)
+        request.send("#{key}=".to_sym, val) if val
+      end
+      add_request request
+    end
+
+    def add_request(request)
       requests << request
     end
 

data/lib/muxer/request.rb

@@ -1,6 +1,6 @@
 module Muxer
   class Request
-    attr_accessor :url, :timeout, :headers
+    attr_accessor :url, :timeout, :headers, :params
     attr_reader :method, :completed, :error
 
     alias_method  :completed?, :completed
@@ -9,6 +9,7 @@ module Muxer
       @completed = false
       @timeout = 10
       @headers = {}
+      @params = {}
       @request = nil
       @error = nil
     end
@@ -24,8 +25,16 @@ module Muxer
         connect_timeout: timeout,
         inactivity_timeout: timeout,
       )
+      options = {
+        head: headers
+      }
+      if [:post, :put].include? method
+        options[:body] = params
+      else
+        options[:query] = params
+      end
       @request = http.public_send(method,
-        head: headers,
+        options
       )
 
       @request.callback { @completed = true }
@@ -34,7 +43,9 @@ module Muxer
     end
 
     def response
-      @request.response
+      if @request
+        @request.response
+      end
     end
   end
 end

data/lib/muxer/version.rb

@@ -1,3 +1,3 @@
 module Muxer
-  VERSION = '0.1.3'
+  VERSION = '0.2.0'
 end

data/spec/cassettes/muxer/post/can.yml

@@ -0,0 +1,38 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://httpbin.org/post
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers: {}
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Wed, 15 Apr 2015 16:28:34 GMT
+      Content-Type:
+      - application/json
+      Content-Length:
+      - '326'
+      Connection:
+      - close
+      Access-Control-Allow-Origin:
+      - '*'
+      Access-Control-Allow-Credentials:
+      - 'true'
+    body:
+      encoding: UTF-8
+      string: "{\n  \"args\": {}, \n  \"data\": \"\", \n  \"files\": {}, \n  \"form\":
+        {}, \n  \"headers\": {\n    \"Content-Length\": \"0\", \n    \"Content-Type\":
+        \"application/x-www-form-urlencoded\", \n    \"Host\": \"httpbin.org\", \n
+        \   \"User-Agent\": \"EventMachine HttpClient\"\n  }, \n  \"json\": null,
+        \n  \"origin\": \"72.92.31.249\", \n  \"url\": \"https://httpbin.org/post\"\n}\n"
+    http_version: 
+  recorded_at: Wed, 15 Apr 2015 16:28:37 GMT
+recorded_with: VCR 2.9.3

data/spec/cassettes/muxer/post/with_params.yml

@@ -0,0 +1,38 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://httpbin.org/post
+    body:
+      encoding: US-ASCII
+      string: test=success
+    headers: {}
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Wed, 15 Apr 2015 16:28:34 GMT
+      Content-Type:
+      - application/json
+      Content-Length:
+      - '352'
+      Connection:
+      - close
+      Access-Control-Allow-Origin:
+      - '*'
+      Access-Control-Allow-Credentials:
+      - 'true'
+    body:
+      encoding: UTF-8
+      string: "{\n  \"args\": {}, \n  \"data\": \"\", \n  \"files\": {}, \n  \"form\":
+        {\n    \"test\": \"success\"\n  }, \n  \"headers\": {\n    \"Content-Length\":
+        \"12\", \n    \"Content-Type\": \"application/x-www-form-urlencoded\", \n
+        \   \"Host\": \"httpbin.org\", \n    \"User-Agent\": \"EventMachine HttpClient\"\n
+        \ }, \n  \"json\": null, \n  \"origin\": \"72.92.31.249\", \n  \"url\": \"https://httpbin.org/post\"\n}\n"
+    http_version: 
+  recorded_at: Wed, 15 Apr 2015 16:28:37 GMT
+recorded_with: VCR 2.9.3

data/spec/cassettes/muxer/put/can.yml

@@ -0,0 +1,38 @@
+---
+http_interactions:
+- request:
+    method: put
+    uri: https://httpbin.org/put
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers: {}
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Wed, 15 Apr 2015 16:28:34 GMT
+      Content-Type:
+      - application/json
+      Content-Length:
+      - '325'
+      Connection:
+      - close
+      Access-Control-Allow-Origin:
+      - '*'
+      Access-Control-Allow-Credentials:
+      - 'true'
+    body:
+      encoding: UTF-8
+      string: "{\n  \"args\": {}, \n  \"data\": \"\", \n  \"files\": {}, \n  \"form\":
+        {}, \n  \"headers\": {\n    \"Content-Length\": \"0\", \n    \"Content-Type\":
+        \"application/x-www-form-urlencoded\", \n    \"Host\": \"httpbin.org\", \n
+        \   \"User-Agent\": \"EventMachine HttpClient\"\n  }, \n  \"json\": null,
+        \n  \"origin\": \"72.92.31.249\", \n  \"url\": \"https://httpbin.org/put\"\n}\n"
+    http_version: 
+  recorded_at: Wed, 15 Apr 2015 16:28:37 GMT
+recorded_with: VCR 2.9.3

data/spec/cassettes/muxer/put/with_params.yml

@@ -0,0 +1,38 @@
+---
+http_interactions:
+- request:
+    method: put
+    uri: https://httpbin.org/put
+    body:
+      encoding: US-ASCII
+      string: test=success
+    headers: {}
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Wed, 15 Apr 2015 16:28:34 GMT
+      Content-Type:
+      - application/json
+      Content-Length:
+      - '351'
+      Connection:
+      - close
+      Access-Control-Allow-Origin:
+      - '*'
+      Access-Control-Allow-Credentials:
+      - 'true'
+    body:
+      encoding: UTF-8
+      string: "{\n  \"args\": {}, \n  \"data\": \"\", \n  \"files\": {}, \n  \"form\":
+        {\n    \"test\": \"success\"\n  }, \n  \"headers\": {\n    \"Content-Length\":
+        \"12\", \n    \"Content-Type\": \"application/x-www-form-urlencoded\", \n
+        \   \"Host\": \"httpbin.org\", \n    \"User-Agent\": \"EventMachine HttpClient\"\n
+        \ }, \n  \"json\": null, \n  \"origin\": \"72.92.31.249\", \n  \"url\": \"https://httpbin.org/put\"\n}\n"
+    http_version: 
+  recorded_at: Wed, 15 Apr 2015 16:28:37 GMT
+recorded_with: VCR 2.9.3

data/spec/muxer/multiplexer_spec.rb

@@ -1,49 +1,68 @@
 require 'spec_helper'
 
+class Muxer::TestRequest < Muxer::Request
+  def test_timeout=(timeout)
+    @test_timeout = timeout
+  end
+
+  def test_timeout
+    @test_timeout ||= 0.0001
+  end
+
+  def process!
+    EM::Timer.new(test_timeout) do
+      @completed = true
+    end
+
+    return self
+  end
+
+end
 RSpec.describe Muxer::Multiplexer do
+
+  def new_request(url, timeout = nil, test_timeout = nil)
+    request = Muxer::TestRequest.new
+    request.url = url
+    request.timeout = timeout if timeout
+    request.test_timeout = test_timeout if test_timeout
+    request
+  end
+
   let(:multiplexer) { Muxer::Multiplexer.new }
 
   it 'kills requests with a timeout' do
-    VCR.use_cassette('muxer/multiplexer/with_a_timeout') do
-      multiplexer.add_url('https://github.com//', 0.0001)
-      response = multiplexer.execute
+    multiplexer.add_request(new_request('https://github.com/', 0.0001, 0.01))
+    response = multiplexer.execute
 
-      expect(response[:succeeded].count).to eq(0)
-      expect(response[:failed].count).to eq(1)
-   end
+    expect(response[:succeeded].count).to eq(0)
+    expect(response[:failed].count).to eq(1)
   end
 
   it 'lets a request wait on the longer one' do
-    VCR.use_cassette('muxer/multiplexer/with_one_timeout') do
-      multiplexer.add_url('https://github.com/', 0.0001)
-      multiplexer.add_url('https://codeclimate.com/', 2)
-      response = multiplexer.execute
+    multiplexer.add_request(new_request('https://github.com/', 0.0001, 0.0002))
+    multiplexer.add_request(new_request('https://codeclimate.com/', 2, 0.002))
+    response = multiplexer.execute
 
-      expect(response[:succeeded].count).to eq(2)
-      expect(response[:failed].count).to eq(0)
-    end
+    expect(response[:succeeded].count).to eq(2)
+    expect(response[:failed].count).to eq(0)
   end
 
   it 'kills requests with a global timeout' do
-    VCR.use_cassette('muxer/multiplexer/with_a_global_timeout') do
-      multiplexer.add_url('https://github.com/')
-      multiplexer.timeout = 0.0001
-      response = multiplexer.execute
+    multiplexer.add_request(new_request('https://github.com/', nil, 0.002))
+    multiplexer.timeout = 0.0001
+    response = multiplexer.execute
 
-      expect(response[:succeeded].count).to eq(0)
-      expect(response[:failed].count).to eq(1)
-    end
+    expect(response[:succeeded].count).to eq(0)
+    expect(response[:failed].count).to eq(1)
   end
 
   it 'kills one of two requests with a global timeout' do
-    VCR.use_cassette('muxer/multiplexer/with_global_timeout') do
-      multiplexer.add_url('https://github.com/')
-      multiplexer.add_url('https://www.google.com/')
-      multiplexer.timeout = 0.2
-      response = multiplexer.execute
-
-      expect(response[:succeeded].count).to eq(1)
-      expect(response[:failed].count).to eq(1)
-    end
+    multiplexer.add_request(new_request('https://github.com/', nil, 1.0))
+    multiplexer.add_request(new_request('https://www.google.com/', nil, 0.00001))
+    multiplexer.timeout = 0.0001
+    response = multiplexer.execute
+
+    expect(response[:succeeded].count).to eq(1)
+    expect(response[:failed].count).to eq(1)
   end
 end

data/spec/muxer_spec.rb

@@ -42,5 +42,59 @@ RSpec.describe Muxer, "execute" do
     end
   end
 
+  it 'can make a POST' do
+    VCR.use_cassette('muxer/post/can') do
+      response = Muxer.execute do |muxer|
+        muxer.add_url 'https://httpbin.org/post', method: :post
+      end
+      expect(response[:succeeded]).to be_kind_of(Array)
+      expect(response[:succeeded].count).to eq(1)
+
+      response_body = JSON.parse(response[:succeeded][0].response)
+      expect(response_body['form']).to eq({})
+    end
+  end
+
+  it 'can make a POST with params' do
+    VCR.use_cassette('muxer/post/with_params') do
+      response = Muxer.execute do |muxer|
+        muxer.add_url 'https://httpbin.org/post', method: :post, params: {test: :success}
+      end
+      expect(response[:succeeded]).to be_kind_of(Array)
+      expect(response[:succeeded].count).to eq(1)
+
+      response_body = JSON.parse(response[:succeeded][0].response)
+      expect(response_body['form']).to be_kind_of(Hash)
+      expect(response_body['form']['test']).to eq('success')
+    end
+  end
+
+  it 'can make a PUT' do
+    VCR.use_cassette('muxer/put/can') do
+      response = Muxer.execute do |muxer|
+        muxer.add_url 'https://httpbin.org/put', method: :put
+      end
+      expect(response[:succeeded]).to be_kind_of(Array)
+      expect(response[:succeeded].count).to eq(1)
+
+      response_body = JSON.parse(response[:succeeded][0].response)
+      expect(response_body['form']).to eq({})
+    end
+  end
+
+  it 'can make a PUT with params' do
+    VCR.use_cassette('muxer/put/with_params') do
+      response = Muxer.execute do |muxer|
+        muxer.add_url 'https://httpbin.org/put', method: :put, params: {test: :success}
+      end
+      expect(response[:succeeded]).to be_kind_of(Array)
+      expect(response[:succeeded].count).to eq(1)
+
+      response_body = JSON.parse(response[:succeeded][0].response)
+      expect(response_body['form']).to be_kind_of(Hash)
+      expect(response_body['form']['test']).to eq('success')
+    end
+  end
+
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: muxer
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Chris MacNaughton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-07 00:00:00.000000000 Z
+date: 2015-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -160,6 +160,10 @@ files:
 - spec/cassettes/muxer/makes_a_web_request.yml
 - spec/cassettes/muxer/makes_multiple_web_requests.yml
 - spec/cassettes/muxer/multiplexer/with_global_timeout.yml
+- spec/cassettes/muxer/post/can.yml
+- spec/cassettes/muxer/post/with_params.yml
+- spec/cassettes/muxer/put/can.yml
+- spec/cassettes/muxer/put/with_params.yml
 - spec/muxer/multiplexer_spec.rb
 - spec/muxer/request_spec.rb
 - spec/muxer_spec.rb
@@ -193,6 +197,10 @@ test_files:
 - spec/cassettes/muxer/makes_a_web_request.yml
 - spec/cassettes/muxer/makes_multiple_web_requests.yml
 - spec/cassettes/muxer/multiplexer/with_global_timeout.yml
+- spec/cassettes/muxer/post/can.yml
+- spec/cassettes/muxer/post/with_params.yml
+- spec/cassettes/muxer/put/can.yml
+- spec/cassettes/muxer/put/with_params.yml
 - spec/muxer/multiplexer_spec.rb
 - spec/muxer/request_spec.rb
 - spec/muxer_spec.rb