superfeedr-blather 0.1.1 → 0.2.1

data/Gemfile

@@ -1,7 +1,5 @@
 source "http://rubygems.org"
 
-gem 'blather', "~> 0.4.14"
-
 group :development do
   gem "jeweler", "~> 1.5.2"
   gem "yard", "~> 0.6.0"
@@ -13,4 +11,4 @@ group :test do
   gem 'autotest-notification', :require => 'autotest_notification'
 end
 
-gemspec :name => "superfeedr-blather"
+gemspec

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    superfeedr-blather (0.1.1)
-      blather (~> 0.4.14)
+    superfeedr-blather (0.2.1)
+      blather (~> 0.4)
 
 GEM
   remote: http://rubygems.org/
@@ -40,7 +40,7 @@ PLATFORMS
 DEPENDENCIES
   autotest
   autotest-notification
-  blather (~> 0.4.14)
+  blather (~> 0.4)
   jeweler (~> 1.5.2)
   rspec
   superfeedr-blather!

data/README

@@ -37,6 +37,12 @@ new notification on demand ("show console" displays the button).
 
 == Install
 
+Rubygems:
+
+ gem install superfeedr-blather
+
+From source:
+
  git clone git://github.com/kapoq/superfeedr-blather.git
 
 == Source and latest version
@@ -55,6 +61,7 @@ Dave Nolan / Kapoq Ltd / kapoq.com[http://kapoq.com]
 * apply patches upstream to blather
   * loading filename conflicts using bundler
   * multiple namespaces
+  * append to existing handlers (e.g. DaemonKit::XMPP stomps over client#when_ready)
 
 * improve type-casting
 

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.1

data/examples/sub_unsub.rb

@@ -1,7 +1,9 @@
 require File.expand_path(File.dirname(__FILE__)) + '/../lib/superfeedr-blather'
 require 'blather/client'
 
-setup YOUR_SUPERFEEDR_USERNAME, YOUR_SUPERFEEDR_PASSWORD
+# setup YOUR_SUPERFEEDR_USERNAME, YOUR_SUPERFEEDR_PASSWORD
+
+DUMMY = "http://superfeedr.com/dummy.xml"
 
 when_ready do
   Blather.logger.info "Connected..."
@@ -12,30 +14,40 @@ when_ready do
     write_to_stream Blather::Stanza::PubSub::Subscriptions.new(:get, :id => "subman1", :from => jid, :to => "firehoser.superfeedr.com")
   }
   
-  EM.add_timer(4) {
+  EM.add_timer(3) {
     Blather.logger.info "unsubscribing from dummy"
-    write_to_stream Blather::Stanza::PubSub::Unsubscribe.new :set, "firehoser.superfeedr.com", "http://superfeedr.com/dummy.xml", jid
+    write_to_stream Blather::Stanza::PubSub::Unsubscribe.new(:set, "firehoser.superfeedr.com", DUMMY, jid)
   }
 
-  EM.add_timer(7) {
+  EM.add_timer(5) {
     write_to_stream Blather::Stanza::PubSub::Subscriptions.new(:get, :id => "subman1", :from => jid, :to => "firehoser.superfeedr.com")
   }
 
-  EM.add_timer(10) {
+  EM.add_timer(7) {
     Blather.logger.info "re-subscribing to dummy"
-    write_to_stream Blather::Stanza::PubSub::Subscribe.new :set, "firehoser.superfeedr.com", "http://superfeedr.com/dummy.xml", jid
+    write_to_stream Blather::Stanza::PubSub::Subscribe.new(:set, "firehoser.superfeedr.com", DUMMY, jid)
   }
   
-  EM.add_timer(13) {
+  EM.add_timer(9) {
     write_to_stream Blather::Stanza::PubSub::Subscriptions.new(:get, :id => "subman1", :from => jid, :to => "firehoser.superfeedr.com")
+    EM.stop
   }
 end
 
+# Subscription requests receive a stanza with the subscription
+# status. Helpful.
+pubsub_subscription :node => DUMMY do |sub|
+  Blather.logger.info "#{sub.node} is #{sub.subscription}"
+end
+
+# Unsubscription requests just receive iq reply...
+iq :result?, :id => /^#{Blather::Stanza::PubSub::Unsubscribe::PREFIX}_/ do |iq|
+  Blather.logger.info "Reply: unsubscription request for #{iq.id.split(/_/).last} received OK"
+end
+
+# ...but we can always check the list of subscriptions
 pubsub_subscriptions do |subs|
-  if subs.list.detect { |sub| sub.node_url =~ /dummy\.xml/ }
-    Blather.logger.info "subscribed to dummy.xml"
-  else
-    Blather.logger.info "not subscribed to dummy.xml"
+  unless subs.subscribed.include?(DUMMY)
+    Blather.logger.info "#{DUMMY} is unsubscribed"
   end  
 end
-

data/lib/blather/subscriptions.rb

@@ -25,11 +25,9 @@ module Blather
           aff
         end
 
-        def list
-          subscriptions.find('//ns:subscription', :ns => self.class.registered_ns).map do |child|
-            Superfeedr::Subscription.new(child)
-          end
-        end
+        def subscribed
+          (list[:subscribed] || []).map { |h| h[:node] }
+        end        
       end
     end
   end

data/lib/superfeedr/superfeedr.rb

@@ -1,4 +1,7 @@
 module Superfeedr
+  FIREHOSER = "firehoser.superfeedr.com"
+  MAX_SIMULTANEOUS_SUBSCRIPTION_REQUESTS = 30
+  
   class Node
     def initialize(node)
       @node = node
@@ -197,14 +200,4 @@ module Superfeedr
       @point ||= (raw || []) && raw.split(",")
     end    
   end
-
-  class Subscription < Node
-    def subscription_state
-      content_from("@subscription")
-    end
-
-    def node_url
-      content_from("@node")
-    end    
-  end  
 end

data/lib/superfeedr-blather.rb

@@ -3,5 +3,10 @@ require 'bundler/setup'
 
 require 'blather'
 
-%w(namespaces pubsub event subscriptions).each { |f| require File.join(File.expand_path(File.dirname(__FILE__)), "blather", f) }
-%w(superfeedr).each { |f| require File.join(File.expand_path(File.dirname(__FILE__)), "superfeedr", f) }
+%w(namespaces pubsub event subscriptions unsubscribe).each { |f|
+  require File.join(File.expand_path(File.dirname(__FILE__)), "blather", f)
+}
+
+%w(superfeedr).each { |f|
+  require File.join(File.expand_path(File.dirname(__FILE__)), "superfeedr", f)
+}

data/spec/stanza/subscriptions_spec.rb

@@ -4,19 +4,10 @@ describe "list of resources/subscriptions" do
   let(:stanza) { @stanza ||= open(File.expand_path(File.dirname(__FILE__) + '/../fixtures/resource_list.xml')) }
   let(:node)   { @node   ||= Blather::XMPPNode.import(Nokogiri::XML.parse(stanza).root) }
 
-  describe Blather::Stanza::PubSub::Subscriptions do
-    it "finds subscriptions" do
-      node.list.should have(2).items
-    end
-  end
-
-  describe Superfeedr::Subscription do
-    let(:sub) { node.list.first }
-
-    it "finds subscription state" do
-      sub.subscription_state.should == "subscribed"
-    end    
-  end
+  it "finds all subscribed nodes" do
+    node.subscribed.should have(2).items
+    node.subscribed.should include("http://superfeedr.com/dummy.xml")
+  end  
 end
 
 describe "requesting list of resources/subscriptions" do

data/superfeedr-blather.gemspec

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
@@ -5,11 +6,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{superfeedr-blather}
-  s.version = "0.1.1"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["dave@kapoq.com"]
-  s.date = %q{2011-01-03}
+  s.date = %q{2011-01-05}
   s.description = %q{You get some patches for Blather and some classes that wrap the stuff you want from Superfeedr (entries, authors etc.). Under-the-hood, Blather uses EventMachine and Nokogiri so it’s fast and convenient. If you want to daemonize your client, daemon-kit comes ready with a blather template.}
   s.email = %q{dave@kapoq.com}
   s.extra_rdoc_files = [
@@ -62,30 +63,12 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<blather>, ["~> 0.4.14"])
-      s.add_runtime_dependency(%q<superfeedr-blather>, [">= 0"])
-      s.add_runtime_dependency(%q<blather>, ["~> 0.4.14"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
+      s.add_runtime_dependency(%q<blather>, ["~> 0.4"])
     else
-      s.add_dependency(%q<blather>, ["~> 0.4.14"])
-      s.add_dependency(%q<superfeedr-blather>, [">= 0"])
-      s.add_dependency(%q<blather>, ["~> 0.4.14"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_dependency(%q<yard>, ["~> 0.6.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_dependency(%q<yard>, ["~> 0.6.0"])
+      s.add_dependency(%q<blather>, ["~> 0.4"])
     end
   else
-    s.add_dependency(%q<blather>, ["~> 0.4.14"])
-    s.add_dependency(%q<superfeedr-blather>, [">= 0"])
-    s.add_dependency(%q<blather>, ["~> 0.4.14"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-    s.add_dependency(%q<yard>, ["~> 0.6.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-    s.add_dependency(%q<yard>, ["~> 0.6.0"])
+    s.add_dependency(%q<blather>, ["~> 0.4"])
   end
 end
 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
+  - 2
   - 1
-  - 1
-  version: 0.1.1
+  version: 0.2.1
 platform: ruby
 authors: 
 - dave@kapoq.com
@@ -14,11 +14,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-03 00:00:00 +01:00
+date: 2011-01-05 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: blather
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -27,99 +28,9 @@ dependencies:
         segments: 
         - 0
         - 4
-        - 14
-        version: 0.4.14
+        version: "0.4"
   type: :runtime
-  prerelease: false
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: superfeedr-blather
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: blather
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 4
-        - 14
-        version: 0.4.14
-  type: :runtime
-  prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: jeweler
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 5
-        - 2
-        version: 1.5.2
-  type: :development
-  prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: yard
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 6
-        - 0
-        version: 0.6.0
-  type: :development
-  prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: jeweler
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 5
-        - 2
-        version: 1.5.2
-  type: :development
-  prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: yard
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 6
-        - 0
-        version: 0.6.0
-  type: :development
-  prerelease: false
-  version_requirements: *id007
 description: "You get some patches for Blather and some classes that wrap the stuff you want from Superfeedr (entries, authors etc.). Under-the-hood, Blather uses EventMachine and Nokogiri so it\xE2\x80\x99s fast and convenient. If you want to daemonize your client, daemon-kit comes ready with a blather template."
 email: dave@kapoq.com
 executables: []
@@ -169,7 +80,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3412587347389494585
       segments: 
       - 0
       version: "0"