cramp 0.8 → 0.9

data/lib/cramp/controller/websocket/rainbows_backend.rb

@@ -0,0 +1,40 @@
+require 'rainbows'
+
+class Rainbows::EventMachine::Client
+  include Cramp::Controller::WebsocketExtension
+
+  def websocket_handshake!
+    @state = :websocket
+  end
+
+  def receive_data_with_websocket(data)
+    case @state
+    when :websocket
+      callback = @env[WEBSOCKET_RECEIVE_CALLBACK]
+      callback.call(data) if callback
+    else
+      receive_data_without_websocket(data)
+    end
+  end
+
+  alias_method_chain :receive_data, :websocket
+end
+
+class Rainbows::HttpResponse
+  class << self
+
+    def write_with_magic(socket, rack_response, out = [])
+      if socket.websocket?
+        socket.write socket.websocket_upgrade_data
+        socket.websocket_handshake!
+
+        out = nil # To make sure Rainbows! doesn't send back regular HTTP headers
+      end
+
+      write_without_magic(socket, rack_response, out)
+    end
+
+    alias_method_chain :write, :magic
+  end
+
+end

data/lib/cramp/controller/websocket/thin_backend.rb

@@ -1,19 +1,20 @@
 require 'thin'
 
-class Thin::Connection
-  WEBSOCKET_RECEIVE_CALLBACK = 'websocket.receive_callback'.freeze
+silence_warnings { Thin::Server::DEFAULT_TIMEOUT = 0 }
 
+class Thin::Connection
   # Called when data is received from the client.
   def receive_data(data)
     trace { data }
 
     case @serving
     when :websocket
-      callback = @request.env[WEBSOCKET_RECEIVE_CALLBACK]
+      callback = @request.env[Thin::Request::WEBSOCKET_RECEIVE_CALLBACK]
       callback.call(data) if callback
     else
       if @request.parse(data)
         if @request.websocket?
+          @response.persistent!
           @response.websocket_upgrade_data = @request.websocket_upgrade_data
           @serving = :websocket
         end
@@ -21,7 +22,7 @@ class Thin::Connection
         process
       end
     end
-  rescue InvalidRequest => e
+  rescue Thin::InvalidRequest => e
     log "!! Invalid request"
     log_error e
     close_connection
@@ -29,22 +30,7 @@ class Thin::Connection
 end
 
 class Thin::Request
-  def websocket?
-    @env['HTTP_CONNECTION'] == 'Upgrade' && @env['HTTP_UPGRADE'] == 'WebSocket'
-  end
-
-  # upgrade headers for websocket connections
-  def websocket_upgrade_data
-    location  = "ws://#{@env['HTTP_HOST']}#{@env['REQUEST_PATH']}"
-
-    upgrade =  "HTTP/1.1 101 Web Socket Protocol Handshake\r\n"
-    upgrade << "Upgrade: WebSocket\r\n"
-    upgrade << "Connection: Upgrade\r\n"
-    upgrade << "WebSocket-Origin: #{@env['HTTP_ORIGIN']}\r\n"
-    upgrade << "WebSocket-Location: #{location}\r\n\r\n"
-
-    upgrade
-  end
+  include Cramp::Controller::WebsocketExtension
 end
 
 class Thin::Response

data/lib/cramp/controller/websocket.rb

@@ -1,5 +1,25 @@
 module Cramp
   module Controller
+    module WebsocketExtension
+      WEBSOCKET_RECEIVE_CALLBACK = 'websocket.receive_callback'.freeze
+
+      def websocket?
+        @env['HTTP_CONNECTION'] == 'Upgrade' && @env['HTTP_UPGRADE'] == 'WebSocket'
+      end
+
+      def websocket_upgrade_data
+        location  = "ws://#{@env['HTTP_HOST']}#{@env['REQUEST_PATH']}"
+
+        upgrade =  "HTTP/1.1 101 Web Socket Protocol Handshake\r\n"
+        upgrade << "Upgrade: WebSocket\r\n"
+        upgrade << "Connection: Upgrade\r\n"
+        upgrade << "WebSocket-Origin: #{@env['HTTP_ORIGIN']}\r\n"
+        upgrade << "WebSocket-Location: #{location}\r\n\r\n"
+
+        upgrade
+      end
+    end
+
     class Websocket < Abstract
 
       include PeriodicTimer
@@ -9,7 +29,7 @@ module Cramp
 
       class << self
         def backend=(backend)
-          raise "Websocket backend #{backend} is unknown" unless [:thin].include?(backend.to_sym)
+          raise "Websocket backend #{backend} is unknown" unless [:thin, :rainbows].include?(backend.to_sym)
           require "cramp/controller/websocket/#{backend}_backend.rb"
         end
 

data/lib/cramp.rb

@@ -2,11 +2,12 @@ require 'eventmachine'
 EM.epoll
 
 require 'active_support'
-require 'active_support/core_ext'
+require 'active_support/core_ext/class/inheritable_attributes'
+require 'active_support/core_ext/class/attribute_accessors'
+require 'active_support/core_ext/module/aliasing'
+require 'active_support/core_ext/kernel/reporting'
 require 'active_support/concern'
 
-require 'cramp/core_ext'
-
 module Cramp
-  VERSION = '0.8'
+  VERSION = '0.9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cramp
 version: !ruby/object:Gem::Version 
-  version: "0.8"
+  version: "0.9"
 platform: ruby
 authors: 
 - Pratik Naik
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-10 00:00:00 +05:30
+date: 2010-01-11 00:00:00 +05:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -100,10 +100,10 @@ files:
 - lib/cramp/controller/periodic_timer.rb
 - lib/cramp/controller/rendering.rb
 - lib/cramp/controller/test_case.rb
+- lib/cramp/controller/websocket/rainbows_backend.rb
 - lib/cramp/controller/websocket/thin_backend.rb
 - lib/cramp/controller/websocket.rb
 - lib/cramp/controller.rb
-- lib/cramp/core_ext.rb
 - lib/cramp/model/arel_monkey_patches.rb
 - lib/cramp/model/attribute.rb
 - lib/cramp/model/attribute_methods.rb

data/lib/cramp/core_ext.rb

@@ -1,4 +0,0 @@
-module Kernel
-  alias :'_' :method
-  alias :callback :method
-end