proc 0.4.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63d146f97fd1dc28e5ff40ae924ac80e5f34838da4a3bb626b51023c2e23efbc
-  data.tar.gz: ebbab25f52bc3344c9fee6e10a00af6ed5022808d05f8516c41dc914987178d6
+  metadata.gz: e066afa0667795307f8627a3220f8bc3887c644b2679a45b9e044d7843ca4ed3
+  data.tar.gz: a5775e58b9a2c7730242b9971d44f1d31d02eca4b5e6bc36ee2e5a712dc63537
 SHA512:
-  metadata.gz: 06f06ba059619e117f86021bfeda3b5520d6842664d5fb284c77e7920cae38b66d4e82874329243ee0e456216034a07111e04f8b49ffaf6828470eb8a0e7f2fc
-  data.tar.gz: d6b1423b158de5320e963c48a988db2936c5c576eb3e02b2ec9d2d675ff54ca6c428e270baaf566935bf8df2fd18b9b59e67449c5ed661d5c57d7a4b75a8f41b
+  metadata.gz: 1c41c56fdfb839226790e7ad63c2fce4724b25b8fd61d79ac47adf2f4e9e9e673dea272a1ebc3e9ee1c1960a71a31a048f133efcc6544fcab92759716b7605bf
+  data.tar.gz: 1c72579ebf19b7ac9a8f85641a4ced7637829e44f3259242d0cec76ced0daaac4180a1334d1711784c459bf9e21f0cecddda67b11fd08742fb63427188c184f4

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

@@ -16,7 +16,7 @@ class Proc
       @arguments = arguments.dup
     end
 
-    def call(input = input_omitted = true, **arguments)
+    def call(input = input_omitted = true, **arguments, &block)
       callable = self.class.new(
         @proc,
         client: @client,
@@ -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, &block)
     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,11 +6,19 @@ require "oj"
 require_relative "argument"
 require_relative "callable"
 require_relative "composition"
+require_relative "enumerator"
 
 require_relative "http/client"
 
 Console.logger.off!
 
+Oj.default_options = {
+  mode: :custom,
+  bigdecimal_load: :auto,
+  float_precision: 0,
+  second_precision: 6
+}.freeze
+
 class Proc
   class Error < StandardError
   end
@@ -37,6 +45,8 @@ class Proc
   end
 
   class Client
+    attr_reader :authorization, :scheme, :host
+
     def initialize(authorization, scheme: "https", host: "proc.dev")
       @authorization = authorization
       @scheme = scheme
@@ -65,46 +75,67 @@ 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, &block)
+      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, headers, payload = get_payload(proc: proc, headers: headers, body: body)
 
-      case payload["status"]
+      case status
       when 200
-        payload[">>"]
+        result = extract_output(payload)
+
+        if (cursor = headers["x-cursor"])
+          enumerator = if cursor.empty?
+            Enumerator.new(result)
+          else
+            Enumerator.new(result) {
+              arguments[:cursor] = cursor.to_s
+              call(proc, input, **arguments)
+            }
+          end
+
+          if block
+            enumerator.each(&block)
+          else
+            enumerator
+          end
+        else
+          result
+        end
       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 +172,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)) 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, response.headers, 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

@@ -15,7 +15,7 @@ class Proc
       @callables = @callables.dup
     end
 
-    def call(input = input_omitted = true, **arguments)
+    def call(input = input_omitted = true, **arguments, &block)
       callable = self.class.new(
         client: @client,
         input: input_omitted ? @input : input,
@@ -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, &block)
     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/enumerator.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class Proc
+  class Enumerator
+    include Enumerable
+
+    def initialize(values, &next_block)
+      @values = values
+      @next_block = next_block
+    end
+
+    def each(&block)
+      return to_enum(:each) unless block
+
+      @values.each(&block)
+
+      if @next_block
+        @next_block.call.each(&block)
+      end
+    end
+  end
+end

data/lib/proc/http/client.rb

@@ -3,8 +3,6 @@
 require "async"
 require "async/http/internet"
 
-require "protocol/http/body/streamable"
-
 require "core/async"
 
 require_relative "request"
@@ -15,30 +13,24 @@ class Proc
     class Client
       include Is::Async
 
-      def initialize
-        @internet = Async::HTTP::Internet.new
-      end
-
       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)
 
         await {
           begin
-            response = make_request(request)
+            response = make_request(internet, request)
 
             yield response
           ensure
             response&.close
+            internet&.close
           end
         }
       end
 
-      def close
-        @internet.close
-      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
 

data/lib/proc/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Proc
-  VERSION = "0.4.0"
+  VERSION = "0.8.1"
 
   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.8.1
 platform: ruby
 authors:
 - Bryan Powell
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-20 00:00:00.000000000 Z
+date: 2021-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-http
@@ -16,42 +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.0.0
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.0
+        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: []
@@ -65,6 +65,7 @@ files:
 - lib/proc/callable.rb
 - lib/proc/client.rb
 - lib/proc/composition.rb
+- lib/proc/enumerator.rb
 - lib/proc/http/client.rb
 - lib/proc/http/request.rb
 - lib/proc/http/response.rb
@@ -88,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.4
 signing_key:
 specification_version: 4
 summary: Proc client library.