replaced delegation with forwardable

unders · Jun 9, 2011 · 44fa937 · 44fa937
1 parent 07560b2
commit 44fa937
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 36 deletions.
diff --git a/lib/resto/extra/delegation.rb b/lib/resto/extra/delegation.rb
diff --git a/lib/resto/request/base.rb b/lib/resto/request/base.rb
@@ -1,23 +1,23 @@
 # encoding: utf-8
 
-require 'resto/extra/delegation'
+require 'forwardable'
+require 'resto/extra/copy'
 require 'resto/request/uri'
 require 'resto/request/header'
 require 'resto/request/option'
 require 'resto/request/factory'
 require 'resto/translator/request_factory'
-require 'resto/extra/copy'
 
 module Resto
   module Request
     class Base
-      extend  Resto::Extra::Delegation
+      extend Forwardable
       include Resto::Request::Header
       include Resto::Request::Uri
       include Resto::Request::Option
 
-      delegate   :head, :head!, :get, :get!, :post, :post!,
-                :put, :put!, :delete, :delete!, :to => :@request
+      def_delegators :@request, :head, :head!, :get, :get!, :post, :post!,
+                :put, :put!, :delete, :delete!
 
       def initialize(request=Resto::Request::Factory)
         @request_klass = request

diff --git a/lib/resto/request/factory.rb b/lib/resto/request/factory.rb
@@ -1,16 +1,16 @@
 # encoding: utf-8
 
 require 'net/https'
-require 'resto/extra/delegation'
+require 'forwardable'
 
 module Resto
   module Request
     class Factory
-      extend Resto::Extra::Delegation
+      extend Forwardable
 
-      delegate :read_host, :read_port, :options, :read_body, :composed_path,
-        :composed_headers, :scheme, :use_ssl, :current_formatter,
-        :to => :@request
+      def_delegators :@request, :read_host, :read_port, :options, :read_body,
+                     :composed_path, :composed_headers, :scheme, :use_ssl,
+                     :current_formatter
 
       def initialize(request)
         @request = request