jpc 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34736193a4d8924161740400cdcfcc5bd595ddc3
-  data.tar.gz: 4b22af972d7bd5a457762bb54cf089aac617f084
+  metadata.gz: 9838964a3c402a026bdd5a0058d94f9838c202c0
+  data.tar.gz: f89c1cac62eeddb98c83e1dd7c7a4f129da8077a
 SHA512:
-  metadata.gz: a53734a7c53d9eb556d6b3d67e975291185bec5fca033d478b4521dce84104fa69f59fb1259aab22149da877e745fca5a3ef5878685f9e289fde6fd115b0a02c
-  data.tar.gz: bf4c3f98c74774df37d5c2df2369c681895604694ca56c77c8fff04e534356d89408146e3014998a4e0b81a637a1f51ff15381cdb2dbfd0232fb0eca669ad36d
+  metadata.gz: 38787ea9e618b415f140c52d51003c1df4e4a1d92f932cd888c676eb5aa9cef072cb6b8e3ed99533c0dffb7e2620b2a14c38f46b59023acb99885412dc1715de
+  data.tar.gz: 32175cd39b99bb034d6c4bd8e9d288a75869aabe198c90b28f6853f5fca34fb479dd56fd1b10c293e6a3fadbf78c6cc856e175a70eaef341804f6a5ae40a6c42

data/.rspec

@@ -1,3 +1,4 @@
 --format documentation
 --color
 --order random
+--require spec_helper

data/CONTRIBUTING.md

@@ -0,0 +1,5 @@
+# How to contribute
+
+If you want to contribute you are welcome!
+
+Just make your changes and create pull request.

data/Rakefile

@@ -1,6 +1,6 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "jpc"
+require 'bundler/setup'
+require 'jpc'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +10,5 @@ require "jpc"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start

data/jpc.gemspec

@@ -4,22 +4,22 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'jpc/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "jpc"
+  spec.name          = 'jpc'
   spec.version       = JPC::VERSION
-  spec.authors       = ["Denis Lysenko"]
-  spec.email         = ["d@lysenkooo.ru"]
-  spec.summary       = %q{JPC is JSON-RPC 2.0 Ruby Library.}
-  spec.description   = %q{This library provides possibility to handle JSON requests.}
-  spec.homepage      = "http://lysenkooo.ru"
-  spec.license       = "MIT"
+  spec.authors       = ['Denis Lysenko']
+  spec.email         = ['d@lysenkooo.ru']
+  spec.summary       = 'JPC is JSON-RPC 2.0 Ruby Library.'
+  spec.description   = 'This library provides possibility to handle JSON requests.'
+  spec.homepage      = 'http://lysenkooo.ru'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency "oj", ">= 2.0.0"
-  spec.add_development_dependency "bundler", "~> 1.11"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_runtime_dependency 'oj', '>= 2.0.0'
+  spec.add_development_dependency 'bundler', '~> 1.11'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec', '~> 3.0'
 end

data/lib/jpc.rb

@@ -1,10 +1,10 @@
-require "oj"
-require "jpc/version"
-require "jpc/errors"
-require "jpc/helpers"
-require "jpc/invoker"
-require "jpc/handler"
-require "jpc/dispatcher"
+require 'oj'
+require 'jpc/version'
+require 'jpc/errors'
+require 'jpc/helpers'
+require 'jpc/invoker'
+require 'jpc/handler'
+require 'jpc/dispatcher'
 
 module JPC
   RPC_VERSION = '2.0'.freeze

data/lib/jpc/dispatcher.rb

@@ -1,37 +1,41 @@
-class JPC::Dispatcher
-  include JPC::Helpers
+module JPC
+  class Dispatcher
+    include JPC::Helpers
 
-  def subscribe(ws, channel)
-    channels[channel.to_sym] ||= []
-    channels[channel.to_sym] << ws
+    def subscribe(ws, channel)
+      channels[channel.to_sym] ||= []
+      channels[channel.to_sym].push(ws) unless channels[channel.to_sym].include?(ws)
 
-    { channel: channel, status: 'subscribed' }
-  end
+      { channel: channel, status: 'subscribed' }
+    end
 
-  def unsubscribe(ws, channel)
-    fail "Channel #{channel} not found" unless channels[channel.to_sym]
+    def unsubscribe(ws, channel)
+      raise "Channel #{channel} not found" unless channels[channel.to_sym]
 
-    channels[channel.to_sym] -= [ws]
+      channels[channel.to_sym].each_with_index do |object, index|
+        channels[channel.to_sym].delete_at(index) if object == ws
+      end
 
-    { channel: channel, status: 'unsubscribed' }
-  end
+      { channel: channel, status: 'unsubscribed' }
+    end
 
-  def cast(channel, payload)
-    message = make_message(channel: channel, payload: payload)
+    def cast(channel, payload)
+      message = make_message(channel: channel, payload: payload)
 
-    sent = 0
+      sent = 0
 
-    channels[channel.to_sym] && channels[channel.to_sym].each do |ws|
-      ws.send(message)
-      sent += 1
-    end
+      channels[channel.to_sym] && channels[channel.to_sym].each do |ws|
+        ws.send(message)
+        sent += 1
+      end
 
-    { channel: channel, sent: sent }
-  end
+      { channel: channel, sent: sent }
+    end
 
-  private
+    private
 
-  def channels
-    @channels ||= {}
+    def channels
+      @channels ||= {}
+    end
   end
 end

data/lib/jpc/errors.rb

@@ -2,7 +2,7 @@ module JPC
   module Errors
     class UnauthorizedError < RuntimeError
       def message
-        "Unauthorized Request"
+        'Unauthorized Request'
       end
     end
   end

data/lib/jpc/handler.rb

@@ -1,30 +1,32 @@
-class JPC::Handler
-  attr_accessor :token
+module JPC
+  class Handler
+    attr_accessor :token
 
-  def initialize(ws = nil, dispatcher = nil)
-    @ws = ws
-    @dispatcher = dispatcher
-  end
+    def initialize(ws, dispatcher)
+      @ws = ws
+      @dispatcher = dispatcher
+    end
 
-  def ping(params = {})
-    "pong #{params}"
-  end
+    def ping(params = {})
+      "pong #{params}"
+    end
 
-  def subscribe(channel)
-    @dispatcher.subscribe(@ws, channel)
-  end
+    def subscribe(channel)
+      @dispatcher.subscribe(@ws, channel)
+    end
 
-  def unsubscribe(channel)
-    @dispatcher.unsubscribe(@ws, channel)
-  end
+    def unsubscribe(channel)
+      @dispatcher.unsubscribe(@ws, channel)
+    end
 
-  private
+    private
 
-  def allowed_methods
-    procedures + %w(ping subscribe unsubscribe)
-  end
+    def allowed_methods
+      procedures + %w(ping subscribe unsubscribe)
+    end
 
-  def procedures
-    []
+    def procedures
+      []
+    end
   end
 end

data/lib/jpc/invoker.rb

@@ -1,53 +1,55 @@
-class JPC::Invoker
-  include JPC::Helpers
+module JPC
+  class Invoker
+    include JPC::Helpers
 
-  def initialize(handler)
-    @handler = handler
-  end
-
-  def invoke(json)
-    request = Oj.load(json)
-    response = execute(request)
-  end
-
-  private
-
-  def execute(request)
-    method = request['method']
-
-    fail "Method #{method} not allowed" unless method_allowed?(method)
-
-    @handler.token = request['token'] if request['token']
-
-    if @handler.respond_to?(:authorized?)
-      fail JPC::Errors::UnauthorizedError unless @handler.authorized?(method)
+    def initialize(handler)
+      @handler = handler
     end
 
-    if request['params'].is_a?(Array)
-      result = @handler.public_send(method, *request['params'])
-    elsif %w(Hash String Integer).include?(request['params'].class.name)
-      result = @handler.public_send(method, request['params'])
-    else
-      result = @handler.public_send(method)
+    def invoke(json)
+      request = Oj.load(json)
+      execute(request)
     end
 
-    make_result(request['id'], result)
-  rescue => e
-    case e.class.name
-    when 'JPC::Errors::UnauthorizedError'
-      code = 32001
-    else
-      code = 32000
+    private
+
+    def execute(request)
+      method = request['method']
+
+      raise "Method #{method} not allowed" unless method_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)
+                 @handler.public_send(method, request['params'])
+               else
+                 @handler.public_send(method)
+               end
+
+      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]}"
+      )
     end
 
-    make_error(
-      request['id'],
-      code,
-      "Method #{method}: #{e.message}. See #{e.backtrace[0]}"
-    )
-  end
-
-  def method_allowed?(name)
-    @handler.send(:allowed_methods).include?(name.to_s)
+    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.0"
+  VERSION = '1.2.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jpc
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Denis Lysenko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-09 00:00:00.000000000 Z
+date: 2016-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -76,6 +76,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE.txt
 - README.md