pezra-resourceful 0.5.4 → 0.6.0

data/History.txt

@@ -0,0 +1,18 @@
+Version 0.6.0
+=============
+
+ * Improved support for multi-valued header fields. (Peter Williams)
+ * Added convenience mechanisms for making URL encoded and multipart form data requests. (Peter Williams)
+ * Ruby 1.9 support (Peter Williams)
+
+Compatibility issues
+--------------------
+
+ * The semantics of the Resourceful::Header API have changed slightly.
+   Previously, any header might return a string or an array.  Now
+   fields are either "single-value" and always return a string, or
+   "multi-value" and always return an array.  See API doc for more
+   details.
+
+
+

data/Manifest

@@ -1,34 +1,39 @@
-lib/resourceful/authentication_manager.rb
-lib/resourceful/cache_manager.rb
-lib/resourceful/exceptions.rb
-lib/resourceful/header.rb
-lib/resourceful/http_accessor.rb
-lib/resourceful/memcache_cache_manager.rb
-lib/resourceful/multipart_form_data.rb
+lib/resourceful.rb
 lib/resourceful/net_http_adapter.rb
 lib/resourceful/options_interpretation.rb
-lib/resourceful/request.rb
-lib/resourceful/resource.rb
-lib/resourceful/response.rb
 lib/resourceful/stubbed_resource_proxy.rb
+lib/resourceful/urlencoded_form_data.rb
+lib/resourceful/header.rb
+lib/resourceful/memcache_cache_manager.rb
+lib/resourceful/response.rb
 lib/resourceful/util.rb
-lib/resourceful.rb
-Manifest
+lib/resourceful/abstract_form_data.rb
+lib/resourceful/cache_manager.rb
+lib/resourceful/request.rb
+lib/resourceful/resource.rb
+lib/resourceful/exceptions.rb
+lib/resourceful/multipart_form_data.rb
+lib/resourceful/http_accessor.rb
+lib/resourceful/authentication_manager.rb
+History.txt
+resourceful.gemspec
+README.markdown
 MIT-LICENSE
 Rakefile
-README.markdown
-resourceful.gemspec
+Manifest
+spec/simple_sinatra_server_spec.rb
+spec/old_acceptance_specs.rb
+spec/acceptance_shared_specs.rb
+spec/spec_helper.rb
+spec/simple_sinatra_server.rb
 spec/acceptance/authorization_spec.rb
-spec/acceptance/caching_spec.rb
 spec/acceptance/header_spec.rb
-spec/acceptance/redirecting_spec.rb
 spec/acceptance/resource_spec.rb
-spec/acceptance_shared_specs.rb
-spec/caching_spec.rb
-spec/old_acceptance_specs.rb
+spec/acceptance/caching_spec.rb
+spec/acceptance/redirecting_spec.rb
 spec/resourceful/multipart_form_data_spec.rb
+spec/resourceful/header_spec.rb
 spec/resourceful/resource_spec.rb
-spec/simple_sinatra_server.rb
-spec/simple_sinatra_server_spec.rb
+spec/resourceful/urlencoded_form_data_spec.rb
+spec/caching_spec.rb
 spec/spec.opts
-spec/spec_helper.rb

data/README.markdown

@@ -58,8 +58,17 @@ Post a URL encoded form
 
      require 'resourceful'
      http = Resourceful::HttpAccessor.new
-     resp = http.resource('http://mysite.example/service').
-              post('hostname=test&level=super', :content_type => 'application/x-www-form-urlencoded')
+     resp = http.resource('http://mysite.example/service'). 
+              post(Resourceful::UrlencodedFormData.new(:hostname => 'test', :level => 'super'))
+
+Post a Mulitpart form with a file
+-----------------------
+
+     require 'resourceful'
+     http = Resourceful::HttpAccessor.new
+     form_data = Resourceful::MultipartFormData.new(:username => 'me')
+     form_data.add_file('avatar', '/tmp/my_avatar.png', 'image/png')
+     resp = http.resource('http://mysite.example/service').post(form_data)
 
 Put an XML document
 -------------------

data/lib/resourceful.rb

@@ -10,9 +10,13 @@ require 'resourceful/util'
 require 'resourceful/header'
 require 'resourceful/http_accessor'
 
+module Resourceful
+  autoload :MultipartFormData, 'resourceful/multipart_form_data'
+  autoload :UrlencodedFormData, 'resourceful/urlencoded_form_data'
+end
+
 # Resourceful is a library that provides a high level HTTP interface.
 module Resourceful
-  VERSION = "0.5.4"
+  VERSION = "0.6.0"
   RESOURCEFUL_USER_AGENT_TOKEN = "Resourceful/#{VERSION}(Ruby/#{RUBY_VERSION})"
-
 end

data/lib/resourceful/abstract_form_data.rb

@@ -0,0 +1,18 @@
+module Resourceful
+  class AbstractFormData
+    def initialize(contents = {})
+      @form_data = []
+      
+      contents.each do |k,v|
+        add(k, v)
+      end
+    end
+
+    def add(name, value)
+      form_data << [name.to_s, value]
+    end
+
+    protected
+    attr_reader :form_data
+  end
+end

data/lib/resourceful/header.rb

@@ -1,125 +1,256 @@
-# A case-normalizing Hash, adjusting on [] and []=.
-# Shamelessly swiped from Rack
+require 'resourceful/options_interpretation'
+require 'set'
+
+# Represents the header fields of an HTTP message.  To access a field
+# you can use `#[]` and `#[]=`.  For example, to get the content type
+# of a response you can do
+# 
+#     response.header['Content-Type']  # => "application/xml"
+#
+# Lookups and modifications done in this way are case insensitive, so
+# 'Content-Type', 'content-type' and :content_type are all equivalent.
+#
+# Multi-valued fields
+# -------------------
+#
+# Multi-value fields (e.g. Accept) are always returned as an Array
+# regardless of the number of values, if the field is present.
+# Single-value fields (e.g. Content-Type) are always returned as
+# strings. The multi/single valueness of a header field is determined
+# by the way it is defined in the HTTP spec.  Unknown fields are
+# treated as multi-valued.
+#
+# (This behavior is new in 0.6 and may be slightly incompatible with
+# the way previous versions worked in some situations.)
+#
+# For example
+#
+#     h = Resourceful::Header.new
+#     h['Accept'] = "application/xml"
+#     h['Accept']                      # => ["application/xml"]
+#
 module Resourceful
-  class Header < Hash
+  class Header
+    include Enumerable
+    
     def initialize(hash={})
+      @raw_fields = {}
       hash.each { |k, v| self[k] = v }
     end
 
     def to_hash
-      {}.replace(self)
+      @raw_fields.dup
     end
 
     def [](k)
-      super capitalize(k)
+      field_def(k).get_from(@raw_fields)
     end
 
     def []=(k, v)
-      super capitalize(k), v
+      field_def(k).set_to(v, @raw_fields)
     end
 
     def has_key?(k)
-      super capitalize(k)
+      field_def(k).exists_in?(@raw_fields)
+    end
+
+    def each(&blk)
+      @raw_fields.each(&blk)
+    end
+    alias each_field each
+
+    def merge!(another)
+      another.each do |k,v|
+        self[k] = v
+      end
+      self
     end
 
-    def capitalize(k)
-      k.to_s.downcase.gsub(/^.|[-_\s]./) { |x| x.upcase }.gsub('_', '-')
+    def merge(another)
+      self.class.new(self).merge!(another)
     end
 
-    def each_field(&blk)
-      to_hash.each { |k,v|
-        blk.call capitalize(k), v
-      }
+    def reverse_merge(another)
+      self.class.new(another).merge!(self)
     end
 
-    HEADERS = %w[
-      Accept
-      Accept-Charset
-      Accept-Encoding
-      Accept-Language
-      Accept-Ranges
-      Age
-      Allow
-      Authorization
-      Cache-Control
-      Connection
-      Content-Encoding
-      Content-Language
-      Content-Length
-      Content-Location
-      Content-MD5
-      Content-Range
-      Content-Type
-      Date
-      ETag
-      Expect
-      Expires
-      From
-      Host
-      If-Match
-      If-Modified-Since
-      If-None-Match
-      If-Range
-      If-Unmodified-Since
-      Keep-Alive
-      Last-Modified
-      Location
-      Max-Forwards
-      Pragma
-      Proxy-Authenticate
-      Proxy-Authorization
-      Range
-      Referer
-      Retry-After
-      Server
-      TE
-      Trailer
-      Transfer-Encoding
-      Upgrade
-      User-Agent
-      Vary
-      Via
-      Warning
-      WWW-Authenticate
-    ]
-
-    HEADERS.each do |header|
-      const = header.upcase.gsub('-', '_')
-      meth  = header.downcase.gsub('-', '_')
-
-      class_eval <<-RUBY, __FILE__, __LINE__
-        #{const} = "#{header}".freeze    # ACCEPT = "accept".freeze
-
-        def #{meth}                      # def accept
-          self[#{const}]                 #   self[ACCEPT]
-        end                              # end
-
-        def #{meth}=(str)                # def accept=(str)
-          self[#{const}] = str           #   self[ACCEPT] = str
-        end                              # end
-      RUBY
+    def dup
+      self.class.new(@raw_fields.dup)
+    end
+
+
+    # Class to handle the details of each type of field.
+    class HeaderFieldDef
+      include Comparable
+      include OptionsInterpretation
+
+      ##
+      attr_reader :name
+
+      def initialize(name, options = {})
+        @name = name
+        extract_opts(options) do |opts|
+          @repeatable = opts.extract(:repeatable, :default => false)
+          @hop_by_hop = opts.extract(:hop_by_hop, :default => false)
+          @modifiable = opts.extract(:modifiable, :default => true)
+        end
+      end
+
+      def repeatable?
+        @repeatable
+      end
+
+      def hop_by_hop?
+        @hop_by_hop
+      end
+
+      def modifiable?
+        @modifiable
+      end
+
+      def get_from(raw_fields_hash)
+        raw_fields_hash[name]
+      end
+
+      def set_to(value, raw_fields_hash)
+        raw_fields_hash[name] = if repeatable?
+                                  Array(value)
+                                elsif value.kind_of?(Array)
+                                  raise ArgumentError, "#{name} field may only have one value" if value.size > 1
+                                  value.first
+                                else
+                                  value
+                                end
+      end
+
+      def exists_in?(raw_fields_hash)
+        raw_fields_hash.has_key?(name)
+      end
+
+      def <=>(another)
+        name <=> another.name
+      end
 
+      def ==(another)
+        name_pattern === another.name
+      end
+      alias eql? ==
+
+      def ===(another)
+        if another.kind_of?(HeaderFieldDef)
+          self == another
+        else
+          name_pattern === another
+        end
+      end
+
+      def name_pattern
+        Regexp.new('^' + name.gsub('-', '[_-]') + '$', Regexp::IGNORECASE)
+      end
+
+      def methodized_name
+        name.downcase.gsub('-', '_')
+      end
+
+      alias to_s name
+
+      def gen_setter(klass)
+        klass.class_eval <<-RUBY
+          def #{methodized_name}=(val)  # def accept=(val)
+            self['#{name}'] = val       #   self['Accept'] = val
+          end                           # end
+        RUBY
+      end
+
+      def gen_getter(klass)
+        klass.class_eval <<-RUBY
+          def #{methodized_name}  # def accept
+            self['#{name}']       #   self['Accept']
+          end                     # end
+        RUBY
+      end
+
+      def gen_canonical_name_const(klass)
+        const_name = name.upcase.gsub('-', '_')
+        
+        klass.const_set(const_name, name)
+      end
+    end
+ 
+    @@header_field_defs = Set.new
+
+    def self.header_field(name, options = {})
+      hfd = HeaderFieldDef.new(name, options)
+
+      @@header_field_defs << hfd
+
+      hfd.gen_getter(self)
+      hfd.gen_setter(self)
+      hfd.gen_canonical_name_const(self)
+    end
+
+    def self.hop_by_hop_headers
+      @@header_field_defs.select{|hfd| hfd.hop_by_hop?}
+    end
+
+    def self.non_modifiable_headers
+      @@header_field_defs.reject{|hfd| hfd.repeatable?}
+    end
+    
+    def field_def(name)
+      @@header_field_defs.find{|hfd| hfd === name} || 
+        HeaderFieldDef.new(name.to_s.downcase.gsub(/^.|[-_\s]./) { |x| x.upcase }.gsub('_', '-'), :repeatable => true)
     end
 
-    HOP_BY_HOP_HEADERS = [
-      CONNECTION,
-      KEEP_ALIVE,
-      PROXY_AUTHENTICATE,
-      PROXY_AUTHORIZATION,
-      TE,
-      TRAILER,
-      TRANSFER_ENCODING,
-      UPGRADE
-    ].freeze
-
-    NON_MODIFIABLE_HEADERS = [
-      CONTENT_LOCATION,
-      CONTENT_MD5,
-      ETAG,
-      LAST_MODIFIED,
-      EXPIRES
-    ].freeze
 
+    header_field('Accept', :repeatable => true)
+    header_field('Accept-Charset', :repeatable => true)
+    header_field('Accept-Encoding', :repeatable => true)
+    header_field('Accept-Language', :repeatable => true)
+    header_field('Accept-Ranges', :repeatable => true)
+    header_field('Age')
+    header_field('Allow', :repeatable => true)
+    header_field('Authorization', :repeatable => true)
+    header_field('Cache-Control', :repeatable => true)
+    header_field('Connection', :hop_by_hop => true)
+    header_field('Content-Encoding', :repeatable => true)
+    header_field('Content-Language', :repeatable => true)
+    header_field('Content-Length')
+    header_field('Content-Location', :modifiable => false)
+    header_field('Content-MD5', :modifiable => false)
+    header_field('Content-Range')
+    header_field('Content-Type')
+    header_field('Date')
+    header_field('ETag', :modifiable => false)
+    header_field('Expect', :repeatable => true)
+    header_field('Expires', :modifiable => false)
+    header_field('From')
+    header_field('Host')
+    header_field('If-Match', :repeatable => true)
+    header_field('If-Modified-Since')
+    header_field('If-None-Match', :repeatable => true)
+    header_field('If-Range')
+    header_field('If-Unmodified-Since')
+    header_field('Keep-Alive', :hop_by_hop => true)
+    header_field('Last-Modified', :modifiable => false)
+    header_field('Location')
+    header_field('Max-Forwards')
+    header_field('Pragma', :repeatable => true)
+    header_field('Proxy-Authenticate', :hop_by_hop => true)
+    header_field('Proxy-Authorization', :hop_by_hop => true)
+    header_field('Range')
+    header_field('Referer')
+    header_field('Retry-After')
+    header_field('Server')
+    header_field('TE', :repeatable => true, :hop_by_hop => true)
+    header_field('Trailer', :repeatable => true, :hop_by_hop => true)
+    header_field('Transfer-Encoding', :repeatable => true, :hop_by_hop => true)
+    header_field('Upgrade', :repeatable => true, :hop_by_hop => true)
+    header_field('User-Agent')
+    header_field('Vary', :repeatable => true)
+    header_field('Via', :repeatable => true)
+    header_field('Warning', :repeatable => true)
+    header_field('WWW-Authenticate', :repeatable => true)
   end
 end
 

data/lib/resourceful/multipart_form_data.rb

@@ -1,16 +1,9 @@
+require 'resourceful/abstract_form_data'
 
 module Resourceful
-  class MultipartFormData
+  class MultipartFormData < AbstractFormData
     FileParamValue = Struct.new(:content, :file_name, :content_type)
 
-    def initialize()
-      @form_data = []
-    end
-
-    def add(name, value)
-      form_data << [name, value]
-    end
-
     def add_file(name, file_name, content_type="application/octet-stream")
       add(name, FileParamValue.new(File.new(file_name, 'r'), File.basename(file_name), content_type))
     end
@@ -21,8 +14,10 @@ module Resourceful
 
     def read
       StringIO.new.tap do |out|
+        first = true
         form_data.each do |key, val|
-          out << "\r\n--" << boundary
+          out << "\r\n" unless first
+          out << "--" << boundary
           out << "\r\nContent-Disposition: form-data; name=\"#{key}\""
           if val.kind_of?(FileParamValue)
             out << "; filename=\"#{val.file_name}\""
@@ -34,13 +29,13 @@ module Resourceful
           else
             out << val.to_s
           end
+          first = false
         end
         out << "\r\n--#{boundary}--"
       end.string
     end
 
     protected
-    attr_reader :form_data
 
     def boundary
       @boundary ||= (0..30).map{BOUNDARY_CHARS[rand(BOUNDARY_CHARS.length)]}.join

data/lib/resourceful/net_http_adapter.rb

@@ -30,15 +30,21 @@ module Resourceful
     def make_request(method, uri, body = nil, header = nil)
       uri = uri.is_a?(Addressable::URI) ? uri : Addressable::URI.parse(uri)
 
+      if [:put, :post].include? method
+        body = body ? body.read : ""
+        header[:content_length] = body.size 
+      end
+
       req = net_http_request_class(method).new(uri.absolute_path)
       header.each_field { |k,v| req[k] = v } if header
       https = ("https" == uri.scheme)
-      conn = Net::HTTP.Proxy(*proxy_details).new(uri.host, uri.port || (https ? 443 : 80))
+      conn_class = proxy_details ? Net::HTTP.Proxy(*proxy_details) : Net::HTTP
+      conn = conn_class.new(uri.host, uri.port || (https ? 443 : 80))
       conn.use_ssl = https
       begin 
         conn.start
         res = if body
-                conn.request(req, body.read)
+                conn.request(req, body)
               else
                 conn.request(req)
               end

data/lib/resourceful/request.rb

@@ -205,7 +205,7 @@ module Resourceful
 
     # Does this request force us to revalidate the cache?
     def forces_revalidation?
-      if max_age == 0 || header.cache_control && cc.include?('no-cache')
+      if max_age == 0 || skip_cache?
         logger.info("    Client forced revalidation")
         true
       else 

data/lib/resourceful/resource.rb

@@ -30,7 +30,7 @@ module Resourceful
     alias uri effective_uri
 
     def default_header(temp_defaults = {})
-      temp_defaults.merge(@default_header)
+      @default_header.merge(temp_defaults)
     end
 
     # Returns the host for this Resource's current uri
@@ -139,14 +139,14 @@ module Resourceful
 
     # Ensures that the request has a content type header
     def ensure_content_type(body, header)
-      return if header.has_key?(:content_type) 
+      return if header.has_key?('Content-Type') 
       
       if body.respond_to?(:content_type)
-        header[:content_type] = body.content_type
+        header['Content-Type'] = body.content_type
         return
       end
       
-      return if default_header.has_key?(:content_type) 
+      return if default_header.has_key?('Content-Type') 
 
       # could not figure it out
       raise MissingContentType
@@ -154,12 +154,16 @@ module Resourceful
 
     # Actually make the request
     def request(method, data, header)
+      header = default_header.merge(header)
       ensure_content_type(data, header) if data
 
       data = StringIO.new(data) if data.kind_of?(String)
 
-      log_request_with_time "#{method.to_s.upcase} [#{uri}]" do
-        request = Request.new(method, self, data, default_header.merge(header))
+      logger.debug { header.map {|k,v| "#{k}: #{v}"}.join("\n\t\t") }
+      logger.debug { data = StringIO.new(data.read); data.string } if data
+      
+      log_request_with_time "#{method.to_s.upcase} [#{uri}]" do        
+        request = Request.new(method, self, data, header)
         request.fetch_response
       end
     end

data/lib/resourceful/response.rb

@@ -26,8 +26,8 @@ module Resourceful
       if header['Cache-Control'] and header['Cache-Control'].first.include?('max-age')
         max_age = header['Cache-Control'].first.split(',').grep(/max-age/).first.split('=').last.to_i
         return true if current_age > max_age
-      elsif header['Expire']
-        return true if Time.httpdate(header['Expire'].first) < Time.now
+      elsif header['Expires']
+        return true if Time.httpdate(header['Expires']) < Time.now
       end
 
       false
@@ -75,8 +75,8 @@ module Resourceful
 
     # Algorithm taken from RCF2616#13.2.3
     def current_age
-      age_value   = header['Age'] ? header['Age'].first.to_i : 0
-      date_value  = Time.httpdate(header['Date'].first)
+      age_value   = header['Age'] || 0
+      date_value  = Time.httpdate(header['Date'])
       now         = Time.now
 
       apparent_age = [0, response_time - date_value].max
@@ -85,7 +85,7 @@ module Resourceful
     end
 
     def body
-      encoding = header['Content-Encoding'] && header['Content-Encoding'].first
+      encoding = header['Content-Encoding']
       case encoding
       when nil
         # body is identity encoded; just return it

data/lib/resourceful/urlencoded_form_data.rb

@@ -0,0 +1,17 @@
+require 'resourceful/abstract_form_data'
+require 'cgi'
+
+module Resourceful
+  class UrlencodedFormData < AbstractFormData
+
+    def content_type
+      "application/x-www-form-urlencoded"
+    end
+
+    def read
+      @form_data.map do |k,v|
+        CGI.escape(k) + '=' + CGI.escape(v)
+      end.join('&')
+    end
+  end
+end

data/resourceful.gemspec

@@ -2,26 +2,25 @@
 
 Gem::Specification.new do |s|
   s.name = %q{resourceful}
-  s.version = "0.5.4"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Paul Sadauskas"]
-  s.date = %q{2009-08-07}
+  s.date = %q{2009-08-14}
   s.description = %q{An HTTP library for Ruby that takes advantage of everything HTTP has to offer.}
   s.email = %q{psadauskas@gmail.com}
-  s.extra_rdoc_files = ["lib/resourceful/authentication_manager.rb", "lib/resourceful/cache_manager.rb", "lib/resourceful/exceptions.rb", "lib/resourceful/header.rb", "lib/resourceful/http_accessor.rb", "lib/resourceful/memcache_cache_manager.rb", "lib/resourceful/multipart_form_data.rb", "lib/resourceful/net_http_adapter.rb", "lib/resourceful/options_interpretation.rb", "lib/resourceful/request.rb", "lib/resourceful/resource.rb", "lib/resourceful/response.rb", "lib/resourceful/stubbed_resource_proxy.rb", "lib/resourceful/util.rb", "lib/resourceful.rb", "README.markdown"]
-  s.files = ["lib/resourceful/authentication_manager.rb", "lib/resourceful/cache_manager.rb", "lib/resourceful/exceptions.rb", "lib/resourceful/header.rb", "lib/resourceful/http_accessor.rb", "lib/resourceful/memcache_cache_manager.rb", "lib/resourceful/multipart_form_data.rb", "lib/resourceful/net_http_adapter.rb", "lib/resourceful/options_interpretation.rb", "lib/resourceful/request.rb", "lib/resourceful/resource.rb", "lib/resourceful/response.rb", "lib/resourceful/stubbed_resource_proxy.rb", "lib/resourceful/util.rb", "lib/resourceful.rb", "Manifest", "MIT-LICENSE", "Rakefile", "README.markdown", "resourceful.gemspec", "spec/acceptance/authorization_spec.rb", "spec/acceptance/caching_spec.rb", "spec/acceptance/header_spec.rb", "spec/acceptance/redirecting_spec.rb", "spec/acceptance/resource_spec.rb", "spec/acceptance_shared_specs.rb", "spec/caching_spec.rb", "spec/old_acceptance_specs.rb", "spec/resourceful/multipart_form_data_spec.rb", "spec/resourceful/resource_spec.rb", "spec/simple_sinatra_server.rb", "spec/simple_sinatra_server_spec.rb", "spec/spec.opts", "spec/spec_helper.rb"]
-  s.has_rdoc = true
+  s.extra_rdoc_files = ["lib/resourceful.rb", "lib/resourceful/net_http_adapter.rb", "lib/resourceful/options_interpretation.rb", "lib/resourceful/stubbed_resource_proxy.rb", "lib/resourceful/urlencoded_form_data.rb", "lib/resourceful/header.rb", "lib/resourceful/memcache_cache_manager.rb", "lib/resourceful/response.rb", "lib/resourceful/util.rb", "lib/resourceful/abstract_form_data.rb", "lib/resourceful/cache_manager.rb", "lib/resourceful/request.rb", "lib/resourceful/resource.rb", "lib/resourceful/exceptions.rb", "lib/resourceful/multipart_form_data.rb", "lib/resourceful/http_accessor.rb", "lib/resourceful/authentication_manager.rb", "README.markdown"]
+  s.files = ["lib/resourceful.rb", "lib/resourceful/net_http_adapter.rb", "lib/resourceful/options_interpretation.rb", "lib/resourceful/stubbed_resource_proxy.rb", "lib/resourceful/urlencoded_form_data.rb", "lib/resourceful/header.rb", "lib/resourceful/memcache_cache_manager.rb", "lib/resourceful/response.rb", "lib/resourceful/util.rb", "lib/resourceful/abstract_form_data.rb", "lib/resourceful/cache_manager.rb", "lib/resourceful/request.rb", "lib/resourceful/resource.rb", "lib/resourceful/exceptions.rb", "lib/resourceful/multipart_form_data.rb", "lib/resourceful/http_accessor.rb", "lib/resourceful/authentication_manager.rb", "History.txt", "resourceful.gemspec", "README.markdown", "MIT-LICENSE", "Rakefile", "Manifest", "spec/simple_sinatra_server_spec.rb", "spec/old_acceptance_specs.rb", "spec/acceptance_shared_specs.rb", "spec/spec_helper.rb", "spec/simple_sinatra_server.rb", "spec/acceptance/authorization_spec.rb", "spec/acceptance/header_spec.rb", "spec/acceptance/resource_spec.rb", "spec/acceptance/caching_spec.rb", "spec/acceptance/redirecting_spec.rb", "spec/resourceful/multipart_form_data_spec.rb", "spec/resourceful/header_spec.rb", "spec/resourceful/resource_spec.rb", "spec/resourceful/urlencoded_form_data_spec.rb", "spec/caching_spec.rb", "spec/spec.opts"]
   s.homepage = %q{http://github.com/paul/resourceful}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Resourceful", "--main", "README.markdown"]
-  s.require_paths = ["lib", "ext"]
+  s.require_paths = ["lib"]
   s.rubyforge_project = %q{resourceful}
-  s.rubygems_version = %q{1.3.1}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{An HTTP library for Ruby that takes advantage of everything HTTP has to offer.}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<addressable>, [">= 2.1.0"])

data/spec/acceptance/caching_spec.rb

@@ -104,7 +104,7 @@ describe Resourceful do
 
       it 'should revalidate the cached response if the response is expired' do
         in_the_past = (Time.now - 60).httpdate
-        resource = @http.resource(uri_for_code(200, "Expire" => in_the_past))
+        resource = @http.resource(uri_for_code(200, "Expires" => in_the_past))
 
         resp = resource.get
         resp.should be_expired

data/spec/acceptance/resource_spec.rb

@@ -7,12 +7,12 @@ describe Resourceful do
   describe "working with a resource" do
     before do 
       @http = Resourceful::HttpAccessor.new
-      @resource = @http.resource('http://localhost:3000/')
+      @resource = @http.resource('http://localhost:42682/')
     end
 
     it 'should make the original uri available' do 
-      @resource.effective_uri.should == 'http://localhost:3000/'
-      @resource.uri.should == 'http://localhost:3000/'
+      @resource.effective_uri.should == 'http://localhost:42682/'
+      @resource.uri.should == 'http://localhost:42682/'
     end
 
     it 'should set the user agent string on the default header' do

data/spec/resourceful/header_spec.rb

@@ -0,0 +1,8 @@
+require File.dirname(__FILE__) + "/../spec_helper.rb"
+
+
+describe Resourceful::Header do 
+  it "should have constants for header names" do 
+    Resourceful::Header::CONTENT_TYPE.should == 'Content-Type'
+  end
+end

data/spec/resourceful/multipart_form_data_spec.rb

@@ -29,7 +29,6 @@ describe Resourceful::MultipartFormData do
       
       boundary = /boundary=(\w+)/.match(@form_data.content_type)[1]
       @form_data.read.should eql(<<MPFD[0..-2])
-\r
 --#{boundary}\r
 Content-Disposition: form-data; name="foo"\r
 \r
@@ -62,7 +61,6 @@ MPFD
       
           boundary = /boundary=(\w+)/.match(@form_data.content_type)[1]
           @form_data.read.should eql(<<MPFD[0..-2])
-\r
 --#{boundary}\r
 Content-Disposition: form-data; name="foo"; filename="#{File.basename(file_to_upload.path)}"\r
 Content-Type: application/octet-stream\r

data/spec/resourceful/urlencoded_form_data_spec.rb

@@ -0,0 +1,44 @@
+require File.dirname(__FILE__) + "/../spec_helper"
+require 'tempfile'
+require "resourceful/urlencoded_form_data.rb"
+
+describe Resourceful::UrlencodedFormData do
+
+  before do 
+    @form_data = Resourceful::UrlencodedFormData.new
+  end
+
+  it "should know its content-type" do 
+    @form_data.content_type.should match(/^application\/x-www-form-urlencoded$/i)
+  end
+
+  describe "instantiation" do 
+    it "should be creatable with hash" do 
+      Resourceful::UrlencodedFormData.new(:foo => 'testing').read.should eql("foo=testing")
+    end
+  end
+
+  describe "with simple parameters" do 
+    it "should all simple parameters to be added" do 
+      @form_data.add(:foo, "testing")
+    end
+
+    it "should render a multipart form-data document when #read is called" do 
+      @form_data.add('foo', 'bar')
+      @form_data.add('baz', 'this')
+      
+      @form_data.read.should eql("foo=bar&baz=this")
+    end
+
+    it "should escape character in values that are unsafe" do 
+      @form_data.add('foo', 'this & that')
+      
+      @form_data.read.should eql("foo=this+%26+that")
+    end
+
+    it "should escape character in names that are unsafe" do 
+      @form_data.add('foo=bar', 'this')      
+      @form_data.read.should eql("foo%3Dbar=this")
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pezra-resourceful
 version: !ruby/object:Gem::Version 
-  version: 0.5.4
+  version: 0.6.0
 platform: ruby
 authors: 
 - Paul Sadauskas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-07 00:00:00 -07:00
+date: 2009-08-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -79,58 +79,65 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- lib/resourceful/authentication_manager.rb
-- lib/resourceful/cache_manager.rb
-- lib/resourceful/exceptions.rb
-- lib/resourceful/header.rb
-- lib/resourceful/http_accessor.rb
-- lib/resourceful/memcache_cache_manager.rb
-- lib/resourceful/multipart_form_data.rb
+- lib/resourceful.rb
 - lib/resourceful/net_http_adapter.rb
 - lib/resourceful/options_interpretation.rb
-- lib/resourceful/request.rb
-- lib/resourceful/resource.rb
-- lib/resourceful/response.rb
 - lib/resourceful/stubbed_resource_proxy.rb
+- lib/resourceful/urlencoded_form_data.rb
+- lib/resourceful/header.rb
+- lib/resourceful/memcache_cache_manager.rb
+- lib/resourceful/response.rb
 - lib/resourceful/util.rb
-- lib/resourceful.rb
-- README.markdown
-files: 
-- lib/resourceful/authentication_manager.rb
+- lib/resourceful/abstract_form_data.rb
 - lib/resourceful/cache_manager.rb
+- lib/resourceful/request.rb
+- lib/resourceful/resource.rb
 - lib/resourceful/exceptions.rb
-- lib/resourceful/header.rb
-- lib/resourceful/http_accessor.rb
-- lib/resourceful/memcache_cache_manager.rb
 - lib/resourceful/multipart_form_data.rb
+- lib/resourceful/http_accessor.rb
+- lib/resourceful/authentication_manager.rb
+- README.markdown
+files: 
+- lib/resourceful.rb
 - lib/resourceful/net_http_adapter.rb
 - lib/resourceful/options_interpretation.rb
-- lib/resourceful/request.rb
-- lib/resourceful/resource.rb
-- lib/resourceful/response.rb
 - lib/resourceful/stubbed_resource_proxy.rb
+- lib/resourceful/urlencoded_form_data.rb
+- lib/resourceful/header.rb
+- lib/resourceful/memcache_cache_manager.rb
+- lib/resourceful/response.rb
 - lib/resourceful/util.rb
-- lib/resourceful.rb
-- Manifest
+- lib/resourceful/abstract_form_data.rb
+- lib/resourceful/cache_manager.rb
+- lib/resourceful/request.rb
+- lib/resourceful/resource.rb
+- lib/resourceful/exceptions.rb
+- lib/resourceful/multipart_form_data.rb
+- lib/resourceful/http_accessor.rb
+- lib/resourceful/authentication_manager.rb
+- History.txt
+- resourceful.gemspec
+- README.markdown
 - MIT-LICENSE
 - Rakefile
-- README.markdown
-- resourceful.gemspec
+- Manifest
+- spec/simple_sinatra_server_spec.rb
+- spec/old_acceptance_specs.rb
+- spec/acceptance_shared_specs.rb
+- spec/spec_helper.rb
+- spec/simple_sinatra_server.rb
 - spec/acceptance/authorization_spec.rb
-- spec/acceptance/caching_spec.rb
 - spec/acceptance/header_spec.rb
-- spec/acceptance/redirecting_spec.rb
 - spec/acceptance/resource_spec.rb
-- spec/acceptance_shared_specs.rb
-- spec/caching_spec.rb
-- spec/old_acceptance_specs.rb
+- spec/acceptance/caching_spec.rb
+- spec/acceptance/redirecting_spec.rb
 - spec/resourceful/multipart_form_data_spec.rb
+- spec/resourceful/header_spec.rb
 - spec/resourceful/resource_spec.rb
-- spec/simple_sinatra_server.rb
-- spec/simple_sinatra_server_spec.rb
+- spec/resourceful/urlencoded_form_data_spec.rb
+- spec/caching_spec.rb
 - spec/spec.opts
-- spec/spec_helper.rb
-has_rdoc: true
+has_rdoc: false
 homepage: http://github.com/paul/resourceful
 licenses: 
 post_install_message: 
@@ -143,7 +150,6 @@ rdoc_options:
 - README.markdown
 require_paths: 
 - lib
-- ext
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
@@ -161,7 +167,7 @@ requirements: []
 rubyforge_project: resourceful
 rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: An HTTP library for Ruby that takes advantage of everything HTTP has to offer.
 test_files: []