doc/rdoc-style.css rufus-verbs.gemspec test/base.rb @@ -1,7 +1,8 @@ = rufus-verbs CHANGELOG.txt -== rufus-verbs - 0.11 not yet released + +== rufus-verbs - 1.0.0 not yet released == rufus-verbs - 0.10 released 2008/05/28 CHANGELOG.txt @@ -5,46 +5,19 @@ require 'rake' require 'rake/clean' require 'rake/packagetask' require 'rake/gempackagetask' -require 'rake/rdoctask' require 'rake/testtask' -require 'lib/rufus/verbs/version' # Rufus::Verbs::VERSION +#require 'rake/rdoctask' +require 'hanna/rdoctask' -# -# GEM SPEC - -spec = Gem::Specification.new do |s| - - s.name = "rufus-verbs" - s.version = Rufus::Verbs::VERSION - s.authors = [ "John Mettraux" ] - s.email = "john at openwfe dot org" - s.homepage = "http://rufus.rubyforge.org/rufus-verbs" - s.platform = Gem::Platform::RUBY - s.summary = "GET, POST, PUT, DELETE, with something around" - #s.license = "MIT" - - s.require_path = "lib" - #s.autorequire = "rufus-verbs" - s.test_file = "test/test.rb" - s.has_rdoc = true - s.extra_rdoc_files = [ 'README.txt' ] - - [ 'rufus-lru' ].each do |d| - s.requirements << d - s.add_dependency d - end +gemspec = File.read('rufus-verbs.gemspec') +eval "gemspec = #{gemspec}" - files = FileList[ "{bin,docs,lib,test}/**/*" ] - files.exclude "rdoc" - files.exclude "extras" - s.files = files.to_a -end # # tasks -CLEAN.include("pkg", "html", "rdoc") +CLEAN.include('pkg', 'html') task :default => [ :clean, :repackage ] @@ -53,25 +26,26 @@ task :default => [ :clean, :repackage ] # TESTING Rake::TestTask.new(:test) do |t| - t.libs << "test" + t.libs << 'test' t.test_files = FileList['test/test.rb'] t.verbose = true end + # # PACKAGING -Rake::GemPackageTask.new(spec) do |pkg| +Rake::GemPackageTask.new(gemspec) do |pkg| #pkg.need_tar = true end -Rake::PackageTask.new("rufus-verbs", Rufus::Verbs::VERSION) do |pkg| +Rake::PackageTask.new('rufus-verbs', gemspec.version) do |pkg| pkg.need_zip = true pkg.package_files = FileList[ - "Rakefile", - "*.txt", - "lib/**/*", - "test/**/*" + 'Rakefile', + '*.txt', + 'lib/**/*', + 'test/**/*' ].to_a #pkg.package_files.delete("MISC.txt") class << pkg @@ -82,40 +56,47 @@ Rake::PackageTask.new("rufus-verbs", Rufus::Verbs::VERSION) do |pkg| end # -# DOCUMENTATION - -#ALLISON=`allison --path` -ALLISON="/Library/Ruby/Gems/1.8/gems/allison-2.0.3/lib/allison.rb" +# VERSION -Rake::RDocTask.new do |rd| +task :change_version do - rd.main = "README.txt" + version = ARGV.pop + `sedip "s/VERSION = '.*'/VERSION = '#{version}'/" lib/rufus/verbs/version.rb` + `sedip "s/s.version = '.*'/s.version = '#{version}'/" rufus-verbs.gemspec` + exit 0 # prevent rake from triggering other tasks +end - rd.rdoc_dir = "html/rufus-verbs" - rd.rdoc_files.include( - "README.txt", - "CHANGELOG.txt", - "LICENSE.txt", - "CREDITS.txt", - "lib/**/*.rb") +# +# DOCUMENTATION - rd.title = "rufus-verbs rdoc" +Rake::RDocTask.new do |rd| + rd.main = 'README.txt' + rd.rdoc_dir = 'html/rufus-verbs' + rd.rdoc_files.include( + 'README.txt', + 'CHANGELOG.txt', + 'LICENSE.txt', + 'CREDITS.txt', + 'lib/**/*.rb') + rd.title = 'rufus-verbs rdoc' rd.options << '-N' # line numbers rd.options << '-S' # inline source +end - rd.template = ALLISON if File.exist?(ALLISON) +task :rrdoc => :rdoc do + FileUtils.cp('doc/rdoc-style.css', 'html/rufus-verbs/') end # # WEBSITE -task :upload_website => [ :clean, :rdoc ] do +task :upload_website => [ :clean, :rrdoc ] do - account = "jmettraux@rubyforge.org" - webdir = "/var/www/gforge-projects/rufus" + account = 'jmettraux@rubyforge.org' + webdir = '/var/www/gforge-projects/rufus' sh "rsync -azv -e ssh html/rufus-verbs #{account}:#{webdir}/" Rakefile @@ -1,6 +1,5 @@ -# #-- -# Copyright (c) 2008, John Mettraux, jmettraux@gmail.com +# Copyright (c) 2008-2009, John Mettraux, jmettraux@gmail.com # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -20,17 +19,9 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. # -# (MIT license) +# Made in Japan. #++ -# -# -# John Mettraux -# -# Made in Japan -# -# 2008/01/11 -# require 'rufus/verbs/endpoint' require 'rufus/verbs/conditional' lib/rufus/verbs.rb @@ -1,6 +1,5 @@ -# #-- -# Copyright (c) 2008, John Mettraux, jmettraux@gmail.com +# Copyright (c) 2008-2009, John Mettraux, jmettraux@gmail.com # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -20,19 +19,10 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. # -# (MIT license) +# Made in Japan. #++ -# -# -# John Mettraux -# -# Made in Japan -# -# 2008/01/16 -# -#require 'rubygems' require 'rufus/lru' @@ -87,53 +77,53 @@ module Rufus::Verbs private - # - # If the representation has already been gotten, send - # potential If-Modified-Since and/or If-None-Match. - # - def add_conditional_headers (req, opts) + # + # If the representation has already been gotten, send + # potential If-Modified-Since and/or If-None-Match. + # + def add_conditional_headers (req, opts) - # if path is cached send since and/or match + # if path is cached send since and/or match - e = @cache[opts[:c_uri]] + e = @cache[opts[:c_uri]] - return unless e # not cached + return unless e # not cached - req['If-Modified-Since'] = e.lastmod if e.lastmod - req['If-None-Match'] = e.etag if e.etag + req['If-Modified-Since'] = e.lastmod if e.lastmod + req['If-None-Match'] = e.etag if e.etag - opts[:c_cached] = e - end + opts[:c_cached] = e + end - def handle_response (method, res, opts) + def handle_response (method, res, opts) - # if method is get and reply is 200, cache (if et and/or lm) - # if method is get and reply is 304, return from cache + # if method is get and reply is 200, cache (if et and/or lm) + # if method is get and reply is 304, return from cache - super + super - code = res.code.to_i + code = res.code.to_i - return opts[:c_cached] if code == 304 + return opts[:c_cached] if code == 304 - cache(res, opts) if code == 200 + cache(res, opts) if code == 200 - res - end + res + end - def cache (res, opts) + def cache (res, opts) - class << res - def lastmod - self['Last-Modified'] - end - def etag - self['Etag'] - end + class << res + def lastmod + self['Last-Modified'] + end + def etag + self['Etag'] end - - @cache[opts[:c_uri]] = res end + + @cache[opts[:c_uri]] = res + end end end lib/rufus/verbs/conditional.rb @@ -1,6 +1,5 @@ -# #-- -# Copyright (c) 2008, John Mettraux, jmettraux@gmail.com +# Copyright (c) 2008-2009, John Mettraux, jmettraux@gmail.com # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -20,21 +19,12 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. # -# (MIT license) +# Made in Japan. #++ -# -# -# John Mettraux -# -# Made in Japan -# -# 2008/01/19 -# require 'webrick/cookie' -#require 'rubygems' require 'rufus/lru' @@ -55,124 +45,124 @@ module Verbs protected - # - # Prepares the instance variable @cookies for storing - # cooking for this endpoint. - # - # Reads the :cookies endpoint option for determining the - # size of the cookie jar (77 by default). - # - def prepare_cookie_jar + # + # Prepares the instance variable @cookies for storing + # cooking for this endpoint. + # + # Reads the :cookies endpoint option for determining the + # size of the cookie jar (77 by default). + # + def prepare_cookie_jar - o = @opts[:cookies] + o = @opts[:cookies] - return unless o and o != false + return unless o and o != false - s = o.to_s.to_i - s = 77 if s < 1 + s = o.to_s.to_i + s = 77 if s < 1 - @cookies = CookieJar.new s - end + @cookies = CookieJar.new s + end - # - # Parses the HTTP response for a potential 'Set-Cookie' header, - # parses and returns it as a hash. - # - def parse_cookies (response) + # + # Parses the HTTP response for a potential 'Set-Cookie' header, + # parses and returns it as a hash. + # + def parse_cookies (response) - c = response['Set-Cookie'] - return nil unless c - Cookie.parse_set_cookies c - end + c = response['Set-Cookie'] + return nil unless c + Cookie.parse_set_cookies c + end - # - # (This method will have no effect if the EndPoint is not - # tracking cookies) - # - # Registers a potential cookie set by the server. - # - def register_cookies (response, opts) + # + # (This method will have no effect if the EndPoint is not + # tracking cookies) + # + # Registers a potential cookie set by the server. + # + def register_cookies (response, opts) - return unless @cookies + return unless @cookies - cs = parse_cookies response + cs = parse_cookies response - return unless cs + return unless cs - # "The origin server effectively ends a session by - # sending the client a Set-Cookie header with Max-Age=0" + # "The origin server effectively ends a session by + # sending the client a Set-Cookie header with Max-Age=0" - cs.each do |c| + cs.each do |c| - host = opts[:host] - path = opts[:path] - cpath = c.path || "/" + host = opts[:host] + path = opts[:path] + cpath = c.path || "/" - next unless cookie_acceptable?(opts, response, c) + next unless cookie_acceptable?(opts, response, c) - domain = c.domain || host + domain = c.domain || host - if c.max_age == 0 - @cookies.remove_cookie domain, path, c - else - @cookies.add_cookie domain, path, c - end + if c.max_age == 0 + @cookies.remove_cookie domain, path, c + else + @cookies.add_cookie domain, path, c end end + end - # - # Checks if the cookie is acceptable in the context of - # the request that sent it. - # - def cookie_acceptable? (opts, response, cookie) + # + # Checks if the cookie is acceptable in the context of + # the request that sent it. + # + def cookie_acceptable? (opts, response, cookie) - # reject if : - # - # * The value for the Path attribute is not a prefix of the - # request-URI. - # * The value for the Domain attribute contains no embedded dots - # or does not start with a dot. - # * The value for the request-host does not domain-match the - # Domain attribute. - # * The request-host is a FQDN (not IP address) and has the form - # HD, where D is the value of the Domain attribute, and H is a - # string that contains one or more dots. + # reject if : + # + # * The value for the Path attribute is not a prefix of the + # request-URI. + # * The value for the Domain attribute contains no embedded dots + # or does not start with a dot. + # * The value for the request-host does not domain-match the + # Domain attribute. + # * The request-host is a FQDN (not IP address) and has the form + # HD, where D is the value of the Domain attribute, and H is a + # string that contains one or more dots. - cdomain = cookie.domain + cdomain = cookie.domain - if cdomain + if cdomain - return false unless cdomain.index '.' - return false if cdomain[0, 1] != '.' + return false unless cdomain.index '.' + return false if cdomain[0, 1] != '.' - h, d = split_host(opts[:host]) - return false if d != cdomain - end + h, d = split_host(opts[:host]) + return false if d != cdomain + end - #path = opts[:path] - path = response.request.path + #path = opts[:path] + path = response.request.path - cpath = cookie.path || "/" + cpath = cookie.path || "/" - return false if path[0..cpath.length-1] != cpath + return false if path[0..cpath.length-1] != cpath - true - end + true + end - # - # Places the 'Cookie' header in the request if appropriate. - # - # (This method will have no effect if the EndPoint is not - # tracking cookies) - # - def mention_cookies (request, opts) + # + # Places the 'Cookie' header in the request if appropriate. + # + # (This method will have no effect if the EndPoint is not + # tracking cookies) + # + def mention_cookies (request, opts) - return unless @cookies + return unless @cookies - cs = @cookies.fetch_cookies opts[:host], opts[:path] + cs = @cookies.fetch_cookies opts[:host], opts[:path] - request['Cookie'] = cs.collect { |c| c.to_header_s }.join(",") - end + request['Cookie'] = cs.collect { |c| c.to_header_s }.join(",") + end end # @@ -184,12 +174,12 @@ module Verbs def to_header_s - ret = "" - ret << @name << "=" << @value - ret << "; " << "$Version=" << @version.to_s if @version > 0 - ret << "; " << "$Domain=" << @domain if @domain - ret << "; " << "$Port=" << @port if @port - ret << "; " << "$Path=" << @path if @path + ret = '' + ret << @name << '=' << @value + ret << '; ' << '$Version=' << @version.to_s if @version > 0 + ret << '; ' << '$Domain=' << @domain if @domain + ret << '; ' << '$Port=' << @port if @port + ret << '; ' << '$Path=' << @path if @path ret end end @@ -306,21 +296,21 @@ module Verbs private - # - # Returns all the cookies that match a domain (host) and a path. - # - def do_fetch (dh, path) + # + # Returns all the cookies that match a domain (host) and a path. + # + def do_fetch (dh, path) - return [] unless dh + return [] unless dh - keys = dh.keys.sort.find_all do |k| - path[0..k.path.length-1] == k.path - end - keys.inject([]) do |r, k| - r << dh[k] - r - end + keys = dh.keys.sort.find_all do |k| + path[0..k.path.length-1] == k.path + end + keys.inject([]) do |r, k| + r << dh[k] + r end + end end end end lib/rufus/verbs/cookies.rb @@ -1,6 +1,5 @@ -# #-- -# Copyright (c) 2008, John Mettraux, jmettraux@gmail.com +# Copyright (c) 2008-2009, John Mettraux, jmettraux@gmail.com # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -20,17 +19,9 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. # -# (MIT license) +# Made in Japan. #++ -# -# -# John Mettraux -# -# Made in Japan -# -# 2008/01/21 -# require 'digest/md5' @@ -94,166 +85,166 @@ module Verbs protected - # - # Returns true if :digest_authentication is set at endpoint - # or request level. - # - def no_digest_auth - - (not o(opts, :digest_authentication)) - end + # + # Returns true if :digest_authentication is set at endpoint + # or request level. + # + def no_digest_auth - # - # To be enhanced. - # - # (For example http://www.intertwingly.net/blog/1585.html) - # - def generate_cnonce + (not o(opts, :digest_authentication)) + end - Digest::MD5.hexdigest("%x" % (Time.now.to_i + rand(65535))) - end + # + # To be enhanced. + # + # (For example http://www.intertwingly.net/blog/1585.html) + # + def generate_cnonce - def request_challenge (req, opts) + Digest::MD5.hexdigest("%x" % (Time.now.to_i + rand(65535))) + end - op = opts.dup + def request_challenge (req, opts) - op[:digest_authentication] = false - # preventing an infinite loop + op = opts.dup - method = req.class.const_get(:METHOD).downcase.to_sym - #method = :get + op[:digest_authentication] = false + # preventing an infinite loop - res = request(method, op) + method = req.class.const_get(:METHOD).downcase.to_sym + #method = :get - return false if res.code.to_i != 401 + res = request(method, op) - @challenge = Challenge.new res + return false if res.code.to_i != 401 - true - end + @challenge = Challenge.new res - # - # Generates an MD5 digest of the arguments (joined by ":"). - # - def h (*args) + true + end - Digest::MD5.hexdigest(args.join(":")) - end + # + # Generates an MD5 digest of the arguments (joined by ":"). + # + def h (*args) - # - # Generates the Authentication header that will be returned - # to the server. - # - def generate_header (req, opts) + Digest::MD5.hexdigest(args.join(":")) + end - @nonce_count += 1 + # + # Generates the Authentication header that will be returned + # to the server. + # + def generate_header (req, opts) - user, pass = o(opts, :digest_authentication) - realm = @challenge.realm || "" - method = req.class.const_get(:METHOD) - path = opts[:path] + @nonce_count += 1 - a1 = if @challenge.algorithm == 'MD5-sess' - h(h(user, realm, pass), @challenge.nonce, @cnonce) - else - h(user, realm, pass) - end + user, pass = o(opts, :digest_authentication) + realm = @challenge.realm || "" + method = req.class.const_get(:METHOD) + path = opts[:path] - a2, qop = if @challenge.qop.include?("auth-int") - [ h(method, path, h(req.body)), "auth-int" ] - else - [ h(method, path), "auth" ] - end + a1 = if @challenge.algorithm == 'MD5-sess' + h(h(user, realm, pass), @challenge.nonce, @cnonce) + else + h(user, realm, pass) + end - nc = ('%08x' % @nonce_count) - - digest = h( - #a1, @challenge.nonce, nc, @cnonce, @challenge.qop, a2) - a1, @challenge.nonce, nc, @cnonce, "auth", a2) - - header = "" - header << "Digest username=\"#{user}\", " - header << "realm=\"#{realm}\", " - header << "qop=\"#{qop}\", " - header << "uri=\"#{path}\", " - header << "nonce=\"#{@challenge.nonce}\", " - #header << "nc=##{nc}, " - header << "nc=#{nc}, " - header << "cnonce=\"#{@cnonce}\", " - header << "algorithm=\"#{@challenge.algorithm}\", " - #header << "algorithm=\"MD5-sess\", " - header << "response=\"#{digest}\", " - header << "opaque=\"#{@challenge.opaque}\"" - - header + a2, qop = if @challenge.qop.include?("auth-int") + [ h(method, path, h(req.body)), "auth-int" ] + else + [ h(method, path), "auth" ] end - # - # A common parent class for Challenge and AuthInfo. - # Their header parsing code is here. - # - class ServerReply + nc = ('%08x' % @nonce_count) + + digest = h( + #a1, @challenge.nonce, nc, @cnonce, @challenge.qop, a2) + a1, @challenge.nonce, nc, @cnonce, "auth", a2) + + header = "" + header << "Digest username=\"#{user}\", " + header << "realm=\"#{realm}\", " + header << "qop=\"#{qop}\", " + header << "uri=\"#{path}\", " + header << "nonce=\"#{@challenge.nonce}\", " + #header << "nc=##{nc}, " + header << "nc=#{nc}, " + header << "cnonce=\"#{@cnonce}\", " + header << "algorithm=\"#{@challenge.algorithm}\", " + #header << "algorithm=\"MD5-sess\", " + header << "response=\"#{digest}\", " + header << "opaque=\"#{@challenge.opaque}\"" + + header + end - def initialize (res) + # + # A common parent class for Challenge and AuthInfo. + # Their header parsing code is here. + # + class ServerReply - s = res[header_name] - return nil unless s + def initialize (res) - s = s[7..-1] if s[0, 6] == "Digest" + s = res[header_name] + return nil unless s - s = s.split "," + s = s[7..-1] if s[0, 6] == "Digest" - s.each do |e| + s = s.split "," - k, v = parse_entry e + s.each do |e| - if k == 'stale' - @stale = (v.downcase == 'true') - elsif k == 'nc' - @nc = v.to_i - elsif k == 'qop' - @qop = v.split "," - else - instance_variable_set "@#{k}".to_sym, v - end + k, v = parse_entry e + + if k == 'stale' + @stale = (v.downcase == 'true') + elsif k == 'nc' + @nc = v.to_i + elsif k == 'qop' + @qop = v.split "," + else + instance_variable_set "@#{k}".to_sym, v end end + end - protected + protected - def parse_entry (e) + def parse_entry (e) - k, v = e.split "=", 2 - v = v[1..-2] if v[0, 1] == '"' - [ k.strip, v.strip ] - end + k, v = e.split '=', 2 + v = v[1..-2] if v[0, 1] == '"' + [ k.strip, v.strip ] end + end - # - # Used when parsing a 'www-authenticate' header challenge. - # - class Challenge < ServerReply + # + # Used when parsing a 'www-authenticate' header challenge. + # + class Challenge < ServerReply - attr_accessor \ - :opaque, :algorithm, :qop, :stale, :nonce, :realm, :charset + attr_accessor \ + :opaque, :algorithm, :qop, :stale, :nonce, :realm, :charset - def header_name - 'www-authenticate' - end + def header_name + 'www-authenticate' end + end - # - # Used when parsing a 'authentication-info' header info. - # - class AuthInfo < ServerReply + # + # Used when parsing a 'authentication-info' header info. + # + class AuthInfo < ServerReply - attr_accessor \ - :cnonce, :rspauth, :nextnonce, :qop, :nc + attr_accessor \ + :cnonce, :rspauth, :nextnonce, :qop, :nc - def header_name - 'authentication-info' - end + def header_name + 'authentication-info' end + end end end lib/rufus/verbs/digest.rb @@ -1,6 +1,5 @@ -# #-- -# Copyright (c) 2008, John Mettraux, jmettraux@gmail.com +# Copyright (c) 2008-2009, John Mettraux, jmettraux@gmail.com # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -20,17 +19,9 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. # -# (MIT license) +# Made in Japan. #++ -# -# -# John Mettraux -# -# Made in Japan -# -# 2008/01/11 -# require 'uri' require 'yaml' # for StringIO (at least for now) @@ -211,437 +202,436 @@ module Verbs private - # - # Manages various args formats : - # - # uri - # [ uri ] - # [ uri, opts ] - # opts - # - def self.extract_opts (args) - - opts = {} + # + # Manages various args formats : + # + # uri + # [ uri ] + # [ uri, opts ] + # opts + # + def self.extract_opts (args) - args = [ args ] unless args.is_a?(Array) + opts = {} - opts = args.last \ - if args.last.is_a?(Hash) + args = [ args ] unless args.is_a?(Array) - opts[:uri] = args.first \ - if args.first.is_a?(String) or args.first.is_a?(URI) + opts = args.last \ + if args.last.is_a?(Hash) - opts - end + opts[:uri] = args.first \ + if args.first.is_a?(String) or args.first.is_a?(URI) - # - # Returns the value from the [request] opts or from the - # [endpoint] @opts. - # - def o (opts, key) + opts + end - keys = Array key - keys.each { |k| (v = opts[k]; return v if v != nil) } - keys.each { |k| (v = @opts[k]; return v if v != nil) } - nil - end + # + # Returns the value from the [request] opts or from the + # [endpoint] @opts. + # + def o (opts, key) - # - # Returns scheme, host, port, path, query - # - def compute_target (opts) + keys = Array key + keys.each { |k| (v = opts[k]; return v if v != nil) } + keys.each { |k| (v = @opts[k]; return v if v != nil) } + nil + end - u = opts[:uri] || opts[:u] + # + # Returns scheme, host, port, path, query + # + def compute_target (opts) - r = if opts[:host] + u = opts[:uri] || opts[:u] - [ opts[:scheme] || 'http', - opts[:host], - opts[:port] || 80, - opts[:path] || '/', - opts[:query] || opts[:params] ] + r = if opts[:host] - elsif u + [ opts[:scheme] || 'http', + opts[:host], + opts[:port] || 80, + opts[:path] || '/', + opts[:query] || opts[:params] ] - u = URI.parse u.to_s unless u.is_a?(URI) - [ u.scheme, - u.host, - u.port, - u.path, - query_to_h(u.query) ] - else + elsif u - [] - end + u = URI.parse u.to_s unless u.is_a?(URI) + [ u.scheme, + u.host, + u.port, + u.path, + query_to_h(u.query) ] + else - opts[:scheme] = r[0] || @opts[:scheme] - opts[:host] = r[1] || @opts[:host] - opts[:port] = r[2] || @opts[:port] - opts[:path] = r[3] || @opts[:path] + [] + end - opts[:query] = - r[4] || - opts[:params] || opts[:query] || - @opts[:query] || @opts[:params] || - {} + opts[:scheme] = r[0] || @opts[:scheme] + opts[:host] = r[1] || @opts[:host] + opts[:port] = r[2] || @opts[:port] + opts[:path] = r[3] || @opts[:path] + + opts[:query] = + r[4] || + opts[:params] || opts[:query] || + @opts[:query] || @opts[:params] || + {} + + opts.delete :path if opts[:path] == '' + + opts[:c_uri] = [ + opts[:scheme], + opts[:host], + opts[:port], + opts[:path], + opts[:query] ].inspect + # + # can be used for conditional gets + + r + end - opts.delete :path if opts[:path] == "" + # + # Creates the Net::HTTP request instance. + # + # If :fake_put is set, will use Net::HTTP::Post + # and make sure the query string contains '_method=put' (or + # '_method=delete'). + # + # This call will also advertise this rufus-verbs as + # 'accepting the gzip encoding' (in case of GET). + # + def create_request (method, opts) - opts[:c_uri] = [ - opts[:scheme], - opts[:host], - opts[:port], - opts[:path], - opts[:query] ].inspect - # - # can be used for conditional gets + if (o(opts, :fake_put) and + (method == :put or method == :delete)) - r + opts[:query][:_method] = method.to_s + method = :post end - # - # Creates the Net::HTTP request instance. - # - # If :fake_put is set, will use Net::HTTP::Post - # and make sure the query string contains '_method=put' (or - # '_method=delete'). - # - # This call will also advertise this rufus-verbs as - # 'accepting the gzip encoding' (in case of GET). - # - def create_request (method, opts) - - if (o(opts, :fake_put) and - (method == :put or method == :delete)) - - opts[:query][:_method] = method.to_s - method = :post - end - - path = compute_path opts - - r = eval("Net::HTTP::#{method.to_s.capitalize}").new path - - r['User-Agent'] = o(opts, :user_agent) - # potentially overriden by opts[:headers] + path = compute_path opts - h = opts[:headers] || opts[:h] - h.each { |k, v| r[k] = v } if h + r = eval("Net::HTTP::#{method.to_s.capitalize}").new path - r['Accept-Encoding'] = 'gzip' \ - if method == :get and not o(opts, :nozip) + r['User-Agent'] = o(opts, :user_agent) + # potentially overriden by opts[:headers] - r - end + h = opts[:headers] || opts[:h] + h.each { |k, v| r[k] = v } if h - # - # If @user and @pass are set, will activate basic authentication. - # Else if the @auth option is set, will assume it contains a Proc - # and will call it (with the request as a parameter). - # - # This comment is too much... Just read the code... - # - def add_authentication (req, opts) + r['Accept-Encoding'] = 'gzip' \ + if method == :get and not o(opts, :nozip) - b = o(opts, :http_basic_authentication) - d = o(opts, :digest_authentication) - o = o(opts, :auth) + r + end - if b and b != false + # + # If @user and @pass are set, will activate basic authentication. + # Else if the @auth option is set, will assume it contains a Proc + # and will call it (with the request as a parameter). + # + # This comment is too much... Just read the code... + # + def add_authentication (req, opts) - req.basic_auth b[0], b[1] + b = o(opts, :http_basic_authentication) + d = o(opts, :digest_authentication) + o = o(opts, :auth) - elsif d and d != false + if b and b != false - digest_auth req, opts + req.basic_auth b[0], b[1] - elsif o and o != false + elsif d and d != false - o.call req - end - end + digest_auth req, opts - # - # In that base class, it's empty. - # It's implemented in ConditionalEndPoint. - # - # Only called for a GET. - # - def add_conditional_headers (req, opts) + elsif o and o != false - # nada + o.call req end + end - # - # Prepares a Net::HTTP instance, with potentially some - # https settings. - # - def prepare_http (opts) + # + # In that base class, it's empty. + # It's implemented in ConditionalEndPoint. + # + # Only called for a GET. + # + def add_conditional_headers (req, opts) - compute_proxy opts + # nada + end - http = Net::HTTP.new( - opts[:host], opts[:port], - opts[:proxy_host], opts[:proxy_port], - opts[:proxy_user], opts[:proxy_pass]) + # + # Prepares a Net::HTTP instance, with potentially some + # https settings. + # + def prepare_http (opts) - set_timeout http, opts + compute_proxy opts - return http unless opts[:scheme].to_s == 'https' + http = Net::HTTP.new( + opts[:host], opts[:port], + opts[:proxy_host], opts[:proxy_port], + opts[:proxy_user], opts[:proxy_pass]) - require 'net/https' + set_timeout http, opts - http.use_ssl = true - http.enable_post_connection_check = true \ - if http.respond_to?(:enable_post_connection_check=) + return http unless opts[:scheme].to_s == 'https' - http.verify_mode = if o(opts, :ssl_verify_peer) - OpenSSL::SSL::VERIFY_PEER - else - OpenSSL::SSL::VERIFY_NONE - end + require 'net/https' - store = OpenSSL::X509::Store.new - store.set_default_paths - http.cert_store = store + http.use_ssl = true + http.enable_post_connection_check = true \ + if http.respond_to?(:enable_post_connection_check=) - http + http.verify_mode = if o(opts, :ssl_verify_peer) + OpenSSL::SSL::VERIFY_PEER + else + OpenSSL::SSL::VERIFY_NONE end - # - # Sets both the open_timeout and the read_timeout for the http - # instance - # - def set_timeout (http, opts) + store = OpenSSL::X509::Store.new + store.set_default_paths + http.cert_store = store + + http + end - to = o(opts, :timeout) || o(opts, :to) - to = to.to_i + # + # Sets both the open_timeout and the read_timeout for the http + # instance + # + def set_timeout (http, opts) - return if to == 0 + to = o(opts, :timeout) || o(opts, :to) + to = to.to_i - http.open_timeout = to - http.read_timeout = to - end + return if to == 0 - # - # Makes sure the request opts hold the proxy information. - # - # If the option :proxy is set to false, no proxy will be used. - # - def compute_proxy (opts) + http.open_timeout = to + http.read_timeout = to + end - p = o(opts, :proxy) + # + # Makes sure the request opts hold the proxy information. + # + # If the option :proxy is set to false, no proxy will be used. + # + def compute_proxy (opts) - return unless p + p = o(opts, :proxy) - u = URI.parse p.to_s + return unless p - raise "not an HTTP[S] proxy '#{u.host}'" \ - unless u.scheme.match(/^http/) + u = URI.parse p.to_s - opts[:proxy_host] = u.host - opts[:proxy_port] = u.port - opts[:proxy_user] = u.user - opts[:proxy_pass] = u.password - end + raise "not an HTTP[S] proxy '#{u.host}'" \ + unless u.scheme.match(/^http/) - # - # Determines the full path of the request (path_info and - # query_string). - # - # For example : - # - # /items/4?style=whatever&maxcount=12 - # - def compute_path (opts) - - b = o(opts, :base) - r = o(opts, [ :res, :resource ]) - i = o(opts, :id) - - path = o(opts, :path) - - if b or r or i - path = "" - path = "/#{b}" if b - path += "/#{r}" if r - path += "/#{i}" if i - end + opts[:proxy_host] = u.host + opts[:proxy_port] = u.port + opts[:proxy_user] = u.user + opts[:proxy_pass] = u.password + end - path = path[1..-1] if path[0..1] == '//' + # + # Determines the full path of the request (path_info and + # query_string). + # + # For example : + # + # /items/4?style=whatever&maxcount=12 + # + def compute_path (opts) - query = opts[:query] || opts[:params] + b = o(opts, :base) + r = o(opts, [ :res, :resource ]) + i = o(opts, :id) - return path if not query or query.size < 1 + path = o(opts, :path) - path + '?' + h_to_query(query, opts) + if b or r or i + path = b ? "/#{b}" : '' + path += "/#{r}" if r + path += "/#{i}" if i end - # - # "a=A&b=B" -> { "a" => "A", "b" => "B" } - # - def query_to_h (q) + path = path[1..-1] if path[0..1] == '//' - return nil unless q + query = opts[:query] || opts[:params] - q.split("&").inject({}) do |r, e| - s = e.split("=") - r[s[0]] = s[1] - r - end - end + return path if not query or query.size < 1 - # - # { "a" => "A", "b" => "B" } -> "a=A&b=B" - # - def h_to_query (h, opts) + path + '?' + h_to_query(query, opts) + end - h.entries.collect { |k, v| - unless o(opts, :no_escape) - k = URI.escape k.to_s - v = URI.escape v.to_s - end - "#{k}=#{v}" - }.join("&") - end + # + # "a=A&b=B" -> { "a" => "A", "b" => "B" } + # + def query_to_h (q) - # - # Fills the request body (with the content of :d or :fd). - # - def add_payload (req, opts, &block) - - d = opts[:d] || opts[:data] - fd = opts[:fd] || opts[:form_data] - - if d - req.body = d - elsif fd - sep = opts[:fd_sep] #|| nil - req.set_form_data fd, sep - elsif block - req.body = block.call req - else - req.body = "" - end + return nil unless q + + q.split('&').inject({}) do |r, e| + s = e.split('=') + r[s[0]] = s[1] + r end + end + + # + # { "a" => "A", "b" => "B" } -> "a=A&b=B" + # + def h_to_query (h, opts) - # - # Handles the server response. - # Eventually follows redirections. - # - # Once the final response has been hit, will make sure - # it's decompressed. - # - def handle_response (method, res, opts) + h.entries.collect { |k, v| + unless o(opts, :no_escape) + k = URI.escape k.to_s + v = URI.escape v.to_s + end + "#{k}=#{v}" + }.join('&') + end - nored = o(opts, [ :no_redirections, :noredir ]) + # + # Fills the request body (with the content of :d or :fd). + # + def add_payload (req, opts, &block) + + d = opts[:d] || opts[:data] + fd = opts[:fd] || opts[:form_data] + + if d + req.body = d + elsif fd + sep = opts[:fd_sep] #|| nil + req.set_form_data fd, sep + elsif block + req.body = block.call req + else + req.body = '' + end + end - #if res.is_a?(Net::HTTPRedirection) - if [ 301, 303, 307 ].include?(res.code.to_i) and (nored != true) + # + # Handles the server response. + # Eventually follows redirections. + # + # Once the final response has been hit, will make sure + # it's decompressed. + # + def handle_response (method, res, opts) - maxr = o(opts, :max_redirections) + nored = o(opts, [ :no_redirections, :noredir ]) - if maxr - maxr = maxr - 1 - raise "too many redirections" if maxr == -1 - opts[:max_redirections] = maxr - end + #if res.is_a?(Net::HTTPRedirection) + if [ 301, 302, 303, 307 ].include?(res.code.to_i) and (nored != true) - location = res['Location'] + maxr = o(opts, :max_redirections) - prev_host = [ opts[:scheme], opts[:host] ] + if maxr + maxr = maxr - 1 + raise 'too many redirections' if maxr == -1 + opts[:max_redirections] = maxr + end - if location.match /^http/ - u = URI::parse location - opts[:scheme] = u.scheme - opts[:host] = u.host - opts[:port] = u.port - opts[:path] = u.path - opts[:query] = u.query - else - opts[:path], opts[:query] = location.split "?" - end + location = res['Location'] - if (authentication_is_on?(opts) and - [ opts[:scheme], opts[:host] ] != prev_host) + prev_host = [ opts[:scheme], opts[:host] ] - raise( - "getting redirected to #{location} while " + - "authentication is on. Stopping.") - end + if location.match /^http/ + u = URI::parse location + opts[:scheme] = u.scheme + opts[:host] = u.host + opts[:port] = u.port + opts[:path] = u.path + opts[:query] = u.query + else + opts[:path], opts[:query] = location.split "?" + end - opts[:query] = query_to_h opts[:query] + if (authentication_is_on?(opts) and + [ opts[:scheme], opts[:host] ] != prev_host) - return request(method, opts) - # - # following the redirection + raise( + "getting redirected to #{location} while " + + "authentication is on. Stopping.") end - decompress res + opts[:query] = query_to_h opts[:query] - res + return request(method, opts) + # + # following the redirection end - # - # Returns an array of symbols, like for example - # - # [ :get, :post ] - # - # obtained by parsing the 'Allow' response header. - # - # This method is used to provide the result of an OPTIONS - # HTTP method. - # - def parse_options (res) + decompress res - s = res['Allow'] + res + end - return [] unless s + # + # Returns an array of symbols, like for example + # + # [ :get, :post ] + # + # obtained by parsing the 'Allow' response header. + # + # This method is used to provide the result of an OPTIONS + # HTTP method. + # + def parse_options (res) - s.split(",").collect do |m| - m.strip.downcase.to_sym - end - end + s = res['Allow'] - # - # Returns true if the current request has authentication - # going on. - # - def authentication_is_on? (opts) + return [] unless s - (o(opts, [ :http_basic_authentication, :hba, :auth ]) != nil) + s.split(',').collect do |m| + m.strip.downcase.to_sym end + end + + # + # Returns true if the current request has authentication + # going on. + # + def authentication_is_on? (opts) - # - # Inflates the response body if necessary. - # - def decompress (res) + (o(opts, [ :http_basic_authentication, :hba, :auth ]) != nil) + end + + # + # Inflates the response body if necessary. + # + def decompress (res) - if res['content-encoding'] == 'gzip' + if res['content-encoding'] == 'gzip' - class << res + class << res - attr_accessor :deflated_body + attr_accessor :deflated_body - alias :old_body :body + alias :old_body :body - def body - @deflated_body || old_body - end + def body + @deflated_body || old_body end - # - # reopened the response to add - # a 'deflated_body' attr and let the the body - # method point to it + end + # + # reopened the response to add + # a 'deflated_body' attr and let the the body + # method point to it - # now deflate... + # now deflate... - io = StringIO.new res.body - gz = Zlib::GzipReader.new io - res.deflated_body = gz.read - gz.close - end + io = StringIO.new res.body + gz = Zlib::GzipReader.new io + res.deflated_body = gz.read + gz.close end + end end end end lib/rufus/verbs/endpoint.rb @@ -1,6 +1,5 @@ -# #-- -# Copyright (c) 2008, John Mettraux, jmettraux@gmail.com +# Copyright (c) 2008-2009, John Mettraux, jmettraux@gmail.com # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -20,17 +19,9 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. # -# (MIT license) +# Made in Japan. #++ -# -# -# John Mettraux -# -# Made in Japan -# -# 2008/03/31 -# module Rufus module Verbs @@ -42,71 +33,71 @@ module Verbs protected - # - # logs a unique message to the verbose channel (if any). - # - def vlog (opts, msg) + # + # logs a unique message to the verbose channel (if any). + # + def vlog (opts, msg) - channel = get_channel(opts) or return + channel = get_channel(opts) or return - channel << msg - end - - # - # logs the outgoing request - # - def vlog_request (opts, req) + channel << msg + end - channel = get_channel(opts) or return + # + # logs the outgoing request + # + def vlog_request (opts, req) - channel << "> #{req.method} #{req.path}\n" + channel = get_channel(opts) or return - req.each do |k, v| - channel << "> #{k}: #{v}\n" - end + channel << "> #{req.method} #{req.path}\n" - channel << ">\n" + req.each do |k, v| + channel << "> #{k}: #{v}\n" end - def vlog_http (opts, http) + channel << ">\n" + end - channel = get_channel(opts) or return + def vlog_http (opts, http) - channel << "* #{http.address}:#{http.port}\n" - channel << "*\n" - end + channel = get_channel(opts) or return - # - # logs the incoming response - # - def vlog_response (opts, res) + channel << "* #{http.address}:#{http.port}\n" + channel << "*\n" + end - channel = get_channel(opts) or return + # + # logs the incoming response + # + def vlog_response (opts, res) - channel << "< #{res.code} #{res.message}\n" - channel << "<\n" + channel = get_channel(opts) or return - res.each do |k, v| - channel << "< #{k}: #{v}\n" - end + channel << "< #{res.code} #{res.message}\n" + channel << "<\n" - channel << "<\n" + res.each do |k, v| + channel << "< #{k}: #{v}\n" end + channel << "<\n" + end + private - def get_channel (opts) + def get_channel (opts) - v = o(opts, [ :verbose, :v ]) + v = o(opts, [ :verbose, :v ]) - return nil if (not v) or (v.to_s == 'false') + return nil if (not v) or (v.to_s == 'false') - v = $stdout if v.to_s == 'true' + v = $stdout if v.to_s == 'true' - return nil unless v.is_a?(IO) + return nil unless v.is_a?(IO) - v - end + v + end end end lib/rufus/verbs/verbose.rb @@ -1,6 +1,5 @@ -# #-- -# Copyright (c) 2008, John Mettraux, jmettraux@gmail.com +# Copyright (c) 2008-2009, John Mettraux, jmettraux@gmail.com # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -20,17 +19,8 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. # -# (MIT license) +# Made in Japan. #++ -# - -# -# John Mettraux -# -# Made in Japan -# -# 2008/01/21 -# module Rufus @@ -39,7 +29,7 @@ module Verbs # # The version of this rufus-verbs [gem] # - VERSION = '0.11' + VERSION = '1.0.0' end end lib/rufus/verbs/version.rb @@ -7,40 +7,37 @@ # Sun Jan 13 12:33:03 JST 2008 # -require 'test/unit' -require 'testbase' - -require 'rufus/verbs' +require File.dirname(__FILE__) + '/base.rb' class Auth0Test < Test::Unit::TestCase - include TestBaseMixin + include TestBaseMixin - include Rufus::Verbs + include Rufus::Verbs - # - # Using an items server with the authentication on. - # - def setup + # + # Using an items server with the authentication on. + # + def setup - @server = ItemServer.new :auth => :basic - @server.start - end + @server = ItemServer.new :auth => :basic + @server.start + end - def test_0 + def test_0 - #res = get :uri => "http://localhost:7777/items" - #assert_equal 200, res.code.to_i - #assert_equal "{}", res.body.strip - expect 401, nil, get(:uri => "http://localhost:7777/items") + #res = get :uri => "http://localhost:7777/items" + #assert_equal 200, res.code.to_i + #assert_equal "{}", res.body.strip + expect 401, nil, get(:uri => "http://localhost:7777/items") - expect 401, nil, get( - :uri => "http://localhost:7777/items", - :http_basic_authentication => [ "toto", "wrong" ]) + expect 401, nil, get( + :uri => "http://localhost:7777/items", + :http_basic_authentication => [ "toto", "wrong" ]) - expect 200, {}, get( - :uri => "http://localhost:7777/items?a", - :http_basic_authentication => [ "toto", "toto" ]) - end + expect 200, {}, get( + :uri => "http://localhost:7777/items?a", + :http_basic_authentication => [ "toto", "toto" ]) + end end test/auth0_test.rb @@ -7,10 +7,7 @@ # Sun Jan 13 12:33:03 JST 2008 # -require 'test/unit' -require 'testbase' - -require 'rufus/verbs' +require File.dirname(__FILE__) + '/base.rb' class Auth1Test < Test::Unit::TestCase test/auth1_test.rb @@ -7,43 +7,41 @@ # Sun Jan 13 20:02:25 JST 2008 # -require 'test/unit' -require 'testbase' -require 'rufus/verbs' +require File.dirname(__FILE__) + '/base.rb' class BlockTest < Test::Unit::TestCase - include TestBaseMixin + include TestBaseMixin - include Rufus::Verbs + include Rufus::Verbs - def test_0 - - res = post :uri => "http://localhost:7777/items/0" do - "Fedor" + - "Fedorovitch" - end - assert_equal 201, res.code.to_i - assert_equal "http://localhost:7777/items/0", res['Location'] + def test_0 + res = post :uri => "http://localhost:7777/items/0" do + "Fedor" + + "Fedorovitch" + end + assert_equal 201, res.code.to_i + assert_equal "http://localhost:7777/items/0", res['Location'] - expect( - 200, - { 0 => "FedorFedorovitch" }, - get(:uri => "http://localhost:7777/things")) - res = post :uri => "http://localhost:7777/items/1" do |req| - # do whatever with the request [headers] - "John" - end - assert_equal 201, res.code.to_i - assert_equal "http://localhost:7777/items/1", res['Location'] + expect( + 200, + { 0 => "FedorFedorovitch" }, + get(:uri => "http://localhost:7777/things")) - expect( - 200, - { 0 => "FedorFedorovitch", 1 => "John" }, - get(:uri => "http://localhost:7777/things")) + res = post :uri => "http://localhost:7777/items/1" do |req| + # do whatever with the request [headers] + "John" end + assert_equal 201, res.code.to_i + assert_equal "http://localhost:7777/items/1", res['Location'] + + expect( + 200, + { 0 => "FedorFedorovitch", 1 => "John" }, + get(:uri => "http://localhost:7777/things")) + end end test/block_test.rb @@ -7,43 +7,41 @@ # Wed Jan 16 13:54:36 JST 2008 # -require 'test/unit' -require 'testbase' -require 'rufus/verbs' +require File.dirname(__FILE__) + '/base.rb' class ConditionalTest < Test::Unit::TestCase - include TestBaseMixin + include TestBaseMixin - include Rufus::Verbs + include Rufus::Verbs - def test_1 + def test_1 - ep = ConditionalEndPoint.new(:host => "localhost", :port => 7777) - expect 200, {}, ep.get(:resource => "items") + ep = ConditionalEndPoint.new(:host => "localhost", :port => 7777) + expect 200, {}, ep.get(:resource => "items") - res = ep.put :resource => "items", :id => 0 do - "blockdata" - end - assert_equal 404, res.code.to_i + res = ep.put :resource => "items", :id => 0 do + "blockdata" + end + assert_equal 404, res.code.to_i - res = ep.post :resource => "items", :id => 0 do - "blockdata" - end - assert_equal 201, res.code.to_i - assert_equal "http://localhost:7777/items/0", res['Location'] + res = ep.post :resource => "items", :id => 0 do + "blockdata" + end + assert_equal 201, res.code.to_i + assert_equal "http://localhost:7777/items/0", res['Location'] - res = expect 200, { 0 => "blockdata" }, ep.get(:res => "items") - assert_kind_of Net::HTTPResponse, res - assert_respond_to res, :lastmod - i = res.object_id - #p res.to_hash + res = expect 200, { 0 => "blockdata" }, ep.get(:res => "items") + assert_kind_of Net::HTTPResponse, res + assert_respond_to res, :lastmod + i = res.object_id + #p res.to_hash - res = expect 200, { 0 => "blockdata" }, ep.get(:res => "items") - assert_equal i, res.object_id + res = expect 200, { 0 => "blockdata" }, ep.get(:res => "items") + assert_equal i, res.object_id - assert_equal 1, ep.cache_current_size - end + assert_equal 1, ep.cache_current_size + end end test/conditional_test.rb @@ -7,139 +7,137 @@ # Sat Jan 19 18:22:48 JST 2008 # -require 'test/unit' -#require 'testbase' -require 'rufus/verbs' -require 'rufus/verbs/cookies' +require File.dirname(__FILE__) + '/base.rb' +#require 'rufus/verbs/cookies' class Cookie0Test < Test::Unit::TestCase - #include TestBaseMixin + #include TestBaseMixin - include Rufus::Verbs::CookieMixin - include Rufus::Verbs::HostMixin + include Rufus::Verbs::CookieMixin + include Rufus::Verbs::HostMixin - # - # testing split_host(s) - # - def test_0 + # + # testing split_host(s) + # + def test_0 - assert_equal [ 'localhost', nil ], split_host('localhost') - assert_equal [ 'benz', '.car.co.nz' ], split_host('benz.car.co.nz') - assert_equal [ '127.0.0.1', nil ], split_host('127.0.0.1') - assert_equal [ '::1', nil ], split_host('::1') - end + assert_equal [ 'localhost', nil ], split_host('localhost') + assert_equal [ 'benz', '.car.co.nz' ], split_host('benz.car.co.nz') + assert_equal [ '127.0.0.1', nil ], split_host('127.0.0.1') + assert_equal [ '::1', nil ], split_host('::1') + end - # - # testing the CookieJar - # - def test_1 + # + # testing the CookieJar + # + def test_1 - cookie0 = TestCookie.new - cookie1 = TestCookie.new + cookie0 = TestCookie.new + cookie1 = TestCookie.new - jar = Rufus::Verbs::CookieJar.new 77 - assert_equal 0, jar.size + jar = Rufus::Verbs::CookieJar.new 77 + assert_equal 0, jar.size - jar.add_cookie(".rubyforge.org", "/", cookie0) - assert_equal 1, jar.size - assert_equal [ cookie0 ], jar.fetch_cookies("rufus.rubyforge.org", "/main") + jar.add_cookie(".rubyforge.org", "/", cookie0) + assert_equal 1, jar.size + assert_equal [ cookie0 ], jar.fetch_cookies("rufus.rubyforge.org", "/main") - jar.add_cookie("rufus.rubyforge.org", "/sub", cookie1) - assert_equal 2, jar.size - assert_equal [ cookie1, cookie0 ], jar.fetch_cookies("rufus.rubyforge.org", "/sub/0") - assert_equal [ cookie0 ], jar.fetch_cookies("rufus.rubyforge.org", "/main") - assert_equal [ cookie0 ], jar.fetch_cookies("rufus.rubyforge.org", "/") + jar.add_cookie("rufus.rubyforge.org", "/sub", cookie1) + assert_equal 2, jar.size + assert_equal [ cookie1, cookie0 ], jar.fetch_cookies("rufus.rubyforge.org", "/sub/0") + assert_equal [ cookie0 ], jar.fetch_cookies("rufus.rubyforge.org", "/main") + assert_equal [ cookie0 ], jar.fetch_cookies("rufus.rubyforge.org", "/") - jar.remove_cookie("rufus.rubyforge.org", "/sub", cookie1) - assert_equal 1, jar.size - end + jar.remove_cookie("rufus.rubyforge.org", "/sub", cookie1) + assert_equal 1, jar.size + end - # - # testing cookie_acceptable?(opts, cookie) - # - def test_2 + # + # testing cookie_acceptable?(opts, cookie) + # + def test_2 - jar = Rufus::Verbs::CookieJar.new 77 + jar = Rufus::Verbs::CookieJar.new 77 - opts = { :host => 'rufus.rubyforge.org', :path => '/' } - c = TestCookie.new '.rubyforge.org', '/' - r = TestResponse.new opts - assert cookie_acceptable?(opts, r, c) + opts = { :host => 'rufus.rubyforge.org', :path => '/' } + c = TestCookie.new '.rubyforge.org', '/' + r = TestResponse.new opts + assert cookie_acceptable?(opts, r, c) - # * The value for the Domain attribute contains no embedded dots - # or does not start with a dot. + # * The value for the Domain attribute contains no embedded dots + # or does not start with a dot. - opts = { :host => 'rufus.rubyforge.org', :path => '/' } - c = TestCookie.new 'rufus.rubyforge.org', '/' - r = TestResponse.new opts - assert ! cookie_acceptable?(opts, r, c) + opts = { :host => 'rufus.rubyforge.org', :path => '/' } + c = TestCookie.new 'rufus.rubyforge.org', '/' + r = TestResponse.new opts + assert ! cookie_acceptable?(opts, r, c) - opts = { :host => 'rufus.rubyforge.org', :path => '/' } - c = TestCookie.new 'org', '/' - r = TestResponse.new opts - assert ! cookie_acceptable?(opts, r, c) + opts = { :host => 'rufus.rubyforge.org', :path => '/' } + c = TestCookie.new 'org', '/' + r = TestResponse.new opts + assert ! cookie_acceptable?(opts, r, c) - # * The value for the Path attribute is not a prefix of the - # request-URI. + # * The value for the Path attribute is not a prefix of the + # request-URI. - opts = { :host => 'rufus.rubyforge.org', :path => '/this' } - c = TestCookie.new '.rubyforge.org', '/that' - r = TestResponse.new opts - assert ! cookie_acceptable?(opts, r, c) + opts = { :host => 'rufus.rubyforge.org', :path => '/this' } + c = TestCookie.new '.rubyforge.org', '/that' + r = TestResponse.new opts + assert ! cookie_acceptable?(opts, r, c) - # * The value for the request-host does not domain-match the - # Domain attribute. + # * The value for the request-host does not domain-match the + # Domain attribute. - opts = { :host => 'rufus.rubyforg.org', :path => '/' } - c = TestCookie.new '.rubyforge.org', '/' - r = TestResponse.new opts - assert ! cookie_acceptable?(opts, r, c) + opts = { :host => 'rufus.rubyforg.org', :path => '/' } + c = TestCookie.new '.rubyforge.org', '/' + r = TestResponse.new opts + assert ! cookie_acceptable?(opts, r, c) - # * The request-host is a FQDN (not IP address) and has the form - # HD, where D is the value of the Domain attribute, and H is a - # string that contains one or more dots. - - # implicit... - end + # * The request-host is a FQDN (not IP address) and has the form + # HD, where D is the value of the Domain attribute, and H is a + # string that contains one or more dots. - #def test_webrick_cookie - # require 'webrick/cookie' - # cookie = "PREF=ID=18da97219de4985:TM=12007507:LM=12007507:S=Guc1JcA15ySZYl2n; expires=Mon, 18-Jan-2010 09:30:37 GMT; path=/; domain=.google.com" - # p WEBrick::Cookie.parse_set_cookie(cookie) - # p Rufus::Verbs::Cookie.parse_set_cookie(cookie) - #end + # implicit... + end - protected + #def test_webrick_cookie + # require 'webrick/cookie' + # cookie = "PREF=ID=18da97219de4985:TM=12007507:LM=12007507:S=Guc1JcA15ySZYl2n; expires=Mon, 18-Jan-2010 09:30:37 GMT; path=/; domain=.google.com" + # p WEBrick::Cookie.parse_set_cookie(cookie) + # p Rufus::Verbs::Cookie.parse_set_cookie(cookie) + #end - class TestCookie + protected - attr_reader :domain, :path, :name + class TestCookie - def initialize (domain=nil, path=nil, name='whatever') + attr_reader :domain, :path, :name - @domain = domain - @path = path - @name = name - end - end + def initialize (domain=nil, path=nil, name='whatever') - class TestResponse + @domain = domain + @path = path + @name = name + end + end - def initialize (opts) + class TestResponse - @path = opts[:path] - end + def initialize (opts) - def request + @path = opts[:path] + end + + def request - r = Object.new - class << r - attr_accessor :path - end - r.path = @path - r - end - end + r = Object.new + class << r + attr_accessor :path + end + r.path = @path + r + end + end end test/cookie0_test.rb @@ -7,54 +7,52 @@ # Sun Jan 13 12:33:03 JST 2008 # -require 'test/unit' -require 'testbase' -require 'rufus/verbs' +require File.dirname(__FILE__) + '/base.rb' class Cookie1Test < Test::Unit::TestCase - include TestBaseMixin + include TestBaseMixin - include Rufus::Verbs + include Rufus::Verbs - def test_0 + def test_0 - ep = EndPoint.new :cookies => true - class << ep - attr_reader :cookies - end + ep = EndPoint.new :cookies => true + class << ep + attr_reader :cookies + end - assert_equal 0, ep.cookies.size + assert_equal 0, ep.cookies.size - ep.get :uri => "http://localhost:7777/cookie" - assert_equal 1, ep.cookies.size + ep.get :uri => "http://localhost:7777/cookie" + assert_equal 1, ep.cookies.size - req = ep.get :uri => "http://localhost:7777/cookie", :dry_run => true - assert_match /^tcookie=\d*$/, req['Cookie'] - end + req = ep.get :uri => "http://localhost:7777/cookie", :dry_run => true + assert_match /^tcookie=\d*$/, req['Cookie'] + end - def test_1 + def test_1 - ep0 = EndPoint.new :cookies => true - ep1 = EndPoint.new :cookies => true + ep0 = EndPoint.new :cookies => true + ep1 = EndPoint.new :cookies => true - ep0.post("http://localhost:7777/cookie") { "smurf0" } - ep1.post("http://localhost:7777/cookie") { "smurf1" } + ep0.post("http://localhost:7777/cookie") { "smurf0" } + ep1.post("http://localhost:7777/cookie") { "smurf1" } - expect 200, [ 'smurf0' ], ep0.get("http://localhost:7777/cookie") - expect 200, [ 'smurf1' ], ep1.get("http://localhost:7777/cookie") - end + expect 200, [ 'smurf0' ], ep0.get("http://localhost:7777/cookie") + expect 200, [ 'smurf1' ], ep1.get("http://localhost:7777/cookie") + end - def test_2 + def test_2 - ep = EndPoint.new :cookies => false # explicitely + ep = EndPoint.new :cookies => false # explicitely - res0 = ep.post("http://localhost:7777/cookie") { "smurf0" } - res1 = expect 200, [], ep.get("http://localhost:7777/cookie") + res0 = ep.post("http://localhost:7777/cookie") { "smurf0" } + res1 = expect 200, [], ep.get("http://localhost:7777/cookie") - assert_not_equal res0['Set-Cookie'], res1['Set-Cookie'] - end + assert_not_equal res0['Set-Cookie'], res1['Set-Cookie'] + end end test/cookie1_test.rb @@ -7,64 +7,63 @@ # Tue Jan 15 09:26:45 JST 2008 # -require 'test/unit' -require 'rufus/verbs' +require File.dirname(__FILE__) + '/base.rb' class DryRunTest < Test::Unit::TestCase - include Rufus::Verbs + include Rufus::Verbs - def test_0 + def test_0 - req = put( - :dry_run => true, - :uri => "http://localhost:7777/items/1", - :params => { "a" => "A", :b => :B }) + req = put( + :dry_run => true, + :uri => "http://localhost:7777/items/1", + :params => { "a" => "A", :b => :B }) - assert_equal "/items/1?a=A&b=B", req.path + assert_equal "/items/1?a=A&b=B", req.path - req = post( - :dry_run => true, - :uri => "http://localhost:7777/items/1", - :params => { "a" => "A", :b => :B }) + req = post( + :dry_run => true, + :uri => "http://localhost:7777/items/1", + :params => { "a" => "A", :b => :B }) - assert_equal "/items/1?a=A&b=B", req.path + assert_equal "/items/1?a=A&b=B", req.path - req = put( - :dry_run => true, - :uri => "http://localhost:7777/items/1", - :query => { "a" => "A", :b => :B }) + req = put( + :dry_run => true, + :uri => "http://localhost:7777/items/1", + :query => { "a" => "A", :b => :B }) - assert_equal "/items/1?a=A&b=B", req.path + assert_equal "/items/1?a=A&b=B", req.path - req = put( - "http://localhost:7777/items/1?a=A", :d => "toto", :dry_run => true) + req = put( + "http://localhost:7777/items/1?a=A", :d => "toto", :dry_run => true) - assert_equal "/items/1?a=A", req.path - assert_equal "toto", req.body - end + assert_equal "/items/1?a=A", req.path + assert_equal "toto", req.body + end - def test_1 + def test_1 - ep = Rufus::Verbs::EndPoint.new( - :host => 'localhost', - :resource => 'whatever') + ep = Rufus::Verbs::EndPoint.new( + :host => 'localhost', + :resource => 'whatever') - req = ep.get( - :dry_run => true, - :resource => 'other', - :params => { 'a' => 'A', 'b' => 'B' }) + req = ep.get( + :dry_run => true, + :resource => 'other', + :params => { 'a' => 'A', 'b' => 'B' }) - assert_equal "/other?a=A&b=B", req.path + assert_equal "/other?a=A&b=B", req.path - req = ep.post( - :dry_run => true, - :resource => 'other', - :query => { 'a' => 'A', 'b' => 'B' }) - - assert_equal "/other?a=A&b=B", req.path - end + req = ep.post( + :dry_run => true, + :resource => 'other', + :query => { 'a' => 'A', 'b' => 'B' }) + + assert_equal "/other?a=A&b=B", req.path + end end test/dryrun_test.rb @@ -7,32 +7,30 @@ # Tue Feb 12 23:10:54 JST 2008 # -require 'test/unit' - -require 'rufus/verbs' +require File.dirname(__FILE__) + '/base.rb' class EscapeTest < Test::Unit::TestCase - include Rufus::Verbs + include Rufus::Verbs - def test_0 + def test_0 - req = put( - :dry_run => true, - :uri => "http://localhost:7777/items/1", - :query => { "a" => "hontou ni ?" }) + req = put( + :dry_run => true, + :uri => "http://localhost:7777/items/1", + :query => { "a" => "hontou ni ?" }) - assert_equal "/items/1?a=hontou%20ni%20?", req.path + assert_equal "/items/1?a=hontou%20ni%20?", req.path - req = put( - :dry_run => true, - :uri => "http://localhost:7777/items/1", - :params => { "a" => "hontou ni ?" }, - :no_escape => true) + req = put( + :dry_run => true, + :uri => "http://localhost:7777/items/1", + :params => { "a" => "hontou ni ?" }, + :no_escape => true) - assert_equal "/items/1?a=hontou ni ?", req.path - # would fail anyway... - end + assert_equal "/items/1?a=hontou ni ?", req.path + # would fail anyway... + end end test/escape_test.rb @@ -7,54 +7,52 @@ # Mon Feb 18 13:00:36 JST 2008 # -require 'test/unit' -require 'testbase' -require 'rufus/verbs' +require File.dirname(__FILE__) + '/base.rb' class UriTest < Test::Unit::TestCase - include TestBaseMixin + include TestBaseMixin - include Rufus::Verbs + include Rufus::Verbs - def test_0 + def test_0 - uri = "http://localhost:7777/items" + uri = "http://localhost:7777/items" - res = fopen uri - assert_equal 200, res.code.to_i - assert_equal "{}", res.body.strip + res = fopen uri + assert_equal 200, res.code.to_i + assert_equal "{}", res.body.strip - res = fopen "file:CHANGELOG.txt" - assert_kind_of String, res.read + res = fopen "file:CHANGELOG.txt" + assert_kind_of String, res.read - res = fopen "CHANGELOG.txt" - assert_kind_of String, res.read + res = fopen "CHANGELOG.txt" + assert_kind_of String, res.read - res = fopen "http://localhost:7777/things" - assert_equal 200, res.code.to_i - assert_equal "{}", res.body.strip - # - # it follows redirections :) + res = fopen "http://localhost:7777/things" + assert_equal 200, res.code.to_i + assert_equal "{}", res.body.strip + # + # it follows redirections :) - res = fopen "http://localhost:7777/things", :noredir => true - assert_equal 303, res.code.to_i + res = fopen "http://localhost:7777/things", :noredir => true + assert_equal 303, res.code.to_i - fopen "CHANGELOG.txt" do |f| - assert_kind_of String, f.read - end + fopen "CHANGELOG.txt" do |f| + assert_kind_of String, f.read + end - fopen "http://localhost:7777/things" do |res| - assert_equal 200, res.code.to_i - assert_equal "{}", res.body.strip - end + fopen "http://localhost:7777/things" do |res| + assert_equal 200, res.code.to_i + assert_equal "{}", res.body.strip end + end - def test_1 + def test_1 - assert_kind_of String, fopen("CHANGELOG.txt").read - assert_kind_of String, fopen("file:CHANGELOG.txt").read - assert_kind_of String, fopen("http://localhost:7777/items").read - end + assert_kind_of String, fopen("CHANGELOG.txt").read + assert_kind_of String, fopen("file:CHANGELOG.txt").read + assert_kind_of String, fopen("http://localhost:7777/items").read + end end test/fopen_test.rb @@ -7,38 +7,33 @@ # Mon Jan 14 00:07:38 JST 2008 # -require 'rubygems' - -require 'test/unit' -require 'testbase' - -require 'rufus/verbs' +require File.dirname(__FILE__) + '/base.rb' class HttpsTest < Test::Unit::TestCase - include TestBaseMixin + include TestBaseMixin - include Rufus::Verbs + include Rufus::Verbs - def setup - # no need for an items server - end + def setup + # no need for an items server + end - def teardown - end + def teardown + end - def test_0 + def test_0 - res = expect( - 200, - nil, - get(:uri => "https://jmettraux.wordpress.com/2006/03/31/cvs-down/")) + res = expect( + 200, + nil, + get(:uri => "https://jmettraux.wordpress.com/2006/03/31/cvs-down/")) - #res.each_header do |h| - # p h - #end + #res.each_header do |h| + # p h + #end - #puts res.body - assert res.body.match "^<!DOCTYPE html PUBLIC" - end + #puts res.body + assert res.body.match "^<!DOCTYPE html PUBLIC" + end end test/https_test.rb @@ -7,62 +7,60 @@ # Sun Jan 13 12:33:03 JST 2008 # -require 'test/unit' -require 'testbase' -require 'rufus/verbs' +require File.dirname(__FILE__) + '/base.rb' class ItemConditionalTest < Test::Unit::TestCase - include TestBaseMixin + include TestBaseMixin - include Rufus::Verbs + include Rufus::Verbs - def test_0 + def test_0 - require 'open-uri' - f = open "http://localhost:7777/items" - d = f.read - f.close + require 'open-uri' + f = open "http://localhost:7777/items" + d = f.read + f.close - assert_equal "{}", d.strip - end + assert_equal "{}", d.strip + end - def test_1 + def test_1 - res = get :uri => "http://localhost:7777/items" + res = get :uri => "http://localhost:7777/items" - assert_equal 200, res.code.to_i - assert_equal "{}", res.body.strip + assert_equal 200, res.code.to_i + assert_equal "{}", res.body.strip - p res['Etag'] - #p res['Last-Modified'] - assert res['Etag'].length > 0 - assert res['Last-Modified'].length > 0 - end + p res['Etag'] + #p res['Last-Modified'] + assert res['Etag'].length > 0 + assert res['Last-Modified'].length > 0 + end - def test_2 + def test_2 - res = get "http://localhost:7777/items" - assert_equal 200, res.code.to_i + res = get "http://localhost:7777/items" + assert_equal 200, res.code.to_i - lm = res['Last-Modified'] - etag = res['Etag'] + lm = res['Last-Modified'] + etag = res['Etag'] - res = get( - "http://localhost:7777/items", - :headers => { 'If-Modified-Since' => lm }) - assert_equal 304, res.code.to_i + res = get( + "http://localhost:7777/items", + :headers => { 'If-Modified-Since' => lm }) + assert_equal 304, res.code.to_i - res = get( - "http://localhost:7777/items", :h => { 'If-None-Match' => etag }) - assert_equal 304, res.code.to_i + res = get( + "http://localhost:7777/items", :h => { 'If-None-Match' => etag }) + assert_equal 304, res.code.to_i - res = get( - "http://localhost:7777/items", - :h => { 'If-Modified-Since' => lm, 'If-None-Match' => etag }) - assert_equal 304, res.code.to_i - end + res = get( + "http://localhost:7777/items", + :h => { 'If-Modified-Since' => lm, 'If-None-Match' => etag }) + assert_equal 304, res.code.to_i + end end test/iconditional_test.rb @@ -19,36 +19,36 @@ $dcount = 0 # tracking the number of hits when doing digest auth # class LastModifiedHash - def initialize + def initialize - @hash = {} - touch - end + @hash = {} + touch + end - def touch (key=nil) + def touch (key=nil) - now = Time.now.httpdate - @hash[key] = now if key - @hash['__self'] = now - end + now = Time.now.httpdate + @hash[key] = now if key + @hash['__self'] = now + end - def delete (key) + def delete (key) - @hash.delete key - @hash['__self'] = Time.now.httpdate - end + @hash.delete key + @hash['__self'] = Time.now.httpdate + end - def last_modified (key) + def last_modified (key) - key = key || '__self' - @hash[key] - end + key = key || '__self' + @hash[key] + end - def clear + def clear - @hash.clear - @hash['__self'] = Time.now.httpdate - end + @hash.clear + @hash['__self'] = Time.now.httpdate + end end @@ -57,173 +57,173 @@ end # class ItemServlet < WEBrick::HTTPServlet::AbstractServlet - @@items = {} - @@last_item_id = -1 + @@items = {} + @@last_item_id = -1 - @@lastmod = LastModifiedHash.new + @@lastmod = LastModifiedHash.new - @@authenticator = WEBrick::HTTPAuth::DigestAuth.new( - :UserDB => WEBrick::HTTPAuth::Htdigest.new('test/test.htdigest'), - :Realm => 'test_realm') + @@authenticator = WEBrick::HTTPAuth::DigestAuth.new( + :UserDB => WEBrick::HTTPAuth::Htdigest.new('test/test.htdigest'), + :Realm => 'test_realm') - def initialize (server, *options) + def initialize (server, *options) - super - @auth = server.auth - end + super + @auth = server.auth + end - # - # Overriding the service() method to perform a potential auth check - # - def service (req, res) + # + # Overriding the service() method to perform a potential auth check + # + def service (req, res) - if @auth == :basic + if @auth == :basic - WEBrick::HTTPAuth.basic_auth(req, res, "items") do |u, p| - (u != nil and u == p) - end + WEBrick::HTTPAuth.basic_auth(req, res, "items") do |u, p| + (u != nil and u == p) + end - elsif @auth == :digest + elsif @auth == :digest - $dcount += 1 - @@authenticator.authenticate(req, res) - end - - super + $dcount += 1 + @@authenticator.authenticate(req, res) end - def do_GET (req, res) + super + end + + def do_GET (req, res) - i = item_id req + i = item_id req - return reply(res, 404, "no item '#{i}'") \ - if i and not items[i] + return reply(res, 404, "no item '#{i}'") \ + if i and not items[i] - representation, et, lm = fetch_representation i + representation, et, lm = fetch_representation i - since = req['If-Modified-Since'] - since = DateTime.parse(since) if since - match = req['If-None-Match'] + since = req['If-Modified-Since'] + since = DateTime.parse(since) if since + match = req['If-None-Match'] - if ((not since and not match) or - (since and (since > DateTime.parse(lm))) or - (match and (match != et))) + if ((not since and not match) or + (since and (since > DateTime.parse(lm))) or + (match and (match != et))) - res['Etag'] = et - res['Last-Modified'] = lm - res.body = representation.inspect + "\n" + res['Etag'] = et + res['Last-Modified'] = lm + res.body = representation.inspect + "\n" - else + else - reply(res, 304, "Not Modified") - end + reply(res, 304, "Not Modified") end + end - def do_POST (req, res) + def do_POST (req, res) - query = WEBrick::HTTPUtils::parse_query(req.query_string) - m = query['_method'] - m = m.downcase if m - return do_PUT(req, res) if m == 'put' - return do_DELETE(req, res) if m == 'delete' + query = WEBrick::HTTPUtils::parse_query(req.query_string) + m = query['_method'] + m = m.downcase if m + return do_PUT(req, res) if m == 'put' + return do_DELETE(req, res) if m == 'delete' - i = item_id req + i = item_id req - i = (@@last_item_id += 1) unless i + i = (@@last_item_id += 1) unless i - items[i] = req.body - lastmod.touch i + items[i] = req.body + lastmod.touch i - res['Location'] = "#{@host}/items/#{i}" - reply res, 201, "item created" - end + res['Location'] = "#{@host}/items/#{i}" + reply res, 201, "item created" + end - def do_PUT (req, res) + def do_PUT (req, res) - i = item_id req + i = item_id req - return reply(res, 404, "no item '#{i}'") unless items[i] + return reply(res, 404, "no item '#{i}'") unless items[i] - items[i] = req.body - lastmod.touch i + items[i] = req.body + lastmod.touch i - reply res, 200, "item updated" - end + reply res, 200, "item updated" + end - def do_DELETE (req, res) + def do_DELETE (req, res) - i = item_id req + i = item_id req - return reply(res, 404, "no item '#{i}'") unless items[i] + return reply(res, 404, "no item '#{i}'") unless items[i] - items.delete i - lastmod.delete i + items.delete i + lastmod.delete i - reply res, 200, "item deleted" - end + reply res, 200, "item deleted" + end - # - # clears the items - # - def self.flush + # + # clears the items + # + def self.flush - @@items.clear - @@lastmod.clear - end + @@items.clear + @@lastmod.clear + end - protected + protected - def items - @@items - end + def items + @@items + end - def lastmod - @@lastmod - end + def lastmod + @@lastmod + end - def is_modified (req, key) + def is_modified (req, key) - since = req['If-Modified-Since'] - match = req['If-None-Match'] + since = req['If-Modified-Since'] + match = req['If-None-Match'] - return true unless since or match + return true unless since or match - #puts - #p [ since, match ] - #puts + #puts + #p [ since, match ] + #puts - (since or match) - end + (since or match) + end - # - # Returns representation, etag, last_modified - # - def fetch_representation (key=nil) + # + # Returns representation, etag, last_modified + # + def fetch_representation (key=nil) - representation = if key - items[key] - else - items - end + representation = if key + items[key] + else + items + end - [ representation, - representation.inspect.hash.to_s, - lastmod.last_modified(key) ] - end + [ representation, + representation.inspect.hash.to_s, + lastmod.last_modified(key) ] + end - def reply (res, code, message) + def reply (res, code, message) - res.status = code - res.body = message + "\n" - res['Content-type'] = "text/plain" - end + res.status = code + res.body = message + "\n" + res['Content-type'] = "text/plain" + end - def item_id (req) + def item_id (req) - p = req.path_info[1..-1] - return nil if not p or p == '' - p.to_i - end + p = req.path_info[1..-1] + return nil if not p or p == '' + p.to_i + end end # @@ -231,12 +231,12 @@ end # class ThingServlet < WEBrick::HTTPServlet::AbstractServlet - def do_GET (req, res) + def do_GET (req, res) - res.set_redirect( - WEBrick::HTTPStatus[303], - "http://localhost:7777/items") - end + res.set_redirect( + WEBrick::HTTPStatus[303], + "http://localhost:7777/items") + end end # @@ -244,35 +244,35 @@ end # class CookieServlet < WEBrick::HTTPServlet::AbstractServlet - @@sessions = {} + @@sessions = {} - def do_GET (req, res) + def do_GET (req, res) - res.body = get_session(req, res).inspect - end + res.body = get_session(req, res).inspect + end - def do_POST (req, res) + def do_POST (req, res) - get_session(req, res) << req.body.strip - res.body = "ok." - end + get_session(req, res) << req.body.strip + res.body = "ok." + end - protected + protected - def get_session (req, res) + def get_session (req, res) - c = req.cookies.find { |c| c.name == 'tcookie' } + c = req.cookies.find { |c| c.name == 'tcookie' } - if c - @@sessions[c.value] - else - s = [] - key = (Time.now.to_f * 100000).to_i.to_s - @@sessions[key] = s - res.cookies << WEBrick::Cookie.new('tcookie', key) - s - end - end + if c + @@sessions[c.value] + else + s = [] + key = (Time.now.to_f * 100000).to_i.to_s + @@sessions[key] = s + res.cookies << WEBrick::Cookie.new('tcookie', key) + s + end + end end # @@ -280,10 +280,10 @@ end # class LostServlet < WEBrick::HTTPServlet::AbstractServlet - def do_GET (req, res) + def do_GET (req, res) - sleep 200 - end + sleep 200 + end end # @@ -292,42 +292,42 @@ end # class ItemServer - def initialize (args={}) + def initialize (args={}) - port = args[:port] || 7777 + port = args[:port] || 7777 - #al = [ - # [ "", WEBrick::AccessLog::COMMON_LOG_FORMAT ], - # [ "", WEBrick::AccessLog::REFERER_LOG_FORMAT ]] + #al = [ + # [ "", WEBrick::AccessLog::COMMON_LOG_FORMAT ], + # [ "", WEBrick::AccessLog::REFERER_LOG_FORMAT ]] - @server = WEBrick::HTTPServer.new :Port => port, :AccessLog => nil + @server = WEBrick::HTTPServer.new :Port => port, :AccessLog => nil - class << @server - attr_accessor :auth - end + class << @server + attr_accessor :auth + end - @server.auth = args[:auth] + @server.auth = args[:auth] - @server.mount "/items", ItemServlet - @server.mount "/things", ThingServlet - @server.mount "/cookie", CookieServlet - @server.mount "/lost", LostServlet + @server.mount "/items", ItemServlet + @server.mount "/things", ThingServlet + @server.mount "/cookie", CookieServlet + @server.mount "/lost", LostServlet - [ 'INT', 'TERM' ].each do |signal| - trap(signal) { shutdown } - end + [ 'INT', 'TERM' ].each do |signal| + trap(signal) { shutdown } end + end - def start + def start - Thread.new { @server.start } - # else the server and the test lock each other - end + Thread.new { @server.start } + # else the server and the test lock each other + end - def shutdown + def shutdown - ItemServlet.flush - @server.shutdown - end + ItemServlet.flush + @server.shutdown + end end test/items.rb @@ -7,85 +7,83 @@ # Thu Jan 17 10:15:52 JST 2008 # -require 'timeout' -require 'test/unit' -require 'rufus/verbs' +require File.dirname(__FILE__) + '/base.rb' class ProxyTest < Test::Unit::TestCase - include Rufus::Verbs + include Rufus::Verbs - def test_0 + def test_0 - uri = "http://rufus.rubyforge.org/rufus-verbs/index.html" + uri = "http://rufus.rubyforge.org/rufus-verbs/index.html" - res0 = get(uri, :proxy => false) + res0 = get(uri, :proxy => false) - assert_not_nil res0.body # just displaying the test dot + assert_not_nil res0.body # just displaying the test dot - proxies = find_proxies + proxies = find_proxies - res1 = nil + res1 = nil - proxies.each do |proxy| - begin - Timeout::timeout 2 do - res1 = get(uri, :proxy => proxy) - end - break if res1.code.to_i == 200 - rescue Exception => e - puts "skipped proxy '#{proxy}'" - end + proxies.each do |proxy| + begin + Timeout::timeout 2 do + res1 = get(uri, :proxy => proxy) end + break if res1.code.to_i == 200 + rescue Exception => e + puts "skipped proxy '#{proxy}'" + end + end - if res1.code.to_i != 200 - puts - puts - puts "sorry, couldn't find an open proxy, couldn't test the" - puts "proxy feature of 'rufus-verbs'" - puts - puts - return - end + if res1.code.to_i != 200 + puts + puts + puts "sorry, couldn't find an open proxy, couldn't test the" + puts "proxy feature of 'rufus-verbs'" + puts + puts + return + end - assert_equal res0.body.length, res1.body.length + assert_equal res0.body.length, res1.body.length - #p res0.to_hash - #p res1.to_hash + #p res0.to_hash + #p res1.to_hash - via1 = res1["via"] + via1 = res1["via"] - unless via1 - puts - puts - puts "seems like no open proxy could be found... no via..." - puts "can't test for now" - puts - puts - return - end + unless via1 + puts + puts + puts "seems like no open proxy could be found... no via..." + puts "can't test for now" + puts + puts + return + end - via1 = res1["via"].split(", ")[-1] - # last proxy + via1 = res1["via"].split(", ")[-1] + # last proxy - assert_no_match /wikimedia\.org/, via1 - # making sure that the proxy was not one of wikipedia - end + assert_no_match /wikimedia\.org/, via1 + # making sure that the proxy was not one of wikipedia + end - protected + protected - def find_proxies + def find_proxies - res = get "http://freeproxy.ch/proxy.txt" - lines = res.body.split "\n" - lines[4..-1].collect do |line| - l = line.split("\t") - 'http://' + l[0] - end - end + res = get "http://freeproxy.ch/proxy.txt" + lines = res.body.split "\n" + lines[4..-1].collect do |line| + l = line.split("\t") + 'http://' + l[0] + end + end end test/proxy_test.rb @@ -7,34 +7,32 @@ # Sun Jan 13 20:02:25 JST 2008 # -require 'test/unit' -require 'testbase' -require 'rufus/verbs' +require File.dirname(__FILE__) + '/base.rb' class RedirTest < Test::Unit::TestCase - include TestBaseMixin + include TestBaseMixin - include Rufus::Verbs + include Rufus::Verbs - def test_0 + def test_0 - expect 200, {}, get(:uri => "http://localhost:7777/things") - end + expect 200, {}, get(:uri => "http://localhost:7777/things") + end - # - # testing the :no_redirections directive - # - def test_1 + # + # testing the :no_redirections directive + # + def test_1 - res = get "http://localhost:7777/things", :no_redirections => true - assert_equal 303, res.code.to_i + res = get "http://localhost:7777/things", :no_redirections => true + assert_equal 303, res.code.to_i - res = get("http://localhost:7777/things", :noredir => true) - assert_equal 303, res.code.to_i + res = get("http://localhost:7777/things", :noredir => true) + assert_equal 303, res.code.to_i - expect 200, {}, get("http://localhost:7777/items", :noredir => true) - end + expect 200, {}, get("http://localhost:7777/items", :noredir => true) + end end test/redir_test.rb @@ -7,121 +7,116 @@ # Sun Jan 13 12:33:03 JST 2008 # -require 'rubygems' - -require 'test/unit' -require 'testbase' - -require 'rufus/verbs' +require File.dirname(__FILE__) + '/base.rb' class SimpleTest < Test::Unit::TestCase - include TestBaseMixin - - include Rufus::Verbs + include TestBaseMixin + include Rufus::Verbs - def test_0 - #res = get :uri => "http://localhost:7777/items" - #assert_equal 200, res.code.to_i - #assert_equal "{}", res.body.strip - expect 200, {}, get(:uri => "http://localhost:7777/items") + def test_0 - res = post :uri => "http://localhost:7777/items/0", :d => "Toto" - assert_equal 201, res.code.to_i - assert_equal "http://localhost:7777/items/0", res['Location'] + #res = get :uri => "http://localhost:7777/items" + #assert_equal 200, res.code.to_i + #assert_equal "{}", res.body.strip + expect 200, {}, get(:uri => "http://localhost:7777/items") - expect 200, { 0 => "Toto" }, get(:uri => "http://localhost:7777/items") + res = post :uri => "http://localhost:7777/items/0", :d => "Toto" + assert_equal 201, res.code.to_i + assert_equal "http://localhost:7777/items/0", res['Location'] - res = get :host => "localhost", :port => 7777, :path => "/items" - assert_equal 200, res.code.to_i - assert_equal ({ 0 => "Toto" }), eval(res.body) + expect 200, { 0 => "Toto" }, get(:uri => "http://localhost:7777/items") - res = put :uri => "http://localhost:7777/items/0", :d => "Toto2" - assert_equal 200, res.code.to_i + res = get :host => "localhost", :port => 7777, :path => "/items" + assert_equal 200, res.code.to_i + assert_equal ({ 0 => "Toto" }), eval(res.body) - expect 200, { 0 => "Toto2" }, get(:uri => "http://localhost:7777/items") + res = put :uri => "http://localhost:7777/items/0", :d => "Toto2" + assert_equal 200, res.code.to_i - res = put :uri => "http://localhost:7777/items/0", :d => "Toto3", :fake_put => true - assert_equal 200, res.code.to_i + expect 200, { 0 => "Toto2" }, get(:uri => "http://localhost:7777/items") - expect 200, { 0 => "Toto3" }, get(:uri => "http://localhost:7777/items") - end + res = put :uri => "http://localhost:7777/items/0", :d => "Toto3", :fake_put => true + assert_equal 200, res.code.to_i - def test_0b + expect 200, { 0 => "Toto3" }, get(:uri => "http://localhost:7777/items") + end - expect 200, {}, get(:uri => "http://localhost:7777/items") + def test_0b - res = post :uri => "http://localhost:7777/items", :d => "Toto" - assert_equal 201, res.code.to_i - assert_equal "http://localhost:7777/items/0", res['Location'] + expect 200, {}, get(:uri => "http://localhost:7777/items") - expect 200, "\"Toto\"", get(:uri => "http://localhost:7777/items/0") + res = post :uri => "http://localhost:7777/items", :d => "Toto" + assert_equal 201, res.code.to_i + assert_equal "http://localhost:7777/items/0", res['Location'] - res = post :uri => "http://localhost:7777/items", :d => "Smurf" - assert_equal 201, res.code.to_i - assert_equal "http://localhost:7777/items/1", res['Location'] + expect 200, "\"Toto\"", get(:uri => "http://localhost:7777/items/0") - expect 200, "\"Smurf\"", get(:uri => "http://localhost:7777/items/1") - end + res = post :uri => "http://localhost:7777/items", :d => "Smurf" + assert_equal 201, res.code.to_i + assert_equal "http://localhost:7777/items/1", res['Location'] - def test_1 + expect 200, "\"Smurf\"", get(:uri => "http://localhost:7777/items/1") + end - ep = EndPoint.new(:host => "localhost", :port => 7777) - expect 200, {}, ep.get(:resource => "items") + def test_1 - res = ep.put :resource => "items", :id => 0 do - "blockdata" - end - assert_equal 404, res.code.to_i + ep = EndPoint.new(:host => "localhost", :port => 7777) + expect 200, {}, ep.get(:resource => "items") - res = ep.post :resource => "items", :id => 0 do - "blockdata" - end - assert_equal 201, res.code.to_i - assert_equal "http://localhost:7777/items/0", res['Location'] + res = ep.put :resource => "items", :id => 0 do + "blockdata" + end + assert_equal 404, res.code.to_i - expect 200, { 0 => "blockdata" }, ep.get(:res => "items") + res = ep.post :resource => "items", :id => 0 do + "blockdata" end + assert_equal 201, res.code.to_i + assert_equal "http://localhost:7777/items/0", res['Location'] - def test_2 + expect 200, { 0 => "blockdata" }, ep.get(:res => "items") + end - s = get(:uri => "http://localhost:7777/items", :body => true) - assert_equal "{}", s.strip - end + def test_2 - # - # The "no-path" test - # - def test_3 + s = get(:uri => "http://localhost:7777/items", :body => true) + assert_equal "{}", s.strip + end - r = get "http://rufus.rubyforge.org" - assert_kind_of Net::HTTPOK, r - end + # + # The "no-path" test + # + def test_3 - # - # HEAD - # - def test_4 + r = get "http://rufus.rubyforge.org" + assert_kind_of Net::HTTPOK, r + end - res = head "http://localhost:7777/items" - assert_equal 200, res.code.to_i - assert_nil res.body - end + # + # HEAD + # + def test_4 - # - # OPTIONS - # - def test_5 + res = head "http://localhost:7777/items" + assert_equal 200, res.code.to_i + assert_nil res.body + end - r = options "http://localhost:7777/items" - assert_equal [ :delete, :get, :head, :options, :post, :put], r - end + # + # OPTIONS + # + def test_5 - def test_6 + r = options "http://localhost:7777/items" + assert_equal [ :delete, :get, :head, :options, :post, :put], r + end - r = Rufus::Verbs::options "http://localhost:7777/items" - assert_equal [ :delete, :get, :head, :options, :post, :put], r - end + def test_6 + + r = Rufus::Verbs::options "http://localhost:7777/items" + assert_equal [ :delete, :get, :head, :options, :post, :put], r + end end test/simple_test.rb @@ -1,28 +1,24 @@ -require 'rubygems' - - -require 'dryrun_test' -require 'iconditional_test' - -require 'simple_test' - -require 'auth0_test' -require 'auth1_test' - -require 'redir_test' -require 'block_test' -require 'https_test' -require 'proxy_test' - -require 'conditional_test' -require 'cookie0_test' -require 'cookie1_test' - -require 'escape_test' - -require 'uri_test' -require 'fopen_test' - -require 'timeout_test' +#require 'dryrun_test' +#require 'iconditional_test' +#require 'simple_test' +#require 'auth0_test' +#require 'auth1_test' +#require 'redir_test' +#require 'block_test' +#require 'https_test' +#require 'proxy_test' +#require 'conditional_test' +#require 'cookie0_test' +#require 'cookie1_test' +#require 'escape_test' +#require 'uri_test' +#require 'fopen_test' +#require 'timeout_test' + +dirpath = File.dirname(__FILE__) + +tests = Dir.new(dirpath).entries.select { |e| e.match(/\_test\.rb$/) }.sort + +tests.each { |t| load "#{dirpath}/#{t}" } test/test.rb @@ -7,32 +7,28 @@ # Mon May 26 17:04:25 JST 2008 # -require 'rubygems' - -require 'test/unit' -require 'testbase' - -require 'rufus/verbs' +require File.dirname(__FILE__) + '/base.rb' class TimeoutTest < Test::Unit::TestCase - include TestBaseMixin - - include Rufus::Verbs + include TestBaseMixin + include Rufus::Verbs - def test_0 - error = nil - t = Time.now + def test_0 - begin - get :uri => "http://localhost:7777/lost", :to => 1 - rescue Timeout::Error => e - error = e - end + error = nil + t = Time.now - assert_not_nil error - assert (Time.now - t < 2) + begin + get :uri => "http://localhost:7777/lost", :to => 1 + rescue Timeout::Error => e + error = e end + + assert_not_nil error + assert (Time.now - t < 2) + end end + test/timeout_test.rb @@ -7,27 +7,25 @@ # Mon Feb 18 11:05:07 JST 2008 # -require 'test/unit' -require 'testbase' -require 'rufus/verbs' +require File.dirname(__FILE__) + '/base.rb' class UriTest < Test::Unit::TestCase - include TestBaseMixin + include TestBaseMixin - include Rufus::Verbs + include Rufus::Verbs - def test_0 + def test_0 - uri = URI.parse "http://localhost:7777/items" + uri = URI.parse "http://localhost:7777/items" - res = get :uri => uri - assert_equal 200, res.code.to_i - assert_equal "{}", res.body.strip + res = get :uri => uri + assert_equal 200, res.code.to_i + assert_equal "{}", res.body.strip - res = get uri - assert_equal 200, res.code.to_i - assert_equal "{}", res.body.strip - end + res = get uri + assert_equal 200, res.code.to_i + assert_equal "{}", res.body.strip + end end test/uri_test.rb test/testbase.rb 2227f78519a2e862403baaa17c1592bdccfd0912 John Mettraux jmettraux@gmail.com http://github.com/jmettraux/rufus-verbs/commit/3159e3a12c41e0aafbba7d4f1a3f7e1f604186cc 3159e3a12c41e0aafbba7d4f1a3f7e1f604186cc 2009-03-23T17:33:50-07:00 2009-03-23T17:33:50-07:00 spring 2009 cleanup 8788b7a11698f6cc8f137d10e5dc13081fa66345 John Mettraux jmettraux@gmail.com