proc 0.2.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75ef8a4c8d8b8f07682996ca70c0263f5e0b6d123493137a07f92717c9c16eab
-  data.tar.gz: 48d2b0b5a4e453366ec4fc99536f98d875f804cb705ff5fde9a8b4b2d46e74c0
+  metadata.gz: 3436b4fd5fc66c40110f6dbf9cae15ab41d3e056126efd0aeb2ea1f3d9a0dd17
+  data.tar.gz: 1e4d324315a902f1f53ad611f8379cc6a3ec86f7c897c0dd27cf8901736c85ce
 SHA512:
-  metadata.gz: 1fca54bd564be4fa0ac560ee4c81c9f6d81421b6fe26a6a7038ac97c4b2a17da34359949ba9d1d02191370022d916727793bda08e3d5a3c6d50d577acfaea17b
-  data.tar.gz: 7a7bba01f304f8866ff2cd69b779c4a4995b966d0ec835d78da29f577704c89d848d79b83b516c5b53df59c0352fb7a038f4f28e2a2d02fab5337048cbfb6fff
+  metadata.gz: ac68f3119ab651efe8705ebe7cc68ad33e7cf9b49c58248c390f5667e31f7521b2b8494f169e213aae4a1a4371df45c6d485b04af743ddb872c993ed04c0dd2b
+  data.tar.gz: cc114dca8b977b3b365127120ad0f1ae37b53e0e75e5f2a025d9bc0741ebdc5f9fb667be6fd4df2793eab0fd9c02ea5b902146f995624d832f91642d2a4064cc

data/lib/proc.rb

@@ -8,7 +8,7 @@ class Proc
   end
 
   def self.undefined
-    @_undefined ||= Object.new
+    @_undefined ||= ::Object.new
   end
 
   def self.undefined?(value)

data/lib/proc/argument.rb

@@ -8,7 +8,7 @@ class Proc
     end
 
     def serialize
-      {"::" => {"name" => @name.to_s}.merge(serialized_options)}
+      ["@@", @name.to_s, serialized_options]
     end
 
     def serialized_options
@@ -21,7 +21,7 @@ class Proc
       if value.respond_to?(:serialize)
         value.serialize
       else
-        value
+        ["%%", value]
       end
     end
   end

data/lib/proc/callable.rb

@@ -24,7 +24,7 @@ class Proc
         arguments: @arguments.merge(arguments)
       )
 
-      @client.call(@proc, callable.serialized_input, **callable.serialized_arguments)
+      @client.call(@proc, callable.input, **callable.arguments)
     end
 
     def with(input = input_omitted = true, **arguments)
@@ -43,14 +43,20 @@ class Proc
       composed
     end
 
-    def serialize
-      wrapped =  {"[]" => [[@proc, serialized_arguments]]}
+    def serialize(unwrapped: false)
+      serialized = ["()", @proc]
 
       unless Proc.undefined?(@input)
-        wrapped["<<"] = serialized_input
+        serialized << [">>", serialized_input]
       end
 
-      {"{}" => wrapped}
+      serialized.concat(serialized_arguments)
+
+      if unwrapped
+        serialized
+      else
+        ["{}", serialized]
+      end
     end
 
     def serialized_input
@@ -58,8 +64,8 @@ class Proc
     end
 
     def serialized_arguments
-      @arguments.each_pair.each_with_object({}) { |(key, value), hash|
-        hash[key.to_s] = serialize_value(value)
+      @arguments.map { |key, value|
+        ["$$", key.to_s, serialize_value(value)]
       }
     end
 
@@ -99,7 +105,7 @@ class Proc
       if value.respond_to?(:serialize)
         value.serialize
       else
-        value
+        ["%%", value]
       end
     end
   end

data/lib/proc/client.rb

@@ -6,10 +6,16 @@ require "oj"
 require_relative "argument"
 require_relative "callable"
 require_relative "composition"
-require_relative "null_logger"
 
 require_relative "http/client"
 
+Console.logger.off!
+
+Oj.default_options = {
+  mode: :custom,
+  bigdecimal_load: :auto
+}.freeze
+
 class Proc
   class Error < StandardError
   end
@@ -35,13 +41,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)
@@ -65,65 +70,54 @@ class Proc
     end
 
     DEFAULT_HEADERS = {
-      "accept" => "application/json",
-      "content-type" => "application/json"
+      "accept" => "application/vnd.proc+json",
+      "content-type" => "application/vnd.proc+json"
     }.freeze
 
-    def call(proc = nil, input = nil, **arguments)
-      Async(logger: NullLogger) { |task|
-        body = {}
-
-        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)
+    def call(proc = nil, input = Proc.undefined, **arguments)
+      body = []
 
-        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)
+      unless Proc.undefined?(input)
+        body << [">>", serialize_value(input)]
+      end
 
-          payload = Oj.load(response.read, mode: :compat)
-        rescue
-          raise Proc::Unavailable
-        ensure
-          response&.close
-        end
+      arguments.each_pair do |key, value|
+        body << ["$$", key.to_s, serialize_value(value)]
+      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
+      headers = {
+        "authorization" => "bearer #{@authorization}"
+      }.merge(DEFAULT_HEADERS)
+
+      status, payload = get_payload(proc: proc, headers: headers, body: body)
+
+      case status
+      when 200
+        extract_output(payload)
+      when 400
+        raise Proc::Invalid, extract_error_message(payload)
+      when 401
+        raise Proc::Unauthorized, extract_error_message(payload)
+      when 403
+        raise Proc::Forbidden, extract_error_message(payload)
+      when 404
+        raise Proc::Undefined, extract_error_message(payload)
+      when 408
+        raise Proc::Timeout, extract_error_message(payload)
+      when 413
+        raise Proc::Invalid, extract_error_message(payload)
+      when 429
+        raise Proc::Limited, extract_error_message(payload)
+      when 500
+        raise Proc::Error, extract_error_message(payload)
+      when 508
+        raise Proc::Error, extract_error_message(payload)
+      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 +134,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("/"))
 
@@ -150,8 +148,44 @@ class Proc
       if value.respond_to?(:serialize)
         value.serialize
       else
-        value
+        ["%%", value]
+      end
+    end
+
+    private def get_payload(proc:, headers:, body:)
+      @internal.call(:post, build_uri(proc), headers: headers, body: Oj.dump(body)) do |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)
+        [response.status, Oj.load(response.read)]
+      end
+    rescue
+      raise Proc::Unavailable
+    end
+
+    private def extract_output(payload)
+      payload.each do |tuple|
+        case tuple[0]
+        when "<<"
+          return tuple[1]
+        end
       end
+
+      nil
+    end
+
+    private def extract_error(payload)
+      payload.each do |tuple|
+        case tuple[0]
+        when "!!"
+          return tuple[1]
+        end
+      end
+
+      nil
+    end
+
+    private def extract_error_message(payload)
+      extract_error(payload)&.dig("message")
     end
   end
 end

data/lib/proc/composition.rb

@@ -23,7 +23,7 @@ class Proc
         arguments: @arguments.merge(arguments)
       )
 
-      @client.call("proc.exec", nil, proc: callable.serialize)
+      @client.call("exec", Proc.undefined, proc: callable)
     end
 
     def with(input = input_omitted = true, **arguments)
@@ -51,25 +51,13 @@ class Proc
     end
 
     def serialize
-      wrapped = {"[]" => serialized_calls}
+      serialized = ["{}"]
 
       unless Proc.undefined?(@input)
-        wrapped["<<"] = serialized_input
+        serialized << [">>", serialized_input]
       end
 
-      {"{}" => wrapped.merge(serialized_arguments)}
-    end
-
-    def serialized_calls
-      @callables.map { |callable|
-        arguments = callable.serialized_arguments
-
-        unless Proc.undefined?(callable.input)
-          arguments["<<"] = callable.serialized_input
-        end
-
-        [callable.proc, arguments]
-      }
+      serialized + serialized_arguments + @callables.map { |callable| callable.serialize(unwrapped: true) }
     end
 
     def serialized_input
@@ -77,8 +65,8 @@ class Proc
     end
 
     def serialized_arguments
-      @arguments.each_pair.each_with_object({}) { |(key, value), hash|
-        hash[key.to_s] = serialize_value(value)
+      @arguments.map { |key, value|
+        ["$$", key.to_s, serialize_value(value)]
       }
     end
 
@@ -93,7 +81,7 @@ class Proc
       if value.respond_to?(:serialize)
         value.serialize
       else
-        value
+        ["%%", value]
       end
     end
   end

data/lib/proc/http/client.rb

@@ -3,52 +3,39 @@
 require "async"
 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
-      def initialize
-        @internet = Async::HTTP::Internet.new
-        @responses = {}
-      end
+      include Is::Async
 
-      def call(method, uri, params: {}, headers: {}, body: nil, task: nil)
+      def call(method, uri, params: {}, headers: {}, body: nil)
+        internet = Async::HTTP::Internet.new
         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
-      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
+        await {
+          begin
+            response = make_request(internet, request)
 
-      def count
-        @responses.count
+            yield response
+          ensure
+            response&.close
+            internet&.close
+          end
+        }
       end
 
-      private def make_request(request)
-        async_response = @internet.call(*request.callable)
+      private def make_request(internet, 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.2.0"
+  VERSION = "0.7.0"
 
   def self.version
     VERSION

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proc
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Bryan Powell
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-08 00:00:00.000000000 Z
+date: 2021-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-http
@@ -16,28 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.52.5
+        version: 0.54.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.52.5
+        version: 0.54.1
+- !ruby/object:Gem::Dependency
+  name: core-async
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '3.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '3.11'
 description: Proc client library.
 email: bryan@metabahn.com
 executables: []
@@ -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:
@@ -75,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.4
 signing_key:
 specification_version: 4
 summary: Proc client library.

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