saorin 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc3152fea207123c2b0babcc3e7b09067eaf63c4
-  data.tar.gz: a42b9af27a59e05304e70e39db95cd671ba1702e
+  metadata.gz: 9790f4170f9f9740a494ce87226a6f67d0e1a613
+  data.tar.gz: 4bf5efd3af1127f67e420a69e2ecd1587474d102
 SHA512:
-  metadata.gz: b04131232693dd6d87c73a5a844fb88ee407ca60579af48d17af751726e813a0b82e47815397e51f338e5579cc6576400ea0f914a6ebfa4968d5ac22b3993014
-  data.tar.gz: 16b6b406fe99842586234e1473ac11c66eb8dfe89367aa34f107a7c9f6584ad2b1a305a060e73ef6ffed8f6ab7446d97ca7df966d6efab31943665f481bf5f9c
+  metadata.gz: bcef4861617f4ceeeeddcc0aa41d373d98a897b125de545a8835ea4d0db8565cc289bda0125272a07d9cfc14fac28e0b3dffba430c83b24799565c405ef8bcaa
+  data.tar.gz: ffdc00163550c32c3a39102e1ad9299da7a4d5a4cfcdebda4ad7ddfdf2a4a729135d6a8ce0ab8e6ec6dd9d74633a167db7381b18aed131739107a08e54edcbda

data/.travis.yml

@@ -0,0 +1,18 @@
+language: ruby
+
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - 2.1.1
+
+branches:
+  only:
+    - master
+
+notifications:
+  irc:
+    channels:
+      - "irc.freenode.net#mashiro-dev" 
+    use_notice: true
+    skip_join: true
+

data/README.md

@@ -1,4 +1,4 @@
-# Saorin
+# Saorin [![Build Status](https://travis-ci.org/mashiro/saorin.png?branch=master)](https://travis-ci.org/mashiro/saorin)
 
 JSON-RPC server and client library.
 

data/lib/saorin/client.rb

@@ -8,7 +8,7 @@ module Saorin
 
     class << self
       def new(options = {}, &block)
-        adapter = options.delete(:adapter) || :faraday
+        adapter = options[:adapter] || :faraday
         adapter_class = guess adapter
         adapter_class.new options, &block
       end

data/lib/saorin/client/base.rb

@@ -7,6 +7,14 @@ require 'saorin/client'
 module Saorin
   module Client
     module Base
+      module UUID
+        def uuid
+          require 'securerandom'
+          SecureRandom.uuid
+        end
+      end
+
+      include UUID
       include Formatter
 
       attr_reader :options
@@ -30,6 +38,33 @@ module Saorin
         content
       end
 
+      class Batch < ::Array
+        include UUID
+        attr_reader :client
+
+        def initialize(client)
+          super()
+          @client = client
+        end
+
+        def call(method, *args)
+          push Saorin::Request.new(method, args, :id => uuid)
+        end
+
+        def notify(method, *args)
+          push Saorin::Request.new(method, args)
+        end
+
+        def apply
+          return [] if empty?
+          @client.apply(self) || []
+        end
+      end
+
+      def batch
+        Batch.new self
+      end
+
       protected
 
       def send_request(content)
@@ -48,6 +83,7 @@ module Saorin
       end
 
       def parse_response(content)
+        return nil if content.nil? || content.empty?
         formatter.load content
       end
 
@@ -73,11 +109,6 @@ module Saorin
         response.validate
         to_content response
       end
-
-      def uuid
-        require 'securerandom'
-        SecureRandom.uuid
-      end
     end
   end
 end

data/lib/saorin/error.rb

@@ -58,13 +58,19 @@ module Saorin
     end
   end
 
+  class UserDefinedError < RPCError
+  end
+
   class << self
     def code_to_error(code)
-      if (-32099..-32000).include?(code)
+      case code
+      when nil
+        nil
+      when (-32099..-32000)
         ServerError
       else
-        @map ||= Hash[JSON_RPC_ERRORS.map { |c, n, m| [c, const_get(n)] }]
-        @map[code]
+        @error_code_map ||= Hash[JSON_RPC_ERRORS.map { |c, n, m| [c, const_get(n)] }]
+        @error_code_map[code] || UserDefinedError
       end
     end
   end

data/lib/saorin/server.rb

@@ -8,7 +8,7 @@ module Saorin
 
     class << self
       def new(handler, options = {})
-        adapter = options.delete(:adapter) || :rack
+        adapter = options[:adapter] || :rack
         adapter_class = guess adapter
         adapter_class.new handler, options
       end

data/lib/saorin/server/base.rb

@@ -87,6 +87,8 @@ module Saorin
           else
             @handler.__send__ method, *params
           end
+        rescue Saorin::RPCError
+          raise
         rescue ArgumentError
           raise Saorin::InvalidParams
         rescue Exception => e

data/lib/saorin/test.rb

@@ -78,6 +78,10 @@ module Saorin
       @client.notify *args
     end
 
+    def test_batch
+      @client.batch
+    end
+
     shared_context 'setup rpc server client' do |options|
       before(:all) do
         create_test_server options[:server] || {}
@@ -89,37 +93,102 @@ module Saorin
     end
 
     shared_examples 'rpc communicatable' do
-      it 'string' do
-        value = '123'
-        test_call('identity', value).should eq value
-      end
-
-      it 'number' do
-        value = 123
-        test_call('identity', value).should eq value
-      end
-
-      it 'array' do
-        value = [1, 2, 3]
-        test_call('identity', value).should eq value
-      end
-
-      it 'hash' do
-        value = {'foo' => 1, 'bar' => 2}
-        test_call('identity', value).should eq value
-      end
-
-      it 'nil' do
-        value = nil
-        test_call('identity', value).should eq value
-      end
-
-      it 'not found' do
-        lambda { test_call('xxx') }.should raise_error MethodNotFound
-      end
-
-      it 'invalid params' do
-        lambda { test_call('identity', 1, 2, 3, 4, 5) }.should raise_error InvalidParams
+      describe '#call' do
+        it 'string' do
+          v = '123'
+          expect(test_call('identity', v)).to eq v
+        end
+
+        it 'number' do
+          v = 123
+          expect(test_call('identity', v)).to eq v
+        end
+
+        it 'array' do
+          v = [1, 2, 3]
+          expect(test_call('identity', v)).to eq v
+        end
+
+        it 'hash' do
+          v = {'foo' => 1, 'bar' => 2}
+          expect(test_call('identity', v)).to eq v
+        end
+
+        it 'nil' do
+          v = nil
+          expect(test_call('identity', v)).to eq v
+        end
+
+        it 'not found' do
+          expect { test_call('xx') }.to raise_error MethodNotFound
+        end
+
+        it 'invalid params' do
+          expect { test_call('identity', 1, 2, 3, 4, 5) }.to raise_error InvalidParams
+        end
+      end
+
+      describe '#notify' do
+        it 'string' do
+          v = '123'
+          expect(test_notify('identity', v)).to eq nil
+        end
+
+        it 'not found' do
+          expect(test_notify('xxx')).to eq nil
+        end
+
+        it 'invalid params' do
+          expect(test_notify('identity', 1, 2, 3, 4, 5)).to eq nil
+        end
+      end
+
+      describe '#batch' do
+        it 'batch call' do
+          b = test_batch
+          b.call 'identity', 1
+          b.call 'identity', '2'
+          b.call 'identity', [3]
+          b.call 'xxx'
+
+          ret = b.apply
+          expect(ret).to have(4).items
+          expect(ret[0]).to eq 1
+          expect(ret[1]).to eq '2'
+          expect(ret[2]).to eq [3]
+          expect(ret[3]).to be_instance_of MethodNotFound
+        end
+
+        it 'batch call with notify' do
+          b = test_batch
+          b.call 'identity', 1
+          b.notify 'identity', '2'
+          b.call 'identity', [3]
+          b.notify 'xxx'
+
+          ret = b.apply
+          expect(ret).to have(2).items
+          expect(ret[0]).to eq 1
+          expect(ret[1]).to eq [3]
+        end
+
+        it 'all notify' do
+          b = test_batch
+          b.notify 'identity', 1
+          b.notify 'identity', '2'
+          b.notify 'identity', [3]
+          b.notify 'xxx'
+
+          ret = b.apply
+          expect(ret).to have(0).items
+        end
+
+        it 'empty' do
+          b = test_batch
+
+          ret = b.apply
+          expect(ret).to have(0).items
+        end
       end
     end
   end

data/lib/saorin/version.rb

@@ -1,3 +1,3 @@
 module Saorin
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'
 end

data/saorin.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'multi_json'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'rack'
-  spec.add_development_dependency 'faraday'
+  spec.add_development_dependency 'rake', '~> 10.4.2'
+  spec.add_development_dependency 'rspec', '~> 2.14.1'
+  spec.add_development_dependency 'rack', '~> 1.5.2'
+  spec.add_development_dependency 'faraday', '~> 0.9.0'
 end

data/spec/{request_spec.rb → saorin/request_spec.rb}

@@ -58,7 +58,7 @@ describe Saorin::Request do
       it do
         r = create_request
         r.stub(:valid?).and_return(true)
-        lambda { r.validate }.should_not raise_error Saorin::InvalidRequest
+        lambda { r.validate }.should_not raise_error
       end
     end
 

data/spec/{response_spec.rb → saorin/response_spec.rb}

@@ -82,7 +82,7 @@ describe Saorin::Response do
       it do
         r = create_response
         r.stub(:valid?).and_return(true)
-        lambda { r.validate }.should_not raise_error Saorin::InvalidResponse
+        lambda { r.validate }.should_not raise_error
       end
     end
 

data/spec/spec_helper.rb

@@ -9,6 +9,9 @@ RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
+  config.expect_with :rspec do |c|
+    c.syntax = [:should, :expect]
+  end
 
   # Run specs in random order to surface order dependencies. If you find an
   # order dependency and want to debug it, you can fix the order by providing

metadata

@@ -1,85 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: saorin
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - mashiro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-09 00:00:00.000000000 Z
+date: 2014-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.4.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.1
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.2
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.0
 description: JSON-RPC 2.0 implementation
 email:
 - mail@mashiro.org
@@ -87,8 +87,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -110,10 +111,10 @@ files:
 - lib/saorin/utility.rb
 - lib/saorin/version.rb
 - saorin.gemspec
-- spec/request_spec.rb
-- spec/response_spec.rb
-- spec/server/base_spec.rb
-- spec/server/rack_spec.rb
+- spec/saorin/request_spec.rb
+- spec/saorin/response_spec.rb
+- spec/saorin/server/base_spec.rb
+- spec/saorin/server/rack_spec.rb
 - spec/spec_helper.rb
 - spec/support/response.rb
 - spec/support/utils.rb
@@ -127,25 +128,25 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: JSON-RPC 2.0 server and client implementation for any protocols
 test_files:
-- spec/request_spec.rb
-- spec/response_spec.rb
-- spec/server/base_spec.rb
-- spec/server/rack_spec.rb
+- spec/saorin/request_spec.rb
+- spec/saorin/response_spec.rb
+- spec/saorin/server/base_spec.rb
+- spec/saorin/server/rack_spec.rb
 - spec/spec_helper.rb
 - spec/support/response.rb
 - spec/support/utils.rb