blather 0.5.9 → 0.5.10

data/.gitignore

@@ -15,4 +15,5 @@ notes
 .yardoc
 *.rbc
 vendor
-.rvmrc
+.rvmrc
+.rbx

data/CHANGELOG

@@ -1,3 +1,7 @@
+v0.5.10
+  Feature(juandebravo): Allow configuring the wire log level
+  Bugfix(benlangfeld): Checking connection status before the stream is established
+
 v0.5.9
   Bugfix(benlangfeld): Failed connections now raise a Blather::Stream::ConnectionFailed exception
   Bugfix(crohr): Blather now supports EventMachine 1.0

data/lib/blather.rb

@@ -77,22 +77,31 @@
   blather/stream/features/tls
 ].each { |r| require r }
 
-# The core Blather namespace
 module Blather
-  # @private
   @@logger = nil
 
-  # Get or create an instance of Logger
-  def self.logger
-    unless @@logger
-      self.logger = Logger.new($stdout)
-      self.logger.level = Logger::INFO
+  class << self
+
+    # Default logger level. Any internal call to log() will forward the log message to
+    # the default log level
+    attr_accessor :default_log_level
+    
+    def logger
+      @@logger ||= Logger.new($stdout).tap {|logger| logger.level = Logger::INFO }
+    end
+
+    def logger=(logger)
+      @@logger = logger
+    end
+
+    def default_log_level
+      @default_log_level ||= :debug # by default is debug (as it used to be)
+    end
+
+    def log(message)
+      logger.send self.default_log_level, message
     end
-    @@logger
-  end
 
-  # Set the Logger
-  def self.logger=(logger)
-    @@logger = logger
   end
+
 end

data/lib/blather/client/client.rb

@@ -64,7 +64,7 @@ module Blather
 
     # Check whether the client is currently connected.
     def connected?
-      setup? && !@stream.stopped?
+      setup? && !@stream.nil? && !@stream.stopped?
     end
 
     # Get the current status. Taken from the `state` attribute of Status

data/lib/blather/stream.rb

@@ -123,7 +123,7 @@ module Blather
     # @param [#to_xml, #to_s] stanza the stanza to send over the wire
     def send(stanza)
       data = stanza.respond_to?(:to_xml) ? stanza.to_xml(:save_with => Nokogiri::XML::Node::SaveOptions::AS_XML) : stanza.to_s
-      Blather.logger.debug "SENDING: (#{caller[1]}) #{data}"
+      Blather.log "SENDING: (#{caller[1]}) #{data}"
       send_data data
     end
 
@@ -152,8 +152,8 @@ module Blather
     # Called by EM with data from the wire
     # @private
     def receive_data(data)
-      Blather.logger.debug "\n#{'-'*30}\n"
-      Blather.logger.debug "STREAM IN: #{data}"
+      Blather.log "\n#{'-'*30}\n"
+      Blather.log "STREAM IN: #{data}"
       @parser << data
 
     rescue ParseError => e
@@ -170,7 +170,7 @@ module Blather
       # EM is supposed to close the connection when this returns false,
       # but it only does that for inbound connections, not when we
       # make a connection to another server. 
-      Blather.logger.debug("Checking SSL cert: #{pem}")
+      Blather.log "Checking SSL cert: #{pem}"
       return true if !@@store
       @@store.trusted?(pem).tap do |trusted|
         close_connection unless trusted
@@ -198,7 +198,7 @@ module Blather
     # Called by the parser with parsed nodes
     # @private
     def receive(node)
-      Blather.logger.debug "RECEIVING (#{node.element_name}) #{node}"
+      Blather.log "RECEIVING (#{node.element_name}) #{node}"
       @node = node
 
       if @node.namespace && @node.namespace.prefix == 'stream'
@@ -227,7 +227,7 @@ module Blather
     # Ensure the JID gets attached to the client
     # @private
     def jid=(new_jid)
-      Blather.logger.debug "NEW JID: #{new_jid}"
+      Blather.log "NEW JID: #{new_jid}"
       @jid = JID.new new_jid
     end
 

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

@@ -49,7 +49,7 @@ class Stream
         return
       end
 
-      Blather.logger.debug "RESOURCE NODE #{@node}"
+      Blather.log "RESOURCE NODE #{@node}"
       # ensure this is a response to our original request
       if @id == @node['id']
         @stream.jid = JID.new @node.find_first('bind_ns:bind/bind_ns:jid', :bind_ns => BIND_NS).content

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

@@ -120,7 +120,7 @@ class Stream
           key, value = statement.split('=')
           res[key] = value.delete('"') unless key.empty?
         end
-        Blather.logger.debug "CHALLENGE DECODE: #{res.inspect}"
+        Blather.log "CHALLENGE DECODE: #{res.inspect}"
 
         @nonce ||= res['nonce']
         @realm ||= res['realm']
@@ -155,8 +155,8 @@ class Stream
           @response[:response] = generate_response
           @response.each { |k,v| @response[k] = "\"#{v}\"" unless [:nc, :qop, :response, :charset].include?(k) }
 
-          Blather.logger.debug "CHALLENGE RESPONSE: #{@response.inspect}"
-          Blather.logger.debug "CH RESP TXT: #{@response.map { |k,v| "#{k}=#{v}" } * ','}"
+          Blather.log "CHALLENGE RESPONSE: #{@response.inspect}"
+          Blather.log "CH RESP TXT: #{@response.map { |k,v| "#{k}=#{v}" } * ','}"
 
           # order is to simplify testing
           # Ruby 1.9 eliminates the need for this with ordered hashes

data/lib/blather/stream/parser.rb

@@ -19,14 +19,14 @@ class Stream
     end
 
     def receive_data(string)
-      Blather.logger.debug "PARSING: (#{string})" if @@debug
+      Blather.log "PARSING: (#{string})" if @@debug
       @parser << string
       self
     end
     alias_method :<<, :receive_data
 
     def start_element_namespace(elem, attrs, prefix, uri, namespaces)
-      Blather.logger.debug "START ELEM: (#{{:elem => elem, :attrs => attrs, :prefix => prefix, :uri => uri, :ns => namespaces}.inspect})" if @@debug
+      Blather.log "START ELEM: (#{{:elem => elem, :attrs => attrs, :prefix => prefix, :uri => uri, :ns => namespaces}.inspect})" if @@debug
 
       args = [elem]
       args << @current.document if @current
@@ -64,7 +64,7 @@ class Stream
     end
 
     def end_element_namespace(elem, prefix, uri)
-      Blather.logger.debug "END ELEM: #{{:elem => elem, :prefix => prefix, :uri => uri}.inspect}" if @@debug
+      Blather.log "END ELEM: #{{:elem => elem, :prefix => prefix, :uri => uri}.inspect}" if @@debug
 
       if elem == 'stream'
         node = XMPPNode.new('end')
@@ -79,12 +79,12 @@ class Stream
     end
 
     def characters(chars = '')
-      Blather.logger.debug "CHARS: #{chars}" if @@debug
+      Blather.log "CHARS: #{chars}" if @@debug
       @current << Nokogiri::XML::Text.new(chars, @current.document) if @current
     end
 
     def warning(msg)
-      Blather.logger.debug "PARSE WARNING: #{msg}" if @@debug
+      Blather.log "PARSE WARNING: #{msg}" if @@debug
     end
 
     def error(msg)

data/lib/blather/version.rb

@@ -1,4 +1,4 @@
 module Blather
   # Blather version number
-  VERSION = '0.5.9'
+  VERSION = '0.5.10'
 end

data/spec/blather/client/client_spec.rb

@@ -4,13 +4,13 @@ require 'blather/client/client'
 describe Blather::Client do
   before do
     @client = Blather::Client.new
-    @stream = mock()
+    @stream = mock
     @stream.stubs(:send)
     @jid = Blather::JID.new('n@d/r')
-    @client.post_init @stream, @jid
   end
 
   it 'provides a Blather::JID reader' do
+    @client.post_init @stream, @jid
     @client.must_respond_to :jid
     @client.jid.must_equal @jid
   end
@@ -21,6 +21,7 @@ describe Blather::Client do
   end
 
   it 'provides a status reader' do
+    @client.post_init @stream, @jid
     @client.must_respond_to :status
     @client.status = :away
     @client.status.must_equal :away
@@ -67,13 +68,20 @@ describe Blather::Client do
   end
 
   it 'knows if it is connected' do
-    stream = mock()
+    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
 
+  describe 'if it has been setup but not connected yet' do
+    it 'should consider itself disconnected' do
+      @client.setup('me.com', 'secret')
+      @client.connected?.must_equal false
+    end
+  end
+
   it 'writes to the connection the closes when #close is called' do
     stream = mock()
     stream.expects(:close_connection_after_writing)

data/spec/blather_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe Blather do
+  
+  describe "while accessing to Logger object" do
+    it "should return a Logger instance" do
+      Blather.logger.must_be_instance_of Logger
+    end
+
+    it "should config log level to info by default" do
+      Blather.logger.level.must_equal 1
+    end
+  end
+
+  describe "while using the log method" do
+    after do
+      Blather.default_log_level = :debug
+    end
+
+    it "should forward to debug by default" do
+      Blather.logger.expects(:debug).with("foo bar").once
+      Blather.log "foo bar"
+    end
+    
+    %w<debug info error fatal>.each do |val|
+      it "should forward to #{val} if configured that default level" do
+        Blather.logger.expects(val.to_sym).with("foo bar").once
+        Blather.default_log_level = val.to_sym
+        Blather.log "foo bar"
+      end
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blather
 version: !ruby/object:Gem::Version
-  version: 0.5.9
+  version: 0.5.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-24 00:00:00.000000000 Z
+date: 2011-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &2151820120 !ruby/object:Gem::Requirement
+  requirement: &2152201300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.12.6
   type: :runtime
   prerelease: false
-  version_requirements: *2151820120
+  version_requirements: *2152201300
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2151817400 !ruby/object:Gem::Requirement
+  requirement: &2152228020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *2151817400
+  version_requirements: *2152228020
 - !ruby/object:Gem::Dependency
   name: niceogiri
-  requirement: &2151816340 !ruby/object:Gem::Requirement
+  requirement: &2152227220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2151816340
+  version_requirements: *2152227220
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2151814180 !ruby/object:Gem::Requirement
+  requirement: &2152226520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 3.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *2151814180
+  version_requirements: *2152226520
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &2151826240 !ruby/object:Gem::Requirement
+  requirement: &2152225740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.7.1
   type: :development
   prerelease: false
-  version_requirements: *2151826240
+  version_requirements: *2152225740
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2151823960 !ruby/object:Gem::Requirement
+  requirement: &2152224800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.9.12
   type: :development
   prerelease: false
-  version_requirements: *2151823960
+  version_requirements: *2152224800
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2151822020 !ruby/object:Gem::Requirement
+  requirement: &2152224280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2151822020
+  version_requirements: *2152224280
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2151832740 !ruby/object:Gem::Requirement
+  requirement: &2152223400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 0.9.9
   type: :development
   prerelease: false
-  version_requirements: *2151832740
+  version_requirements: *2152223400
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2151843420 !ruby/object:Gem::Requirement
+  requirement: &2152222880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 0.6.1
   type: :development
   prerelease: false
-  version_requirements: *2151843420
+  version_requirements: *2152222880
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2151848800 !ruby/object:Gem::Requirement
+  requirement: &2152222460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151848800
+  version_requirements: *2152222460
 - !ruby/object:Gem::Dependency
   name: guard-minitest
-  requirement: &2151861200 !ruby/object:Gem::Requirement
+  requirement: &2152221960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151861200
+  version_requirements: *2152221960
 - !ruby/object:Gem::Dependency
   name: bluecloth
-  requirement: &2151857080 !ruby/object:Gem::Requirement
+  requirement: &2152221420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151857080
+  version_requirements: *2152221420
 - !ruby/object:Gem::Dependency
   name: growl_notify
-  requirement: &2151869860 !ruby/object:Gem::Requirement
+  requirement: &2152220860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151869860
+  version_requirements: *2152220860
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &2151865360 !ruby/object:Gem::Requirement
+  requirement: &2152282580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,7 +164,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151865360
+  version_requirements: *2152282580
 description: An XMPP DSL for Ruby written on top of EventMachine and Nokogiri
 email: sprsquish@gmail.com
 executables: []
@@ -307,6 +307,7 @@ files:
 - spec/blather/stream/parser_spec.rb
 - spec/blather/stream/ssl_spec.rb
 - spec/blather/xmpp_node_spec.rb
+- spec/blather_spec.rb
 - spec/fixtures/pubsub.rb
 - spec/spec_helper.rb
 - yard/templates/default/class/html/handlers.erb
@@ -386,6 +387,6 @@ test_files:
 - spec/blather/stream/parser_spec.rb
 - spec/blather/stream/ssl_spec.rb
 - spec/blather/xmpp_node_spec.rb
+- spec/blather_spec.rb
 - spec/fixtures/pubsub.rb
 - spec/spec_helper.rb
-has_rdoc: