rufus-verbs 0.10 → 1.0.0

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

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

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

data/test/dryrun_test.rb

@@ -7,64 +7,77 @@
 # 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
+
+  def test_cgi_escape
+
+    ep = Rufus::Verbs::EndPoint.new(
+      :host => 'localhost',
+      :resource => 'whatever')
+
+    req = ep.post(
+      :dry_run => true,
+      :resource => 'other',
+      :query => { 'a' => 'A&A', 'b' => 'B?B' })
+
+    assert_equal "/other?a=A%26A&b=B%3FB", req.path
+  end
 end