pebblebed 0.3.15 → 0.3.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee75f8d72025d4c7694243367b3d2c005cabc4e0
-  data.tar.gz: '09d5d620129964dc80b206c1f3801bda4cebbeb8'
+  metadata.gz: ec6e1847afca02058150931728920d66a0488b41
+  data.tar.gz: fe9d7005b7ae347ab80d16473b2787ce46b4188f
 SHA512:
-  metadata.gz: ed69ba69a5cf148d35c4eb06a864bc2e2026e9f93982657df0768f200bff70e6a704920b50f843fe9e44577cebc602d9fe58ae19706ca9d1033c2bce1ac91ca2
-  data.tar.gz: bf78c1ac553713d8e40c0ccf85eb7be968744dcfebfcc9c144819691f6c4a686f7c7d8a72d44d7bd60645ae84f0aa6ab78882d973d6c927d421e6fd011415add
+  metadata.gz: 9a877ec1296f7df0a29b5ae43c2eb99cd99f39f4dbbe8fce3eda0ce397eae5225294bfe53a8df0f6892194febfabb857811bc75f2f0214606c9dab615d8c8e74
+  data.tar.gz: bf10e50a98159afda438c7e6e746dce69e634d5283fbdea2514e7e96434bfde424cd3ee01d3f45aeb1763e3242cda4508702cc6fce72559581cb21a89cded3ce

data/lib/pebblebed/clients/generic_client.rb

@@ -3,7 +3,7 @@ require 'deepstruct'
 module Pebblebed
   class GenericClient < AbstractClient
     def initialize(session_key, root_url)
-      @root_url = root_url  
+      @root_url = root_url
       @root_url = URI(@root_url) unless @root_url.is_a?(URI::HTTP)
       @session_key = session_key
     end
@@ -22,6 +22,14 @@ module Pebblebed
       end
     end
 
+    def stream(method, url = '', params = {}, options = {})
+      on_data = options[:on_data] or raise "Option :on_data must be specified"
+      method_name = "stream_#{method.to_s.downcase}"
+      raise "Method not supported for streaming" unless Pebblebed::Http.respond_to?(method_name)
+      return Pebblebed::Http.send(method_name, service_url(url), service_params(params),
+        on_data: on_data)
+    end
+
     def service_url(url, params = nil)
       result = @root_url.dup
       result.path = result.path.sub(/\/+$/, "") + url

data/lib/pebblebed/http.rb

@@ -50,7 +50,7 @@ module Pebblebed
 
     def self.get(url = nil, params = nil, &block)
       url, params = url_and_params_from_args(url, params, &block)
-      return with_curl { |easy|
+      return do_easy { |easy|
         easy.url = url_with_params(url, params)
         easy.http_get
       }
@@ -59,7 +59,7 @@ module Pebblebed
     def self.post(url, params, &block)
       url, params = url_and_params_from_args(url, params, &block)
       content_type, body = serialize_params(params)
-      return with_curl { |easy|
+      return do_easy { |easy|
         easy.url = url.to_s
         easy.headers['Accept'] = 'application/json'
         easy.headers['Content-Type'] = content_type
@@ -70,7 +70,7 @@ module Pebblebed
     def self.put(url, params, &block)
       url, params = url_and_params_from_args(url, params, &block)
       content_type, body = serialize_params(params)
-      return with_curl { |easy|
+      return do_easy { |easy|
         easy.url = url.to_s
         easy.headers['Accept'] = 'application/json'
         easy.headers['Content-Type'] = content_type
@@ -80,12 +80,55 @@ module Pebblebed
 
     def self.delete(url, params, &block)
       url, params = url_and_params_from_args(url, params, &block)
-      return with_curl { |easy|
+      return do_easy { |easy|
         easy.url = url_with_params(url, params)
         easy.http_delete
       }
     end
 
+    def self.stream_get(url = nil, params = nil, options = {})
+      return do_easy { |easy|
+        on_data = options[:on_data] or raise "Option :on_data must be specified"
+
+        url, params = url_and_params_from_args(url, params)
+
+        easy.url = url_with_params(url, params)
+        easy.on_body do |data|
+          on_data.call(data)
+          data.length
+        end
+        easy.http_get
+      }
+    end
+
+    def self.stream_post(url, params, options = {})
+      return do_easy { |easy|
+        on_data = options[:on_data] or raise "Option :on_data must be specified"
+
+        url, params = url_and_params_from_args(url, params)
+        content_type, body = serialize_params(params)
+
+        easy.url = url.to_s
+        easy.headers['Accept'] = 'application/json'
+        easy.headers['Content-Type'] = content_type
+        easy.http_post(body)
+      }
+    end
+
+    def self.stream_put(url, params, options = {})
+      return do_easy { |easy|
+        on_data = options[:on_data] or raise "Option :on_data must be specified"
+
+        url, params = url_and_params_from_args(url, params)
+        content_type, body = serialize_params(params)
+
+        easy.url = url.to_s
+        easy.headers['Accept'] = 'application/json'
+        easy.headers['Content-Type'] = content_type
+        easy.http_put(body)
+      }
+    end
+
     private
 
     def self.serialize_params(params)
@@ -114,11 +157,17 @@ module Pebblebed
       response
     end
 
-    def self.with_curl(&block)
+    def self.do_easy(&block)
+      with_easy do |easy|
+        yield easy
+        return handle_http_errors(Response.new(easy))
+      end
+    end
+
+    def self.with_easy(&block)
       easy = Thread.current[:pebblebed_curb_easy] ||= Curl::Easy.new
       easy.reset
       yield easy
-      return handle_http_errors(Response.new(easy))
     end
 
     def self.url_with_params(url, params)

data/lib/pebblebed/version.rb

@@ -1,3 +1,3 @@
 module Pebblebed
-  VERSION = "0.3.15"
+  VERSION = "0.3.16"
 end

data/spec/generic_client_spec.rb

@@ -49,4 +49,27 @@ describe Pebblebed::GenericClient do
     expect(result).to eq "Ok"
   end
 
+  describe 'streaming' do
+    context 'GET' do
+      it "streams response body" do
+        curl_result = DeepStruct.wrap({status: 200, body: nil})
+        allow(Pebblebed::Http).to receive(:stream_get).with(
+          URI.parse("http://example.org/"),
+          {"session" => "session_key"},
+          anything) { |_, _, options|
+          options[:on_data].call("hello")
+        }.and_return(curl_result)
+
+        buf = ""
+        client = Pebblebed::GenericClient.new("session_key", "http://example.org/")
+        result = client.stream(:get, '/', {}, on_data: ->(data) {
+          buf << data
+        })
+        expect(buf).to eq "hello"
+        expect(result.status).to eq 200
+        expect(result.body).to eq nil
+      end
+    end
+  end
+
 end

data/spec/http_spec.rb

@@ -87,4 +87,19 @@ describe Pebblebed::Http do
     expect(result["QUERY_STRING"]).to eq "hello=world"
   end
 
+  describe 'streaming' do
+    context 'GET' do
+      it "streams response body" do
+        buf = ""
+        response = Pebblebed::Http.stream_get(pebble_url, {hello: 'world'},
+          on_data: ->(data) {
+            buf << data
+          })
+        result = JSON.parse(buf)
+        expect(result["QUERY_STRING"]).to eq "hello=world"
+        expect(response.body).to eq nil
+      end
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pebblebed
 version: !ruby/object:Gem::Version
-  version: 0.3.15
+  version: 0.3.16
 platform: ruby
 authors:
 - Katrina Owen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-13 00:00:00.000000000 Z
+date: 2017-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -303,7 +303,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: pebblebed
-rubygems_version: 2.5.2
+rubygems_version: 2.4.5.2
 signing_key: 
 specification_version: 4
 summary: Development tools for working with Pebblebed
@@ -323,3 +323,4 @@ test_files:
 - spec/sinatra_spec.rb
 - spec/spec_helper.rb
 - spec/uid_spec.rb
+has_rdoc: