tyler-uppercut 0.7.0 → 0.7.1

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-patch: 0
+patch: 1
 major: 0
 minor: 7

data/examples/personal.rb

@@ -0,0 +1,42 @@
+require 'rubygems'
+require 'uppercut'
+require 'yahoo-weather'
+require 'feed_tools'
+
+class PersonalAgent < Uppercut::Agent
+  def get_weather
+    @weather_client ||= YahooWeather::Client.new
+    @weather_client.lookup_location('94102') # lookup by zipcode
+  end
+
+  def get_news
+    FeedTools::Feed.open('feed://www.nytimes.com/services/xml/rss/nyt/HomePage.xml')
+  end
+
+  command 'weather' do |c,args|
+    weather = get_weather
+    c.send "#{weather.title}\n#{weather.condition.temp} degrees\n#{weather.condition.text}"
+  end
+
+  command 'forecast' do |c,args|
+    response = get_weather
+    msg = "#{response.forecasts[0].day} - #{response.forecasts[0].text}. "
+    msg << "High: #{response.forecasts[0].high} Low: #{response.forecasts[0].low}\n"
+    msg << "#{response.forecasts[1].day} - #{response.forecasts[1].text}. "
+    msg << "High: #{response.forecasts[1].high} Low: #{response.forecasts[1].low}\n"
+    c.send msg
+  end
+
+  command 'news' do |c,args|
+    msg = get_news.items[0,5].map { |item|
+      "#{item.title}\n#{item.link}"
+    }.join("\n\n")
+    c.send msg
+  end
+end
+
+if $0 == __FILE__
+  agent = PersonalAgent.new('name@domain.com/PersonalAgent','password')
+  agent.listen
+  sleep
+end

data/lib/uppercut/agent.rb

@@ -16,10 +16,10 @@ class Uppercut
       # any captures in the pattern Regexp. (Does not apply to String 
       # patterns).
       def command(pattern,&block)
-        define_method(gensym) do |msg|
-          return :no_match unless captures = matches?(pattern,msg.body)
-          block[Conversation.new(msg.from,self),*captures]
-        end
+        @@patterns ||= []
+        g = gensym
+        @@patterns << [pattern,g]
+        define_method(g, &block)
       end
 
       # Define a callback for specific presence events.
@@ -39,7 +39,7 @@ class Uppercut
       private
 
       def gensym
-        '__uc' + (self.instance_methods.grep(/^__uc/).size).to_s.rjust(8,'0')
+        ('__uc' + (self.instance_methods.grep(/^__uc/).size).to_s.rjust(8,'0')).intern
       end
     end
 
@@ -182,7 +182,12 @@ class Uppercut
       block = @redirects[bare_from].respond_to?(:shift) && @redirects[bare_from].shift
       return block[msg.body] if block
 
-      self.methods.grep(/^__uc/).sort.detect { |m| send(m,msg) != :no_match }
+      captures = nil
+      pair = @@patterns.detect { |pattern,method| captures = matches?(pattern,msg.body) }
+      if pair
+        pattern, method = pair if pair
+        send method, Conversation.new(msg.from,self), captures
+      end
     end
 
     def dispatch_presence(type, presence)

data/spec/spec_helper.rb

@@ -12,22 +12,22 @@ require 'uppercut'
 require 'jabber_stub'
 
 class TestAgent < Uppercut::Agent
-  command 'hi' do |c|
+  command 'hi' do |c,args|
     c.instance_eval { @base.instance_eval { @called_hi = true } }
     c.send 'called hi'
   end
   
-  command /^hi/ do |c|
+  command /^hi/ do |c,args|
     c.instance_eval { @base.instance_eval { @called_hi_regex = true } }
     c.send 'called high regex'
   end
   
-  command /(good)?bye/ do |c,good|
+  command /(good)?bye/ do |c,args|
     @called_goodbye = true
-    c.send good ? "Good bye to you as well!" : "Rot!"
+    c.send args.first ? "Good bye to you as well!" : "Rot!"
   end
   
-  command 'wait' do |c|
+  command 'wait' do |c,args|
     @called_wait = true
     c.send 'Waiting...'
     c.wait_for do |reply|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tyler-uppercut
 version: !ruby/object:Gem::Version 
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors: 
 - Tyler McMullen
@@ -45,6 +45,7 @@ files:
 - spec/notifier_spec.rb
 - spec/spec_helper.rb
 - examples/basic_agent.rb
+- examples/personal.rb
 has_rdoc: false
 homepage: http://github.com/tyler/uppercut
 post_install_message: