rufus-verbs 0.10 → 1.0.0

data/test/escape_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

data/test/fopen_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

data/test/https_test.rb

@@ -7,36 +7,33 @@
 # Mon Jan 14 00:07:38 JST 2008
 #
 
-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 => "http://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

data/test/iconditional_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
 

data/test/items.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