wampus 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1344ac9b431935be7e6eb17811b05b32553b216f
-  data.tar.gz: 4f0633e43c52ca041dadd7f77f54a8b99233b506
+  metadata.gz: 1fab89846514435d31da67a8901ff932dfb5f00f
+  data.tar.gz: 7860fa6dafa8ac71cef8d93c006c8218d18507fd
 SHA512:
-  metadata.gz: 2049c1ac5788a583a73b0441cb87c0b4986dc2824bc42b767e3bd0cfe65e5872c92cfcab6b5293635adfec7f4e71407519344dea0bb2365225052afd96020b38
-  data.tar.gz: 33e317dd4d990ef424176be6207cf89f83fce62574c810e14433139f3b0b2f0eabf566ede047e5c6d4ef55ceb7039282ca67a0389014ed6ce8eaa441c8af6c78
+  metadata.gz: baf0b7adcfb7a01b95121e07f0983de9871087fb20e6774536cd2d2cbe02dc6bc532faabadd8f75ee0eb45dc07fc41ff8b5f85d4be147d70c54babbe503035db
+  data.tar.gz: 8d69e07b83649147a4f5faa415c349a2839b1e1b0fc70f0c57d55b3eff470802cabc05ee6a161a03d3c05f863a163b3706a5b9432d91b5d6df154101ac01b6df

data/lib/wampus/pubsub/server_ext.rb

@@ -168,14 +168,14 @@ module Wampus
 
       def get_subscribe_handler(topic_uri)
         topic = topic_for_uri topic_uri
-        nil unless topic
+        return nil unless topic
         handler = topic.subscribe_handler
         [topic.uri, topic_uri[topic.uri.length..-1], *handler]
       end
 
       def get_publish_handler(topic_uri)
         topic = topic_for_uri topic_uri
-        nil unless topic
+        return nil unless topic
         handler = topic.publish_handler
         [topic.uri, topic_uri[topic.uri.length..-1], *handler]
       end

data/lib/wampus/rpc/server_ext.rb

@@ -40,7 +40,6 @@ module Wampus
         end
       end
 
-      # TODO FIXME Use EM Deferred
       def handle_call_msg(connection, data)
         call_id, proc_uri, *args = data
 
@@ -53,19 +52,20 @@ module Wampus
           raise Wampus::Errors::CallError.new(Wampus::Protocols::Wamp::URI_ERROR+'NoSuchRPCEndpoint', 'Missing Method')
         end
 
-        EM.defer lambda {
-          run_rpc_deferred connection, handler, args
-        }, lambda { |result|
-          if result.is_a? StandardError
-            error = on_after_call_error connection, result
-            msg = call_error_msg call_id, *error.to_call_error
-            connection.write msg
-            on_after_send_call_error connection, msg
-          else
-            result = on_after_call_success connection, result
-            connection.write call_result_msg call_id, result
+        begin
+          if handler[0]
+            result = handler[0].send handler[1], connection, *args
+          elsif handler[1].is_a? Proc
+            result = handler[1].call connection, *args
           end
-        }
+          result = on_after_call_success connection, result
+          connection.write call_result_msg call_id, result
+        rescue => error
+          error = on_after_call_error connection, error
+          msg = call_error_msg call_id, *error.to_call_error
+          connection.write msg
+          on_after_send_call_error connection, msg
+        end
       end
 
       # -- RPC Hooks
@@ -80,7 +80,7 @@ module Wampus
 
       def on_after_call_error(connection, error)
         unless error.is_a? Wampus::Errors::CallError
-          error = Wampus::Errors::CallError.new(Wampus::Protocols::Wamp::URI_ERROR+'generic', 'RPC Call Error')
+          error = Wampus::Errors::CallError.new(Wampus::Protocols::Wamp::URI_ERROR+'generic', "RPC Call Error: #{error.message}")
         end
         error
       end

data/lib/wampus/servers/wamp.rb

@@ -13,6 +13,7 @@ module Wampus
       end
 
       def run(options = {})
+        # Maybe we'll get subprotocol support in EM::Websocket one day
         options[:protocol] ||= ['wamp']
         options['sec-websocket-protocol'] = 'wamp'
         EM::WebSocket.run(options) do |ws|

data/lib/wampus/version.rb

@@ -1,3 +1,3 @@
 module Wampus
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wampus
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Michael Stack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-15 00:00:00.000000000 Z
+date: 2013-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -129,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: ''