json-rpc-objects 0.4.3 → 0.4.4

data/lib/json-rpc-objects/generic/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/generic/object"
 

data/lib/json-rpc-objects/generic/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/object"
 

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

@@ -1,9 +1,8 @@
 # encoding: utf-8
-# (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
+# (c) 2011-2015 Martin Poljak (martin@poljak.cz)
 
 require "json-rpc-objects/v20/request"
 require "json-rpc-objects/serializer"
-require "hash-utils/object"
 
 ##
 # Main JSON-RPC Objects module.
@@ -51,8 +50,8 @@ module JsonRpcObjects
         
         def self.parse(string, default_v11 = :wd, serializer = JsonRpcObjects::default_serializer)
             data = serializer.deserialize(string)
-            
-            if not data.hash?
+            p data
+            if not data.kind_of? Hash
                 raise Exception::new("Data in JSON string aren't object.")
             end
             
@@ -76,7 +75,7 @@ module JsonRpcObjects
             end
             
             # Returns
-            if not file.in? @@files
+            if not @@files.include?(file)
                 require file
                 @@files[file] = true
             end

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

@@ -1,9 +1,8 @@
 # encoding: utf-8
-# (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
+# (c) 2011-2015 Martin Poljak (martin@poljak.cz)
 
 require "json-rpc-objects/v20/response"
 require "json-rpc-objects/serializer"
-require "hash-utils/object"
 
 ##
 # Main JSON-RPC Objects module.
@@ -51,7 +50,7 @@ module JsonRpcObjects
         def self.parse(string, default_v11 = :wd, serializer = JsonRpcObjects::default_serializer)
             data = serializer.deserialize(string)
             
-            if not data.hash?
+            if not data.kind_of? Hash
                 raise Exception::new("Data in JSON string aren't object.")
             end
             
@@ -75,7 +74,7 @@ module JsonRpcObjects
             end
             
             # Returns
-            if not file.in? @@files
+            if not @@files.include?(file)
                 require file
                 @@files[file] = true
             end

data/lib/json-rpc-objects/serializer.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/serializer/json"
 require "abstract"
@@ -104,4 +104,3 @@ module JsonRpcObjects
         
     end
 end
-

data/lib/json-rpc-objects/serializer/marshal.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/serializer"
 

data/lib/json-rpc-objects/serializer/none.rb

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

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

@@ -0,0 +1,6 @@
+# encoding: utf-8
+# (c) 2011-2015 Martin Poljak (martin@poljak.cz)
+
+require 'json-rpc-objects/utils/hash'
+require 'json-rpc-objects/utils/object'
+require 'json-rpc-objects/utils/string'

data/lib/json-rpc-objects/utils/hash.rb

@@ -0,0 +1,198 @@
+# encoding: utf-8
+# (c) 2011-2015 Martin Poljak (martin@poljak.cz)
+
+require 'ruby-version'
+
+##
+# Main JSON-RPC Objects module.
+#
+
+module JsonRpcObjects
+
+    ##
+    # Module for utility functions. Large part ported from 'hash-utils'.
+    # @since 0.4.4
+    #
+    
+    module Utils
+    
+        ##
+        # Hash utility functions.
+        #
+        
+        class Hash
+          
+            ##
+            # Returns a new hash with the results of running block once for 
+            # every key in +hash+.
+            #
+            # @param [Hash] hash  source hash
+            # @param [Proc] block evaluating block
+            # @return [Hash] new hash
+            #
+            
+            def self.map_keys(hash, &block)
+                self.map_pairs(hash) do |k, v|
+                    [block.call(k), v]
+                end
+            end
+            
+            ##
+            # Emulates {#map_keys} on place. In fact, replaces old hash by 
+            # new one.
+            #
+            # @param [Hash] hash  source hash
+            # @param [Proc] block evaluating block
+            # @return [Hash] new hash
+            #
+            
+            def self.map_keys!(hash, &block)
+                hash.replace(self.map_keys(hash, &block))
+            end
+            
+            ##
+            # Returns a new hash with the results of running block once for 
+            # every pair in +hash+.
+            #
+            # @param [Hash] hash  source hash
+            # @param [Proc] block evaluating block
+            # @return [Hash] new hash
+            # 
+            
+            def self.map_pairs(hash, &block)
+                _new = self.recreate(hash)
+                
+                hash.each_pair do |k, v|
+                    new_k, new_v = block.call(k, v)
+                    _new[new_k] = new_v
+                end
+                
+                return _new
+            end
+            
+            ##
+            # Recreates the hash, so creates empty one and assigns
+            # the same default values.
+            #
+            # @param [Hash] hash  source hash
+            # @return [Hash] new hash
+            #
+            
+            def self.recreate(hash)
+                self.create(hash.default, &hash.default_proc)
+            end
+            
+            ##
+            # Creates hash by setting default settings in one call.
+            #
+            # @param [Object] default  default value
+            # @param [Hash] hash  initial values
+            # @param [Proc] block  default block
+            # @return [Hash] new hash
+            #
+            
+            def self.create(default = nil, hash = nil, &block)
+                if Ruby::Version >= "1.9"
+                     if not hash.nil?
+                         hash = hash.dup
+                     else
+                         hash = { }
+                     end
+                     
+                     hash.default = default
+                     hash.default_proc = block if not block.nil?
+                     return hash
+                 else
+                     if not hash.nil?
+                         hash = hash.dup
+                     else
+                         hash = { }
+                     end
+                     
+                     if not block.nil?
+                         _new = ::Hash::new(&block)
+                         _new.update(hash) if not hash.empty?
+                         hash = _new
+                     else
+                         hash.default = default
+                     end
+                     
+                     return hash
+                 end    
+            end
+            
+            ##
+            # Converts all +String+ keys to symbols. 
+            #
+            # @param [Hash] hash  source hash
+            # @return [Hash] new hash
+            #
+            
+            def self.keys_to_sym(hash)
+                self.map_keys(hash) do |k|
+                    if k.kind_of? ::String
+                        k.to_sym 
+                    else
+                        k
+                    end
+                end
+            end
+            
+            ##
+            # Emulates {#keys_to_sym} on place. In fact, replaces old hash by 
+            # new one.
+            #
+            # @param [Hash] hash  source hash
+            # @return [Hash] new hash
+            #
+            
+            def self.keys_to_sym!(hash)
+                hash.replace(self.keys_to_sym(hash))
+            end
+            
+            ##
+            # Moves selected pairs outside the hash, so returns them.
+            # Output hash has the same default settings.
+            #
+            # @param [Hash] hash  source hash
+            # @param [Proc] block selecting block
+            # @return [Hash] removed selected pairs
+            #
+            
+            def self.remove!(hash, &block)
+                result = self.recreate(hash)
+                delete = [ ]
+                
+                hash.each_pair do |k, v|
+                    if block.call(k, v)
+                        result[k] = v
+                        delete << k
+                    end
+                end
+                
+                delete.each do |k|
+                    hash.delete(k)
+                end
+                
+                return result
+            end
+            
+            ##
+            # Defines hash by setting the default value or an +Proc+ 
+            # and content.
+            #
+            # @param [Hash] values  initial values
+            # @param [Object] default  default value
+            # @param [Proc] block  default block
+            # @return [Hash] new hash
+            #
+            
+            def self.define(values = { }, default = nil, &block) 
+                hash = ::Hash[values]
+                self.create(default, hash, &block)
+            end
+            
+        end
+        
+    end
+end

data/lib/json-rpc-objects/utils/object.rb

@@ -0,0 +1,85 @@
+# encoding: utf-8
+# (c) 2011-2015 Martin Poljak (martin@poljak.cz)
+
+##
+# Main JSON-RPC Objects module.
+#
+
+module JsonRpcObjects
+
+    ##
+    # Module for utility functions. Large part ported from 'hash-utils'.
+    # @since 0.4.4
+    #
+    
+    module Utils
+    
+        ##
+        # Object utility functions.
+        #
+        
+        class Object
+          
+            ##
+            # Returns +true+ if object is an instance of the given classes. 
+            #
+            # @see #kind_of_any?
+            # @param [Object] object  source object
+            # @param [Array] classes array of class objects
+            # @return [Boolean] +true+ if it is, +false+ in otherwise
+            #
+            
+            def self.instance_of_any?(object, *classes)
+                if classes.first.kind_of? ::Array
+                    classes = classes.first
+                end
+                
+                classes.each do |cls|
+                    if object.instance_of? cls
+                        return true
+                    end
+                end
+                
+                return false
+            end
+            
+            ##
+            # Returns +true+ if one of classes are the class of object, 
+            # or if one of classes are one of the superclasses of object or 
+            # modules included in object.
+            #
+            # @param [Object] object  source object
+            # @param [Array] classes array of class objects
+            # @return [Boolean] +true+ if it is, +false+ in otherwise
+            # @since 0.16.0
+            #
+            
+            def self.kind_of_any?(object, *classes)
+                if classes.first.kind_of? ::Array
+                    classes = classes.first
+                end
+                
+                classes.each do |cls|
+                    if object.kind_of? cls
+                        return true
+                    end
+                end
+                
+                return false
+            end
+            
+            ##
+            # Indicates, object is boolean.
+            #
+            # @param [Objectt] object  source object 
+            # @return [Boolean] +true+ if yes, +false+ in otherwise
+            #
+            
+            def self.boolean?(object)
+                self.instance_of_any? object, [TrueClass, FalseClass]
+            end
+            
+        end
+        
+    end
+end

data/lib/json-rpc-objects/utils/string.rb

@@ -0,0 +1,46 @@
+# encoding: utf-8
+# (c) 2011-2015 Martin Poljak (martin@poljak.cz)
+
+##
+# Main JSON-RPC Objects module.
+#
+
+module JsonRpcObjects
+
+    ##
+    # Module for utility functions. Large part ported from 'hash-utils'.
+    # @since 0.4.4
+    #
+    
+    module Utils
+    
+        ##
+        # String utility functions.
+        #
+        
+        class String
+          
+            ##
+            # Holds numeric matcher.
+            #
+          
+            NUMERIC = /^\s*-?\d+(?:\.\d+)?\s*$/
+              
+            ##
+            # Indicates, string is numeric, so consists of numbers only.
+            #
+            # @param [Source] string  source string
+            # @return [Boolean] +true+ if yes, +false+ in otherwise
+            #
+            
+            def self.numeric?(string)
+                if string.match(NUMERIC)
+                    true
+                else
+                    false
+                end
+            end
+        end
+        
+    end
+end

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