proc 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b1cac83c7cff9f09dc94086b6b58e43cf686c4faa28e95aecda09c73e9eebbc
-  data.tar.gz: e349377c73af33cdff5dfb488dbfd199ec37b9c1db84132e82dde7d65889b71b
+  metadata.gz: 59becc885513c542ccee8100b436c2854d5c42939b72424a691a281741861728
+  data.tar.gz: 82cfac2a503a9e934efeae9b41d037b6dd72d1e78e493a6ec921d04a39fec97e
 SHA512:
-  metadata.gz: e9b7322deb5945ddac4cff0c12c444d8c90d88b917619176bc2983370e215f54ebafdf83e82a4778424fc94a9ed67149596ebb7fd7378d0bea8d0fcdac611a67
-  data.tar.gz: 91286717d2ee7d67a8021f3aedf2debec4c2da88e2f9abbe34dadd751f02c64f227a40dbdb8e3f6b95ed0ca5ead33557b096683594b3b5e32f10aab5eaf23367
+  metadata.gz: 71cbb386c7e906584a706538f3cccba04a7090496486b80160b2856b2d4dbe480d35b02f83814643fb208173518053f283b9d4e2c365f8164781e569b23f98ea
+  data.tar.gz: '095adc172bb26b52871a0fb9d8265fb782cab0ae43981c03f1bedfe47200cdf1551e78cf1564e29ade46a535f0c717350e306513583b4ced7e09eac815a10c73'

data/lib/proc.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-# TODO: Introduce inspectable everywhere (just bundle from pakyow).
-
 require_relative "proc/client"
 
 class Proc

data/lib/proc/client.rb

@@ -1,9 +1,11 @@
 # frozen_string_literal: true
 
+require "async"
 require "oj"
 
 require_relative "callable"
 require_relative "composition"
+require_relative "null_logger"
 
 require_relative "http/client"
 
@@ -45,36 +47,38 @@ class Proc
     }.freeze
 
     def perform(proc, input, **arguments)
-      body = {
-        input: input, arguments: arguments
-      }
-
-      headers = {
-        "authorization" => "Bearer #{@authorization}"
-      }.merge(DEFAULT_HEADERS)
-
-      begin
-        response = call(:post, build_uri(proc), headers: headers, body: Oj.dump(body, mode: :json))
-      rescue => error
-        raise Proc::Unavailable, error.message
-      end
-
-      payload = if response.body
-        Oj.load(response.body.read, mode: :strict)
-      end
-
-      case response.status
-      when 200
-        payload["value"]
-      when 400
-        raise Proc::ArgumentError, payload.dig("error", "message")
-      when 403
-        raise Proc::Unauthorized, payload.dig("error", "message")
-      when 404
-        raise Proc::Undefined, payload.dig("error", "message")
-      when 500
-        raise Proc::Error, payload.dig("error", "message")
-      end
+      Async(logger: NullLogger) { |task|
+        body = {
+          input: input, arguments: arguments
+        }
+
+        headers = {
+          "authorization" => "Bearer #{@authorization}"
+        }.merge(DEFAULT_HEADERS)
+
+        begin
+          response = call(:post, build_uri(proc), headers: headers, body: Oj.dump(body, mode: :json), task: task)
+
+          payload = Oj.load(response.read, mode: :strict)
+        rescue => error
+          raise Proc::Unavailable, error.message
+        ensure
+          response&.close
+        end
+
+        case response.status
+        when 200
+          payload["value"]
+        when 400
+          raise Proc::ArgumentError, payload.dig("error", "message")
+        when 403
+          raise Proc::Unauthorized, payload.dig("error", "message")
+        when 404
+          raise Proc::Undefined, payload.dig("error", "message")
+        when 500
+          raise Proc::Error, payload.dig("error", "message")
+        end
+      }.wait
     end
 
     private def build_uri(proc)

data/lib/proc/http/client.rb

@@ -8,35 +8,31 @@ require "protocol/http/body/streamable"
 require_relative "request"
 require_relative "response"
 
+require_relative "../null_logger"
+
 class Proc
   module Http
     class Client
-      class NullLogger
-        class << self
-          def method_missing(*, **)
-          end
-
-          def respond_to_missing?(*)
-            true
-          end
-        end
-      end
-
       def initialize
         @internet = Async::HTTP::Internet.new
         @responses = {}
       end
 
-      def call(method, uri, params: {}, headers: {}, body: nil)
+      def call(method, uri, params: {}, headers: {}, body: nil, task: nil)
         request = Request.new(method: method, uri: uri, params: params, headers: headers, body: body)
 
-        Async(logger: NullLogger) {
-          async_request = @internet.call(*request.callable)
-          wrap_async_response_for_request(async_request, request)
-        }.wait
+        if task
+          make_request(request)
+        else
+          Async(logger: NullLogger) {
+            make_request(request)
+          }.wait
+        end
       end
 
       def close
+        # TODO: Make sure this works. We should also close / clear after accumulating some amount.
+        #
         @responses.each_value(&:close)
         @responses.clear
         @internet.close
@@ -46,20 +42,13 @@ class Proc
         @responses.count
       end
 
-      private def wrap_async_response_for_request(async_response, request)
-        Protocol::HTTP::Body::Streamable.wrap(async_response) do
-          @responses.delete(async_response)
-        end
-
-        response = Response.new(
-          request: request,
-          status: async_response.status,
-          version: async_response.version,
-          headers: async_response.headers,
-          body: async_response.body
-        )
+      private def make_request(request)
+        async_response = @internet.call(*request.callable)
+        wrap_async_response_for_request(async_response, request)
+      end
 
-        @responses[async_response] = response
+      private def wrap_async_response_for_request(async_response, request)
+        @responses[async_response] = Response.new(request, async_response)
       end
     end
   end

data/lib/proc/http/response.rb

@@ -1,37 +1,18 @@
 # frozen_string_literal: true
 
+require "forwardable"
+
 class Proc
   module Http
     class Response
-      attr_reader :request, :status, :version, :headers, :body
-
-      def initialize(request:, status:, version:, headers:, body:)
-        @request = request
-        @status = status
-        @version = version
-        @headers = headers
-        @body = body
-
-        @stream = nil
-        @stream_blocks = []
-      end
-
-      def stream(&block)
-        @stream_blocks << block
+      extend Forwardable
+      def_delegators :@response, :status, :version, :headers, :read, :close
 
-        @stream ||= Async {
-          @body.each do |chunk|
-            @stream_blocks.each do |stream_callback|
-              stream_callback.call(chunk)
-            end
-          end
-        }
-      end
+      attr_reader :request
 
-      def close
-        @stream&.stop
-        @stream_blocks.clear
-        @body.close
+      def initialize(request, response)
+        @request = request
+        @response = response
       end
     end
   end

data/lib/proc/null_logger.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class Proc
+  class NullLogger
+    class << self
+      def method_missing(*, **)
+      end
+
+      def respond_to_missing?(*)
+        true
+      end
+    end
+  end
+end

data/lib/proc/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Proc
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 
   def self.version
     VERSION

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proc
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Bryan Powell
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-20 00:00:00.000000000 Z
+date: 2020-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-http
@@ -55,6 +55,7 @@ files:
 - lib/proc/http/client.rb
 - lib/proc/http/request.rb
 - lib/proc/http/response.rb
+- lib/proc/null_logger.rb
 - lib/proc/version.rb
 homepage: https://proc.dev/
 licenses: