ostatus 0.0.6 → 0.0.7

data/lib/ostatus/activity.rb

@@ -1,53 +1,55 @@
 module OStatus
+  ACTIVITY_NS = 'http://activitystrea.ms/spec/1.0/'
 
   # This class represents an Activity object for an OStatus entry.
   class Activity
+    SCHEMA_ROOT = 'http://activitystrea.ms/schema/1.0/'
 
-    # This will create an instance of an Activity class populated
-    # with the given data as a Hash or parsable XML given by a 
-    # Nokogiri::XML::Element that serves as the root node of
-    # anything containing the activity tags.
-    def initialize(activity_root)
-      if activity_root.class == Hash
-        @activity_data = activity_root
-        @activity = nil
-      else
-        @activity = activity_root
-        @activity_data = nil
-      end
+    def initialize(entry)
+      @entry = entry
     end
 
-    def pick_first_node(a)
-      if a.empty?
-        nil
-      else
-        a[0].content
-      end
-    end
-    private :pick_first_node
-
     # Returns the object field or nil if it does not exist.
     def object
-      return @activity_data[:object] unless @activity_data == nil
-      pick_first_node(@activity.xpath('./activity:object'))
+      if @entry.is_a? Hash
+        @entry[:object]
+      else
+        @entry.activity_object
+      end
     end
 
     # Returns the target field or nil if it does not exist.
     def target
-      return @activity_data[:target] unless @activity_data == nil
-      pick_first_node(@activity.xpath('./activity:target'))
+      if @entry.is_a? Hash
+        @entry[:object]
+      else
+        @entry.activity_target
+      end
     end
 
     # Returns the verb field or nil if it does not exist.
+    # :favorite, :follow, :like, :"make-friend", :join, :play, 
+    # :post, :save, :share, :tag, :update
     def verb
-      return @activity_data[:verb] unless @activity_data == nil
-      pick_first_node(@activity.xpath('./activity:verb'))
+      if @entry.is_a? Hash
+        @entry[:object]
+      else
+        obj = @entry.activity_verb
+        obj[SCHEMA_ROOT.size..-1].intern unless obj.nil?
+      end
     end
 
     # Returns the object-type field or nil if it does not exist.
+    # :article, :audio, :bookmark, :comment, :file, :folder, :group, 
+    # :list, :note, :person, :photo, :"photo-album", :place, :playlist, 
+    # :product, :review, :service, :status, :video
     def object_type
-      return @activity_data[:object_type] unless @activity_data == nil
-      pick_first_node(@activity.xpath('./activity:object-type'))
+      if @entry.is_a? Hash
+        @entry[:object_type]
+      else
+        obj = @entry.activity_object_type
+        obj[SCHEMA_ROOT.size..-1].intern unless obj.nil?
+      end
     end
 
     # Returns a hash of all relevant fields.

data/lib/ostatus/author.rb

@@ -4,59 +4,85 @@ require_relative 'portable_contacts'
 module OStatus
 
   # Holds information about the author of the Feed.
-  class Author
-
-    # Instantiates an Author object either from a given <author></author> root
-    # passed as an instance of a Nokogiri::XML::Element or a Hash containing
-    # the properties.
-    def initialize(author_node)
-      if author_node.class == Hash
-        @author_data = author_node
-        @author = nil
-      else
-        @author = author_node
-        @author_data = nil
-      end
-    end
+  class Author < Atom::Person
+    include Atom::SimpleExtensions
 
-    # Gives an instance of an OStatus::Activity that parses the fields
-    # having an activity prefix.
-    def activity
-      OStatus::Activity.new(@author)
-    end
+    add_extension_namespace :activity, ACTIVITY_NS
+    element 'activity:object-type'
 
-    def pick_first_node(a)
-      if a.empty?
-        nil
-      else
-        a[0].content
-      end
+    namespace Atom::NAMESPACE
+    element :email
+    element :uri
+
+    add_extension_namespace :poco, POCO_NS
+    element 'poco:id'
+    element 'poco:displayName'
+    element 'poco:nickname'
+    element 'poco:updated',     :class => DateTime, :content_only => true
+    element 'poco:published',   :class => DateTime, :content_only => true
+    element 'poco:birthday',    :class => Date, :content_only => true
+    element 'poco:anniversary', :class => Date, :content_only => true
+    element 'poco:gender'
+    element 'poco:note'
+    element 'poco:preferredUsername'
+    element 'poco:connected'
+
+    def initialize *args
+      self.activity_object_type = "http://activitystrea.ms/schema/1.0/person" 
+      super(*args)
     end
-    private :pick_first_node
 
-    # Returns the name of the author, if it exists.
+    # unfortunately ratom doesn't handle elements with the same local name well.
+    # this is a workaround for that.
+    attr_writer :name, :poco_name
+
     def name
-      return @author_data[:name] unless @author_data == nil
-      pick_first_node(@author.css('name'))
+      @name or self[Atom::NAMESPACE, 'name'].first
+    end
+
+    def poco_name
+      @poco_name or self[POCO_NS, 'name'].first
     end
 
-    # Returns the email of the author, if it exists.
-    def email
-      return @author_data[:email] unless @author_data == nil
-      pick_first_node(@author.css('email'))
+    def to_xml(*args)
+      x = super(*args)
+
+      if self.name
+        node = XML::Node.new('name')
+        node << self.name
+        x << node
+      end
+
+      if self.poco_name
+        node = XML::Node.new('poco:name')
+        node << self.poco_name
+        x << node
+      end
+
+      x
     end
 
-    # Returns the uri of the author, if it exists.
-    def uri
-      return @author_data[:uri] unless @author_data == nil
-      pick_first_node(@author.css('uri'))
+    # Gives an instance of an OStatus::Activity that parses the fields
+    # having an activity prefix.
+    def activity
+      OStatus::Activity.new(self)
     end
 
     # Returns an instance of a PortableContacts that further describe the
     # author's contact information, if it exists.
     def portable_contacts
-      return @author_data[:portable_contacts] unless @author_data == nil
-      PortableContacts.new(@author)
+      PortableContacts.new(self)
+    end
+
+    def portable_contacts= poco
+      [ 'id', 'name', 'nickname', 'updated', 'published', 'birthday',
+        'anniversary', 'gender', 'note', 'connected'].each do |p|
+        v = poco.send(p)
+        self.send("poco_#{p}=", v) if v
+      end
+
+      self.poco_displayName = poco.display_name if poco.display_name
+      self.poco_preferredUsername = poco.preferred_username if poco.preferred_username
     end
   end
 end

data/lib/ostatus/entry.rb

@@ -1,131 +1,74 @@
 require_relative 'activity'
+require_relative 'author'
 
 module OStatus
 
   # Holds information about an individual entry in the Feed.
-  class Entry
+  class Entry < Atom::Entry
+    include Atom::SimpleExtensions
+
+    add_extension_namespace :activity, ACTIVITY_NS
+    element 'activity:object-type'
+    element 'activity:object'
+    element 'activity:verb'
+    element 'activity:target'
+
+    namespace Atom::NAMESPACE
+    element :title, :id, :summary
+    element :updated, :published, :class => DateTime, :content_only => true
+    element :source, :class => Atom::Source
+    elements :links, :class => Atom::Link
+    elements :categories, :class => Atom::Category
+    element :content, :class => Atom::Content
+    element :author, :class => OStatus::Author
 
-    # Instantiates an Entry object from either a given <entry></entry> root
-    # passed as an instance of a Nokogiri::XML::Element or a Hash
-    # containing the properties.
-    def initialize(entry_node)
-      if entry_node.class == Hash
-        @entry_data = entry_node
-        @entry = nil
-      else
-        @entry = entry_node
-        @entry_data = nil
-      end
-    end
-
-    # Gives an instance of an OStatus::Activity that parses the fields
-    # having an activity prefix.
     def activity
-      Activity.new(@entry)
+      Activity.new(self)
     end
 
-    def pick_first_node(a)
-      if a.empty?
-        nil
-      else
-        a[0].content
+    def activity= value
+      if value.object_type
+        self.activity_object_type = OStatus::Activity::SCHEMA_ROOT + value.object_type.to_s
       end
-    end
-    private :pick_first_node
-
-    # Returns the title of the entry.
-    def title
-      return @entry_data[:title] unless @entry_data == nil
-      pick_first_node(@entry.css('title'))
-    end
-
-    # Returns the content of the entry.
-    def content
-      return @entry_data[:content] unless @entry_data == nil
-      pick_first_node(@entry.css('content'))
-    end
-
-    # Returns the content-type of the entry.
-    def content_type
-      return @entry_data[:content_type] unless @entry_data == nil
-      content = @entry.css('content')
-      content.empty? ? "" : content[0]['type']
-    end
-
-    # Returns the DateTime that this entry was published.
-    def published
-      return @entry_data[:published] unless @entry_data == nil
-      DateTime.parse(pick_first_node(@entry.css('published')))
-    end
-
-    # Returns the DateTime that this entry was updated.
-    def updated
-      return @entry_data[:updated] unless @entry_data == nil
-      DateTime.parse(pick_first_node(@entry.css('updated')))
-    end
-
-    # Returns the id of the entry.
-    def id
-      return @entry_data[:id] unless @entry_data == nil
-      pick_first_node(@entry.css('id'))
+      self.activity_object = value.activity_object if value.object
+      if value.verb
+        self.activity_verb = OStatus::Activity::SCHEMA_ROOT + value.activity_verb.to_s
+      end
+      self.activity_target = value.activity_target if value.target
+      activity_object_type = "HEY"
     end
 
     def url
-      return @entry_data[:url] unless @entry_data == nil or @entry_data[:url] == nil
-      return nil if @entry_data != nil
-
-      cur_url = nil
-      @entry.css('link').each do |node|
-        if node[:href]
-          cur_url = node[:href]
-        end
-      end
-
-      links = self.link
-      if links[:alternate]
-        links[:alternate][0][:href].value
-      elsif links[:self]
-        links[:self][0][:href].value
+      if links.alternate
+        links.alternate.href
+      elsif links.self
+        links.self.href
       else
-        cur_url
+        links.map.each do |l|
+          l.href
+        end.compact.first
       end
     end
 
-    def link
-      return @entry_data[:link] unless @entry_data == nil
-
-      result = {}
-
-      @entry.css('link').each do |node|
-        if node[:rel] != nil
-          rel = node[:rel].intern
-          if result[rel] == nil
-            result[rel] = []
-          end
-
-          attrs = node.attributes
-
-          map = {}
-          attrs.keys.each do |key|
-            map[key.intern] = attrs[key]
-          end
+    def url= value
+      links << Atom::Link.new(:rel => "alternate", :href => value)
+    end
 
-          result[rel] << map
-        end
-      end
+    def link
+      links.group_by { |l| l.rel.intern }
+    end
 
-      result
+    def link= options
+      links.clear << Atom::Link.new(options)
     end
 
     # Returns a Hash of all fields.
     def info
-      return @entry_data unless @entry_data == nil
       {
         :activity => self.activity.info,
-        :id => pick_first_node(@entry.css('id')),
+        :id => self.id,
         :title => self.title,
         :content => self.content,
-        :content_type => self.content_type,
         :link => self.link,
         :published => self.published,
         :updated => self.updated

data/lib/ostatus/feed.rb

@@ -1,6 +1,5 @@
-require 'nokogiri'
 require 'open-uri'
-require 'tinyatom'
+require 'atom'
 
 require_relative 'entry'
 require_relative 'author'
@@ -8,22 +7,49 @@ require_relative 'author'
 module OStatus
 
   # This class represents an OStatus Feed object.
-  class Feed
+  class Feed < Atom::Feed
+    include Atom::SimpleExtensions
+
+    namespace Atom::NAMESPACE
+
+    add_extension_namespace :poco, POCO_NS
+    add_extension_namespace :poco, ACTIVITY_NS
+    element :id, :rights, :icon, :logo
+    element :generator, :class => Atom::Generator
+    element :title, :subtitle, :class => Atom::Content
+    element :updated, :class => Time, :content_only => true
+    elements :links, :class => Atom::Link
+    elements :authors, :class => OStatus::Author
+    elements :categories, :class => Atom::Category
+    elements :entries, :class => OStatus::Entry
+
+    attr_reader :url
+
     def initialize(str, url, access_token, options)
       @str = str
       @url = url
       @access_token = access_token
       @options = options
 
-      if options == nil
-        @xml = Nokogiri::XML::Document.parse(self.atom)
+      if str
+        super(XML::Reader.string(str))
+      else
+        super(options)
       end
     end
 
     # Creates a new Feed instance given by the atom feed located at 'url'
     # and optionally using the OAuth::AccessToken given.
     def Feed.from_url(url, access_token = nil)
-      Feed.new(nil, url, access_token, nil)
+      if access_token.nil?
+        # simply open the url
+        str = open(url).read
+      else
+        # open the url through OAuth
+        str = access_token.get(url).body
+      end
+
+      Feed.new(str, url, access_token, nil)
     end
 
     # Creates a new Feed instance that contains the information given by
@@ -36,52 +62,34 @@ module OStatus
       Feed.new(str, nil, nil, nil)
     end
 
-    # Returns an array of  Nokogiri::XML::Element instances for all link tags
-    # that have a rel equal to that given by attribute. This can be used 
-    # generally as a Hash where the keys are intern strings that give an attribute.
+    # Returns an array of Atom::Link instances for all link tags
+    # that have a rel equal to that given by attribute.
     #
     # For example:
-    #   link(:hub).first[:href] -- Gets the first link tag with rel="hub" and
-    #                              returns the contents of the href attribute.
+    #   link(:hub).first.href -- Gets the first link tag with rel="hub" and
+    #                            returns the contents of the href attribute.
     #
     def link(attribute)
-      return @options[:links][attribute] unless @options == nil or @options[:links] == nil
-      return nil if @options != nil
+      links.find_all { |l| l.rel == attribute.to_s }
+    end
 
-      # get all links with rel attribute being equal to attribute
-      @xml.xpath('/xmlns:feed/xmlns:link').select do |link|
-        link[:rel] == attribute.to_s
+    def links=(given)
+      self.links.clear
+      given.each do |rel,links|
+        links.each do |l|
+          self.links << Atom::Link.new(l.merge({:rel => rel}))
+        end
       end
     end
 
     # Returns an array of URLs for each hub link tag.
     def hubs
-      if link(:hub)
-        link(:hub).map do |link|
-          link[:href]
-        end
-      else
-        []
-      end
+      link(:hub).map { |link| link.href }
     end
 
     # Returns the salmon URL from the link tag.
     def salmon
-      link(:salmon).first[:href]
-    end
-
-    # Returns the logo
-    def logo
-      return @options[:logo] unless @options == nil
-
-      pick_first_node(@xml.xpath('/xmlns:feed/xmlns:logo'))
-    end
-
-    # Returns the icon
-    def icon
-      return @options[:icon] unless @options == nil
-
-      pick_first_node(@xml.xpath('/xmlns:feed/xmlns:icon'))
+      link(:salmon).first.href
     end
 
     # This method will return a String containing the actual content of
@@ -97,88 +105,25 @@ module OStatus
         # open the url through OAuth
         @access_token.get(@url).body
       else
-        # build the atom file from internal information
-        feed = TinyAtom::Feed.new(
-          self.id,
-          self.title,
-
-          @url,
-
-          :author_name => self.author.name,
-          :author_email => self.author.email,
-          :author_uri => self.author.uri,
-
-          :hubs => self.hubs
-        )
-
-        @options[:entries].each do |entry|
-          entry_url = entry.url
-          entry_url = @url if entry_url == nil
-
-          feed.add_entry(
-            entry.id,
-            entry.title,
-            entry.updated,
-
-            entry_url,
-
-            :published => entry.published,
-
-            :content => entry.content,
-
-            :author_name => self.author.name,
-            :author_email => self.author.email,
-            :author_uri => self.author.uri
-          )
-        end
-
-        feed.make(:indent => 2)
-      end
-    end
-
-    def pick_first_node(a)
-      if a.empty?
-        nil
-      else
-        a[0].content
+        self.links << Atom::Link.new(:rel => 'self', :href => @url) if @url
+        self.links << Atom::Link.new(:rel => 'edit', :href => @url) if @url
+        self.to_xml
       end
     end
-    private :pick_first_node
-
-    def id
-      return @options[:id] unless @options == nil
-
-      pick_first_node(@xml.xpath('/xmlns:feed/xmlns:id'))
-    end
-
-    def title
-      return @options[:title] unless @options == nil
-
-      pick_first_node(@xml.xpath('/xmlns:feed/xmlns:title'))
-    end
-
-    def url
-      return @url
-    end
 
     # Returns an OStatus::Author that will parse the author information
     # within the Feed.
     def author
-      return @options[:author] unless @options == nil
-
-      author_xml = @xml.at_css('author')
-      OStatus::Author.new(author_xml)
+      @options ? @options[:author] : self.authors.first
     end
 
-    # This method gives you an array of OStatus::Entry instances for 
-    # each entry listed in the feed.
-    def entries
-      return @options[:entries] unless @options == nil
-
-      entries_xml = @xml.css('entry')
+    def author= author
+      self.authors.clear << author
+    end
 
-      entries_xml.map do |entry|
-        OStatus::Entry.new(entry)
+    def hubs= hubs
+      hubs.each do |hub|
+        links << Atom::Link.new(:rel => 'hub', :href => hub)
       end
     end
   end

data/lib/ostatus/portable_contacts.rb

@@ -1,116 +1,59 @@
 module OStatus
+  POCO_NS = 'http://portablecontacts.net/spec/1.0'
 
   # Holds information about the extended contact information
   # in the Feed given in the Portable Contacts specification.
   class PortableContacts
-    
-    # Instantiates a OStatus::PortableContacts object from either
-    # a given root that contains all <poco:*> tags as a
-    # Nokogiri::XML::Element or a Hash containing the properties.
-    def initialize(author_node)
-      if author_node.class == Hash
-        @poco_data = author_node
-        @poco = nil
-      else
-        @poco = author_node
-        @poco_data = nil
-      end
-    end
 
-    def pick_first_node(a)
-      if a.empty?
-        nil
+    # Instantiates a OStatus::PortableContacts object from either
+    # a given root that contains all <poco:*> tags as an ratom Person
+    #  or a Hash containing the properties.
+    def initialize(parent)
+      if parent.is_a? Hash
+        @options = parent
       else
-        a[0].content
+        @parent = parent
       end
     end
-    private :pick_first_node
-
-    # Returns the id of the contact, if it exists.
-    def id
-      return @poco_data[:id] unless @poco_data == nil
-      pick_first_node(@poco.xpath('./poco:id'))
-    end
 
-    # Returns the display_name of the contact, if it exists.
-    def display_name
-      return @poco_data[:display_name] unless @poco_data == nil
-      pick_first_node(@poco.xpath('./poco:displayName'))
-    end
+    def id;                   get_prop(:id); end
+    def id= value;            set_prop(:id, value); end
 
-    # Returns the name of the contact, if it exists.
-    def name
-      return @poco_data[:name] unless @poco_data == nil
-      pick_first_node(@poco.xpath('./poco:name'))
-    end
+    def name;                 get_prop(:name); end
+    def name= value;          set_prop(:name, value); end
 
-    # Returns the nickname of the contact, if it exists.
-    def nickname
-      return @poco_data[:nickname] unless @poco_data == nil
-      pick_first_node(@poco.xpath('./poco:nickname'))
-    end
+    def nickname;             get_prop(:nickname); end
+    def nickname= value;      set_prop(:nickname, value); end
 
-    # Returns the published of the contact, if it exists.
-    def published
-      return @poco_data[:published] unless @poco_data == nil
-      pub = pick_first_node(@poco.xpath('./poco:published'))
-      if pub != nil
-        DateTime.parse(pub)
-      end
-    end
+    def gender;               get_prop(:gender); end
+    def gender= value;        set_prop(:gender, value); end
 
-    # Returns the updated of the contact, if it exists.
-    def updated
-      return @poco_data[:updated] unless @poco_data == nil
-      upd = pick_first_node(@poco.xpath('./poco:updated'))
-      if upd != nil
-        DateTime.parse(upd)
-      end
-    end
+    def note;                 get_prop(:note); end
+    def note= value;          set_prop(:note, value); end
 
-    # Returns the birthday of the contact, if it exists.
-    def birthday
-      return @poco_data[:birthday] unless @poco_data == nil
-      bday = pick_first_node(@poco.xpath('./poco:birthday'))
-      if bday != nil
-        Date.parse(bday)
-      end
-    end
+    def display_name;         get_prop(:display_name, 'displayName'); end
+    def display_name= value;  set_prop(:display_name, value, 'displayName'); end
 
-    # Returns the anniversary of the contact, if it exists.
-    def anniversary
-      return @poco_data[:anniversary] unless @poco_data == nil
-      anni = pick_first_node(@poco.xpath('./poco:anniversary'))
-      if anni != nil
-        Date.parse(anni)
-      end
+    def preferred_username         
+      get_prop(:preferred_username, 'preferredUsername')
     end
 
-    # Returns the gender of the contact, if it exists.
-    def gender
-      return @poco_data[:gender] unless @poco_data == nil
-      pick_first_node(@poco.xpath('./poco:gender'))
+    def preferred_username= value
+      set_prop(:preferred_username, value, 'preferredUsername')
     end
 
-    # Returns the note of the contact, if it exists.
-    def note
-      return @poco_data[:note] unless @poco_data == nil
-      pick_first_node(@poco.xpath('./poco:note'))
-    end
+    def updated;   get_datetime(:updated); end
+    def published; get_datetime(:published); end
 
-    # Returns the preferred username of the contact, if it exists.
-    def preferred_username
-      return @poco_data[:preferred_username] unless @poco_data == nil
-      pick_first_node(@poco.xpath('./poco:preferredUsername'))
-    end
+    def birthday;    get_date(:birthday); end
+    def anniversary; get_date(:anniversary); end
 
     # Returns a boolean that indicates that a bi-directional connection
     # has been established between the user and the contact, if it is
     # able to assert this.
     def connected
-      return @poco_data[:connected] unless @poco_data == nil
-      str = pick_first_node(@poco.xpath('./poco:connected'))
-      return nil if str == nil
+      return @options[:connected] unless @options.nil?
+      str = @parent.poco_connected
 
       if str == "true"
         true
@@ -120,5 +63,38 @@ module OStatus
         nil
       end
     end
+
+  private
+
+    def get_prop name, xmlName = name
+      @options ? @options[name] : @parent.send("poco_#{xmlName}")
+    end
+
+    def set_prop name, value, xmlName = name
+      if @options
+        @options[name] = value
+      else
+        @parent.send("poco_#{xmlName}=", value)
+      end
+    end
+
+    def get_datetime x
+      if @options
+        dt = @options[x]
+        DateTime.parse(dt) if dt
+      else
+        @parent.send("poco_#{x}")
+      end
+    end
+
+    def get_date x
+      if @options
+        d = @options[x]
+        Date.parse(d) if d
+      else
+        @parent.send("poco_#{x}")
+      end
+    end
+
   end
 end

data/lib/ostatus/version.rb

@@ -1,3 +1,3 @@
 module OStatus
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/ostatus.rb

@@ -1,5 +1,3 @@
-require 'nokogiri'
-
 require_relative 'ostatus/feed'
 require_relative 'ostatus/entry'
 require_relative 'ostatus/author'

data/ostatus.gemspec

@@ -15,8 +15,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project = "ostatus"
 
   s.add_dependency "oauth"
-  s.add_dependency "nokogiri"
-  s.add_dependency "tinyatom"
+  s.add_dependency "ratom"
   s.add_development_dependency "rspec"
 
   s.files         = `git ls-files`.split("\n")

data/spec/activity_spec.rb

@@ -23,7 +23,7 @@ describe OStatus::Activity do
 
   describe "#object-type" do
     it "should give a String containing the content of the activity:object-type tag" do
-      @activity.object_type.should eql('http://activitystrea.ms/schema/1.0/note')
+      @activity.object_type.should eql(:note)
     end
 
     it "should give nil when no activity:object-type was given" do
@@ -33,7 +33,7 @@ describe OStatus::Activity do
 
   describe "#verb" do
     it "should give a String containing the content of the activity:verb tag" do
-      @activity.verb.should eql('http://activitystrea.ms/schema/1.0/post')
+      @activity.verb.should eql(:post)
     end
 
     it "should give nil when no activity:verb was given" do

data/spec/author_spec.rb

@@ -16,7 +16,7 @@ describe OStatus::Author do
     end
 
     it "should give an Activity instance that is relevant to the author subtree" do
-      @author.activity.object_type.should eql('http://activitystrea.ms/schema/1.0/person')
+      @author.activity.object_type.should eql(:person)
     end
   end
 

data/spec/builder_spec.rb

@@ -0,0 +1,72 @@
+require_relative '../lib/ostatus/feed.rb'
+
+describe 'XML builder' do
+  before(:each) do
+    @feed_url = 'http://example.org/feed'
+    @poco_id  = '68b329da9893e34099c7d8ad5cb9c940'
+    @poco     = OStatus::PortableContacts.new(:id => @poco_id,
+                                              :display_name => 'Dean Venture',
+                                              :preferred_username => 'dean')
+    @author   = OStatus::Author.new(:name => 'Dean Venture',
+                                    :email => 'dean@venture.com',
+                                    :uri => 'http://geocities.com/~dean',
+                                    :portable_contacts => @poco)
+    @feed = OStatus::Feed.from_data(@feed_url,
+                                    :title => "Dean's Updates",
+                                    :id => @feed_url,
+                                    :author => @author,
+                                    :entries => [],
+                                    :links => {
+                                      :hub => [{:href => 'http://example.org/hub'}]
+                                    })
+  end
+
+  it 'should generate the title' do
+    @feed.atom.should match("<title>Dean's Updates")
+  end
+
+  it 'should generate the id' do
+    @feed.atom.should match("<id>#{@feed_url}")
+  end
+
+  it 'should generate a self link' do
+    # depending on this attribute order is a really terrible idea, but oh well.
+    @feed.atom.should match("<link rel=\"self\" href=\"#{@feed_url}\"/>")
+  end
+
+  it 'should generate the hub link' do
+    # depending on this attribute order is a really terrible idea, but oh well.
+    @feed.atom.should match('<link rel="hub" href="http://example.org/hub"/>')
+  end
+
+  describe 'when generating the author' do
+    specify { @feed.atom.should match('<name>Dean Venture') }
+    specify { @feed.atom.should match('<email>dean@venture.com') }
+    specify { @feed.atom.should match('<uri>http://geocities.com/~dean') }
+    specify { @feed.atom.should match("<poco:id>#{@poco_id}") }
+    specify { @feed.atom.should match('<poco:displayName>Dean Venture') }
+    specify { @feed.atom.should match('<poco:preferredUsername>dean') }
+  end
+
+  describe 'when generating a feed with entries' do
+    before do
+      @now = Time.now
+
+      @feed.entries << OStatus::Entry.new(
+        :title => 'atom powered robots are running amok lol',
+        :content => 'atom powered robots are running amok lol',
+        :updated => @now,
+        :published => @now,
+        :id => 'http://example.org/feed/1',
+        :link => { :href => 'http://example.org/feed/1' }
+      )
+    end
+
+    specify { @feed.atom.should match('<title>atom powered robots') }
+    specify { @feed.atom.should match('<content>atom powered robots') }
+    specify { @feed.atom.should match("<updated>#{@now.iso8601}") }
+    specify { @feed.atom.should match("<published>#{@now.iso8601}") }
+    specify { @feed.atom.should match('<id>http://example.org/feed/1') }
+    specify { @feed.atom.should match('<link href="http://example.org/feed/1"/>') }
+  end
+end

data/spec/entry_spec.rb

@@ -26,12 +26,6 @@ describe OStatus::Entry do
     end
   end
 
-  describe "#content_type" do
-    it "should give a String containing the content of the type attribute on the content tag" do
-      @entry.content_type.should eql("html")
-    end
-  end
-
   describe "#updated" do
     it "should return a DateTime instance" do
       @entry.updated.instance_of?(DateTime).should eql(true)
@@ -58,12 +52,6 @@ describe OStatus::Entry do
     end
   end
 
-  describe "#url" do
-    it "should return a String" do
-      @entry.url.class.should eql(String)
-    end
-  end
-
   describe "#info" do
     it "should give a Hash" do
       @entry.info.instance_of?(Hash).should eql(true)
@@ -81,10 +69,6 @@ describe OStatus::Entry do
       @entry.info[:title].should eql("staples come out of the head tomorrow, oh yeah")
     end
 
-    it "should contain the content_type" do
-      @entry.info[:content_type].should eql("html")
-    end
-
     it "should contain a Hash for the link" do
       @entry.info[:link].class.should eql(Hash)
     end

data/test/example_feed.atom

@@ -22,11 +22,11 @@
 		<poco:id>foobar</poco:id>
 		<poco:name>barbaz</poco:name>
 		<poco:nickname>spaz</poco:nickname>
-		<poco:published>2012-02-21T02:15:14+00:00</pico:published>
-		<poco:updated>2013-02-21T02:15:14+00:00</pico:updated>
-		<poco:birthday>2014-02-21</pico:birthday>
-		<poco:anniversary>2015-02-21</pico:anniversary>
-		<poco:gender>male</pico:gender>
+		<poco:published>2012-02-21T02:15:14+00:00</poco:published>
+		<poco:updated>2013-02-21T02:15:14+00:00</poco:updated>
+		<poco:birthday>2014-02-21</poco:birthday>
+		<poco:anniversary>2015-02-21</poco:anniversary>
+		<poco:gender>male</poco:gender>
 		<poco:note>foo
 bar</poco:note>
 		<poco:utcOffset>-08:00</poco:utcOffset>
@@ -72,7 +72,7 @@ bar</poco:note>
 	<entry>
 		<activity:object-type>http://activitystrea.ms/schema/1.0/note</activity:object-type>
 		<activity:object>Foobar</activity:object>
-		<activity:target>Barbaz</activity:object>
+		<activity:target>Barbaz</activity:target>
 		<id>http://identi.ca/notice/64991641</id>
 		<title>staples come out of the head tomorrow, oh yeah</title>
 		<content type="html">staples come out of the head tomorrow, oh yeah</content>

data/test/example_feed_empty_author.atom

@@ -48,7 +48,7 @@
 	<entry>
 		<activity:object-type>http://activitystrea.ms/schema/1.0/note</activity:object-type>
 		<activity:object>Foobar</activity:object>
-		<activity:target>Barbaz</activity:object>
+		<activity:target>Barbaz</activity:target>
 		<id>http://identi.ca/notice/64991641</id>
 		<title>staples come out of the head tomorrow, oh yeah</title>
 		<content type="html">staples come out of the head tomorrow, oh yeah</content>

data/test/example_feed_false_connected.atom

@@ -22,11 +22,11 @@
 		<poco:id>foobar</poco:id>
 		<poco:name>barbaz</poco:name>
 		<poco:nickname>spaz</poco:nickname>
-		<poco:published>2012-02-21T02:15:14+00:00</pico:published>
-		<poco:updated>2013-02-21T02:15:14+00:00</pico:updated>
-		<poco:birthday>2014-02-21</pico:birthday>
-		<poco:anniversary>2015-02-21</pico:anniversary>
-		<poco:gender>male</pico:gender>
+		<poco:published>2012-02-21T02:15:14+00:00</poco:published>
+		<poco:updated>2013-02-21T02:15:14+00:00</poco:updated>
+		<poco:birthday>2014-02-21</poco:birthday>
+		<poco:anniversary>2015-02-21</poco:anniversary>
+		<poco:gender>male</poco:gender>
 		<poco:note>foo
 bar</poco:note>
 		<poco:utcOffset>-08:00</poco:utcOffset>
@@ -71,7 +71,7 @@ bar</poco:note>
 	<entry>
 		<activity:object-type>http://activitystrea.ms/schema/1.0/note</activity:object-type>
 		<activity:object>Foobar</activity:object>
-		<activity:target>Barbaz</activity:object>
+		<activity:target>Barbaz</activity:target>
 		<id>http://identi.ca/notice/64991641</id>
 		<title>staples come out of the head tomorrow, oh yeah</title>
 		<content type="html">staples come out of the head tomorrow, oh yeah</content>

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Hackers of the Severed Hand
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-22 00:00:00 -04:00
+date: 2011-04-02 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -31,7 +31,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: nokogiri
+  name: ratom
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -43,23 +43,10 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: tinyatom
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -68,7 +55,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id004
+  version_requirements: *id003
 description: This project is to be used to jumpstart OStatus related projects that implement the PubSubHubbub protocols by providing the common fundamentals of Atom parsing and OStatus object creation.
 email: 
 - hotsh@xomb.org
@@ -93,6 +80,7 @@ files:
 - ostatus.gemspec
 - spec/activity_spec.rb
 - spec/author_spec.rb
+- spec/builder_spec.rb
 - spec/entry_spec.rb
 - spec/feed_spec.rb
 - spec/portable_contacts_spec.rb
@@ -134,6 +122,7 @@ summary: Implementations of the OStatus data stream objects.
 test_files: 
 - spec/activity_spec.rb
 - spec/author_spec.rb
+- spec/builder_spec.rb
 - spec/entry_spec.rb
 - spec/feed_spec.rb
 - spec/portable_contacts_spec.rb