tinyatom 0.3.2 → 0.3.3

data/README.textile

@@ -55,10 +55,10 @@ puts feed.make(:indent => 2)
 # open('atom.xml', 'w') { |f| feed.make(:target => f) }
 
 <?xml version="1.0" encoding="UTF-8"?>
-<feed xmlns:media="http://purl.org/syndication/atommedia" xmlns="http://www.w3.org/2005/Atom">
+<feed xmlns:media="http://search.yahoo.com/mrss/" xmlns="http://www.w3.org/2005/Atom">
   <title>My Blog</title>
   <link rel="self" href="http://mysite.com/blog/atom.xml"/>
-  <updated>2010-11-14T10:35:27-05:00</updated>
+  <updated>2010-11-14T11:36:03-05:00</updated>
   <id>http://mysite.com/blog/</id>
   <author>
     <name>me</name>
@@ -70,7 +70,7 @@ puts feed.make(:indent => 2)
     <title>post 1</title>
     <link href="http://mysite.com/blog/1"/>
     <id>tag:mysite.com,2010-11-14:1</id>
-    <updated>2010-11-14T10:35:27-05:00</updated>
+    <updated>2010-11-14T11:36:03-05:00</updated>
     <summary>the summary</summary>
     <content>the content</content>
     <author>

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

data/lib/tinyatom.rb

@@ -1,4 +1,2 @@
-Dir.glob(File.join(File.dirname(__FILE__), 'tinyatom', '*.rb')).
-  map { |f| File.join('tinyatom', File.basename(f, '.rb')) }.
-  sort.
-  each { |m| require m }
+require 'tinyatom/feed'
+require 'tinyatom/uri'

data/lib/tinyatom/feed.rb

@@ -25,46 +25,46 @@ module TinyAtom
         }.merge(options)
     end
 
-    # Build the feed and return a Builder::XmlMarkup
+    # Build the feed and return a Builder::XmlMarkup.
     def make(options={})
       xm = Builder::XmlMarkup.new(options)
-      xm.instruct!(:xml)
+      xm.instruct! :xml
 
       xm.feed(:xmlns => 'http://www.w3.org/2005/Atom',
         :'xmlns:media' => 'http://search.yahoo.com/mrss/') {
-        xm.title(title)
-        xm.link(:href => feed_url, :rel => 'self')
-        xm.updated(updated.xmlschema)
-        xm.id(site_url)
-        TinyAtom::author(xm, feed_options)
+        xm.title title
+        xm.link :href => feed_url, :rel => 'self'
+        xm.updated updated.xmlschema
+        xm.id site_url
+        TinyAtom::author xm, feed_options
         feed_options.fetch(:hubs, []).each do |hub|
-          xm.link(:rel => 'hub', :href => hub)
+          xm.link :rel => 'hub', :href => hub
         end
 
         entries.each do |e|
           xm.entry {
-            xm.title(e[:title])
-            xm.link(:href => e[:link])
-            xm.id(entry_id(e))
-            xm.updated(e[:updated].xmlschema)
-            xm.summary(e[:summary]) if e[:summary]
-            xm.content(e[:content]) if e[:content]
-
-            (e[:authors] || [e]).each { |h| TinyAtom::author(xm, h) }
-            (e[:enclosures] || [e]).each { |h| TinyAtom::enclosure(xm, h) }
+            xm.title e[:title]
+            xm.link :href => e[:link]
+            xm.id entry_id(e)
+            xm.updated e[:updated].xmlschema
+            xm.summary(e[:summary])  if e[:summary]
+            xm.content(e[:content])  if e[:content]
+
+            (e[:authors] || [e]).each { |h| TinyAtom::author xm, h }
+            (e[:enclosures] || [e]).each { |h| TinyAtom::enclosure xm, h }
             (e[:media_thumbnails] || [e]).each do |h|
-              TinyAtom::media_thumbnail(xm, h)
+              TinyAtom::media_thumbnail xm, h
             end
-            TinyAtom::via(xm, e)
+            TinyAtom::via xm, e
           }
         end
       }
     end
 
-    # Return the last update time of the feed
+    # Return the last update time of the feed.
     def updated; entries.map { |e| e[:updated] }.max; end
 
-    # Build an entry id
+    # Build an entry id.
     def entry_id(e)
       # http://diveintomark.org/archives/2004/05/28/howto-atom-id
       "tag:#{site_domain},#{e[:updated].strftime('%Y-%m-%d')}:#{e[:id]}"
@@ -80,13 +80,13 @@ module TinyAtom
 
   module_function
 
-  # Add author tags if present
+  # Add author tags if present.
   def author(markup, h)
     if h[:author_name]
       markup.author {
-        markup.name(h[:author_name])
-        markup.email(h[:author_email]) if h[:author_email]
-        markup.uri(h[:author_uri]) if h[:author_uri]
+        markup.name h[:author_name]
+        markup.email(h[:author_email])  if h[:author_email]
+        markup.uri(h[:author_uri])  if h[:author_uri]
       }
     end
   end
@@ -96,7 +96,7 @@ module TinyAtom
     :enclosure_length => :length,
     }
 
-  # Add enclosure tags if present
+  # Add enclosure tags if present.
   def enclosure(markup, h)
     if h[:enclosure_type] and h[:enclosure_href] and h[:enclosure_title]
       options = {}
@@ -106,8 +106,8 @@ module TinyAtom
         end
       end
 
-      link(markup, 'enclosure', h[:enclosure_type], h[:enclosure_href],
-        h[:enclosure_title], options)
+      link markup, 'enclosure', h[:enclosure_type], h[:enclosure_href],
+        h[:enclosure_title], options
     end
   end
 
@@ -128,19 +128,19 @@ module TinyAtom
         end
       end
 
-      markup.media(:thumbnail,
-        { :url => h[:media_thumbnail_url] }.merge(options))
+      markup.media :thumbnail,
+        { :url => h[:media_thumbnail_url] }.merge(options)
     end
   end
 
-  # Add via tags if present
+  # Add via tags if present.
   def via(markup, h)
     if h[:via_type] and h[:via_href] and h[:via_title]
-      link(markup, 'via', h[:via_type], h[:via_href], h[:via_title])
+      link markup, 'via', h[:via_type], h[:via_href], h[:via_title]
     end
   end
 
-  # Create link tag
+  # Create link tag.
   def link(markup, rel, type, href, title, options={})
     markup.link({
       :rel => rel,

data/lib/tinyatom/uri.rb

@@ -2,7 +2,7 @@ require 'uri'
 
 class URI::Generic
 
-  # Add domain method to URI
+  # Add domain method to URI.
   def domain
     if (host and (d = host[/[a-z\d-]+\.[a-z]{2,}(\.[a-z]{2})?$/]))
       d.downcase

data/tinyatom.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tinyatom}
-  s.version = "0.3.2"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matthew M. Boedicker"]
-  s.date = %q{2010-11-14}
+  s.date = %q{2010-11-21}
   s.description = %q{Small and easy to use ruby Atom feed generator.}
   s.email = %q{matthewm@boedicker.org}
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tinyatom
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Matthew M. Boedicker
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-14 00:00:00 -05:00
+date: 2010-11-21 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency