proc 0.1.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2950f8e2178a95a40c29372c902203d883bda75ac84785a3579134b9394d7a52
-  data.tar.gz: 6c8433c3f49bbc0a6a62187c9b992fd7c39e6eac2894f7d71a2056205bdc7900
+  metadata.gz: 1759094e21f61007e2f96393615f5ae03880bff36f6ee764e1072ba7b73bd310
+  data.tar.gz: 7495016b1b5e9de6e4d8a8c92dce90b4769f6404488d92b69f88ab06238ee6cb
 SHA512:
-  metadata.gz: 36828988724d7e3cad08a3a741f576bfa50f8d53a459062892bb270e01da1d8a1ddf4977255976a314a15b4e79e8266da4089c9cdbb8f723c30d681099654c7f
-  data.tar.gz: e224df7dcabcf284d5cf72f410be3ccf713dfbb0ff386ae5a50597e5c9a6b07634c87759f30d5e4b4a95fc0091d0c2f0aa490146a02b8806a3784033025fd123
+  metadata.gz: '00008d07672ae0a0aed43d4146b0c6ea687071d939085e19cc7ae82aabc770e33dcb959d53ec69705784c667ffdad75545650e97872870ccd1396285b034149c'
+  data.tar.gz: b7d89543b58a65bdd9522bf360c2a76132f2a7a391717af3d1f0fb665e49b0157b85081cfcd0ddacb289e82c5cb87036946da10944b16645550e03aa72329a1b

data/lib/proc.rb

@@ -6,4 +6,12 @@ class Proc
   def self.connect(authorization, **options)
     Client.new(authorization, **options)
   end
+
+  def self.undefined
+    @_undefined ||= Object.new
+  end
+
+  def self.undefined?(value)
+    value == undefined
+  end
 end

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

@@ -4,8 +4,8 @@ class Proc
   class Callable
     attr_reader :proc, :input, :arguments
 
-    def initialize(proc, client:, input: nil, arguments: {})
-      @proc = proc
+    def initialize(proc, client:, input: Proc.undefined, arguments: {})
+      @proc = proc.to_s
       @client = client
       @input = input
       @arguments = arguments
@@ -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)
@@ -44,12 +44,15 @@ class Proc
     end
 
     def serialize
-      {
-        "{}" => {
-          "<<" => serialized_input,
-          "[]" => [[@proc, serialized_arguments]]
-        }
-      }
+      serialized = ["()", @proc]
+
+      unless Proc.undefined?(@input)
+        serialized << [">>", serialized_input]
+      end
+
+      serialized.concat(serialized_arguments)
+
+      ["{}", serialized]
     end
 
     def serialized_input
@@ -57,8 +60,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
 
@@ -98,7 +101,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,64 +70,59 @@ 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 = { "<<" => serialize_value(input) }
-
-        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 => error
-          # TODO: This should wrap `error`.
-          #
-          raise Proc::Unavailable, error.message
-        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 = nil, **arguments)
-      Callable.new(name, client: self, input: input, arguments: arguments)
+    def method_missing(name, input = input_omitted = true, *, **arguments)
+      if input_omitted
+        Callable.new(name, client: self, arguments: arguments)
+      else
+        Callable.new(name, client: self, input: input, arguments: arguments)
+      end
     end
 
     def respond_to_missing?(name, *)
@@ -134,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("/"))
 
@@ -144,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)
@@ -37,33 +37,38 @@ class Proc
 
     def >>(other)
       composed = dup
-
-      case other
-      when Composition
-        composed.merge(other)
-      when Callable
-        composed << other
-      end
-
+      composed << other
       composed
     end
 
     def <<(callable)
-      @callables << callable
+      case callable
+      when Composition
+        merge(callable)
+      when Callable
+        @callables << callable
+      end
     end
 
     def serialize
-      {
-        "{}" => {
-          "<<" => serialized_input,
-          "[]" => serialized_calls
-        }.merge(serialized_arguments)
-      }
+      serialized = ["{}"]
+
+      unless Proc.undefined?(@input)
+        serialized << [">>", serialized_input]
+      end
+
+      serialized + serialized_arguments + serialized_calls
     end
 
     def serialized_calls
       @callables.map { |callable|
-        [callable.proc, callable.serialized_arguments]
+        serialized = ["()", callable.proc]
+
+        unless Proc.undefined?(callable.input)
+          serialized << [">>", callable.serialized_input]
+        end
+
+        serialized.concat(callable.serialized_arguments)
       }
     end
 
@@ -72,8 +77,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
 
@@ -88,7 +93,7 @@ class Proc
       if value.respond_to?(:serialize)
         value.serialize
       else
-        value
+        ["%%", value]
       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.1.2"
+  VERSION = "0.6.0"
 
   def self.version
     VERSION

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proc
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.6.0
 platform: ruby
 authors:
 - Bryan Powell
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-31 00:00:00.000000000 Z
+date: 2021-02-10 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:
@@ -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.1.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