json-rpc-objects 0.4.3 → 0.4.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: eadd3626dc9e70dcffc6f0f93a96295785ff1eec
+  data.tar.gz: dca0aa2fee5a1ef1c1d113e6a43b8f1885012b82
+SHA512:
+  metadata.gz: 6b9fe6aca1ad153d470bd8e496a18209dde6484a9f2b88a850ce85737c1f22d6b88875c5fae0d076e3fd7df9b4730c2d8a077fae07188a3f22cc70a828af86b5
+  data.tar.gz: 043e0051b6643000249d3309f4512218ee6aa49949e1b3b47e5350e8b8d319b04576b81d0459f41b298ea709de0cafaaceae307a0e60f5ba5d2958cb940f5b53

data/CHANGES.txt

@@ -1,4 +1,9 @@
 
+0.4.4 (2015-03-14)
+* 'hash-utils' gem dependency removed
+* JsonRpcObjects::V11::Error and JsonRpcObjects::V20::Error now throws 
+  JsonRpcObjects::Exceptions::InvalidCode in case of invalid error code
+
 0.4.3 (2013-05-06)
 * none (passthru) serializer
 * method name should allow strings to be given, not symbols only

data/Gemfile

@@ -1,10 +1,12 @@
 source "http://rubygems.org"
 # Add dependencies required to use your gem here.
 # Example:
-   gem "hash-utils", ">= 0.18.0"
    gem "addressable", ">= 2.2.2"
    gem "abstract", ">= 1.0.0"
    gem "json-rpc-objects-json", ">= 0.1.1"
+   gem "ruby-version", ">= 0.4.0"
+   gem "rspec"
+   gem 'rspec-its'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -2,23 +2,69 @@ GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    addressable (2.3.4)
-    git (1.2.5)
-    hash-utils (2.1.1)
-      ruby-version (>= 0.4.0)
-    jeweler (1.8.4)
-      bundler (~> 1.0)
+    addressable (2.3.8)
+    builder (3.2.2)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    diff-lcs (1.2.5)
+    faraday (0.9.1)
+      multipart-post (>= 1.2, < 3)
+    git (1.2.9.1)
+    github_api (0.12.4)
+      addressable (~> 2.3)
+      descendants_tracker (~> 0.0.4)
+      faraday (~> 0.8, < 0.10)
+      hashie (>= 3.4)
+      multi_json (>= 1.7.5, < 2.0)
+      nokogiri (~> 1.6.6)
+      oauth2
+    hashie (3.4.2)
+    highline (1.7.3)
+    jeweler (2.0.1)
+      builder
+      bundler (>= 1.0)
       git (>= 1.2.5)
+      github_api
+      highline (>= 1.6.15)
+      nokogiri (>= 1.5.10)
       rake
       rdoc
-    json (1.7.7)
     json-rpc-objects-json (0.1.1)
       multi_json
-    multi_json (1.7.2)
-    rake (10.0.4)
-    rdoc (4.0.1)
-      json (~> 1.4)
+    jwt (1.5.1)
+    mini_portile (0.6.2)
+    multi_json (1.11.2)
+    multi_xml (0.5.5)
+    multipart-post (2.0.0)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
+    oauth2 (1.0.0)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
+    rack (1.6.4)
+    rake (10.4.2)
+    rdoc (4.2.0)
+    rspec (3.3.0)
+      rspec-core (~> 3.3.0)
+      rspec-expectations (~> 3.3.0)
+      rspec-mocks (~> 3.3.0)
+    rspec-core (3.3.2)
+      rspec-support (~> 3.3.0)
+    rspec-expectations (3.3.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
+    rspec-its (1.2.0)
+      rspec-core (>= 3.0.0)
+      rspec-expectations (>= 3.0.0)
+    rspec-mocks (3.3.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
+    rspec-support (3.3.0)
     ruby-version (0.4.3)
+    thread_safe (0.3.5)
 
 PLATFORMS
   ruby
@@ -27,6 +73,11 @@ DEPENDENCIES
   abstract (>= 1.0.0)
   addressable (>= 2.2.2)
   bundler (>= 1.0.0)
-  hash-utils (>= 0.18.0)
   jeweler (>= 1.5.2)
   json-rpc-objects-json (>= 0.1.1)
+  rspec
+  rspec-its
+  ruby-version (>= 0.4.0)
+
+BUNDLED WITH
+   1.10.6

data/LICENSE.txt

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

data/README.md

@@ -48,19 +48,23 @@ the versions (typically server).
 Concrete version use example (creates call to `subtract` method with 
 ID "a2b3"):
 
-    require "json-rpc-objects/v10/request"
-    require "json-rpc-objects/v11/alt/request"
-    require "json-rpc-objects/v20/request"
-    
-    JsonRpcObjects::V10::Request::create(:subtract, ["1", "2"], :id => "a2b3")
-    JsonRpcObjects::V11::Alt::Request::create(:subtract, ["1", "2"], :id => "a2b3")
-    JsonRpcObjects::V20::Request::create(:subtract, ["1", "2"], :id => "a2b3")
-    
+```ruby
+require "json-rpc-objects/v10/request"
+require "json-rpc-objects/v11/alt/request"
+require "json-rpc-objects/v20/request"
+
+JsonRpcObjects::V10::Request::create(:subtract, ["1", "2"], :id => "a2b3")
+JsonRpcObjects::V11::Alt::Request::create(:subtract, ["1", "2"], :id => "a2b3")
+JsonRpcObjects::V20::Request::create(:subtract, ["1", "2"], :id => "a2b3")
+```
+
 Or incoming data processing request:
 
-    require "json-rpc-objects/request"
-    JsonRpcObjects::Request::parse(string)
-    
+```ruby
+require "json-rpc-objects/request"
+JsonRpcObjects::Request::parse(string)
+```
+
 …which will simply return request object of appropriate class according 
 to its version. Be warn, to distinguish between 1.1 Alt and 1.1 WD is
 impossible in most of cases. It isn't problem for simple use, but it 
@@ -73,12 +77,14 @@ In some cases, for example in case implementing of JSON-RPC server, you
 need make response to request by the same protocol version. It can be 
 achieved by simple way:
 
-    require "json-rpc-objects/request"
-    
-    request = JsonRpcObjects::Request::parse(string)
-    ... <data processing>
-    response = request.class::version.response::create(<some args>)
-    
+```ruby
+require "json-rpc-objects/request"
+
+request = JsonRpcObjects::Request::parse(string)
+# ... <data processing>
+response = request.class::version.response::create(<some args>)
+```
+
 This code analyzes protocol version of the request and creates response
 of the same protocol version. It utilizes call handler, so you can call
 for example `request.class::version.service_procedure_description::create(<arguments>)`
@@ -108,40 +114,33 @@ widespread compatibility,
 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
+```ruby
+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)
-    
+```ruby
+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
-------------
-
-1. Fork it.
-2. Create a branch (`git checkout -b 20101220-my-change`).
-3. Commit your changes (`git commit -am "Added something"`).
-4. Push to the branch (`git push origin 20101220-my-change`).
-5. Create an [Issue][6] with a link to your branch.
-6. Enjoy a refreshing Diet Coke and wait.
-
-
 Copyright
 ---------
 
-Copyright &copy; 2011 [Martin Kozák][7]. See `LICENSE.txt` for
+Copyright &copy; 2011 &ndash; 2015 [Martin Poljak][7]. See `LICENSE.txt` for
 further details.
 
 [1]: http://en.wikipedia.org/wiki/JSON-RPC
@@ -150,7 +149,7 @@ further details.
 [4]: http://groups.google.com/group/json-rpc/web/json-rpc-1-1-alt
 [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/
+[7]: http://www.martinpoljak.net/
 
 [9]: http://www.yaml.org/
 [10]: http://ruby-doc.org/core/classes/Marshal.html

data/Rakefile

@@ -19,8 +19,8 @@ Jeweler::Tasks.new do |gem|
   gem.homepage = "http://github.com/martinkozak/json-rpc-objects"
   gem.license = "MIT"
   gem.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.'
-  gem.email = "martinkozak@martinkozak.net"
-  gem.authors = ["Martin Kozák"]
+  gem.email = "martin@poljak.cz"
+  gem.authors = ["Martin Poljak"]
   # Include your dependencies below. Runtime dependencies are required when using your gem,
   # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
   #  gem.add_runtime_dependency 'jabber4r', '> 0.1'

data/VERSION

@@ -1 +1 @@
-0.4.3
+0.4.4

data/json-rpc-objects.gemspec

@@ -2,15 +2,17 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: json-rpc-objects 0.4.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "json-rpc-objects"
-  s.version = "0.4.3"
+  s.version = "0.4.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Martin Koz\u{e1}k"]
-  s.date = "2013-05-06"
-  s.email = "martinkozak@martinkozak.net"
+  s.require_paths = ["lib"]
+  s.authors = ["Martin Poljak"]
+  s.date = "2015-08-15"
+  s.email = "martin@poljak.cz"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md"
@@ -26,6 +28,7 @@ Gem::Specification.new do |s|
     "VERSION",
     "json-rpc-objects.gemspec",
     "lib/json-rpc-objects/error.rb",
+    "lib/json-rpc-objects/exceptions/invalid-code.rb",
     "lib/json-rpc-objects/generic.rb",
     "lib/json-rpc-objects/generic/error.rb",
     "lib/json-rpc-objects/generic/object.rb",
@@ -36,6 +39,10 @@ Gem::Specification.new do |s|
     "lib/json-rpc-objects/serializer.rb",
     "lib/json-rpc-objects/serializer/marshal.rb",
     "lib/json-rpc-objects/serializer/none.rb",
+    "lib/json-rpc-objects/utils.rb",
+    "lib/json-rpc-objects/utils/hash.rb",
+    "lib/json-rpc-objects/utils/object.rb",
+    "lib/json-rpc-objects/utils/string.rb",
     "lib/json-rpc-objects/v10/error.rb",
     "lib/json-rpc-objects/v10/request.rb",
     "lib/json-rpc-objects/v10/response.rb",
@@ -68,37 +75,44 @@ Gem::Specification.new do |s|
     "lib/json-rpc-objects/v20/request.rb",
     "lib/json-rpc-objects/v20/response.rb",
     "lib/json-rpc-objects/v20/tests/test.rb",
-    "lib/json-rpc-objects/version.rb"
+    "lib/json-rpc-objects/version.rb",
+    "spec/request_spec.rb",
+    "spec/spec_helper.rb"
   ]
   s.homepage = "http://github.com/martinkozak/json-rpc-objects"
   s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.23"
+  s.rubygems_version = "2.4.5"
   s.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."
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<hash-utils>, [">= 0.18.0"])
       s.add_runtime_dependency(%q<addressable>, [">= 2.2.2"])
       s.add_runtime_dependency(%q<abstract>, [">= 1.0.0"])
       s.add_runtime_dependency(%q<json-rpc-objects-json>, [">= 0.1.1"])
+      s.add_runtime_dependency(%q<ruby-version>, [">= 0.4.0"])
+      s.add_runtime_dependency(%q<rspec>, [">= 0"])
+      s.add_runtime_dependency(%q<rspec-its>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_development_dependency(%q<jeweler>, [">= 1.5.2"])
     else
-      s.add_dependency(%q<hash-utils>, [">= 0.18.0"])
       s.add_dependency(%q<addressable>, [">= 2.2.2"])
       s.add_dependency(%q<abstract>, [">= 1.0.0"])
       s.add_dependency(%q<json-rpc-objects-json>, [">= 0.1.1"])
+      s.add_dependency(%q<ruby-version>, [">= 0.4.0"])
+      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<rspec-its>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_dependency(%q<jeweler>, [">= 1.5.2"])
     end
   else
-    s.add_dependency(%q<hash-utils>, [">= 0.18.0"])
     s.add_dependency(%q<addressable>, [">= 2.2.2"])
     s.add_dependency(%q<abstract>, [">= 1.0.0"])
     s.add_dependency(%q<json-rpc-objects-json>, [">= 0.1.1"])
+    s.add_dependency(%q<ruby-version>, [">= 0.4.0"])
+    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<rspec-its>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 1.0.0"])
     s.add_dependency(%q<jeweler>, [">= 1.5.2"])
   end

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

data/lib/json-rpc-objects/exceptions/invalid-code.rb

@@ -0,0 +1,25 @@
+# encoding: utf-8
+# (c) 2015 Martin Poljak (martin@poljak.cz)
+
+##
+# Main JSON-RPC Objects module.
+#
+
+module JsonRpcObjects
+
+    ##
+    # Module for exceptions.
+    # @since 0.4.4
+    #
+    
+    module Exceptions
+    
+        ##
+        # Invalid code exception..
+        #
+        
+        class InvalidCode < Exception
+        end
+        
+    end
+end

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

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

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

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

@@ -1,11 +1,10 @@
 # encoding: utf-8
-# (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
+# (c) 2011-2015 Martin Poljak (martin@poljak.cz)
 
-require "hash-utils/hash"
 require "abstract"
 require "json-rpc-objects/serializer"
 require "json-rpc-objects/version"
-
+require "json-rpc-objects/utils"
 ##
 # Main JSON-RPC Objects module.
 #
@@ -102,6 +101,7 @@ module JsonRpcObjects
             def initialize(data, serializer = JsonRpcObjects::default_serializer)
                 @serializer = serializer
                 self.data = data
+                p self
                 self.check!
             end
 
@@ -141,7 +141,7 @@ module JsonRpcObjects
             
             def __convert_data(data, mode = nil)
                 if mode != :converted
-                    data.keys_to_sym
+                    JsonRpcObjects::Utils::Hash.keys_to_sym(data)
                 else
                     data
                 end
@@ -157,4 +157,3 @@ module JsonRpcObjects
         end
     end
 end
-