em-breakout 0.0.3 → 0.0.4

data/em-breakout.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'json', '>=1.4.6'
   s.add_dependency 'em-websocket', '>=0.2.1'
-  s.add_dependency 'breakout', '0.0.1'
+  s.add_dependency 'breakout', '>=0.0.2'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/features/notify.feature

@@ -17,3 +17,16 @@ Feature: notify
     Then worker 1's payload route should be "test"
     Then worker 1's payload bid should be "1"
     Then worker 1's payload message should be "/close"
+
+  Scenario: bid freed after notify
+    Given worker 1 opens a url for work
+    When browser 1 opens a url with bid "foo" and notify
+    And worker 1 receives a payload
+    And browser 1 disconnects
+    And browser 2 opens a url with bid "foo"
+    Then browser 2 should not be connected
+    When worker 1 sends done_work
+    And worker 1 receives a payload
+    And worker 1 sends done_work
+    When browser 2 opens a url with bid "foo"
+    Then browser 2 should be connected

data/features/security.feature

@@ -18,6 +18,13 @@ Feature: security
     And browser 2 should be disconnected
     And browser 1 should be connected
 
+  Scenario: bid freed after use
+    Given worker 1 opens a url
+    When browser 1 opens a url with bid "foo"
+    And browser 1 disconnects
+    And browser 2 opens a url with bid "foo"
+    Then browser 2 should be connected
+
   Scenario: expired link
     Given worker 1 opens a url
     When browser 1 opens an expired url

data/features/step_definitions/common_steps.rb

@@ -14,6 +14,10 @@ When /^browser (\d+) opens a url with notify$/ do |id|
   @browser_by_id[id] = Breakout::Socket.new(Breakout.browser_url("test", :bid => id, :notify => true))
 end
 
+When /^browser (\d+) opens a url with bid "([^"]*)" and notify$/ do |id, bid|
+  @browser_by_id[id] = Breakout::Socket.new(Breakout.browser_url("test", :bid => bid, :notify => true))
+end
+
 When /^worker (\d+) opens a url for work$/ do |id|
   @worker_by_id[id] = Breakout::Socket.new(Breakout.worker_url)
   @worker_by_id[id].send :done_work => true
@@ -103,10 +107,12 @@ end
 
 When /^browser (\d+) disconnects$/ do |id|
   @browser_by_id[id].close
+  sleep(0.01)
 end
 
 When /^worker (\d+) disconnects$/ do |id|
   @worker_by_id[id].close
+  sleep(0.01)
 end
 
 Then /^browser (\d+) should be disconnected$/ do |id|
@@ -153,3 +159,7 @@ end
 Given /^the server is restarted$/ do
   restart_server
 end
+
+When /^there is a pause$/ do
+  sleep(0.1)
+end

data/lib/em-breakout/browser.rb

@@ -28,7 +28,7 @@ module EventMachine
               throw :break
             end
 
-            if @grid.browsers.has_key?(@bid)
+            if @grid.browsers.has_key?(@bid) or @grid.disconnected_browsers.has_key?(@bid)
               close_websocket "bid in use"
               throw :break
             end
@@ -71,6 +71,7 @@ module EventMachine
           log("closing") if debug
 
           if @message_queue
+            @grid.browsers.delete @bid
 
             if @notify
               @grid.disconnected_browsers[@bid] = self

data/lib/em-breakout/version.rb

@@ -1,5 +1,5 @@
 module EventMachine
   module Breakout
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

metadata

@@ -1,61 +1,57 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: em-breakout
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.0.4
   prerelease: 
-  version: 0.0.3
 platform: ruby
-authors: 
+authors:
 - Steve Masterman
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-02 00:00:00 -04:00
+date: 2011-05-02 00:00:00.000000000 -04:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70737630 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.4.6
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: em-websocket
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70737630
+- !ruby/object:Gem::Dependency
+  name: em-websocket
+  requirement: &70737370 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.2.1
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: breakout
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70737370
+- !ruby/object:Gem::Dependency
+  name: breakout
+  requirement: &70737140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 0.0.1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.2
   type: :runtime
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *70737140
 description: Breakout routes messages among web browsers and workers using WebSockets.
-email: 
+email:
 - steve@vermonster.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - README.md
@@ -87,43 +83,26 @@ files:
 has_rdoc: true
 homepage: https://github.com/steve9001/em-breakout
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: em-breakout
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Breakout routes messages among web browsers and workers using WebSockets.
-test_files: 
-- features/api.feature
-- features/api_format.feature
-- features/connect.feature
-- features/notify.feature
-- features/performance.feature
-- features/ping.feature
-- features/security.feature
-- features/serialize.feature
-- features/step_definitions/common_steps.rb
-- features/step_definitions/performance_steps.rb
-- features/support/em_control
-- features/support/env.rb
-- features/support/server.rb
-- features/support/socket.rb
+test_files: []