json-rpc-objects 0.3.4 → 0.4.0

data/CHANGES.txt

@@ -1,6 +1,11 @@
 
+0.4.0 (2011-07-20)
+* multiple serializers support
+* minor optimization of the version routine
+* documentation corrections
+
 0.3.4 (2011-07-18)
-* dependency from yajl-ruby to multi_json for compatibility with all 
+* 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

data/README.md

@@ -1,11 +1,11 @@
 JSON-RPC Objects
 ================
 
-**JSON-RPC Objects** are implementation of by [JSON-RPC][1] defined 
-objects with respect to specifications compliance and API backward 
-compatibility. It implements all versions of the protocol and support 
-for ability to communicate by the same protocol version which the 
-other side uses by a transparent way.
+**JSON-RPC Objects** is complete implementation of by [JSON-RPC][1] 
+defined objects with respect to specifications compliance and API 
+backward compatibility. It implements all versions of the protocol and 
+support for ability to communicate by the same protocol version which 
+the other side uses by a transparent way.
 
 It means, it implements following JSON-RPC versions:
 
@@ -28,7 +28,7 @@ homogenous. Application which can deal with 1.0 can deal with 2.0 too
 without any funcionallity or logic lost. 
 
 ### Usage
-
+  
 All object classes have three creating class methods:
 
 * `#create(<some arguments>, opts = { })` &ndash; which creates new 
@@ -89,6 +89,35 @@ neither 1.0 nor 2.0 implements these objects, so it can simply cause
 Be limited by `Error`, `Request` and `Response` classes here or check
 the protocol version using `#VERSION` class constant.
 
+### Serializers
+
+Multiple serializers support is implemented, so you aren't limited to
+JSON[8] only, but you can use also built-in serializers to YAML[9] or
+[Ruby marshaling][10] format. Also support for [BSON][11] serializing 
+format is available standalone through [`json-rpc-objects-bson`][12] gem.
+
+You can set the default serializer for whole library session (both class
+and instance of the class are supported):
+
+    require "json-rpc-objects/serializer/marshal"
+    
+    JsonRpcObjects::default_serializer(JsonRpcObjects::Serializer::Marshal)
+    
+    # it's setting default serializer for all new instances, without
+    # arguments it returns the default serializer
+    
+Or by individual object assigning (only instances are supported):
+
+    require "json-rpc-objects/serializer/marshal"
+    
+    serializer = JsonRpcObjects::Serializer::Marshal::new
+    JsonRpcObjects::V10::Request::parse(data, serializer)
+    
+…and the same for constructor. The `#serializer` property is also 
+accessible, both readable and writable on all objects. By the same way, 
+serializer is received by the generic parsers `JsonRpcObjects::Request` 
+and so too. 
+
 Contributing
 ------------
 
@@ -113,3 +142,7 @@ further details.
 [5]: http://groups.google.com/group/json-rpc/web/json-rpc-2-0
 [6]: http://github.com/martinkozak/json-rpc-objects/issues
 [7]: http://www.martinkozak.net/
+
+[9]: http://www.yaml.org/
+[10]: http://ruby-doc.org/core/classes/Marshal.html
+[11]: http://bsonspec.org/

data/VERSION

@@ -1 +1 @@
-0.3.4
+0.4.0

data/json-rpc-objects.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{json-rpc-objects}
-  s.version = "0.3.4"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Martin Kozák}]
-  s.date = %q{2011-07-18}
+  s.date = %q{2011-07-20}
   s.email = %q{martinkozak@martinkozak.net}
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -33,6 +33,10 @@ Gem::Specification.new do |s|
     "lib/json-rpc-objects/generic/response.rb",
     "lib/json-rpc-objects/request.rb",
     "lib/json-rpc-objects/response.rb",
+    "lib/json-rpc-objects/serializer.rb",
+    "lib/json-rpc-objects/serializer/json.rb",
+    "lib/json-rpc-objects/serializer/marshal.rb",
+    "lib/json-rpc-objects/serializer/yaml.rb",
     "lib/json-rpc-objects/v10/error.rb",
     "lib/json-rpc-objects/v10/request.rb",
     "lib/json-rpc-objects/v10/response.rb",

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

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

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

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

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

@@ -2,8 +2,8 @@
 # (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
 
 require "hash-utils/hash"
-require "multi_json"
 require "abstract"
+require "json-rpc-objects/serializer"
 require "json-rpc-objects/version"
 
 ##
@@ -25,11 +25,20 @@ module JsonRpcObjects
         
         class Object
         
+            ##
+            # Holds assigned serializer.
+            # @since 0.4.0
+            #
+            
+            attr_accessor :serializer
+            @serializer
+        
             ##
             # Creates new one.
             #
             # @param [Array] args some arguments
-            # @return [JsonRpc::Generic::Object] new object
+            # @return [JsonRpcObjects::Generic::Object] new object
+            # @abstract
             #
             
             def self.create(*args)
@@ -46,31 +55,52 @@ module JsonRpcObjects
             end
           
             ##
-            # Parses JSON-RPC string.
+            # Parses serialized string.
             #
-            # @param [String] string with the JSON data
+            # @param [Object] object with the serialized data
+            # @param [JsonRpcObjects::Serializer] serializer instance 
+            #   of serializer class
             # @return [Generic::Object] of the given class
             #
             
-            def self.parse(string)
-                self::new(MultiJson.decode(string)) 
+            def self.parse(string, serializer = JsonRpcObjects::default_serializer)
+                self::new(serializer.deserialize(string), serializer) 
             end
-                        
+            
             ##
-            # Converts back to JSON.
+            # Converts object to JSON. It's deprecated and ineffective now.
+            # Use the {#serialize} method.
+            #
+            # @see #serialize
             # @return [String]
+            # @deprecated Since 0.4.0, replaced by +#serialize+.
             #
             
             def to_json
-                MultiJson.encode(self.output)
+                JsonRpcObjects::Serializer::JSON::new.serialize(self.output)
+            end
+            
+            ##
+            # Serializes the object by the serializer.
+            #
+            # @return [Object]
+            # @since 0.4.0
+            #
+            
+            def serialize
+                @serializer.serialize(self.output)
             end
                      
             ##
             # Constructor.
+            #
             # @param [Hash] data for initializing the object
+            # @param [JsonRpcObjects::Serializer] serializer instance 
+            #   of serializer class
             #
             
-            def initialize(data)
+            def initialize(data, serializer = JsonRpcObjects::default_serializer)
+                @serializer = serializer
                 self.data = data
                 self.check!
             end
@@ -127,3 +157,4 @@ module JsonRpcObjects
         end
     end
 end
+

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

@@ -1,7 +1,9 @@
 # encoding: utf-8
+# (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
+
 require "json-rpc-objects/v20/request"
+require "json-rpc-objects/serializer"
 require "hash-utils/object"
-require "multi_json"
 
 ##
 # Main JSON-RPC Objects module.
@@ -43,10 +45,12 @@ module JsonRpcObjects
         # @param [String] string JSON string for parse
         # @param [:wd, :alt] default_v11 type of the eventually returned 
         #   1.1 object
+        # @param [JsonRpcObjects::Serializer] serializer instance of 
+        #   serializer class
         #
         
-        def self.parse(string, default_v11 = :wd)
-            data = MultiJson.decode(string)
+        def self.parse(string, default_v11 = :wd, serializer = JsonRpcObjects::default_serializer)
+            data = serializer.deserialize(string)
             
             if not data.hash?
                 raise Exception::new("Data in JSON string aren't object.")

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

@@ -1,7 +1,9 @@
 # encoding: utf-8
+# (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
+
 require "json-rpc-objects/v20/response"
+require "json-rpc-objects/serializer"
 require "hash-utils/object"
-require "multi_json"
 
 ##
 # Main JSON-RPC Objects module.
@@ -42,10 +44,12 @@ module JsonRpcObjects
         # @param [String] string JSON string for parse
         # @param [:wd, :alt] default_v11 type of the eventually returned 
         #   1.1 object
+        # @param [JsonRpcObjects::Serializer] serializer instance of 
+        #   serializer class
         #
         
-        def self.parse(string, default_v11 = :wd)
-            data = MultiJson.decode(string)
+        def self.parse(string, default_v11 = :wd, serializer = JsonRpcObjects::default_serializer)
+            data = serializer.deserialize(string)
             
             if not data.hash?
                 raise Exception::new("Data in JSON string aren't object.")

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

@@ -0,0 +1,106 @@
+# encoding: utf-8
+# (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
+
+require "json-rpc-objects/serializer/json"
+require "abstract"
+
+##
+# Main JSON-RPC Objects module.
+#
+
+module JsonRpcObjects
+
+    ##
+    # Holds the serializer.
+    #
+
+    @@serializer = JsonRpcObjects::Serializer::JSON::new
+
+    ##
+    # Sets the object serializer.
+    # 
+    # @param [Class, Module] serializer the serializer module
+    # @since 0.4.0
+    #
+    
+    def self.default_serializer(mod = nil)
+        if mod.kind_of? Class
+            mod = mod::new
+        end
+        
+        @@serializer = mod if not mod.nil?
+        @@serializer    # returns
+    end
+    
+    ##
+    # Serializes data.
+    #
+    # @param [Object] data some data
+    # @return [Object] object in serialized form
+    # @since 0.4.0
+    #
+    
+    def self.serialize(data)
+        @@serializer.serialize(data)
+    end
+    
+    ##
+    # Deserializes data.
+    #
+    # @param [Object] data data in serialized form
+    # @return [Object] deserialized data
+    # @since 0.4.0
+    #
+    
+    def self.deserialize(data)
+        @@serializer.deserialize(data)
+    end
+
+
+    ##
+    # Abstract serializer class.
+    #
+    # @since 0.4.0
+    # @abstract
+    #
+    
+    class Serializer
+        
+        ##
+        # Constructor.
+        #
+       
+        def initialize
+            if self.instance_of? Serializer
+                not_implemented
+            end
+        end
+                        
+        ##
+        # Serializes data.
+        #
+        # @param [Object] data some data
+        # @return [Object] object in serialized form
+        # @abstract
+        #
+        
+        def serialize(data)
+            not_implemented
+        end
+        
+        ##
+        # Deserializes data.
+        #
+        # @param [Object] data data in serialized form
+        # @return [Object] deserialized data
+        # @abstract
+        #
+        
+        def deserialize(data)
+            not_implemented
+        end
+        
+    end
+        
+end
+

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

@@ -0,0 +1,56 @@
+# encoding: utf-8
+# (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
+
+require "json-rpc-objects/serializer"
+require "multi_json"
+
+##
+# Main JSON-RPC Objects module.
+#
+
+module JsonRpcObjects
+    
+    ##
+    # Abstract serializer class.
+    #
+    # @since 0.4.0
+    # @abstract
+    #
+    
+    class Serializer
+    
+        ##
+        # JSON serializer using +multi_json+.
+        # @since 0.4.0
+        #
+        
+        class JSON < Serializer 
+                
+            ##
+            # Serializes data.
+            #
+            # @param [Object] data some data
+            # @return [Object] object in serialized form
+            #
+            
+            def serialize(data)
+                MultiJson.encode(data)
+            end
+            
+            ##
+            # Deserializes data.
+            #
+            # @param [Object] data data in serialized form
+            # @return [Object] deserialized data
+            #
+            
+            def deserialize(data)
+                MultiJson.decode(data)
+            end
+    
+        end
+        
+    end
+end
+    
+    

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

@@ -0,0 +1,55 @@
+# encoding: utf-8
+# (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
+
+require "json-rpc-objects/serializer"
+
+##
+# Main JSON-RPC Objects module.
+#
+
+module JsonRpcObjects
+    
+    ##
+    # Abstract serializer class.
+    #
+    # @since 0.4.0
+    # @abstract
+    #
+    
+    class Serializer
+    
+        ##
+        # +Marshal+ serializer using internal Ruby marshaling.
+        # @since 0.4.0
+        #
+        
+        class Marshal < Serializer 
+                
+            ##
+            # Serializes data.
+            #
+            # @param [Object] data some data
+            # @return [Object] object in serialized form
+            #
+            
+            def serialize(data)
+                ::Marshal.dump(data)
+            end
+            
+            ##
+            # Deserializes data.
+            #
+            # @param [Object] data data in serialized form
+            # @return [Object] deserialized data
+            #
+            
+            def deserialize(data)
+                ::Marshal.load(data)
+            end
+    
+        end
+        
+    end
+end
+    
+    

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

@@ -0,0 +1,56 @@
+# encoding: utf-8
+# (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
+
+require "json-rpc-objects/serializer"
+require "yaml"
+
+##
+# Main JSON-RPC Objects module.
+#
+
+module JsonRpcObjects
+    
+    ##
+    # Abstract serializer class.
+    #
+    # @since 0.4.0
+    # @abstract
+    #
+    
+    class Serializer
+    
+        ##
+        # YAML serializer using internal Ruby YAML.
+        # @since 0.4.0
+        #
+        
+        class YAML < Serializer 
+                
+            ##
+            # Serializes data.
+            #
+            # @param [Object] data some data
+            # @return [Object] object in serialized form
+            #
+            
+            def serialize(data)
+                ::YAML.dump(data)
+            end
+            
+            ##
+            # Deserializes data.
+            #
+            # @param [Object] data data in serialized form
+            # @return [Object] deserialized data
+            #
+            
+            def deserialize(data)
+                ::YAML.load(data)
+            end
+    
+        end
+        
+    end
+end
+    
+    

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

@@ -90,9 +90,9 @@ module JsonRpcObjects
             def output
                 self.check!
                 data = {
-                    :method => @method.to_s,
-                    :params => @params,
-                    :id => @id
+                    "method" => @method.to_s,
+                    "params" => @params,
+                    "id" => @id
                 }
             end
             

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

@@ -97,10 +97,17 @@ module JsonRpcObjects
             
             def output
                 self.check!
+                
+                if @error.nil?
+                    error = nil
+                else
+                    error = @error.output
+                end
+                
                 data = {
-                    :result => @result,
-                    :error => @error,
-                    :id => @id
+                    "result" => @result,
+                    "error" => error,
+                    "id" => @id
                 }
                 
                 return data

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

@@ -2,21 +2,22 @@
 # (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
 
 $:.push("../../..")
+require "json-rpc-objects/serializer/marshal"
+JsonRpcObjects::default_serializer(JsonRpcObjects::Serializer::Marshal)
 
 require "../request"
 req = JsonRpcObjects::V10::Request::create(:alfa, [:beta], :id => 12345)
-puts req.to_json
+puts req.serialize
 
 require "../response"
 res = JsonRpcObjects::V10::Response::create(true, nil, :id => 12345)
-puts res.to_json
+puts res.serialize
 
 require "../response"
 res = JsonRpcObjects::V10::Response::create(nil, "some problem", :id => 12345)
-puts res.to_json
-
+puts res.serialize
 
 require "../../request"
-puts JsonRpcObjects::Request::parse(req.to_json).inspect
+puts JsonRpcObjects::Request::parse(req.serialize).inspect
 require "../../response"
-puts JsonRpcObjects::Response::parse(res.to_json).inspect
+puts JsonRpcObjects::Response::parse(res.serialize).inspect

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

@@ -49,7 +49,7 @@ module JsonRpcObjects
                 
                 def output
                     result = super()
-                    result.delete(:name)
+                    result.delete("name")
                     
                     return result
                 end

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

@@ -3,39 +3,43 @@
 
 $:.push("../../../..")
 
+require "json-rpc-objects/serializer/marshal"
+JsonRpcObjects::default_serializer(JsonRpcObjects::Serializer::Marshal)
+
+
 require "../procedure-call"
 req = JsonRpcObjects::V11::Alt::ProcedureCall::create(:alfa, [:foo, :bar], :kwparams => {"0" => :beta, "something" => :alfa}, :id => 12345, :"$whatever" => false)
-puts req.to_json
+puts req.serialize
 
 require "../error"
 err = JsonRpcObjects::V11::Alt::Error::create(200, "some problem")
 
 require "../procedure-return"
 res = JsonRpcObjects::V11::Alt::ProcedureReturn::create(nil, err, :id => 12345)
-puts res.to_json
+puts res.serialize
 res = JsonRpcObjects::V11::Alt::ProcedureReturn::create(true, nil, :id => 12345)
-puts res.to_json
+puts res.serialize
 
 require "../service-description"
 sdesc = JsonRpcObjects::V11::Alt::ServiceDescription::create(:alfa, 100)
-puts sdesc.to_json
+puts sdesc.serialize
 
 require "../service-procedure-description"
 sproc = JsonRpcObjects::V11::Alt::ServiceProcedureDescription::create(:some_proc)
 sdesc << sproc
-puts sdesc.to_json
+puts sdesc.serialize
 
 require "../procedure-parameter-description"
 sparam1 = JsonRpcObjects::V11::Alt::ProcedureParameterDescription::create(:param1, :type => :str)
 sparam2 = JsonRpcObjects::V11::Alt::ProcedureParameterDescription::create(:param2, :type => JsonRpcObjects)
 sproc << sparam1
 sproc << sparam2
-puts sdesc.to_json
+puts sdesc.serialize
 
 
 require "../../../request"
-puts JsonRpcObjects::Request::parse(req.to_json).inspect
+puts JsonRpcObjects::Request::parse(req.serialize).inspect
 require "../../../response"
-puts JsonRpcObjects::Response::parse(res.to_json, :alt).inspect
+puts JsonRpcObjects::Response::parse(res.serialize, :alt).inspect
 
 puts req.class::version.response::create(25)

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

@@ -2,6 +2,7 @@
 # (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
 
 require "hash-utils/numeric"
+require "hash-utils/hash"
 require "json-rpc-objects/generic"
 require "json-rpc-objects/v10/error"
 require "json-rpc-objects/v11/wd/extensions"
@@ -115,16 +116,16 @@ module JsonRpcObjects
                 def output
                     self.check!
                     data = {
-                        :name => :JSONRPCError,
-                        :code => @code,
-                        :message => @message
+                        "name" => "JSONRPCError",
+                        "code" => @code,
+                        "message" => @message
                     }
                     
                     if not @data.nil?
-                        data[:error] = @data
+                        data["error"] = @data
                     end
                     
-                    data.merge! @extensions
+                    data.merge! @extensions.map_keys { |k| k.to_s }
                     return data
                 end
                                 

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

@@ -45,13 +45,13 @@ module JsonRpcObjects
                 # Holds JSON-RPC version specification.
                 #
                 
-                VERSION_NUMBER = :"1.1"
+                VERSION_NUMBER = "1.1"
                 
                 ##
                 # Holds JSON-RPC version member identification.
                 #
                 
-                VERSION_MEMBER = :version
+                VERSION_MEMBER = "version"
                 
                 ##
                 # Holds keyword parameters.
@@ -99,7 +99,7 @@ module JsonRpcObjects
                     end
                     
                     data.merge! @extensions                
-                    return data
+                    return data.map_keys! { |k| k.to_s }
                 end
                 
                 
@@ -168,14 +168,14 @@ module JsonRpcObjects
                     
                     if not @params.nil?
                         @params.each_index do |i|
-                            params[i.to_s.to_sym] = @params[i]
+                            params[i.to_s] = @params[i]
                         end
                     end
                     if not @keyword_params.nil?
                         params.merge! @keyword_params
                     end
                 
-                    data[:params] = params
+                    data[:params] = params.map_keys! { |k| k.to_s }
                 end
                             
                 ##
@@ -201,7 +201,7 @@ module JsonRpcObjects
                 #
                 
                 def __delete_version(data)
-                    data.delete(self.class::VERSION_MEMBER)
+                    data.delete(self.class::VERSION_MEMBER.to_sym)
                 end
                 
             end

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

@@ -116,10 +116,10 @@ module JsonRpcObjects
                 
                 def output
                     self.check!
-                    data = { :name => @name.to_s }
+                    data = { "name" => @name.to_s }
                     
                     if not @type.nil?
-                        data[:type] = __object_to_type
+                        data["type"] = __object_to_type.to_s
                     end
                     
                     return data

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

@@ -5,6 +5,7 @@ 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.
@@ -43,13 +44,13 @@ module JsonRpcObjects
                 # Holds JSON-RPC version specification.
                 #
                 
-                VERSION_NUMBER = :"1.1"
+                VERSION_NUMBER = "1.1"
                 
                 ##
                 # Holds JSON-RPC version member identification.
                 #
                 
-                VERSION_MEMBER = :version
+                VERSION_MEMBER = "version"
                 
                 ##
                 # Identifies the error object class.
@@ -80,18 +81,18 @@ module JsonRpcObjects
                     __assign_version(data)
                     
                     if not @result.nil?
-                        data[:result] = @result
+                        data["result"] = @result
                     end
                     
                     if not @error.nil?
-                        data[:error] = @error
+                        data["error"] = @error.output
                     end
 
                     if not @id.nil?
-                        data[:id] = @id
+                        data["id"] = @id
                     end
                 
-                    data.merge! @extensions
+                    data.merge! @extensions.map_keys { |k| k.to_s }
                     return data
                 end
 
@@ -149,7 +150,7 @@ module JsonRpcObjects
                 #
                 
                 def __delete_version(data)
-                    data.delete(self.class::VERSION_MEMBER)
+                    data.delete(self.class::VERSION_MEMBER.to_sym)
                 end
                 
             end

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

@@ -161,29 +161,29 @@ module JsonRpcObjects
                     self.check!
                     
                     data = {
-                        :sdversion => :"1.0",
-                        :name => @name.to_s,
-                        :id => @id.to_s
+                        "sdversion" => "1.0",
+                        "name" => @name.to_s,
+                        "id" => @id.to_s
                     }
                     
                     if not @version.nil?
-                        data[:version] = @version
+                        data["version"] = @version
                     end
                     
                     if not @summary.nil?
-                        data[:summary] = @summary
+                        data["summary"] = @summary
                     end
                     
                     if not @help.nil?
-                        data[:help] = @help.to_s
+                        data["help"] = @help.to_s
                     end
                     
                     if not @address.nil?
-                        data[:address] = @address.to_s
+                        data["address"] = @address.to_s
                     end
                     
                     if not @procs.nil?
-                        data[:procs] = @procs
+                        data["procs"] = @procs.map { |i| i.output }
                     end
                     
                     return data

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

@@ -147,26 +147,26 @@ module JsonRpcObjects
                 
                 def output
                     self.check!
-                    data = { :name => @name.to_s }
+                    data = { "name" => @name.to_s }
                     
                     if not @summary.nil?
-                        data[:summary] = @summary
+                        data["summary"] = @summary
                     end
                     
                     if not @help.nil?
-                        data[:help] = @help.to_s
+                        data["help"] = @help.to_s
                     end
                     
                     if not @idempotent.nil?
-                        data[:idempotent] = @idempotent
+                        data["idempotent"] = @idempotent
                     end
                     
                     if not @params.nil?
-                        data[:params] = @params
+                        data["params"] = @params.map { |i| i.output }
                     end
 
                     if not @return.nil?
-                        data[:return] = @return
+                        data["return"] = @return.output
                     end
                     
                     return data

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

@@ -3,39 +3,42 @@
 
 $:.push("../../../..")
 
+require "json-rpc-objects/serializer/marshal"
+JsonRpcObjects::default_serializer(JsonRpcObjects::Serializer::Marshal)
+
+
 require "../procedure-call"
 req = JsonRpcObjects::V11::WD::ProcedureCall::create(:alfa, {"0" => :beta, "something" => :alfa}, :id => 12345, :"$whatever" => false)
-puts req.to_json
+puts req.serialize
 
 require "../error"
 err = JsonRpcObjects::V11::WD::Error::create(200, "some problem")
 
 require "../procedure-return"
 res = JsonRpcObjects::V11::WD::ProcedureReturn::create(nil, err, :id => 12345)
-puts res.to_json
+puts res.serialize
 res = JsonRpcObjects::V11::WD::ProcedureReturn::create(true, nil, :id => 12345)
-puts res.to_json
+puts res.serialize
 
 require "../service-description"
 sdesc = JsonRpcObjects::V11::WD::ServiceDescription::create(:alfa, 100, :version => "1.2.34")
-puts sdesc.to_json
+puts sdesc.serialize
 
 require "../service-procedure-description"
 sproc = JsonRpcObjects::V11::WD::ServiceProcedureDescription::create(:some_proc)
 sdesc << sproc
-puts sdesc.to_json
+puts sdesc.serialize
 
 require "../procedure-parameter-description"
 sparam1 = JsonRpcObjects::V11::WD::ProcedureParameterDescription::create(:param1, :type => :str)
 sparam2 = JsonRpcObjects::V11::WD::ProcedureParameterDescription::create(:param2, :type => JsonRpcObjects)
 sproc << sparam1
 sproc << sparam2
-puts sdesc.to_json
-
+puts sdesc.serialize
 
 require "../../../request"
-puts JsonRpcObjects::Request::parse(req.to_json).inspect
+puts JsonRpcObjects::Request::parse(req.serialize).inspect
 require "../../../response"
-puts JsonRpcObjects::Response::parse(res.to_json).inspect
+puts JsonRpcObjects::Response::parse(res.serialize).inspect
 
 puts req.class::version.response::create(25)

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

@@ -55,9 +55,9 @@ module JsonRpcObjects
             def output
                 result = super()
                 
-                if result.include? :error
-                    result[:data] = result[:error]
-                    result.delete(:error)
+                if result.include? "error"
+                    result["data"] = result["error"]
+                    result.delete("error")
                 end
             
                 return result

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

@@ -33,13 +33,13 @@ module JsonRpcObjects
             # Holds JSON-RPC version specification.
             #
             
-            VERSION_NUMBER = :"2.0"
+            VERSION_NUMBER = "2.0"
             
             ##
             # Holds JSON-RPC version member identification.
             #
             
-            VERSION_MEMBER = :jsonrpc
+            VERSION_MEMBER = "jsonrpc"
                         
             ##
             # Indicates ID has been set.
@@ -68,9 +68,9 @@ module JsonRpcObjects
                 result = super()
                 
                 if @_id_set and @id.nil?
-                    result[:id] = nil
+                    result["id"] = nil
                 end
-                
+
                 return result
             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
+                    data[:params] = @keyword_params.map_keys { |k| k.to_s } 
                 end
             end
             

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

@@ -39,13 +39,13 @@ module JsonRpcObjects
             # Holds JSON-RPC version specification.
             #
             
-            VERSION_NUMBER = :"2.0"
+            VERSION_NUMBER = "2.0"
             
             ##
             # Holds JSON-RPC version member identification.
             #
             
-            VERSION_MEMBER = :jsonrpc
+            VERSION_MEMBER = "jsonrpc"
            
             ##
             # Indicates ID has been set.
@@ -74,7 +74,7 @@ module JsonRpcObjects
                 result = super()
                 
                 if @_id_set and @id.nil?
-                    result[:id] = nil
+                    result["id"] = nil
                 end
                 
                 return result
@@ -100,7 +100,7 @@ module JsonRpcObjects
             #
             
             def __assign_version(data)
-                data[:jsonrpc] = :"2.0"
+                data["jsonrpc"] = "2.0"
             end
                                 
         end

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

@@ -3,24 +3,28 @@
 
 $:.push("../../..")
 
+require "json-rpc-objects/serializer/marshal"
+JsonRpcObjects::default_serializer(JsonRpcObjects::Serializer::Marshal)
+
+
 require "../request"
 req = JsonRpcObjects::V20::Request::create(:alfa, {:alfa => :beta}, :id => :"12345", :"$whatever" => false)
-puts req.to_json
+puts req.serialize
 req = JsonRpcObjects::V20::Request::create(:alfa, [:beta], :"version" => :"1.0")
-puts req.to_json
+puts req.serialize
 
 require "../error"
 err = JsonRpcObjects::V20::Error::create(200, "some problem", :data => "Additional data.")
 
 require "../response"
 res = JsonRpcObjects::V20::Response::create(nil, err, :id => 12345)
-puts res.to_json
+puts res.serialize
 res = JsonRpcObjects::V20::Response::create(true, nil, :id => 12345)
-puts res.to_json
+puts res.serialize
 
 require "../../request"
-puts JsonRpcObjects::Request::parse(req.to_json).inspect
+puts JsonRpcObjects::Request::parse(req.serialize).inspect
 require "../../response"
-puts JsonRpcObjects::Response::parse(res.to_json).inspect
+puts JsonRpcObjects::Response::parse(res.serialize).inspect
 
 puts req.class::version.response::create(25)

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

@@ -1,5 +1,8 @@
 # encoding: utf-8
+# (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
+
 require "hash-utils/object"
+require "hash-utils/module"
 
 ##
 # Main JSON-RPC Objects module.
@@ -76,7 +79,7 @@ module JsonRpcObjects
             class_name.gsub!(self.class::CLASS_NAME_GENERATOR) { |s| s[1].chr.upcase }
 
             # Module name
-            module_name = @module.name.dup << "::" << class_name
+            module_name = @module.name + "::" + class_name
             
             # File path
             file_path = "x" << module_name
@@ -90,7 +93,7 @@ module JsonRpcObjects
                 @@files[file_path] = true
             end
             
-            return Kernel::eval(module_name)
+            return Module.get_module(module_name)
         end
         
         

metadata

@@ -2,7 +2,7 @@
 name: json-rpc-objects
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.4
+  version: 0.4.0
 platform: ruby
 authors: 
 - "Martin Koz\xC3\xA1k"
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-18 00:00:00 Z
+date: 2011-07-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: hash-utils
@@ -105,6 +105,10 @@ files:
 - lib/json-rpc-objects/generic/response.rb
 - lib/json-rpc-objects/request.rb
 - lib/json-rpc-objects/response.rb
+- lib/json-rpc-objects/serializer.rb
+- lib/json-rpc-objects/serializer/json.rb
+- lib/json-rpc-objects/serializer/marshal.rb
+- lib/json-rpc-objects/serializer/yaml.rb
 - lib/json-rpc-objects/v10/error.rb
 - lib/json-rpc-objects/v10/request.rb
 - lib/json-rpc-objects/v10/response.rb
@@ -151,7 +155,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1516690560256011752
+      hash: -3765115865130944718
       segments: 
       - 0
       version: "0"