json-rpc-objects 0.4.3 → 0.4.4

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

@@ -1,8 +1,7 @@
 # encoding: utf-8
-# (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
+# (c) 2011-2015 Martin Poljak (martin@poljak.cz)
 
 require "json-rpc-objects/generic/request"
-require "hash-utils/object"
 
 ##
 # Main JSON-RPC Objects module.
@@ -134,7 +133,7 @@ module JsonRpcObjects
             #
             
             def __check_method
-                if not (@method.symbol? or @method.string?) 
+                if not (@method.kind_of? Symbol or @method.kind_of? String) 
                     raise Exception::new("Service name must be Symbol or convertable to Symbol.")
                 end
             end
@@ -144,7 +143,7 @@ module JsonRpcObjects
             #
             
             def __check_params
-                if not @params.array?
+                if not @params.kind_of? Array
                     raise Exception::new("Params must be Array.")
                 end
             end
@@ -154,7 +153,7 @@ module JsonRpcObjects
             #
             
             def __normalize_method
-                if @method.string?
+                if @method.kind_of? String
                     @method = @method.to_sym
                 end
             end

data/lib/json-rpc-objects/v10/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/generic/response"
 require "json-rpc-objects/v10/error"

data/lib/json-rpc-objects/v10/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("../../..")
 #require "json-rpc-objects/serializer/marshal"

data/lib/json-rpc-objects/v11/alt/error.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/wd/error"
 

data/lib/json-rpc-objects/v11/alt/fakes/request.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/procedure-call"
 
@@ -32,4 +32,3 @@ module JsonRpcObjects
         end
     end
 end
-

data/lib/json-rpc-objects/v11/alt/fakes/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/procedure-return"
 
@@ -32,4 +32,3 @@ module JsonRpcObjects
         end
     end
 end
-

data/lib/json-rpc-objects/v11/alt/procedure-call.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/wd/request"
+require "json-rpc-objects/utils"
 
 ##
 # Main JSON-RPC Objects module.
@@ -60,9 +60,9 @@ module JsonRpcObjects
                     #   property.
                     if data.include? :kwparams
                        @keyword_params = data[:kwparams]
-                       @keyword_params.keys_to_sym!
+                       JsonRpcObjects::Utils::Hash.keys_to_sym! @keyword_params
                     end
-                end
+                end 
                 
                 ##
                 # Assigns the parameters settings.

data/lib/json-rpc-objects/v11/alt/procedure-parameter-description.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/wd/procedure-parameter-description"
 

data/lib/json-rpc-objects/v11/alt/procedure-return.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
-# (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
+# (c) 2011-2015 Martin Poljak (martin@poljak.cz)
 
+require "json-rpc-objects/utils"
 require "json-rpc-objects/v11/alt/error"
 require "json-rpc-objects/v11/wd/response"
 

data/lib/json-rpc-objects/v11/alt/request.rb

@@ -1,4 +1,4 @@
 # 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/fakes/request"

data/lib/json-rpc-objects/v11/alt/response.rb

@@ -1,4 +1,4 @@
 # 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/fakes/response"

data/lib/json-rpc-objects/v11/alt/service-description.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/service-procedure-description"
 require "json-rpc-objects/v11/wd/service-description"

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

@@ -1,8 +1,6 @@
 # encoding: utf-8
-# (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
+# (c) 2011-2015 Martin Poljak (martin@poljak.cz)
 
-require "hash-utils/array"
-require "hash-utils/object"
 require "json-rpc-objects/v11/alt/procedure-parameter-description"
 require "json-rpc-objects/v11/wd/service-procedure-description"
 
@@ -50,7 +48,7 @@ module JsonRpcObjects
                 def check!
                     super()
                     
-                    if @params.array? and (not @params.all? { |v| v.type != JsonRpcObjects::V11::GenericTypes::Nil })
+                    if @params.kind_of? Array and (not @params.all? { |v| v.type != JsonRpcObjects::V11::GenericTypes::Nil })
                         raise Exception::new("Nil return type isn't allowed for parameters.")
                     end
                 end

data/lib/json-rpc-objects/v11/alt/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/v11/generic-types.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-# (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
+# (c) 2011-2015 Martin Poljak (martin@poljak.cz)
 
 ##
 # Main JSON-RPC Objects module.

data/lib/json-rpc-objects/v11/wd/error.rb

@@ -1,8 +1,7 @@
 # encoding: utf-8
-# (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
+# (c) 2011-2015 Martin Poljak (martin@poljak.cz)
 
-require "hash-utils/numeric"
-require "hash-utils/hash"
+require "json-rpc-objects/utils"
 require "json-rpc-objects/generic"
 require "json-rpc-objects/v10/error"
 require "json-rpc-objects/v11/wd/extensions"
@@ -103,8 +102,8 @@ module JsonRpcObjects
                 def check!
                     self.normalize!
 
-                    if not @code.in? 100..999
-                        raise Exception::new("Code must be between 100 and 999 including them.")
+                    if not (100..999).include? @code
+                        raise JsonRpcObjects::Exceptions::InvalidCode::new("Code must be between 100 and 999 including them.")
                     end
                 end
 
@@ -125,7 +124,7 @@ module JsonRpcObjects
                         data["error"] = @data
                     end
                     
-                    data.merge! @extensions.map_keys { |k| k.to_s }
+                    data.merge! JsonRpcObjects::Utils::Hash.map_keys(@extensions) { |k| k.to_s }
                     return data
                 end
                                 

data/lib/json-rpc-objects/v11/wd/extensions.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-# (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
+# (c) 2011-2015 Martin Poljak (martin@poljak.cz)
 
 ##
 # Main JSON-RPC Objects module.

data/lib/json-rpc-objects/v11/wd/fakes/request.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/wd/procedure-call"
 
@@ -32,4 +32,3 @@ module JsonRpcObjects
         end
     end
 end
-

data/lib/json-rpc-objects/v11/wd/fakes/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/wd/procedure-return"
 
@@ -32,4 +32,3 @@ module JsonRpcObjects
         end
     end
 end
-

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

@@ -1,10 +1,7 @@
 # encoding: utf-8
-# (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
+# (c) 2011-2015 Martin Poljak (martin@poljak.cz)
 
-require "hash-utils/array"
-require "hash-utils/hash"
-require "hash-utils/object"
-require "hash-utils/string"
+require "json-rpc-objects/utils"
 require "json-rpc-objects/v10/request"
 require "json-rpc-objects/v11/wd/extensions"
 
@@ -32,7 +29,6 @@ module JsonRpcObjects
             #
             
             class ProcedureCall < JsonRpcObjects::V10::Request
-            
                 include Extensions
 
                 ##
@@ -68,7 +64,7 @@ module JsonRpcObjects
                 def check!
                     super()
                     
-                    if not @keyword_params.nil? and not @keyword_params.hash?
+                    if not @keyword_params.nil? and not @keyword_params.kind_of? Hash
                         raise Exception::new("Keyword params must be Hash.")
                     end
                 end
@@ -99,7 +95,7 @@ module JsonRpcObjects
                     end
                     
                     data.merge! @extensions                
-                    return data.map_keys! { |k| k.to_s }
+                    return JsonRpcObjects::Utils::Hash.map_keys!(data) { |k| k.to_s }
                 end
                 
                 
@@ -147,15 +143,18 @@ module JsonRpcObjects
                     # If named arguments used, assigns keys as symbols
                     #   but keeps numeric arguments as integers
                     
-                    if @params.hash?
+                    if @params.kind_of? Hash
                         @params = @params.dup
-                        @keyword_params = @params.remove! { |k, v| not k.numeric? }
-                        @params = @params.sort_by { |i| i.first.to_i }.map { |i| i.second }
+                        @keyword_params = JsonRpcObjects::Utils::Hash.remove!(@params) do |k, v|
+                            not JsonRpcObjects::Utils::String.numeric? k
+                        end
+                        
+                        @params = @params.sort_by { |i| i[0].to_i }.map { |i| i[1] }
                     else
                         @keyword_params = { }
                     end
                     
-                    @keyword_params.keys_to_sym!
+                    JsonRpcObjects::Utils::Hash.keys_to_sym! @keyword_params
                     
                 end
                 
@@ -175,7 +174,7 @@ module JsonRpcObjects
                         params.merge! @keyword_params
                     end
                 
-                    data[:params] = params.map_keys! { |k| k.to_s }
+                    data[:params] = Utils::Hash.map_keys!(params) { |k| k.to_s }
                 end
                             
                 ##
@@ -183,7 +182,7 @@ module JsonRpcObjects
                 #
                 
                 def __check_params
-                    if not @params.nil? and not @params.array?
+                    if not @params.nil? and not @params.kind_of? Array
                         raise Exception::new("Params must be Array.")
                     end
                 end
@@ -208,4 +207,3 @@ module JsonRpcObjects
         end
     end
 end
-

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

@@ -1,9 +1,9 @@
 # encoding: utf-8
-# (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
+# (c) 2011-2015 Martin Poljak (martin@poljak.cz)
 
 require "json-rpc-objects/v11/generic-types"
 require "json-rpc-objects/generic"
-require "hash-utils/object"
+require "json-rpc-objects/utils"
 
 ##
 # Main JSON-RPC Objects module.
@@ -40,7 +40,7 @@ module JsonRpcObjects
                 # Maps type to object (class).
                 #
                 
-                TYPE_TO_OBJECT = Hash::define({
+                TYPE_TO_OBJECT = Utils::Hash::define({
                     :num => Integer,
                     :str => String,
                     :arr => Array,
@@ -54,7 +54,7 @@ module JsonRpcObjects
                 # Maps object (class) to type.
                 #
                 
-                OBJECT_TO_TYPE = Hash::define({
+                OBJECT_TO_TYPE = Utils::Hash::define({
                     Integer => :num,
                     String => :str,
                     Array => :arr,
@@ -100,11 +100,11 @@ module JsonRpcObjects
                 def check!
                     self.normalize!
                     
-                    if not @name.symbol?
+                    if not @name.kind_of? Symbol
                         raise Exception::new("Parameter name must be Symbol or convertable to Symbol.")
                     end
                     
-                    if (not @type.nil?) and (not @type.kind_of_any? [GenericTypes::Any, GenericTypes::Nil, GenericTypes::Boolean, Integer, String, Array, Object])
+                    if (not @type.nil?) and (not Utils::Object.kind_of_any?(@type, [GenericTypes::Any, GenericTypes::Nil, GenericTypes::Boolean, Integer, String, Array, Object]))
                         raise Exception::new("Type if defined can be only Any, Nil, Boolean, Integer, String, Array or Object.")
                     end
                 end
@@ -144,11 +144,11 @@ module JsonRpcObjects
                 #
                 
                 def normalize!
-                    if @name.string?
+                    if @name.kind_of? String
                         @name = @name.to_sym
                     end
 
-                    if @type.kind_of_any? [String, Symbol]
+                    if Utils::Object.kind_of_any?(@type, [String, Symbol])
                         @type = __normalize_type
                     end
                 end

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

@@ -1,11 +1,10 @@
 # encoding: utf-8
-# (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
+# (c) 2011-2015 Martin Poljak (martin@poljak.cz)
 
+require "json-rpc-objects/utils"
 require "json-rpc-objects/v10/response"
 require "json-rpc-objects/v11/wd/error"
 require "json-rpc-objects/v11/wd/extensions"
-require "hash-utils/object"
-require "hash-utils/hash"
 
 ##
 # Main JSON-RPC Objects module.
@@ -92,7 +91,7 @@ module JsonRpcObjects
                         data["id"] = @id
                     end
                 
-                    data.merge! @extensions.map_keys { |k| k.to_s }
+                    data.merge! Utils::Hash.map_keys(@extensions) { |k| k.to_s }
                     return data
                 end
 
@@ -132,7 +131,7 @@ module JsonRpcObjects
                 #
                 
                 def __create_error
-                    if @error.hash?
+                    if @error.kind_of? Hash
                         @error = self.class::ERROR_CLASS::new(@error)
                     end
                 end

data/lib/json-rpc-objects/v11/wd/request.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
-# (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
+# (c) 2011-2015 Martin Poljak (martin@poljak.cz)
 
 require "json-rpc-objects/v11/wd/fakes/request"

data/lib/json-rpc-objects/v11/wd/response.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
-# (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
+# (c) 2011-2015 Martin Poljak (martin@poljak.cz)
 
 require "json-rpc-objects/v11/wd/fakes/response"

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

@@ -1,11 +1,9 @@
 # encoding: utf-8
-# (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
+# (c) 2011-2015 Martin Poljak (martin@poljak.cz)
 
 require "addressable/uri"
 require "json-rpc-objects/v11/wd/service-procedure-description"
 require "json-rpc-objects/generic"
-require "hash-utils/array"
-require "hash-utils/object"
 
 ##
 # Main JSON-RPC Objects module.
@@ -133,7 +131,7 @@ module JsonRpcObjects
                 def check!
                     self.normalize!
                     
-                    if not @name.symbol?
+                    if not @name.kind_of? Symbol
                         raise Exception::new("Service name must be Symbol or convertable to Symbol.")
                     end
 
@@ -142,11 +140,11 @@ module JsonRpcObjects
                     end
                     
                     if (not @procs.nil?) 
-                        if (not @procs.array?) or (not @procs.all? { |v| v.kind_of? self.class::PROCEDURE_DESCRIPTION_CLASS })
+                        if (not @procs.kind_of? Array) or (not @procs.all? { |v| v.kind_of? self.class::PROCEDURE_DESCRIPTION_CLASS })
                             raise Exception::new("If procs is defined, must be an Array of " << self.class::PROCEDURE_DESCRIPTION_CLASS.name << " objects.")
                         end
                         
-                        if @procs.array?
+                        if @procs.kind_of? Array
                             @procs.each { |proc| proc.check! }
                         end
                     end
@@ -225,7 +223,7 @@ module JsonRpcObjects
                     @address = data[:address]
                     @procs = data[:procs]
                     
-                    if @procs.array?
+                    if @procs.kind_of? Array
                         @procs = @procs.map { |v| self.class::PROCEDURE_DESCRIPTION_CLASS::new(v) }
                     end
                 end
@@ -235,7 +233,7 @@ module JsonRpcObjects
                 #
                 
                 def normalize!
-                    if @name.string?
+                    if @name.kind_of? String
                         @name = @name.to_sym
                     end