em-campfire 1.0.0 → 1.1.0

data/README.md

@@ -52,7 +52,8 @@ EM.run {
     :api_key => "jhhekrlfjnksdjnliyherkjb",
     :verbose => true,
     :logger => Logger::Syslog.new('process_name', Syslog::LOG_PID | Syslog::LOG_CONS),
-    :cache => custom_cache_object
+    :cache => custom_cache_object,
+    :ignore_self => true
   )
 
   # more code
@@ -83,7 +84,6 @@ I've tested it in Ruby >= 1.9.3.
 
 ## TODO
 
-* I mock is\_me? in "should be able to ignore itself" in connection_spec.rb for convenience, work out a way to not do that
 * See if http connection/cacheing/failure handling can be abstracted
 * Allow user to pass success/error callbacks
 * Re-try failed HTTP requests

data/lib/em-campfire/connection.rb

@@ -12,12 +12,12 @@ module EventMachine
       attr_accessor :on_message_block
 
       def process_message(msg)
+        return if (msg[:type] == "TimestampMessage" && ignore_timestamps?)
         logger.debug "Received message #{msg.inspect}"
         if ignore_self && is_me?(msg[:user_id])
           logger.debug "Ignoring message with user_id #{msg[:user_id]} as that is me and ignore_self is true"
         else
           if on_message_block
-            logger.debug "on_message callback exists, calling it with #{msg.inspect}"
             on_message_block.call(msg)
           else
             logger.debug "on_message callback does not exist"

data/lib/em-campfire/version.rb

@@ -1,5 +1,5 @@
 module EventMachine
   class Campfire
-    VERSION = "1.0.0"
+    VERSION = "1.1.0"
   end
 end

data/lib/em-campfire.rb

@@ -12,7 +12,7 @@ require "em-campfire/cache"
 
 module EventMachine
   class Campfire
-    attr_accessor :logger, :verbose, :subdomain, :api_key
+    attr_accessor :logger, :verbose, :subdomain, :api_key, :ignore_timestamps
     
     include Connection
     include Rooms
@@ -56,5 +56,9 @@ module EventMachine
       @verbose = is_verbose
       logger.level = Logger::DEBUG if is_verbose
     end
+
+    def ignore_timestamps?
+      self.ignore_timestamps || false
+    end
   end # Campfire
 end # EventMachine

data/spec/lib/connection_spec.rb

@@ -13,25 +13,25 @@ end
 
 describe EventMachine::Campfire::Connection do
   before :each do
-    mock_logger(ConnectionTester)
     @conn = ConnectionTester.new
   end
 
-  it "should receive messages" do
-    @conn.receive_message "foo"
-    logger_output.should =~ /DEBUG.*Received message "foo"/
+  it "should alert if on_message callback doesn't exist" do
+    mock_logger(ConnectionTester)
+    @conn.receive_message({:type=>"TextMessage"})
     logger_output.should =~ /DEBUG.*on_message callback does not exist/
   end
 
   it "should process on_message an block if present" do
+    mock_logger(ConnectionTester)
     ping = mock
-    ping.expects(:ping).with("foo")
+    ping.expects(:ping).with({:type=>"TextMessage"})
     @conn.on_message {|message| ping.ping(message) }
-    @conn.receive_message "foo"
-    logger_output.should =~ /DEBUG.*on_message callback exists, calling it with "foo"/
+    @conn.receive_message({:type=>"TextMessage"})
   end
 
   it "should be able to ignore itself" do
+    mock_logger(ConnectionTester)
     @conn.ignore_self = true
     @conn.cache.stubs(:get).with('user-data-me').returns({'id' => 789})
 
@@ -39,11 +39,12 @@ describe EventMachine::Campfire::Connection do
     ping.expects(:ping).never
 
     @conn.on_message { ping.ping }
-    EM.run_block { @conn.receive_message({:user_id => 789}) }
+    EM.run_block { @conn.receive_message({:user_id => 789, :type=>"TextMessage"}) }
     logger_output.should =~ /Ignoring message with user_id 789 as that is me and ignore_self is true/
   end
 
   it "should not ignore non-self messages" do
+    mock_logger(ConnectionTester)
     stub_self_data_request
     @conn.ignore_self = true
 
@@ -52,4 +53,12 @@ describe EventMachine::Campfire::Connection do
     @conn.on_message { ping.ping }
     EM.run_block { @conn.receive_message({:user_id => 2}) }
   end
+
+  it "should be able to ignore timestamps" do
+    @conn.expects(:ignore_timestamps?).returns(true)
+    ping = mock
+    ping.expects(:ping).never
+    @conn.on_message {|message| ping.ping }
+    @conn.receive_message({:room_id=>410261, :created_at=>"2012/10/03 22:55:00 +0000", :body=>nil, :starred=>false, :id=>688112871, :user_id=>nil, :type=>"TimestampMessage"})
+  end
 end

data/spec/lib/em-campfire_spec.rb

@@ -3,7 +3,6 @@ require "spec_helper"
 describe EventMachine::Campfire do
   
   before :each do
-    # stub_room_list_data_request
     @self_data_request_stub = stub_self_data_request
   end
     
@@ -81,7 +80,20 @@ describe EventMachine::Campfire do
       @adaptor.cache.set("foo", "bar")
       @adaptor.cache.get("foo").should eql("bar")
     end
+  end
+
+  describe "#ignore_timestamps" do
+    before :each do
+      EM.run_block { @adaptor = a EM::Campfire }
+    end
 
+    it "should default to false" do
+      @adaptor.ignore_timestamps?.should eql(false)
+    end
+
+    it "should be overridable at initialization" do
+      EM.run_block { a(EM::Campfire, :ignore_timestamps => true).ignore_timestamps?.should be_true }
+    end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em-campfire
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-02 00:00:00.000000000 Z
+date: 2012-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -185,7 +185,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4475605419022692822
+      hash: 734765957230943654
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -194,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4475605419022692822
+      hash: 734765957230943654
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24