exempla-atomic 0.0.3 → 0.0.4

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 3
+:patch: 4
 :major: 0
 :minor: 0

data/lib/atomic.rb

@@ -1,4 +1,5 @@
 require File.dirname(__FILE__) + '/atomic/service'
+require File.dirname(__FILE__) + '/atomic/feed'
 require File.dirname(__FILE__) + '/atomic/entry'
 
 Atomic::NAMESPACES = { "xmlns:atom" => "http://www.w3.org/2005/Atom",

data/lib/atomic/entry.rb

@@ -8,44 +8,36 @@ module Atomic
 
     class << self
 
-      def parse(xml)
-
-        doc = Nokogiri.XML(xml)
-
-#        puts("================================================================")
-#        puts("XML Document")
-#        puts("================================================================")
-#        puts(doc)
-#        puts("================================================================")
-
-        entry_xml = doc.xpath('//atom:entry', NAMESPACES).first
-
-        attributes = {}
-        attributes[:id] = entry_xml.xpath('atom:id', NAMESPACES).first.text
-        attributes[:title] = entry_xml.xpath('atom:title', NAMESPACES).first.text
-        attributes[:created_at] = entry_xml.xpath('atom:published', NAMESPACES).first.text
-        attributes[:updated_at] = entry_xml.xpath('atom:updated', NAMESPACES).first.text
-
-        content_xml = entry_xml.xpath('atom:content', NAMESPACES).first
-
-        if (content_xml['type'] == 'application/xml')
-          attributes[:content] = {}
-
-          announcement_xml = content_xml.xpath('cirrus:announcement', NAMESPACES).first
-          unless announcement_xml.nil?
-            attributes[:content][:message] = announcement_xml.xpath('cirrus:message', NAMESPACES).first.text
-            attributes[:content][:starts_at] = announcement_xml.xpath('cirrus:starts-at', NAMESPACES).first.text
-            attributes[:content][:ends_at] = announcement_xml.xpath('cirrus:ends-at', NAMESPACES).first.text
+      def parse(data)
+        entry = new
+        doc = data.kind_of?(Nokogiri::XML::Element) ? data : Nokogiri.XML(data)
+
+        entry_node = doc.xpath('//atom:entry', NAMESPACES).first
+
+        entry.id = entry_node.xpath('atom:id', NAMESPACES).first.text
+        entry.title = entry_node.xpath('atom:title', NAMESPACES).first.text
+        entry.created_at = entry_node.xpath('atom:published', NAMESPACES).first.text
+        entry.updated_at = entry_node.xpath('atom:updated', NAMESPACES).first.text
+
+        content_node = entry_node.xpath('atom:content', NAMESPACES).first
+
+        if (content_node['type'] == 'application/xml')
+          entry.content = {}
+          announcement_node = content_node.xpath('cirrus:announcement', NAMESPACES).first
+          unless announcement_node.nil?
+            entry.content[:message] = announcement_node.xpath('cirrus:message', NAMESPACES).first.text
+            entry.content[:starts_at] = announcement_node.xpath('cirrus:starts-at', NAMESPACES).first.text
+            entry.content[:ends_at] = announcement_node.xpath('cirrus:ends-at', NAMESPACES).first.text
           end
         else
-          attributes[:content] = content_xml.inner_html
+          entry.content = content_node.inner_html
         end
-        attributes[:categories] = []
-        entry_xml.xpath('atom:category', NAMESPACES).each do |category_node|
-          attributes[:categories] << {:term => category_node['term'], :scheme => category_node['scheme']}
+        entry.categories = []
+        entry_node.xpath('atom:category', NAMESPACES).each do |category_node|
+          entry.categories << {:term => category_node['term'], :scheme => category_node['scheme']}
         end
 
-        new(attributes)
+        entry
       end
 
     end

data/lib/atomic/feed.rb

@@ -0,0 +1,43 @@
+require 'rubygems'
+require 'nokogiri'
+require 'time'
+
+module Atomic
+
+  class Feed
+
+    class << self
+
+      def parse(data)
+        feed = new
+        doc = data.kind_of?(Nokogiri::XML::Element) ? data : Nokogiri.XML(data)
+        feed_node = doc.xpath('//atom:feed', NAMESPACES).first
+        feed.title = feed_node.xpath('atom:title', NAMESPACES).first.text
+        feed.id = feed_node.xpath('atom:id', NAMESPACES).first.text
+        feed_node.xpath('atom:entry', NAMESPACES).each do |entry_node|
+          feed.entries << Entry.parse(entry_node)
+        end
+        feed
+      end
+
+    end
+
+    attr_accessor :title, :id, :entries
+
+    def initialize(params = {})
+      @title = params[:title]
+      @id = params[:id]
+      @entries = params[:entries] || []
+    end
+
+    def to_hash
+      {
+        :title => @title,
+        :id => @id,
+        :entries => @entries.collect { |entry| entry.to_hash }
+      }
+    end
+
+  end
+
+end

data/spec/atomic/feed_spec.rb

@@ -0,0 +1,12 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe Atomic::Feed do
+  before(:each) do
+  end
+
+  it "should work" do
+    xml = File.read(File.join(File.dirname(__FILE__), '..', 'fixtures', 'valid_atom_feed.xml'))
+    @feed = Atomic::Feed.parse(xml)
+  end
+end
+

data/spec/fixtures/valid_atom_feed.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom">
+  <title type="text">dive into mark</title>
+  <subtitle type="html">
+    A &lt;em&gt;lot&lt;/em&gt; of effort
+    went into making this effortless
+  </subtitle>
+  <updated>2005-07-31T12:29:29Z</updated>
+  <id>tag:example.org,2003:3</id>
+  <link rel="alternate" type="text/html"
+   hreflang="en" href="http://example.org/"/>
+  <link rel="self" type="application/atom+xml"
+   href="http://example.org/feed.atom"/>
+  <rights>Copyright (c) 2003, Mark Pilgrim</rights>
+  <generator uri="http://www.example.com/" version="1.0">
+    Example Toolkit
+  </generator>
+  <entry>
+    <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"/>
+    <id>tag:example.org,2003:3.2397</id>
+    <updated>2005-07-31T12:29:29Z</updated>
+    <published>2003-12-13T08:29:29-04:00</published>
+    <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>
+    <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>
+</feed>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: exempla-atomic
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Darrin Wortlehock
@@ -33,9 +33,11 @@ files:
 - spec/fixtures
 - spec/fixtures/valid_atom_entry.xml
 - spec/fixtures/valid_atom_service.xml
+- spec/fixtures/valid_atom_feed.xml
 - spec/spec_helper.rb
 - spec/atomic
 - spec/atomic/entry_spec.rb
+- spec/atomic/feed_spec.rb
 - spec/atomic/service_spec.rb
 has_rdoc: true
 homepage: http://github.com/exempla/atomic