nodevent 3.0.3 → 3.0.4

data/lib/nodevent/version.rb

@@ -1,3 +1,3 @@
 module Nodevent
-  VERSION = "3.0.3"
+  VERSION = "3.0.4"
 end

data/lib/nodevent.rb

@@ -3,19 +3,46 @@ require 'json'
 
 module NoDevent
   def self.included(base)
-    base.extend(NoDevent::Emitter)
+    raise "No longer supported, Please include NoDevent::Base instead"
   end
+  module Base
+    def self.included(base)
+      base.extend(NoDevent::Base)
+    end
+    
+    class << self
+      def emit(name, message)
+        NoDevent::Emitter.emit(self.room, name, message)
+      end
+      def room(obj)
+        NoDevent::Emitter.room(self)
+      end
+      def room_key(expires)
+        Emitter.room_key(self.room, expires)
+      end
+    end
 
-  def emit(name, message=nil)
-    Emitter.emit(self, name, message || self)
-  end
+    def emit(name, message=nil)
+      Emitter.emit(self.room, name, message || self)
+    end
+    
+    def room
+      Emitter.room(self)
+    end
+    
+    def room_key(expires)
+      Emitter.room_key(self.room, expires)
+    end
 
-  def room
-    Emitter.room(self)
-  end
 
-  def room_key(expires)
-    Emitter.room_key(self, expires)
+    def nodevent_create
+      NoDevent::Emitter.emit(self.class.name, 'create', self)
+    end
+    
+    def nodevent_update
+      self.emit('update')
+    end
+  
   end
     
 
@@ -39,7 +66,7 @@ module NoDevent
 
       def config
         @@config ||= Hash.new({
-                                :host => "http://localhost:8080",
+                                :host => "http://loadsfcalhost:8080",
                                 :namespace => "/nodevent"
                               })
         @@config
@@ -48,6 +75,7 @@ module NoDevent
       def emit(room, name, message)
         room = NoDevent::Emitter.room(room)
 
+        puts "NoDevent::emit: #{room}, #{name}, #{message}"
         $redis.publish("events", 
                        { :room => room,
                          :event => name, 

data/spec/base_spec.rb

@@ -0,0 +1,165 @@
+require 'spec_helper'
+
+module ActiveRecord
+  class Base;end
+end
+
+class ModelMock < ActiveRecord::Base
+  include NoDevent::Base
+
+  attr_accessor :to_param
+
+  def initialize(param)
+    @to_param = param
+  end
+  def to_json(options)
+    '{"id":"#{to_param}"}'
+  end
+end
+
+NoDevent::Emitter.config = {
+  :host => "http://thehost",
+  :namespace => "thenamespace", 
+  :secret => "asdf"
+}
+
+describe NoDevent do
+  describe "the class" do
+    
+    it { ModelMock.room.should == "ModelMock" }
+    
+    it "should emit to the right room" do
+      $redis.should_receive(:publish).with("events", 
+                                           {
+                                             :room => "ModelMock", 
+                                             :event => 'theevent', 
+                                             :message => 'themessage'}.to_json)
+      
+      ModelMock.emit('theevent', 'themessage')
+    end
+    
+    it "should create a key from the right room" do
+      t = Time.now
+      ts = (t.to_f*1000).to_i
+      ModelMock.room_key(t).should == 
+        (Digest::SHA2.new << "ModelMock" << ts.to_s << NoDevent::Emitter.config[:secret]).to_s
+    end
+    
+    describe "with a custom room name" do
+      before  do
+        ModelMock.stub(:room => "otherRoom")
+      end
+      
+      it { ModelMock.room.should == "otherRoom" }
+      
+      it "should emit to the right room" do
+        $redis.should_receive(:publish).with("events", 
+                                             {
+                                               :room => "otherRoom", 
+                                               :event => 'theevent', 
+                                               :message => 'themessage'}.to_json)
+        
+        ModelMock.emit('theevent', 'themessage')
+      end
+      
+      it "should create a key from the right room" do
+        t = Time.now
+        ts = (t.to_f*1000).to_i
+        ModelMock.room_key(t).should == 
+          (Digest::SHA2.new << ModelMock.room << ts.to_s << NoDevent::Emitter.config[:secret]).to_s
+      end
+    end  
+  end
+  
+  describe "an instance of the class" do
+    let(:instance) {ModelMock.new( 'theparam') }
+
+    it { instance.room.should == "ModelMock_theparam" }
+    it "should emit to the right room" do
+      $redis.should_receive(:publish).with("events", 
+                                           {
+                                             :room => "ModelMock_theparam", 
+                                             :event => 'theevent', 
+                                             :message => 'themessage'}.to_json)
+      
+      instance.emit('theevent', 'themessage')
+    end
+    
+    describe "#nodevent_create" do
+      it "should emit to the right room" do
+      $redis.should_receive(:publish).with("events", 
+                                           {
+                                             :room => "ModelMock", 
+                                             :event => 'create', 
+                                             :message => instance}.to_json)
+        instance.nodevent_create
+        
+      end
+    end
+    describe "#nodevent_update" do
+      it "should emit to the right room" do
+      $redis.should_receive(:publish).with("events", 
+                                           {
+                                             :room => "ModelMock_theparam", 
+                                             :event => 'update', 
+                                             :message => instance}.to_json)
+        instance.nodevent_update
+        
+      end
+    end
+
+    it "should create a key from the right room" do
+      t = Time.now
+      ts = (t.to_f*1000).to_i
+      instance.room_key(t).should == 
+        (Digest::SHA2.new << instance.room << ts.to_s << NoDevent::Emitter.config[:secret]).to_s
+    end
+    
+    describe "with a custom room name" do
+      before  do
+        instance.stub(:room => "otherRoom")
+      end
+      
+      it { instance.room.should == "otherRoom" }
+      
+      it "should emit to the right room" do
+        $redis.should_receive(:publish).with("events", 
+                                             {
+                                               :room => "otherRoom", 
+                                               :event => 'theevent', 
+                                               :message => 'themessage'}.to_json)
+        
+        instance.emit('theevent', 'themessage')
+      end
+      
+      it "should create a key from the right room" do
+        t = Time.now
+        ts = (t.to_f*1000).to_i
+        instance.room_key(t).should == 
+          (Digest::SHA2.new << "otherRoom" << ts.to_s << NoDevent::Emitter.config[:secret]).to_s
+      end
+      describe "#nodevent_create" do
+        it "should emit to the right room" do
+          $redis.should_receive(:publish).with("events", 
+                                               {
+                                                 :room => instance.class.room, 
+                                                 :event => 'create', 
+                                                 :message => instance}.to_json)
+          instance.nodevent_create
+          
+        end
+      end
+      describe "#nodevent_update" do
+        it "should emit to the right room" do
+          $redis.should_receive(:publish).with("events", 
+                                               {
+                                                 :room => instance.room,
+                                                 :event => 'update', 
+                                                 :message => instance}.to_json)
+          instance.nodevent_update
+          
+        end
+      end  
+    end
+  end
+ end

data/spec/spec_helper.rb

@@ -24,4 +24,10 @@ RSpec.configure do |config|
   # the seed, which is printed after each run.
   #     --seed 1234
   config.order = 'random'
+
+  config.before(:suite) do
+    $redis = Object.new
+  end
 end
+
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nodevent
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-23 00:00:00.000000000 Z
+date: 2012-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -44,7 +44,8 @@ files:
 - lib/nodevent.rb
 - lib/nodevent/version.rb
 - nodevent.gemspec
-- spec/nodevent_spec.rb
+- spec/base_spec.rb
+- spec/emitter_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/cconstantine/NoDevent
 licenses: []
@@ -71,5 +72,6 @@ signing_key:
 specification_version: 3
 summary: Write a gem summary
 test_files:
-- spec/nodevent_spec.rb
+- spec/base_spec.rb
+- spec/emitter_spec.rb
 - spec/spec_helper.rb