scamp 0.1.0 → 0.1.1

data/README.md

@@ -16,6 +16,24 @@ Ruby >= 1.9.2 (At least for the named captures)
 
 ## Usage and Examples
 
+### The most simple example:
+
+    require 'scamp'
+    
+    scamp = Scamp.new(:api_key => "YOUR API KEY", :subdomain => "yoursubdomain", :verbose => true)
+    
+    scamp.behaviour do
+      # Simple matching based on regex or string:
+      match "ping" do
+        say "pong"
+      end
+    end
+    
+    # Connect and join some rooms
+    scamp.connect!([293788, "Monitoring"])
+
+### A more in-depth run through
+
 Matchers are tested in order and all that satisfy the match and conditions will be run. Careful, Scamp listens to itself, you could easily create an infinite loop. Look in the examples dir for more.
 
     require 'scamp'
@@ -100,13 +118,11 @@ Matchers are tested in order and all that satisfy the match and conditions will
     # Connect and join some rooms
     scamp.connect!([293788, "Monitoring"])
 
-In the room/user conditions you can use the name, regex or ID of a user or room, in say you can ise a string or ID, eg:
+In the room/user conditions and say/play commands you can use the name or ID of a user or room, eg:
 
-    :conditions => {:room => /someregex/}
     :conditions => {:room => "some string"}
     :conditions => {:room => 123456}
 
-    :conditions => {:user => /someregex/}
     :conditions => {:user => "some string"}
     :conditions => {:user => 123456}
 

data/lib/scamp/messages.rb

@@ -19,7 +19,7 @@ class Scamp
       http = EventMachine::HttpRequest.new(url).post :head => {'Content-Type' => 'application/json', 'authorization' => [api_key, 'X']}, :body => Yajl::Encoder.encode({:message => {:body => payload, :type => type}})
       http.errback { logger.error "Couldn't connect to #{url} to post message \"#{payload}\" to room #{room_id}" }
       http.callback {
-        if http.response_header.status == 200
+        if [200,201].include? http.response_header.status
           logger.debug "Posted message \"#{payload}\" to room #{room_id}"
         else
           logger.error "Couldn't post message \"#{payload}\" to room #{room_id} using url #{url}, http response from the API was #{http.response_header.status}"

data/lib/scamp/version.rb

@@ -1,3 +1,3 @@
 class Scamp
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/lib/scamp_spec.rb

@@ -598,7 +598,7 @@ describe Scamp do
         EM.run_block {
           stub_request(:post, @message_post_url).
             with(:headers => {'Authorization'=>[@valid_params[:api_key], 'X'], 'Content-Type' => 'application/json'}).
-            to_return(:status => 200, :body => Yajl::Encoder.encode(:room => @valid_room_cache_data[123]), :headers => {})
+            to_return(:status => 201, :body => Yajl::Encoder.encode(:room => @valid_room_cache_data[123]), :headers => {})
           bot.send(:send_message, 123, "Hi", "Textmessage")
         }
         logger_output.should =~ /DEBUG.*Posted message "Hi" to room 123/

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scamp
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-09-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &2152463380 !ruby/object:Gem::Requirement
+  requirement: &70295424002980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.0.beta.4
   type: :runtime
   prerelease: false
-  version_requirements: *2152463380
+  version_requirements: *70295424002980
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &2152461660 !ruby/object:Gem::Requirement
+  requirement: &70295424002200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.8.3
   type: :runtime
   prerelease: false
-  version_requirements: *2152461660
+  version_requirements: *70295424002200
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &2152459120 !ruby/object:Gem::Requirement
+  requirement: &70295424001540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0.beta.4
   type: :runtime
   prerelease: false
-  version_requirements: *2152459120
+  version_requirements: *70295424001540
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152457780 !ruby/object:Gem::Requirement
+  requirement: &70295424000840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2152457780
+  version_requirements: *70295424000840
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2152454380 !ruby/object:Gem::Requirement
+  requirement: &70295424000160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.10.0
   type: :development
   prerelease: false
-  version_requirements: *2152454380
+  version_requirements: *70295424000160
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &2152453060 !ruby/object:Gem::Requirement
+  requirement: &70295423999460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +76,7 @@ dependencies:
         version: 1.7.6
   type: :development
   prerelease: false
-  version_requirements: *2152453060
+  version_requirements: *70295423999460
 description: Eventmachine based Campfire bot framework
 email:
 - will@willj.net