cramp 0.7 → 0.8

data/lib/cramp/controller/abstract.rb

@@ -56,6 +56,14 @@ module Cramp
         send_initial_response(status, headers, halt_body)
       end
 
+      def request
+        @request ||= Rack::Request.new(@env)
+      end
+
+      def params
+        @params ||= @env['usher.params']
+      end
+
     end
   end
 end

data/lib/cramp/controller/action.rb

@@ -5,14 +5,6 @@ module Cramp
       include PeriodicTimer
       include KeepConnectionAlive
 
-      def request
-        @request ||= Rack::Request.new(@env)
-      end
-
-      def params
-        @params ||= @env['usher.params']
-      end
-
       def render(body)
         @body.call(body)
       end

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

@@ -0,0 +1,62 @@
+require 'thin'
+
+class Thin::Connection
+  WEBSOCKET_RECEIVE_CALLBACK = 'websocket.receive_callback'.freeze
+
+  # 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.call(data) if callback
+    else
+      if @request.parse(data)
+        if @request.websocket?
+          @response.websocket_upgrade_data = @request.websocket_upgrade_data
+          @serving = :websocket
+        end
+
+        process
+      end
+    end
+  rescue InvalidRequest => e
+    log "!! Invalid request"
+    log_error e
+    close_connection
+  end
+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
+end
+
+class Thin::Response
+  # Headers for sending Websocket upgrade
+  attr_accessor :websocket_upgrade_data
+
+  def each
+    websocket_upgrade_data ? yield(websocket_upgrade_data) : yield(head)
+    if @body.is_a?(String)
+      yield @body
+    else
+      @body.each { |chunk| yield chunk }
+    end
+  end
+end

data/lib/cramp/controller/websocket.rb

@@ -0,0 +1,40 @@
+module Cramp
+  module Controller
+    class Websocket < Abstract
+
+      include PeriodicTimer
+
+      class_inheritable_accessor :on_data_callbacks, :instance_reader => false
+      self.on_data_callbacks = []
+
+      class << self
+        def backend=(backend)
+          raise "Websocket backend #{backend} is unknown" unless [:thin].include?(backend.to_sym)
+          require "cramp/controller/websocket/#{backend}_backend.rb"
+        end
+
+        def on_data(*methods)
+          self.on_data_callbacks += methods
+        end
+      end
+
+      def process
+        @env['websocket.receive_callback'] = method(:_on_data_receive)
+        super
+      end
+
+      def render(body)
+        @body.call("\x00#{body}\xff")
+      end
+
+      def _on_data_receive(data)
+        data = data.slice(/\000([^\377]*)\377/).gsub(/^\x00|\xff$/, '')
+
+        self.on_data_callbacks.each do |callback|
+          EM.next_tick { send(callback, data) }
+        end
+      end
+
+    end
+  end
+end

data/lib/cramp/controller.rb

@@ -1,10 +1,10 @@
 require 'cramp'
-require 'usher'
 require 'rack'
 
 module Cramp
   module Controller
     autoload :Action, "cramp/controller/action"
+    autoload :Websocket, "cramp/controller/websocket"
     autoload :Body, "cramp/controller/body"
     autoload :PeriodicTimer, "cramp/controller/periodic_timer"
     autoload :KeepConnectionAlive, "cramp/controller/keep_connection_alive"

data/lib/cramp.rb

@@ -8,5 +8,5 @@ require 'active_support/concern'
 require 'cramp/core_ext'
 
 module Cramp
-  VERSION = '0.7'
+  VERSION = '0.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cramp
 version: !ruby/object:Gem::Version 
-  version: "0.7"
+  version: "0.8"
 platform: ruby
 authors: 
 - Pratik Naik
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-09 00:00:00 +05:30
+date: 2010-01-10 00:00:00 +05:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,7 +50,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.0.0
+        version: 1.1.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: mysqlplus
@@ -100,6 +100,8 @@ files:
 - lib/cramp/controller/periodic_timer.rb
 - lib/cramp/controller/rendering.rb
 - lib/cramp/controller/test_case.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