atom-tools 2.0.0 → 2.0.1

data/Rakefile

@@ -7,7 +7,7 @@ require "spec/rake/spectask"
 require "rake/clean"
 
 NAME = "atom-tools"
-VERS = "2.0.0"
+VERS = "2.0.1"
 
 # the following from markaby-0.5's tools/rakehelp
 def setup_tests
@@ -38,6 +38,9 @@ def setup_gem(pkg_name, pkg_version, author, summary, dependencies, test_file)
     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

data/bin/atom-show

@@ -0,0 +1,70 @@
+#!/usr/bin/ruby
+
+=begin
+Usage: atom-show [options] source
+    displays a feed human-readably
+
+    'source' can be a path on the local filesystem, the
+  URL of an Atom Collection or '-' for stdin.
+=end
+
+require 'atom/tools'
+include Atom::Tools
+
+def parse_options
+  options = { }
+
+  opts = OptionParser.new do |opts|
+    opts.banner = <<END
+Usage: #{$0} [options] [source]
+    displays a feed human-readably
+
+    'source' can be a path on the local filesystem, the
+  URL of an Atom Collection or '-' for stdin.
+END
+
+    opts.on('-c', '--complete', "Follow previous and next links in the source feed to obtain the entire logical feed") do
+     options[:complete] = true
+    end
+
+    opts.on('-n', '--content [MAX-LENGTH]', "Display max-length words of each entry's content") do |length|
+      options[:content] = length ? length.to_i : 0
+    end
+
+    atom_options opts, options
+  end
+
+  opts.parse!(ARGV)
+
+  if ARGV.length > 1
+    puts opts
+    exit
+  end
+
+  options
+end
+
+if __FILE__ == $0
+  require 'optparse'
+
+  options = parse_options
+
+  source = ARGV[0]
+  source ||= '-'
+
+  entries = parse_input source, options
+
+  entries.each do |e|
+    puts e.title
+
+    if options[:content]
+      if options[:content].zero?
+        puts e.content.to_s
+      else
+        puts e.content.to_s.split(' ')[0,options[:content]].join(' ')
+      end
+    end
+
+    puts
+  end
+end

data/lib/atom/collection.rb

@@ -70,11 +70,22 @@ module Atom
     def initialize(href = nil, http = Atom::HTTP.new)
       super()
 
+      @http = http
+
       if href
         self.href = href
       end
+    end
 
-      @http = http
+    def self.parse xml, base = ''
+      e = super
+
+      # URL absolutization
+      if !e.base.empty? and e.href
+        e.href = (e.base.to_uri + e.href).to_s
+      end
+
+      e
     end
 
     # POST an entry to the collection, with an optional slug

data/lib/atom/element.rb

@@ -596,7 +596,7 @@ module Atom # :nodoc:
       e = super
 
       # URL absolutization
-      if e.base and e.href
+      if !e.base.empty? and e.href
         e.href = (e.base.to_uri + e.href).to_s
       end
 

data/lib/atom/feed.rb

@@ -93,7 +93,7 @@ module Atom
     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>)
+    # (see RFC 5005)
     def get_everything!
       self.update!
 

data/lib/atom/http.rb

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

data/lib/atom/text.rb

@@ -27,10 +27,20 @@ module Atom
 
       if x.is_a? REXML::Element
         if type == 'xhtml'
-          x = x.elements['div']
+          x = e.get_elem x, XHTML::NS, 'div'
+
           raise Atom::ParseError, 'xhtml content needs div wrapper' unless x
 
           c = x.dup
+
+          unless x.prefix.empty?
+            # content has a namespace prefix, strip prefixes from it and all
+            # XHTML children
+
+            REXML::XPath.each(c, './/xhtml:*', 'xhtml' => XHTML::NS) do |x|
+              x.name = x.name
+            end
+          end
         else
           c = x[0] ? x[0].value : nil
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: atom-tools
 version: !ruby/object:Gem::Version 
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors: 
 - Brendan Taylor
@@ -9,12 +9,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-28 00:00:00 -06:00
+date: 2008-05-13 00:00:00 -06:00
 default_executable: 
 dependencies: []
 
 description: 
-email: 
+email: whateley@gmail.com
 executables: []
 
 extensions: []
@@ -28,6 +28,7 @@ files:
 - setup.rb
 - bin/atom-grep
 - bin/atom-post
+- bin/atom-show
 - bin/atom-purge
 - bin/atom-cp
 - test/test_constructs.rb
@@ -54,7 +55,7 @@ files:
 - lib/atom/element.rb
 - lib/atom/http.rb
 has_rdoc: true
-homepage: 
+homepage: http://code.necronomicorp.com/atom-tools
 post_install_message: 
 rdoc_options: []
 
@@ -74,8 +75,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.0.1
+rubyforge_project: ibes
+rubygems_version: 1.1.1
 signing_key: 
 specification_version: 2
 summary: Tools for working with Atom Entries, Feeds and Collections