atom-tools 0.9.1 → 0.9.2

data/lib/atom/service.rb

@@ -9,8 +9,6 @@ module Atom
   
   class WrongNamespace < RuntimeError #:nodoc:
   end
-  class WrongMimetype < RuntimeError # :nodoc:
-  end
   class WrongResponse < RuntimeError # :nodoc:
   end
 
@@ -102,16 +100,13 @@ module Atom
 
       rxml = nil
 
-      res = @http.get(base)
+      res = @http.get(base, "Accept" => "application/atomserv+xml")
+      res.validate_content_type(["application/atomserv+xml"])
 
       unless res.code == "200" # XXX needs to handle redirects, &c.
         raise WrongResponse, "service document URL responded with unexpected code #{res.code}"
       end
 
-      unless res.content_type == "application/atomserv+xml"
-        raise WrongMimetype, "this isn't an atom service document!"
-      end
-
       parse(res.body, base)
     end
  
@@ -152,19 +147,4 @@ module Atom
       doc
     end
   end
- 
-  class Entry
-    # the @href of an entry's link[@rel="edit"]
-    def edit_url
-      begin
-        edit_link = self.links.find do |link|
-          link["rel"] == "edit"
-        end
-
-        edit_link["href"]
-      rescue
-        nil
-      end
-    end
-  end
 end

data/lib/atom/yaml.rb

@@ -50,7 +50,7 @@ module Atom
       end
     end
     def to_yaml_style # :nodoc:
-      if @content.match("\n")
+      if @content.to_s.match("\n")
         :fold
       else
         :plain

data/test/test_feed.rb

@@ -60,6 +60,8 @@ END
 
   def test_update
     @s.mount_proc("/") do |req,res|
+      assert_equal "application/atom+xml", req["Accept"]
+
       res.content_type = "application/atom+xml"
       res.body = @test_feed
 
@@ -89,6 +91,9 @@ END
 
         @s.stop
       end
+      # there's some kind of race condition here that will result in a
+      # timeout sometimes. this is a dirty fix.
+      sleep 0.5
       one_shot
     end
     
@@ -96,15 +101,32 @@ END
 
     # even if it looks like a feed, the server's word is law
     c.call("text/plain")
-    assert_raise(Atom::HTTPException) { feed.update! }
+    assert_raise(Atom::WrongMimetype) { feed.update! }
+
+    # a parameter shouldn't change the type
+    c.call("application/atom+xml;type=feed")
+    assert_nothing_raised { feed.update! }
+
+    # type and subtype are case insensitive (param. attribute names too)
+    c.call("ApPliCatIon/ATOM+XML")
+    assert_nothing_raised { feed.update! }
 
     # text/xml isn't the preferred mimetype, but we'll accept it
     c.call("text/xml")
     assert_nothing_raised { feed.update! }
 
     # same goes for application/xml
-    # XXX c.call("application/xml")
-    # assert_nothing_raised { feed.update! }
+    c.call("application/xml")
+    assert_nothing_raised { feed.update! }
+
+    # nil content type
+    @s.mount_proc("/") do |req,res|
+      res.body = @test_feed
+
+      @s.stop
+    end
+    one_shot
+    assert_raises(Atom::HTTPException) { feed.update! }
   end
 
   def test_conditional_get
@@ -139,7 +161,8 @@ END
       assert_equal 'Wed, 15 Nov 1995 04:58:08 GMT', req["If-Modified-Since"]
 
       res.status = 304
-      res.body = "this hasn't been modified"
+      res.content_type = "application/atom+xml"
+      res.body = @test_feed
       
       @s.stop
     end

data/test/test_http.rb

@@ -3,10 +3,14 @@ require "test/unit"
 require "atom/http"
 require "webrick"
 
-class AtomProtocolTest < Test::Unit::TestCase
+class AtomHTTPTest < Test::Unit::TestCase
   REALM = "test authentication"
   USER = "test_user"
   PASS = "aoeuaoeu"
+
+  # for Google AuthSub authentication
+  TOKEN = "pq7266382__838"
+
   SECRET_DATA = "I kissed a boy once"
 
   def setup
@@ -18,11 +22,13 @@ class AtomProtocolTest < Test::Unit::TestCase
   end
 
   def test_parse_wwwauth
+    # a Basic WWW-Authenticate
     header = 'realm="SokEvo"'
    
     params = @http.send :parse_quoted_wwwauth, header
     assert_equal "SokEvo", params[:realm]
 
+    # Digest is parsed a bit differently
     header = 'opaque="07UrfUiCYac5BbWJ", algorithm=MD5-sess, qop="auth", stale=TRUE, nonce="MDAx0Mzk", realm="test authentication"'
 
     params = @http.send :parse_wwwauth_digest, header
@@ -36,57 +42,120 @@ class AtomProtocolTest < Test::Unit::TestCase
   end
 
   def test_GET
-    @s.mount_proc("/") do |req,res|
+    mount_one_shot do |req,res|
       assert_equal("/", req.path)
 
       res.content_type = "text/plain"
-      res.body = "just junk"
-
-      @s.stop
+      res.body = "Success!"
     end
 
-    one_shot
-
     get_root
     
-    assert_equal("200", @res.code)
-    assert_equal("text/plain", @res.content_type)
-    assert_equal("just junk", @res.body)
+    assert_equal "200", @res.code 
+    assert_equal "text/plain", @res.content_type 
+    assert_equal "Success!", @res.body 
   end
 
   def test_GET_headers
-    @s.mount_proc("/") do |req,res|
+    mount_one_shot do |req,res|
       assert_equal("tester agent", req["User-Agent"])
+    end
+
+    get_root("User-Agent" => "tester agent")
+
+    assert_equal "200", @res.code 
+  end
+
+  def test_redirect
+    @s.mount_proc("/") do |req,res|
+      res.status = 302
+      res["Location"] = "http://localhost:#{@port}/redirected"
       
+      res.body = "ignore me."
+    end
+
+    @s.mount_proc("/redirected") do |req,res|
+      res.content_type = "text/plain"
+      res.body = "Success!"
+
       @s.stop
     end
 
+    one_shot; get_root
+
+    # the redirect should be transparent (to whatever extent it can be)
+    assert_equal "200", @res.code
+    assert_equal "Success!", @res.body
+  end
+
+  def test_redirect_loop
+    @s.mount_proc("/") do |req,res|
+      res.status = 302
+      res["Location"] = "http://localhost:#{@port}/redirected"
+    end
+
+    @s.mount_proc("/redirected") do |req,res|
+      res.status = 302
+      res["Location"] = "http://localhost:#{@port}/"
+    end
+
     one_shot
+    
+    assert_raises(Atom::HTTPException) { get_root }
 
-    get_root("User-Agent" => "tester agent")
+    @s.stop
+  end
+
+  def test_redirect_non_GET_non_HEAD
+    @s.mount_proc("/") do |req,res|
+      assert_equal "POST", req.request_method
+      res.status = 302
+      res["Location"] = "http://localhost:#{@port}/redirected"
+    end
+
+    @s.mount_proc("/redirected") do |req,res|
+      assert_equal "POST", req.request_method
+      assert_equal "important message", req.body
+      res.content_type = "text/plain"
+      res.body = "Success!"
+    end
+
+    one_shot
+
+    @res = @http.post "http://localhost:#{@port}/", "important message"
+
+    assert_equal "302", @res.code
 
-    assert_equal("200", @res.code)
+    @http.allow_all_redirects = true
+
+    one_shot
+
+    @res = @http.post "http://localhost:#{@port}/", "important message"
+
+    assert_equal "200", @res.code
+    assert_equal "Success!", @res.body
+
+    @s.stop
   end
 
   def test_basic_auth
-    @s.mount_proc("/") do |req,res|
+    mount_one_shot do |req,res|
       WEBrick::HTTPAuth.basic_auth(req, res, REALM) do |u,p|
         u == USER and p == PASS
       end
 
       res.body = SECRET_DATA
-      @s.stop
     end
 
-    one_shot
-   
-    # with no credentials
+    # no credentials
     assert_raises(Atom::Unauthorized) { get_root }
 
     @http.user = USER
     @http.pass = "incorrect_password"
 
-    # with incorrect credentials
+    one_shot
+
+    # incorrect credentials
     assert_raises(Atom::Unauthorized) { get_root }
 
     @http.when_auth do |abs_url,realm|
@@ -95,19 +164,20 @@ class AtomProtocolTest < Test::Unit::TestCase
 
       [USER, PASS]
     end
-    
+   
     one_shot
-  
-    get_root
-    assert_equal "200", @res.code 
-    assert_equal SECRET_DATA, @res.body 
+    
+    # correct credentials
+    assert_authenticates
   end
 
   def test_digest_auth
-    # a dummy userdb 
+    # a dummy userdb (saves me creating a file)
     userdb = {}
+    # with a single entry
     userdb[USER] = PASS
 
+    # HTTPAuth::DigestAuth#authenticate uses this
     def userdb.get_passwd(realm, user, reload)
       Digest::MD5::hexdigest([user, realm, self[user]].join(":"))
     end
@@ -132,14 +202,13 @@ class AtomProtocolTest < Test::Unit::TestCase
     @http.pass = PASS
 
     # correct credentials
-    res = get_root
-    assert_equal SECRET_DATA, res.body
+    assert_authenticates
 
     @s.stop
   end
 
   def test_wsse_auth
-    @s.mount_proc("/") do |req,res|
+    mount_one_shot do |req,res|
       assert_equal 'WSSE profile="UsernameToken"', req["Authorization"]
 
       xwsse = req["X-WSSE"]
@@ -159,24 +228,74 @@ class AtomProtocolTest < Test::Unit::TestCase
       assert_equal password_digest, p[:PasswordDigest]
 
       res.body = SECRET_DATA
-      @s.stop
     end
 
-    one_shot
-
     @http.always_auth = :wsse
     @http.user = USER
     @http.pass = PASS
-    
-    get_root
 
+    assert_authenticates
+  end
+
+  def test_authsub_auth
+    mount_one_shot do |req,res|
+      assert_equal %{AuthSub token="#{TOKEN}"}, req["Authorization"]
+
+      res.body = SECRET_DATA
+    end
+
+    @http.always_auth = :authsub
+    @http.token = TOKEN
+
+    assert_authenticates
+  end
+
+  def test_https
+    require 'webrick/https'
+
+    @s = WEBrick::HTTPServer.new(
+          :Port            => (@port + 1),
+          :DocumentRoot    => Dir::pwd + "/htdocs",
+          :Logger => WEBrick::Log.new($stderr, WEBrick::Log::FATAL), 
+          :AccessLog => [],
+          :SSLEnable       => true,
+          :SSLVerifyClient => ::OpenSSL::SSL::VERIFY_NONE,
+          :SSLCertName => [ ["C","CA"], ["O","localhost"], ["CN", "WWW"] ]
+       )
+
+    mount_one_shot do |req,res|
+      res.body = SECRET_DATA
+    end
+
+    res = @http.get("https://localhost:#{@port + 1}/")
+
+    assert_equal "200", res.code
+    assert_equal SECRET_DATA, res.body
+  end
+
+  # mount a block on the test server, shutting the server down after a
+  # single request
+  def mount_one_shot &block
+    @s.mount_proc("/") do |req,res|
+      block.call req, res
+      @s.stop
+    end
+
+    one_shot
+  end
+
+  # test that we authenticated properly
+  def assert_authenticates
+    get_root
     assert_equal "200", @res.code 
-    assert_equal SECRET_DATA, @res.body
+    assert_equal SECRET_DATA, @res.body 
   end
 
+  # performs a GET on the test server
   def get_root(*args)
     @res = @http.get("http://localhost:#{@port}/", *args)
   end
 
+  # sets up the server for a single request
   def one_shot; Thread.new { @s.start }; end
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: atom-tools
 version: !ruby/object:Gem::Version 
-  version: 0.9.1
-date: 2006-11-26 00:00:00 -07:00
+  version: 0.9.2
+date: 2006-12-27 00:00:00 -07:00
 summary: Tools for working with Atom Entries, Feeds and Collections
 require_paths: 
 - lib
@@ -33,6 +33,43 @@ files:
 - Rakefile
 - setup.rb
 - bin/atom-client.rb
+- doc/files
+- doc/index.html
+- doc/rdoc-style.css
+- doc/fr_method_index.html
+- doc/fr_class_index.html
+- doc/fr_file_index.html
+- doc/created.rid
+- doc/classes
+- doc/files/lib
+- doc/files/README.html
+- doc/files/lib/atom
+- doc/files/lib/atom/feed_rb.html
+- doc/files/lib/atom/text_rb.html
+- doc/files/lib/atom/xml_rb.html
+- doc/files/lib/atom/yaml_rb.html
+- doc/files/lib/atom/service_rb.html
+- doc/files/lib/atom/element_rb.html
+- doc/files/lib/atom/entry_rb.html
+- doc/files/lib/atom/http_rb.html
+- doc/files/lib/atom/collection_rb.html
+- doc/classes/Atom
+- doc/classes/XHTML.html
+- doc/classes/Atom/Service.html
+- doc/classes/Atom/Author.html
+- doc/classes/Atom/Element.html
+- doc/classes/Atom/Feed.html
+- doc/classes/Atom/DigestAuth.html
+- doc/classes/Atom/Text.html
+- doc/classes/Atom/Contributor.html
+- doc/classes/Atom/HTTPResponse.html
+- doc/classes/Atom/HTTP.html
+- doc/classes/Atom/Link.html
+- doc/classes/Atom/Collection.html
+- doc/classes/Atom/Content.html
+- doc/classes/Atom/Category.html
+- doc/classes/Atom/Workspace.html
+- doc/classes/Atom/Entry.html
 - test/test_constructs.rb
 - test/runtests.rb
 - test/test_feed.rb