saorin 0.3.2 → 0.4.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5d731d83b57e3aa94b1496a35d8d635ac7f0e4b1
+  data.tar.gz: 58702ec40e1322e327f8813da93c36e87345d27d
+SHA512:
+  metadata.gz: ee7f2206ee8092b8549961d0d517dc792dcddd5e23c4b06c6ad045b6a4668e84ed594d66aade15b7b3b202deaef0367a7968e706909167d810fdc70701dfc31a
+  data.tar.gz: a0e9be370c67bf3d7bd589941a7a9d7bc3d2b1b1ebc08bad9ff17707b1895496081e17d5053cf94e7f6d46e5c2f7400de2f9ce85273901c5c3de4f2d0cba30dc

data/lib/saorin/client/base.rb

@@ -1,7 +1,8 @@
-require 'multi_json'
 require 'saorin/request'
 require 'saorin/response'
 require 'saorin/client'
+require 'multi_json'
+require 'securerandom'
 
 module Saorin
   module Client
@@ -12,7 +13,7 @@ module Saorin
       end
 
       def call(method, *args)
-        apply Saorin::Request.new(method, args, :id => seqid!)
+        apply Saorin::Request.new(method, args, :id => uuid)
       end
 
       def notify(method, *args)
@@ -20,7 +21,7 @@ module Saorin
       end
 
       def apply(request)
-        response = send_request request.to_json
+        response = send_request dump_request(request)
         content = process_response response
         raise content if content.is_a?(Saorin::RPCError)
         content
@@ -42,17 +43,19 @@ module Saorin
       rescue Saorin::InvalidResponse => e
         raise e
       rescue => e
-        p e
-        print e.backtrace.join("\t\n")
         raise Saorin::InvalidResponse, e.to_s
       end
 
       def parse_response(content)
-        MultiJson.decode content
+        MultiJson.load content
       rescue MultiJson::LoadError => e
         raise Saorin::InvalidResponse, e.to_s
       end
 
+      def dump_request(request)
+        MultiJson.dump request
+      end
+
       def to_content(response)
         return nil if response.nil?
         if response.error?
@@ -72,20 +75,8 @@ module Saorin
         to_content response
       end
 
-      def seqid
-        @@seqid ||= 0
-      end
-
-      def seqid=(value)
-        @@seqid = value
-        @@seqid = 0 if @@seqid >= (1 << 31)
-        @@seqid
-      end
-
-      def seqid!
-        id = self.seqid
-        self.seqid += 1
-        id
+      def uuid
+        SecureRandom.uuid
       end
     end
   end

data/lib/saorin/error.rb

@@ -22,7 +22,7 @@ module Saorin
     end
 
     def to_json(*args)
-      options = args.last.is_a?(::Hash) ? args.pop : {}
+      options = Saorin::Utility.extract_options!(args)
       MultiJson.dump to_h, options
     end
   end

data/lib/saorin/request.rb

@@ -44,7 +44,7 @@ module Saorin
     end
 
     def to_json(*args)
-      options = args.last.is_a?(::Hash) ? args.pop : {}
+      options = Saorin::Utility.extract_options!(args)
       MultiJson.dump to_h, options
     end
 

data/lib/saorin/response.rb

@@ -42,7 +42,7 @@ module Saorin
     end
 
     def to_json(*args)
-      options = args.last.is_a?(::Hash) ? args.pop : {}
+      options = Saorin::Utility.extract_options!(args)
       MultiJson.dump to_h, options
     end
 

data/lib/saorin/server/base.rb

@@ -2,6 +2,7 @@ require 'saorin/error'
 require 'saorin/request'
 require 'saorin/response'
 require 'saorin/server'
+require 'multi_json'
 
 module Saorin
   module Server
@@ -34,15 +35,19 @@ module Saorin
                      Response.new(:error => e)
                    end
 
-        response && MultiJson.dump(response)
+        dump_response response if response
       end
 
       def parse_request(content)
-        MultiJson.decode content
+        MultiJson.load content
       rescue MultiJson::LoadError
         raise Saorin::ParseError
       end
 
+      def dump_response(response)
+        MultiJson.dump response
+      end
+
       def handle_request(hash)
         begin
           request = Request.from_hash(hash)

data/lib/saorin/test.rb

@@ -57,12 +57,11 @@ module Saorin
         }.merge(options))
         @server.start
       end
-      sleep 2
+      sleep 1
     end
 
     def shutdown_test_server
       Process.kill :INT, @pid
-      sleep 2
     end
 
     def create_test_client(options = {})
@@ -79,19 +78,17 @@ module Saorin
       @client.notify *args
     end
 
-    shared_context 'setup rpc server client' do
-      let(:server_adapter) {}
-      let(:client_adapter) {}
+    shared_context 'setup rpc server client' do |options|
       before(:all) do
-        create_test_server :adapter => server_adapter
-        create_test_client :adapter => client_adapter
+        create_test_server :adapter => options[:server]
+        create_test_client :adapter => options[:client]
       end
       after(:all) do
         shutdown_test_server
       end
     end
 
-    shared_examples 'rpc server client' do
+    shared_examples 'rpc communicatable' do
       it 'string' do
         value = '123'
         test_call('identity', value).should eq value

data/lib/saorin/utility.rb

@@ -1,6 +1,10 @@
 module Saorin
   module Utility
     class << self
+      def extract_options!(args)
+        args.last.is_a?(::Hash) ? args.pop : {}
+      end
+
       def symbolized_keys(hash)
         hash = hash.dup
         hash.keys.each do |key|

data/lib/saorin/version.rb

@@ -1,3 +1,3 @@
 module Saorin
-  VERSION = '0.3.2'
+  VERSION = '0.4.0'
 end

data/spec/server/base_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'saorin/server/base'
 
 describe Saorin::Server::Base do
-  it_should_behave_like 'rpc call' do
+  it_should_behave_like 'returning valid response' do
     let(:process) do
       handler = Saorin::Test::Handler.new
       class VanillaServer
@@ -10,7 +10,8 @@ describe Saorin::Server::Base do
       end
       server = VanillaServer.new handler
       proc do |input|
-        server.process_request input
+        data = server.process_request input
+        data && JSON.load(data)
       end
     end
   end

data/spec/server/rack_spec.rb

@@ -4,8 +4,6 @@ require 'saorin/server/rack'
 
 describe Saorin::Server::Rack do
   include Saorin::Test
-
-  let(:server_adapter) { :rack }
-  include_context 'setup rpc server client'
-  it_should_behave_like 'rpc server client'
+  include_context 'setup rpc server client', :server => :rack
+  it_should_behave_like 'rpc communicatable'
 end

data/spec/support/{rpc_call.rb → response.rb}

@@ -1,5 +1,4 @@
 require 'support/utils'
-require 'json'
 
 shared_examples 'rpc call with positional parameters' do
   it 'rpc call with positional parameters' do
@@ -142,7 +141,7 @@ shared_examples 'rpc call Batch (all notifications)' do
   end
 end
 
-shared_examples 'rpc call' do
+shared_examples 'returning valid response' do
   let(:inputs) { [] }
   let(:answers) { [] }
   include_examples 'rpc call with positional parameters'

data/spec/support/utils.rb

@@ -1,13 +1,13 @@
 require 'saorin/test'
 
-def deserialize(data)
+def json_decode(data)
   data && JSON.load(data)
 end
 
 def validates(process, inputs, answers)
   inputs.zip(answers).each do |input, answer|
-    output = deserialize process.call(input)
-    answer = deserialize answer
+    output = process.call(input)
+    answer = json_decode answer
     output.should eq answer
   end
 end

metadata

@@ -1,94 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: saorin
 version: !ruby/object:Gem::Version
-  version: 0.3.2
-  prerelease: 
+  version: 0.4.0
 platform: ruby
 authors:
 - mashiro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-11 00:00:00.000000000 Z
+date: 2013-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: JSON-RPC 2.0 implementation
@@ -124,37 +113,30 @@ files:
 - spec/server/base_spec.rb
 - spec/server/rack_spec.rb
 - spec/spec_helper.rb
-- spec/support/rpc_call.rb
+- spec/support/response.rb
 - spec/support/utils.rb
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2282161111462653130
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2282161111462653130
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: JSON-RPC 2.0 server and client implementation for any protocols
 test_files:
 - spec/request_spec.rb
@@ -162,5 +144,5 @@ test_files:
 - spec/server/base_spec.rb
 - spec/server/rack_spec.rb
 - spec/spec_helper.rb
-- spec/support/rpc_call.rb
+- spec/support/response.rb
 - spec/support/utils.rb