proc 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63d146f97fd1dc28e5ff40ae924ac80e5f34838da4a3bb626b51023c2e23efbc
-  data.tar.gz: ebbab25f52bc3344c9fee6e10a00af6ed5022808d05f8516c41dc914987178d6
+  metadata.gz: a3b65698431242010b57cb9897c5ddf826cbd9c81dea9a3947505062e8060aeb
+  data.tar.gz: bf1d1caaa7fffda8b8eac8d65c50b29a4c95003d980b8c83962f65bed8e1749e
 SHA512:
-  metadata.gz: 06f06ba059619e117f86021bfeda3b5520d6842664d5fb284c77e7920cae38b66d4e82874329243ee0e456216034a07111e04f8b49ffaf6828470eb8a0e7f2fc
-  data.tar.gz: d6b1423b158de5320e963c48a988db2936c5c576eb3e02b2ec9d2d675ff54ca6c428e270baaf566935bf8df2fd18b9b59e67449c5ed661d5c57d7a4b75a8f41b
+  metadata.gz: ba18a8388e58dfe25119b412274b13eaf7cf684fc33e2ca186c8527c85a6f8973ecf01d39c9f56b861456646262b0a0fbaf9272feaec44ce178f328e1c6349ca
+  data.tar.gz: 77ecd00cf5f48da5e17e80da46b2f0145ec1c8ae87d710d0b423d3e1908f7fdbc13fe251b9efee67289b5f20e1711b81a2c186fc0a48a9042aaff02413a8cdc8

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)
@@ -44,13 +44,15 @@ class Proc
     end
 
     def serialize
-      wrapped =  {"[]" => [[@proc, serialized_arguments]]}
+      serialized = ["()", @proc]
 
       unless Proc.undefined?(@input)
-        wrapped["<<"] = serialized_input
+        serialized << [">>", serialized_input]
       end
 
-      {"{}" => wrapped}
+      serialized.concat(serialized_arguments)
+
+      ["{}", serialized]
     end
 
     def serialized_input
@@ -58,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
 
@@ -99,7 +101,7 @@ class Proc
       if value.respond_to?(:serialize)
         value.serialize
       else
-        value
+        ["%%", value]
       end
     end
   end

data/lib/proc/client.rb

@@ -65,46 +65,48 @@ 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)
-      body = {"<>" => true}
+    def call(proc = nil, input = Proc.undefined, **arguments)
+      body = []
 
       unless Proc.undefined?(input)
-        body["<<"] = serialize_value(input)
+        body << [">>", serialize_value(input)]
       end
 
       arguments.each_pair do |key, value|
-        body[key.to_s] = serialize_value(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)
+      status, payload = get_payload(proc: proc, headers: headers, body: body)
 
-      case payload["status"]
+      case status
       when 200
-        payload[">>"]
+        extract_output(payload)
       when 400
-        raise Proc::Invalid, payload.dig("error", "message")
+        raise Proc::Invalid, extract_error_message(payload)
       when 401
-        raise Proc::Unauthorized, payload.dig("error", "message")
+        raise Proc::Unauthorized, extract_error_message(payload)
       when 403
-        raise Proc::Forbidden, payload.dig("error", "message")
+        raise Proc::Forbidden, extract_error_message(payload)
       when 404
-        raise Proc::Undefined, payload.dig("error", "message")
+        raise Proc::Undefined, extract_error_message(payload)
       when 408
-        raise Proc::Timeout, payload.dig("error", "message")
+        raise Proc::Timeout, extract_error_message(payload)
+      when 413
+        raise Proc::Invalid, extract_error_message(payload)
       when 429
-        raise Proc::Limited, payload.dig("error", "message")
+        raise Proc::Limited, extract_error_message(payload)
       when 500
-        raise Proc::Error, payload.dig("error", "message")
+        raise Proc::Error, extract_error_message(payload)
       when 508
-        raise Proc::Error, payload.dig("error", "message")
+        raise Proc::Error, extract_error_message(payload)
       else
         raise Proc::Error, "unhandled"
       end
@@ -141,21 +143,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, mode: :custom)) { |response|
+      @internal.call(:post, build_uri(proc), headers: headers, body: Oj.dump(body, mode: :custom)) 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)
-
-        payload = Oj.load(response.read, mode: :compat, compat_bigdecimal: true)
-        payload["status"] = response.status
-        payload
-      }
+        [response.status, Oj.load(response.read, mode: :compat, compat_bigdecimal: true)]
+      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("proc.exec", Proc.undefined, proc: callable)
     end
 
     def with(input = input_omitted = true, **arguments)
@@ -51,24 +51,32 @@ class Proc
     end
 
     def serialize
-      wrapped = {"[]" => serialized_calls}
+      # wrapped = {"[]" => serialized_calls}
+
+      # unless Proc.undefined?(@input)
+      #   wrapped["<<"] = serialized_input
+      # end
+
+      # {"{}" => wrapped.merge(serialized_arguments)}
+
+      serialized = ["{}"]
 
       unless Proc.undefined?(@input)
-        wrapped["<<"] = serialized_input
+        serialized << [">>", serialized_input]
       end
 
-      {"{}" => wrapped.merge(serialized_arguments)}
+      serialized + serialized_arguments + serialized_calls
     end
 
     def serialized_calls
       @callables.map { |callable|
-        arguments = callable.serialized_arguments
+        serialized = ["()", callable.proc]
 
         unless Proc.undefined?(callable.input)
-          arguments["<<"] = callable.serialized_input
+          serialized << [">>", callable.serialized_input]
         end
 
-        [callable.proc, arguments]
+        serialized.concat(callable.serialized_arguments)
       }
     end
 
@@ -77,8 +85,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 +101,7 @@ class Proc
       if value.respond_to?(:serialize)
         value.serialize
       else
-        value
+        ["%%", value]
       end
     end
   end

data/lib/proc/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proc
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Bryan Powell
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-20 00:00:00.000000000 Z
+date: 2021-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-http