atom-tools 2.0.3 → 2.0.4

data/Rakefile

@@ -7,81 +7,74 @@ require "spec/rake/spectask"
 require "rake/clean"
 
 NAME = "atom-tools"
-VERS = "2.0.3"
-
-# the following from markaby-0.5's tools/rakehelp
-def setup_tests
-  Rake::TestTask.new do |t|
-    t.libs << "test"
-    t.test_files = FileList['test/test*.rb']
-    t.verbose = true
-  end
-end
+VERS = "2.0.4"
+
+task :default => [:spec]
+
+# For historical reasons, atom-tools has both rspec specs and test/unit tests.
+# This is silly (and there's a lot of duplication), but I have better things to
+# do than rewrite the tests.
+#
+# Ideally all the tests should be runnable with one command, but for now you
+# have to run "rake test" and "rake spec"
 
-def setup_rdoc files
-  Rake::RDocTask.new do |rdoc|
-    rdoc.title = NAME + " documentation"
-    rdoc.rdoc_dir = 'doc'
-    rdoc.options << '--line-numbers'
-    rdoc.options << '--inline-source'
-    rdoc.rdoc_files.add(files)
-  end
+# spec task
+desc 'Run all specs (see also "test" task)'
+Spec::Rake::SpecTask.new('spec')
+
+# test task
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.test_files = FileList['test/test*.rb']
+  t.verbose = true
 end
 
-def setup_gem(pkg_name, pkg_version, author, summary, dependencies, test_file)
-  pkg_version = pkg_version
-  pkg_name    = pkg_name
-  pkg_file_name = "#{pkg_name}-#{pkg_version}"
-
-  spec = Gem::Specification.new do |s|
-    s.name = pkg_name
-    s.version = pkg_version
-    s.platform = Gem::Platform::RUBY
-    s.author = author
-    s.email = 'whateley@gmail.com'
-    s.homepage = 'http://code.necronomicorp.com/atom-tools'
-    s.rubyforge_project = 'ibes'
-    s.summary = summary
-    s.test_file = test_file
-    s.has_rdoc = true
-    s.extra_rdoc_files = [ "README" ]
-    dependencies.each do |dep|
-        s.add_dependency(*dep)
-    end
-    s.files = %w(COPYING README Rakefile setup.rb) +
-    Dir.glob("{bin,doc,test,lib}/**/*") + 
-    Dir.glob("ext/**/*.{h,c,rb}") +
-    Dir.glob("examples/**/*.rb") +
-    Dir.glob("tools/*.rb")
-
-    s.require_path = "lib"
-    s.extensions = FileList["ext/**/extconf.rb"].to_a
-
-    s.bindir = "bin"
-  end
-
-  Rake::GemPackageTask.new(spec) do |p|
-    p.gem_spec = spec
-    p.need_tar = true
-  end
-
-  task :install do
-    sh %{rake package}
-    sh %{gem install pkg/#{pkg_name}-#{pkg_version}}
-  end
+Rake::RDocTask.new do |rdoc|
+  rdoc.title = 'atom-tools documentation'
+  rdoc.main = 'README'
+  rdoc.rdoc_files.include 'README', 'lib/**/*.rb'
+  rdoc.rdoc_dir = 'doc'
 end
 
-task :default => [:spec]
-desc 'Run all specs and generate report for spec results and code coverage'
-Spec::Rake::SpecTask.new('spec') do |t| 
-  t.spec_opts = ["--format", "html:report.html", '--diff'] 
-  t.fail_on_error = false
-  t.rcov = true
+spec = Gem::Specification.new do |s|
+  s.name = NAME
+  s.version = VERS
+  s.platform = Gem::Platform::RUBY
+  s.author = "Brendan Taylor"
+  s.email = 'whateley@gmail.com'
+  s.homepage = 'http://github.com/bct/atom-tools/wikis'
+
+  s.rubyforge_project = 'ibes'
+
+  s.summary = 'Tools for working with Atom Entries, Feeds and Collections.'
+  s.description = 'atom-tools is an all-in-one Atom library. It parses and builds Atom (RFC 4287) entries and feeds, and manipulates Atom Publishing Protocol (RFC 5023) Collections.
+
+It also comes with a set of commandline utilities for working with AtomPub Collections.
+
+It is not the fastest Ruby Atom library, but it is comprehensive and makes handling extensions to the Atom format very easy.'
+
+  s.test_file = "test/runtests.rb" # TODO: should have the spec here instead?
+  s.has_rdoc = true
+  s.extra_rdoc_files = [ "README" ]
+
+  s.files = %w(COPYING README Rakefile setup.rb) +
+  Dir.glob("{bin,doc,test,spec,lib}/**/*") +
+  Dir.glob("ext/**/*.{h,c,rb}") +
+  Dir.glob("examples/**/*.rb") +
+  Dir.glob("tools/*.rb")
+
+  s.require_path = "lib"
+  s.extensions = FileList["ext/**/extconf.rb"].to_a
+
+  s.bindir = "bin"
 end
 
-setup_tests
-setup_rdoc ['README', 'lib/**/*.rb']
+Rake::GemPackageTask.new(spec) do |p|
+  p.gem_spec = spec
+  p.need_tar = true
+end
 
-summary = "Tools for working with Atom Entries, Feeds and Collections"
-test_file = "test/runtests.rb"
-setup_gem(NAME, VERS, "Brendan Taylor", summary, [], test_file)
+task :install do
+  sh %{rake package}
+  sh %{gem install pkg/#{NAME}-#{VERS}}
+end

data/bin/atom-post

@@ -8,6 +8,7 @@ Usage: atom-post [options] destination [file]
   'file' is the path to a file to POST (default is stdin)
 =end
 
+require 'rubygems'
 require 'atom/tools'
 include Atom::Tools
 

data/lib/atom/element.rb

@@ -507,7 +507,7 @@ module Atom # :nodoc:
         @attrs
       end
 
-      self.class.initters do |init|
+      self.class.run_initters do |init|
         self.instance_eval &init
       end
 
@@ -521,9 +521,8 @@ module Atom # :nodoc:
       @on_init << block
     end
 
-    def self.initters &block
-      @on_init ||= []
-      @on_init.each &block
+    def self.run_initters &block
+      @on_init.each(&block) if @on_init
     end
 
     # appends an element named 'name' in namespace 'ns' to 'root'
@@ -644,4 +643,43 @@ module Atom # :nodoc:
   class Contributor < Atom::Person
     is_atom_element :contributor
   end
+
+  module HasLinks
+    def HasLinks.included(klass)
+      klass.atom_elements :link, :links, Atom::Link
+    end
+
+    def find_link(criteria)
+      self.links.find do |l|
+        criteria.all? { |k,v| l.send(k) == v }
+      end
+    end
+  end
+
+  module HasCategories
+    def HasCategories.included(klass)
+      klass.atom_elements :category, :categories, Atom::Category
+    end
+
+    # categorize the entry with each of an array or a space-separated
+    #   string
+    def tag_with(tags, delimiter = ' ')
+      return if not tags or tags.empty?
+
+      tag_list = unless tags.is_a?(String)
+                   tags
+                 else
+                   tags = tags.split(delimiter)
+                   tags.map! { |t| t.strip }
+                   tags.reject! { |t| t.empty? }
+                   tags.uniq
+                 end
+
+      tag_list.each do |tag|
+        unless categories.any? { |c| c.term == tag }
+          categories.new :term => tag
+        end
+      end
+    end
+  end
 end

data/lib/atom/entry.rb

@@ -3,7 +3,21 @@ require "rexml/document"
 require "atom/element"
 require "atom/text"
 
+require 'atom/feed'
+
 module Atom
+  # this is just a forward declaration since atom/entry includes atom/feed and vice-versa.
+  class Feed < Atom::Element # :nodoc:
+  end
+
+  class Source < Atom::Feed
+    is_atom_element :source
+
+    # TODO: this shouldn't be necessary, but on_init doesn't get inherited the
+    # way I would like it to.
+    @on_init = Atom::Feed.instance_variable_get '@on_init'
+  end
+
   class Control < Atom::Element
     attr_accessor :draft
 
@@ -21,45 +35,6 @@ module Atom
     end
   end
 
-  module HasCategories
-    def HasCategories.included(klass)
-      klass.atom_elements :category, :categories, Atom::Category
-    end
-
-    # categorize the entry with each of an array or a space-separated
-    #   string
-    def tag_with(tags, delimiter = ' ')
-      return if not tags or tags.empty?
-
-      tag_list = unless tags.is_a?(String)
-                   tags
-                 else
-                   tags = tags.split(delimiter)
-                   tags.map! { |t| t.strip }
-                   tags.reject! { |t| t.empty? }
-                   tags.uniq
-                 end
-
-      tag_list.each do |tag|
-        unless categories.any? { |c| c.term == tag }
-          categories.new :term => tag
-        end
-      end
-    end
-  end
-
-  module HasLinks
-    def HasLinks.included(klass)
-      klass.atom_elements :link, :links, Atom::Link
-    end
-
-    def find_link(criteria)
-      self.links.find do |l|
-        criteria.all? { |k,v| l.send(k) == v }
-      end
-    end
-  end
-
   # An individual entry in a feed. As an Atom::Element, it can be
   # manipulated using accessors for each of its child elements. You
   # should be able to set them using an instance of any class that
@@ -94,7 +69,7 @@ module Atom
 
     atom_element :rights, Atom::Rights
 
-    # element :source, Atom::Feed  # XXX complicated, eg. serialization
+    atom_element :source, Atom::Source
 
     atom_time :published
     atom_time :updated

data/lib/atom/feed.rb

@@ -5,6 +5,10 @@ require "atom/entry"
 require "atom/http"
 
 module Atom
+  # this is just a forward declaration since atom/entry includes atom/feed and vice-versa.
+  class Entry < Atom::Element # :nodoc:
+  end
+
   class FeedGone < RuntimeError # :nodoc:
   end
 

data/lib/atom/http.rb

@@ -17,7 +17,7 @@ class String # :nodoc:
 end
 
 module Atom
-  TOOLS_VERSION = '2.0.3'
+  TOOLS_VERSION = '2.0.4'
   UA = "atom-tools " + TOOLS_VERSION
 
   module DigestAuth

data/spec/entry_spec.rb

@@ -0,0 +1,353 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+require 'atom/entry'
+
+module TestsXML
+  def read_entry_xml xpath
+    REXML::XPath.first(@entry.to_xml, xpath, { 'atom' => Atom::NS, 'app' => Atom::PP_NS })
+  end
+end
+
+describe Atom::Entry do
+  describe 'when parsing' do
+    before(:each) do
+      @entry = Atom::Entry.parse(fixtures(:entry))
+      @empty_entry = '<entry xmlns="http://www.w3.org/2005/Atom" />'
+    end
+
+    it 'should read & parse input from an IO object' do
+      input = mock('IO')
+      input.should_receive(:read).and_return(@empty_entry)
+      Atom::Entry.parse(input).should be_an_instance_of(Atom::Entry)
+    end
+
+    it 'should read & parse input from a string' do
+      input = mock('string')
+      input.should_receive(:to_s).and_return(@empty_entry)
+      Atom::Entry.parse(input).should be_an_instance_of(Atom::Entry)
+    end
+
+    it 'should raise ParseError when invalid entry' do
+      lambda { Atom::Entry.parse('<entry/>') }.should raise_error(Atom::ParseError)
+    end
+
+    it 'should parse title element correctly' do
+      @entry.title.should be_is_a(Atom::Text)
+      @entry.title['type'].should == 'text'
+      @entry.title.to_s.should == 'Atom draft-07 snapshot'
+    end
+
+    it 'should parse id element correctly' do
+      @entry.id.should == 'tag:example.org,2003:3.2397'
+    end
+
+    it 'should parse updated element correctly' do
+      @entry.updated.should == Time.parse('2005-07-31T12:29:29Z')
+    end
+
+    it 'should parse published element correctly' do
+      @entry.published.should == Time.parse('2003-12-13T08:29:29-04:00')
+    end
+
+    it 'should parse app:edited element correctly' do
+      @entry.edited.should == Time.parse('2005-07-31T12:29:29Z')
+    end
+
+    it 'should parse app:control/draft element correctly' do
+      @entry.draft?.should be_true
+    end
+
+    it 'should parse rights element correctly' do
+      @entry.rights.should be_is_a(Atom::Text)
+      @entry.rights['type'].should == 'text'
+      @entry.rights.to_s.should == 'Copyright (c) 2003, Mark Pilgrim'
+    end
+
+    it 'should parse author element correctly' do
+      @entry.authors.length.should == 1
+      @entry.authors.first.name.should == 'Mark Pilgrim'
+      @entry.authors.first.email.should == 'f8dy@example.com'
+      @entry.authors.first.uri.should == 'http://example.org/'
+    end
+
+    it 'should parse contributor element correctly' do
+      @entry.contributors.length.should == 2
+      @entry.contributors.first.name.should == 'Sam Ruby'
+      @entry.contributors[1].name.should == 'Joe Gregorio'
+    end
+
+    it 'should parse content element correctly' do
+      @entry.content.should be_an_instance_of(Atom::Content)
+      @entry.content['type'].should == 'xhtml'
+      @entry.content.base.should == 'http://diveintomark.org/'
+      @entry.content.to_s.strip.should == '<p><i>[Update: The Atom draft is finished.]</i></p>'
+    end
+
+    it 'should parse summary element correctly' do
+      @entry.summary['type'].should == 'text'
+      @entry.summary.to_s.should == 'Some text.'
+    end
+
+    it 'should parse links element correctly' do
+      @entry.links.length.should == 2
+      alternates = @entry.links.select { |l| l['rel'] == 'alternate' }
+      alternates.length.should == 1
+      alternates.first['href'].should == 'http://example.org/2005/04/02/atom'
+      alternates.first['type'].should == 'text/html'
+      @entry.links.last['rel'].should == 'enclosure'
+      @entry.links.last['href'].should == 'http://example.org/audio/ph34r_my_podcast.mp3'
+      @entry.links.last['type'].should == 'audio/mpeg'
+    end
+
+    it 'should parse category element correctly' do
+      @entry.categories.first['term'].should == 'ann'
+      @entry.categories.first['scheme'].should == 'http://example.org/cats'
+    end
+
+    it 'should parse source element correctly' do
+      @entry.source.title.to_s.should == 'Atom Sample Feed'
+      @entry.source.id.should == 'tag:example.org,2003:/'
+
+      @entry.source.links.length.should == 1
+      @entry.source.links.first.rel == 'self'
+
+      @entry.source.authors.length.should == 0
+
+      @entry.source.contributors.length.should == 1
+      @entry.source.contributors.first.name == 'Mark Pilgrim'
+    end
+  end
+
+  describe 'title element' do
+    before(:each) do
+      @entry = Atom::Entry.new
+    end
+
+    it 'should be nil if not defined' do
+      @entry.title.should be_nil
+
+      @entry.title.to_s.should == ''
+    end
+
+    it 'should accept a simple string' do
+      @entry.title = '<clever thing here>'
+
+      @entry.title.type.should == 'text'
+
+      @entry.title.to_s.should == '<clever thing here>'
+      @entry.title.html.should =~ /^&lt;clever thing/
+      @entry.title.to_xml.to_s.should =~ /&lt;clever thing/
+    end
+
+    it 'should accept an HTML string' do
+      @entry.title = 'even <em>cleverer</em>'
+      @entry.title.type = 'html'
+
+      @entry.title.type.should == 'html'
+
+      @entry.title.to_s.should =~ /even <em>clever/
+      @entry.title.html.should =~ /even <em>clever/
+      @entry.title.to_xml.to_s.should =~ /even &lt;em/
+    end
+
+    it 'should accept an XHTML string' do
+      @entry.title = 'the <strong>cleverest</strong>'
+      @entry.title.type = 'xhtml'
+
+      @entry.title.to_xml.to_s.should =~ /w3.org\/1999\/xhtml.>the <strong>/
+      @entry.title.html.should =~ /the <strong>cleverest/
+    end
+
+    it 'should reject an ill-formed XHTML string' do
+      @entry.title = 'the <strong>cleverest'
+      lambda { @entry.title.type = 'xhtml' }.should raise_error(Atom::ParseError)
+    end
+
+    it 'should accept something like Atom::Text' do
+      title = Atom::Title.new '<3'
+
+      @entry.title = title
+      @entry.title.type.should == 'text'
+
+      @entry.title.to_xml.to_s.should =~ /&lt;3/
+    end
+  end
+
+  describe 'updated element' do
+    before(:each) do
+      @entry = Atom::Entry.new
+    end
+
+    it 'should be nil if not defined' do
+      @entry.updated.should be_nil
+    end
+
+    it 'should be definable' do
+      @entry.updated = '1990-04-07'
+      @entry.updated.should == Time.parse('1990-04-07')
+    end
+
+    it 'should be an xsd:DateTime' do
+      @entry.updated = '1990-04-07'
+      @entry.updated.to_s.should =~ /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/
+    end
+
+    it 'should be declarable as updated using #updated!' do
+      @entry.updated!
+      @entry.updated.should > Time.parse('1990-04-07')
+    end
+  end
+
+  describe 'app:edited element' do
+    include TestsXML
+
+    before(:each) do
+      @entry = Atom::Entry.new
+    end
+
+    it 'should be nil if not defined' do
+      @entry.edited.should be_nil
+    end
+
+    it 'should be definable' do
+      @entry.edited = '1990-04-07'
+      @entry.edited.should == Time.parse('1990-04-07')
+    end
+
+    it 'should be an xsd:DateTime' do
+      @entry.edited = '1990-04-07'
+      @entry.edited.to_s.should =~ /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/
+    end
+
+    it 'should have APP namespace' do
+      @entry.edited = '1990-04-07'
+      read_entry_xml('app:edited').namespace.should == Atom::PP_NS
+    end
+
+    it 'should be declarable as edited using #edited!' do
+      @entry.edited!
+      @entry.edited.should > Time.parse('1990-04-07')
+    end
+  end
+
+  describe 'category element' do
+    before(:each) do
+      @entry = Atom::Entry.new
+    end
+
+    it 'should have no category on intializing' do
+      @entry.categories.should be_empty
+    end
+
+    it 'should increase total count when adding a new category' do
+      @count = @entry.categories.length
+      @entry.categories.new['term'] = 'foo'
+      @entry.categories.length.should == @count + 1
+    end
+
+    it 'should find category' do
+      category = @entry.categories.new
+      category['scheme'] = 'http://example.org/categories'
+      category['term'] = 'bar'
+      @entry.categories.select { |c| c['scheme'] == 'http://example.org/categories' }.should == [category]
+    end
+
+    describe 'when using tags' do
+      before(:each) do
+        @tags = %w(chunky bacon ruby)
+      end
+
+      it 'should set categories from an array of tags' do
+        @entry.tag_with(@tags)
+        @entry.categories.length.should == 3
+        @tags.each { |tag| @entry.categories.any? { |c| c['term'] == tag }.should be_true }
+      end
+
+      it 'should set categories from a space-sperated string of tags' do
+        @entry.tag_with(@tags.join(' '))
+        @entry.categories.length.should == 3
+        @tags.each { |tag| @entry.categories.any? { |c| c['term'] == tag }.should be_true }
+      end
+
+      it 'should be possible to specify the delimiter when passing tags as a string' do
+        @entry.tag_with(@tags.join(','), ',')
+        @entry.categories.length.should == 3
+        @tags.each { |tag| @entry.categories.any? { |c| c['term'] == tag }.should be_true }
+      end
+
+      it 'should create a category only once' do
+        @entry.tag_with(@tags)
+        @entry.tag_with(@tags.first)
+        @entry.categories.length.should == 3
+      end
+    end
+  end
+
+  describe 'edit url' do
+    before(:each) do
+      @entry = Atom::Entry.new
+    end
+
+    it 'should be nil on initializing' do
+      @entry.edit_url.should be_nil
+    end
+
+    it 'should be easily definable' do
+      @entry.edit_url = 'http://example.org/entries/foo'
+      @entry.edit_url.should == 'http://example.org/entries/foo'
+    end
+
+    it 'should not erase other links' do
+      link = @entry.links.new :rel => 'related', :href => 'http://example.org'
+
+      @entry.edit_url = 'http://example.com/entries/foo'
+      @entry.links.length.should == 2
+      @entry.links.should include(link)
+    end
+
+    it 'should accept a URI object' do
+      @entry.edit_url = URI.parse('http://example.com/entries/foo')
+      @entry.to_s.should =~ /example.com\/entries/
+    end
+  end
+
+  describe 'draft element' do
+    include TestsXML
+
+    before(:each) do
+      @entry = Atom::Entry.new
+    end
+
+    it 'should not be a draft by default' do
+      @entry.should_not be_draft
+    end
+
+    it 'should be definable using draft=' do
+      @entry.draft = true
+      @entry.should be_draft
+      @entry.draft = false
+      @entry.should_not be_draft
+    end
+
+    it 'should be declarable as a draft using #draft!' do
+      @entry.draft!
+      @entry.should be_draft
+    end
+
+    it 'should have APP namespace' do
+      @entry.draft!
+      read_entry_xml('app:control/app:draft').namespace.should == Atom::PP_NS
+    end
+  end
+
+
+  describe 'extensions' do
+    before(:each) do
+      @entry = Atom::Entry.parse(fixtures('entry-w-ext'))
+    end
+
+    it 'should preserve namespaces' do
+      @entry.to_s.should =~ /purl/
+    end
+  end
+end

data/spec/ext_spec.rb

@@ -0,0 +1,42 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+require 'atom/entry'
+
+module Atom
+  THR_NS  = "http://purl.org/syndication/thread/1.0"
+  SLUG_NS = 'http://example.org/ns/slug'
+
+  class InReplyTo < Atom::Element
+    is_element THR_NS, :"in-reply-to"
+
+    atom_attrb :ref
+    atom_attrb :href
+    atom_attrb :type
+    atom_attrb :source
+  end
+
+  class Entry
+    attrb   ['sl', SLUG_NS], 'slug'
+    element ['thr', THR_NS], :"in-reply-to", InReplyTo
+  end
+end
+
+describe Atom::Entry do
+  it 'should correctly write extension attributes' do
+    entry = Atom::Entry.new
+    entry.slug = 'hallo'
+
+    entry.to_s.should =~ /sl:slug/
+    entry.to_s.should =~ /xmlns:sl='#{Atom::SLUG_NS}'/
+  end
+
+  describe 'in-reply-to' do
+    it 'should be written with the correct namespace' do
+      entry = Atom::Entry.new
+      entry.in_reply_to = { :ref => 'http://example.org/some-entry' }
+
+      entry.to_s.should =~ /ref='http:\/\/example.org/
+      entry.to_s.should =~ Regexp.new(Atom::THR_NS)
+    end
+  end
+end

data/spec/feed_spec.rb

@@ -0,0 +1,20 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+require 'atom/feed'
+
+describe Atom::Entry do
+  describe 'extensions' do
+    before(:each) do
+      @feed = Atom::Feed.parse(fixtures('feed-w-ext'))
+    end
+
+    it 'should preserve namespaces' do
+      @feed.to_s.should =~ /purl/
+
+      feed2 = Atom::Feed.new
+      feed2.merge! @feed
+
+      feed2.to_s.should =~ /purl/
+    end
+  end
+end

data/spec/fixtures/entry-w-ext.xml

@@ -0,0 +1,15 @@
+<entry xmlns="http://www.w3.org/2005/Atom"
+       xml:base='http://www.example.org/'
+       xmlns:thr='http://purl.org/syndication/thread/1.0'
+       xml:lang='en-us'>
+ <title>Extendy</title>
+ <link rel='replies' thr:count='2' type='application/xhtml+xml' href='Extendy#comments' />
+ <id>http://www.example.org/Extendy.atom</id>
+ <published>2008-03-15T02:00:00-07:00</published>
+ <updated>2008-03-15T18:10:25-07:00</updated>
+  <content type='xhtml'>
+    <div xmlns='http://www.w3.org/1999/xhtml'>
+    <p>Extensions ahoy!</p>
+    </div>
+  </content>
+</entry>

data/spec/fixtures/entry.xml

@@ -0,0 +1,42 @@
+<entry xmlns="http://www.w3.org/2005/Atom"
+  xmlns:app="http://www.w3.org/2007/app">
+  <title>Atom draft-07 snapshot</title>
+  <link rel="alternate" type="text/html"
+    href="http://example.org/2005/04/02/atom"/>
+  <link rel="enclosure" type="audio/mpeg" length="1337"
+    href="http://example.org/audio/ph34r_my_podcast.mp3"/>
+  <source>
+    <title>Atom Sample Feed</title>
+    <id>tag:example.org,2003:/</id>
+    <link rel="self" href="http://example.org/feed"/>
+    <contributor>
+      <name>Mark Pilgrim</name>
+    </contributor>
+  </source>
+  <rights>Copyright (c) 2003, Mark Pilgrim</rights>
+  <id>tag:example.org,2003:3.2397</id>
+  <updated>2005-07-31T12:29:29Z</updated>
+  <published>2003-12-13T08:29:29-04:00</published>
+  <app:edited>2005-07-31T12:29:29Z</app:edited>
+  <app:control><app:draft>yes</app:draft></app:control>
+  <author>
+    <name>Mark Pilgrim</name>
+    <uri>http://example.org/</uri>
+    <email>f8dy@example.com</email>
+  </author>
+  <contributor>
+    <name>Sam Ruby</name>
+  </contributor>
+  <contributor>
+    <name>Joe Gregorio</name>
+  </contributor>
+  <summary>Some text.</summary>
+  <category scheme="http://example.org/cats" term="ann" />
+  <content type="xhtml" xml:lang="en"
+    xml:base="http://diveintomark.org/">
+    <div xmlns="http://www.w3.org/1999/xhtml">
+      <p><i>[Update: The Atom draft is finished.]</i></p>
+    </div>
+  </content>
+</entry>
+

data/spec/fixtures/feed-w-ext.xml

@@ -0,0 +1,33 @@
+<feed xmlns='http://www.w3.org/2005/Atom'
+      xmlns:thr='http://purl.org/syndication/thread/1.0'
+      xml:base='http://www.tbray.org/ongoing/ongoing.atom'
+      xml:lang='en-us'>
+ <title>ongoing</title>
+ <id>http://www.tbray.org/ongoing/</id>
+ <link href='./' />
+ <link rel='self' href='' />
+ <link rel='replies'       thr:count='101'       href='/home/tbray.org/www/html/ongoing/comments.atom' />
+ <logo>rsslogo.jpg</logo>
+ <icon>/favicon.ico</icon>
+ <updated>2008-03-17T02:04:49-07:00</updated>
+ <author><name>Tim Bray</name></author>
+ <subtitle>ongoing fragmented essay by Tim Bray</subtitle>
+ <rights>All content written by Tim Bray and photos by Tim Bray Copyright Tim Bray, some rights reserved, see /ongoing/misc/Copyright</rights>
+ <generator uri='/misc/Colophon'>Generated from XML source code using Perl, Expat, Emacs, Mysql, Ruby, Java, and ImageMagick.  Industrial-strength technology, baby.</generator>
+<entry xml:base='When/200x/2008/03/13/'>
+ <title>Maui Bound</title>
+ <link href='Maui' />
+ <link rel='replies'        thr:count='1'        type='application/xhtml+xml'        href='Maui#comments' />
+ <id>http://www.tbray.org/ongoing/When/200x/2008/03/13/Maui</id>
+ <published>2008-03-13T02:00:00-07:00</published>
+ <updated>2008-03-13T17:23:47-07:00</updated>
+ <category scheme='http://www.tbray.org/ongoing/What/' term='The World/Places/Hawaii' />
+ <category scheme='http://www.tbray.org/ongoing/What/' term='The World' />
+ <category scheme='http://www.tbray.org/ongoing/What/' term='Places' />
+ <category scheme='http://www.tbray.org/ongoing/What/' term='Hawaii' />
+<content type='xhtml'><div xmlns='http://www.w3.org/1999/xhtml'>
+<p>I’m off with the family tomorrow for ten days in Maui, 15th through the
+24th.  We’ll be meeting an Aussie friend.  Anyone else I know who’ll be there,
+drop me a line and we’ll get together for a Mai Tai.</p>
+</div></content></entry>
+</feed>

data/spec/fixtures/service-w-xhtml-ns.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<service xmlns="http://www.w3.org/2007/app" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:xhtml="http://www.w3.org/1999/xhtml">
+  <workspace title="Yulup Demo">
+    <atom:title type="text">Yulup Demo</atom:title>
+
+    <collection title="Releases" href="../entries/?yanel.resource.viewid=atom">
+      <atom:title type="html">Early Yulup &lt;i>Releases&lt;/i></atom:title>
+    </collection>
+  </workspace>
+
+  <workspace title="Yulup Website">
+    <atom:title type="text">Yulup Website</atom:title>
+
+    <collection title="Releases" href="http://www.yulup.org/download/release-atom-entries/?yanel.resource.viewid=atom">
+      <atom:title type="xhtml"><xhtml:div>Yulup <xhtml:b>Releases</xhtml:b>
+</xhtml:div>
+</atom:title>
+
+    </collection>
+  </workspace>
+</service>

data/spec/fixtures/service.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding='utf-8'?>
+<service xmlns="http://www.w3.org/2007/app"
+         xmlns:atom="http://www.w3.org/2005/Atom">
+  <workspace>
+    <atom:title>Main Site</atom:title>
+    <collection
+        href="http://example.org/blog/main" >
+      <atom:title>My Blog Entries</atom:title>
+      <categories
+         href="http://example.com/cats/forMain.cats" />
+    </collection>
+    <collection
+        href="http://example.org/blog/pic" >
+      <atom:title>Pictures</atom:title>
+      <accept>image/png</accept>
+      <accept>image/jpeg</accept>
+      <accept>image/gif</accept>
+    </collection>
+  </workspace>
+  <workspace>
+    <atom:title>Sidebar Blog</atom:title>
+    <collection
+        href="http://example.org/sidebar/list" >
+      <atom:title>Remaindered Links</atom:title>
+      <accept>application/atom+xml;type=entry</accept>
+      <categories fixed="yes">
+        <atom:category
+          scheme="http://example.org/extra-cats/"
+          term="joke" />
+        <atom:category
+          scheme="http://example.org/extra-cats/"
+          term="serious" />
+      </categories>
+    </collection>
+  </workspace>
+</service>

data/spec/service_spec.rb

@@ -0,0 +1,108 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+require 'atom/service'
+
+describe Atom::Service do
+  describe 'when parsing' do
+    before(:each) do
+      @service = Atom::Service.parse(fixtures(:service))
+    end
+
+    it 'should parse workspace elements correctly' do
+      @service.workspaces.length.should == 2
+    end
+
+    it 'should absolutize relative hrefs' do
+      svc = Atom::Service.parse(
+        fixtures('service-w-xhtml-ns'),
+        'http://example.org/introspection/')
+
+      coll = svc.workspaces.first.collections.first
+      coll.href.should == "http://example.org/entries/?yanel.resource.viewid=atom"
+    end
+
+    it 'should parse XHTML outside the default namespace correctly' do
+      xhtml_svc = Atom::Service.parse(fixtures('service-w-xhtml-ns'))
+
+      xhtml_svc.workspaces.length.should == 2
+      xhtml_coll = xhtml_svc.workspaces.last.collections.first
+      xhtml_coll.title.html.strip.should == 'Yulup <b>Releases</b>'
+    end
+  end
+end
+
+describe Atom::Workspace do
+  describe 'when parsing' do
+    before(:each) do
+      svc = Atom::Service.parse(fixtures(:service))
+      @main = svc.workspaces.first
+      @sidebar = svc.workspaces.last
+    end
+
+    it 'should parse title element correctly' do
+      @main.title.to_s.should == 'Main Site'
+      @sidebar.title.to_s.should == 'Sidebar Blog'
+    end
+
+    it 'should parse collection elements correctly' do
+      @main.collections.length.should == 2
+      @sidebar.collections.length.should == 1
+    end
+  end
+end
+
+describe Atom::Collection do
+  describe 'when parsing' do
+    before(:each) do
+      svc = Atom::Service.parse(fixtures(:service))
+      @entries = svc.workspaces.first.collections.first
+      @pictures = svc.workspaces.first.collections.last
+      @links = svc.workspaces.last.collections.first
+    end
+
+    it 'should parse href correctly' do
+      @entries.href.should == 'http://example.org/blog/main'
+      @entries.feed.uri.to_s.should == 'http://example.org/blog/main'
+
+      @pictures.href.should == 'http://example.org/blog/pic'
+      @links.href.should == 'http://example.org/sidebar/list'
+    end
+
+    it 'should parse title element correctly' do
+      @entries.title.to_s.should == 'My Blog Entries'
+      @pictures.title.to_s.should == 'Pictures'
+      @links.title.to_s.should == 'Remaindered Links'
+    end
+
+    it 'should parse accept elements correctly' do
+      @entries.accepts.should == ['application/atom+xml;type=entry']
+      @pictures.accepts.should == ['image/png', 'image/jpeg', 'image/gif']
+      @links.accepts.should == ['application/atom+xml;type=entry']
+    end
+  end
+end
+
+describe Atom::Categories do
+  describe 'when parsing' do
+    before(:each) do
+      svc = Atom::Service.parse(fixtures(:service))
+      @ool = svc.workspaces.first.collections.first.categories.first
+      @il = svc.workspaces.last.collections.first.categories.first
+    end
+
+    it 'should parse out-of-line categories correctly' do
+      @ool.href.should == 'http://example.com/cats/forMain.cats'
+    end
+
+    it 'should parse inline categories correctly' do
+      @il.fixed.should be_true
+
+      @il.list.length.should == 2
+
+      @il.list.first.scheme.should == 'http://example.org/extra-cats/'
+      @il.list.first.term.should == 'joke'
+
+      @il.list.last.term.should == 'serious'
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,9 @@
+require 'rubygems'
+require 'spec'
+
+$:.unshift 'lib/', File.dirname(__FILE__) + '/../lib'
+
+def fixtures(name)
+  File.read(File.dirname(__FILE__) + "/fixtures/#{name}.xml")
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: atom-tools
 version: !ruby/object:Gem::Version 
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors: 
 - Brendan Taylor
@@ -9,11 +9,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-01 00:00:00 -06:00
+date: 2009-08-15 00:00:00 +00:00
 default_executable: 
 dependencies: []
 
-description: 
+description: |-
+  atom-tools is an all-in-one Atom library. It parses and builds Atom (RFC 4287) entries and feeds, and manipulates Atom Publishing Protocol (RFC 5023) Collections.
+  
+  It also comes with a set of commandline utilities for working with AtomPub Collections.
+  
+  It is not the fastest Ruby Atom library, but it is comprehensive and makes handling extensions to the Atom format very easy.
 email: whateley@gmail.com
 executables: []
 
@@ -34,7 +39,6 @@ files:
 - test/runtests.rb
 - test/test_feed.rb
 - test/test_protocol.rb
-- test/conformance
 - test/conformance/updated.rb
 - test/conformance/xmlnamespace.rb
 - test/conformance/title.rb
@@ -43,7 +47,16 @@ files:
 - test/test_xml.rb
 - test/test_http.rb
 - test/test_general.rb
-- lib/atom
+- spec/entry_spec.rb
+- spec/ext_spec.rb
+- spec/spec_helper.rb
+- spec/feed_spec.rb
+- spec/fixtures/feed-w-ext.xml
+- spec/fixtures/service-w-xhtml-ns.xml
+- spec/fixtures/entry-w-ext.xml
+- spec/fixtures/service.xml
+- spec/fixtures/entry.xml
+- spec/service_spec.rb
 - lib/atom/cache.rb
 - lib/atom/feed.rb
 - lib/atom/text.rb
@@ -54,7 +67,9 @@ files:
 - lib/atom/element.rb
 - lib/atom/http.rb
 has_rdoc: true
-homepage: http://code.necronomicorp.com/atom-tools
+homepage: http://github.com/bct/atom-tools/wikis
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -75,9 +90,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ibes
-rubygems_version: 1.3.1
+rubygems_version: 1.3.2
 signing_key: 
-specification_version: 2
-summary: Tools for working with Atom Entries, Feeds and Collections
+specification_version: 3
+summary: Tools for working with Atom Entries, Feeds and Collections.
 test_files: 
 - test/runtests.rb