json-rpc-objects 0.2.0 → 0.3.0

data/CHANGES.txt

@@ -0,0 +1,25 @@
+
+0.3.0
+* #error? response method
+* non-fake request, response and error classes (including ProcedureCall
+  and ProcedureReturn classes of sure) have generic marking Request,
+  Response and Error parent classes
+* fake 1.1 request, response and error classes are parent classes of the
+  appropriate 2.0 classes
+* 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
+
+0.1.3 (2011-01-18)
+* 'version' gem dependency removed
+
+0.1.2 (2011-01-16)
+* compatibility problem in 1.0 fake error class 
+* high level error module returned 1.1 instead of 2.0 error
+
+0.1.1 (2011-01-16)
+* bug in 1.1/2.0 response error assignment
+
+0.1.0 (2011-01-13) 
+* initial version

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/json-rpc-objects.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{json-rpc-objects}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Martin Kozák"]
-  s.date = %q{2011-01-30}
+  s.date = %q{2011-02-01}
   s.email = %q{martinkozak@martinkozak.net}
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
+    "CHANGES.txt",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
@@ -26,10 +27,13 @@ Gem::Specification.new do |s|
     "json-rpc-objects.gemspec",
     "lib/json-rpc-objects/error.rb",
     "lib/json-rpc-objects/generic.rb",
+    "lib/json-rpc-objects/generic/error.rb",
+    "lib/json-rpc-objects/generic/object.rb",
+    "lib/json-rpc-objects/generic/request.rb",
+    "lib/json-rpc-objects/generic/response.rb",
     "lib/json-rpc-objects/request.rb",
     "lib/json-rpc-objects/response.rb",
     "lib/json-rpc-objects/v10/error.rb",
-    "lib/json-rpc-objects/v10/fakes/error.rb",
     "lib/json-rpc-objects/v10/request.rb",
     "lib/json-rpc-objects/v10/response.rb",
     "lib/json-rpc-objects/v10/tests/test.rb",

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

@@ -0,0 +1,27 @@
+# encoding: utf-8
+require "json-rpc-objects/generic/object"
+
+##
+# Main JSON-RPC Objects module.
+#
+
+module JsonRpcObjects
+
+    ##
+    # Module for generic object methods.
+    #
+    
+    module Generic
+    
+        ##
+        # Generic JSON-RPC error.
+        #
+        # @since 0.3.0
+        # @abstract
+        #
+        
+        class Error < Object
+        end
+        
+    end
+end

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

@@ -0,0 +1,144 @@
+# encoding: utf-8
+require "hash-utils"
+require "yajl/json_gem"
+require "json-rpc-objects/version"
+
+##
+# Main JSON-RPC Objects module.
+#
+
+module JsonRpcObjects
+
+    ##
+    # Module for generic object methods.
+    #
+    
+    module Generic
+    
+        ##
+        # Generic JSON-RPC Object.
+        # @abstract
+        #
+        
+        class Object
+        
+            ##
+            # Creates new one.
+            #
+            # @param [Array] args some arguments
+            # @return [JsonRpc::Generic::Object] new object
+            #
+            
+            def self.create(*args)
+                __abstract
+            end
+        
+            ##
+            # Returns the version object.
+            # @return [JsonRpcObjects::Version]  appropriate version object
+            #
+            
+            def self.version
+                JsonRpcObjects::Version::get(self::VERSION)
+            end
+          
+            ##
+            # Parses JSON-RPC string.
+            #
+            # @param [String] string with the JSON data
+            # @return [Generic::Object] of the given class
+            #
+            
+            def self.parse(string)
+                self::new(JSON.load(string)) 
+            end
+                        
+            ##
+            # Converts back to JSON.
+            # @return [String]
+            #
+            
+            def to_json
+                self.output.to_json
+            end
+                     
+            ##
+            # Constructor.
+            # @param [Hash] data for initializing the object
+            #
+            
+            def initialize(data)
+                self.data = data
+                self.check!
+            end
+
+            ##
+            # Checks correctness of the request data.
+            #
+            
+            def check!
+            end
+                        
+            ##
+            # Renders data to output form.
+            #
+            # @return [Object] with data of object
+            # @abstract
+            #
+
+            def output
+                __abstract
+            end
+            
+            
+            protected
+            
+            ##
+            # Assigns request data.
+            #
+
+            def data=(value, mode = nil)
+                __abstract
+            end
+            
+            ##
+            # Converts data keys from strings to symbols if necessary.
+            #
+            
+            def __convert_data(data, mode = nil)
+                if mode != :converted
+                    data.keys_to_sym
+                else
+                    data
+                end
+            end
+            
+            ##
+            # Converts request data to standard (defined) format.
+            #
+            
+            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

@@ -0,0 +1,27 @@
+# encoding: utf-8
+require "json-rpc-objects/generic/object"
+
+##
+# Main JSON-RPC Objects module.
+#
+
+module JsonRpcObjects
+
+    ##
+    # Module for generic object methods.
+    #
+    
+    module Generic
+    
+        ##
+        # Generic JSON-RPC request.
+        #
+        # @since 0.3.0
+        # @abstract
+        #
+        
+        class Request < Object
+        end
+        
+    end
+end

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

@@ -0,0 +1,27 @@
+# encoding: utf-8
+require "json-rpc-objects/generic/object"
+
+##
+# Main JSON-RPC Objects module.
+#
+
+module JsonRpcObjects
+
+    ##
+    # Module for generic object methods.
+    #
+    
+    module Generic
+    
+        ##
+        # Generic JSON-RPC response.
+        #
+        # @since 0.3.0
+        # @abstract
+        #
+        
+        class Response < Object
+        end
+        
+    end
+end

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

@@ -1,144 +1,5 @@
 # encoding: utf-8
-require "hash-utils"
-require "yajl/json_gem"
-require "json-rpc-objects/version"
+# @deprecated (since 0.3.0)
 
-##
-# Main JSON-RPC Objects module.
-#
+require "json-rpc-objects/generic/object"
 
-module JsonRpcObjects
-
-    ##
-    # Module for generic object methods.
-    #
-    
-    module Generic
-    
-        ##
-        # Generic JSON-RPC Object.
-        # @abstract
-        #
-        
-        class Object
-        
-            ##
-            # Creates new one.
-            #
-            # @param [Array] args some arguments
-            # @return [JsonRpc::Generic::Object] new object
-            #
-            
-            def self.create(*args)
-                __abstract
-            end
-        
-            ##
-            # Returns the version object.
-            # @return [JsonRpcObjects::Version]  appropriate version object
-            #
-            
-            def self.version
-                JsonRpcObjects::Version::get(self::VERSION)
-            end
-          
-            ##
-            # Parses JSON-RPC string.
-            #
-            # @param [String] string with the JSON data
-            # @return [Generic::Object] of the given class
-            #
-            
-            def self.parse(string)
-                self::new(JSON.load(string)) 
-            end
-                        
-            ##
-            # Converts back to JSON.
-            # @return [String]
-            #
-            
-            def to_json
-                self.output.to_json
-            end
-                     
-            ##
-            # Constructor.
-            # @param [Hash] data for initializing the object
-            #
-            
-            def initialize(data)
-                self.data = data
-                self.check!
-            end
-
-            ##
-            # Checks correctness of the request data.
-            #
-            
-            def check!
-            end
-                        
-            ##
-            # Renders data to output form.
-            #
-            # @return [Object] with data of object
-            # @abstract
-            #
-
-            def output
-                __abstract
-            end
-            
-            
-            protected
-            
-            ##
-            # Assigns request data.
-            #
-
-            def data=(value, mode = nil)
-                __abstract
-            end
-            
-            ##
-            # Converts data keys from strings to symbols if necessary.
-            #
-            
-            def __convert_data(data, mode = nil)
-                if mode != :converted
-                    data.keys_to_sym
-                else
-                    data
-                end
-            end
-            
-            ##
-            # Converts request data to standard (defined) format.
-            #
-            
-            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/v10/error.rb

@@ -1,2 +1,80 @@
 # encoding: utf-8
-require "json-rpc-objects/v10/fakes/error"
+require "json-rpc-objects/generic/error"
+
+##
+# Main JSON-RPC Objects module.
+#
+
+module JsonRpcObjects
+
+    ##
+    # Module of JSON-RPC 1.0.
+    # @see http://json-rpc.org/wiki/specification
+    #
+    
+    module V10
+    
+        ##
+        # In fact, fake error class.
+        #
+        
+        class Error < JsonRpcObjects::Generic::Error
+
+            ##
+            # Holds request method name.
+            #
+        
+            @data
+            attr_accessor :data
+            
+            ##
+            # Holds link to its version module.
+            #
+            
+            VERSION = JsonRpcObjects::V10
+            
+            ##
+            # Creates new one.
+            #
+            # @param [Object] data error data
+            # @return [JsonRpcObjects::V10::Error] new object
+            #
+            
+            def self.create(code, message = nil, opts = { })
+                if message.nil? and opts.empty?
+                    data = code
+                elsif not opts.empty?
+                    data = {
+                        :message => message,
+                        :data => opts
+                    }
+                elsif
+                    data = message
+                end
+                
+                self::new(data)
+            end
+        
+            ##
+            # Renders data to output form.
+            # @return [Object] with data of object
+            #
+
+            def output
+                @data
+            end
+            
+            
+            protected
+            
+            ##
+            # Assigns request data.
+            #
+
+            def data=(value, mode = nil)
+                @data = value
+            end
+            
+        end
+    end
+end

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

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require "json-rpc-objects/generic"
+require "json-rpc-objects/generic/request"
 
 ##
 # Main JSON-RPC Objects module.
@@ -18,7 +18,7 @@ module JsonRpcObjects
         # Request object class.
         #
         
-        class Request < JsonRpcObjects::Generic::Object
+        class Request < JsonRpcObjects::Generic::Request
         
             ##
             # Holds link to its version module.

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

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require "json-rpc-objects/generic"
+require "json-rpc-objects/generic/response"
 require "json-rpc-objects/v10/error"
 
 ##
@@ -19,7 +19,7 @@ module JsonRpcObjects
         # Response object class.
         #
         
-        class Response < JsonRpcObjects::Generic::Object
+        class Response < JsonRpcObjects::Generic::Response
 
             ##
             # Holds link to its version module.
@@ -110,6 +110,17 @@ module JsonRpcObjects
                 @result = result
             end
             
+            ##
+            # Indicates, response is error.
+            #
+            # @return [Boolean] +true+ if it's, +false+ otherwise
+            # @since 0.3.0
+            #
+            
+            def error?
+                not @error.nil?
+            end
+            
             
             protected
             

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

@@ -1,6 +1,6 @@
 # encoding: utf-8
 require "hash-utils/hash"
-require "json-rpc-objects/v11/wd/procedure-call"
+require "json-rpc-objects/v11/wd/request"
 
 ##
 # Main JSON-RPC Objects module.
@@ -25,7 +25,7 @@ module JsonRpcObjects
             # Procedure call (request) class.
             #
             
-            class ProcedureCall < JsonRpcObjects::V11::WD::ProcedureCall
+            class ProcedureCall < JsonRpcObjects::V11::WD::Request
             
                 ##
                 # Holds link to its version module.

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

@@ -1,6 +1,6 @@
 # encoding: utf-8
 require "json-rpc-objects/v11/alt/error"
-require "json-rpc-objects/v11/wd/procedure-return"
+require "json-rpc-objects/v11/wd/response"
 
 ##
 # Main JSON-RPC Objects module.
@@ -25,7 +25,7 @@ module JsonRpcObjects
             # Procedure return (response) class.
             #
             
-            class ProcedureReturn < JsonRpcObjects::V11::WD::ProcedureReturn
+            class ProcedureReturn < JsonRpcObjects::V11::WD::Response
             
                 ##
                 # Holds link to its version module.

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

@@ -1,6 +1,7 @@
 # encoding: utf-8
 require "hash-utils/numeric"
 require "json-rpc-objects/generic"
+require "json-rpc-objects/v10/error"
 require "json-rpc-objects/v11/wd/extensions"
 
 ##
@@ -26,7 +27,7 @@ module JsonRpcObjects
             # Error description object class for ProcedureReturn.
             #
             
-            class Error < JsonRpcObjects::Generic::Object
+            class Error < JsonRpcObjects::V10::Error
             
                 include Extensions
 

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

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require "multitype-introspection"
 require "hash-utils/hash"
-require "json-rpc-objects/v11/alt/procedure-call"
+require "json-rpc-objects/v11/alt/request"
 
 ##
 # Main JSON-RPC Objects module.
@@ -20,7 +20,7 @@ module JsonRpcObjects
         # Request object class.
         #
         
-        class Request < JsonRpcObjects::V11::Alt::ProcedureCall
+        class Request < JsonRpcObjects::V11::Alt::Request
 
             ##
             # Holds link to its version module.

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

@@ -1,6 +1,6 @@
 # encoding: utf-8
 require "multitype-introspection"
-require "json-rpc-objects/v11/alt/procedure-return"
+require "json-rpc-objects/v11/alt/response"
 require "json-rpc-objects/v20/error"
 
 ##
@@ -20,7 +20,7 @@ module JsonRpcObjects
         # Response object class.
         #
     
-        class Response < JsonRpcObjects::V11::Alt::ProcedureReturn
+        class Response < JsonRpcObjects::V11::Alt::Response
         
             ##
             # Holds link to its version module.

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - "Martin Koz\xC3\xA1k"
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-30 00:00:00 +01:00
+date: 2011-02-01 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -133,6 +133,7 @@ extra_rdoc_files:
 - README.md
 files: 
 - .document
+- CHANGES.txt
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -142,10 +143,13 @@ files:
 - json-rpc-objects.gemspec
 - lib/json-rpc-objects/error.rb
 - lib/json-rpc-objects/generic.rb
+- lib/json-rpc-objects/generic/error.rb
+- lib/json-rpc-objects/generic/object.rb
+- lib/json-rpc-objects/generic/request.rb
+- lib/json-rpc-objects/generic/response.rb
 - lib/json-rpc-objects/request.rb
 - lib/json-rpc-objects/response.rb
 - lib/json-rpc-objects/v10/error.rb
-- lib/json-rpc-objects/v10/fakes/error.rb
 - lib/json-rpc-objects/v10/request.rb
 - lib/json-rpc-objects/v10/response.rb
 - lib/json-rpc-objects/v10/tests/test.rb
@@ -192,7 +196,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 223533265713224733
+      hash: -3073341896383133206
       segments: 
       - 0
       version: "0"

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

@@ -1,80 +0,0 @@
-# encoding: utf-8
-require "json-rpc-objects/generic"
-
-##
-# Main JSON-RPC Objects module.
-#
-
-module JsonRpcObjects
-
-    ##
-    # Module of JSON-RPC 1.0.
-    # @see http://json-rpc.org/wiki/specification
-    #
-    
-    module V10
-    
-        ##
-        # In fact, fake error class.
-        #
-        
-        class Error < JsonRpcObjects::Generic::Object
-      
-            ##
-            # Holds link to its version module.
-            #
-            
-            VERSION = JsonRpcObjects::V10
-            
-            ##
-            # Creates new one.
-            #
-            # @param [Object] data error data
-            # @return [JsonRpcObjects::V10::Error] new object
-            #
-            
-            def self.create(code, message = nil, opts = { })
-                if message.nil? and opts.empty?
-                    data = code
-                elsif not opts.empty?
-                    data = {
-                        :message => message,
-                        :data => opts
-                    }
-                elsif
-                    data = message
-                end
-                
-                self::new(data)
-            end
-        
-            ##
-            # Holds request method name.
-            #
-        
-            @data
-            attr_accessor :data
-            
-            ##
-            # Renders data to output form.
-            # @return [Object] with data of object
-            #
-
-            def output
-                @data
-            end
-            
-            
-            protected
-            
-            ##
-            # Assigns request data.
-            #
-
-            def data=(value, mode = nil)
-                @data = value
-            end
-            
-        end
-    end
-end