wampus 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14ca9589d293012e05857f4bae923a158b794099
-  data.tar.gz: a4da144a3fbf35345d47b75d56ebcd9a9b715c66
+  metadata.gz: 64e79cb9e7b99c33ed789828ebe831a943f1613e
+  data.tar.gz: ebaae0ad6da9e25be70144855b23e3a5d352125c
 SHA512:
-  metadata.gz: bde24c014aa16619a31a9c591df246b4782884586009c02971dfe8dd4c9c6744f745825524e06e0c3175adcd480dccbc4f5ac1eac3225fedcb421758dac437bd
-  data.tar.gz: 7b049c53ba81457f85279a43991b6b8044a961363aacf662aae9203d5f93ee2d5dc5069ea98898ecb6ecc12644ee2a8e6c2937acbfcb1e99a771739704358667
+  metadata.gz: 071a2bd09533edf1719c350245781206639fa919319e6306fa3d69eccebd5b7252e128805b2fff0c7d9f7fe6bb359a78c8afca03b78dcecc91c5e29a0e331c62
+  data.tar.gz: 1b84d5f9be5b1606dbc863efc2b0c1babfc47326e650edccc8f7c0b877826c873066a26bd5cc25d75126f15afdcfe4aa944d3398e0d2b812375e2ec9718c1af0

data/lib/wampus/after_init.rb

@@ -1,3 +1,6 @@
+require 'active_support/concern'
+require 'active_support/core_ext/class/attribute'
+
 module Wampus
   module AfterInit
     extend ActiveSupport::Concern

data/lib/wampus/backends/redis.rb

@@ -1,3 +1,6 @@
+require 'active_support/concern'
+require 'active_support/core_ext/class/attribute'
+
 module Wampus
   module Backends
     module Redis
@@ -84,7 +87,7 @@ module Wampus
 
             topic.subscribers(connection, excluded, included) do |subscribers|
               subscribers.each do |connection|
-                connection.websocket.send event_msg(topic.uri, payload)
+                connection.write event_msg(topic.uri, payload)
               end
             end
           rescue => error

data/lib/wampus/connection.rb

@@ -12,10 +12,14 @@ module Wampus
       @topics = []
 
       @authenticated = false
-      @pending_auth = nil,
+      @pending_auth = nil
       @auth_timeout_call = nil
     end
 
+    def write(msg)
+      @websocket.send msg
+    end
+
     def subscribe_to_topic(topic)
       @topics << topic
     end

data/lib/wampus/protocols/wamp_cra.rb

@@ -7,7 +7,7 @@ module Wampus
 
       include Wamp
 
-      URI_PROCEDURE = URI_BASE + 'procedure#'
+      URI_PROCEDURE = Wampus::Protocols::Wamp::URI_BASE + 'procedure#'
 
       def derive_key(secret, extra = nil)
         if extra.is_a?(Hash) && extra.has_key?(:salt)

data/lib/wampus/pubsub/handler.rb

@@ -1,3 +1,6 @@
+require 'active_support/concern'
+require 'active_support/core_ext/class/attribute'
+
 module Wampus
   module Pubsub
     module Handler

data/lib/wampus/pubsub/server_ext.rb

@@ -1,3 +1,5 @@
+require 'active_support/concern'
+
 module Wampus
   module Pubsub
     module ServerExt
@@ -82,7 +84,7 @@ module Wampus
         else
           begin
             if handler[2]
-              result = handler[2].send handler[3], [connection, topic_uri]
+              result = handler[2].send handler[3], connection, topic_uri
             elsif handler[3].is_a? Proc
               result = handler[3].call connection, topic_uri
             end
@@ -122,12 +124,13 @@ module Wampus
           begin
             begin
               if handler[2]
-                result = handler[2].send handler[3], [connection, topic_uri]
+                result = handler[2].send handler[3], [connection, topic_uri, event]
               elsif handler[3].is_a? Proc
-                result = handler[1].call connection, topic_uri
+                result = handler[3].call connection, topic_uri, event
               end
               dispatch_event topic.uri, event, exclude, include
             rescue => error
+              puts error.message
               # Nothing
             end
           end
@@ -137,7 +140,7 @@ module Wampus
       def dispatch_event(topic_uri, event, exclude, include)
         topic = topics[topic_uri]
         topic.subscribers(exclude, include).each do |subscriber|
-          subscriber.websocket.send event_msg(topic_uri, event)
+          subscriber.write event_msg(topic_uri, event)
         end
       end
 

data/lib/wampus/rpc/handler.rb

@@ -1,3 +1,6 @@
+require 'active_support/concern'
+require 'active_support/core_ext/class/attribute'
+
 module Wampus
   module Rpc
     module Handler

data/lib/wampus/rpc/server_ext.rb

@@ -1,3 +1,5 @@
+require 'active_support/concern'
+
 module Wampus
   module Rpc
     module ServerExt
@@ -19,7 +21,7 @@ module Wampus
         def register_rpc_handler(handler, base_uri)
           after_init do
             handler.rpc_handlers.each do |procedure, handler_method|
-              uri = URI_RPC_BASE + procedure
+              uri = Wampus::Protocols::Wamp::URI_RPC + procedure
               register_rpc_method uri, handler, handler_method
             end
           end
@@ -49,19 +51,19 @@ module Wampus
           rpc_call_exists = rpcs.has_key?(uri)
           uri, args = on_before_call connection, call_id, uri, args, rpc_call_exists
           unless rpc_call_exists
-            raise Wampus::Errors::CallError.new(URI_ERROR+'NoSuchRPCEndpoint', 'Missing Method')
+            raise Wampus::Errors::CallError.new(Wampus::Protocols::Wamp::URI_ERROR+'NoSuchRPCEndpoint', 'Missing Method')
           end
           if handler[0]
-            result = handler[0].send handler[1], [connection, *args]
+            result = handler[0].send handler[1], connection, call_id, *args
           elsif handler[1].is_a? Proc
-            result = handler[1].call connection, *args
+            result = handler[1].call connection, call_id, *args
           end
           result = on_after_call_success connection, result
-          connection.send call_result_msg call_id, 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.send msg
+          connection.write msg
           on_after_send_call_error connection, msg
         end
       end
@@ -78,7 +80,7 @@ module Wampus
 
       def on_after_call_error(connection, error)
         unless error.is_a? Wampus::Errors::CallError
-          error = Wampus::Errors::CallError.new(URI_ERROR+'generic', 'RPC Call Error')
+          error = Wampus::Errors::CallError.new(Wampus::Protocols::Wamp::URI_ERROR+'generic', 'RPC Call Error')
         end
         error
       end

data/lib/wampus/servers/wamp.rb

@@ -29,7 +29,7 @@ module Wampus
 
       def on_connection_open(websocket, handshake)
         connection = new_connection(websocket)
-        connection.websocket.send welcome_msg connection.id
+        connection.write welcome_msg connection.id
         on_session_open connection
       end
 

data/lib/wampus/servers/wamp_cra.rb

@@ -9,8 +9,8 @@ module Wampus
       self.client_auth_allow_anonymous = true
 
       after_init do
-        register_rpc_method URI_RPC+'authRequest', self, :auth_request
-        register_rpc_method URI_RPC+'auth', self, :auth
+        register_rpc_method Wampus::Protocols::WampCra::URI_PROCEDURE+'authRequest', self, :auth_request
+        register_rpc_method Wampus::Protocols::WampCra::URI_PROCEDURE+'auth', self, :auth
       end
 
       def get_auth_permissions(connection, auth_key, auth_extra)
@@ -39,39 +39,39 @@ module Wampus
 
       def auth_request(connection, auth_key = nil, extra = {})
         if connection.authenticated
-          raise Wampus::Errors::CallError.new(URI_ERROR+'already-authenticated', 'Already Authenticated')
+          raise Wampus::Errors::CallError.new(Wampus::Protocols::Wamp::URI_ERROR+'already-authenticated', 'Already Authenticated')
         end
 
         unless connection.pending_auth.nil?
-          raise Wampus::Errors::CallError.new(URI_ERROR+'authentication-already-requested', 'Authentication Already Requested')
+          raise Wampus::Errors::CallError.new(Wampus::Protocols::Wamp::URI_ERROR+'authentication-already-requested', 'Authentication Already Requested')
         end
 
         unless extra.is_a? Hash
-          raise Wampus::Errors::CallError.new(URI_ERROR+'invalid-argument', 'Extra is not a Dictionary/Hash')
+          raise Wampus::Errors::CallError.new(Wampus::Protocols::Wamp::URI_ERROR+'invalid-argument', 'Extra is not a Dictionary/Hash')
         end
 
         if auth_key.nil? && !client_auth_allow_anonymous
-          raise Wampus::Errors::CallError.new(URI_ERROR+'anonymous-auth-forbidden', 'Anonymous Auth Forbidden')
+          raise Wampus::Errors::CallError.new(Wampus::Protocols::Wamp::URI_ERROR+'anonymous-auth-forbidden', 'Anonymous Auth Forbidden')
         end
 
         auth_secret = get_auth_secret connection, auth_key
-        on_get_auth_secrek_ok connection, auth_secret, auth_key, extra
+        on_get_auth_secret_ok connection, auth_secret, auth_key, extra
       end
 
       def auth(connection, signature = nil)
         if connection.authenticated
-          raise Wampus::Errors::CallError.new(URI_ERROR+'already-authenticated', 'Already Authenticated')
+          raise Wampus::Errors::CallError.new(Wampus::Protocols::Wamp::URI_ERROR+'already-authenticated', 'Already Authenticated')
         end
 
         if connection.pending_auth.nil?
-          raise Wampus::Errors::CallError.new(URI_ERROR+'no-authentication-requested', 'No Authentication Requested')
+          raise Wampus::Errors::CallError.new(Wampus::Protocols::Wamp::URI_ERROR+'no-authentication-requested', 'No Authentication Requested')
         end
 
         if connection.pending_auth[1] != signature
           connection.pending_auth = nil
 
           return EventMachine.add_timer expo(1.25) {
-            raise Wampus::Errors::CallError.new URI_ERROR+'invalid-signature', 'Signature for authentication request is invalid'
+            raise Wampus::Errors::CallError.new Wampus::Protocols::Wamp::URI_ERROR+'invalid-signature', 'Signature for authentication request is invalid'
           }
         end
 
@@ -115,7 +115,7 @@ module Wampus
           return nil
         end
       rescue => error
-        raise CallError.new(URI_ERROR+'auth-permissions-error', error.message)
+        raise Wampus::Errors::CallError.new(Wampus::Protocols::Wamp::URI_ERROR+'auth-permissions-error', error.message)
       end
 
       def expo(l)

data/lib/wampus/version.rb

@@ -1,3 +1,3 @@
 module Wampus
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wampus
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Michael Stack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-09 00:00:00.000000000 Z
+date: 2013-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler