scamp 0.0.3 → 0.0.4

data/README.md

@@ -41,15 +41,15 @@ Matchers are tested in order and all that satisfy the match and conditions will
       # 
       # Limit the match to certain channels, users or both.
       # 
-      match /^Lets match (.+)$/, :conditions => {:channel => /someregex/} do
+      match /^Lets match (.+)$/, :conditions => {:channel => "Some Channel"} do
         say "Only said if channel name mathces /someregex/"
       end
       
-      match "some text", :conditions => {:user => /someregex/} do
+      match "some text", :conditions => {:user => "Some User"} do
         say "Only said if user name mathces /someregex/"
       end
       
-      match /some other text/, :conditions => {:user => /someregex/, :channel => /some other regex/} do
+      match /some other text/, :conditions => {:user => "Some User", :channel => 123456} do
         say "You can mix conditions"
       end
       

data/examples/bot.rb

@@ -18,16 +18,6 @@ scamp.behaviour do
     say "Limit a match to a channel condition based on a string"
   end
   
-  # Limit a match to a channel condition based on a regex
-  match /^channel regex (.+)$/, :conditions => {:channel => /someregex/} do
-    say "Limit a match to a channel condition based on a regex"
-  end
-  
-  # Limit a match to a user condition based on a regex
-  match /^user regex (.+)$/, :conditions => {:user => /someregex/} do
-    say "Limit a match to a user condition based on a regex"
-  end
-
   # Limit a match to a user condition based on a string
   match /^user name (.+)$/, :conditions => {:user => "Will Jessop"} do
     say "Limit a match to a user condition based on a string"

data/lib/scamp/channels.rb

@@ -100,7 +100,7 @@ class Scamp
       # Timeout per https://github.com/igrigorik/em-http-request/wiki/Redirects-and-Timeouts
       http = EventMachine::HttpRequest.new(url, :connect_timeout => 20, :inactivity_timeout => 0).get :head => {'authorization' => [api_key, 'X']}
       http.errback { logger.error "Couldn't stream channel #{channel_id} at url #{url}" }
-      http.callback { logger.error "Disconnected from #{url}" }
+      http.callback { logger.error "Disconnected from #{url}"; channels_to_join << channel_id}
       http.stream {|chunk| json_parser << chunk }
     end
 

data/lib/scamp/connection.rb

@@ -2,14 +2,21 @@ class Scamp
   module Connection
     private
     
-    def connect(api_key, channels_to_join)
+    def connect(api_key, channel_list)
       EventMachine.run do
-        # Ideally populate_channel_list would block, but I can't see an easy way to do this, so a hacky callback it is.
-        populate_channel_list do
-          channels_to_join.map{|c| channel_id(c) }.each do |id|
+        
+        # Check for channels to join, and join them
+        EventMachine::add_periodic_timer(5) do
+          while id = @channels_to_join.pop
             join_and_stream(id)
           end
         end
+        
+        populate_channel_list do
+          logger.debug "Adding #{channel_list.join ', '} to list of channels to join"
+          @channels_to_join = channel_list.map{|c| channel_id(c) }
+        end
+        
       end
     end
       

data/lib/scamp/matcher.rb

@@ -43,18 +43,10 @@ class Scamp
     end
     
     def conditions_satisfied_by(msg)
-      # bot.logger.warn "Need to take into account nick, channel and regexps at #{__FILE__}:#{__LINE__}"
-      bot.logger.info "Checking message against #{conditions.inspect}"
-      
-      # nick
-      # channel name
-      # nick regex
-      # channel regex
-      
-      #{"room_id":1,"created_at":"2009-12-01 23:44:40","body":"hello","id":1,"user_id":1,"type":"TextMessage"}
+      bot.logger.debug "Checking message against #{conditions.inspect}"
       
       # item will be :nick or :channel
-      # cond is the regex, int or string value.
+      # cond is the int or string value.
       conditions.each do |item, cond|
         bot.logger.debug "Checking #{item} against #{cond}"
         bot.logger.debug "msg is #{msg.inspect}"
@@ -69,9 +61,6 @@ class Scamp
             return false unless bot.username_for(msg[:user_id]) == cond
           end
           bot.logger.error "Don't know how to deal with a match item of #{item}, cond #{cond}"
-        elsif cond.is_a? Regexp
-          return false
-          return false unless msg[item].match(cond)
         end
       end
       true

data/lib/scamp/version.rb

@@ -1,3 +1,3 @@
 class Scamp
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/scamp.rb

@@ -15,7 +15,7 @@ class Scamp
   include Channels
   include Users
 
-  attr_accessor :channels, :user_cache, :channel_cache, :matchers, :api_key, :subdomain, :logger, :verbose, :first_match_only
+  attr_accessor :channels, :user_cache, :channel_cache, :matchers, :api_key, :subdomain, :logger, :verbose, :first_match_only, :channels_to_join
 
   def initialize(options = {})
     options ||= {}
@@ -30,7 +30,8 @@ class Scamp
         logger.warn "Scamp initialized with #{k.inspect} => #{v.inspect} but NO UNDERSTAND!"
       end
     end
-
+    
+    @channels_to_join = []
     @channels = {}
     @user_cache = {}
     @channel_cache = {}

data/spec/lib/scamp_spec.rb

@@ -3,6 +3,8 @@ require "spec_helper"
 describe Scamp do
   before do
     @valid_params = {:api_key => "6124d98749365e3db2c9e5b27ca04db6", :subdomain => "oxygen"}
+    @valid_user_cache_data = {123 => {"name" => "foo"}, 456 => {"name" => "bar"}}
+    @valid_channel_cache_data = {123 => {"name" => "foo"}, 456 => {"name" => "bar"}}
   end
 
   describe "#initialize" do
@@ -86,8 +88,155 @@ describe Scamp do
         end
       end
     end
-
-
+  end
+  
+  describe "matching" do
+    
+    context "with conditions" do
+      it "should limit matches by channel id" do
+        canary = mock
+        canary.expects(:lives).once
+        canary.expects(:bang).never
+        
+        bot = a Scamp
+        bot.behaviour do
+          match("a string", :conditions => {:channel => 123}) {canary.lives}
+          match("a string", :conditions => {:channel => 456}) {canary.bang}
+        end
+        
+        bot.send(:process_message, {:room_id => 123, :body => "a string"})
+      end
+      
+      it "should limit matches by channel name" do
+        canary = mock
+        canary.expects(:lives).once
+        canary.expects(:bang).never
+        
+        bot = a Scamp
+        bot.behaviour do
+          match("a string", :conditions => {:channel => "foo"}) {canary.lives}
+          match("a string", :conditions => {:channel => "bar"}) {canary.bang}
+        end
+        
+        bot.channel_cache = @valid_channel_cache_data
+        
+        bot.send(:process_message, {:room_id => 123, :body => "a string"})
+      end
+      
+      it "should limit matches by user id" do
+        canary = mock
+        canary.expects(:lives).once
+        canary.expects(:bang).never
+        
+        bot = a Scamp
+        bot.behaviour do
+          match("a string", :conditions => {:user => 123}) {canary.lives}
+          match("a string", :conditions => {:user => 456}) {canary.bang}
+        end
+        
+        bot.send(:process_message, {:user_id => 123, :body => "a string"})
+      end
+      
+      it "should limit matches by user name" do
+        canary = mock
+        canary.expects(:lives).once
+        canary.expects(:bang).never
+        
+        bot = a Scamp
+        bot.behaviour do
+          match("a string", :conditions => {:user => "foo"}) {canary.lives}
+          match("a string", :conditions => {:user => "bar"}) {canary.bang}
+        end
+        
+        bot.user_cache = @valid_user_cache_data
+        
+        bot.send(:process_message, {:user_id => 123, :body => "a string"})
+      end
+      
+      it "should limit matches by channel and user" do
+        canary = mock
+        canary.expects(:lives).once
+        canary.expects(:bang).never
+        
+        bot = a Scamp
+        bot.behaviour do
+          match("a string", :conditions => {:channel => 123, :user => 123}) {canary.lives}
+          match("a string", :conditions => {:channel => 456, :user => 456}) {canary.bang}
+        end
+        
+        bot.channel_cache = @valid_channel_cache_data
+        bot.user_cache = @valid_user_cache_data
+        bot.send(:process_message, {:room_id => 123, :user_id => 123, :body => "a string"})
+        bot.send(:process_message, {:room_id => 123, :user_id => 456, :body => "a string"})
+        bot.send(:process_message, {:room_id => 456, :user_id => 123, :body => "a string"})
+      end
+    end
+    
+    describe "strings" do
+      it "should match an exact string" do
+        canary = mock
+        canary.expects(:lives).once
+        canary.expects(:bang).never
+        
+        bot = a Scamp
+        bot.behaviour do
+          match("a string") {canary.lives}
+          match("another string") {canary.bang}
+          match("a string like no other") {canary.bang}
+        end
+        
+        bot.send(:process_message, {:body => "a string"})
+      end
+    end
+    
+    describe "regexes" do
+      it "should match a regex" do
+        canary = mock
+        canary.expects(:ping).twice
+        
+        bot = a Scamp
+        bot.behaviour do
+          match /foo/ do
+            canary.ping
+          end
+        end
+        
+        bot.send(:process_message, {:body => "something foo other thing"})
+        bot.send(:process_message, {:body => "foomaster"})
+      end
+      
+      it "should make named captures vailable as methods" do
+        canary = mock
+        canary.expects(:one).with("first")
+        canary.expects(:two).with("the rest of it")
+        
+        bot = a Scamp
+        bot.behaviour do
+          match /^please match (?<yousaidthis>\w+) and (?<andthis>.+)$/ do
+            canary.one(yousaidthis)
+            canary.two(andthis)
+          end
+        end
+        
+        bot.send(:process_message, {:body => "please match first and the rest of it"})
+      end
+      
+      it "should make matches available in an array" do
+        canary = mock
+        canary.expects(:one).with("first")
+        canary.expects(:two).with("the rest of it")
+        
+        bot = a Scamp
+        bot.behaviour do
+          match /^please match (\w+) and (.+)$/ do
+            canary.one(matches[0])
+            canary.two(matches[1])
+          end
+        end
+        
+        bot.send(:process_message, {:body => "please match first and the rest of it"})
+      end
+    end
   end
 
   def a klass, params={}

data/spec/spec_helper.rb

@@ -1 +1,2 @@
 require File.expand_path("../lib/scamp", File.dirname(__FILE__))
+require 'mocha'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scamp
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-19 00:00:00.000000000Z
+date: 2011-09-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &2160350540 !ruby/object:Gem::Requirement
+  requirement: &2152335860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.0.beta.4
   type: :runtime
   prerelease: false
-  version_requirements: *2160350540
+  version_requirements: *2152335860
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &2160349260 !ruby/object:Gem::Requirement
+  requirement: &2152335100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.8.3
   type: :runtime
   prerelease: false
-  version_requirements: *2160349260
+  version_requirements: *2152335100
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &2160348020 !ruby/object:Gem::Requirement
+  requirement: &2152334240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0.beta.4
   type: :runtime
   prerelease: false
-  version_requirements: *2160348020
+  version_requirements: *2152334240
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2160346640 !ruby/object:Gem::Requirement
+  requirement: &2152333240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2160346640
+  version_requirements: *2152333240
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2160345740 !ruby/object:Gem::Requirement
+  requirement: &2152332420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: 0.10.0
   type: :development
   prerelease: false
-  version_requirements: *2160345740
+  version_requirements: *2152332420
 description: Eventmachine based Campfire bot framework
 email:
 - will@willj.net