dagger 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d105ac895b507dfe26dff70cb114f8aa3df1070
-  data.tar.gz: 9e406e38bd220df5bef5c18fb5245a29dad6c605
+  metadata.gz: 9acd73b4c13d3fbc7d86edc5872e30c64f290c02
+  data.tar.gz: 8ea4011792e0b7b2bd44d5184641c86c6db436df
 SHA512:
-  metadata.gz: 9da12347a5186a0ef71a66b63bb78c97413ecdee9a2411baf3f9a0e9120c938cf1a51ecd08f7b2b39fc986e636102ebc1490368a35f6f6d4bf1d8ee07004fd8a
-  data.tar.gz: 3f3a9136f4a7d26cef68fb311aadd10b6f513e59590ecd0a0cef82e92072312dd7db18a1e91c0ad2d920748cc425f9032c9ce4efeb381149967f29afef09f9a4
+  metadata.gz: 6be7e1806544f1f0212cf64e39614324fbb67f027a3e189ac80292c593ace1adde58ea87f33e80b6fb3b8e4f246cf1556ed69afa39c0a4c8007fb77aff82e07e
+  data.tar.gz: c8d34bf201a266fe07d00f0799b8da950aec0589672aa60d3908a129cd0c733db9cae9aad8cd7604b77c3ca30b5f8182ed2cb251429c88f97319d5e149627803

data/README.md

@@ -35,7 +35,7 @@ puts resp.code # => 200
 resp = Dagger.put('http://server.com', { foo: 'bar' }, { json: true })
 
 # now, if the endpoint returned a parseable content-type (e.g. 'application/json')
-# then `resp.data` will return the parsed result. `body` contains the raw data.
+# then `resp.data` will return the parsed result. `body` contains the raw bytes.
 puts resp.data # => { result: 'GREAT SUCCESS!' }
 ```
 

data/lib/dagger.rb

@@ -17,6 +17,7 @@ module Dagger
   module Utils
 
     def self.parse_uri(uri)
+      raise ArgumentError.new("Empty URI") if uri.to_s.strip == ''
       uri = 'http://' + uri unless uri.to_s['http']
       uri = URI.parse(uri)
       raise ArgumentError.new("Invalid URI: #{uri}") unless uri.is_a?(URI::HTTP)
@@ -75,14 +76,32 @@ module Dagger
       request = Net::HTTP::Get.new(path, DEFAULT_HEADERS.merge(opts[:headers] || {}))
       request.basic_auth(opts.delete(:username), opts.delete(:password)) if opts[:username]
 
-      @resp, @data = @http.request(request)
+      @http.start unless @http.started?
+      resp, data = @http.request(request)
 
-      if REDIRECT_CODES.include?(@resp.code.to_i) && @resp['Location'] && (opts[:follow] && opts[:follow] > 0)
+      if REDIRECT_CODES.include?(resp.code.to_i) && resp['Location'] && (opts[:follow] && opts[:follow] > 0)
         opts[:follow] -= 1
-        return get(@resp['Location'], nil, opts)
+        puts "Following redirect to #{resp['Location']}"
+        return get(resp['Location'], nil, opts)
       end
 
-      response
+      @response = build_response(resp, data || resp.body)
+    end
+
+    def post(uri, data, options = {})
+      request(:post, uri, data, options)
+    end
+
+    def put(uri, data, options = {})
+      request(:put, uri, data, options)
+    end
+
+    def patch(uri, data, options = {})
+      request(:patch, uri, data, options)
+    end
+
+    def delete(uri, data, options = {})
+      request(:delete, uri, data, options)
     end
 
     def request(method, uri, data, opts = {})
@@ -108,13 +127,23 @@ module Dagger
       args = [method.to_s.downcase, uri.path, query, headers]
       args.delete_at(2) if args[0] == 'delete' # Net::HTTP's delete does not accept data
 
-      @resp, @data = @http.send(*args)
-      response
+      @http.start unless @http.started?
+      resp, data = @http.send(*args)
+      @response = build_response(resp, data || resp.body)
     end
 
     def response
-      raise 'No response yet!' unless @resp
-      @response ||= build_response(@resp, @data || @resp.body) # 1.8 vs 1.9 style responses
+      @response or raise 'Request not sent!'
+    end
+
+    def open(&block)
+      @http.start do
+        instance_eval(&block)
+      end
+    end
+
+    def close
+      @http.finish
     end
 
     private
@@ -130,15 +159,9 @@ module Dagger
   class << self
 
     def open(uri, opts = {}, &block)
-      uri = Utils.parse_uri(uri)
-      opts.merge!(use_ssl: uri.scheme == 'https')
-      opts.merge!(verify_mode: OpenSSL::SSL::VERIFY_NONE) if opts[:verify_ssl] === false
-
-      Net::HTTP.start(uri.host, uri.port, opts) do |http|
-        client = Client.new(http)
-        # yield(client)
-        client.instance_eval(&block)
-      end
+      client = Client.init(uri, opts)
+      client.start(&block) if block_given?
+      client
     end
 
     def get(uri, options = {})

data/lib/dagger/version.rb

@@ -1,7 +1,7 @@
 module Dagger
   MAJOR = 0
-  MINOR = 6
-  PATCH = 1
+  MINOR = 7
+  PATCH = 0
 
   VERSION = [MAJOR, MINOR, PATCH].join('.')
 end

data/{test → spec}/arguments_spec.rb

@@ -14,7 +14,8 @@ describe 'arguments' do
     describe 'empty url' do
 
       it 'raises error' do
-        expect { send_request('') }.to raise_error(URI::InvalidURIError)
+        # expect { send_request('') }.to raise_error(URI::InvalidURIError)
+        expect { send_request('') }.to raise_error(ArgumentError)
       end
 
     end

data/{test → spec}/parsers_spec.rb

@@ -9,7 +9,7 @@ describe 'Parsers' do
     Dagger.post('http://foobar.com/test', { foo: 'bar'})
   end
 
-  let(:fake_http) { double('Net::HTTP') }
+  let(:fake_http) { double('Net::HTTP', started?: true) }
   let(:fake_resp) { double('Net::HTTPResponse', code: 200) }
 
   before do

data/{test → spec}/persistent_spec.rb

@@ -3,12 +3,13 @@ require './lib/dagger'
 require 'rspec/mocks'
 require 'rspec/expectations'
 
-describe 'Persitent mode' do
+describe 'Persistent mode' do
 
   it 'works' do
     fake_client = double('Client')
     expect(Dagger::Client).to receive(:new).once.and_return(fake_client)
-    expect(fake_client).to receive(:get).twice #.and_return(fake_resp)
+    # expect(fake_client).to receive(:get).twice #.and_return(fake_resp)
+    expect(fake_client).to receive(:start).once #.and_return(fake_resp)
 
     obj = Dagger.open('https://www.google.com') do
       get('/search?q=dagger+http+client')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dagger
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Tomás Pollak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-02 00:00:00.000000000 Z
+date: 2017-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -113,9 +113,9 @@ files:
 - lib/dagger/parsers.rb
 - lib/dagger/response.rb
 - lib/dagger/version.rb
-- test/arguments_spec.rb
-- test/parsers_spec.rb
-- test/persistent_spec.rb
+- spec/arguments_spec.rb
+- spec/parsers_spec.rb
+- spec/persistent_spec.rb
 homepage: https://github.com/tomas/dagger
 licenses: []
 metadata: {}
@@ -135,9 +135,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: dagger
-rubygems_version: 2.2.0
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Simplified Net::HTTP wrapper.
 test_files: []
-has_rdoc: