json-rpc-objects 0.3.3 → 0.3.4

data/CHANGES.txt

@@ -1,4 +1,10 @@
 
+0.3.4 (2011-07-18)
+* dependency from yajl-ruby to multi_json for compatibility with all 
+  other major JSON libraries or unsupported platforms
+* minor optimizations and corrections
+* upgrade to modern 'hash-utils' version
+
 0.3.3 (2011-02-13)
 * rather big performance lag in generic parsers
 
@@ -18,7 +24,8 @@
 * correct error inheritance from 1.1 to 1.0
 
 0.2.0 (2011-01-30)
-* high level modules now aren't modules, but constants linking to appropriate classes
+* high level modules now aren't modules, but constants linking to 
+  appropriate classes
 
 0.1.3 (2011-01-18)
 * 'version' gem dependency removed

data/Gemfile

@@ -1,15 +1,14 @@
 source "http://rubygems.org"
 # Add dependencies required to use your gem here.
 # Example:
-   gem "multitype-introspection", ">= 0.1.0"
-   gem "hash-utils", ">= 0.3.0"
-   gem "types", ">= 0.1.0"
+   gem "hash-utils", ">= 0.18.0"
    gem "addressable", ">= 2.2.2"
-   gem "yajl-ruby", ">= 0.7.8"
+   gem "abstract", ">= 1.0.0"
+   gem "multi_json", ">= 0"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.2"
+  gem "bundler", ">= 1.0.0"
+  gem "jeweler", ">= 1.5.2"
 end

data/Gemfile.lock

@@ -1,27 +1,24 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.2.2)
+    abstract (1.0.0)
+    addressable (2.2.6)
     git (1.2.5)
-    hash-utils (0.3.0)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
+    hash-utils (0.18.0)
+    jeweler (1.6.4)
+      bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    multitype-introspection (0.1.0)
-    rake (0.8.7)
-    types (0.1.0)
-      multitype-introspection (>= 0.1.0)
-    yajl-ruby (0.7.9)
+    multi_json (1.0.3)
+    rake (0.9.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  abstract (>= 1.0.0)
   addressable (>= 2.2.2)
-  bundler (~> 1.0.0)
-  hash-utils (>= 0.3.0)
-  jeweler (~> 1.5.2)
-  multitype-introspection (>= 0.1.0)
-  types (>= 0.1.0)
-  yajl-ruby (>= 0.7.8)
+  bundler (>= 1.0.0)
+  hash-utils (>= 0.18.0)
+  jeweler (>= 1.5.2)
+  multi_json

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2011 Martin Kozák
+Copyright (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -1,6 +1,7 @@
 # encoding: utf-8
 require 'rubygems'
 require 'bundler'
+
 begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
@@ -8,9 +9,10 @@ rescue Bundler::BundlerError => e
   $stderr.puts "Run `bundle install` to install missing gems"
   exit e.status_code
 end
-require 'rake'
 
+require 'rake'
 require 'jeweler'
+
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
   gem.name = "json-rpc-objects"
@@ -25,13 +27,3 @@ Jeweler::Tasks.new do |gem|
   #  gem.add_development_dependency 'rspec', '> 1.2.3'
 end
 Jeweler::RubygemsDotOrgTasks.new
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "types #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.3.4

data/json-rpc-objects.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{json-rpc-objects}
-  s.version = "0.3.3"
+  s.version = "0.3.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Martin Kozák"]
-  s.date = %q{2011-02-13}
+  s.authors = [%q{Martin Kozák}]
+  s.date = %q{2011-07-18}
   s.email = %q{martinkozak@martinkozak.net}
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -68,39 +68,36 @@ Gem::Specification.new do |s|
     "lib/json-rpc-objects/version.rb"
   ]
   s.homepage = %q{http://github.com/martinkozak/json-rpc-objects}
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.2}
+  s.licenses = [%q{MIT}]
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.5}
   s.summary = %q{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 a transparent way.}
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<multitype-introspection>, [">= 0.1.0"])
-      s.add_runtime_dependency(%q<hash-utils>, [">= 0.3.0"])
-      s.add_runtime_dependency(%q<types>, [">= 0.1.0"])
+      s.add_runtime_dependency(%q<hash-utils>, [">= 0.18.0"])
       s.add_runtime_dependency(%q<addressable>, [">= 2.2.2"])
-      s.add_runtime_dependency(%q<yajl-ruby>, [">= 0.7.8"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_runtime_dependency(%q<abstract>, [">= 1.0.0"])
+      s.add_runtime_dependency(%q<multi_json>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, [">= 1.5.2"])
     else
-      s.add_dependency(%q<multitype-introspection>, [">= 0.1.0"])
-      s.add_dependency(%q<hash-utils>, [">= 0.3.0"])
-      s.add_dependency(%q<types>, [">= 0.1.0"])
+      s.add_dependency(%q<hash-utils>, [">= 0.18.0"])
       s.add_dependency(%q<addressable>, [">= 2.2.2"])
-      s.add_dependency(%q<yajl-ruby>, [">= 0.7.8"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_dependency(%q<abstract>, [">= 1.0.0"])
+      s.add_dependency(%q<multi_json>, [">= 0"])
+      s.add_dependency(%q<bundler>, [">= 1.0.0"])
+      s.add_dependency(%q<jeweler>, [">= 1.5.2"])
     end
   else
-    s.add_dependency(%q<multitype-introspection>, [">= 0.1.0"])
-    s.add_dependency(%q<hash-utils>, [">= 0.3.0"])
-    s.add_dependency(%q<types>, [">= 0.1.0"])
+    s.add_dependency(%q<hash-utils>, [">= 0.18.0"])
     s.add_dependency(%q<addressable>, [">= 2.2.2"])
-    s.add_dependency(%q<yajl-ruby>, [">= 0.7.8"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+    s.add_dependency(%q<abstract>, [">= 1.0.0"])
+    s.add_dependency(%q<multi_json>, [">= 0"])
+    s.add_dependency(%q<bundler>, [">= 1.0.0"])
+    s.add_dependency(%q<jeweler>, [">= 1.5.2"])
   end
 end
 

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

@@ -1,4 +1,6 @@
 # encoding: utf-8
+# (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
+
 require "json-rpc-objects/generic/object"
 
 ##

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

@@ -1,6 +1,9 @@
 # encoding: utf-8
-require "hash-utils"
-require "yajl/json_gem"
+# (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
+
+require "hash-utils/hash"
+require "multi_json"
+require "abstract"
 require "json-rpc-objects/version"
 
 ##
@@ -30,7 +33,7 @@ module JsonRpcObjects
             #
             
             def self.create(*args)
-                __abstract
+                not_implemented
             end
         
             ##
@@ -50,7 +53,7 @@ module JsonRpcObjects
             #
             
             def self.parse(string)
-                self::new(JSON.load(string)) 
+                self::new(MultiJson.decode(string)) 
             end
                         
             ##
@@ -59,7 +62,7 @@ module JsonRpcObjects
             #
             
             def to_json
-                self.output.to_json
+                MultiJson.encode(self.output)
             end
                      
             ##
@@ -77,6 +80,7 @@ module JsonRpcObjects
             #
             
             def check!
+                true
             end
                         
             ##
@@ -87,7 +91,7 @@ module JsonRpcObjects
             #
 
             def output
-                __abstract
+                not_implemented
             end
             
             
@@ -98,7 +102,7 @@ module JsonRpcObjects
             #
 
             def data=(value, mode = nil)
-                __abstract
+                not_implemented
             end
             
             ##
@@ -120,25 +124,6 @@ module JsonRpcObjects
             def normalize!
             end
 
-            
-            private
-            
-            ##
-            # Raises method is abstract exception.
-            #
-            
-            def __abstract
-                self.class::__abstract
-            end
-            
-            ##
-            # Raises method is abstract exception.
-            #
-            
-            def self.__abstract
-                raise Exception::new("Method is abstract.")
-            end
-
         end
     end
 end

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

@@ -1,4 +1,6 @@
 # encoding: utf-8
+# (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
+
 require "json-rpc-objects/generic/object"
 
 ##

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

@@ -1,4 +1,6 @@
 # encoding: utf-8
+# (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
+
 require "json-rpc-objects/generic/object"
 
 ##

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

@@ -1,6 +1,7 @@
 # encoding: utf-8
 require "json-rpc-objects/v20/request"
-require "yajl/json_gem"
+require "hash-utils/object"
+require "multi_json"
 
 ##
 # Main JSON-RPC Objects module.
@@ -45,9 +46,9 @@ module JsonRpcObjects
         #
         
         def self.parse(string, default_v11 = :wd)
-            data = JSON.load(string)
+            data = MultiJson.decode(string)
             
-            if not data.kind_of? Hash
+            if not data.hash?
                 raise Exception::new("Data in JSON string aren't object.")
             end
             
@@ -71,7 +72,7 @@ module JsonRpcObjects
             end
             
             # Returns
-            if not @@files.has_key? file
+            if not file.in? @@files
                 require file
                 @@files[file] = true
             end

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

@@ -1,5 +1,7 @@
 # encoding: utf-8
 require "json-rpc-objects/v20/response"
+require "hash-utils/object"
+require "multi_json"
 
 ##
 # Main JSON-RPC Objects module.
@@ -43,9 +45,9 @@ module JsonRpcObjects
         #
         
         def self.parse(string, default_v11 = :wd)
-            data = JSON.load(string)
+            data = MultiJson.decode(string)
             
-            if not data.kind_of? Hash
+            if not data.hash?
                 raise Exception::new("Data in JSON string aren't object.")
             end
             
@@ -69,7 +71,7 @@ module JsonRpcObjects
             end
             
             # Returns
-            if not @@files.has_key? file
+            if not file.in? @@files
                 require file
                 @@files[file] = true
             end

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

@@ -1,4 +1,6 @@
 # encoding: utf-8
+# (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
+
 require "json-rpc-objects/generic/error"
 
 ##

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

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

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

@@ -1,4 +1,6 @@
 # encoding: utf-8
+# (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
+
 require "json-rpc-objects/generic/response"
 require "json-rpc-objects/v10/error"
 

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

@@ -1,4 +1,6 @@
 # encoding: utf-8
+# (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
+
 $:.push("../../..")
 
 require "../request"

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

@@ -1,4 +1,6 @@
 # encoding: utf-8
+# (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
+
 require "json-rpc-objects/v11/wd/error"
 
 ##

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

@@ -1,4 +1,6 @@
 # encoding: utf-8
+# (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
+
 require "json-rpc-objects/v11/alt/procedure-call"
 
 ##

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

@@ -1,4 +1,6 @@
 # encoding: utf-8
+# (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
+
 require "json-rpc-objects/v11/alt/procedure-return"
 
 ##

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

@@ -1,4 +1,6 @@
 # encoding: utf-8
+# (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
+
 require "hash-utils/hash"
 require "json-rpc-objects/v11/wd/request"
 
@@ -58,7 +60,7 @@ module JsonRpcObjects
                     #   property.
                     if data.include? :kwparams
                        @keyword_params = data[:kwparams]
-                       @keyword_params.map_keys! { |k| k.to_sym }
+                       @keyword_params.keys_to_sym!
                     end
                 end
                 

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

@@ -1,4 +1,6 @@
 # encoding: utf-8
+# (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
+
 require "json-rpc-objects/v11/wd/procedure-parameter-description"
 
 ##

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

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

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

@@ -1,2 +1,4 @@
 # encoding: utf-8
+# (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
+
 require "json-rpc-objects/v11/alt/fakes/request"

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

@@ -1,2 +1,4 @@
 # encoding: utf-8
+# (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
+
 require "json-rpc-objects/v11/alt/fakes/response"

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

@@ -1,4 +1,6 @@
 # encoding: utf-8
+# (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
+
 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,5 +1,8 @@
 # encoding: utf-8
+# (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
+
 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"
 
@@ -47,7 +50,7 @@ module JsonRpcObjects
                 def check!
                     super()
                     
-                    if (@params.kind_of? Array) and (not @params.all? { |v| v.type != JsonRpcObjects::V11::GenericTypes::Nil })
+                    if @params.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,4 +1,6 @@
 # encoding: utf-8
+# (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
+
 $:.push("../../../..")
 
 require "../procedure-call"

data/lib/json-rpc-objects/v11/generic-types.rb

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

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

@@ -1,4 +1,6 @@
 # encoding: utf-8
+# (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
+
 require "hash-utils/numeric"
 require "json-rpc-objects/generic"
 require "json-rpc-objects/v10/error"

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

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

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

@@ -1,4 +1,6 @@
 # encoding: utf-8
+# (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
+
 require "json-rpc-objects/v11/wd/procedure-call"
 
 ##

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

@@ -1,4 +1,6 @@
 # encoding: utf-8
+# (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
+
 require "json-rpc-objects/v11/wd/procedure-return"
 
 ##

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

@@ -1,5 +1,10 @@
 # encoding: utf-8
+# (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
+
+require "hash-utils/array"
 require "hash-utils/hash"
+require "hash-utils/object"
+require "hash-utils/string"
 require "json-rpc-objects/v10/request"
 require "json-rpc-objects/v11/wd/extensions"
 
@@ -63,7 +68,7 @@ module JsonRpcObjects
                 def check!
                     super()
                     
-                    if not @keyword_params.nil? and not @keyword_params.kind_of? Hash
+                    if not @keyword_params.nil? and not @keyword_params.hash?
                         raise Exception::new("Keyword params must be Hash.")
                     end
                 end
@@ -142,15 +147,15 @@ module JsonRpcObjects
                     # If named arguments used, assigns keys as symbols
                     #   but keeps numeric arguments as integers
                     
-                    if @params.kind_of? Hash
+                    if @params.hash?
                         @params = @params.dup
                         @keyword_params = @params.remove! { |k, v| not k.numeric? }
-                        @params = @params.sort_by { |i| i[0].to_i }.map { |i| i[1] }
+                        @params = @params.sort_by { |i| i.first.to_i }.map { |i| i.second }
                     else
                         @keyword_params = { }
                     end
                     
-                    @keyword_params.map_keys! { |k| k.to_sym }
+                    @keyword_params.keys_to_sym!
                     
                 end
                 
@@ -178,7 +183,7 @@ module JsonRpcObjects
                 #
                 
                 def __check_params
-                    if not @params.nil? and not @params.kind_of? Array
+                    if not @params.nil? and not @params.array?
                         raise Exception::new("Params must be Array.")
                     end
                 end

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

@@ -1,7 +1,9 @@
 # encoding: utf-8
-require "multitype-introspection"
+# (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
+
 require "json-rpc-objects/v11/generic-types"
 require "json-rpc-objects/generic"
+require "hash-utils/object"
 
 ##
 # Main JSON-RPC Objects module.
@@ -98,7 +100,7 @@ module JsonRpcObjects
                 def check!
                     self.normalize!
                     
-                    if not @name.kind_of? Symbol
+                    if not @name.symbol?
                         raise Exception::new("Parameter name must be Symbol or convertable to Symbol.")
                     end
                     
@@ -142,7 +144,7 @@ module JsonRpcObjects
                 #
                 
                 def normalize!
-                    if @name.kind_of? String
+                    if @name.string?
                         @name = @name.to_sym
                     end
 

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

@@ -1,7 +1,10 @@
 # encoding: utf-8
+# (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
+
 require "json-rpc-objects/v10/response"
 require "json-rpc-objects/v11/wd/error"
 require "json-rpc-objects/v11/wd/extensions"
+require "hash-utils/object"
 
 ##
 # Main JSON-RPC Objects module.
@@ -128,7 +131,7 @@ module JsonRpcObjects
                 #
                 
                 def __create_error
-                    if @error.kind_of? Hash
+                    if @error.hash?
                         @error = self.class::ERROR_CLASS::new(@error)
                     end
                 end

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

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

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

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

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

@@ -1,8 +1,11 @@
 # encoding: utf-8
+# (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
+
 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.
@@ -130,7 +133,7 @@ module JsonRpcObjects
                 def check!
                     self.normalize!
                     
-                    if not @name.kind_of? Symbol
+                    if not @name.symbol?
                         raise Exception::new("Service name must be Symbol or convertable to Symbol.")
                     end
 
@@ -139,11 +142,11 @@ module JsonRpcObjects
                     end
                     
                     if (not @procs.nil?) 
-                        if (not @procs.kind_of? Array) or (not @procs.all? { |v| v.kind_of? self.class::PROCEDURE_DESCRIPTION_CLASS })
+                        if (not @procs.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.kind_of? Array
+                        if @procs.array?
                             @procs.each { |proc| proc.check! }
                         end
                     end
@@ -222,7 +225,7 @@ module JsonRpcObjects
                     @address = data[:address]
                     @procs = data[:procs]
                     
-                    if @procs.kind_of? Array
+                    if @procs.array?
                         @procs = @procs.map { |v| self.class::PROCEDURE_DESCRIPTION_CLASS::new(v) }
                     end
                 end
@@ -232,7 +235,7 @@ module JsonRpcObjects
                 #
                 
                 def normalize!
-                    if @name.kind_of? String
+                    if @name.string?
                         @name = @name.to_sym
                     end
 

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

@@ -1,8 +1,9 @@
 # encoding: utf-8
+# (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
+
 require "addressable/uri"
-require "multitype-introspection"
-require "types"
 require "hash-utils/array"
+require "hash-utils/object"
 require "json-rpc-objects/v11/wd/procedure-parameter-description"
 require "json-rpc-objects/generic"
 
@@ -112,16 +113,16 @@ module JsonRpcObjects
                 def check!
                     self.normalize!
                     
-                    if not @name.kind_of? Symbol
+                    if not @name.symbol?
                         raise Exception::new("Procedure name must be Symbol or convertable to Symbol.")
                     end
 
                     if not @params.nil? 
-                        if (not @params.kind_of? Array) or (not @params.all? { |v| v.kind_of? self.class::PARAMETER_DESCRIPTION_CLASS })
+                        if (not @params.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.kind_of? Array
+                        if @params.array?
                             @params.each { |param| param.check! }
                         end
                     end
@@ -134,7 +135,7 @@ module JsonRpcObjects
                         @return.check!
                     end
 
-                    if (not @idempotent.nil?) and (not @idempotent.type_of? Boolean)
+                    if (not @idempotent.nil?) and (not @idempotent.boolean?)
                         raise Exception::new("If idempotent is defined, must be boolean.")
                     end
                 end
@@ -207,11 +208,11 @@ module JsonRpcObjects
                     @params = data[:params]
                     @return = data[:return]
                     
-                    if @params.kind_of? Array
+                    if @params.array?
                         @params = @params.map { |v| self.class::PARAMETER_DESCRIPTION_CLASS::new(v) }
                     end
                     
-                    if @return.kind_of? Hash
+                    if @return.hash?
                         @return = self.class::PARAMETER_DESCRIPTION_CLASS::new(@return)
                     end
                 end
@@ -221,7 +222,7 @@ module JsonRpcObjects
                 #
                 
                 def normalize!
-                    if @name.kind_of? String
+                    if @name.string?
                         @name = @name.to_sym
                     end
                     

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

@@ -1,4 +1,6 @@
 # encoding: utf-8
+# (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
+
 $:.push("../../../..")
 
 require "../procedure-call"

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

@@ -1,4 +1,6 @@
 # encoding: utf-8
+# (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
+
 require "hash-utils/numeric"
 require "json-rpc-objects/v11/alt/error"
 

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

@@ -1,5 +1,6 @@
 # encoding: utf-8
-require "multitype-introspection"
+# (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
+
 require "hash-utils/hash"
 require "json-rpc-objects/v11/alt/request"
 
@@ -104,7 +105,7 @@ module JsonRpcObjects
             #
             
             def __get_params(data)
-                if @params.kind_of? Hash
+                if @params.hash?
                     @keyword_params = @params.keys_to_sym
                     @params = nil
                 end

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

@@ -1,5 +1,6 @@
 # encoding: utf-8
-require "multitype-introspection"
+# (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
+
 require "json-rpc-objects/v11/alt/response"
 require "json-rpc-objects/v20/error"
 

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

@@ -1,4 +1,6 @@
 # encoding: utf-8
+# (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
+
 $:.push("../../..")
 
 require "../request"

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

@@ -1,4 +1,5 @@
 # encoding: utf-8
+require "hash-utils/object"
 
 ##
 # Main JSON-RPC Objects module.
@@ -50,7 +51,7 @@ module JsonRpcObjects
         #
         
         def self.get(mod)
-            if not @@cache.include? mod
+            if not mod.in? @@cache
                 @@cache[mod] = self::new(mod)
             end
             

metadata

@@ -2,7 +2,7 @@
 name: json-rpc-objects
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors: 
 - "Martin Koz\xC3\xA1k"
@@ -10,86 +10,74 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-13 00:00:00 +01:00
-default_executable: 
+date: 2011-07-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: multitype-introspection
+  name: hash-utils
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.1.0
+        version: 0.18.0
   type: :runtime
   prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: hash-utils
+  name: addressable
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.0
+        version: 2.2.2
   type: :runtime
   prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: types
+  name: abstract
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.1.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: addressable
+  name: multi_json
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.2.2
+        version: "0"
   type: :runtime
   prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: yajl-ruby
+  name: bundler
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.7.8
-  type: :runtime
-  prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: bundler
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
       - !ruby/object:Gem::Version 
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id006
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *id007
+  version_requirements: *id006
 description: 
 email: martinkozak@martinkozak.net
 executables: []
@@ -150,7 +138,6 @@ files:
 - lib/json-rpc-objects/v20/response.rb
 - lib/json-rpc-objects/v20/tests/test.rb
 - lib/json-rpc-objects/version.rb
-has_rdoc: true
 homepage: http://github.com/martinkozak/json-rpc-objects
 licenses: 
 - MIT
@@ -164,7 +151,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4515745036204370160
+      hash: -1516690560256011752
       segments: 
       - 0
       version: "0"
@@ -177,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 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 a transparent way.