blather 0.4.10 → 0.4.11

data/lib/blather/stanza/disco/disco_info.rb

@@ -22,8 +22,8 @@ class Stanza
     def self.new(type = nil, node = nil, identities = [], features = [])
       new_node = super type
       new_node.node = node
-      [identities].flatten.each { |i| new_node.query << Identity.new(i) }
-      [features].flatten.each   { |f| new_node.query << Feature.new(f) }
+      new_node.identities = [identities]
+      new_node.features = [features]
       new_node
     end
 
@@ -34,6 +34,15 @@ class Stanza
       end
     end
 
+    # Add an array of identities
+    # @param identities the array of identities, passed directly to Identity.new
+    def identities=(identities)
+      query.find('//ns:identity', :ns => self.class.registered_ns).each &:remove
+      if identities
+        [identities].flatten.each { |i| self.query << Identity.new(i) }
+      end
+    end
+
     # List of feature objects
     def features
       query.find('//ns:feature', :ns => self.class.registered_ns).map do |f|
@@ -41,6 +50,15 @@ class Stanza
       end
     end
 
+    # Add an array of features
+    # @param features the array of features, passed directly to Feature.new
+    def features=(features)
+      query.find('//ns:feature', :ns => self.class.registered_ns).each &:remove
+      if features
+        [features].flatten.each { |f| self.query << Feature.new(f) }
+      end
+    end
+
     class Identity < XMPPNode
       # Create a new DiscoInfo Identity
       # @overload new(node)

data/lib/blather/stanza/disco/disco_items.rb

@@ -21,7 +21,7 @@ class Stanza
     def self.new(type = nil, node = nil, items = [])
       new_node = super type
       new_node.node = node
-      [items].flatten.each { |item| new_node.query << Item.new(item) }
+      new_node.items = [items]
       new_node
     end
 
@@ -34,6 +34,15 @@ class Stanza
       end
     end
 
+    # Add an array of items
+    # @param items the array of items, passed directly to Item.new
+    def items=(items)
+      query.find('//ns:item', :ns => self.class.registered_ns).each &:remove
+      if items
+        [items].flatten.each { |i| self.query << Item.new(i) }
+      end
+    end
+
     # An individual Disco Item
     class Item < XMPPNode
       # Create a new Blather::Stanza::DiscoItems::Item

data/lib/blather/stanza/iq/command.rb

@@ -28,16 +28,27 @@ class Iq
       new_node.command
       new_node.node = node
       new_node.action = action
-      new_node.new_sessionid!
       new_node
     end
 
     # Overrides the parent method to ensure the current command node is destroyed
+    # and the action is set to execute if no action provided
     #
     # @see Blather::Stanza::Iq#inherit
     def inherit(node)
       command.remove
       super
+      self.action = :execute unless self.action
+      self
+    end
+    
+    # Overrides the parent method to ensure the reply has no action
+    #
+    # @return [self]
+    def reply!
+      super
+      self.action = nil
+      self
     end
 
     # Command node accessor
@@ -47,7 +58,7 @@ class Iq
     # @return [Blather::XMPPNode]
     def command
       c = if self.class.registered_ns
-        find_first('command_ns:command', :command_ns => self.class.registered_ns)
+        find_first('ns:command', :ns => self.class.registered_ns)
       else
         find_first('command')
       end
@@ -80,6 +91,13 @@ class Iq
       command[:sessionid]
     end
 
+    # Check if there is a sessionid set
+    #
+    # @return [true, false]
+    def sessionid?
+      !sessionid.nil?
+    end
+
     # Set the sessionid of the command
     #
     # @param [String, nil] sessionid the new sessionid
@@ -89,14 +107,14 @@ class Iq
 
     # Generate a new session ID (SHA-1 hash)
     def new_sessionid!
-      self.sessionid = "commandsession-"+id
+      self.sessionid = "commandsession-#{id}"
     end
 
     # Get the action of the command
     #
     # @return [Symbol, nil]
     def action
-      command.read_attr :action, :to_sym
+      (val = command[:action]) && val.to_sym
     end
 
     # Check if the command action is :cancel
@@ -148,7 +166,7 @@ class Iq
     #
     # @return [Symbol, nil]
     def status
-      command.read_attr :status, :to_sym
+      ((val = command[:status]) && val.to_sym) || :executing
     end
 
     # Check if the command status is :executing
@@ -177,7 +195,7 @@ class Iq
     # @param [:executing, :completed, :canceled] status the new status
     def status=(status)
       if status && !VALID_STATUS.include?(status.to_sym)
-        raise ArgumentError, "Invalid Action (#{statusn}), use: #{VALID_STATUS*' '}"
+        raise ArgumentError, "Invalid Action (#{status}), use: #{VALID_STATUS*' '}"
       end
       command[:status] = status
     end
@@ -188,10 +206,9 @@ class Iq
     #
     # @return [Blather::XMPPNode]
     def actions
-      a = find_first('actions')
-
-      unless a
-        (self << (a = XMPPNode.new('actions', self.document)))
+      unless a = self.command.find_first('ns:actions', :ns => self.class.registered_ns)
+        (self.command << (a = XMPPNode.new('actions', self.document)))
+        a.namespace = self.command.namespace
       end
       a
     end
@@ -200,33 +217,37 @@ class Iq
     #
     # @return [[Symbol]]
     def allowed_actions
-      a = []
-      a << :execute
-      actions.children.each do |action|
-        a << action.name.to_sym
+      ([:execute] + actions.children.map { |action| action.name.to_sym }).uniq
+    end
+
+    def primary_allowed_action
+      (actions[:execute] || :execute).to_sym
+    end
+
+    def primary_allowed_action=(a)
+      if a && ![:prev, :next, :complete, :execute].include?(a.to_sym)
+        raise ArgumentError, "Invalid Action (#{a}), use: #{[:prev, :next, :complete, :execute]*' '}"
       end
-      a
+      actions[:execute] = a
     end
 
     # Add allowed actions to the command
     #
     # @param [[:prev, :next, :complete]] allowed_actions the new allowed actions
-    def add_allowed_actions(allowed_actions)
-      [allowed_actions].flatten.each do |action|
-        if action && !VALID_ACTIONS.include?(action.to_sym)
-          raise ArgumentError, "Invalid Action (#{action}), use: #{VALID_ACTIONS*' '}"
-        end
-        actions << "<#{action.to_s}/>"
+    def allowed_actions=(allowed_actions)
+      allowed_actions = ([allowed_actions].flatten.map(&:to_sym) + [:execute]).uniq
+      if (invalid_actions = allowed_actions - VALID_ACTIONS).size > 0
+        raise ArgumentError, "Invalid Action(s) (#{invalid_actions*' '}), use: #{VALID_ACTIONS*' '}"
       end
+      actions.children.map(&:remove)
+      allowed_actions.each { |action| actions << XMPPNode.new(action.to_s) }
     end
 
     # Remove allowed actions from the command
     #
     # @param [[:prev, :next, :complete]] disallowed_actions the allowed actions to remove
-    def remove_allowed_actions(disallowed_actions)
-      [disallowed_actions].flatten.each do |action|
-        actions.remove_children action.to_sym
-      end
+    def remove_allowed_actions!
+      actions.remove
     end
 
     # Command note accessor
@@ -235,10 +256,9 @@ class Iq
     #
     # @return [Blather::XMPPNode]
     def note
-      n = find_first('note')
-
-      unless n
-        (self << (n = XMPPNode.new('note', self.document)))
+      unless n = self.command.find_first('ns:note', :ns => self.class.registered_ns)
+        (self.command << (n = XMPPNode.new('note', self.document)))
+        n.namespace = self.command.namespace
       end
       n
     end
@@ -247,7 +267,7 @@ class Iq
     #
     # @return [Symbol, nil]
     def note_type
-      note.read_attr :type, :to_sym
+      (val = note[:type]) && val.to_sym
     end
 
     # Check if the command status is :info
@@ -283,23 +303,29 @@ class Iq
 
     # Get the text of the command's note
     def note_text
-      content_from "note"
+      content_from :note
     end
 
     # Set the command's note text
     #
     # @param [String] note_text the command's new note text
     def note_text=(note_text)
-      set_content_for "note", note_text
+      set_content_for :note, note_text
     end
 
     # Returns the command's x:data form child
     def form
-      X.new command.find_first('//ns:x', :ns => X.registered_ns)
+      if found_x = command.find_first('ns:x', :ns => X.registered_ns)
+        x = X.new found_x
+        found_x.remove
+      else
+        x = X.new
+      end
+      self.command << x
+      x
     end
-
   end #Command
 
 end #Iq
 end #Stanza
-end
+end #Blather

data/lib/blather/stanza/x.rb

@@ -25,10 +25,10 @@ class Stanza
         new_node.inherit type
       when Hash
         new_node.type = type[:type]
-        new_node.add_fields([type[:fields]])
+        new_node.fields = type[:fields]
       else
         new_node.type = type
-        new_node.add_fields([fields])
+        new_node.fields = fields
       end
       new_node
     end
@@ -51,15 +51,25 @@ class Stanza
     # List of field objects
     # @return [Blather::Stanza::X::Field]
     def fields
-      self.find('ns:field', :ns => self.class.registered_ns).map do |f|
-        Field.new f
+      self.find('ns:field', :ns => self.class.registered_ns).map do |field|
+        Field.new(field)
       end
     end
 
+    # Find a field by var
+    # @param var the var for the field you wish to find
+    def field(var)
+      fields.detect { |f| f.var == var }
+    end
+
     # Add an array of fields to form
     # @param fields the array of fields, passed directly to Field.new
-    def add_fields(fields = [])
-      [fields].flatten.each { |f| self << Field.new(f) }
+    def fields=(fields)
+      remove_children :field
+      [fields].flatten.each do |field|
+        self << (f = Field.new(field))
+        f.namespace = self.namespace
+      end
     end
 
     # Check if the x is of type :cancel
@@ -94,9 +104,7 @@ class Stanza
     #
     # @return [String]
     def instructions
-      if i = self.find_first('ns:instructions', :ns => self.class.registered_ns)
-        i.children.inner_text
-      end
+      content_from 'ns:instructions', :ns => self.registered_ns
     end
 
     # Set the form's instructions
@@ -104,16 +112,18 @@ class Stanza
     # @param [String] instructions the form's instructions
     def instructions=(instructions)
       self.remove_children :instructions
-      self << "<instructions>#{instructions}</instructions>"
+      if instructions
+        self << (i = XMPPNode.new(:instructions, self.document))
+        i.namespace = self.namespace
+        i << instructions
+      end
     end
 
     # Retrieve the form's title
     #
     # @return [String]
     def title
-      if t = self.find_first('ns:title', :ns => self.class.registered_ns)
-        t.children.inner_text
-      end
+      content_from 'ns:title', :ns => self.registered_ns
     end
 
     # Set the form's title
@@ -121,7 +131,11 @@ class Stanza
     # @param [String] title the form's title
     def title=(title)
       self.remove_children :title
-      self << "<title>#{title}</title>"
+      if title
+        self << (t = XMPPNode.new(:title))
+        t.namespace = self.namespace
+        t << title
+      end
     end
 
     class Field < XMPPNode
@@ -137,12 +151,22 @@ class Stanza
       #   @option opts [:boolean, :fixed, :hidden, :"jid-multi", :"jid-single", :"list-multi", :"list-single", :"text-multi", :"text-private", :"text-single"] :type the type of the field
       #   @option opts [String] :var the variable for the field
       #   @option opts [String] :label the label for the field
+      #   @option [String, nil] :value the value for the field
+      #   @option [String, nil] :description the description for the field
+      #   @option [true, false, nil] :required the required flag for the field
+      #   @param [Array<Array, X::Field::Option>, nil] :options a list of field options.
+      #   These are passed directly to X::Field::Option.new
       # @overload new(type, var = nil, label = nil)
       #   Create a new Field by name
       #   @param [:boolean, :fixed, :hidden, :"jid-multi", :"jid-single", :"list-multi", :"list-single", :"text-multi", :"text-private", :"text-single"] type the type of the field
       #   @param [String, nil] var the variable for the field
       #   @param [String, nil] label the label for the field
-      def self.new(type, var = nil, label = nil)
+      #   @param [String, nil] value the value for the field
+      #   @param [String, nil] description the description for the field
+      #   @param [true, false, nil] required the required flag for the field
+      #   @param [Array<Array, X::Field::Option>, nil] options a list of field options.
+      #   These are passed directly to X::Field::Option.new
+      def self.new(type, var = nil, label = nil, value = nil, description = nil, required = false, options = [])
         new_node = super :field
 
         case type
@@ -152,10 +176,18 @@ class Stanza
           new_node.type = type[:type]
           new_node.var = type[:var]
           new_node.label = type[:label]
+          new_node.value = type[:value]
+          new_node.desc = type[:description]
+          new_node.required = type[:required]
+          new_node.options = type[:options]
         else
           new_node.type = type
           new_node.var = var
           new_node.label = label
+          new_node.value = value
+          new_node.desc = description
+          new_node.required = required
+          new_node.options = options
         end
         new_node
       end
@@ -203,8 +235,10 @@ class Stanza
       #
       # @param [String]
       def value
-        if v = self.find_first('value')
-          v.children.inner_text
+        if self.namespace
+          content_from 'ns:value', :ns => self.namespace.href
+        else
+          content_from :value
         end
       end
 
@@ -213,15 +247,21 @@ class Stanza
       # @param [String] value the field's value
       def value=(value)
         self.remove_children :value
-        self << "<value>#{value}</value>"
+        if value
+          self << (v = XMPPNode.new(:value))
+          v.namespace = self.namespace
+          v << value
+        end
       end
 
       # Get the field's description
       #
       # @param [String]
       def desc
-        if d = self.find_first('desc')
-          d.children.inner_text
+        if self.namespace
+          content_from 'ns:desc', :ns => self.namespace.href
+        else
+          content_from :desc
         end
       end
 
@@ -230,60 +270,50 @@ class Stanza
       # @param [String] description the field's description
       def desc=(description)
         self.remove_children :desc
-        self << "<desc>#{description}</desc>"
+        if description
+          self << (d = XMPPNode.new(:desc))
+          d.namespace = self.namespace
+          d << description
+        end
       end
 
       # Get the field's required flag
       #
       # @param [true, false]
       def required?
-        self.find_first('required') ? true : false
+        !self.find_first('required').nil?
       end
 
       # Set the field's required flag
       #
       # @param [true, false] required the field's required flag
-      def required!(required = true)
-        if self.find_first('required')
-          if required==false
-            self.remove_children :required
-          end
-        else
-          if required==true
-            self << "<required/>"
-          end
-        end
+      def required=(required)
+        self.remove_children(:required) unless required
+        self << XMPPNode.new(:required) if required
       end
 
       # Extract list of option objects
       #
       # @return [Blather::Stanza::X::Field::Option]
       def options
-        self.find('option').map do |f|
-          Option.new f
-        end
+        self.find(:option).map { |f| Option.new(f) }
       end
 
       # Add an array of options to field
       # @param options the array of options, passed directly to Option.new
-      def add_options(options = [])
-        [options].flatten.each { |o| self << Option.new(o) }
+      def options=(options)
+        remove_children :option
+        if options
+          [options].flatten.each { |o| self << Option.new(o) }
+        end
       end
 
       # Compare two Field objects by type, var and label
       # @param [X::Field] o the Field object to compare against
       # @return [true, false]
       def eql?(o)
-        unless o.is_a?(self.class)
-          raise "Cannot compare #{self.class} with #{o.class}"
-        end
-
-        o.type == self.type &&
-        o.var == self.var &&
-        o.label == self.label &&
-        o.desc == self.desc &&
-        o.required? == self.required? &&
-        o.value == self.value
+        raise "Cannot compare #{self.class} with #{o.class}" unless o.is_a?(self.class)
+        ![:type, :var, :label, :desc, :required?, :value].detect { |m| o.send(m) != self.send(m) }
       end
       alias_method :==, :eql?
 
@@ -320,16 +350,22 @@ class Stanza
         # The Field Option's value
         # @return [String]
         def value
-          if v = self.find_first('value')
-            v.children.inner_text
+          if self.namespace
+            content_from 'ns:value', :ns => self.namespace.href
+          else
+            content_from :value
           end
         end
 
         # Set the Field Option's value
         # @param [String] value the new value for the field option
-        def value=(v)
+        def value=(value)
           self.remove_children :value
-          self << "<value>#{v}</value>"
+          if value
+            self << (v = XMPPNode.new(:value))
+            v.namespace = self.namespace
+            v << value
+          end
         end
 
         # The Field Option's label

data/spec/blather/stanza/discos/disco_info_spec.rb

@@ -54,6 +54,29 @@ describe Blather::Stanza::Iq::DiscoInfo do
     n.to = 'to@jid.com'
     n.find("/iq[@to='to@jid.com' and @type='get' and @id='#{n.id}']/ns:query[@node='/path/to/node']", :ns => Blather::Stanza::Iq::DiscoInfo.registered_ns).wont_be_empty
   end
+
+  it 'allows adding of identities' do
+    di = Blather::Stanza::Iq::DiscoInfo.new
+    di.identities.size.must_equal 0
+    di.identities = [{:name => 'name', :type => 'type', :category => 'category'}]
+    di.identities.size.must_equal 1
+    di.identities += [Blather::Stanza::Iq::DiscoInfo::Identity.new(*%w[name type category])]
+    di.identities.size.must_equal 2
+    di.identities = nil
+    di.identities.size.must_equal 0
+  end
+
+  it 'allows adding of features' do
+    di = Blather::Stanza::Iq::DiscoInfo.new
+    di.features.size.must_equal 0
+    di.features = ["feature1"]
+    di.features.size.must_equal 1
+    di.features += [Blather::Stanza::Iq::DiscoInfo::Feature.new "feature2"]
+    di.features.size.must_equal 2
+    di.features = nil
+    di.features.size.must_equal 0
+  end
+
 end
 
 describe 'Blather::Stanza::Iq::DiscoInfo identities' do

data/spec/blather/stanza/discos/disco_items_spec.rb

@@ -102,6 +102,17 @@ describe Blather::Stanza::Iq::DiscoItems do
     di.items.size.must_equal 2
     di.items.each { |i| control.include?(i).must_equal true }
   end
+
+  it 'allows adding of items' do
+    di = Blather::Stanza::Iq::DiscoItems.new
+    di.items.size.must_equal 0
+    di.items = [{:jid => 'foo@bar/baz', :node => 'node', :name => 'name'}]
+    di.items.size.must_equal 1
+    di.items += [Blather::Stanza::Iq::DiscoItems::Item.new(*%w[foo@bar/baz node name])]
+    di.items.size.must_equal 2
+    di.items = nil
+    di.items.size.must_equal 0
+  end
 end
 
 describe Blather::Stanza::Iq::DiscoItems::Item do

data/spec/blather/stanza/iq/command_spec.rb

@@ -8,7 +8,6 @@ def command_xml
       id='form2'>
     <command xmlns='http://jabber.org/protocol/commands'
              node='node1'
-             action='execute'
              sessionid='dqjiodmqlmakm'>
       <x xmlns='jabber:x:data' type='form'>
         <field var='field-name' type='text-single' label='description' />
@@ -86,7 +85,18 @@ describe Blather::Stanza::Iq::Command do
     c.type.must_equal :result
   end
 
-  # TODO: Deal with #reply/#reply! better?
+  it 'removes action on reply' do
+    c = Blather::XMPPNode.import parse_stanza(command_xml).root
+    c.action.must_equal :execute
+    c.reply.action.must_equal nil
+  end
+  
+  it 'removes action on reply!' do
+    c = Blather::XMPPNode.import parse_stanza(command_xml).root
+    c.action.must_equal :execute
+    c.reply!
+    c.action.must_equal nil
+  end
 
   it 'can be registered under a namespace' do
     class CommandNs < Blather::Stanza::Iq::Command; register :command_ns, nil, 'command:ns'; end
@@ -113,27 +123,53 @@ describe Blather::Stanza::Iq::Command do
     n.action.must_equal :cancel
   end
 
+  it 'must default action to :execute on import' do
+    n = Blather::XMPPNode.import(parse_stanza(command_xml).root)
+    n.action.must_equal :execute
+  end
+
   it 'has a status attribute' do
     n = Blather::Stanza::Iq::Command.new
-    n.status.must_equal nil
-    n.status = :executing
     n.status.must_equal :executing
+    n.status = :completed
+    n.status.must_equal :completed
   end
 
   it 'has a sessionid attribute' do
     n = Blather::Stanza::Iq::Command.new
-    n.sessionid.wont_be_nil
+    n.sessionid.must_equal nil
     n.sessionid = "somerandomstring"
     n.sessionid.must_equal Digest::SHA1.hexdigest("somerandomstring")
   end
 
-  it 'has an allowed_actions attribute' do
+  it 'has a sessionid? attribute' do
     n = Blather::Stanza::Iq::Command.new
+    n.sessionid?.must_equal false
+    n.new_sessionid!
+    n.sessionid?.must_equal true
+  end
+
+  it 'has an allowed_actions attribute' do
+    n = Blather::XMPPNode.import parse_stanza(command_xml).root
+    n.allowed_actions.must_equal [:execute]
+    n.allowed_actions = [:next, :prev]
+    (n.allowed_actions - [:next, :prev, :execute]).must_be_empty
+    n.remove_allowed_actions!
     n.allowed_actions.must_equal [:execute]
-    n.add_allowed_actions [:prev, :next]
-    n.allowed_actions.must_equal [:execute, :prev, :next]
-    n.remove_allowed_actions :prev
-    n.allowed_actions.must_equal [:execute, :next]
+    n.allowed_actions += [:next]
+    (n.allowed_actions - [:next, :execute]).must_be_empty
+
+    r = Blather::Stanza::Iq::Command.new
+    r.allowed_actions.must_equal [:execute]
+    r.allowed_actions += [:prev]
+    (r.allowed_actions - [:prev, :execute]).must_be_empty
+  end
+
+  it 'has a primary_allowed_action attribute' do
+    n = Blather::XMPPNode.import parse_stanza(command_xml).root
+    n.primary_allowed_action.must_equal :execute
+    n.primary_allowed_action = :next
+    n.primary_allowed_action.must_equal :next
   end
 
   it 'has a note_type attribute' do
@@ -155,5 +191,9 @@ describe Blather::Stanza::Iq::Command do
     n.form.fields.size.must_equal 1
     n.form.fields.map { |f| f.class }.uniq.must_equal [Blather::Stanza::X::Field]
     n.form.must_be_instance_of Blather::Stanza::X
+
+    r = Blather::Stanza::Iq::Command.new
+    r.form.type = :form
+    r.form.type.must_equal :form
   end
 end

data/spec/blather/stanza/x_spec.rb

@@ -15,12 +15,12 @@ def x_xml
     <field var='field-name3'
            type='text-single'
            label='description' />
-    <field var='field-name'
-           type='{field-type}'
+    <field var='field-name4'
+           type='list-multi'
            label='description'>
       <desc/>
       <required/>
-      <value>field-value</value>
+      <value>field-value4</value>
       <option label='option-label'><value>option-value</value></option>
       <option label='option-label'><value>option-value</value></option>
     </field>
@@ -81,6 +81,13 @@ describe Blather::Stanza::X do
     r.fields.map { |f| f.class }.uniq.must_equal [Blather::Stanza::X::Field]
   end
 
+  it 'returns a field object for a particular var' do
+    x = Blather::Stanza::X.new parse_stanza(x_xml).root
+    f = x.field 'field-name4'
+    f.must_be_instance_of Blather::Stanza::X::Field
+    f.value.must_equal 'field-value4'
+  end
+
   it 'takes a list of hashes for fields' do
     fields = [
       {:label => 'label', :type => 'text-single', :var => 'var'},
@@ -121,9 +128,9 @@ describe Blather::Stanza::X do
   it 'allows adding of fields' do
     di = Blather::Stanza::X.new nil
     di.fields.size.must_equal 0
-    di.add_fields [{:label => 'label', :type => 'text-single', :var => 'var'}]
+    di.fields = [{:label => 'label', :type => 'text-single', :var => 'var', :required => true}]
     di.fields.size.must_equal 1
-    di.add_fields [Blather::Stanza::X::Field.new(*%w[text-single var1 label1])]
+    di.fields += [Blather::Stanza::X::Field.new(*%w[text-single var1 label1])]
     di.fields.size.must_equal 2
   end
 
@@ -171,9 +178,9 @@ describe Blather::Stanza::X::Field do
   it 'has a required? attribute' do
     n = Blather::Stanza::X::Field.new 'text-single', 'subject', 'Music from the time of Shakespeare'
     n.required?.must_equal false
-    n.required!
+    n.required = true
     n.required?.must_equal true
-    n.required! false
+    n.required = false
     n.required?.must_equal false
   end
 
@@ -190,9 +197,9 @@ describe Blather::Stanza::X::Field do
   it 'allows adding of options' do
     di = Blather::Stanza::X::Field.new nil
     di.options.size.must_equal 0
-    di.add_options [{:label => 'Person', :value => 'person'}]
+    di.options += [{:label => 'Person', :value => 'person'}]
     di.options.size.must_equal 1
-    di.add_options [Blather::Stanza::X::Field::Option.new(*%w[person1 Person1])]
+    di.options += [Blather::Stanza::X::Field::Option.new(*%w[person1 Person1])]
     di.options.size.must_equal 2
   end
 
@@ -225,4 +232,4 @@ describe Blather::Stanza::X::Field::Option do
     n.label = 'Book 2'
     n.label.must_equal 'Book 2'
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: blather
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 4
-  - 10
-  version: 0.4.10
+  - 11
+  version: 0.4.11
 platform: ruby
 authors: 
 - Jeff Smick
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-19 00:00:00 -07:00
+date: 2010-07-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency