botfly 0.3.0 → 0.3.1

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/botfly.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{botfly}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ryan Neufeld"]

data/lib/botfly.rb

@@ -1,5 +1,8 @@
 require 'rubygems'
 
+require 'logger'
+require 'forwardable'
+
 require 'xmpp4r'
 require 'xmpp4r/muc'
 require 'xmpp4r/roster'
@@ -10,8 +13,7 @@ require 'botfly/bot'
 require 'botfly/matcher'
 require 'botfly/muc_client'
 
-require 'logger'
-require 'forwardable'
+
 
 Thread.abort_on_exception = true
 
@@ -20,10 +22,10 @@ module Botfly
     @logger = Logger.new(@logfile)
     return @logger
   end
-  def Botfly.login(jid,pass,logfile=STDOUT,&block)
+  def Botfly.login(jid,pass,opts={},logfile=STDOUT,&block)
     @logfile = logfile
     Botfly.logger.info("BOTFLY: #login")
-    bot = Botfly::Bot.new(jid,pass)
+    bot = Botfly::Bot.new(jid,pass,opts)
     bot.connect # Must connect first, since MUC requires an active connection to initiate
     bot.instance_exec(&block)
     return bot # At this point doesn't get returned, as the thread is stopped

data/lib/botfly/bot.rb

@@ -20,10 +20,11 @@ module Botfly
       Botfly.logger.info("  BOT: Connecting to #{@host || @jid}...")
       @client.connect(@host)
       @client.auth(@password)
+      @roster = Jabber::Roster::Helper.new(@client)
       Botfly.logger.info("  BOT: Connected")
       register_for_callbacks
       @client.send(Jabber::Presence.new.set_status("Carrier has arrived"))
-      @roster = Jabber::Roster::Helper.new(@client)
+
       #Thread.stop
     end
 
@@ -43,7 +44,7 @@ module Botfly
     def register_for_callbacks
       Botfly.logger.info("  BOT: Registering for callbacks with client")
 #     @client.add_update_callback {|presence| respond_to(:update, :presence => presence) }
-      @client.add_subscription_request_callback do |item, pres| # requires Roster helper
+      @roster.add_subscription_request_callback do |item, pres| # requires Roster helper
         Botfly.logger.debug("    CB: Got Message")
         respond_to(:subscription_request, :roster_item => item, :presence => pres)
       end

data/lib/botfly/common_block_acceptor.rb

@@ -5,7 +5,7 @@ module Botfly
     attr_accessor :responders  
     attr_reader :client
     
-    def initialize(ignored,ignore)
+    def initialize(jid,pass,opts={})
       @block_state = {}
       @responders = {}
     end
@@ -37,7 +37,8 @@ module Botfly
 
       def method_missing(type,&block)
         Botfly.logger.info("#{@obj.to_debug_s}: Bot#on")
-        klass = Botfly.const_get(@obj.class_prefix + type.to_s.capitalize + "Responder")
+        type_name = type.to_s.split('_').map(&:capitalize).join('')
+        klass = Botfly.const_get(@obj.class_prefix + type_name + "Responder")
         (@obj.responders[type] ||= []) << responder = klass.new(@obj, &block)
         Botfly.logger.info("#{@obj.to_debug_s}: #{@obj.class_prefix}#{type.to_s.capitalize}Responder added to responder chain")
         return responder

data/lib/botfly/responder.rb

@@ -1,6 +1,8 @@
+# TODO: Dry this up
 require 'botfly/responder/common_responder_methods'
 require 'botfly/responder/responder'
 require 'botfly/responder/message_responder'
 require 'botfly/responder/presence_responder'
 require 'botfly/responder/muc_responder'
-require 'botfly/responder/muc_message_responder'
+require 'botfly/responder/muc_message_responder'
+require 'botfly/responder/subscription_request_responder'

data/lib/botfly/responder/subscription_request_responder.rb

@@ -13,5 +13,6 @@ module Botfly
     end
     def decline
       @bot.roster.decline_subscription(@from)
+    end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Ryan Neufeld