nodevent 3.0.1 → 3.0.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (3) hide show
  1. data/lib/nodevent/version.rb +1 -1
  2. data/lib/nodevent.rb +14 -5
  3. metadata +1 -1
@@ -1,3 +1,3 @@
1
1
  module Nodevent
2
- VERSION = "3.0.1"
2
+ VERSION = "3.0.2"
3
3
  end
data/lib/nodevent.rb CHANGED
@@ -6,20 +6,26 @@ module NoDevent
6
6
  base.extend(NoDevent::Emitter)
7
7
  end
8
8
 
9
- def emit(name, messsage)
10
- Emitter.emit(self.room, name, message)
9
+ def emit(name, messsage=nil)
10
+ Emitter.emit(self, name, message || self)
11
11
  end
12
12
 
13
13
  def room
14
14
  Emitter.room(self)
15
15
  end
16
16
 
17
+ def room_key(expires)
18
+ Emitter.room_key(self, expires)
19
+ end
20
+
21
+
17
22
  module Helper
18
23
  def javascript_include_nodevent
19
24
  host = NoDevent::Emitter.config['host']
20
25
  namespace = NoDevent::Emitter.config['namespace']
26
+ namespace = '/' + namespace unless namespace[0] == '/'
21
27
 
22
- "<script src='#{host}/api/#{namespace}' type='text/javascript'></script>".html_safe
28
+ "<script src='#{host}/api#{namespace}' type='text/javascript'></script>".html_safe
23
29
  end
24
30
  end
25
31
  ActionView::Base.send :include, Helper if defined?(ActionView::Base)
@@ -34,14 +40,16 @@ module NoDevent
34
40
  def config
35
41
  @@config ||= Hash.new({
36
42
  :host => "http://localhost:8080",
37
- :namespace => "nodevent"
43
+ :namespace => "/nodevent"
38
44
  })
39
45
  @@config
40
46
  end
41
47
 
42
48
  def emit(room, name, message)
49
+ room = NoDevent::Emitter.room(room)
50
+
43
51
  $redis.publish("events",
44
- { :room => NoDevent::Emitter.room(room),
52
+ { :room => room,
45
53
  :event => name,
46
54
  :message => message}.to_json)
47
55
  end
@@ -49,6 +57,7 @@ module NoDevent
49
57
  def room(obj)
50
58
  obj = "#{obj.class}_#{obj.to_param}" if (defined?(ActiveRecord::Base) &&
51
59
  obj.is_a?(ActiveRecord::Base))
60
+ obj = "#{obj.name}" if (obj.class == Class || obj.class == Module)
52
61
  obj
53
62
  end
54
63
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: nodevent
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.0.1
4
+ version: 3.0.2
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors: