saorin 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58da2e066be3253ec651b8d669cd2a3a11e43d7a
-  data.tar.gz: 7537767a94c0a528e0a3566e4b87d917200081a0
+  metadata.gz: bc3152fea207123c2b0babcc3e7b09067eaf63c4
+  data.tar.gz: a42b9af27a59e05304e70e39db95cd671ba1702e
 SHA512:
-  metadata.gz: 97f9611f075af1fbd356fc6f4501d445c38aaa1e4ae1ea33e0ae12b72025c0caac1e37ca33e007136e21719c6c0c37522af4eb1f19fdc52438e3a46057224a4f
-  data.tar.gz: f01373595fb38d523e5a6569df38dce6d2880e726e9ce1bd1d33b9843d5086e2d7bd4d778040e734aa85433ed6823610f18dd89f3799e4f3e0267dc1b1731f6d
+  metadata.gz: b04131232693dd6d87c73a5a844fb88ee407ca60579af48d17af751726e813a0b82e47815397e51f338e5579cc6576400ea0f914a6ebfa4968d5ac22b3993014
+  data.tar.gz: 16b6b406fe99842586234e1473ac11c66eb8dfe89367aa34f107a7c9f6584ad2b1a305a060e73ef6ffed8f6ab7446d97ca7df966d6efab31943665f481bf5f9c

data/Rakefile

@@ -1,4 +1,4 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 task :default => :spec

data/lib/saorin.rb

@@ -4,6 +4,7 @@ require 'saorin/request'
 require 'saorin/response'
 require 'saorin/server'
 require 'saorin/client'
+require 'multi_json'
 
 module Saorin
   JSON_RPC_VERSION = '2.0'

data/lib/saorin/client.rb

@@ -1,4 +1,5 @@
 require 'saorin/registerable'
+require 'saorin/client/base'
 
 module Saorin
   module Client

data/lib/saorin/client/base.rb

@@ -1,15 +1,18 @@
+require 'saorin/error'
 require 'saorin/request'
 require 'saorin/response'
+require 'saorin/formatter'
 require 'saorin/client'
-require 'multi_json'
-require 'securerandom'
 
 module Saorin
   module Client
     module Base
-      CONTENT_TYPE = 'application/json'.freeze
+      include Formatter
+
+      attr_reader :options
 
       def initialize(options = {})
+        @options = options
       end
 
       def call(method, *args)
@@ -40,20 +43,16 @@ module Saorin
         else
           handle_response response
         end
-      rescue Saorin::InvalidResponse => e
-        raise e
       rescue => e
         raise Saorin::InvalidResponse, e.to_s
       end
 
       def parse_response(content)
-        MultiJson.load content
-      rescue MultiJson::LoadError => e
-        raise Saorin::InvalidResponse, e.to_s
+        formatter.load content
       end
 
       def dump_request(request)
-        MultiJson.dump request
+        formatter.dump request
       end
 
       def to_content(response)
@@ -76,6 +75,7 @@ module Saorin
       end
 
       def uuid
+        require 'securerandom'
         SecureRandom.uuid
       end
     end

data/lib/saorin/client/faraday.rb

@@ -6,6 +6,7 @@ module Saorin
     class Faraday
       include Base
 
+      CONTENT_TYPE = 'application/json'.freeze
       attr_reader :connection
 
       def initialize(options = {}, &block)

data/lib/saorin/dumpable.rb

@@ -0,0 +1,10 @@
+require 'saorin/utility'
+
+module Saorin
+  module Dumpable
+    def to_json(*args)
+      options = Saorin::Utility.extract_options!(args)
+      MultiJson.dump to_h, options
+    end
+  end
+end

data/lib/saorin/error.rb

@@ -1,10 +1,12 @@
-require 'multi_json'
+require 'saorin/dumpable'
 
 module Saorin
   class Error < StandardError
   end
 
   class RPCError < Error
+    include Dumpable
+
     attr_reader :code, :data
 
     def initialize(message, options = {})
@@ -20,11 +22,6 @@ module Saorin
       h['data'] = data if data
       h
     end
-
-    def to_json(*args)
-      options = Saorin::Utility.extract_options!(args)
-      MultiJson.dump to_h, options
-    end
   end
 
   # code  message   meaning

data/lib/saorin/formatter.rb

@@ -0,0 +1,11 @@
+module Saorin
+  module Formatter
+    def default_formatter
+      MultiJson
+    end
+
+    def formatter
+      @formatter ||= (@options[:formatter] || default_formatter)
+    end
+  end
+end

data/lib/saorin/request.rb

@@ -1,10 +1,12 @@
 require 'saorin'
 require 'saorin/error'
+require 'saorin/dumpable'
 require 'saorin/utility'
-require 'multi_json'
 
 module Saorin
   class Request
+    include Dumpable
+
     attr_accessor :version, :method, :params, :id
 
     def initialize(method, params, options = {})
@@ -43,11 +45,6 @@ module Saorin
       h
     end
 
-    def to_json(*args)
-      options = Saorin::Utility.extract_options!(args)
-      MultiJson.dump to_h, options
-    end
-
     def self.symbolized_keys(hash)
       hash.each do |k, v|
         if k.is_a? ::String

data/lib/saorin/response.rb

@@ -1,10 +1,12 @@
 require 'saorin'
 require 'saorin/error'
+require 'saorin/dumpable'
 require 'saorin/utility'
-require 'multi_json'
 
 module Saorin
   class Response
+    include Dumpable
+
     attr_accessor :version, :result, :error, :id
 
     def initialize(options = {})
@@ -41,11 +43,6 @@ module Saorin
       h
     end
 
-    def to_json(*args)
-      options = Saorin::Utility.extract_options!(args)
-      MultiJson.dump to_h, options
-    end
-
     def self.from_hash(hash)
       raise Saorin::InvalidResponse unless hash.is_a?(::Hash)
       new Saorin::Utility.symbolized_keys(hash)

data/lib/saorin/server.rb

@@ -1,4 +1,5 @@
 require 'saorin/registerable'
+require 'saorin/server/base'
 
 module Saorin
   module Server

data/lib/saorin/server/base.rb

@@ -1,12 +1,14 @@
 require 'saorin/error'
 require 'saorin/request'
 require 'saorin/response'
+require 'saorin/formatter'
 require 'saorin/server'
-require 'multi_json'
 
 module Saorin
   module Server
     module Base
+      include Formatter
+
       attr_reader :handler, :allowed_methods
       attr_reader :options
 
@@ -39,13 +41,13 @@ module Saorin
       end
 
       def parse_request(content)
-        MultiJson.load content
-      rescue MultiJson::LoadError
+        formatter.load content
+      rescue
         raise Saorin::ParseError
       end
 
       def dump_response(response)
-        MultiJson.dump response
+        formatter.dump response
       end
 
       def handle_request(hash)

data/lib/saorin/test.rb

@@ -80,8 +80,8 @@ module Saorin
 
     shared_context 'setup rpc server client' do |options|
       before(:all) do
-        create_test_server :adapter => options[:server]
-        create_test_client :adapter => options[:client]
+        create_test_server options[:server] || {}
+        create_test_client options[:client] || {}
       end
       after(:all) do
         shutdown_test_server

data/lib/saorin/version.rb

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

data/spec/server/base_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'saorin/server/base'
 
 describe Saorin::Server::Base do
   it_should_behave_like 'returning valid response' do

data/spec/server/rack_spec.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: saorin
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - mashiro
@@ -97,7 +97,9 @@ files:
 - lib/saorin/client.rb
 - lib/saorin/client/base.rb
 - lib/saorin/client/faraday.rb
+- lib/saorin/dumpable.rb
 - lib/saorin/error.rb
+- lib/saorin/formatter.rb
 - lib/saorin/registerable.rb
 - lib/saorin/request.rb
 - lib/saorin/response.rb