activerpc 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 731fbeef55a0b7a9bacbf22b09caabd6599f66032ac24e34d834889f7c810ef3
-  data.tar.gz: 841090dce51a1285eb0f2e63e17c3f5f6c868c211caef620f7a91e2991bf267b
+  metadata.gz: e424564ef40dfcc5c6a1e802a8e7767a7111f5de76ebd52b7f91581f61bae195
+  data.tar.gz: 2d27258a00946665bd4795f124c3eb63f6ce59ed5056d3b0396c422d611c22e8
 SHA512:
-  metadata.gz: 9c30c2aa2c713da842b21d1ce591ed350856f27bad5c154f1a60b1bfa223c4e4bd4d32ec25f2de30e9a21dcd1d52e9d05b6368dc4161f42e47185ee444c8fdbe
-  data.tar.gz: 0fdc8cc5a86773f43835223976941e90e8222c86191bb18110380e18f0fe3a83ec594e29d6c99024a4da13f9d511e447ef2422e56a037e3ef5928cdf12fe4a54
+  metadata.gz: 1f62f60e31e8ae1e26922693d3666f4f48ebac57f1eaf4a02dc96b9254f8636ae926addf08edef1ee67759c4344510e64d23b3454ac4fdf1a64be1886537898a
+  data.tar.gz: '040801f682a44861de03fbaa779f5d223c21de825e0581a328d114b22f651c14d92fe523c995a8966a085d2b4402e9e198b08ebfb4469cbcb0cc17a14a9d43bd'

data/README.md

@@ -80,20 +80,17 @@ end
 ```
 
 #### Controller Lifecycle Events
-You can provide `around`, `before` or `after` hooks to tie into the controller
+You can provide `after` or `before` hooks to tie into the controller
 lifecycle, whether for authentication, authorization or whatever else.
 
-To provide a hook, you need to pass something that responds to the corresponding
-method to the appropriate setting in the config, e.g.
+To provide a hook, you can provide a callable for the method desired to the config
+object.
 
 ```ruby
 ActiveRpc.configure do |config|
-  config.around_action = Module.new do
-    def self.around(controller) # method name matches the hook type
-      puts controller.request.remote_ip
-      yield
-    end
-  end
+  config.before_action = ->{
+    authenticate_user!
+  }
 end
 ```
 

data/app/controllers/active_rpc/rpc_controller.rb

@@ -1,13 +1,11 @@
 module ActiveRpc
   class RpcController < ActionController::Base
     if ActiveRpc.config.after_action.present?
-      after_action ActiveRpc.config.after_action
-    end
-    if ActiveRpc.config.around_action.present?
-      around_action ActiveRpc.config.around_action
+      after_action(&ActiveRpc.config.after_action)
     end
+
     if ActiveRpc.config.before_action.present?
-      before_action ActiveRpc.config.before_action
+      before_action(&ActiveRpc.config.before_action)
     end
 
     def create
@@ -27,8 +25,9 @@ module ActiveRpc
     end
 
     private def process_item(item)
-      req = ActiveRpc::Request.new(id: item['id'], method: item['method'], params: item['params'])
+      req = ActiveRpc::Request.new(item.slice('id', 'method', 'params'))
       res = ActiveRpc::Response.from_request(req)
+      ex = nil
 
       begin
         raise TypeError, 'invalid JSON-RPC request' unless req.valid?
@@ -39,17 +38,19 @@ module ActiveRpc
         ex = executor.new(req.params)
         raise ArgumentError, 'invalid payload' unless ex.valid?
         res.result = ex.call
-      rescue TypeError => ex
-        res.error = Errors::ClientError.new(message: ex.to_s)
-      rescue NoMethodError => ex
-        res.error = Errors::NoMethodError.new(message: ex.to_s)
-      rescue ArgumentError => ex
-        res.error = Errors::ArgumentError.new(message: ex.to_s)
-      rescue OperationFailure => ex
-        res.error = ex.rpc_error
+      rescue TypeError => e
+        res.error = Errors::ClientError.new(message: e.to_s)
+        res.error.data = req.errors
+      rescue NoMethodError => e
+        res.error = Errors::NoMethodError.new(message: e.to_s)
+      rescue ArgumentError => e
+        res.error = Errors::ArgumentError.new(message: e.to_s)
+        res.error.data = ex.errors
+      rescue OperationFailure => e
+        res.error = e.rpc_error
       # todo: handle rpc-level errors
-      rescue => ex
-        res.error = Errors::InternalError.new(message: ex.to_s)
+      rescue => e
+        res.error = Errors::InternalError.new(message: e.to_s)
       end
 
       res

data/lib/active_rpc/request.rb

@@ -1,19 +1,30 @@
 module ActiveRpc
   class Request
-    attr_reader :id, :method, :params
+    include ActiveModel::Model
+    include ActiveModel::Validations
 
-    def initialize(id:, method:, params:)
-      @id, @method, @params = id, method, params
+    attr_accessor :id, :method, :params
+
+    validates_each :id do |record, field, value|
+      unless value.is_a?(String) || value.is_a?(Integer)
+        record.errors.add(field, %(illegal type - received #{value.class}))
+      end
+    end
+
+    validates_each :method do |record, field, value|
+      unless value.is_a?(String)
+        record.errors.add(field, %(illegal type - received #{value.class}))
+      end
+
+      unless value.present?
+        record.errors.add(field, 'must not be empty')
+      end
     end
 
-    def valid?
-      [
-        id.present?,
-        id.is_a?(String) || id.is_a?(Integer),
-        method.present?,
-        method.is_a?(String),
-        params.nil? || params.is_a?(Array) || params.is_a?(Hash),
-      ].all?
+    validates_each :params do |record, field, value|
+      unless value.nil? || value.is_a?(Array) || value.is_a?(Hash)
+        record.errors.add(field, %(invalid type - received #{value.class}))
+      end
     end
   end
 end

data/lib/active_rpc/version.rb

@@ -1,3 +1,3 @@
 module ActiveRpc
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerpc
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - John Maxwell