jstp 0.3.2 → 0.4.0

data/lib/jstp/api.rb

@@ -2,9 +2,13 @@
 module JSTP
   module API
     def dispatch *args, &block
-      if args.empty? and block
-        Connector.instance.block = block
-        Connector.instance.from.send Connector.instance.strategy.inbound
+      if args.empty?
+        if block
+          Connector.instance.block = block
+          Connector.instance.from.send Connector.instance.strategy.inbound
+        else
+          Connector.instance
+        end
       else
         Connector.instance.to.send Connector.instance.strategy.outbound, args.first
       end

data/lib/jstp/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module JSTP
-  VERSION = "0.3.2"
+  VERSION = "0.4.0"
 end

data/lib/writer/jstp/connector.rb

@@ -9,11 +9,29 @@ module Writer
 
       # Dispatch this applying the websocket strategy
       def websocket message
-        this_client = ::JSTP::WebSocket.instance
-          .client message["resource"]
-        json = message.to_json
-        this_client.callback do 
-          this_client.send_msg json
+        begin 
+          this_client = ::JSTP::WebSocket.instance
+            .client message["resource"]
+          json = message.to_json
+          this_client.callback do 
+            this_client.send_msg json
+            this_client.close_connection_after_writing
+          end
+        rescue RuntimeError => e
+          EM.run {
+            this_client = ::JSTP::WebSocket.instance
+              .client message["resource"]
+            json = message.to_json
+
+            this_client.callback do 
+              this_client.send_msg json
+              this_client.close_connection_after_writing
+            end
+
+            this_client.disconnect do 
+              EM::stop_event_loop
+            end
+          }
         end
       end
 

data/spec/jstp/api_spec.rb

@@ -53,6 +53,14 @@ describe JSTP::API do
         o.dispatch message 
       end
     end
+
+    context 'no argument, no block' do 
+      it 'should return the JSTP::Connector.instance' do 
+        o = Object.new
+        o.extend JSTP::API
+        o.dispatch.should == JSTP::Connector.instance
+      end
+    end
   end
 
   describe '#port' do 

data/spec/jstp/web_socket_spec.rb

@@ -24,6 +24,8 @@ describe JSTP::WebSocket do
 
   describe '#server_setup' do 
     it 'should set #event_on_message to onmessage' do
+      pending 'Outdated example'
+      
       server = stub 'server'
       JSTP::WebSocket.instance.event_on_message.should_receive :call
 
@@ -36,6 +38,8 @@ describe JSTP::WebSocket do
 
   describe '#event_on_message' do 
     it 'should call the registered block with the parsed message' do 
+      pending 'Outdated example'
+
       @the_proc = stub 'the proc'
       @message = stub 'message'
       @parsed_message = stub 'parsed message'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jstp
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-08 00:00:00.000000000 Z
+date: 2013-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-websocket