wrest 0.0.9 → 0.1.0

data/lib/wrest/http_shared.rb

@@ -0,0 +1,24 @@
+# Copyright 2009 Sidu Ponnappa
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at native://www.apache.org/licenses/LICENSE-2.0
+# Unless required by applicable law or agreed to in writing, software distributed under the License
+# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and limitations under the License.
+
+module Wrest #:nodoc:
+  
+  # Contains functionality the is independent of
+  # the underlying HTTP libs
+  module HttpShared
+  end
+end
+
+require "#{Wrest::Root}/wrest/http_shared/headers"
+require "#{Wrest::Root}/wrest/http_shared/standard_headers"
+require "#{Wrest::Root}/wrest/http_shared/standard_tokens"
+
+# Set up a shorter convenience API for constants
+Wrest::H = Wrest::HttpShared::StandardHeaders
+Wrest::T = Wrest::HttpShared::StandardTokens

data/lib/wrest/native/connection_factory.rb

@@ -0,0 +1,23 @@
+# Copyright 2009 Sidu Ponnappa
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+# Unless required by applicable law or agreed to in writing, software distributed under the License
+# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and limitations under the License.
+
+module Wrest::Native
+  module ConnectionFactory
+    def create_connection(timeout = 60)
+      timeout ||= 60
+      connection = Net::HTTP.new(self.host, self.port)
+      connection.read_timeout = timeout
+      if self.https?
+        connection.use_ssl     = true
+        connection.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      end
+      connection
+    end
+  end
+end

data/lib/wrest/{http → native}/delete.rb

@@ -7,7 +7,7 @@
 # is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and limitations under the License.
 
-module Wrest::Http
+module Wrest::Native
   class Delete < Request
     def initialize(wrest_uri, parameters = {}, headers = {}, options = {})
       super(

data/lib/wrest/{http → native}/get.rb

@@ -7,7 +7,7 @@
 # is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and limitations under the License.
 
-module Wrest::Http
+module Wrest::Native
   class Get < Request
     def initialize(wrest_uri, parameters = {}, headers = {}, options = {})
       follow_redirects = options[:follow_redirects]

data/lib/wrest/{http → native}/options.rb

@@ -7,7 +7,7 @@
 # is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and limitations under the License.
 
-module Wrest::Http
+module Wrest::Native
   class Options < Request
     def initialize(wrest_uri, options = {})
       super(

data/lib/wrest/{http → native}/post.rb

@@ -7,7 +7,7 @@
 # is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and limitations under the License.
 
-module Wrest::Http
+module Wrest::Native
   class Post < Request
     def initialize(wrest_uri, body = '', headers = {}, parameters = {}, options = {})
       super(

data/lib/wrest/{http → native}/put.rb

@@ -7,7 +7,7 @@
 # is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and limitations under the License.
 
-module Wrest::Http
+module Wrest::Native
   class Put < Request
     def initialize(wrest_uri, body = '', headers = {}, parameters = {}, options = {})
       super(

data/lib/wrest/{http → native}/redirection.rb

@@ -8,9 +8,12 @@
 # See the License for the specific language governing permissions and limitations under the License. 
 
 module Wrest #:nodoc:
-  module Http #:nodoc:
+  module Native #:nodoc:
     # Constructed by Wrest::Response.new if the HTTP response code is 3xx 
     # (http://en.wikipedia.org/wiki/300_Multiple_Choices#3xx_Redirection)
+    # 
+    # This class is necessary because Net::HTTP doesn't seem to support
+    # redirection natively.
     class Redirection < Response
       
       # A get is invoked on the url stored in the response headers

data/lib/wrest/{http → native}/request.rb

@@ -7,13 +7,13 @@
 # is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and limitations under the License.
 
-module Wrest::Http
+module Wrest::Native
   # This represents a HTTP request. Typically you will never need to instantiate
   # one of these yourself - you can use one of the more conveient APIs via Wrest::Uri
   # or Wrest::Http::Get etc. instead.
   class Request
-    attr_reader :http_request, :uri, :body, :headers, :username, :password, :follow_redirects, 
-                :follow_redirects_limit, :follow_redirects_count, :timeout
+    attr_reader :http_request, :uri, :body, :headers, :username, :password, :follow_redirects,
+                :follow_redirects_limit, :follow_redirects_count, :timeout, :connection, :parameters
     # Valid tuples for the options are:
     # :username => String, defaults to nil
     # :password => String, defaults to nil
@@ -28,10 +28,13 @@ module Wrest::Http
     #                             until the follow_redirects_limit is hit. You should never set
     #                             this option yourself.
     # :timeout => The period, in seconds, after which a Timeout::Error is raised 
-    #             in the event of a connection failing to open. Defaults to 60.
+    #             in the event of a connection failing to open. Defaulted to 60 by Uri#create_connection.
+    # :connection => The HTTP Connection object to use. This is how a keep-alive connection can be
+    #             used for multiple requests.
     def initialize(wrest_uri, http_request_klass, parameters = {}, body = nil, headers = {}, options = {})
       @uri = wrest_uri
       @headers = headers.stringify_keys
+      @parameters = parameters
       @http_request = http_request_klass.new(parameters.empty? ? wrest_uri.full_path : "#{wrest_uri.full_path}?#{parameters.to_query}", @headers)
       @body = body
       @options = options.clone
@@ -40,33 +43,42 @@ module Wrest::Http
       @follow_redirects = (@options[:follow_redirects] ||= false)
       @follow_redirects_count = (@options[:follow_redirects_count] ||= 0)
       @follow_redirects_limit = (@options[:follow_redirects_limit] ||= 5)
-      @timeout = (@options[:timeout] ||= 60)
+      @timeout = @options[:timeout]
+      @connection = @options[:connection]
     end
 
-    # Makes a request and returns a Wrest::Http::Response. 
+    # Makes a request and returns a Wrest::Native::Response. 
     # Data about the request is and logged to Wrest.logger
+    # The log entry contains the following information:
+    #
+    # --> indicates a request
+    # <-- indicates a response
+    #
+    # The type of request is mentioned in caps, followed by a hash 
+    # uniquely uniquely identifying a particular request/response pair.
+    # In a multi-process or multi-threaded scenario, this can be used
+    # to identify request-response pairs.
+    #
+    # The request hash is followed by a connection hash; requests using the
+    # same connection (effectively a keep-alive connection) will have the 
+    # same connection hash.
+    #
+    # This is followed by the response code, the payload size and the time taken.
     def invoke
       response = nil
-
-      prefix = "#{http_request.method} #{http_request.hash}"
-      http_connection = create_connection(timeout)
+      
+      @connection ||= @uri.create_connection(timeout)
       http_request.basic_auth username, password      
 
+      prefix = "#{http_request.method} #{http_request.hash} #{@connection.hash}"
+      
       Wrest.logger.debug "--> (#{prefix}) #{@uri.protocol}://#{@uri.host}:#{@uri.port}#{@http_request.path}"
-      time = Benchmark.realtime { response = Wrest::Http::Response.new( http_connection.request(@http_request, @body) ) }
+      time = Benchmark.realtime { response = Wrest::Native::Response.new( @connection.request(@http_request, @body) ) }
       Wrest.logger.debug "<-- (#{prefix}) %d %s (%d bytes %.2fs)" % [response.code, response.message, response.body ? response.body.length : 0, time]
 
       @follow_redirects ? response.follow(@options) : response
-    end
-
-    def create_connection(timeout)
-      connection = Net::HTTP.new(@uri.host, @uri.port)
-      connection.read_timeout = timeout
-      if @uri.https?
-        connection.use_ssl     = true
-        connection.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      end
-      connection
+    rescue Timeout::Error => e
+      raise Wrest::Exceptions::Timeout.new(e)
     end
   end
 end

data/lib/wrest/{http → native}/response.rb

@@ -8,10 +8,10 @@
 # See the License for the specific language governing permissions and limitations under the License. 
 
 module Wrest #:nodoc:
-  module Http #:nodoc:
+  module Native #:nodoc:
     # Decorates a response providing support for deserialisation.
     #
-    # The following methods are also available (unlisted by rdoc because they're forwarded):
+    # The following methods are also available (unlisted by rdoc because they're forwarded to Net::HTTP::Response):
     #
     # <tt>:@Http_response,  :code, :message, :body, :Http_version,
     # :[], :content_length, :content_type, :each_header, :each_name, :each_value, :fetch,
@@ -19,15 +19,19 @@ module Wrest #:nodoc:
     #
     # They behave exactly like their Net::HttpResponse equivalents.
     class Response
+      attr_reader :http_response
+      
       extend Forwardable
       def_delegators  :@http_response,  :code, :message, :body, :Http_version,
               :[], :content_length, :content_type, :each_header, :each_name, :each_value, :fetch,
               :get_fields, :key?, :type_params
 
       # We're overriding :new to act as a factory so 
-      # we can build the appropriate Response instance
+      # we can build the appropriate Response instance based
+      # on th response code.
       def self.new(http_response)
-        instance = ((300..399).include?(http_response.code.to_i) ? Wrest::Http::Redirection : self).allocate
+        code = http_response.code.to_i
+        instance = ((300..303).include?(code) || (305..399).include?(code)  ? Wrest::Native::Redirection : self).allocate
         instance.send :initialize, http_response
         instance
       end
@@ -56,6 +60,10 @@ module Wrest #:nodoc:
       def follow(redirect_request_options = {})
         self
       end
+      
+      def connection_closed?
+        self[Native::StandardHeaders::Connection].downcase == Native::StandardTokens::Close.downcase
+      end
     end
   end
 end

data/lib/wrest/native/session.rb

@@ -0,0 +1,57 @@
+# Copyright 2009 Sidu Ponnappa
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+# Unless required by applicable law or agreed to in writing, software distributed under the License
+# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and limitations under the License.
+
+module Wrest::Native
+  # This class is a wrapper for a keep-alive HTTP connection. It simply passes the
+  # same connection instance as an option to all Wrest::Http::Request instances created using it.
+  #
+  # If at any point the server closes an existing connection during a Session by returning a
+  # Connection: Close header the current connection is destroyed and a fresh one created for the next
+  # request.
+  #
+  # The Session constructor can accept either a String URI or a Wrest::Uri as a parameter. If you
+  # need HTTP authentication, you should use a Wrest::Uri.
+  class Session
+    attr_reader :uri
+    def initialize(uri)
+      @uri = uri.is_a?(String) ? uri.to_uri : uri
+      @default_headers = { Wrest::Native::StandardHeaders::Connection => Wrest::Native::StandardTokens::KeepAlive }
+
+      yield(self) if block_given?
+    end
+
+    def connection
+      @connection ||= @uri.create_connection
+    end
+
+    def get(path = '', parameters = {}, headers = {})
+      maybe_destroy_connection @uri[path, {:connection => self.connection}].get(parameters, headers.merge(@default_headers))
+    end
+
+    def post(path = '', body = '', headers = {}, params = {})
+      maybe_destroy_connection @uri[path, {:connection => self.connection}].post(body, headers.merge(@default_headers), params)
+    end
+    
+    def put(path = '', body = '', headers = {}, params = {})
+      maybe_destroy_connection @uri[path, {:connection => self.connection}].put(body, headers.merge(@default_headers), params)
+    end
+
+    def delete(path = '', parameters = {}, headers = {})
+      maybe_destroy_connection @uri[path, {:connection => self.connection}].delete(parameters, headers.merge(@default_headers))
+    end
+    
+    def maybe_destroy_connection(response)
+      if response.connection_closed?
+        Wrest.logger.warn "Connection #{@connection.hash} has been closed by the server"
+        @connection = nil 
+      end
+      response
+    end
+  end
+end

data/lib/wrest/native.rb

@@ -0,0 +1,32 @@
+# Copyright 2009 Sidu Ponnappa
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at native://www.apache.org/licenses/LICENSE-2.0
+# Unless required by applicable law or agreed to in writing, software distributed under the License
+# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and limitations under the License.
+
+module Wrest #:nodoc:
+
+  # Contains all native protocol related classes such as
+  # Get, Post, Request, Response etc. and uses the native
+  # Ruby Net::native libraries.
+  module Native
+    include Wrest::HttpShared
+  end
+end
+
+require "#{Wrest::Root}/wrest/native/connection_factory"
+require "#{Wrest::Root}/wrest/native/response"
+require "#{Wrest::Root}/wrest/native/redirection"
+require "#{Wrest::Root}/wrest/native/request"
+require "#{Wrest::Root}/wrest/native/get"
+require "#{Wrest::Root}/wrest/native/put"
+require "#{Wrest::Root}/wrest/native/post"
+require "#{Wrest::Root}/wrest/native/delete"
+require "#{Wrest::Root}/wrest/native/options"
+require "#{Wrest::Root}/wrest/native/session"
+
+# default to using Native libs
+Wrest::Http = Wrest::Native

data/lib/wrest/resource/base.rb

@@ -11,7 +11,7 @@ module Wrest::Resource #:nodoc:
   # Resource::Base is the equivalent of ActiveResource::Base.
   # It is a REST client targetted at Rails REST apps.
   class Base
-    include Wrest::Components::AttributesContainer
+    include Wrest::Components::Container
 
     always_has      :id
     typecast        :id => as_integer

data/lib/wrest/resource.rb

@@ -15,4 +15,4 @@ module Wrest
   end
 end
 
-require "#{WREST_ROOT}/wrest/resource/base"
+require "#{Wrest::Root}/wrest/resource/base"

data/lib/wrest/test/request_patches.rb

@@ -0,0 +1,5 @@
+class Wrest::Native::Request
+  def invoke
+    raise Wrest::Exceptions::RealRequestMadeInTestEnvironmet, 'A real HTTP request was made while running tests. Please avoid using live HTTP connections while testing and replace them with mocks.'
+  end
+end

data/lib/wrest/test.rb

@@ -0,0 +1 @@
+require "#{Wrest::Root}/wrest/test/request_patches"

data/lib/wrest/uri.rb

@@ -22,14 +22,13 @@ module Wrest #:nodoc:
   #
   # You can find examples that use real APIs (like delicious) under the wrest/examples directory.
   class Uri
-    attr_reader :uri, :username, :password
-    
+    attr_reader :uri, :username, :password, :uri_string
+        
     # See Wrest::Http::Request for the available options and their default values.
     def initialize(uri_string, options = {})
       @options = options
       @uri_string = uri_string.clone
       @uri = URI.parse(uri_string)
-      @options = options
       @username = (@options[:username] ||= @uri.user)
       @password = (@options[:password] ||= @uri.password)
     end
@@ -53,6 +52,12 @@ module Wrest #:nodoc:
       Uri.new(@uri_string+path, options || @options)
     end
     
+    # Clones a Uri, building a new instance with exactly the same uri string.
+    # You can however change the Uri options or add new ones.
+    def clone(opts = {})
+      Uri.new(@uri_string, @options.merge(opts))
+    end
+
     def eql?(other)
       self == other
     end
@@ -66,6 +71,13 @@ module Wrest #:nodoc:
       @uri.hash + @username.hash + @password.hash + 20090423
     end
     
+    # This produces exactly the same string as the Wrest::Uri was constructed with.
+    # If the orignial URI contained a HTTP username and password, that too will
+    # show up, so be careful if using this for logging.
+    def to_s
+      uri_string
+    end
+    
     # Make a GET request to this URI. This is a convenience API
     # that creates a Wrest::Http::Get, executes it and returns a Wrest::Http::Response.
     #
@@ -84,11 +96,25 @@ module Wrest #:nodoc:
 
     # Makes a POST request to this URI. This is a convenience API
     # that creates a Wrest::Http::Post, executes it and returns a Wrest::Http::Response.
+    # Note that sending an empty body will blow up if you're using libcurl.
     #
     # Remember to escape all parameter strings if necessary, using URI.escape
     def post(body = '', headers = {}, parameters = {})
       Http::Post.new(self, body.to_s, headers, parameters, @options).invoke
     end
+    
+    # Makes a POST request to this URI. This is a convenience API
+    # that mimics a form being posted; some allegly RESTful APIs like FCBK
+    # require this to be used.
+    #
+    # Form encoding involves munging the parameters into a string and placing them
+    # in the body, as well as setting the Content-Type header to
+    # application/x-www-form-urlencoded
+    def post_form(parameters = {}, headers = {})
+      headers = headers.merge(Wrest::H::ContentType => Wrest::T::FormEncoded)
+      body = parameters.to_query
+      Http::Post.new(self, body, headers, {}, @options).invoke
+    end
 
     # Makes a DELETE request to this URI. This is a convenience API
     # that creates a Wrest::Http::Delete, executes it and returns a Wrest::Http::Response.
@@ -128,5 +154,7 @@ module Wrest #:nodoc:
     def port
       uri.port
     end
+    
+    include Http::ConnectionFactory
   end
 end

data/lib/wrest/version.rb

@@ -11,8 +11,8 @@ module Wrest
   module VERSION
     unless defined? MAJOR
       MAJOR  = 0
-      MINOR  = 0
-      TINY   = 9
+      MINOR  = 1
+      TINY   = 0
 
       STRING = [MAJOR, MINOR, TINY].join('.')
 

data/lib/wrest.rb

@@ -1,13 +1,13 @@
 # Copyright 2009 Sidu Ponnappa
-# Licensed under the Apache License, Version 2.0 (the "License"); 
-# you may not use this file except in compliance with the License. 
-# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 
-# Unless required by applicable law or agreed to in writing, software distributed under the License 
-# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-# See the License for the specific language governing permissions and limitations under the License. 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+# Unless required by applicable law or agreed to in writing, software distributed under the License
+# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and limitations under the License.
 
 require 'rubygems'
-gem 'activesupport', '>= 2.3.2'
+gem 'activesupport', '>= 2.3.5'
 
 require 'net/http'
 require 'net/https'
@@ -19,16 +19,25 @@ require 'logger'
 require 'benchmark'
 require 'active_support'
 
-WREST_ROOT = File.dirname(__FILE__)
 
 module Wrest  #:nodoc:
+  Root = File.dirname(__FILE__)
   def self.logger=(logger)
     @logger = logger
   end
-  
+
   def self.logger
     @logger
   end
+
+  def self.use_native
+    silence_warnings{ Wrest.const_set('Http', Wrest::Native) }
+  end
+
+  def self.use_curl
+    require "#{Wrest::Root}/wrest/curl"
+    silence_warnings{ Wrest.const_set('Http', Wrest::Curl) }
+  end
 end
 
 Wrest.logger = ActiveSupport::BufferedLogger.new(STDOUT)
@@ -38,13 +47,40 @@ begin
   gem 'libxml-ruby', '>= 1.1.3'
   ActiveSupport::XmlMini.backend='LibXML'
 rescue Gem::LoadError
-  Wrest.logger.warn "LibXML >= 1.1.3 not found, falling back to #{ActiveSupport::XmlMini.backend}. To install LibXML run `sudo gem install ruby-libxml`"
+  Wrest.logger.debug "Warning: LibXML >= 1.1.3 not found, attempting to use Nokogiri. To install LibXML run `(sudo) gem install libxml-ruby` (libxml-ruby is not available on JRuby)"
+  begin
+    gem 'nokogiri', '>= 1.3.3'
+    ActiveSupport::XmlMini.backend='Nokogiri'
+  rescue Gem::LoadError
+    Wrest.logger.debug "Warning: Nokogiri >= 1.3.3 not found, falling back to #{ActiveSupport::XmlMini.backend} (which is probably significantly slower). To install Nokogiri run `(sudo) (jruby -S) gem install nokogiri`"
+    if RUBY_PLATFORM =~ /java/
+      begin
+        gem 'jrexml', '>= 0.5.3'
+        require 'jrexml'
+        Wrest.logger.debug "Detected JRuby, JREXML loaded."
+      rescue Gem::LoadError
+        Wrest.logger.debug "Warning: Detected JRuby, but failed to load JREXML. JREXML offers *some* performance improvement when using REXML on JRuby. To install JREXML run `(sudo) jruby -S gem install jrexml`"
+      end
+    end
+  end
 end
 
-source_dirs = ["/wrest/core_ext/*.rb", "/wrest/*.rb"]
+Dir["#{File.expand_path(File.dirname(__FILE__))}/wrest/core_ext/*.rb"].each { |file| require file }
+
+# Load Wrest Core
+require "#{Wrest::Root}/wrest/http_shared"
+require "#{Wrest::Root}/wrest/native"
+
+# Load Wrest Wrappers
+require "#{Wrest::Root}/wrest/uri"
+require "#{Wrest::Root}/wrest/uri_template"
+require "#{Wrest::Root}/wrest/version"
+require "#{Wrest::Root}/wrest/exceptions"
+require "#{Wrest::Root}/wrest/components"
+
+# Load Wrest::Resource
+require "#{Wrest::Root}/wrest/resource"
 
-source_dirs.each{|directory|
-  Dir["#{File.expand_path(File.dirname(__FILE__) + directory)}"].each { |file|
-    require file
-  }
-}
+# if (ENV['RAILS_ENV'] == 'test' || (Kernel.const_defined?(:RAILS_ENV) && (RAILS_ENV == 'test')))
+#   require "#{Wrest::Root}/wrest/test"
+# end

data/spec/unit/spec_helper.rb

@@ -1,4 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + "/../../lib/wrest")
+require "#{Wrest::Root}/wrest/curl" unless RUBY_PLATFORM =~ /java/
 require 'spec'
 
 ['/../custom_matchers/**/*.rb'].each{|directory|
@@ -7,7 +8,7 @@ require 'spec'
   }
 }
 
-Wrest.logger = Logger.new(File.open("#{WREST_ROOT}/../log/test.log", 'a'))
+Wrest.logger = Logger.new(File.open("#{Wrest::Root}/../log/test.log", 'a'))
 
 def p(*args)
  # super *(args << caller[0])
@@ -17,10 +18,18 @@ end
 
 def puts(*args)
  # super *(args << caller[0])
- super *(args << '<br/>')
+ super *(['<pre>'] + args + ['</pre>'])
  # super *args
 end
 
 Spec::Runner.configure do |config|
   config.include(CustomMatchers)
-end
+end
+
+def build_ok_response(body = '')
+  returning mock(Net::HTTPOK) do |response|
+    response.stub!(:code).and_return('200')
+    response.stub!(:message).and_return('OK')
+    response.stub!(:body).and_return(body)
+  end
+end

data/spec/unit/wrest/components/attributes_container/alias_accessors_spec.rb

@@ -1,11 +1,11 @@
 require File.dirname(__FILE__) + '/../../../spec_helper'
 
 module Wrest::Components
-  describe AttributesContainer::AliasAccessors do
+  describe Container::AliasAccessors do
     before :each do
       @Demon = Class.new
       @Demon.class_eval do
-        include Wrest::Components::AttributesContainer
+        include Wrest::Components::Container
       end
     end
 

data/spec/unit/wrest/components/attributes_container/typecaster_spec.rb

@@ -1,12 +1,12 @@
 require File.dirname(__FILE__) + '/../../../spec_helper'
 
 module Wrest::Components
-  describe AttributesContainer::Typecaster do
+  describe Container::Typecaster do
     before :each do
       @Demon = Class.new
       @Demon.class_eval do
-        include Wrest::Components::AttributesContainer
-        include Wrest::Components::AttributesContainer::Typecaster
+        include Wrest::Components::Container
+        include Wrest::Components::Container::Typecaster
       end
     end
 
@@ -25,7 +25,7 @@ module Wrest::Components
 
       it "hash should not typecast" do
         class TestUser
-          include Wrest::Components::AttributesContainer
+          include Wrest::Components::Container
         end
 
         @Demon.class_eval{ typecast :user => lambda{|user| TestUser.new(user)}}
@@ -58,8 +58,8 @@ module Wrest::Components
       before :each do
         @Sidhe = Class.new
         @Sidhe.class_eval do
-          include Wrest::Components::AttributesContainer
-          include Wrest::Components::AttributesContainer::Typecaster
+          include Wrest::Components::Container
+          include Wrest::Components::Container::Typecaster
 
           typecast :age => as_integer
         end