socket.io-emitter 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0a74de36280d4fb1bb38c3203943bcbe3478df7
-  data.tar.gz: ccc8ceb16873c29cd4d5bc7fc8f56dc018d7e5ab
+  metadata.gz: 8949263ea52c8b7bc3bbb22059f3447d63502216
+  data.tar.gz: d09ede88e369533f728a0a11a29673b09ab633a8
 SHA512:
-  metadata.gz: eac67277a871d4168ca01324e77028ef0fee3bc4366cdc7d5e5004210222659f93dd0185f828eca8b84bae8c462a3dc56809470557adba54f2d555f7815e322d
-  data.tar.gz: b68ad524adfe3e3fe288f016a614b88168df4c0a5f9bbc5ada3539bd5ac6f0da9ff4004c3a2a07711eefc25d0916e2e74a2807e210ddff9288d4a8a93fd64473
+  metadata.gz: 6d641176398d21feee7ebb1f2fc30b9540ac8f01b4ca99fe903258ef0b226076261039a22cba72d2efb8b94e9107c8e28f95102961e30b9c7ce0ab97fd9f1b4f
+  data.tar.gz: ca6e0117dd69149324301a0db86a87f4b51f3c167b75bc7d7604a9ba4656e5cd92b2784cca41c59ea3e83bf3b47e08bc3b8c45ffa0ce8e1f29ef9d49d50a88d8

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
 rvm:
+  - 2.2
   - 2.1
   - 2.0

data/Readme.md

@@ -1,6 +1,8 @@
 
 # SocketIO::Emitter
 
+[![Build Status](https://travis-ci.org/nulltask/socket.io-ruby-emitter.svg)](https://travis-ci.org/nulltask/socket.io-ruby-emitter)
+
 A Ruby implementation of [socket.io-emitter](https://github.com/Automattic/socket.io-emitter).
 
 ## How to use

data/lib/socket.io/emitter.rb

@@ -14,46 +14,50 @@ module SocketIO
     def initialize(options = {})
       @redis = options[:redis] || Redis.new
       @key = "#{options[:key] || 'socket.io'}#emitter";
+      @nsp = nil
       @rooms = []
       @flags = {}
     end
 
     FLAGS.each do |flag|
-      define_method(flag) do
-        @flags[flag.to_sym] = true
-        self
-      end
+      define_method(flag) { clone.enable_flag(flag) }
     end
 
     def in(room)
-      @rooms << room unless @rooms.include?(room)
-      self
+      clone.add_room(room)
     end
     alias :to :in
 
     def of(nsp)
-      @flags[:nsp] = nsp
-      self
+      clone.select_namespace(nsp)
     end
 
     def emit(*args)
       packet = {}
       packet[:type] = has_binary?(args) ? Type::BINARY_EVENT : Type::EVENT
       packet[:data] = args
-
-      if @flags.has_key?(:nsp)
-        packet[:nsp] = @flags[:nsp]
-        @flags.delete(:nsp)
-      else
-        packet[:nsp] = '/'
-      end
+      packet[:nsp] = @nsp || '/'
 
       packed = MessagePack.pack([packet, { rooms: @rooms, flags: @flags }])
       @redis.publish(@key, packed)
 
-      @rooms.clear
-      @flags.clear
+      self
+    end
+
+    protected
+
+    def add_room(room)
+      @rooms += [room] unless @rooms.include?(room)
+      self
+    end
+
+    def select_namespace(nsp)
+      @nsp = nsp
+      self
+    end
 
+    def enable_flag(flag)
+      @flags = @flags.merge(flag.to_sym => true)
       self
     end
 

data/lib/socket.io/emitter/version.rb

@@ -1,5 +1,5 @@
 module SocketIO
   class Emitter
-    VERSION = '0.1.0'
+    VERSION = '0.2.0'
   end
 end

data/spec/socket.io/emitter_spec.rb

@@ -5,33 +5,65 @@ describe SocketIO::Emitter do
   include Timeout
 
   let(:emitter) { SocketIO::Emitter.new(redis: Redis.new(host: "localhost", port: 6380)) }
-  it 'should be able to emit messages to client' do
-    emitter.emit('broadcast event', 'broadcast payload')
 
-    timeout(1) do
-      expect($child_io.gets.chomp).to eq 'broadcast payload'
+  describe "integration tests" do
+    it 'should be able to emit messages to client' do
+      emitter.emit('broadcast event', 'broadcast payload')
+
+      timeout(1) do
+        expect($child_io.gets.chomp).to eq 'broadcast payload'
+      end
+    end
+
+    it 'should be able to emit messages to namespace' do
+      emitter.of('/nsp').broadcast.emit('broadcast event', 'nsp broadcast payload')
+
+      timeout(1) do
+        expect($child_io.gets.chomp).to eq 'nsp broadcast payload'
+      end
     end
-  end
 
-  it 'should be able to emit messages to namespace' do
-    emitter.of('/nsp').broadcast.emit('broadcast event', 'nsp broadcast payload')
+    it 'should not emit message to all namespace' do
+      emitter.of('/nsp').broadcast.emit('nsp broadcast event', 'nsp broadcast payload')
 
-    timeout(1) do
-      expect($child_io.gets.chomp).to eq 'nsp broadcast payload'
+      timeout(1) do
+        expect($child_io.gets.chomp).to eq 'GOOD'
+      end
+
+      expect {
+        timeout(2) do
+          $child_io.gets
+        end
+      }.to raise_error(TimeoutError)
     end
   end
 
-  it 'should not emit message to all namespace' do
-    emitter.of('/nsp').broadcast.emit('nsp broadcast event', 'nsp broadcast payload')
+  describe "configuration" do
+    it 'builds a new object each time a new room is added' do
+      single = emitter.in("first")
+      double = single.in("second")
 
-    timeout(1) do
-      expect($child_io.gets.chomp).to eq 'GOOD'
+      expect(emitter.instance_variable_get(:@rooms)).to eq []
+      expect(single.instance_variable_get(:@rooms)).to eq ['first']
+      expect(double.instance_variable_get(:@rooms)).to eq ['first', 'second']
     end
 
-    expect {
-      timeout(2) do
-        $child_io.gets
+    it 'builds a new object each time the namespace is changed' do
+      first = emitter.of("first")
+      second = first.of("second")
+
+      expect(emitter.instance_variable_get(:@nsp)).to be nil
+      expect(first.instance_variable_get(:@nsp)).to eq "first"
+      expect(second.instance_variable_get(:@nsp)).to eq "second"
+    end
+
+    %i(json volatile broadcast).each do |flag|
+      it "builds a new object each time the #{flag} flag is changed" do
+        flagged = emitter.send(flag)
+
+        expect(emitter.instance_variable_get(:@flags)[flag]).to be nil
+        expect(flagged.instance_variable_get(:@flags)[flag]).to be true
       end
-    }.to raise_error(TimeoutError)
+    end
   end
 end

data/spec/testapp.js

@@ -4,6 +4,7 @@ var redis = require('socket.io-redis');
 
 var srv = io(8125);
 srv.adapter(redis({ host: 'localhost', port: 6380 }));
+var nsp = srv.of('/nsp');
 
 var cli = ioc('ws://localhost:8125', {forceNew: true});
 

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: socket.io-emitter
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - nulltask
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-22 00:00:00.000000000 Z
+date: 2015-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -87,9 +87,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - Gemfile
 - Rakefile
 - Readme.md
@@ -112,17 +112,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Ruby Socket.IO emitter implementation.