spec/resourceful/response_spec.rb @@ -1,3 +1,19 @@ +Version 0.7.0 +============= + * Multiple values in a single header field are treated the same as repeated header fields. (Peter Williams) + +Compatibility issues +-------------------- + + * The semantics of the Resourceful::Header API have changed slightly. + Previously multiple values in a single header field + (e.g. `Accept: application/xml, application/json`) where treated + differently from multiple values occurring in multiple fields (e.g + `Accept: application/xml\n\rAccept: application/json`). This lead + to some unfortunate complexity when interacting with multi-valued + fields. + + Version 0.6.0 ============= History.txt @@ -18,6 +18,6 @@ end # Resourceful is a library that provides a high level HTTP interface. module Resourceful - VERSION = "0.6.0" + VERSION = "0.7.0" RESOURCEFUL_USER_AGENT_TOKEN = "Resourceful/#{VERSION}(Ruby/#{RUBY_VERSION})" end lib/resourceful.rb @@ -53,6 +53,7 @@ module Resourceful def has_key?(k) field_def(k).exists_in?(@raw_fields) end + alias has_field? has_key? def each(&blk) @raw_fields.each(&blk) @@ -126,8 +127,8 @@ module Resourceful end def set_to(value, raw_fields_hash) - raw_fields_hash[name] = if repeatable? - Array(value) + raw_fields_hash[name] = if multivalued? + Array(value).map{|v| v.split(/,\s*/)}.flatten elsif value.kind_of?(Array) raise ArgumentError, "#{name} field may only have one value" if value.size > 1 value.first lib/resourceful/header.rb @@ -23,11 +23,10 @@ module Resourceful # # @return true|false def expired? - 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['Expires'] - return true if Time.httpdate(header['Expires']) < Time.now + if header.cache_control and m_age_str = header.cache_control.find{|cc| /^max-age=/ === cc} + return current_age > m_age_str[/\d+/].to_i + elsif header.expires + return Time.httpdate(header.expires) < Time.now end false @@ -38,10 +37,8 @@ module Resourceful # @return true|false def stale? return true if expired? - if header['Cache-Control'] - return true if header['Cache-Control'].include?('must-revalidate') - return true if header['Cache-Control'].include?('no-cache') - end + return false unless header.has_field?(Header::CACHE_CONTROL) + return true if header.cache_control.any?{|cc| /must-revalidate|no-cache/ === cc} false end @@ -75,8 +72,8 @@ module Resourceful # Algorithm taken from RCF2616#13.2.3 def current_age - age_value = header['Age'] || 0 - date_value = Time.httpdate(header['Date']) + age_value = header.age.to_i + date_value = Time.httpdate(header.date) now = Time.now apparent_age = [0, response_time - date_value].max lib/resourceful/response.rb @@ -54,7 +54,7 @@ describe "Caching" do resp = @resource.get resp.headers['X-Updateme'].should == ["bar"] - resp.headers['Cache-Control'].should == ["private,max-age=0"] + resp.headers['Cache-Control'].should == ["private", "max-age=0"] end end spec/caching_spec.rb @@ -112,8 +112,12 @@ module Resourceful accept.should eql(['application/foo', 'application/bar']) end + it "should be instantiatable w/ repeated multi-valued header fields w/ multiple values" do + Header.new('Accept' => ['application/foo, application/bar', 'text/plain']). + accept.should eql(['application/foo', 'application/bar', 'text/plain']) + end + it "should be instantiatable w/ multi-valued header fields w/ multiple values" do - pending Header.new('Accept' => 'application/foo, application/bar'). accept.should eql(['application/foo', 'application/bar']) end spec/resourceful/header_spec.rb @@ -2,10 +2,12 @@ require 'rubygems' require 'spec' require 'pp' -$LOAD_PATH << File.join(File.dirname(__FILE__), "..", "lib") +__DIR__ = File.dirname(__FILE__) + +$LOAD_PATH << File.join(__DIR__, "..", "lib") require 'resourceful' -$LOAD_PATH << File.dirname(__FILE__) # ./spec +$LOAD_PATH << __DIR__ # ./spec # Spawn the server in another process spec/spec_helper.rb 3af11e776cbece6e32c9a5b217c304e13fba5f63 Peter Williams pezra@youthful-indiscretion.local http://github.com/paul/resourceful/commit/5ef819fe245861aa75005b480b5d4f57189d335e 5ef819fe245861aa75005b480b5d4f57189d335e 2009-08-23T22:42:49-07:00 2009-08-23T22:42:49-07:00 improved handling of multivalue header fields when the values occur in a single field in the message 417e6873f4a222833b820e2fffcb09e5848761b0 Peter Williams pezra@youthful-indiscretion.local