wrest 1.0.0.beta6-universal-java-1.6 → 1.0.0-universal-java-1.6

data/CHANGELOG

@@ -17,6 +17,15 @@ Features under a numbered section are complete and available in the Wrest gem.
  * Ensure Components::Container is ActiveModel compliant
 
 == Current
+ * GH#56 Detailed Net::HTTP debug output option added to Wrest::Native:Request.
+ * GH#60 Wrest debug log arrow direction changed to be consistent with Net::HTPP debug log
+ * GH#59 follow_redirects_limit is off by one
+ * GH#24 Add support for xpath based filtering of xml response bodies to the response chain
+ * GH#46 Response.deserialise for Json responses
+ * GH#52 Wrest console (bin/wrest) fails on 1.9.2
+
+== 1.0.0.beta7
+ * GH#46 Response.deserialise for Json responses
 
 == 1.0.0.beta6
  * GH#35 Wrest::UriTemplate extensions swallow existing path

data/README.rdoc

@@ -1,4 +1,4 @@
-= Wrest 1.0.0.beta5
+= Wrest 1.0.0
 
 (c) Copyright 2009-2010 {Sidu Ponnappa}[http://blog.sidu.in]. All Rights Reserved.
 
@@ -34,6 +34,17 @@ For Facebook, Twitter, Delicious, GitHub and other API examples, see http://gith
     'http://google.com'.to_uri(:follow_redirects => false).get
   
     'http://google.com'.to_uri(:follow_redirects_limit => 1).get
+
+  :follow_redirects_limit defaults to 5 if not specified.
+
+* Deserialise with XPath filtering
+  
+    ActiveSupport::XmlMini.backend = 'REXML'
+    
+    'http://twitter.com/statuses/public_timeline.xml'.to_uri.get.deserialise(
+                                                  :xpath => '//user/name/text()'
+                                                )
+
 * More complex request with parameters and a custom deserialiser
   
     'http://search.yahooapis.com/NewsSearchService/V1/newsSearch'.to_uri.get(
@@ -135,7 +146,7 @@ Features that are planned, in progress or already implemented are documented in
 
 The source is available at git://github.com/kaiwren/wrest.git
 
-To install the Wrest gem, do <tt>(sudo) gem install wrest --pre</tt>.
+To install the Wrest gem, do <tt>(sudo) gem install wrest</tt>.
 
 Wrest is currently available as a gem for for Ruby and JRuby.
 
@@ -144,7 +155,21 @@ Wrest is currently available as a gem for for Ruby and JRuby.
 You can launch the interactive Wrest shell by running bin/wrest if you have the source or invoking <tt>wrest</tt> from your prompt if you've installed the gem.
   $ wrest
   >> y 'http://twitter.com/statuses/public_timeline.json'.to_uri(:timeout => 5).get.deserialise
-  
+
+=== Testing
+
+Start the Sinatra test server for functional test.
+  rake -f spec/sample_app/Rakefile  
+
+Run the tests in a different terminal:
+
+  # Run the normal test suite.
+  rake
+
+  # Runs the functional test suite.
+  rake rspec:functional
+
+
 == Contributors
  
 * Sidu Ponnappa : {kaiwren}[http://github.com/kaiwren]
@@ -153,4 +178,6 @@ You can launch the interactive Wrest shell by running bin/wrest if you have the
 * Srushti : {srushti}[http://github.com/srushti]
 * Preethi Ramdev : {preethiramdev}[http://github.com/preethiramdev]
 * Nikhil Vallishayee : {nikhilvallishayee}[http://github.com/nikhilvallishayee]
-* Jacques Crocker : {railsjedi}[http://github.com/railsjedi]
+* Jacques Crocker : {railsjedi}[http://github.com/railsjedi]
+* Jasim A Basheer: {jasim}[http://github.com/jasim]
+

data/bin/wrest_shell.rb

@@ -1,7 +1,7 @@
 puts "Ruby #{RUBY_VERSION}, #{RUBY_RELEASE_DATE}, #{RUBY_PLATFORM}"
 
-entry_point = "#{File.dirname(__FILE__)}/../lib/wrest.rb"
-version = "#{File.dirname(__FILE__)}/../lib/wrest/version"
+entry_point = File.expand_path "#{File.dirname(__FILE__)}/../lib/wrest.rb"
+version = File.expand_path "#{File.dirname(__FILE__)}/../lib/wrest/version.rb"
 
 irb = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
 

data/lib/wrest.rb

@@ -83,6 +83,9 @@ ActiveSupport::JSON.backend = "JSONGem"
 
 require "#{Wrest::Root}/wrest/core_ext/string"
 
+# Load XmlMini Extensions
+require "#{Wrest::Root}/wrest/xml_mini"
+
 # Load Wrest Core
 require "#{Wrest::Root}/wrest/version"
 require "#{Wrest::Root}/wrest/http_shared"

data/lib/wrest/components/translators/json.rb

@@ -13,7 +13,7 @@ module Wrest
     module Translators::Json
       extend self
 
-      def deserialise(response)
+      def deserialise(response,options = {})
         ActiveSupport::JSON.decode(response.body)
       end
 

data/lib/wrest/components/translators/xml.rb

@@ -6,18 +6,6 @@
 # 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 'jruby'
-# include Java
-# 
-# java_import javax.xml.parsers.DocumentBuilder
-# java_import javax.xml.parsers.DocumentBuilderFactory
-# java_import java.io.StringReader
-# java_import org.xml.sax.InputSource
-# java_import javax.xml.xpath.XPath
-# java_import javax.xml.xpath.XPathFactory
-# java_import javax.xml.xpath.XPathConstants
-# java_import javax.xml.xpath.XPathExpression
-# #java_import Java::org.jdom.input.SAXBuilder
 module Wrest
   module Components::Translators
     module Xml
@@ -25,7 +13,7 @@ module Wrest
 
       def deserialise(response,options={})
         if(!options[:xpath].nil?)
-          Hash.from_xml(filter(response,options[:xpath]))
+          ActiveSupport::XmlMini.filter(response.body,options[:xpath])
         else
           Hash.from_xml(response.body)
         end
@@ -34,33 +22,6 @@ module Wrest
       def serialise(hash, options = {})
         hash.to_xml(options)
       end
-
-      def filter(response,xpath)
-        filter_rexml(response,xpath)
-      end
-      
-      def filter_rexml(response,xpath)
-        doc = REXML::Document.new(response.body)
-        REXML::XPath.first(doc,xpath).to_s
-      end
-
-
-      # def filter_jdom(response,xpath)
-      #  # string_reader = StringReader.new(response.body)
-      #   input_source = InputSource.new(string_reader)
-      #   #p input_source.to_s
-      #   doc = DocumentBuilderFactory.new_instance.new_document_builder.parse(input_source)
-      #   #doc = SAXBuilder.new.build(string_reader)
-      #   p doc
-      #   p doc.toString
-      #   #xpath_instance = XPathFactory.new_instance.newXPath
-      #   #expr = xpath_instance.compile(xpath)
-      #   #p expr.to_s
-      #   #result = expr.evaluate(doc)
-
-      #   #puts result
-      # end
-
     end
   end
 end

data/lib/wrest/curl/request.rb

@@ -59,7 +59,7 @@ module Wrest
         @http_request.timeout = @timeout
       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:
       #
@@ -84,9 +84,9 @@ module Wrest
 
         prefix = "#{http_request.action.to_s.upcase} #{http_request.hash} #{connection.hash}"
 
-        Wrest.logger.debug "--> (#{prefix}) #{http_request.url}"
+        Wrest.logger.debug "<- (#{prefix}) #{http_request.url}"
         time = Benchmark.realtime { response =  Wrest::Curl::Response.new(connection.handle_request(http_request))}
-        Wrest.logger.debug "<-- (#{prefix}) %s (%d bytes %.2fs)" % [response.message, response.body ? response.body.length : 0, time]
+        Wrest.logger.debug "-> (#{prefix}) %s (%d bytes %.2fs)" % [response.message, response.body ? response.body.length : 0, time]
 
         response
       rescue Patron::TimeoutError => e

data/lib/wrest/curl/session.rb

@@ -9,7 +9,7 @@
 
 module Wrest::Curl
   # 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.
+  # same connection instance as an option to all Wrest::Native::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

data/lib/wrest/exceptions.rb

@@ -11,7 +11,7 @@ module Wrest
     end
 
     # Raised when a request auto redirects more times than are allowed
-    # by its follow_redirects_limit. See Wrest::Http::Redirection.
+    # by its follow_redirects_limit. See Wrest::Native::Redirection.
     class AutoRedirectLimitExceeded < StandardError
     end
 

data/lib/wrest/native/connection_factory.rb

@@ -9,15 +9,16 @@
 
 module Wrest::Native
   module ConnectionFactory
-    def create_connection(timeout = 60)
-      timeout ||= 60
+    def create_connection(options = {:timeout => 60, :verify_mode => 'VERIFY_PEER'})
+      options[:timeout] ||= 60
       connection = Net::HTTP.new(self.host, self.port)
-      connection.read_timeout = timeout
+      connection.read_timeout = options[:timeout]
       if self.https?
         connection.use_ssl     = true
-        connection.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        connection.verify_mode = OpenSSL::SSL::VERIFY_PEER
+        connection.verify_mode = OpenSSL::SSL::VERIFY_NONE if options[:verify_mode] == 'VERIFY_NONE'
       end
       connection
     end
   end
-end
+end

data/lib/wrest/native/redirection.rb

@@ -28,7 +28,7 @@ module Wrest #:nodoc:
         target = self['location']
         redirect_request_options = redirect_request_options.clone
 
-        raise Wrest::Exceptions::AutoRedirectLimitExceeded if (redirect_request_options[:follow_redirects_count] += 1) >= redirect_request_options[:follow_redirects_limit]
+        raise Wrest::Exceptions::AutoRedirectLimitExceeded if (redirect_request_options[:follow_redirects_count] += 1) > redirect_request_options[:follow_redirects_limit]
 
         Wrest.logger.debug "--| Redirecting to #{target}"
         Wrest::Uri.new(target, redirect_request_options).get

data/lib/wrest/native/request.rb

@@ -32,6 +32,10 @@ module Wrest::Native
     #   :connection => The HTTP Connection object to use. This is how a keep-alive connection can be
     #                  used for multiple requests.
     #   :cache_store => The object which should be used as cache store for cacheable responses
+    #   :detailed_http_logging => nil/$stdout/$stderr or File/Logger/IO object. Defaults to nil (recommended).
+    #   
+    # *WARNING* : detailed_http_logging causes serious security hole. Never use it in production code.
+    #
     def initialize(wrest_uri, http_request_klass, parameters = {}, body = nil, headers = {}, options = {})
       @uri = wrest_uri
       @headers = headers.stringify_keys
@@ -47,6 +51,7 @@ module Wrest::Native
       @connection = @options[:connection]
       @http_request = self.build_request(http_request_klass, @uri, @parameters, @headers)
       @cache_store = options[:cache_store]
+      @detailed_http_logging = options[:detailed_http_logging]
     end
 
     # Makes a request and returns a Wrest::Native::Response. 
@@ -69,14 +74,16 @@ module Wrest::Native
     def invoke
       response = nil
       
-      @connection ||= @uri.create_connection(timeout)
+      @connection ||= @uri.create_connection({:timeout => timeout})
+      @connection.set_debug_output @detailed_http_logging
+      
       http_request.basic_auth username, password unless username.nil? || password.nil?
 
       prefix = "#{http_request.method} #{http_request.hash} #{@connection.hash}"
       
-      Wrest.logger.debug "--> (#{prefix}) #{@uri.protocol}://#{@uri.host}:#{@uri.port}#{@http_request.path}"
+      Wrest.logger.debug "<- (#{prefix}) #{@uri.protocol}://#{@uri.host}:#{@uri.port}#{@http_request.path}"
       time = Benchmark.realtime { response = Wrest::Native::Response.new( do_request ) }
-      Wrest.logger.debug "<-- (#{prefix}) %d %s (%d bytes %.2fs)" % [response.code, response.message, response.body ? response.body.length : 0, time]
+      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
     rescue Timeout::Error => e

data/lib/wrest/native/session.rb

@@ -9,7 +9,7 @@
 
 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.
+  # same connection instance as an option to all Wrest::Native::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

data/lib/wrest/uri.rb

@@ -24,7 +24,7 @@ module Wrest #:nodoc:
   class Uri
     attr_reader :uri, :username, :password, :uri_string, :uri_path, :query
         
-    # See Wrest::Http::Request for the available options and their default values.
+    # See Wrest::Native::Request for the available options and their default values.
     def initialize(uri_string, options = {})
         @options = options
         @uri_string = uri_string.to_s
@@ -88,7 +88,7 @@ module Wrest #:nodoc:
     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.
+    # that creates a Wrest::Native::Get, executes it and returns a Wrest::Native::Response.
     #
     # Remember to escape all parameter strings if necessary, using URI.escape
     def get(parameters = {}, headers = {})
@@ -96,7 +96,7 @@ module Wrest #:nodoc:
     end
 
     # Make a PUT request to this URI. This is a convenience API
-    # that creates a Wrest::Http::Put, executes it and returns a Wrest::Http::Response.
+    # that creates a Wrest::Native::Put, executes it and returns a Wrest::Native::Response.
     #
     # Remember to escape all parameter strings if necessary, using URI.escape
     def put(body = '', headers = {}, parameters = {})
@@ -104,7 +104,7 @@ module Wrest #:nodoc:
     end
 
     # 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.
+    # that creates a Wrest::Native::Post, executes it and returns a Wrest::Native::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
@@ -126,7 +126,7 @@ module Wrest #:nodoc:
     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.
+    # that creates a Wrest::Native::Delete, executes it and returns a Wrest::Native::Response.
     #
     # Remember to escape all parameter strings if necessary, using URI.escape
     def delete(parameters = {}, headers = {})
@@ -134,7 +134,7 @@ module Wrest #:nodoc:
     end
 
     # Makes an OPTIONS request to this URI. This is a convenience API
-    # that creates a Wrest::Http::Options, executes it and returns the Wrest::Http::Response.
+    # that creates a Wrest::Native::Options, executes it and returns the Wrest::Native::Response.
     def options
       Http::Options.new(self, @options).invoke
     end

data/lib/wrest/version.rb

@@ -13,7 +13,7 @@ module Wrest
       MAJOR  = 1
       MINOR  = 0
       TINY   = 0
-      BUILD = 'beta6'
+      BUILD = nil
       
       STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
 

data/lib/wrest/xml_mini.rb

@@ -0,0 +1,10 @@
+require 'wrest/xml_mini/libxml'
+require 'wrest/xml_mini/rexml'
+require 'wrest/xml_mini/nokogiri'
+module ActiveSupport
+  module XmlMini
+    delegate :filter, :to => :backend
+  end
+end
+
+

data/lib/wrest/xml_mini/jdom.rb

@@ -0,0 +1,6 @@
+require 'wrest/xml_mini/jdom/xpath_filter'
+module ActiveSupport
+  module XmlMini_JDOM
+    XmlMini_JDOM.extend(::XmlMini::JDOM::XPathFilter)
+  end
+end

data/lib/wrest/xml_mini/jdom/xpath_filter.rb

@@ -0,0 +1,17 @@
+raise "JRuby is required to use the JDOM backend for XmlMini" unless RUBY_PLATFORM =~ /java/
+
+
+
+
+module XmlMini
+  module JDOM 
+      module XPathFilter
+        #Enables filtering of an xml response using a specified xpath
+        #Returns an array of elements matching the xpath
+        def filter(xml_body,xpath)
+          raise NotImplementedError, "'filter' method is not implemented if JDOM backend is being used"
+        end
+
+    end
+  end
+ end

data/lib/wrest/xml_mini/libxml.rb

@@ -0,0 +1,8 @@
+require 'wrest/xml_mini/libxml/xpath_filter'
+module ActiveSupport
+  module XmlMini_LibXML
+    XmlMini_LibXML.extend(::XmlMini::LibXML::XPathFilter)
+  end
+end
+
+

data/lib/wrest/xml_mini/libxml/xpath_filter.rb

@@ -0,0 +1,12 @@
+module XmlMini
+  module LibXML
+    module XPathFilter
+      #Enables filtering of an xml response using a specified xpath
+      #Returns an array of elements matching the xpath
+      def filter(xml_body,xpath)
+        doc = ::LibXML::XML::Document.string(xml_body)
+        doc.find(xpath).to_a
+      end
+    end
+  end
+end

data/lib/wrest/xml_mini/nokogiri.rb

@@ -0,0 +1,7 @@
+require 'wrest/xml_mini/nokogiri/xpath_filter'
+module ActiveSupport
+  module XmlMini_Nokogiri 
+    XmlMini_Nokogiri.extend(::XmlMini::Nokogiri::XPathFilter)
+  end
+end
+

data/lib/wrest/xml_mini/nokogiri/xpath_filter.rb

@@ -0,0 +1,15 @@
+module XmlMini
+  module Nokogiri
+    module XPathFilter
+      #Enables filtering of an xml response using a specified xpath
+      #Returns all elements that match the xpath
+      def filter(xml_body,xpath)
+        doc = ::Nokogiri::XML(xml_body)
+        doc.xpath(xpath).to_a 
+      end
+    end
+  end
+end
+
+
+

data/lib/wrest/xml_mini/rexml.rb

@@ -0,0 +1,8 @@
+require 'wrest/xml_mini/rexml/xpath_filter'
+module ActiveSupport
+  module XmlMini_REXML 
+    XmlMini_REXML.extend(::XmlMini::Rexml::XPathFilter)
+  end
+end
+
+    

data/lib/wrest/xml_mini/rexml/xpath_filter.rb

@@ -0,0 +1,15 @@
+module XmlMini
+  module Rexml
+    module XPathFilter
+      #Enables filtering of an xml response using a specified xpath
+      #Returns an array of elements matching the xpath
+      def filter(xml_body,xpath)
+        doc = REXML::Document.new(xml_body)
+        REXML::XPath.each(doc,xpath).to_a
+      end
+    end
+  end
+end
+
+
+

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: wrest
 version: !ruby/object:Gem::Version 
-  prerelease: true
+  prerelease: false
   segments: 
     - 1
     - 0
     - 0
-    - beta6
-  version: 1.0.0.beta6
+  version: 1.0.0
 platform: universal-java-1.6
 authors: 
   - Sidu Ponnappa
@@ -16,14 +15,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-21 00:00:00 +05:30
+date: 2010-12-24 00:00:00 +05:30
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: rspec
     prerelease: false
     requirement: &id001 !ruby/object:Gem::Requirement 
-      none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
@@ -40,7 +38,6 @@ dependencies:
     name: activesupport
     prerelease: false
     requirement: &id002 !ruby/object:Gem::Requirement 
-      none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
@@ -55,7 +52,6 @@ dependencies:
     name: builder
     prerelease: false
     requirement: &id003 !ruby/object:Gem::Requirement 
-      none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
@@ -70,7 +66,6 @@ dependencies:
     name: json-jruby
     prerelease: false
     requirement: &id004 !ruby/object:Gem::Requirement 
-      none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
@@ -86,7 +81,6 @@ dependencies:
     name: nokogiri
     prerelease: false
     requirement: &id005 !ruby/object:Gem::Requirement 
-      none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
@@ -112,60 +106,69 @@ files:
   - bin/wrest
   - lib/wrest_no_ext.rb
   - lib/wrest.rb
-  - lib/wrest/uri_template.rb
-  - lib/wrest/version.rb
-  - lib/wrest/test.rb
-  - lib/wrest/curl.rb
-  - lib/wrest/native.rb
   - lib/wrest/http_shared.rb
-  - lib/wrest/uri.rb
-  - lib/wrest/components.rb
+  - lib/wrest/native.rb
+  - lib/wrest/multipart.rb
+  - lib/wrest/xml_mini.rb
   - lib/wrest/exceptions.rb
+  - lib/wrest/curl.rb
   - lib/wrest/resource.rb
-  - lib/wrest/multipart.rb
-  - lib/wrest/resource/state.rb
-  - lib/wrest/resource/base.rb
-  - lib/wrest/resource/collection.rb
-  - lib/wrest/core_ext/hash.rb
-  - lib/wrest/core_ext/string.rb
-  - lib/wrest/core_ext/hash/conversions.rb
-  - lib/wrest/core_ext/string/conversions.rb
-  - lib/wrest/native/session.rb
-  - lib/wrest/native/redirection.rb
-  - lib/wrest/native/response.rb
-  - lib/wrest/native/options.rb
-  - lib/wrest/native/get.rb
-  - lib/wrest/native/connection_factory.rb
+  - lib/wrest/test.rb
+  - lib/wrest/uri_template.rb
+  - lib/wrest/uri.rb
+  - lib/wrest/components.rb
+  - lib/wrest/version.rb
+  - lib/wrest/components/translators.rb
+  - lib/wrest/components/container.rb
+  - lib/wrest/components/mutators.rb
+  - lib/wrest/components/mutators/xml_mini_type_caster.rb
+  - lib/wrest/components/mutators/base.rb
+  - lib/wrest/components/mutators/camel_to_snake_case.rb
+  - lib/wrest/components/mutators/xml_simple_type_caster.rb
+  - lib/wrest/components/translators/xml.rb
+  - lib/wrest/components/translators/content_types.rb
+  - lib/wrest/components/translators/json.rb
+  - lib/wrest/components/container/typecaster.rb
+  - lib/wrest/components/container/alias_accessors.rb
   - lib/wrest/native/request.rb
-  - lib/wrest/native/post.rb
+  - lib/wrest/native/connection_factory.rb
   - lib/wrest/native/put_multipart.rb
-  - lib/wrest/native/put.rb
   - lib/wrest/native/delete.rb
+  - lib/wrest/native/response.rb
+  - lib/wrest/native/get.rb
   - lib/wrest/native/post_multipart.rb
-  - lib/wrest/curl/session.rb
+  - lib/wrest/native/put.rb
+  - lib/wrest/native/options.rb
+  - lib/wrest/native/session.rb
+  - lib/wrest/native/post.rb
+  - lib/wrest/native/redirection.rb
+  - lib/wrest/core_ext/hash.rb
+  - lib/wrest/core_ext/string.rb
+  - lib/wrest/core_ext/string/conversions.rb
+  - lib/wrest/core_ext/hash/conversions.rb
+  - lib/wrest/curl/request.rb
+  - lib/wrest/curl/delete.rb
   - lib/wrest/curl/response.rb
-  - lib/wrest/curl/options.rb
   - lib/wrest/curl/get.rb
-  - lib/wrest/curl/request.rb
-  - lib/wrest/curl/post.rb
   - lib/wrest/curl/put.rb
-  - lib/wrest/curl/delete.rb
-  - lib/wrest/components/mutators.rb
-  - lib/wrest/components/translators.rb
-  - lib/wrest/components/container.rb
-  - lib/wrest/components/translators/json.rb
-  - lib/wrest/components/translators/xml.rb
-  - lib/wrest/components/translators/content_types.rb
-  - lib/wrest/components/container/alias_accessors.rb
-  - lib/wrest/components/container/typecaster.rb
-  - lib/wrest/components/mutators/camel_to_snake_case.rb
-  - lib/wrest/components/mutators/xml_mini_type_caster.rb
-  - lib/wrest/components/mutators/base.rb
-  - lib/wrest/components/mutators/xml_simple_type_caster.rb
-  - lib/wrest/http_shared/standard_tokens.rb
+  - lib/wrest/curl/options.rb
+  - lib/wrest/curl/session.rb
+  - lib/wrest/curl/post.rb
+  - lib/wrest/resource/base.rb
+  - lib/wrest/resource/collection.rb
+  - lib/wrest/resource/state.rb
+  - lib/wrest/xml_mini/libxml.rb
+  - lib/wrest/xml_mini/jdom.rb
+  - lib/wrest/xml_mini/nokogiri.rb
+  - lib/wrest/xml_mini/rexml.rb
+  - lib/wrest/xml_mini/rexml/xpath_filter.rb
+  - lib/wrest/xml_mini/libxml/xpath_filter.rb
+  - lib/wrest/xml_mini/jdom/xpath_filter.rb
+  - lib/wrest/xml_mini/nokogiri/xpath_filter.rb
+  - lib/wrest/test/request_patches.rb
   - lib/wrest/http_shared/standard_headers.rb
+  - lib/wrest/http_shared/standard_tokens.rb
   - lib/wrest/http_shared/headers.rb
-  - lib/wrest/test/request_patches.rb
   - README.rdoc
   - CHANGELOG
   - LICENCE
@@ -179,7 +182,6 @@ rdoc_options:
 require_paths: 
   - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -187,7 +189,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
           - 0
         version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -200,7 +201,7 @@ requirements:
   - To use multipart post, install the 'multipart-post' gem.
   - To use curl as the http engine, install the 'patron' gem. This feature is not available (and should be unneccessary) on jruby.
 rubyforge_project: wrest
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Wrest is an elegant, object oriented HTTP client library for 1.8, 1.9, JRuby and Rubinius.