jubjub 0.0.7 → 0.0.8

data/lib/jubjub/pubsub/affiliation_collection.rb

@@ -1,7 +1,9 @@
 class Jubjub::Pubsub::AffiliationCollection
-  
+
   attr_reader :jid, :node
-  
+
+  include Jubjub::Helpers::Collection
+
   def initialize(jid,node,connection)
     @jid = Jubjub::Jid.new jid
     @node = node
@@ -11,28 +13,19 @@ class Jubjub::Pubsub::AffiliationCollection
   def [](jid_num)
     case jid_num
     when Fixnum
-      affiliations[jid_num]
+      list[jid_num]
     when Jubjub::Jid
-      affiliations.find{|i| i.jid == jid_num } || Jubjub::Pubsub::Affiliation.new( jid, node, jid_num, 'none', @connection )
+      search_list( Jubjub::Pubsub::Affiliation.new( jid, node, jid_num, 'none', @connection ) ){|i| i.jid == jid_num }
     else
       j = Jubjub::Jid.new( jid_num )
-      affiliations.find{|i| i.jid == j } || Jubjub::Pubsub::Affiliation.new( jid, node, j, 'none', @connection )
+      search_list( Jubjub::Pubsub::Affiliation.new( jid, node, j, 'none', @connection ) ){|i| i.jid == j }
     end
   end
 
-  # Hint that methods are actually applied to list using method_missing
-  def inspect
-    affiliations.inspect
-  end
-
 private
 
-  def method_missing(name, *args, &block)
-    affiliations.send(name, *args, &block)
-  end
-  
-  def affiliations
-    @affiliations ||= @connection.pubsub.retrieve_affiliations( @jid, @node )
+  def list
+    @list ||= @connection.pubsub.retrieve_affiliations( @jid, @node )
   end
-  
-end
+
+end

data/lib/jubjub/pubsub/collection.rb

@@ -2,18 +2,20 @@
 # and delaying expensive operations until
 # required
 class Jubjub::Pubsub::Collection
-   
+
   attr_reader :jid
-   
+
+  include Jubjub::Helpers::Collection
+
   def initialize(jid, connection)
     @jid = Jubjub::Jid.new jid
     @connection = connection
   end
-  
+
   def create(node)
     @connection.pubsub.create jid, node
   end
-  
+
   def create(node, &block)
     config = nil
     if block_given?
@@ -23,46 +25,37 @@ class Jubjub::Pubsub::Collection
     end
     @connection.pubsub.create jid, node, config
   end
-  
+
   def destroy(node, redirect_jid = nil, redirect_node = nil)
     redirect_jid = Jubjub::Jid.new(redirect_jid) if redirect_jid
     @connection.pubsub.destroy jid, node, redirect_jid, redirect_node
   end
-  
+
   def purge(node)
     @connection.pubsub.purge jid, node
   end
-  
+
   def subscribe(node)
     @connection.pubsub.subscribe jid, node
   end
-  
+
   def unsubscribe(node, subid=nil)
     @connection.pubsub.unsubscribe jid, node, subid
   end
-  
+
   def [](node_num)
     case node_num
     when Fixnum
       list[node_num]
     else
-      list.find{|p| p.node == node_num } || Jubjub::Pubsub.new( jid, node_num, @connection )
+      search_list(Jubjub::Pubsub.new( jid, node_num, @connection )){|p| p.node == node_num }
     end
   end
-  
-  # Hint that methods are actually applied to list using method_missing
-  def inspect
-    list.inspect
-  end
 
 private
 
-  def method_missing(name, *args, &block)
-    list.send(name, *args, &block)
-  end
-  
   def list
     @list ||= @connection.pubsub.list jid
   end
-  
-end
+
+end

data/lib/jubjub/pubsub/configuration.rb

@@ -1,5 +1,5 @@
 require 'jubjub/data_form'
 
 class Jubjub::Pubsub::Configuration < Jubjub::DataForm
-  
-end
+
+end

data/lib/jubjub/pubsub/item.rb

@@ -1,7 +1,7 @@
 class Jubjub::Pubsub::Item
-  
+
   attr_reader :jid, :node, :item_id, :data
-  
+
   def initialize(jid, node, item_id, data, connection)
     @jid = Jubjub::Jid.new jid
     @node = node
@@ -9,17 +9,17 @@ class Jubjub::Pubsub::Item
     @data = data
     @connection = connection
   end
-  
+
   # Hide the connection details and show jid as string for compactness
   def inspect
     obj_id = "%x" % (object_id << 1)
     "#<#{self.class}:0x#{obj_id} @jid=\"#{jid}\" @node=#{node.inspect} @item_id=#{item_id.inspect} @data=#{data.inspect}>"
   end
-  
+
   def retract
     @connection.pubsub.retract jid, node, item_id
   end
-  
+
   def ==(other)
     other.is_a?( self.class ) &&
     other.jid     == self.jid &&
@@ -27,9 +27,9 @@ class Jubjub::Pubsub::Item
     other.item_id == self.item_id &&
     other.data    == self.data
   end
-  
+
   def uri
     "xmpp:#{@jid}?;node=#{@node};item=#{@item_id}"
   end
-  
-end
+
+end

data/lib/jubjub/pubsub/item_collection.rb

@@ -1,7 +1,9 @@
 class Jubjub::Pubsub::ItemCollection
-  
+
   attr_reader :jid, :node
-  
+
+  include Jubjub::Helpers::Collection
+
   def initialize(jid,node,connection)
     @jid = Jubjub::Jid.new jid
     @node = node
@@ -11,25 +13,16 @@ class Jubjub::Pubsub::ItemCollection
   def [](item_num)
     case item_num
     when Fixnum
-      items[item_num]
+      list[item_num]
     else
-      items.find{|i| i.item_id == item_num }        
+      search_list{|i| i.item_id == item_num }
     end
   end
 
-  # Hint that methods are actually applied to list using method_missing
-  def inspect
-    items.inspect
-  end
-
 private
 
-  def method_missing(name, *args, &block)
-    items.send(name, *args, &block)
-  end
-  
-  def items
-    @items ||= @connection.pubsub.retrieve_items( @jid, @node )
+  def list
+    @list ||= @connection.pubsub.retrieve_items( @jid, @node )
   end
-  
-end
+
+end

data/lib/jubjub/pubsub/pubsub.rb

@@ -1,66 +1,66 @@
 class Jubjub::Pubsub
-  
+
   attr_reader :jid, :node
-  
+
   def initialize(jid, node, connection)
     @jid = Jubjub::Jid.new jid
     @node = node
     @connection = connection
   end
-  
+
   def destroy(redirect_jid = nil, redirect_node = nil)
     redirect_jid = Jubjub::Jid.new(redirect_jid) if redirect_jid
     @connection.pubsub.destroy jid, node, redirect_jid, redirect_node
   end
-  
+
   def purge
     @connection.pubsub.purge jid, node
   end
-  
+
   def subscribe
     @connection.pubsub.subscribe jid, node
   end
-  
+
   def unsubscribe(subid = nil)
-    @connection.pubsub.unsubscribe jid, node, subid      
+    @connection.pubsub.unsubscribe jid, node, subid
   end
-  
+
   def publish(data, item_id = nil)
     @connection.pubsub.publish jid, node, data, item_id
   end
-  
+
   def retract(item_id)
     @connection.pubsub.retract jid, node, item_id
   end
-  
+
   # Hide the connection details and show jid as string for compactness
   def inspect
     obj_id = "%x" % (object_id << 1)
     "#<#{self.class}:0x#{obj_id} @jid=\"#{jid}\" @node=#{node.inspect}>"
   end
-  
+
   def items
     ItemCollection.new jid, node, @connection
   end
-  
+
   def affiliations
     AffiliationCollection.new jid, node, @connection
   end
-  
+
   def uri
     "xmpp:#{@jid}?;node=#{@node}"
   end
-  
+
   def ==(other)
     other.is_a?( self.class ) &&
     other.jid     == self.jid &&
     other.node    == self.node
   end
-  
+
 private
 
   def method_missing(name, *args, &block)
     items.send(name, *args, &block)
   end
-  
-end
+
+end

data/lib/jubjub/pubsub/subscription.rb

@@ -1,7 +1,7 @@
 class Jubjub::Pubsub::Subscription
-  
+
   attr_reader :jid, :node, :subscriber, :subid, :subscription
-  
+
   def initialize(jid, node, subscriber, subid, subscription, connection)
     @jid          = Jubjub::Jid.new jid
     @node         = node
@@ -10,15 +10,15 @@ class Jubjub::Pubsub::Subscription
     @subscription = subscription
     @connection   = connection
   end
-  
+
   def unsubscribe
     @connection.pubsub.unsubscribe jid, node, subid
   end
-  
+
   # Hide the connection details and show jid as string for compactness
   def inspect
     obj_id = "%x" % (object_id << 1)
     "#<#{self.class}:0x#{obj_id} @jid=\"#{jid}\" @node=#{node.inspect} @subscriber=\"#{subscriber}\" @subid=#{subid.inspect} @subscription=#{subscription.inspect}>"
   end
-  
-end
+
+end

data/lib/jubjub/response.rb

@@ -1,3 +1,3 @@
 require "jubjub/response/response"
 require "jubjub/response/proxy"
-require "jubjub/response/error"
+require "jubjub/response/error"

data/lib/jubjub/response/error.rb

@@ -7,19 +7,19 @@ module Jubjub
       def initialize(xml)
         @stanza = xml
       end
-    
+
       def condition
         @condition ||= begin
           condition = @stanza.xpath('//error/ietf:*','ietf' => 'urn:ietf:params:xml:ns:xmpp-stanzas').first
           condition.name if condition
         end
       end
-      
+
       def type
         @error_type ||= stanza.xpath('//error').first.attr('type')
       end
-      
-      def text(language=nil)        
+
+      def text(language=nil)
         if language
           xpath = "//error/text[@xml:lang='#{language}']"
         else
@@ -27,7 +27,7 @@ module Jubjub
         end
         stanza.xpath(xpath).text
       end
-    
+
     end
   end
-end
+end

data/lib/jubjub/response/proxy.rb

@@ -6,39 +6,39 @@ module Jubjub
       instance_methods.each do |m|
         undef_method(m) if m.to_s !~ /(?:^__|^nil?$|^send$|^object_id$|^should$)/
       end
-      
+
       attr_reader :proxy_primary, :proxy_secondary
-      
+
       def initialize(primary, secondary, primary_method)
         @proxy_primary = primary
         @proxy_secondary = secondary
         @primary_method = primary_method
       end
-      
+
       # We really want to show the secondary object
       # as the primary is just a thin layer on top
       def inspect
         proxy_secondary.inspect
       end
-      
+
       # Used to give away this is really a proxy
       def proxy_class
         Jubjub::Response::Proxy
       end
-      
+
     private
 
       def method_missing(name, *args, &block)
         # If the method exists on the primary use that
         # unless it's the method name called to create the proxy from the primary, or is a standard object method
-        if name.to_s != @primary_method && (proxy_primary.public_methods - Object.public_methods).include?( name.to_s )
+        if name.to_s != @primary_method && (proxy_primary.public_methods - Object.public_methods).map{|m| m.to_s }.include?( name.to_s )
           proxy_primary.send(name, *args, &block)
         else
         # Else use a method on the secondary
           proxy_secondary.send(name, *args, &block)
         end
       end
-      
+
     end
   end
-end
+end

data/lib/jubjub/response/response.rb

@@ -1,33 +1,33 @@
 module Jubjub
-  
+
   class Response
-    
+
     attr_reader :stanza, :result
-    
+
     def initialize(xml,&block)
       @stanza = xml
-      
+
       @result = nil
       @result = yield stanza if block_given?
     end
-    
+
     def proxy_result
-      # Allows some syntax sugar. We can chain from the result, 
+      # Allows some syntax sugar. We can chain from the result,
       # but still get access to the response via the proxy
       @proxy_result ||= Proxy.new self, result, 'proxy_result'
     end
-    
+
     def success?
       @success ||= stanza.xpath('/iq[@type="result"]|/iq[@type="set"]|/iq[@type="get"]').any?
     end
-    
+
     def error
       @errors ||= begin
         s = stanza.at_xpath('/iq[@type="error"]/error')
         Error.new s if s
       end
     end
-    
+
   end
-  
+
 end