proc 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3a73eafa61306bca405c0eaec0f8df0d145b22d27a98ee8dcf28db94cdadfa3
-  data.tar.gz: b1e95096528fe529ec664a370095269ae26672994178ed62e3c78159c46ed173
+  metadata.gz: 63d146f97fd1dc28e5ff40ae924ac80e5f34838da4a3bb626b51023c2e23efbc
+  data.tar.gz: ebbab25f52bc3344c9fee6e10a00af6ed5022808d05f8516c41dc914987178d6
 SHA512:
-  metadata.gz: 9708b1585d8c95deb6016cc5dbed10d5c7bffdfa55421d0392d3c51ec2af5ce334eb5b41283c585795874c7cdf5b035e6eb41ca145ee56d7409147546b61a6bf
-  data.tar.gz: ec138355afed48dde883579c73d304196b3cb2b6b8ac7d5a0986b43c5bffb6591fd33c019b516807c46b2c1ef3c6d75df7fc10d5bae10ecfbc38428ea89977c9
+  metadata.gz: 06f06ba059619e117f86021bfeda3b5520d6842664d5fb284c77e7920cae38b66d4e82874329243ee0e456216034a07111e04f8b49ffaf6828470eb8a0e7f2fc
+  data.tar.gz: d6b1423b158de5320e963c48a988db2936c5c576eb3e02b2ec9d2d675ff54ca6c428e270baaf566935bf8df2fd18b9b59e67449c5ed661d5c57d7a4b75a8f41b

data/lib/proc/client.rb

@@ -6,10 +6,11 @@ require "oj"
 require_relative "argument"
 require_relative "callable"
 require_relative "composition"
-require_relative "null_logger"
 
 require_relative "http/client"
 
+Console.logger.off!
+
 class Proc
   class Error < StandardError
   end
@@ -35,13 +36,12 @@ class Proc
   class Timeout < Error
   end
 
-  class Client < Http::Client
+  class Client
     def initialize(authorization, scheme: "https", host: "proc.dev")
       @authorization = authorization
       @scheme = scheme
       @host = host
-
-      super()
+      @internal = Http::Client.new
     end
 
     def [](proc)
@@ -70,60 +70,47 @@ class Proc
     }.freeze
 
     def call(proc = nil, input = nil, **arguments)
-      Async(logger: NullLogger) { |task|
-        body = {"<>" => true}
-
-        unless Proc.undefined?(input)
-          body["<<"] = serialize_value(input)
-        end
-
-        arguments.each_pair do |key, value|
-          body[key.to_s] = serialize_value(value)
-        end
-
-        headers = {
-          "authorization" => "bearer #{@authorization}"
-        }.merge(DEFAULT_HEADERS)
-
-        begin
-          response = super(:post, build_uri(proc), headers: headers, body: Oj.dump(body, mode: :custom), task: task)
-
-          @remaining = response.headers["x-rate-limit-remaining"].to_s.to_i
-          @resets_at = Time.at(response.headers["x-rate-limit-reset"].to_s.to_i)
-
-          payload = Oj.load(response.read, mode: :compat)
-        rescue
-          raise Proc::Unavailable
-        ensure
-          response&.close
-        end
-
-        case response.status
-        when 200
-          payload[">>"]
-        when 400
-          raise Proc::Invalid, payload.dig("error", "message")
-        when 401
-          raise Proc::Unauthorized, payload.dig("error", "message")
-        when 403
-          raise Proc::Forbidden, payload.dig("error", "message")
-        when 404
-          raise Proc::Undefined, payload.dig("error", "message")
-        when 408
-          raise Proc::Timeout, payload.dig("error", "message")
-        when 429
-          raise Proc::Limited, payload.dig("error", "message")
-        when 500
-          raise Proc::Error, payload.dig("error", "message")
-        when 508
-          raise Proc::Error, payload.dig("error", "message")
-        else
-          raise Proc::Error, "unhandled"
-        end
-      }.wait
+      body = {"<>" => true}
+
+      unless Proc.undefined?(input)
+        body["<<"] = serialize_value(input)
+      end
+
+      arguments.each_pair do |key, value|
+        body[key.to_s] = serialize_value(value)
+      end
+
+      headers = {
+        "authorization" => "bearer #{@authorization}"
+      }.merge(DEFAULT_HEADERS)
+
+      payload = get_payload(proc: proc, headers: headers, body: body)
+
+      case payload["status"]
+      when 200
+        payload[">>"]
+      when 400
+        raise Proc::Invalid, payload.dig("error", "message")
+      when 401
+        raise Proc::Unauthorized, payload.dig("error", "message")
+      when 403
+        raise Proc::Forbidden, payload.dig("error", "message")
+      when 404
+        raise Proc::Undefined, payload.dig("error", "message")
+      when 408
+        raise Proc::Timeout, payload.dig("error", "message")
+      when 429
+        raise Proc::Limited, payload.dig("error", "message")
+      when 500
+        raise Proc::Error, payload.dig("error", "message")
+      when 508
+        raise Proc::Error, payload.dig("error", "message")
+      else
+        raise Proc::Error, "unhandled"
+      end
     end
 
-    def method_missing(name, input = input_omitted = true, **arguments)
+    def method_missing(name, input = input_omitted = true, *, **arguments)
       if input_omitted
         Callable.new(name, client: self, arguments: arguments)
       else
@@ -140,6 +127,10 @@ class Proc
     end
     alias_method :arg, :argument
 
+    def close
+      @internal.close
+    end
+
     private def build_uri(proc)
       host_and_path = File.join(@host, proc.to_s.split(".").join("/"))
 
@@ -153,5 +144,18 @@ class Proc
         value
       end
     end
+
+    private def get_payload(proc:, headers:, body:)
+      @internal.call(:post, build_uri(proc), headers: headers, body: Oj.dump(body, mode: :custom)) { |response|
+        @remaining = response.headers["x-rate-limit-remaining"].to_s.to_i
+        @resets_at = Time.at(response.headers["x-rate-limit-reset"].to_s.to_i)
+
+        payload = Oj.load(response.read, mode: :compat, compat_bigdecimal: true)
+        payload["status"] = response.status
+        payload
+      }
+    rescue
+      raise Proc::Unavailable
+    end
   end
 end

data/lib/proc/http/client.rb

@@ -5,50 +5,45 @@ require "async/http/internet"
 
 require "protocol/http/body/streamable"
 
+require "core/async"
+
 require_relative "request"
 require_relative "response"
 
-require_relative "../null_logger"
-
 class Proc
   module Http
     class Client
+      include Is::Async
+
       def initialize
         @internet = Async::HTTP::Internet.new
-        @responses = {}
       end
 
-      def call(method, uri, params: {}, headers: {}, body: nil, task: nil)
+      def call(method, uri, params: {}, headers: {}, body: nil)
         request = Request.new(method: method, uri: uri, params: params, headers: headers, body: body)
 
-        if task
-          make_request(request)
-        else
-          Async(logger: NullLogger) {
-            make_request(request)
-          }.wait
-        end
+        await {
+          begin
+            response = make_request(request)
+
+            yield response
+          ensure
+            response&.close
+          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
       end
 
-      def count
-        @responses.count
-      end
-
       private def make_request(request)
         async_response = @internet.call(*request.callable)
         wrap_async_response_for_request(async_response, request)
       end
 
       private def wrap_async_response_for_request(async_response, request)
-        @responses[async_response] = Response.new(request, async_response)
+        Response.new(request, async_response)
       end
     end
   end

data/lib/proc/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proc
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Bryan Powell
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-23 00:00:00.000000000 Z
+date: 2021-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-http
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.52.5
+- !ruby/object:Gem::Dependency
+  name: core-async
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.0
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
@@ -54,7 +68,6 @@ 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:

data/lib/proc/null_logger.rb

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