jubjub 0.0.7 → 0.0.8

data/lib/jubjub/data_form.rb

@@ -2,7 +2,7 @@ require "nokogiri"
 
 module Jubjub
   class DataForm
-    
+
     attr_reader :fields
 
     def initialize(config={})
@@ -47,12 +47,15 @@ module Jubjub
     def ==(thing)
       thing.is_a?( self.class ) && thing.fields == self.fields
     end
-    
+
     def to_builder(root_doc=Nokogiri::XML.parse(""))
       Nokogiri::XML::Builder.with(root_doc) do |xml|
         xml.x_('xmlns' => 'jabber:x:data', :type => 'submit') {
-          settings.each{|name,values|
-            xml.field_('var' => name){
+          fields.each{|name,settings|
+            options = {'var' => name}
+            options[:type] = settings[:type] if settings[:type]
+            values = Array[self[name]].flatten
+            xml.field_(options){
               values.each {|v|
                 xml.value_ v
               }
@@ -73,8 +76,8 @@ module Jubjub
     end
 
     def check_config(config)
-      required = [:type]
-      understood = required + [:label, :options, :value]    
+      required = []
+      understood = required + [:type, :label, :options, :value]
 
       raise Jubjub::ArgumentError.new("please initialize with a hash of the format { 'foo' => {:type => 'boolean', :value => false, :label => 'Fooey'} }") unless config.is_a? Hash
 
@@ -87,7 +90,7 @@ module Jubjub
         ) if mystery_arguments.any?
       end
     end
-    
+
     def convert_xml(config)
       config.xpath(
         # Get fields
@@ -98,24 +101,24 @@ module Jubjub
         hash = {}
         hash[:type]  = field.attr 'type'
         hash[:label] = field.attr 'label'
-        
+
         value = field.xpath('x_data:value', namespaces)
         hash[:value] = hash[:type].match(/\-multi$/) ? value.map{|e| e.content } : value.text
-        
+
         options = field.xpath('x_data:option', namespaces).map{|o|
           { :label => o.attr('label'), :value => o.xpath('x_data:value', namespaces).text }
         }
         hash[:options] = options if options.any?
-        
+
         result[field.attr 'var'] = hash unless hash[:type] == 'fixed'
         result
       }
     end
-    
+
     def namespaces
       { 'x_data' => 'jabber:x:data' }
     end
 
   end
-  
-end
+
+end

data/lib/jubjub/errors.rb

@@ -1,7 +1,7 @@
 module Jubjub
   class Error < StandardError
   end
-  
+
   class ArgumentError < Error
   end
-end
+end

data/lib/jubjub/helpers.rb

@@ -0,0 +1,32 @@
+module Jubjub
+  module Helpers
+    module Collection
+
+      # Hint that methods are actually applied to list using method_missing
+      def inspect
+        list.inspect
+      end
+
+      def search_list(default=nil, &block)
+        list unless default # We HAVE to search unless there is a default
+        if list?
+          list.find( &block ) || default
+        else
+          default
+        end
+      end
+      private :search_list
+
+      def method_missing(name, *args, &block)
+        list.send(name, *args, &block)
+      end
+      private :method_missing
+
+      def list?
+        instance_variable_defined?("@list")
+      end
+      private :list?
+
+    end
+  end
+end

data/lib/jubjub/jid.rb

@@ -1,10 +1,10 @@
 module Jubjub
   class Jid
-    
+
     PATTERN = /^(?:([^@]*)@)??([^@\/]*)(?:\/(.*?))?$/
-    
+
     attr_reader :node, :domain, :resource
-    
+
     def initialize(node, domain = nil, resource = nil)
       if node.is_a? Jid
         @node = node.node
@@ -15,19 +15,19 @@ module Jubjub
         @domain = domain
         @resource = resource
       end
-      
+
       if @domain.nil? && @resource.nil?
         @node, @domain, @resource = node.to_s.scan(PATTERN).first
       end
     end
-    
+
     def to_s
       (node ? "#{node}@" : '') + domain + (resource ? "/#{resource}" : '')
     end
-    
+
     def ==(obj)
       obj.is_a?( self.class ) && obj.to_s == self.to_s
     end
-    
+
   end
-end
+end

data/lib/jubjub/muc.rb

@@ -1,4 +1,6 @@
 require "jubjub/connection/xmpp_gateway/muc"
 require 'jubjub/muc/muc'
 require 'jubjub/muc/collection'
-require 'jubjub/muc/configuration'
+require 'jubjub/muc/configuration'
+require 'jubjub/muc/affiliations_collection'
+require 'jubjub/muc/affiliation'

data/lib/jubjub/muc/affiliation.rb

@@ -0,0 +1,77 @@
+class Jubjub::Muc::Affiliation
+
+  attr_reader :muc_jid, :jid, :nick, :role, :affiliation
+
+  def initialize(muc_jid, jid, nick, role, affiliation, connection)
+    @muc_jid = Jubjub::Jid.new muc_jid
+    @jid = Jubjub::Jid.new jid
+    @nick = nick
+    @role = role
+    @affiliation = affiliation
+    @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} @muc_jid=\"#{muc_jid}\" @jid=\"#{jid}\" @nick=#{@nick.inspect} @affiliation=#{affiliation.inspect}  @role=#{@role.inspect}>"
+  end
+
+  def outcast?
+    affiliation == "outcast"
+  end
+
+  def none?
+    affiliation == "none"
+  end
+
+  def member?
+    affiliation == "member"
+  end
+
+  def admin?
+    affiliation == "admin"
+  end
+
+  def owner?
+    affiliation == "owner"
+  end
+
+  def set(new_affiliation)
+    old_affiliation = @affiliation
+    @affiliation = new_affiliation
+    r = @connection.muc.modify_affiliations muc_jid, self
+    @affiliation = old_affiliation unless r
+    r
+  end
+
+  def set_outcast
+    set 'outcast'
+  end
+
+  def set_none
+    set 'none'
+  end
+
+  def set_member
+    set 'member'
+  end
+
+  def set_admin
+    set 'admin'
+  end
+
+  def set_owner
+    set 'owner'
+  end
+
+  def ==(other)
+    other.is_a?( self.class ) &&
+    other.muc_jid     == self.muc_jid &&
+    other.jid         == self.jid &&
+    other.nick        == self.nick &&
+    other.role        == self.role &&
+    other.affiliation == self.affiliation
+  end
+
+end

data/lib/jubjub/muc/affiliations_collection.rb

@@ -0,0 +1,31 @@
+class Jubjub::Muc::AffiliationCollection
+
+  attr_reader :jid
+
+  include Jubjub::Helpers::Collection
+
+  def initialize(jid,connection)
+    @jid = Jubjub::Jid.new jid
+    @connection = connection
+  end
+
+  def [](jid_num)
+    case jid_num
+    when Fixnum
+      list[jid_num]
+    when Jubjub::Jid
+      search_list( Jubjub::Muc::Affiliation.new( jid, jid_num, nil, nil, 'none', @connection ) ){|i| i.jid == jid_num }
+    else
+      j = Jubjub::Jid.new( jid_num )
+      search_list( Jubjub::Muc::Affiliation.new( jid, j, nil, nil, 'none', @connection ) ){|i| i.jid == j }
+    end
+  end
+
+private
+
+  def list
+    # OPTIMIZE: These requests should be made in parallel, not sequentially
+    @list ||= %w(owner outcast member admin).map{|a| @connection.muc.retrieve_affiliations( jid, a ) }.flatten
+  end
+
+end

data/lib/jubjub/muc/collection.rb

@@ -2,14 +2,16 @@
 # and delaying expensive operations until
 # required
 class Jubjub::Muc::Collection
-   
+
   attr_reader :jid
-   
+
+  include Jubjub::Helpers::Collection
+
   def initialize(jid, connection)
     @jid = Jubjub::Jid.new(jid)
     @connection = connection
   end
-  
+
   def create(node, nick = nil, &block)
     full_jid = Jubjub::Jid.new node, @jid.domain, nick || @connection.jid.node
 
@@ -22,34 +24,25 @@ class Jubjub::Muc::Collection
       # Instant room
       result = @connection.muc.create full_jid
     end
-    
+
   end
-  
+
   def [](jid_node_num)
     case jid_node_num
     when Fixnum
       list[jid_node_num]
     when Jubjub::Jid
-      list.find{|m| m.jid == jid_node_num } || Jubjub::Muc.new( jid_node_num, nil, @connection )
+      search_list( Jubjub::Muc.new( jid_node_num, nil, @connection ) ){|m| m.jid == jid_node_num }
     else
       j = Jubjub::Jid.new jid_node_num, jid.domain
-      list.find{|m| m.jid == j } || Jubjub::Muc.new( j, nil, @connection )
+      search_list( Jubjub::Muc.new( j, nil, @connection ) ){|m| m.jid == j }
     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.muc.list @jid
   end
-  
-end
+
+end

data/lib/jubjub/muc/configuration.rb

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

data/lib/jubjub/muc/muc.rb

@@ -1,37 +1,50 @@
 module Jubjub
   class Muc
-    
+
     attr_reader :jid, :name
-    
+
     def initialize(jid, name = nil, connection = nil)
       @jid = Jubjub::Jid.new(jid)
       @name = name
       @connection = connection
-    end 
-    
+    end
+
+    def message(body)
+      @connection.muc.message(jid, body)
+      self
+    end
+
     def exit(nick = nil)
       full_jid = Jubjub::Jid.new @jid.node, @jid.domain, nick || @connection.jid.node
-      
+
       @connection.muc.exit(full_jid)
       self
     end
-    
+
     def destroy
       @connection.muc.destroy(@jid)
     end
-    
+
+    def affiliations
+      AffiliationCollection.new jid, @connection
+    end
+
+    def roles
+      RoleCollection.new jid, @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}\" @name=#{@name.inspect}>"
     end
-    
+
     def ==(other)
       other.is_a?( self.class ) &&
       other.jid     == self.jid &&
       other.name    == self.name
     end
-    
-  end 
 
-end
+  end
+
+end

data/lib/jubjub/pubsub.rb

@@ -6,4 +6,4 @@ require "jubjub/pubsub/affiliation"
 require "jubjub/pubsub/affiliation_collection"
 require "jubjub/pubsub/item"
 require "jubjub/pubsub/item_collection"
-require "jubjub/pubsub/subscription"
+require "jubjub/pubsub/subscription"

data/lib/jubjub/pubsub/affiliation.rb

@@ -1,7 +1,7 @@
 class Jubjub::Pubsub::Affiliation
-  
+
   attr_reader :pubsub_jid, :pubsub_node, :jid, :affiliation
-  
+
   def initialize(pubsub_jid, pubsub_node, jid, affiliation, connection)
     @pubsub_jid = Jubjub::Jid.new pubsub_jid
     @pubsub_node = pubsub_node
@@ -15,31 +15,31 @@ class Jubjub::Pubsub::Affiliation
     obj_id = "%x" % (object_id << 1)
     "#<#{self.class}:0x#{obj_id} @pubsub_jid=\"#{pubsub_jid}\" @pubsub_node=#{@pubsub_node} @jid=\"#{jid}\" @affiliation=#{affiliation.inspect}>"
   end
-  
+
   def owner?
     affiliation == "owner"
   end
-  
+
   def publisher?
     affiliation == "publisher"
   end
-  
+
   def publish_only?
     affiliation == "publish-only"
   end
-  
+
   def member?
     affiliation == "member"
   end
-  
+
   def none?
     affiliation == "none"
   end
-  
+
   def outcast?
     affiliation == "outcast"
   end
-  
+
   def set(new_affiliation)
     old_affiliation = @affiliation
     @affiliation = new_affiliation
@@ -47,31 +47,31 @@ class Jubjub::Pubsub::Affiliation
     @affiliation = old_affiliation unless r
     r
   end
-  
+
   def set_owner
     set 'owner'
   end
-  
+
   def set_publisher
-    set 'publisher'    
+    set 'publisher'
   end
-  
+
   def set_publish_only
-    set 'publish-only'    
+    set 'publish-only'
   end
-  
+
   def set_member
     set 'member'
   end
-  
+
   def set_none
     set 'none'
   end
-  
+
   def set_outcast
     set 'outcast'
   end
-  
+
   def ==(other)
     other.is_a?( self.class ) &&
     other.pubsub_jid  == self.pubsub_jid &&
@@ -79,5 +79,5 @@ class Jubjub::Pubsub::Affiliation
     other.jid         == self.jid &&
     other.affiliation == self.affiliation
   end
-  
-end
+
+end