proc 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63fefe7d8d6f97ef667ca24f07ef5f38b402c6982d783582d6ea869dbfc67c76
-  data.tar.gz: ceaeee3d8d634ba9d9ba6771266554e8dc7b8662b819751520658b0e657dbfa8
+  metadata.gz: 2950f8e2178a95a40c29372c902203d883bda75ac84785a3579134b9394d7a52
+  data.tar.gz: 6c8433c3f49bbc0a6a62187c9b992fd7c39e6eac2894f7d71a2056205bdc7900
 SHA512:
-  metadata.gz: 1c44c09c6526286bbcc8e67fefd1c2d13cb5dec65b4471452eb07c9845f36e8c2aa92dcd7c5080ff7070a2a1228b6f3667c7d9616f35e37ba7d14ec9f882ac22
-  data.tar.gz: a38fe68ec69ed2b086741d46728245d3351fe58ed26c956fcb9ec67257e9089b9e2e383a8551530bed293188f6e14ca9799ebaf57859163bf1b9fbd0bfb26f82
+  metadata.gz: 36828988724d7e3cad08a3a741f576bfa50f8d53a459062892bb270e01da1d8a1ddf4977255976a314a15b4e79e8266da4089c9cdbb8f723c30d681099654c7f
+  data.tar.gz: e224df7dcabcf284d5cf72f410be3ccf713dfbb0ff386ae5a50597e5c9a6b07634c87759f30d5e4b4a95fc0091d0c2f0aa490146a02b8806a3784033025fd123

data/lib/proc/argument.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+class Proc
+  class Argument
+    def initialize(name, **options)
+      @name = name
+      @options = options
+    end
+
+    def serialize
+      {"::" => {"name" => @name.to_s}.merge(serialized_options)}
+    end
+
+    def serialized_options
+      @options.each_pair.each_with_object({}) { |(key, value), hash|
+        hash[key.to_s] = serialize_value(value)
+      }
+    end
+
+    private def serialize_value(value)
+      if value.respond_to?(:serialize)
+        value.serialize
+      else
+        value
+      end
+    end
+  end
+end

data/lib/proc/callable.rb

@@ -17,11 +17,23 @@ class Proc
     end
 
     def call(input = input_omitted = true, **arguments)
-      @client.call(@proc, input_omitted ? @input : input, **@arguments.merge(arguments))
+      callable = self.class.new(
+        @proc,
+        client: @client,
+        input: input_omitted ? @input : input,
+        arguments: @arguments.merge(arguments)
+      )
+
+      @client.call(@proc, callable.serialized_input, **callable.serialized_arguments)
     end
 
     def with(input = input_omitted = true, **arguments)
-      self.class.new(@proc, client: @client, input: input_omitted ? @input : input, arguments: @arguments.merge(arguments))
+      self.class.new(
+        @proc,
+        client: @client,
+        input: input_omitted ? @input : input,
+        arguments: @arguments.merge(arguments)
+      )
     end
 
     def >>(other)
@@ -34,18 +46,31 @@ class Proc
     def serialize
       {
         "{}" => {
-          "<<" => serialize_value(@input),
+          "<<" => serialized_input,
           "[]" => [[@proc, serialized_arguments]]
         }
       }
     end
 
+    def serialized_input
+      serialize_value(@input)
+    end
+
     def serialized_arguments
       @arguments.each_pair.each_with_object({}) { |(key, value), hash|
         hash[key.to_s] = serialize_value(value)
       }
     end
 
+    def [](proc)
+      Callable.new(
+        [@proc, proc].join("."),
+        client: @client,
+        input: @input,
+        arguments: @arguments
+      )
+    end
+
     IGNORE_MISSING = %i[to_hash].freeze
 
     def method_missing(name, input = input_omitted = true, **arguments)

data/lib/proc/client.rb

@@ -3,6 +3,7 @@
 require "async"
 require "oj"
 
+require_relative "argument"
 require_relative "callable"
 require_relative "composition"
 require_relative "null_logger"
@@ -13,7 +14,7 @@ class Proc
   class Error < StandardError
   end
 
-  class ArgumentError < ::ArgumentError
+  class Invalid < ::ArgumentError
   end
 
   class Undefined < ::NameError
@@ -22,10 +23,13 @@ class Proc
   class Unauthorized < Error
   end
 
+  class Forbidden < Error
+  end
+
   class Unavailable < Error
   end
 
-  class RateLimited < Error
+  class Limited < Error
   end
 
   class Timeout < Error
@@ -60,7 +64,6 @@ class Proc
       @resets_at
     end
 
-
     DEFAULT_HEADERS = {
       "accept" => "application/json",
       "content-type" => "application/json"
@@ -86,6 +89,8 @@ class Proc
 
           payload = Oj.load(response.read, mode: :compat)
         rescue => error
+          # TODO: This should wrap `error`.
+          #
           raise Proc::Unavailable, error.message
         ensure
           response&.close
@@ -95,17 +100,21 @@ class Proc
         when 200
           payload[">>"]
         when 400
-          raise Proc::ArgumentError, payload.dig("error", "message")
-        when 403
+          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::RateLimited, payload.dig("error", "message")
+          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
@@ -120,6 +129,11 @@ class Proc
       true
     end
 
+    def argument(name, **options)
+      Argument.new(name, **options)
+    end
+    alias_method :arg, :argument
+
     private def build_uri(proc)
       host_and_path = File.join(@host, proc.to_s.split(".").join("/"))
 

data/lib/proc/composition.rb

@@ -2,10 +2,13 @@
 
 class Proc
   class Composition
-    def initialize(client:, input:, callables: [])
+    attr_reader :input, :callables, :arguments
+
+    def initialize(client:, input:, callables: [], arguments: {})
       @client = client
       @input = input
       @callables = callables
+      @arguments = arguments
     end
 
     def initialize_copy(_)
@@ -13,16 +16,35 @@ class Proc
     end
 
     def call(input = input_omitted = true, **arguments)
-      @client.call("exec", input_omitted ? @input : input, proc: serialized_calls)
+      callable = self.class.new(
+        client: @client,
+        input: input_omitted ? @input : input,
+        callables: @callables.dup,
+        arguments: @arguments.merge(arguments)
+      )
+
+      @client.call("proc.exec", nil, proc: callable.serialize)
     end
 
-    def with(input = input_omitted = true)
-      self.class.new(client: @client, input: input_omitted ? @input : input, callables: @callables.dup)
+    def with(input = input_omitted = true, **arguments)
+      self.class.new(
+        client: @client,
+        input: input_omitted ? @input : input,
+        callables: @callables.dup,
+        arguments: @arguments.merge(arguments)
+      )
     end
 
     def >>(other)
       composed = dup
-      composed << other
+
+      case other
+      when Composition
+        composed.merge(other)
+      when Callable
+        composed << other
+      end
+
       composed
     end
 
@@ -33,9 +55,9 @@ class Proc
     def serialize
       {
         "{}" => {
-          "<<" => @input,
+          "<<" => serialized_input,
           "[]" => serialized_calls
-        }
+        }.merge(serialized_arguments)
       }
     end
 
@@ -44,5 +66,30 @@ class Proc
         [callable.proc, callable.serialized_arguments]
       }
     end
+
+    def serialized_input
+      serialize_value(@input)
+    end
+
+    def serialized_arguments
+      @arguments.each_pair.each_with_object({}) { |(key, value), hash|
+        hash[key.to_s] = serialize_value(value)
+      }
+    end
+
+    def merge(composition)
+      raise ArgumentError, "expected a composition" unless composition.is_a?(self.class)
+
+      @callables.concat(composition.callables)
+      @arguments.merge!(composition.arguments)
+    end
+
+    private def serialize_value(value)
+      if value.respond_to?(:serialize)
+        value.serialize
+      else
+        value
+      end
+    end
   end
 end

data/lib/proc/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proc
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Bryan Powell
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-26 00:00:00.000000000 Z
+date: 2020-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-http
@@ -47,6 +47,7 @@ files:
 - LICENSE
 - README.md
 - lib/proc.rb
+- lib/proc/argument.rb
 - lib/proc/callable.rb
 - lib/proc/client.rb
 - lib/proc/composition.rb