atom-tools 0.9.3 → 0.9.4

data/Rakefile

@@ -6,7 +6,7 @@ require "rake/gempackagetask"
 require "rake/clean"
 
 NAME = "atom-tools"
-VERS = "0.9.3"
+VERS = "0.9.4"
 
 # the following from markaby-0.5's tools/rakehelp
 def setup_tests

data/bin/atom-client.rb

@@ -32,7 +32,6 @@ require "atom/service"
 require "atom/http"
 
 require "rubygems"
-require "bluecloth"
 
 require "time"
 
@@ -63,34 +62,26 @@ class String
 end
 
 class Atom::Entry
-  def prepare_for_output
-    filter_hook
-
-    updated!
-  end
-
-  def filter_hook
-    # so much for actual text content...
-    if @content and @content["type"] == "text"
-      self.content = BlueCloth.new( @content.to_s ).to_html
-      @content["type"] = "xhtml"
-    end
-  end
-
   def edit
     yaml = YAML.load(self.to_yaml)
    
-    # human readability
+    # delete bits the person doesn't need to see
     yaml.delete "id"
 
     if yaml["links"]
-      yaml["links"].find_all { |l| l["rel"] == "alternate" or l["rel"] == "edit" }.each { |l| yaml["links"].delete(l) }
+      yaml["links"].find_all { |l| ["alternate", "edit"].member? l["rel"] }.each { |l| yaml["links"].delete(l) }
       yaml.delete("links") if yaml["links"].empty?
     end
-    
+  
+    if self.content
+      yaml["content"] = $text_filter_before.call(self.content.html)
+    end
+
     new_yaml, entry = write_entry(yaml.to_yaml)
     
+    # restore deleted bits
     entry.id = self.id
+    self.links.each { |l| entry.links << l }
 
     [new_yaml["slug"], entry]
   end
@@ -145,7 +136,12 @@ def write_entry(editstring = "")
 
     entry = Atom::Entry.from_yaml yaml
 
-    entry.prepare_for_output
+    if yaml["content"] #and not yaml["type"]
+      entry.content, type = $text_filter_after.call(yaml["content"])
+      entry.content["type"] = (type || "text")
+    end
+    
+    entry.updated!
 
     # XXX disabled until the APP WG can decide what a valid entry is
 =begin
@@ -187,6 +183,14 @@ url = if options[:url]
   options[:url]
 else
   yaml = YAML.load(File.read("#{ENV["HOME"]}/.atom-client"))
+
+  # leave it the way it came in
+  i = Proc.new { |x| x }
+  $text_filter_before = eval(yaml["text_filter_before"])
+  $text_filter_before ||= i
+  $text_filter_after = eval(yaml["text_filter_after"])
+  $text_filter_after ||= i
+
   collections = yaml["collections"]
 
   puts "which collection?"

data/lib/atom/entry.rb

@@ -5,7 +5,7 @@ require "atom/text"
 
 module Atom
   NS = "http://www.w3.org/2005/Atom"
-  PP_NS = "http://purl.org/atom/app#"
+  PP_NS = "http://www.w3.org/2007/app"
 
   # An individual entry in a feed. As an Atom::Element, it can be
   # manipulated using accessors for each of its child elements. You

data/lib/atom/feed.rb

@@ -197,14 +197,14 @@ module Atom
 
       coll = Atom::Feed.parse(coll, self.base.to_s)
       merge! coll
-     
-      link = coll.links.find { |l| l["rel"] = "next" and l["type"] == "application/atom+xml" }
+
+      link = coll.links.find { |l| l["rel"] == "next" and l["type"] == "application/atom+xml" }
       if link
         abs_uri = @uri + link["href"]
         @next = Feed.new(abs_uri.to_s, @http)
       end
 
-      link = coll.links.find { |l| l["rel"] = "previous" and l["type"] == "application/atom+xml" } 
+      link = coll.links.find { |l| l["rel"] == "previous" and l["type"] == "application/atom+xml" } 
       if link
         abs_uri = @uri + link["href"]
         @prev = Feed.new(abs_uri.to_s, @http)

data/lib/atom/http.rb

@@ -3,7 +3,7 @@ require "net/https"
 require "uri"
 
 require "sha1"
-require "md5"
+require "digest/md5"
 
 module URI # :nodoc: all
   class Generic; def to_uri; self; end; end
@@ -17,7 +17,7 @@ module Atom
   UA = "atom-tools 0.9.3"
 
   module DigestAuth
-    CNONCE = Digest::MD5.new("%x" % (Time.now.to_i + rand(65535))).hexdigest
+    CNONCE = Digest::MD5.hexdigest("%x" % (Time.now.to_i + rand(65535)))
 
     @@nonce_count = -1
 
@@ -223,18 +223,21 @@ module Atom
       req.basic_auth user, pass
     end
 
-    # WSSE authentication 
-    #   <http://www.xml.com/pub/a/2003/12/17/dive.html>
+    # is this the right way to do it? who knows, there's no
+    # spec!
+    #   <http://necronomicorp.com/lab/atom-authentication-sucks>
+    #
+    # thanks to H. Miyamoto for clearing things up.
     def wsse_authenticate(req, url, params = {})
       user, pass = username_and_password_for_realm(url, params["realm"])
 
-      # thanks to Sam Ruby
       nonce = rand(16**32).to_s(16)
+      nonce_enc = [nonce].pack('m').chomp
       now = Time.now.gmtime.iso8601
 
       digest = [Digest::SHA1.digest(nonce + now + pass)].pack("m").chomp
       
-      req['X-WSSE'] = %Q<UsernameToken Username="#{user}", PasswordDigest="#{digest}", Nonce="#{nonce}", Created="#{now}">
+      req['X-WSSE'] = %Q<UsernameToken Username="#{user}", PasswordDigest="#{digest}", Nonce="#{nonce_enc}", Created="#{now}">
       req["Authorization"] = 'WSSE profile="UsernameToken"'
     end
 
@@ -281,8 +284,9 @@ module Atom
 
       case res
       when Net::HTTPUnauthorized
-        if @always_auth or www_authenticate # XXX and not stale (Digest only) 
-          # we've tried the credentials you gave us once and failed
+        if @always_auth or www_authenticate or not res["WWW-Authenticate"] # XXX and not stale (Digest only) 
+          # we've tried the credentials you gave us once
+          # and failed, or the server gave us no way to fix it
           raise Unauthorized, "Your authorization was rejected"
         else
           # once more, with authentication

data/lib/atom/service.rb

@@ -36,12 +36,12 @@ module Atom
        
         coll = Atom::Collection.new(url, http)
 
-        # XXX this is a Text Construct, and should be parsed as such
         col_el.fill_text_construct(coll, "title")
 
         accepts = REXML::XPath.first( col_el,
                                       "./app:accept",
                                       {"app" => Atom::PP_NS} )
+
         coll.accepts = (accepts ? accepts.text : "entry")
         
         ws.collections << coll
@@ -53,10 +53,11 @@ module Atom
     def to_element # :nodoc:
       root = REXML::Element.new "workspace" 
 
-      # damn you, REXML. Damn you and you bizarre handling of namespaces
-      title = self.title.to_element
-      title.name = "atom:title"
-      root << title
+      if self.title
+        title = self.title.to_element
+        title.name = "atom:title"
+        root << title
+      end
 
       self.collections.each do |coll|
         el = REXML::Element.new "collection"
@@ -98,8 +99,8 @@ module Atom
 
       rxml = nil
 
-      res = @http.get(base, "Accept" => "application/atomserv+xml")
-      res.validate_content_type(["application/atomserv+xml"])
+      res = @http.get(base, "Accept" => "application/atomsvc+xml")
+      res.validate_content_type(["application/atomsvc+xml"])
 
       unless res.code == "200" # XXX needs to handle redirects, &c.
         raise WrongResponse, "service document URL responded with unexpected code #{res.code}"
@@ -107,7 +108,15 @@ module Atom
 
       parse(res.body, base)
     end
- 
+
+    def self.parse xml, base = ""
+      Atom::Service.new.parse(xml, base)
+    end
+
+    def collections
+      self.workspaces.map { |ws| ws.collections }.flatten
+    end
+
     # parse a service document, adding its workspaces to this object
     def parse xml, base = ""
       rxml = if xml.is_a? REXML::Document

data/test/test_constructs.rb

@@ -5,7 +5,7 @@ class ConstructTest < Test::Unit::TestCase
   def test_text_construct_html_to_xml
     begin
       require "hpricot"
-    rescue
+    rescue LoadError
       # hpricot isn't installed, just skip this test
       puts "skipping hpricot tests"
       return

data/test/test_http.rb

@@ -226,7 +226,7 @@ class AtomHTTPTest < Test::Unit::TestCase
       assert_match /^UsernameToken /, xwsse
 
       # Base64( SHA1( Nonce + CreationTimestamp + Password ) )
-      pd_string = p[:Nonce] + p[:Created] + PASS
+      pd_string = p[:Nonce].unpack("m").first + p[:Created] + PASS
       password_digest = [Digest::SHA1.digest(pd_string)].pack("m").chomp
 
       assert_equal password_digest, p[:PasswordDigest]

data/test/test_protocol.rb

@@ -21,7 +21,7 @@ end
 class AtomProtocolTest < Test::Unit::TestCase
   def test_introspection
     doc = <<END
-<service xmlns="http://purl.org/atom/app#"
+<service xmlns="http://www.w3.org/2007/app"
   xmlns:atom="http://www.w3.org/2005/Atom">
   <workspace>
     <atom:title>My Blog</atom:title>
@@ -36,11 +36,8 @@ class AtomProtocolTest < Test::Unit::TestCase
 </service>
 END
     
-    #http = FakeHTTP.new({ "http://example.com/service.xml" => service }, "application/atomserv+xml")
-
     service = Atom::Service.new
     service.parse doc
-    #service = Atom::Service.new "http://example.com/service.xml", http
 
     ws = service.workspaces.first
     assert_equal "My Blog", ws.title.to_s 
@@ -84,7 +81,7 @@ END
 
     doc = REXML::Document.new(service.to_s)
 
-    assert_equal "http://purl.org/atom/app#", doc.root.namespace
+    assert_equal "http://www.w3.org/2007/app", doc.root.namespace
 
     ws = REXML::XPath.first( doc.root, 
                               "/app:service/app:workspace", 

data/test/test_xml.rb

@@ -79,7 +79,7 @@ class AtomTest < Test::Unit::TestCase
     entry.updated = "1970-01-01"
     entry.content = "blah"
 
-    assert_instance_of(Time, entry.updated)
+    assert entry.updated.is_a?(Time)
 
     xml = get_elements entry
 

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
+rubygems_version: 0.9.4
 specification_version: 1
 name: atom-tools
 version: !ruby/object:Gem::Version 
-  version: 0.9.3
-date: 2007-05-10 00:00:00 -06:00
+  version: 0.9.4
+date: 2007-08-11 00:00:00 -06:00
 summary: Tools for working with Atom Entries, Feeds and Collections
 require_paths: 
 - lib