json-rpc-objects 0.4.3 → 0.4.4

data/lib/json-rpc-objects/v11/wd/service-procedure-description.rb

@@ -1,9 +1,7 @@
 # encoding: utf-8
-# (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
+# (c) 2011-2015 Martin Poljak (martin@poljak.cz)
 
 require "addressable/uri"
-require "hash-utils/array"
-require "hash-utils/object"
 require "json-rpc-objects/v11/wd/procedure-parameter-description"
 require "json-rpc-objects/generic"
 
@@ -113,16 +111,16 @@ module JsonRpcObjects
                 def check!
                     self.normalize!
                     
-                    if not @name.symbol?
+                    if not @name.kind_of? Symbol
                         raise Exception::new("Procedure name must be Symbol or convertable to Symbol.")
                     end
 
                     if not @params.nil? 
-                        if (not @params.array?) or (not @params.all? { |v| v.kind_of? self.class::PARAMETER_DESCRIPTION_CLASS })
+                        if (not @params.kind_of? Array) or (not @params.all? { |v| v.kind_of? self.class::PARAMETER_DESCRIPTION_CLASS })
                             raise Exception::new("If params is defined, must be an Array of " << self.class::PARAMETER_DESCRIPTION_CLASS.name << " objects.")
                         end
                         
-                        if @params.array?
+                        if @params.kind_of? Array
                             @params.each { |param| param.check! }
                         end
                     end
@@ -135,7 +133,7 @@ module JsonRpcObjects
                         @return.check!
                     end
 
-                    if (not @idempotent.nil?) and (not @idempotent.boolean?)
+                    if (not @idempotent.nil?) and (not Utils::Object.boolean? @idempotent)
                         raise Exception::new("If idempotent is defined, must be boolean.")
                     end
                 end
@@ -208,11 +206,11 @@ module JsonRpcObjects
                     @params = data[:params]
                     @return = data[:return]
                     
-                    if @params.array?
+                    if @params.kind_of? Array
                         @params = @params.map { |v| self.class::PARAMETER_DESCRIPTION_CLASS::new(v) }
                     end
                     
-                    if @return.hash?
+                    if @return.kind_of? Hash
                         @return = self.class::PARAMETER_DESCRIPTION_CLASS::new(@return)
                     end
                 end
@@ -222,7 +220,7 @@ module JsonRpcObjects
                 #
                 
                 def normalize!
-                    if @name.string?
+                    if @name.kind_of? String
                         @name = @name.to_sym
                     end
                     

data/lib/json-rpc-objects/v11/wd/tests/test.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-# (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
+# (c) 2011-2015 Martin Poljak (martin@poljak.cz)
 
 $:.push("../../../..")
 

data/lib/json-rpc-objects/v20/error.rb

@@ -1,8 +1,8 @@
 # encoding: utf-8
-# (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
+# (c) 2011-2015 Martin Poljak (martin@poljak.cz)
 
-require "hash-utils/numeric"
 require "json-rpc-objects/v11/alt/error"
+require "json-rpc-objects/exceptions/invalid-code"
 
 ##
 # Main JSON-RPC Objects module.
@@ -42,8 +42,10 @@ module JsonRpcObjects
             def check!
                 self.normalize!
 
-                if (@code.in? -32768..-32000) and not ((@code == -32700) or (@code.in? -32603..-32600) or (@code.in? -32099..-32000))
-                    raise Exception::new("Code is invalid because of reserved space.")
+                if ((-32768..-32000).include?(@code)) and not ((@code == -32700) or
+                     ((-32603..-32600).include?(@code)) or ((-32099..-32000).include?(code)))
+
+                    raise JsonRpcObjects::Exceptions::InvalidCode::new("Code is invalid because of reserved space.")
                 end
             end
 

data/lib/json-rpc-objects/v20/request.rb

@@ -1,8 +1,8 @@
 # encoding: utf-8
-# (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
+# (c) 2011-2015 Martin Poljak (martin@poljak.cz)
 
-require "hash-utils/hash"
 require "json-rpc-objects/v11/alt/request"
+require "json-rpc-objects/utils"
 
 ##
 # Main JSON-RPC Objects module.
@@ -54,7 +54,7 @@ module JsonRpcObjects
             def check!
                 super()
                 
-                if not @id.kind_of_any? [Symbol, String, Integer, NilClass]
+                if not [Symbol, String, Integer, NilClass].any?{ |cl| @id.kind_of?(cl) }
                     raise Exception::new("ID must contain Symbol, String, Number or nil if included.")
                 end
             end
@@ -105,8 +105,8 @@ module JsonRpcObjects
             #
             
             def __get_params(data)
-                if @params.hash?
-                    @keyword_params = @params.keys_to_sym
+                if @params.kind_of?(Hash)
+                    @keyword_params = Utils::Hash.keys_to_sym(@params)
                     @params = nil
                 end
             end
@@ -119,7 +119,7 @@ module JsonRpcObjects
                 if not @params.nil? and not @params.empty?
                     data[:params] = @params
                 elsif not @keyword_params.nil? and not @keyword_params.empty?
-                    data[:params] = @keyword_params.map_keys { |k| k.to_s } 
+                    data[:params] = Utils::Hash.map_keys(@keyword_params) { |k| k.to_s } 
                 end
             end
             

data/lib/json-rpc-objects/v20/response.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-# (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
+# (c) 2011-2015 Martin Poljak (martin@poljak.cz)
 
 require "json-rpc-objects/v11/alt/response"
 require "json-rpc-objects/v20/error"
@@ -60,7 +60,7 @@ module JsonRpcObjects
             def check!
                 super()
                 
-                if not @id.kind_of_any? [Symbol, String, Integer, NilClass]
+                if not [Symbol, String, Integer, NilClass].any?{ |cl| @id.kind_of?(cl) }
                     raise Exception::new("ID must contain Symbol, String, Number or nil if included.")
                 end
             end

data/lib/json-rpc-objects/v20/tests/test.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-# (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
+# (c) 2011-2015 Martin Poljak (martin@poljak.cz)
 
 $:.push("../../..")
 
@@ -19,7 +19,7 @@ puts res.serialize
 require "../request"
 req = JsonRpcObjects::V20::Request::create(:alfa, [:beta], :"version" => :"1.0")
 puts req.serialize
-req = JsonRpcObjects::V20::Request::create(:alfa, {:alfa => :beta}, :id => :"12345", :"$whatever" => false)
+req = JsonRpcObjects::V20::Request::create(:alfa, {:alfa => :beta}, :id => :"12345", :$whatever => false)
 puts req.serialize
 
 require "../../request"

data/lib/json-rpc-objects/version.rb

@@ -1,8 +1,5 @@
 # encoding: utf-8
-# (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
-
-require "hash-utils/object"
-require "hash-utils/module"
+# (c) 2011-2015 Martin Poljak (martin@poljak.cz)
 
 ##
 # Main JSON-RPC Objects module.
@@ -54,7 +51,7 @@ module JsonRpcObjects
         #
         
         def self.get(mod)
-            if not mod.in? @@cache
+            if not @@cache.include? mod
                 @@cache[mod] = self::new(mod)
             end
             
@@ -93,7 +90,7 @@ module JsonRpcObjects
                 @@files[file_path] = true
             end
             
-            return Module.get_module(module_name)
+            return __get_module(module_name)
         end
         
         
@@ -107,6 +104,21 @@ module JsonRpcObjects
             @module = mod
         end
         
+        
+        private
+        
+        def __get_module(name)
+            names = name.split("::")
+            mod = ::Module
+            
+            while not names.empty?
+                name = names.shift
+                mod = mod.const_get(name)
+            end
+            
+            return mod
+        end
+        
     end
     
 end

data/spec/request_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+require 'json-rpc-objects/request'
+
+describe JsonRpcObjects::Request do
+  describe "#parse" do
+    let(:json) { '{"jsonrpc":"2.0","method":"sum","params":[1,2],"id":"cbf5d56b"}' }
+    subject(:request) { described_class.parse(json) }
+    its(:method) { should == :sum }
+    its(:params) { should == [1,2] }
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,18 @@
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# Require this file using `require "spec_helper"` to ensure that it is only
+# loaded once.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+require 'rspec/its'
+
+RSpec.configure do |config|
+  config.run_all_when_everything_filtered = true
+  config.filter_run :focus
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = 'random'
+end

metadata

@@ -1,121 +1,136 @@
 --- !ruby/object:Gem::Specification
 name: json-rpc-objects
 version: !ruby/object:Gem::Version
-  version: 0.4.3
-  prerelease: 
+  version: 0.4.4
 platform: ruby
 authors:
-- Martin Kozák
+- Martin Poljak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-06 00:00:00.000000000 Z
+date: 2015-08-15 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: hash-utils
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.18.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.18.0
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.2
 - !ruby/object:Gem::Dependency
   name: abstract
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: json-rpc-objects-json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.1
+- !ruby/object:Gem::Dependency
+  name: ruby-version
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.2
 description: 
-email: martinkozak@martinkozak.net
+email: martin@poljak.cz
 executables: []
 extensions: []
 extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files:
-- .document
+- ".document"
 - CHANGES.txt
 - Gemfile
 - Gemfile.lock
@@ -125,6 +140,7 @@ files:
 - VERSION
 - json-rpc-objects.gemspec
 - lib/json-rpc-objects/error.rb
+- lib/json-rpc-objects/exceptions/invalid-code.rb
 - lib/json-rpc-objects/generic.rb
 - lib/json-rpc-objects/generic/error.rb
 - lib/json-rpc-objects/generic/object.rb
@@ -135,6 +151,10 @@ files:
 - lib/json-rpc-objects/serializer.rb
 - lib/json-rpc-objects/serializer/marshal.rb
 - lib/json-rpc-objects/serializer/none.rb
+- lib/json-rpc-objects/utils.rb
+- lib/json-rpc-objects/utils/hash.rb
+- lib/json-rpc-objects/utils/object.rb
+- lib/json-rpc-objects/utils/string.rb
 - lib/json-rpc-objects/v10/error.rb
 - lib/json-rpc-objects/v10/request.rb
 - lib/json-rpc-objects/v10/response.rb
@@ -168,33 +188,31 @@ files:
 - lib/json-rpc-objects/v20/response.rb
 - lib/json-rpc-objects/v20/tests/test.rb
 - lib/json-rpc-objects/version.rb
+- spec/request_spec.rb
+- spec/spec_helper.rb
 homepage: http://github.com/martinkozak/json-rpc-objects
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4582882999797080532
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Implementation of JSON-RPC objects with respect to specifications compliance
   and API backward compatibility. Implements all versions of the protocol and support
   for ability to communicate by the same protocol version which other side uses by