superfeedr-superfeedr-ruby 0.3.0 → 0.3.1

data/VERSION.yml

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

data/lib/stanzas/notification_stanza.rb

@@ -9,6 +9,7 @@
 # - chunks (long entries might be notified in several chunks)
 # - chunk (current chunk out of chunks)
 #
+require "cgi"
 class Item
   include SAXMachine
   element :item, :as => :chunk, :value => :chunk
@@ -19,6 +20,10 @@ class Item
   element :id, :as => :unique_id
   element :published
   
+  def link
+    CGI.unescape(@link).gsub("\n", "")
+  end
+  
   def published
     Time.parse(@published)
   end
@@ -56,6 +61,10 @@ class NotificationStanza
     @http_status.to_i
   end
   
+  def feed_url
+    CGI.unescape(@feed_url).gsub("\n", "")
+  end
+  
   element :http, :as => :message_status
   element :http, :as => :http_status, :value => :code
   element :status, :value => :feed, :as => :feed_url

data/lib/superfeedr.rb

@@ -82,11 +82,11 @@ module Superfeedr
   ##
   # List all subscriptions, by sending them by blocks (page), starting at page specified in argument
   def self.subscriptions(start_page = 1, &block)
-    Superfeedr.subscriptions_by_page(start_page) do |result|
+    Superfeedr.subscriptions_by_page(start_page) do |page, result|
       if !result.empty?
         subscriptions(start_page + 1, &block)
+        block.call(page, result)
       end
-      block.call(result)
     end
   end
   
@@ -139,8 +139,8 @@ module Superfeedr
   ##
   # Called with a response to a subscriptions listing
   def self.on_subscriptions(stanza, &block)
-    page = stanza.xpath('//xmlns:subscriptions', { 'xmlns' => 'http://jabber.org/protocol/pubsub' }).first["page"].to_i
-    feeds = stanza.xpath('//xmlns:subscription', { 'xmlns' => 'http://jabber.org/protocol/pubsub' }).map { |s| s["node"] }
+    page = stanza.xpath('//subscriptions').first["page"].to_i
+    feeds = stanza.xpath('//subscription').map { |s| s["node"] }
     block.call(page, feeds)
   end
   

data/spec/superfeedr_ruby_spec.rb

@@ -41,12 +41,12 @@ describe Superfeedr do
     it "should call subscriptions_by_page for each page as long as they're not empty" do
       def method_called_upon_page
       end
-      self.should_receive(:method_called_upon_page).exactly(4).times
+      self.should_receive(:method_called_upon_page).exactly(3).times
       3.times do |t|
-        Superfeedr.should_receive(:subscriptions_by_page).with(t+1).and_yield(["a", "b", "c"])
+        Superfeedr.should_receive(:subscriptions_by_page).with(t+1).and_yield( t+1 , ["a", "b", "c"])
       end
-      Superfeedr.should_receive(:subscriptions_by_page).with(4).and_yield([])      
-      Superfeedr.subscriptions do |result|
+      Superfeedr.should_receive(:subscriptions_by_page).with(4).and_yield(4, [])      
+      Superfeedr.subscriptions do |page, result|
         method_called_upon_page
       end
     end
@@ -219,8 +219,8 @@ EOXML
     it "should call the block with the page number and the list of feeds as an array" do
       xml = <<-EOXML
       <iq type="result" to="you@superfeedr.com/home" id="subman1" from="firehoser.superfeedr.com">
-        <pubsub xmlns="http://jabber.org/protocol/pubsub" xmlns:superfeedr="http://superfeedr.com/xmpp-pubsub-ext" >
-          <subscriptions superfeedr:page="3">
+        <pubsub>
+          <subscriptions page="3">
             <subscription node="http://domain.tld/path/to/a/feed/atom.xml" subscription="subscribed" jid="you@superfeedr.com" />
             <subscription node="http://domain2.tld/path/to/feed.rss" subscription="subscribed" jid="you@superfeedr.com" />
           </subscriptions>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: superfeedr-superfeedr-ruby
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - julien Genestoux
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-06 00:00:00 -07:00
+date: 2009-06-09 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency