superfeedr-superfeedr-ruby 0.3.1 → 0.3.2

data/VERSION.yml

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

data/lib/stanzas/subscribe_query_stanza.rb

@@ -1,18 +1,26 @@
-class SubscribeQueryStanza < IqQueryStanza
+class SubscribeQueryStanza < IqQueryStanza 
   
-  def initialize(params)
-    super(params.merge({:type => :set}))
-    pubsub = Nokogiri::XML::Node.new("pubsub", @doc)
-    pubsub["xmlns"] = "http://jabber.org/protocol/pubsub"
+  def initialize(params) 
+    raise NoFeedToSubscribe if params[:nodes].nil? or params[:nodes].empty? 
+    raise TooManyFeeds if params[:nodes].size > 30 
+    super(params.merge({:type => :set})) 
+    @pubsub = Nokogiri::XML::Node.new("pubsub", @doc) 
+    @pubsub["xmlns"] = "http://jabber.org/protocol/pubsub" 
+    params[:nodes].each do |node| 
+      add_node(node) 
+    end 
+    @iq.add_child(@pubsub) 
+  end 
+  
+  def add_node(node)
     subscribe = Nokogiri::XML::Node.new("subscribe", @doc)
-    subscribe["node"] = params[:node]
+    subscribe["node"] = node
     subscribe["jid"] = from.split("/").first
-    pubsub.add_child(subscribe)
-    @iq.add_child(pubsub)
-  end 
+    @pubsub.add_child(subscribe)
+  end
   
-  def node
-    @iq.search("subscribe").first["node"]
+  def nodes
+    @pubsub.children.map {|c| c["node"]}
   end
   
 end

data/lib/stanzas/unsubscribe_query_stanza.rb

@@ -1,18 +1,27 @@
 class UnsubscribeQueryStanza < IqQueryStanza
   
   def initialize(params)
+    raise NoFeedToSubscribe if params[:nodes].nil? or params[:nodes].empty? 
+    raise TooManyFeeds if params[:nodes].size > 30 
     super(params.merge({:type => :set}))
-    pubsub = Nokogiri::XML::Node.new("pubsub", @doc)
-    pubsub["xmlns"] = "http://jabber.org/protocol/pubsub"
-    @iq.add_child(pubsub)
+    
+    @pubsub = Nokogiri::XML::Node.new("pubsub", @doc)
+    params[:nodes].each do |node|
+      add_node(node)
+    end
+    @pubsub["xmlns"] = "http://jabber.org/protocol/pubsub"
+    @iq.add_child(@pubsub)
+  end 
+  
+  def add_node(node)
     unsubscribe = Nokogiri::XML::Node.new("unsubscribe", @doc)
-    unsubscribe["node"] = params[:node].to_s
+    unsubscribe["node"] = node.to_s
     unsubscribe["jid"] = from.split("/").first
-    pubsub.add_child(unsubscribe)
-  end 
+    @pubsub.add_child(unsubscribe)
+  end
   
-  def node
-    @iq.search("unsubscribe").first["node"]
+  def nodes
+    @pubsub.children.map {|c| c["node"]}
   end
   
-end
+end

data/lib/superfeedr.rb

@@ -6,7 +6,6 @@ require "stanzas/subscribe_query_stanza.rb"
 require "stanzas/unsubscribe_query_stanza.rb"
 require "stanzas/subscriptions_query_stanza.rb"
 
-
 ##
 # By default, the log level is at error. You can change that at anytime in your app
 Babylon.logger.level = Log4r::ERROR
@@ -58,13 +57,13 @@ module Superfeedr
   end
   
   ##
-  # Subscribes to the multiple feeds, one by one. Calls the block after each feed.
+  # Subscribes to the multiple feeds, 30 by 30. Calls the block after each feed.
   def self.subscribe(*feeds, &block)
     return if feeds.flatten! == []
-    feed = feeds.shift
-    Superfeedr.add_feed(feed) do |result|
+    subset = feeds.slice!(0..29)
+    Superfeedr.add_feeds(subset) do |result|
       subscribe(feeds, &block)
-      block.call(feed)
+      block.call(subset)
     end
   end
   
@@ -72,10 +71,10 @@ module Superfeedr
   # Ubsubscribe to multiple feeds, one by one.  Calls the block after each feed.
   def self.unsubscribe(*feeds, &block)
     return if feeds.flatten! == []
-    feed = feeds.shift
-    Superfeedr.remove_feed(feed) do |result|
+    subset = feeds.slice!(0..29)
+    Superfeedr.remove_feeds(subset) do |result|
       unsubscribe(feeds, &block)
-      block.call(feed)
+      block.call(subset)
     end
   end
   
@@ -85,8 +84,8 @@ module Superfeedr
     Superfeedr.subscriptions_by_page(start_page) do |page, result|
       if !result.empty?
         subscriptions(start_page + 1, &block)
-        block.call(page, result)
       end
+      block.call(page, result)
     end
   end
   
@@ -94,9 +93,9 @@ module Superfeedr
   # Adds the url to the list of feeds you're monitoring. The block passed in argument will be called upon success. 
   # The block will take one boolen argument : true means everything went right... false means something failed! 
   # (Please set Babylon's log to Log4r::INFO for more info)
-  def self.add_feed(feed_url, &block)
+  def self.add_feeds(feeds_url, &block)
     raise NotConnected unless connection
-    stanza = SubscribeQueryStanza.new({:node => feed_url, :from => connection.jid})
+    stanza = SubscribeQueryStanza.new({:nodes => feeds_url, :from => connection.jid})
     @@callbacks[stanza.id] = Hash.new
     @@callbacks[stanza.id][:method] = method(:on_subscribe)
     @@callbacks[stanza.id][:param] = block
@@ -107,9 +106,9 @@ module Superfeedr
   # Unsubscribe from a feed. The block passed in argument will be called upon success. 
   # The block will take one boolen argument  : true means everything went right... false means something failed! 
   # (Please set Babylon's log to Log4r::INFO for more info)
-  def self.remove_feed(feed_url, &block)
+  def self.remove_feeds(feeds_url, &block)
     raise NotConnected unless connection
-    stanza = UnsubscribeQueryStanza.new({:node => feed_url, :from => connection.jid})
+    stanza = UnsubscribeQueryStanza.new({:nodes => feeds_url, :from => connection.jid})
     @@callbacks[stanza.id] = Hash.new
     @@callbacks[stanza.id][:method] = method(:on_unsubscribe)
     @@callbacks[stanza.id][:param] = block
@@ -140,7 +139,7 @@ module Superfeedr
   # Called with a response to a subscriptions listing
   def self.on_subscriptions(stanza, &block)
     page = stanza.xpath('//subscriptions').first["page"].to_i
-    feeds = stanza.xpath('//subscription').map { |s| s["node"] }
+    feeds = stanza.xpath('//subscription').map { |s| CGI.unescapeHTML(s["node"]) }
     block.call(page, feeds)
   end
   
@@ -195,7 +194,7 @@ module Superfeedr
       @@callbacks.delete(stanza["id"])
     else
       if stanza.name == "message" and stanza.at("event")
-        @@notication_callback.call(NotificationStanza.new(stanza))
+        @@notication_callback.call(NotificationStanza.new(stanza)) if @@notification_callback
         # Here we need to call the main notification callback!
       end
     end

data/spec/stanzas/subscribe_stanza_spec.rb

@@ -5,11 +5,11 @@ describe SubscribeQueryStanza do
   it_should_behave_like "Iq Query Stanzas"
   
   before(:each) do
-    @params = { :type => "set", :from => "me@server.com/resource", :node => "http//domain.tld/feed.xml", :type => "set", :from => "me@server.com/resource"}
+    @params = { :type => "set", :from => "me@server.com/resource", :nodes => ["http//domain.tld/feed.xml"], :type => "set", :from => "me@server.com/resource"}
   end
   
   it "should have the right node value" do
-    SubscribeQueryStanza.new(@params).node.should == @params[:node]
+    SubscribeQueryStanza.new(@params).nodes.should == @params[:nodes]
   end
   
 end

data/spec/stanzas/unsubscribe_stanza_spec.rb

@@ -5,11 +5,11 @@ describe UnsubscribeQueryStanza do
   it_should_behave_like "Iq Query Stanzas"
   
   before(:each) do
-    @params = { :type => "set", :from => "me@server.com/resource", :node => "http//domain.tld/feed.xml", :type => "set", :from => "me@server.com/resource"}
+    @params = { :type => "set", :from => "me@server.com/resource", :nodes => ["http//domain.tld/feed.xml", "http//domain.tld/feed2.xml"], :type => "set", :from => "me@server.com/resource"}
   end
   
   it "should have the right node value" do
-    UnsubscribeQueryStanza.new(@params).node.should == @params[:node]
+    UnsubscribeQueryStanza.new(@params).nodes.should == @params[:nodes]
   end
   
 end

data/spec/superfeedr_ruby_spec.rb

@@ -14,11 +14,10 @@ describe Superfeedr do
   
   
   describe "subscribe" do
-    it "should call add_feed with feeds supplied" do
-      feeds = "a", "b", "c", "d"
-      feeds.each do |feed|
-        Superfeedr.should_receive(:add_feed).with(feed).and_yield(true)
-      end
+    it "should call add_feeds with feeds supplied" do
+      feeds = ["a"] * 50 
+      Superfeedr.should_receive(:add_feeds).with(["a"] * 30).and_yield(true)
+      Superfeedr.should_receive(:add_feeds).with(["a"] * 20).and_yield(true)
       Superfeedr.subscribe(feeds) do |result|
         result.should be_true
       end
@@ -26,11 +25,10 @@ describe Superfeedr do
   end
   
   describe "unsubscribe" do
-    it "should call remove_feed with feeds supplied" do
-      feeds = "a", "b", "c", "d"
-      feeds.each do |feed|
-        Superfeedr.should_receive(:remove_feed).with(feed).and_yield(true)
-      end
+    it "should call remove_feeds with feeds supplied" do
+      feeds = ["a"] * 40 
+      Superfeedr.should_receive(:remove_feeds).with(["a"] * 30).and_yield(true)
+      Superfeedr.should_receive(:remove_feeds).with(["a"] * 10).and_yield(true)
       Superfeedr.unsubscribe(feeds) do |result|
         result.should be_true
       end
@@ -41,7 +39,7 @@ 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(3).times
+      self.should_receive(:method_called_upon_page).exactly(4).times
       3.times do |t|
         Superfeedr.should_receive(:subscriptions_by_page).with(t+1).and_yield( t+1 , ["a", "b", "c"])
       end
@@ -53,7 +51,7 @@ describe Superfeedr do
   end
   
   
-  describe "add_feed" do
+  describe "add_feeds" do
     before(:each) do
       Superfeedr.stub!(:connection).and_return(@mock_connection)
       Superfeedr.stub!(:send).and_return(true)
@@ -68,35 +66,35 @@ describe Superfeedr do
     it "should raise an error if not connected" do
       Superfeedr.should_receive(:connection).and_return(nil)
       lambda {
-        Superfeedr.add_feed(@node, &@block)
+        Superfeedr.add_feeds(@node, &@block)
       }.should raise_error(Superfeedr::NotConnected)
     end
       
     it "should create a new SubscribeQueryStanza with the right url" do
-      SubscribeQueryStanza.should_receive(:new).with({:node => @node, :from => @mock_connection.jid}).and_return(@mock_stanza)
-      Superfeedr.add_feed(@node, &@block)
+      SubscribeQueryStanza.should_receive(:new).with({:nodes => @node, :from => @mock_connection.jid}).and_return(@mock_stanza)
+      Superfeedr.add_feeds(@node, &@block)
     end
     
     it "should add a Proc that just calls the block in params to the @@callbacks" do
-      Superfeedr.add_feed(@node, &@block)
+      Superfeedr.add_feeds(@node, &@block)
       Superfeedr.callbacks[@mock_stanza.id][:method].should == Superfeedr.method(:on_subscribe)
       Superfeedr.callbacks[@mock_stanza.id][:param].should == @block
     end
     
     it "should send the stanza"  do
       Superfeedr.should_receive(:send).with(@mock_stanza).and_return(true)
-      Superfeedr.add_feed(@node, &@block)
+      Superfeedr.add_feeds(@node, &@block)
     end
   end
   
-  describe "remove_feed" do
+  describe "remove_feeds" do
     before(:each) do
       Superfeedr.stub!(:connection).and_return(@mock_connection)
       Superfeedr.stub!(:send).and_return(true)
       @block = Proc.new {
         
       }
-      @node = "http://domain.com/feed.xml"
+      @nodes = ["http://domain.com/feed.xml"]
       @mock_stanza = mock(UnsubscribeQueryStanza, {:id => "123"})
       UnsubscribeQueryStanza.stub!(:new).and_return(@mock_stanza)
     end
@@ -104,24 +102,24 @@ describe Superfeedr do
     it "should raise an error if not connected" do
       Superfeedr.should_receive(:connection).and_return(nil)
       lambda {
-        Superfeedr.remove_feed(@node, &@block)
+        Superfeedr.remove_feeds(@nodes, &@block)
       }.should raise_error(Superfeedr::NotConnected)
     end
       
     it "should create a new SubscribeQueryStanza with the right url" do
-      UnsubscribeQueryStanza.should_receive(:new).with({:node => @node, :from => @mock_connection.jid}).and_return(@mock_stanza)
-      Superfeedr.remove_feed(@node, &@block)
+      UnsubscribeQueryStanza.should_receive(:new).with({:nodes => @nodes, :from => @mock_connection.jid}).and_return(@mock_stanza)
+      Superfeedr.remove_feeds(@nodes, &@block)
     end
     
     it "should add a Proc that just calls the block in params to the @@callbacks" do
-      Superfeedr.remove_feed(@node, &@block)
+      Superfeedr.remove_feeds(@nodes, &@block)
       Superfeedr.callbacks[@mock_stanza.id][:method].should == Superfeedr.method(:on_unsubscribe)
       Superfeedr.callbacks[@mock_stanza.id][:param].should == @block
     end
     
     it "should send the stanza"  do
       Superfeedr.should_receive(:send).with(@mock_stanza).and_return(true)
-      Superfeedr.remove_feed(@node, &@block)
+      Superfeedr.remove_feeds(@nodes, &@block)
     end
   end
   
@@ -221,7 +219,7 @@ EOXML
       <iq type="result" to="you@superfeedr.com/home" id="subman1" from="firehoser.superfeedr.com">
         <pubsub>
           <subscriptions page="3">
-            <subscription node="http://domain.tld/path/to/a/feed/atom.xml" subscription="subscribed" jid="you@superfeedr.com" />
+            <subscription node="http://domain.tld/path/to/a/feed/atom.xml&amp;toto=tutu" subscription="subscribed" jid="you@superfeedr.com" />
             <subscription node="http://domain2.tld/path/to/feed.rss" subscription="subscribed" jid="you@superfeedr.com" />
           </subscriptions>
         </pubsub>
@@ -230,7 +228,7 @@ EOXML
       stanza = Nokogiri::XML(xml) 
       Superfeedr.on_subscriptions(stanza.root) do |page, subscriptions|
         page.should == 3
-        subscriptions.should == ["http://domain.tld/path/to/a/feed/atom.xml", "http://domain2.tld/path/to/feed.rss"] 
+        subscriptions.should == ["http://domain.tld/path/to/a/feed/atom.xml&toto=tutu", "http://domain2.tld/path/to/feed.rss"] 
       end
     end
     

metadata

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