ostatus 0.0.4 → 0.0.5

data/lib/ostatus/entry.rb

@@ -70,6 +70,27 @@ module OStatus
       pick_first_node(@entry.css('id'))
     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]
+      elsif links[:self]
+        links[:self][0][:href]
+      else
+        cur_url
+      end
+    end
+
     def link
       return @entry_data[:link] unless @entry_data == nil
 
@@ -82,7 +103,14 @@ module OStatus
             result[rel] = []
           end
 
-          result[rel] << node
+          attrs = node.attributes
+
+          map = {}
+          attrs.keys.each do |key|
+            map[key.intern] = attrs[key]
+          end
+
+          result[rel] << map
         end
       end
 

data/lib/ostatus/feed.rb

@@ -45,7 +45,8 @@ module OStatus
     #                              returns the contents of the href attribute.
     #
     def link(attribute)
-      return @options[:links][attribute] unless @options == nil
+      return @options[:links][attribute] unless @options == nil or @options[:links] == nil
+      return nil if @options != nil
 
       # get all links with rel attribute being equal to attribute
       @xml.xpath('/xmlns:feed/xmlns:link').select do |link|
@@ -55,8 +56,12 @@ module OStatus
 
     # Returns an array of URLs for each hub link tag.
     def hubs
-      link(:hub).map do |link|
-        link[:href]
+      if link(:hub)
+        link(:hub).map do |link|
+          link[:href]
+        end
+      else
+        []
       end
     end
 
@@ -107,7 +112,7 @@ module OStatus
         )
 
         @options[:entries].each do |entry|
-          entry_url = entry.link[:href]
+          entry_url = entry.url
           entry_url = @url if entry_url == nil
 
           feed.add_entry(

data/lib/ostatus/version.rb

@@ -1,3 +1,3 @@
 module OStatus
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Hackers of the Severed Hand
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-15 00:00:00 -04:00
+date: 2011-03-22 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency