blather 0.4.16 → 0.5.0

data/lib/blather/stream/features/session.rb

@@ -1,7 +1,8 @@
-module Blather # :nodoc:
-class Stream # :nodoc:
+module Blather
+class Stream
 
-  class Session < Features # :nodoc:
+  # @private
+  class Session < Features
     SESSION_NS = 'urn:ietf:params:xml:ns:xmpp-session'.freeze
     register SESSION_NS
 
@@ -22,7 +23,7 @@ class Stream # :nodoc:
   private
     def check_response
       if @node[:type] == 'result'
-        succeed!        
+        succeed!
       else
         fail!(StanzaError.import(@node))
       end

data/lib/blather/stream/features/tls.rb

@@ -1,7 +1,8 @@
-module Blather # :nodoc:
-class Stream # :nodoc:
+module Blather
+class Stream
 
-  class TLS < Features # :nodoc:
+  # @private
+  class TLS < Features
     class TLSFailure < BlatherError
       register :tls_failure
     end

data/lib/blather/stream/parser.rb

@@ -1,9 +1,8 @@
-require 'nokogiri'
+module Blather
+class Stream
 
-module Blather # :nodoc:
-class Stream # :nodoc:
-
-  class Parser < Nokogiri::XML::SAX::Document # :nodoc:
+  # @private
+  class Parser < Nokogiri::XML::SAX::Document
     NS_TO_IGNORE = %w[jabber:client jabber:component:accept]
 
     @@debug = false

data/lib/blather/version.rb

@@ -1,3 +1,4 @@
 module Blather
-  VERSION = '0.4.16'
+  # Blather version number
+  VERSION = '0.5.0'
 end

data/lib/blather/xmpp_node.rb

@@ -210,14 +210,23 @@ module Blather
       self
     end
 
+    # The node as XML
+    #
+    # @return [String] XML representation of the node
     def inspect
       self.to_xml
     end
 
+    # Check that a set of fields are equal between nodes
+    #
+    # @param [XMPPNode] other the other node to compare against
+    # @param [*#to_s] fields the set of fields to compare
+    # @return [Fixnum<-1,0,1>]
     def eql?(o, *fields)
       o.is_a?(self.class) && fields.all? { |f| self.__send__(f) == o.__send__(f) }
     end
 
+    # @private
     def ==(o)
       eql?(o)
     end

data/spec/blather/client/client_spec.rb

@@ -28,7 +28,7 @@ describe Blather::Client do
 
   it 'should have a caps handler' do
     @client.must_respond_to :caps
-    @client.caps.must_be_kind_of Blather::Client::Caps
+    @client.caps.must_be_kind_of Blather::Stanza::Capabilities
   end
 
   it 'can be setup' do
@@ -61,6 +61,19 @@ describe Blather::Client do
     @client.run
   end
 
+  it 'knows if it is disconnected' do
+    @client.must_respond_to :connected?
+    @client.connected?.must_equal false
+  end
+
+  it 'knows if it is connected' do
+    stream = mock()
+    stream.expects(:stopped?).returns false
+    @client.setup('me.com', 'secret')
+    @client.post_init stream, Blather::JID.new('me.com')
+    @client.connected?.must_equal true
+  end
+
   it 'writes to the connection the closes when #close is called' do
     stream = mock()
     stream.expects(:close_connection_after_writing)

data/spec/blather/stanza/iq_spec.rb

@@ -42,4 +42,20 @@ describe Blather::Stanza::Iq do
       Blather::Stanza::Iq.new.must_respond_to :"#{valid_type}?"
     end
   end
+
+  it 'removes the body when replying' do
+    iq = Blather::Stanza::Iq.new :get, 'me@example.com'
+    iq.from = 'them@example.com'
+    iq << Blather::XMPPNode.new('query', iq.document)
+    r = iq.reply
+    r.children.empty?.must_equal true
+  end
+
+  it 'does not remove the body when replying if we ask to keep it' do
+    iq = Blather::Stanza::Iq.new :get, 'me@example.com'
+    iq.from = 'them@example.com'
+    iq << Blather::XMPPNode.new('query', iq.document)
+    r = iq.reply :remove_children => false
+    r.children.empty?.must_equal false
+  end
 end

data/spec/blather/stanza/presence_spec.rb

@@ -56,7 +56,7 @@ describe Blather::Stanza::Presence do
     s.type.must_equal :subscribe
   end
 
-  it 'creates a Presence object when importing a node with type equal to something unkown' do
+  it 'creates a Presence object when importing a node with type equal to something unknown' do
     n = Blather::XMPPNode.new
     n[:type] = :foo
     s = Blather::Stanza::Presence.import(n)

data/spec/blather/stanza_spec.rb

@@ -62,6 +62,24 @@ describe Blather::Stanza do
     r.to.must_equal f
   end
 
+  it 'does not remove the body when replying' do
+    s = Blather::Stanza.new('message')
+    s.from = f = Blather::JID.new('n@d/r')
+    s.to = t = Blather::JID.new('d@n/r')
+    s << Blather::XMPPNode.new('query', s.document)
+    r = s.reply
+    r.children.empty?.must_equal false
+  end
+
+  it 'removes the body when replying if we ask to remove it' do
+    s = Blather::Stanza.new('message')
+    s.from = f = Blather::JID.new('n@d/r')
+    s.to = t = Blather::JID.new('d@n/r')
+    s << Blather::XMPPNode.new('query', s.document)
+    r = s.reply :remove_children => true
+    r.children.empty?.must_equal true
+  end
+
   it 'provides "attr_accessor" for id' do
     s = Blather::Stanza.new('message')
     s.id.must_be_nil

data/spec/blather/stream/client_spec.rb

@@ -666,7 +666,7 @@ describe Blather::Stream::Client do
     end
   end
 
-  it 'fails when an unkown node comes through during SASL negotiation' do
+  it 'fails when an unknown node comes through during SASL negotiation' do
     @client = mock()
     @client.expects(:receive_data).with do |n|
       n.must_be_instance_of Blather::UnknownResponse
@@ -827,7 +827,7 @@ describe Blather::Stream::Client do
     end
   end
 
-  it 'will return an error if an unkown node comes through during resouce binding' do
+  it 'will return an error if an unknown node comes through during resouce binding' do
     state = nil
     @client = mock()
     @client.expects(:receive_data).with do |n|

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: blather
 version: !ruby/object:Gem::Version 
-  hash: 47
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
-  - 4
-  - 16
-  version: 0.4.16
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Jeff Smick
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-02 00:00:00 -07:00
+date: 2010-09-02 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 35
         segments: 
         - 0
         - 12
@@ -40,9 +38,8 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 1
         - 4
@@ -54,112 +51,135 @@ dependencies:
   name: minitest
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 7
+        - 1
+        version: 1.7.1
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        - 7
+        version: 3.0.7
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: minitest
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
         segments: 
         - 1
         - 7
         - 1
         version: 1.7.1
   type: :development
-  version_requirements: *id003
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: mocha
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 35
         segments: 
         - 0
         - 9
         - 12
         version: 0.9.12
   type: :development
-  version_requirements: *id004
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: bundler
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 1
         - 0
         - 0
         version: 1.0.0
   type: :development
-  version_requirements: *id005
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rcov
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 41
         segments: 
         - 0
         - 9
         - 9
         version: 0.9.9
   type: :development
-  version_requirements: *id006
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: yard
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
         segments: 
         - 0
         - 6
         - 1
         version: 0.6.1
   type: :development
-  version_requirements: *id007
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: bluecloth
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
         segments: 
         - 2
         - 1
         - 0
         version: 2.1.0
   type: :development
-  version_requirements: *id008
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
-  version_requirements: *id009
+  version_requirements: *id011
 description: An XMPP DSL for Ruby written on top of EventMachine and Nokogiri
 email: sprsquish@gmail.com
 executables: []
@@ -171,10 +191,10 @@ extra_rdoc_files:
 - README.md
 files: 
 - .autotest
+- .gemtest
 - .gitignore
 - CHANGELOG
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -193,8 +213,6 @@ files:
 - lib/blather/client/client.rb
 - lib/blather/client/dsl.rb
 - lib/blather/client/dsl/pubsub.rb
-- lib/blather/core_ext/active_support.rb
-- lib/blather/core_ext/active_support/inheritable_attributes.rb
 - lib/blather/core_ext/eventmachine.rb
 - lib/blather/core_ext/ipaddr.rb
 - lib/blather/core_ext/nokogiri.rb
@@ -210,6 +228,7 @@ files:
 - lib/blather/roster_item.rb
 - lib/blather/stanza.rb
 - lib/blather/stanza/disco.rb
+- lib/blather/stanza/disco/capabilities.rb
 - lib/blather/stanza/disco/disco_info.rb
 - lib/blather/stanza/disco/disco_items.rb
 - lib/blather/stanza/iq.rb
@@ -318,7 +337,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -327,14 +345,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Simpler XMPP built for speed

data/lib/blather/core_ext/active_support.rb

@@ -1,45 +0,0 @@
-require File.join(File.dirname(__FILE__), 'active_support', 'inheritable_attributes')
-
-class Object  # @private
-  def duplicable?; true; end
-  def blank?; respond_to?(:empty?) ? empty? : !self; end
-  def present?; !blank?; end
-end
-
-class Array  # @private
-  alias_method :blank?, :empty?
-  def extract_options!; last.is_a?(::Hash) ? pop : {}; end
-end
-
-class Hash  # @private
-  alias_method :blank?, :empty?
-end
-
-class String  # @private
-  def blank?; self !~ /\S/; end
-end
-
-class NilClass  # @private
-  def duplicable?; false; end
-  def blank?; true; end
-end
-
-class FalseClass  # @private
-  def duplicable?; false; end
-  def blank?; true; end
-end
-
-class TrueClass  # @private
-  def duplicable?; false; end
-  def blank?; false; end
-end
-
-class Symbol  # @private
-  def duplicable?; false; end
-  def to_proc; Proc.new { |*args| args.shift.__send__(self, *args) }; end
-end
-
-class Numeric  # @private
-  def duplicable?; false; end
-  def blank?; false; end
-end