riddl 0.99.133 → 0.99.134

data/lib/ruby/riddl/protocols/websocket.rb

@@ -38,16 +38,6 @@ module Thin #{{{
   end
 end   #}}}
 
-class WebSocketParserData
-  attr_accessor :headers, :request_path, :query_string, :http_method, :body, :request_url
-  def match(what)
-    @body =~ what 
-  end
-  def upgrade?
-    true
-  end
-end
-
 module EventMachine
   module WebSocket
     class Handshake
@@ -61,44 +51,56 @@ module EventMachine
 end  
 
 module Riddl
-  class WebSocket < ::EventMachine::WebSocket::Connection
-    class Error < RuntimeError; end
+  module Protocols
+    class WebSocket < ::EventMachine::WebSocket::Connection
+      class Error < RuntimeError; end
 
-    def self.new(*args)
-      instance = allocate
-      instance.__send__(:initialize, *args)
-      instance
-    end
+      class ParserData
+        attr_accessor :headers, :request_path, :query_string, :http_method, :body, :request_url
+        def match(what)
+          @body =~ what 
+        end
+        def upgrade?
+          true
+        end
+      end
 
-    def send_data(*args)
-      EM.next_tick do
-        @socket.send_data(*args)
-      end  
-    end
+      def self.new(*args)
+        instance = allocate
+        instance.__send__(:initialize, *args)
+        instance
+      end
 
-    def close_connection(*args)
-      EM.next_tick do
-        trigger_on_close
-        @socket.close_connection(*args)
-      end  
-    end
+      def send_data(*args)
+        EM.next_tick do
+          @socket.send_data(*args)
+        end  
+      end
 
-    def trigger_on_message(msg);    @app.onmessage(msg);                        end
-    def trigger_on_open(handshake); @closed = false; @app.onopen;               end
-    def trigger_on_close;           @closed = true;  @app.onclose;              end
-    def trigger_on_error(error);    @closed = true;  @app.onerror(error); true; end
+      def close_connection(*args)
+        EM.next_tick do
+          trigger_on_close
+          @socket.close_connection(*args)
+        end  
+      end
 
-    def initialize(app, socket)
-      @app = app
-      @socket = socket
-      @ssl = socket.backend.respond_to?(:ssl?) && socket.backend.ssl?
-      @closed = true
-      socket.websocket = self
-      socket.comm_inactivity_timeout = 0
-    end
+      def trigger_on_message(msg);    @app.onmessage(msg);                        end
+      def trigger_on_open(handshake); @closed = false; @app.onopen;               end
+      def trigger_on_close;           @closed = true;  @app.onclose;              end
+      def trigger_on_error(error);    @closed = true;  @app.onerror(error); true; end
 
-    def closed?
-      @closed
+      def initialize(app, socket)
+        @app = app
+        @socket = socket
+        @ssl = socket.backend.respond_to?(:ssl?) && socket.backend.ssl?
+        @closed = true
+        socket.websocket = self
+        socket.comm_inactivity_timeout = 0
+      end
+
+      def closed?
+        @closed
+      end
     end
   end
 end

data/lib/ruby/riddl/server.rb

@@ -488,7 +488,7 @@ module Riddl
     def run(what,*args)# {{{
       return if @riddl_path == ''
       if what.class == Class && what.superclass == Riddl::WebSocketImplementation
-        data = WebSocketParserData.new 
+        data = Riddl::Protocols::WebSocket::ParserData.new 
         data.request_path = @riddl_pinfo                                                                                                                                     
         data.request_url = @riddl_pinfo + '?' + @riddl_query_string
         data.query_string = @riddl_query_string
@@ -498,7 +498,7 @@ module Riddl
           @riddl_headers.map { |key, value|  [key.downcase.gsub('_','-'), value] }
         ]
         w = what.new(@riddl_info.merge!(:a => args, :version => @riddl_env['HTTP_SEC_WEBSOCKET_VERSION'], :match => matching_path))
-        w.io = Riddl::WebSocket.new(w, @riddl_env['thin.connection']) 
+        w.io = Riddl::Protocols::WebSocket.new(w, @riddl_env['thin.connection']) 
         w.io.dispatch(data) 
       end  
       if what.class == Class && what.superclass == Riddl::Implementation

data/lib/ruby/riddl/utils/notifications_producer.rb

@@ -314,6 +314,7 @@ module Riddl
 
           def onclose
             @handler.key(@key).ws_close() unless @handler.nil?
+            @backend.subscriptions[@key].delete
           end
         end #}}}
         

data/riddl.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "riddl"
-  s.version          = "0.99.133"
+  s.version          = "0.99.134"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3"
   s.summary          = "restful interface description and declaration language: tools and client/server libs"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riddl
 version: !ruby/object:Gem::Version
-  version: 0.99.133
+  version: 0.99.134
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: tools
 cert_chain: []
-date: 2013-12-12 00:00:00.000000000 Z
+date: 2013-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xml-smart