jpc 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9838964a3c402a026bdd5a0058d94f9838c202c0
-  data.tar.gz: f89c1cac62eeddb98c83e1dd7c7a4f129da8077a
+  metadata.gz: 190f935e6c034bbe7f4844e648d9989126baa392
+  data.tar.gz: 8911efec5a01688e0af7afb472b9408aaa6edee7
 SHA512:
-  metadata.gz: 38787ea9e618b415f140c52d51003c1df4e4a1d92f932cd888c676eb5aa9cef072cb6b8e3ed99533c0dffb7e2620b2a14c38f46b59023acb99885412dc1715de
-  data.tar.gz: 32175cd39b99bb034d6c4bd8e9d288a75869aabe198c90b28f6853f5fca34fb479dd56fd1b10c293e6a3fadbf78c6cc856e175a70eaef341804f6a5ae40a6c42
+  metadata.gz: c4d79d19f34d7af91ee31c128529893f68eb6a889f9bfa4ee2eb86ad7cdf04bcd000b30a32ac4842bdc99fc8fb26f3b7b5c4e33870b720d7d6eca0754b218dec
+  data.tar.gz: '06877185c39b85a024e2b3e74e7be2f5ce91ff1b6939fdc95cdd71428b5e01e1aaa7a582021aad7b4afd2160a93691b649d9ec6282bc794381dd928e1ffc3675'

data/lib/jpc.rb

@@ -1,6 +1,5 @@
 require 'oj'
 require 'jpc/version'
-require 'jpc/errors'
 require 'jpc/helpers'
 require 'jpc/invoker'
 require 'jpc/handler'

data/lib/jpc/handler.rb

@@ -8,7 +8,7 @@ module JPC
     end
 
     def ping(params = {})
-      "pong #{params}"
+      "pong #{params.inspect}"
     end
 
     def subscribe(channel)
@@ -21,12 +21,8 @@ module JPC
 
     private
 
-    def allowed_methods
-      procedures + %w(ping subscribe unsubscribe)
-    end
-
-    def procedures
-      []
+    def allowed?(method)
+      %w(ping subscribe unsubscribe).include?(method)
     end
   end
 end

data/lib/jpc/invoker.rb

@@ -16,14 +16,10 @@ module JPC
     def execute(request)
       method = request['method']
 
-      raise "Method #{method} not allowed" unless method_allowed?(method)
+      raise "Method #{method} is not allowed" unless @handler.send(:allowed?, method)
 
       @handler.token = request['token'] if request['token']
 
-      if @handler.respond_to?(:authorized?)
-        raise JPC::Errors::UnauthorizedError unless @handler.authorized?(method)
-      end
-
       result = if request['params'].is_a?(Array)
                  @handler.public_send(method, *request['params'])
                elsif %w(Hash String Integer).include?(request['params'].class.name)
@@ -34,22 +30,11 @@ module JPC
 
       make_result(request['id'], result)
     rescue => e
-      code = case e.class.name
-             when 'JPC::Errors::UnauthorizedError'
-               32001
-             else
-               32000
-             end
-
       make_error(
         request['id'],
-        code,
-        "Method #{method}: #{e.message}. See #{e.backtrace[0]}"
+        e.class.name,
+        "Method #{method}: [#{e.class.name}] #{e.message} @ #{e.backtrace[0]}"
       )
     end
-
-    def method_allowed?(name)
-      @handler.send(:allowed_methods).include?(name.to_s)
-    end
   end
 end

data/lib/jpc/version.rb

@@ -1,3 +1,3 @@
 module JPC
-  VERSION = '1.2.1'.freeze
+  VERSION = '1.3.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jpc
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Denis Lysenko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-28 00:00:00.000000000 Z
+date: 2017-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -86,7 +86,6 @@ files:
 - jpc.gemspec
 - lib/jpc.rb
 - lib/jpc/dispatcher.rb
-- lib/jpc/errors.rb
 - lib/jpc/handler.rb
 - lib/jpc/helpers.rb
 - lib/jpc/invoker.rb
@@ -111,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: JPC is JSON-RPC 2.0 Ruby Library.

data/lib/jpc/errors.rb

@@ -1,9 +0,0 @@
-module JPC
-  module Errors
-    class UnauthorizedError < RuntimeError
-      def message
-        'Unauthorized Request'
-      end
-    end
-  end
-end