proc 0.6.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1759094e21f61007e2f96393615f5ae03880bff36f6ee764e1072ba7b73bd310
-  data.tar.gz: 7495016b1b5e9de6e4d8a8c92dce90b4769f6404488d92b69f88ab06238ee6cb
+  metadata.gz: cbe8ec8f147808e160d44b09da719dafb03e329b3b1fb78f345300af4c9ab798
+  data.tar.gz: f7d81cecd2d9c6cf88e3b4f59bae7681e962bd2dd7d95fd6a1c1593f8245639c
 SHA512:
-  metadata.gz: '00008d07672ae0a0aed43d4146b0c6ea687071d939085e19cc7ae82aabc770e33dcb959d53ec69705784c667ffdad75545650e97872870ccd1396285b034149c'
-  data.tar.gz: b7d89543b58a65bdd9522bf360c2a76132f2a7a391717af3d1f0fb665e49b0157b85081cfcd0ddacb289e82c5cb87036946da10944b16645550e03aa72329a1b
+  metadata.gz: e31c9f0c03adc5b2b82f0a2205cfb990f7be7bf529cf287580f2253b70425b63be00f19583838b93e15642f5ea2d3a1289d88065d6658f247f25b875d5bd8e3f
+  data.tar.gz: 9f44c4c22a636faa3f3032420a48e8aa8e7b92b18d2023115736612ef1b03736d967b770a43cf28e3ef426057b2ffa31a0398e627b51e271b6612cfadd2d0fea

data/lib/proc.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "proc/client"
+require_relative "proc/version"
 
 class Proc
   def self.connect(authorization, **options)
@@ -8,7 +9,7 @@ class Proc
   end
 
   def self.undefined
-    @_undefined ||= Object.new
+    @_undefined ||= ::Object.new
   end
 
   def self.undefined?(value)

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.input, **callable.arguments)
+      @client.call(@proc, callable.input, **callable.arguments, &block)
     end
 
     def with(input = input_omitted = true, **arguments)
@@ -43,7 +43,7 @@ class Proc
       composed
     end
 
-    def serialize
+    def serialize(unwrapped: false)
       serialized = ["()", @proc]
 
       unless Proc.undefined?(@input)
@@ -52,7 +52,11 @@ class Proc
 
       serialized.concat(serialized_arguments)
 
-      ["{}", serialized]
+      if unwrapped
+        serialized
+      else
+        ["{}", serialized]
+      end
     end
 
     def serialized_input

data/lib/proc/client.rb

@@ -1,21 +1,21 @@
 # frozen_string_literal: true
 
 require "async"
-require "oj"
+require "msgpack"
+
+require_relative "msgpack/types/decimal"
+MessagePack::DefaultFactory.register_type(0x00, Proc::Msgpack::Types::Decimal)
+MessagePack::DefaultFactory.register_type(-1, Time, packer: MessagePack::Time::Packer, unpacker: MessagePack::Time::Unpacker)
 
 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
-}.freeze
-
 class Proc
   class Error < StandardError
   end
@@ -42,6 +42,8 @@ class Proc
   end
 
   class Client
+    attr_reader :authorization, :scheme, :host
+
     def initialize(authorization, scheme: "https", host: "proc.dev")
       @authorization = authorization
       @scheme = scheme
@@ -53,28 +55,33 @@ class Proc
       Callable.new(proc, client: self)
     end
 
-    def remaining
-      unless defined?(@remaining)
-        self["ping"].call
-      end
+    def rate_limit
+      refresh_rate_limit
+      @rate_limit
+    end
+
+    def rate_limit_window
+      refresh_rate_limit
+      @rate_limit_window
+    end
 
-      @remaining
+    def rate_limit_reset
+      refresh_rate_limit
+      @rate_limit_reset
     end
 
-    def resets_at
-      unless defined?(@resets_at)
+    private def refresh_rate_limit
+      unless defined?(@rate_limit_reset)
         self["ping"].call
       end
-
-      @resets_at
     end
 
     DEFAULT_HEADERS = {
-      "accept" => "application/vnd.proc+json",
-      "content-type" => "application/vnd.proc+json"
+      "accept" => "application/vnd.proc+msgpack",
+      "content-type" => "application/vnd.proc+msgpack"
     }.freeze
 
-    def call(proc = nil, input = Proc.undefined, **arguments)
+    def call(proc = nil, input = Proc.undefined, **arguments, &block)
       body = []
 
       unless Proc.undefined?(input)
@@ -89,11 +96,30 @@ class Proc
         "authorization" => "bearer #{@authorization}"
       }.merge(DEFAULT_HEADERS)
 
-      status, payload = get_payload(proc: proc, headers: headers, body: body)
+      status, headers, payload = get_payload(proc: proc, headers: headers, body: body)
 
       case status
       when 200
-        extract_output(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, extract_error_message(payload)
       when 401
@@ -153,10 +179,23 @@ class Proc
     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)]
+      @internal.call(:post, build_uri(proc), headers: headers, body: MessagePack.pack(body)) do |response|
+        split_limit = response.headers["x-rate-limit"].to_s.split(";window=")
+
+        @rate_limit = split_limit[0].to_i
+
+        @rate_limit_window = case split_limit[1]
+        when "60"
+          :minute
+        when "1"
+          :second
+        end
+
+        @rate_limit_reset = if (reset = response.headers["x-rate-limit-reset"])
+          Time.at(reset.to_s.to_i)
+        end
+
+        [response.status, response.headers, MessagePack.unpack(response.read)]
       end
     rescue
       raise Proc::Unavailable

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("exec", Proc.undefined, proc: callable)
+      @client.call("exec", Proc.undefined, proc: callable, &block)
     end
 
     def with(input = input_omitted = true, **arguments)
@@ -57,19 +57,7 @@ class Proc
         serialized << [">>", serialized_input]
       end
 
-      serialized + serialized_arguments + serialized_calls
-    end
-
-    def serialized_calls
-      @callables.map { |callable|
-        serialized = ["()", callable.proc]
-
-        unless Proc.undefined?(callable.input)
-          serialized << [">>", callable.serialized_input]
-        end
-
-        serialized.concat(callable.serialized_arguments)
-      }
+      serialized + serialized_arguments + @callables.map { |callable| callable.serialize(unwrapped: true) }
     end
 
     def serialized_input

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/msgpack/types/decimal.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+class BigDecimal
+  def to_msgpack(packer)
+    if precision > 16
+      packer.write(Proc::Msgpack::Types::Decimal.new(self))
+      packer
+    else
+      to_f.to_msgpack(packer)
+    end
+  end
+end
+
+class Proc
+  module Msgpack
+    module Types
+      class Decimal
+        class << self
+          def from_msgpack_ext(data)
+            BigDecimal(data)
+          end
+        end
+
+        def initialize(value)
+          @value = value
+        end
+
+        def to_msgpack_ext
+          @value.to_s
+        end
+      end
+    end
+  end
+end

data/lib/proc/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proc
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Bryan Powell
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-10 00:00:00.000000000 Z
+date: 2021-03-17 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.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.0
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
-  name: oj
+  name: msgpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '1.4'
 description: Proc client library.
 email: bryan@metabahn.com
 executables: []
@@ -65,9 +65,11 @@ 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
+- lib/proc/msgpack/types/decimal.rb
 - lib/proc/version.rb
 homepage: https://proc.dev/
 licenses:
@@ -88,7 +90,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.