atom-tools 0.9.4 → 1.0.0

data/Rakefile

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

data/bin/atom-client.rb

@@ -32,6 +32,7 @@ require "atom/service"
 require "atom/http"
 
 require "rubygems"
+require "bluecloth"
 
 require "time"
 
@@ -62,26 +63,34 @@ 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)
    
-    # delete bits the person doesn't need to see
+    # human readability
     yaml.delete "id"
 
     if yaml["links"]
-      yaml["links"].find_all { |l| ["alternate", "edit"].member? l["rel"] }.each { |l| yaml["links"].delete(l) }
+      yaml["links"].find_all { |l| l["rel"] == "alternate" or l["rel"] == "edit" }.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
@@ -136,12 +145,7 @@ def write_entry(editstring = "")
 
     entry = Atom::Entry.from_yaml yaml
 
-    if yaml["content"] #and not yaml["type"]
-      entry.content, type = $text_filter_after.call(yaml["content"])
-      entry.content["type"] = (type || "text")
-    end
-    
-    entry.updated!
+    entry.prepare_for_output
 
     # XXX disabled until the APP WG can decide what a valid entry is
 =begin
@@ -183,14 +187,6 @@ 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/element.rb

@@ -170,7 +170,7 @@ module Atom # :nodoc:
 
       self.class.attrs.each do |name,req|
         value = self[name.to_s]
-        elem.attributes[name.to_s] = value if value
+        elem.attributes[name.to_s] = value.to_s if value
       end
 
       self.extensions.children.each do |element|

data/lib/atom/entry.rb

@@ -66,7 +66,11 @@ module Atom
       elsif xml.respond_to? :read
         self.parse(xml.read)
       else
-        REXML::Document.new(xml.to_s).to_atom_entry(base)
+        begin
+          REXML::Document.new(xml.to_s).to_atom_entry(base)
+        rescue REXML::ParseException
+          raise Atom::ParseError
+        end
       end
     end
 

data/lib/atom/feed.rb

@@ -73,7 +73,11 @@ module Atom
       elsif xml.respond_to? :read
         self.parse(xml.read)
       else
-        REXML::Document.new(xml.to_s).to_atom_feed(base)
+        begin
+          REXML::Document.new(xml.to_s).to_atom_feed(base)
+        rescue REXML::ParseException
+          raise Atom::ParseError
+        end
       end
     end
 
@@ -96,6 +100,10 @@ module Atom
       @entries.each &block
     end
 
+    def empty?
+      @entries.empty?
+    end
+
     # gets everything in the logical feed (could be a lot of stuff)
     # (see <http://www.ietf.org/internet-drafts/draft-nottingham-atompub-feed-history-05.txt>)
     def get_everything!
@@ -130,7 +138,7 @@ module Atom
 
     # like #merge, but in place 
     def merge! other_feed
-      [:id, :title, :subtitle, :updated, :rights].each { |p|
+      [:id, :title, :subtitle, :updated, :rights, :logo, :icon].each { |p|
         self.send("#{p}=", other_feed.send("#{p}"))
       }
 

data/lib/atom/http.rb

@@ -14,7 +14,7 @@ class String # :nodoc:
 end
 
 module Atom
-  UA = "atom-tools 0.9.3"
+  UA = "atom-tools 1.0.0"
 
   module DigestAuth
     CNONCE = Digest::MD5.hexdigest("%x" % (Time.now.to_i + rand(65535)))

data/lib/atom/service.rb

@@ -5,11 +5,6 @@ require "atom/element"
 require "atom/collection"
 
 module Atom
-  class WrongNamespace < RuntimeError #:nodoc:
-  end
-  class WrongResponse < RuntimeError # :nodoc:
-  end
-
   # an Atom::Workspace has a #title (Atom::Text) and #collections, an Array of Atom::Collection s
   class Workspace < Atom::Element
     element :collections, Atom::Multiple(Atom::Collection)
@@ -23,7 +18,11 @@ module Atom
       elsif xml.is_a? REXML::Element
         xml
       else 
-        REXML::Document.new(xml)
+        begin
+          REXML::Document.new(xml)
+        rescue REXML::ParseException
+          raise Atom::ParseError
+        end
       end
 
       xml.fill_text_construct(ws, "title")
@@ -42,7 +41,12 @@ module Atom
                                       "./app:accept",
                                       {"app" => Atom::PP_NS} )
 
-        coll.accepts = (accepts ? accepts.text : "entry")
+        accepts = []
+        REXML::XPath.each(col_el, "./app:accept", {"app" => Atom::PP_NS}) do |a|
+          accepts << a.texts.join
+        end
+
+        coll.accepts = (accepts.empty? ? ["application/atom+xml;type=entry"] : accepts)
         
         ws.collections << coll
       end
@@ -62,16 +66,18 @@ module Atom
       self.collections.each do |coll|
         el = REXML::Element.new "collection"
 
-        el.attributes["href"] = coll.uri
+        el.attributes["href"] = coll.uri.to_s
 
         title = coll.title.to_element
         title.name = "atom:title"
         el << title
        
         unless coll.accepts.nil?
-          accepts = REXML::Element.new "accepts"
-          accepts.text = coll.accepts
-          el << accepts
+          coll.accepts.each do |acc|
+            accept = REXML::Element.new "accept"
+            accept.text = acc
+            el << accept
+          end
         end
 
         root << el
@@ -102,8 +108,8 @@ module Atom
       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}"
+      unless res.code == "200"
+        raise Atom::HTTPException, "Unexpected HTTP response code: #{res.code}"
       end
 
       parse(res.body, base)
@@ -128,7 +134,7 @@ module Atom
       end
 
       unless rxml.root.namespace == PP_NS
-        raise WrongNamespace, "this isn't an atom service document!"
+        raise Atom::ParseError, "this isn't an atom service document! (wrong namespace: #{rxml.root.namespace})"
       end
 
       REXML::XPath.match( rxml, "/app:service/app:workspace", {"app" => Atom::PP_NS} ).each do |ws_el|

data/lib/atom/text.rb

@@ -105,16 +105,14 @@ module Atom
       end
 
       # this should be done via inheritance
-      unless self.class == Atom::Content and self["src"]
-        c = convert_contents e
+      c = convert_contents e
 
-        if c.is_a? String
-          e.text = c
-        elsif c.is_a? REXML::Element
-          e << c.dup
-        else
-          raise RuntimeError, "atom:#{local_name} can't contain type #{@content.class}"
-        end
+      if c.is_a? String
+        e.text = c
+      elsif c.is_a? REXML::Element
+        e << c.dup
+      else
+        raise RuntimeError, "atom:#{local_name} can't contain type #{@content.class}"
       end
 
       e
@@ -176,6 +174,15 @@ module Atom
       end
     end
 
+    def to_element
+      if self["src"]
+        element_super = Element.instance_method(:to_element)
+        return element_super.bind(self).call
+      end
+
+      super
+    end
+
     private
     def valid_type? type
       super or type.match(/\//)

data/lib/atom/xml.rb

@@ -2,6 +2,8 @@ require "atom/entry"
 require "atom/feed"
 require "uri"
 
+class Atom::ParseError < StandardError; end
+
 # Two big, interrelated problems:
 #
 # * I probably shouldn't be playing around in REXML's namespace
@@ -11,9 +13,11 @@ require "uri"
 module REXML # :nodoc: all
   class Document
     def to_atom_entry base = ""
+      raise Atom::ParseError unless self.root
       self.root.to_atom_entry base
     end
     def to_atom_feed base = ""
+      raise Atom::ParseError unless self.root
       self.root.to_atom_feed base
     end
   end
@@ -79,7 +83,7 @@ module REXML # :nodoc: all
         elsif type == "xhtml"
           div = XPath.first(text, "./xhtml:div", { "xhtml" => XHTML::NS })
           unless div
-            raise "Refusing to parse type='xhtml' with no <div/> wrapper"
+            raise Atom::ParseError, "Refusing to parse type='xhtml' with no <div/> wrapper"
           end
 
           # content is the serialized content of the <div> wrapper
@@ -131,7 +135,7 @@ module REXML # :nodoc: all
     # 'base' is the URI that you fetched this document from.
     def to_atom_entry base = ""
       unless self.name == "entry" and self.namespace == Atom::NS
-        raise TypeError, "this isn't an atom:entry! (name: #{self.name}, ns: #{self.namespace})"
+        raise Atom::ParseError, "this isn't an atom:entry! (name: #{self.name}, ns: #{self.namespace})"
       end
 
       entry = Atom::Entry.new
@@ -168,7 +172,7 @@ module REXML # :nodoc: all
     # 'base' is the URI that you fetched this document from.
     def to_atom_feed base = ""
       unless self.name == "feed" and self.namespace == Atom::NS
-        raise TypeError, "this isn't an atom:feed! (name: #{self.name}, ns: #{self.namespace})"
+        raise Atom::ParseError, "this isn't an atom:feed! (name: #{self.name}, ns: #{self.namespace})"
       end
 
       feed = Atom::Feed.new

data/test/test_protocol.rb

@@ -43,14 +43,14 @@ END
     assert_equal "My Blog", ws.title.to_s 
 
     coll = ws.collections.first
-    assert_equal URI.parse("http://example.org/myblog/entries"), coll.uri 
-    assert_equal "Entries", coll.title.to_s 
-    assert_equal "entry", coll.accepts 
+    assert_equal URI.parse("http://example.org/myblog/entries"), coll.uri
+    assert_equal "Entries", coll.title.to_s
+    assert_equal ["application/atom+xml;type=entry"], coll.accepts
 
     coll = ws.collections.last
-    assert_equal URI.parse("http://example.org/myblog/fotes"), coll.uri 
-    assert_equal "Photos", coll.title.to_s 
-    assert_equal "image/*", coll.accepts 
+    assert_equal URI.parse("http://example.org/myblog/fotes"), coll.uri
+    assert_equal "Photos", coll.title.to_s
+    assert_equal ["image/*"], coll.accepts
 
     http = service.instance_variable_get(:@http)
     assert_instance_of Atom::HTTP, http
@@ -74,7 +74,7 @@ END
 
     coll = Atom::Collection.new "http://example.org/audio"
     coll.title = "Audio"
-    coll.accepts = "audio/*"
+    coll.accepts = ["audio/*"]
     ws.collections << coll
 
     nses = { "app" => Atom::PP_NS, "atom" => Atom::NS }
@@ -102,7 +102,7 @@ END
     title = REXML::XPath.first(entries, "./atom:title", nses)
     assert_equal "Entries", title.text
 
-    accepts = REXML::XPath.first(entries, "./app:accepts", nses)
+    accepts = REXML::XPath.first(entries, "./app:accept", nses)
     assert_nil accepts
 
     audio = colls.last
@@ -112,7 +112,7 @@ END
     title = REXML::XPath.first(audio, "./atom:title", nses)
     assert_equal "Audio", title.text
 
-    accepts = REXML::XPath.first(audio, "./app:accepts", nses)
+    accepts = REXML::XPath.first(audio, "./app:accept", nses)
     assert_equal "audio/*", accepts.text
   end
 

data/test/test_xml.rb

@@ -146,7 +146,7 @@ class AtomTest < Test::Unit::TestCase
     assert entry.draft
   end
 
-  def test_extensive_enty_parsing
+  def test_extensive_entry_parsing
 str = '<entry xmlns="http://www.w3.org/2005/Atom">
   <title>Atom draft-07 snapshot</title>
   <link rel="alternate" type="text/html"

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: atom-tools
 version: !ruby/object:Gem::Version 
-  version: 0.9.4
-date: 2007-08-11 00:00:00 -06:00
+  version: 1.0.0
+date: 2007-11-10 00:00:00 -07:00
 summary: Tools for working with Atom Entries, Feeds and Collections
 require_paths: 
 - lib
@@ -39,14 +39,14 @@ files:
 - test/test_feed.rb
 - test/test_protocol.rb
 - test/conformance
-- test/test_xml.rb
-- test/test_http.rb
-- test/test_general.rb
 - test/conformance/updated.rb
 - test/conformance/xmlnamespace.rb
 - test/conformance/title.rb
 - test/conformance/order.rb
 - test/conformance/xhtmlcontentdiv.rb
+- test/test_xml.rb
+- test/test_http.rb
+- test/test_general.rb
 - lib/atom
 - lib/atom/yaml.rb
 - lib/atom/feed.rb