saorin 0.2.0 → 0.3.0

data/lib/saorin.rb

@@ -2,7 +2,6 @@ require 'saorin/version'
 require 'saorin/error'
 require 'saorin/request'
 require 'saorin/response'
-require 'saorin/adapters'
 require 'saorin/server'
 require 'saorin/client'
 

data/lib/saorin/client.rb

@@ -1,11 +1,14 @@
-require 'saorin/adapters/clients'
+require 'saorin/registerable'
 
 module Saorin
-  class Client
+  module Client
+    include Registerable
+    self.load_path = 'saorin/client'
+
     class << self
       def new(options = {}, &block)
         adapter = options.delete(:adapter) || :faraday
-        adapter_class = Saorin::Adapters::Clients.guess adapter
+        adapter_class = guess adapter
         adapter_class.new options, &block
       end
     end

data/lib/saorin/client/base.rb

@@ -0,0 +1,92 @@
+require 'multi_json'
+require 'saorin/request'
+require 'saorin/response'
+require 'saorin/client'
+
+module Saorin
+  module Client
+    module Base
+      CONTENT_TYPE = 'application/json'.freeze
+
+      def initialize(options = {})
+      end
+
+      def call(method, *args)
+        apply Saorin::Request.new(method, args, :id => seqid!)
+      end
+
+      def notify(method, *args)
+        apply Saorin::Request.new(method, args)
+      end
+
+      def apply(request)
+        response = send_request request.to_json
+        content = process_response response
+        raise content if content.is_a?(Saorin::RPCError)
+        content
+      end
+
+      protected
+
+      def send_request(content)
+        raise NotImplementedError
+      end
+
+      def process_response(content)
+        response = parse_response content
+        if response.is_a?(::Array)
+          response.map { |res| handle_response res }
+        else
+          handle_response response
+        end
+      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
+      rescue MultiJson::LoadError => e
+        raise Saorin::InvalidResponse, e.to_s
+      end
+
+      def to_content(response)
+        return nil if response.nil?
+        if response.error?
+          code, message, data = response.error.values_at('code', 'message', 'data')
+          error_class = Saorin.code_to_error code
+          raise Error, 'unknown error code' unless error_class
+          error_class.new message, :code => code, :data => data
+        else
+          response.result
+        end
+      end
+
+      def handle_response(hash)
+        return nil if hash.nil?
+        response = Response.from_hash(hash)
+        response.validate
+        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
+      end
+    end
+  end
+end

data/lib/saorin/client/faraday.rb

@@ -0,0 +1,32 @@
+require 'saorin/client/base'
+require 'faraday'
+
+module Saorin
+  module Client
+    class Faraday
+      include Base
+
+      attr_reader :connection
+
+      def initialize(options = {}, &block)
+        super options
+
+        @connection = ::Faraday::Connection.new(options) do |builder|
+          builder.adapter ::Faraday.default_adapter
+          builder.response :raise_error
+          block.call builder if block
+        end
+      end
+
+      def send_request(content)
+        response = @connection.post do |req|
+          req.headers[:content_type] = CONTENT_TYPE
+          req.body = content
+        end
+        response.body
+      end
+    end
+
+    register :faraday, Faraday
+  end
+end

data/lib/saorin/registerable.rb

@@ -0,0 +1,31 @@
+require 'saorin/error'
+
+module Saorin
+  module Registerable
+    class << self
+      def included(base)
+        base.extend ClassMethods
+      end
+    end
+
+    module ClassMethods
+      attr_accessor :load_path
+
+      def adapters
+        @adapters ||= {}
+      end
+
+      def register(key, adapter)
+        adapters[key.to_s] = adapter
+      end
+
+      def guess(key)
+        key = key.to_s
+        require "#{load_path}/#{key}"
+        adapter = adapters[key]
+        raise AdapterNotFound, key unless adapter
+        adapter
+      end
+    end
+  end
+end

data/lib/saorin/server.rb

@@ -1,14 +1,16 @@
-require 'saorin/adapters/servers'
+require 'saorin/registerable'
 
 module Saorin
-  class Server
+  module Server
+    include Registerable
+    self.load_path = 'saorin/server'
+
     class << self
       def new(handler, options = {}, &block)
         adapter = options.delete(:adapter) || :rack
-        adapter_class = Saorin::Adapters::Servers.guess adapter
+        adapter_class = guess adapter
         adapter_class.new handler, options, &block
       end
-
       alias_method :start, :new
     end
   end

data/lib/saorin/server/base.rb

@@ -0,0 +1,86 @@
+require 'saorin/error'
+require 'saorin/request'
+require 'saorin/response'
+require 'saorin/server'
+
+module Saorin
+  module Server
+    module Base
+      attr_reader :handler, :allowed_methods
+
+      def initialize(handler, options = {})
+        @handler = handler
+        @allowed_methods = options[:allowed_methods] || handler.public_methods(false)
+        @allowed_methods.map! { |m| m.to_s }
+      end
+
+      def process_request(content)
+        response = begin
+                     request = parse_request content
+                     if request.is_a?(::Array)
+                       raise Saorin::InvalidRequest if request.empty?
+                       responses = request.map { |req| handle_request(req) }
+                       responses.compact!
+                       responses.empty? ? nil : responses
+                     else
+                       handle_request(request)
+                     end
+                   rescue Saorin::Error => e
+                     Response.new(:error => e)
+                   end
+
+        response && MultiJson.dump(response)
+      end
+
+      def parse_request(content)
+        MultiJson.decode content
+      rescue MultiJson::LoadError
+        raise Saorin::ParseError
+      end
+
+      def handle_request(hash)
+        begin
+          request = Request.from_hash(hash)
+          request.validate
+          dispatch_request_with_trap_notification request
+        rescue Saorin::InvalidRequest => e
+          Response.new(:error => e)
+        rescue Saorin::Error => e
+          Response.new(:error => e, :id => request.id)
+        rescue Exception => e
+          options = {:error => Saorin::InternalError.new}
+          options[:id] = request.id if request
+          Response.new(options)
+        end
+      end
+
+      def dispatch_request_with_trap_notification(request)
+        result = dispatch_request request
+        Response.new(:result => result, :id => request.id)
+      ensure
+        return nil if request.notify?
+      end
+
+      def dispatch_request(request)
+        method = request.method.to_s
+        params = request.params || []
+
+        unless @allowed_methods.include?(method) && @handler.respond_to?(method)
+          raise Saorin::MethodNotFound
+        end
+
+        begin
+          if params.is_a?(::Hash)
+            @handler.__send__ method, params
+          else
+            @handler.__send__ method, *params
+          end
+        rescue ArgumentError
+          raise Saorin::InvalidParams
+        rescue Exception => e
+          raise Saorin::ServerError, e
+        end
+      end
+    end
+  end
+end

data/lib/saorin/server/rack.rb

@@ -0,0 +1,33 @@
+require 'saorin/server/base'
+require 'rack'
+
+module Saorin
+  module Server
+    class Rack
+      include Base
+
+      DEFAULT_HEADERS = {
+        'Content-Type' => 'application/json'
+      }.freeze
+
+      def initialize(handler, options = {}, &block)
+        super handler, options
+
+        ::Rack::Server.start({
+          :app => self,
+          :Host => options[:host],
+          :Port => options[:port],
+        }.merge(options))
+      end
+
+      def call(env)
+        request = ::Rack::Request.new(env)
+        response = ::Rack::Response.new([], 200, DEFAULT_HEADERS.dup)
+        response.write process_request(request.body.read) if request.post?
+        response.finish
+      end
+    end
+
+    register :rack, Rack
+  end
+end

data/lib/saorin/version.rb

@@ -1,3 +1,3 @@
 module Saorin
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/saorin.gemspec

@@ -21,6 +21,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'rack'
-  gem.add_development_dependency 'reel'
   gem.add_development_dependency 'faraday'
 end

data/spec/{adapter → server}/base_spec.rb

@@ -1,11 +1,14 @@
 require 'spec_helper'
-require 'saorin/adapters/servers/base'
+require 'saorin/server/base'
 
-describe Saorin::Adapters::Servers::Base do
+describe Saorin::Server::Base do
   it_should_behave_like 'rpc call' do
     let(:process) do
       handler = Saorin::Test::Handler.new
-      server = Saorin::Adapters::Servers::Base.new handler
+      class VanillaServer
+        include Saorin::Server::Base
+      end
+      server = VanillaServer.new handler
       proc do |input|
         server.process_request input
       end

data/spec/{adapter/servers → server}/rack_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 require 'saorin/test'
-require 'saorin/adapters/servers/rack'
+require 'saorin/server/rack'
 
-describe Saorin::Adapters::Servers::Rack do
+describe Saorin::Server::Rack do
   include Saorin::Test
 
   let(:server_adapter) { :rack }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: saorin
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-09 00:00:00.000000000 Z
+date: 2013-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -75,22 +75,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: reel
-  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
@@ -121,30 +105,24 @@ files:
 - README.md
 - Rakefile
 - lib/saorin.rb
-- lib/saorin/adapters.rb
-- lib/saorin/adapters/clients.rb
-- lib/saorin/adapters/clients/base.rb
-- lib/saorin/adapters/clients/faraday.rb
-- lib/saorin/adapters/registerable.rb
-- lib/saorin/adapters/servers.rb
-- lib/saorin/adapters/servers/base.rb
-- lib/saorin/adapters/servers/rack.rb
-- lib/saorin/adapters/servers/reel.rb
 - lib/saorin/client.rb
+- lib/saorin/client/base.rb
+- lib/saorin/client/faraday.rb
 - lib/saorin/error.rb
+- lib/saorin/registerable.rb
 - lib/saorin/request.rb
 - lib/saorin/response.rb
 - lib/saorin/server.rb
+- lib/saorin/server/base.rb
+- lib/saorin/server/rack.rb
 - lib/saorin/test.rb
 - lib/saorin/utility.rb
 - lib/saorin/version.rb
 - saorin.gemspec
-- server.rb
-- spec/adapter/base_spec.rb
-- spec/adapter/servers/rack_spec.rb
-- spec/adapter/servers/reel_spec.rb
 - spec/request_spec.rb
 - spec/response_spec.rb
+- spec/server/base_spec.rb
+- spec/server/rack_spec.rb
 - spec/spec_helper.rb
 - spec/support/rpc_call.rb
 - spec/support/utils.rb
@@ -162,7 +140,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2145368172034945708
+      hash: 926844584898114179
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -171,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2145368172034945708
+      hash: 926844584898114179
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -179,11 +157,10 @@ signing_key:
 specification_version: 3
 summary: JSON-RPC 2.0 server and client implementation for any protocols
 test_files:
-- spec/adapter/base_spec.rb
-- spec/adapter/servers/rack_spec.rb
-- spec/adapter/servers/reel_spec.rb
 - spec/request_spec.rb
 - spec/response_spec.rb
+- spec/server/base_spec.rb
+- spec/server/rack_spec.rb
 - spec/spec_helper.rb
 - spec/support/rpc_call.rb
 - spec/support/utils.rb

data/lib/saorin/adapters.rb

@@ -1,2 +0,0 @@
-require 'saorin/adapters/servers'
-require 'saorin/adapters/clients'

data/lib/saorin/adapters/clients.rb

@@ -1,10 +0,0 @@
-require 'saorin/adapters/registerable'
-
-module Saorin
-  module Adapters
-    module Clients
-      include Registerable
-      self.load_path = 'saorin/adapters/clients'
-    end
-  end
-end

data/lib/saorin/adapters/clients/base.rb

@@ -1,94 +0,0 @@
-require 'multi_json'
-require 'saorin/request'
-require 'saorin/response'
-require 'saorin/adapters/clients'
-
-module Saorin
-  module Adapters
-    module Clients
-      class Base
-        CONTENT_TYPE = 'application/json'.freeze
-
-        def initialize(options = {})
-        end
-
-        def call(method, *args)
-          apply Saorin::Request.new(method, args, :id => seqid!)
-        end
-
-        def notify(method, *args)
-          apply Saorin::Request.new(method, args)
-        end
-
-        def apply(request)
-          response = send_request request.to_json
-          content = process_response response
-          raise content if content.is_a?(Saorin::RPCError)
-          content
-        end
-
-        protected
-
-        def send_request(content)
-          raise NotImplementedError
-        end
-
-        def process_response(content)
-          response = parse_response content
-          if response.is_a?(::Array)
-            response.map { |res| handle_response res }
-          else
-            handle_response response
-          end
-        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
-        rescue MultiJson::LoadError => e
-          raise Saorin::InvalidResponse, e.to_s
-        end
-
-        def to_content(response)
-          return nil if response.nil?
-          if response.error?
-            code, message, data = response.error.values_at('code', 'message', 'data')
-            error_class = Saorin.code_to_error code
-            raise Error, 'unknown error code' unless error_class
-            error_class.new message, :code => code, :data => data
-          else
-            response.result
-          end
-        end
-
-        def handle_response(hash)
-          return nil if hash.nil?
-          response = Response.from_hash(hash)
-          response.validate
-          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
-        end
-      end
-    end
-  end
-end

data/lib/saorin/adapters/clients/faraday.rb

@@ -1,32 +0,0 @@
-require 'saorin/adapters/clients/base'
-require 'faraday'
-
-module Saorin
-  module Adapters
-    module Clients
-      class Faraday < Base
-        attr_reader :connection
-
-        def initialize(options = {}, &block)
-          super options
-
-          @connection = ::Faraday::Connection.new(options) do |builder|
-            builder.adapter ::Faraday.default_adapter
-            builder.response :raise_error
-            block.call builder if block
-          end
-        end
-
-        def send_request(content)
-          response = @connection.post do |req|
-            req.headers[:content_type] = CONTENT_TYPE
-            req.body = content
-          end
-          response.body
-        end
-      end
-
-      register :faraday, Faraday
-    end
-  end
-end

data/lib/saorin/adapters/registerable.rb

@@ -1,33 +0,0 @@
-require 'saorin/error'
-
-module Saorin
-  module Adapters
-    module Registerable
-      class << self
-        def included(base)
-          base.extend ClassMethods
-        end
-      end
-
-      module ClassMethods
-        attr_accessor :load_path
-
-        def adapters
-          @adapters ||= {}
-        end
-
-        def register(key, adapter)
-          adapters[key.to_s] = adapter
-        end
-
-        def guess(key)
-          key = key.to_s
-          require "#{load_path}/#{key}"
-          adapter = adapters[key]
-          raise AdapterNotFound, key unless adapter
-          adapter
-        end
-      end
-    end
-  end
-end

data/lib/saorin/adapters/servers.rb

@@ -1,10 +0,0 @@
-require 'saorin/adapters/registerable'
-
-module Saorin
-  module Adapters
-    module Servers
-      include Registerable
-      self.load_path = 'saorin/adapters/servers'
-    end
-  end
-end

data/lib/saorin/adapters/servers/base.rb

@@ -1,88 +0,0 @@
-require 'saorin/error'
-require 'saorin/request'
-require 'saorin/response'
-require 'saorin/adapters/servers'
-
-module Saorin
-  module Adapters
-    module Servers
-      class Base
-        attr_reader :handler, :allowed_methods
-
-        def initialize(handler, options = {})
-          @handler = handler
-          @allowed_methods = options[:allowed_methods] || handler.public_methods(false)
-          @allowed_methods.map! { |m| m.to_s }
-        end
-
-        def process_request(content)
-          response = begin
-                       request = parse_request content
-                       if request.is_a?(::Array)
-                         raise Saorin::InvalidRequest if request.empty?
-                         responses = request.map { |req| handle_request(req) }
-                         responses.compact!
-                         responses.empty? ? nil : responses
-                       else
-                         handle_request(request)
-                       end
-                     rescue Saorin::Error => e
-                       Response.new(:error => e)
-                     end
-
-          response && MultiJson.dump(response)
-        end
-
-        def parse_request(content)
-          MultiJson.decode content
-        rescue MultiJson::LoadError
-          raise Saorin::ParseError
-        end
-
-        def handle_request(hash)
-          begin
-            request = Request.from_hash(hash)
-            request.validate
-            dispatch_request_with_trap_notification request
-          rescue Saorin::InvalidRequest => e
-            Response.new(:error => e)
-          rescue Saorin::Error => e
-            Response.new(:error => e, :id => request.id)
-          rescue Exception => e
-            options = {:error => Saorin::InternalError.new}
-            options[:id] = request.id if request
-            Response.new(options)
-          end
-        end
-
-        def dispatch_request_with_trap_notification(request)
-          result = dispatch_request request
-          Response.new(:result => result, :id => request.id)
-        ensure
-          return nil if request.notify?
-        end
-
-        def dispatch_request(request)
-          method = request.method.to_s
-          params = request.params || []
-
-          unless @allowed_methods.include?(method) && @handler.respond_to?(method)
-            raise Saorin::MethodNotFound
-          end
-
-          begin
-            if params.is_a?(::Hash)
-              @handler.__send__ method, params
-            else
-              @handler.__send__ method, *params
-            end
-          rescue ArgumentError
-            raise Saorin::InvalidParams
-          rescue Exception => e
-            raise Saorin::ServerError, e
-          end
-        end
-      end
-    end
-  end
-end

data/lib/saorin/adapters/servers/rack.rb

@@ -1,33 +0,0 @@
-require 'saorin/adapters/servers/base'
-require 'rack'
-
-module Saorin
-  module Adapters
-    module Servers
-      class Rack < Base
-        DEFAULT_HEADERS = {
-          'Content-Type' => 'application/json'
-        }.freeze
-
-        def initialize(handler, options = {}, &block)
-          super handler, options
-
-          ::Rack::Server.start({
-            :app => self,
-            :Host => options[:host],
-            :Port => options[:port],
-          }.merge(options))
-        end
-
-        def call(env)
-          request = ::Rack::Request.new(env)
-          response = ::Rack::Response.new([], 200, DEFAULT_HEADERS.dup)
-          response.write process_request(request.body.read) if request.post?
-          response.finish
-        end
-      end
-
-      register :rack, Rack
-    end
-  end
-end

data/lib/saorin/adapters/servers/reel.rb

@@ -1,37 +0,0 @@
-require 'saorin/adapters/servers/base'
-require 'reel'
-
-module Saorin
-  module Adapters
-    module Servers
-      class Reel < Base
-        DEFAULT_HEADERS = {
-          'Content-Type' => 'application/json'
-        }.freeze
-
-        attr_reader :server
-
-        def initialize(handler, options = {}, &block)
-          super handler, options
-
-          @server = ::Reel::Server.supervise(options[:host], options[:port], &method(:process))
-          trap(:INT) { @server.terminate; exit }
-          sleep unless options[:nonblock]
-        end
-
-        def process(connection)
-          while request = connection.request
-            case request
-            when ::Reel::Request
-              response_body = process_request(request.body) if request.method.to_s.upcase == 'POST'
-              response_body ||= ''
-              request.respond :ok, DEFAULT_HEADERS.dup, response_body
-            end
-          end
-        end
-      end
-
-      register :reel, Reel
-    end
-  end
-end

data/server.rb

@@ -1,13 +0,0 @@
-#!/usr/bin/env ruby
-# -*- encoding: utf-8 -*-
-require 'saorin'
-
-class Handler
-  def log(tag, time, record)
-    p [tag, time, record]
-    nil
-  end
-end
-
-Saorin::Server.start Handler.new, :host => 'localhost', :port => 25252, :adapter => :reel
-

data/spec/adapter/servers/reel_spec.rb

@@ -1,11 +0,0 @@
-require 'spec_helper'
-require 'saorin/test'
-require 'saorin/adapters/servers/reel'
-
-describe Saorin::Adapters::Servers::Reel do
-  include Saorin::Test
-
-  let(:server_adapter) { :reel }
-  include_context 'setup rpc server client'
-  it_should_behave_like 'rpc server client'
-end