ostatus 0.0.1 → 0.0.2

data/lib/ostatus.rb

@@ -1,4 +1,7 @@
 require 'nokogiri'
 
-module OStatus
-end
+require_relative 'ostatus/feed'
+require_relative 'ostatus/entry'
+require_relative 'ostatus/author'
+require_relative 'ostatus/activity'
+require_relative 'ostatus/portable_contacts'

data/lib/ostatus/feed.rb

@@ -3,12 +3,14 @@ require 'open-uri'
 require 'tinyatom'
 
 require_relative 'entry'
+require_relative 'author'
 
 module OStatus
 
   # This class represents an OStatus Feed object.
   class Feed
-    def initialize(url, access_token, author, entries, id, title, links)
+    def initialize(str, url, access_token, author, entries, id, title, links)
+      @str = str
       @url = url
       @access_token = access_token
       @author = author
@@ -25,13 +27,17 @@ module OStatus
     # 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(url, access_token, nil, nil, nil, nil, nil)
+      Feed.new(nil, url, access_token, nil, nil, nil, nil, nil)
     end
 
     # Creates a new Feed instance that contains the information given by
     # the various instances of author and entries.
     def Feed.from_data(id, title, url, author, entries, links)
-      Feed.new(url, nil, author, entries, id, title, links)
+      Feed.new(nil, url, nil, author, entries, id, title, links)
+    end
+
+    def Feed.from_string(str)
+      Feed.new(str, nil, nil, nil, nil, nil, nil, nil)
     end
 
     # Returns an array of  Nokogiri::XML::Element instances for all link tags
@@ -67,7 +73,9 @@ module OStatus
     # the atom feed. It will make a network request (through OAuth if
     # an access token was given) to retrieve the document if necessary.
     def atom
-      if @id == nil and @access_token == nil
+      if @str != nil
+        @str
+      elsif @id == nil and @access_token == nil
         # simply open the url
         open(@url).read
       elsif @id == nil and @url != nil
@@ -93,7 +101,9 @@ module OStatus
             entry.title,
             entry.updated,
 
-            '',
+            @url,
+
+            :published => entry.published,
 
             :content => entry.content,
 

data/lib/ostatus/version.rb

@@ -1,3 +1,3 @@
 module OStatus
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/entry_spec.rb

@@ -79,9 +79,8 @@ describe OStatus::Entry do
       @entry.info[:content_type].should eql("html")
     end
 
-    it "should contain a Nokogiri NodeSet for the link" do
-      @entry.info[:link].class.should eql(Nokogiri::XML::NodeSet)
-      @entry.info[:link][0].class.should eql(Nokogiri::XML::Element)
+    it "should contain a Hash for the link" do
+      @entry.info[:link].class.should eql(Hash)
     end
     
     it "should contain the published DateTime" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Hackers of the Severed Hand