happy_fun_time_bot 0.1.2 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.0

data/examples/example.rb

@@ -4,8 +4,7 @@ require 'rubygems'
 require 'happy_fun_time_bot'
 
 # For hipchat, your :jid, :room and :password are available at https://www.hipchat.com/account/xmpp
-#@bot = HappyFunTimeBot.new(:jid => "xxxxx@chat.hipchat.com", :nick => "ImageBot", :room => "your_room@conf.hipchat.com", :password => "xxx")
-@bot = HappyFunTimeBot.new(:jid => "514_23995@chat.hipchat.com", :nick => "HappyFunTime Bot", :room => "514_dev_talk@conf.hipchat.com", :password => "kwanzaa")
+@bot = HappyFunTimeBot.new(:jid => "xxxxx@chat.hipchat.com", :nick => "ImageBot", :room => "your_room@conf.hipchat.com", :password => "xxx")
 
 # calling !heybot will return a simple response.
 @bot.add_responder('heybot') do |from, args|

data/examples/find_image.rb

@@ -2,8 +2,7 @@
 %w(rubygems happy_fun_time_bot httparty).each {|r| require r }
 
 # For hipchat, your :jid, :room and :password are available at https://www.hipchat.com/account/xmpp
-#@bot = HappyFunTimeBot.new(:jid => "xxxxx@chat.hipchat.com", :nick => "ImageBot", :room => "your_room@conf.hipchat.com", :password => "xxx")
-@bot = HappyFunTimeBot.new(:jid => "514_23995@chat.hipchat.com", :nick => "HappyFunTime Bot", :room => "514_dev_talk@conf.hipchat.com", :password => "kwanzaa")
+@bot = HappyFunTimeBot.new(:jid => "xxxxx@chat.hipchat.com", :nick => "ImageBot", :room => "your_room@conf.hipchat.com", :password => "xxx")
 
 # Let's create a simple image getter from google.
 class Google
@@ -28,7 +27,6 @@ end
 
 # let's find some images!
 @bot.add_responder('findimage') do |from, args|
-  $stdout << "args are #{args}\n"
   url = Google.get_image_url(args)
   "Look! #{url}"
 end

data/happy_fun_time_bot.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{happy_fun_time_bot}
-  s.version = "0.1.2"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Grant Ammons"]
-  s.date = %q{2011-06-12}
+  s.authors = [%q{Grant Ammons}]
+  s.date = %q{2011-09-13}
   s.description = %q{Easily create bots that can respond to anything!}
   s.email = %q{grant@pipelinedealsco.com}
   s.extra_rdoc_files = [
@@ -35,9 +35,9 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/gammons/happy_fun_time_bot}
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.4.2}
+  s.licenses = [%q{MIT}]
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.6}
   s.summary = %q{Simple XMPP bot framework}
 
   if s.respond_to? :specification_version then

data/lib/bot/muc_client.rb

@@ -4,15 +4,15 @@
 module Jabber
   module MUC
     class MUCClient
-      
+
       def join(jid, password=nil)
         if active?
           raise "MUCClient already active"
         end
-        
+
         @jid = (jid.kind_of?(JID) ? jid : JID.new(jid))
         activate
-        
+
         # Joining
         pres = Presence.new
         pres.to = @jid
@@ -20,13 +20,13 @@ module Jabber
         xmuc = XMUC.new
         xmuc.password = password
         pres.add(xmuc)
-        
+
         # NOTE: Adding 'maxstanzas="0"' to 'history' subelement of xmuc nixes
         # the history being sent to us when we join.
         history = XMPPElement.new('history')
         history.add_attributes({'maxstanzas' => '0'})
         xmuc.add(history)
-        
+
         # We don't use Stream#send_with_id here as it's unknown
         # if the MUC component *always* uses our stanza id.
         error = nil
@@ -43,7 +43,7 @@ module Jabber
               @affiliation = i.affiliation  # we're interested in if it's :owner
               @role = i.role                # :moderator ?
             end
-            
+
             handle_presence(r, false)
             true
           else
@@ -51,15 +51,15 @@ module Jabber
             false
           end
         }
-        
+
         if error
           deactivate
           raise ServerError.new(error)
         end
-        
+
         self
       end
-      
+
     end
   end
 end

data/lib/happy_fun_time_bot.rb

@@ -39,7 +39,7 @@ class HappyFunTimeBot
     self
   end
 
-  def add_responder(command  = '', &block)
+  def add_responder(command  = nil, &block)
     responders << Responder.new(command, &block)
   end
 
@@ -51,7 +51,8 @@ class HappyFunTimeBot
   private
 
   def process(from, command)
-    return [] unless command =~ self.config[:command_regex]
+    return [] if !responders.any? {|r| r.command.nil? } and !(command =~ self.config[:command_regex])
+
     responders.select {|r| r.responds_to?($1) }.map  do |responder|
       args = command.split
       args.shift

data/lib/responder.rb

@@ -7,6 +7,11 @@ class Responder
   end
 
   def responds_to?(command)
+    # respond to all if our command is nil.
+    return true if @command.nil?
+
+    # otherwise parse out the command and make sure it matches
+    # our command.
     @command == command.split.first
   end
 end

data/spec/happy_fun_time_bot_spec.rb

@@ -39,5 +39,10 @@ describe "HappyFunTimeBot" do
       @bot.add_responder("argarg") { |from, args| "your args are #{args}" }
       @bot.send(:process, "bob", "!argarg monkey costume").should == ["your args are monkey costume"]
     end
+
+    it "should respond to all messages if we did not specify a specific responder" do
+      @bot.add_responder { |from, args| "got it." }
+      @bot.send(:process, "jim", "sending some stuff").should == ["got it."]
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: happy_fun_time_bot
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
   - 2
-  version: 0.1.2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Grant Ammons
@@ -15,13 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-12 00:00:00 -04:00
-default_executable: 
+date: 2011-09-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   name: ruby-debug
   type: :runtime
+  prerelease: false
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -33,9 +32,9 @@ dependencies:
         version: "0"
   requirement: *id001
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   name: xmpp4r
   type: :runtime
+  prerelease: false
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -47,9 +46,9 @@ dependencies:
         version: "0"
   requirement: *id002
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   name: json
   type: :runtime
+  prerelease: false
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -61,9 +60,9 @@ dependencies:
         version: "0"
   requirement: *id003
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   name: httparty
   type: :runtime
+  prerelease: false
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -75,9 +74,9 @@ dependencies:
         version: "0"
   requirement: *id004
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   name: rspec
   type: :development
+  prerelease: false
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -91,9 +90,9 @@ dependencies:
         version: 2.3.0
   requirement: *id005
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   name: yard
   type: :development
+  prerelease: false
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -107,9 +106,9 @@ dependencies:
         version: 0.6.0
   requirement: *id006
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   name: bundler
   type: :development
+  prerelease: false
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -123,9 +122,9 @@ dependencies:
         version: 1.0.0
   requirement: *id007
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   name: jeweler
   type: :development
+  prerelease: false
   version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -139,9 +138,9 @@ dependencies:
         version: 1.6.0
   requirement: *id008
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   name: rcov
   type: :development
+  prerelease: false
   version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -178,7 +177,6 @@ files:
 - lib/responder.rb
 - spec/happy_fun_time_bot_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/gammons/happy_fun_time_bot
 licenses: 
 - MIT
@@ -208,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Simple XMPP bot framework