socker 0.0.3 → 0.0.4

data/lib/socker.rb

@@ -13,22 +13,11 @@ module Socker
 
     WEBSOCKET_STANDARD_EVENTS = [ :open, :close, :message, :error ]
 
-    attr_reader :events, :callbacks
+    attr_accessor :events
+    attr_reader :callbacks
 
     def initialize(callbacks={})
       @callbacks = callbacks
-      @application = lambda do |env|
-        return [501, {}, ['Sorry, but I am websocket app.']] unless is_websocket?(env)
-        connection(env) do |c|
-          WEBSOCKET_STANDARD_EVENTS.each(&register_handler(c, env))
-        end
-      end
-      # This is needed for Puma so we can log the requests to WebSockets
-      @application.class.instance_eval {
-        define_method(:log) { |message| Socker::App.log(message) }
-      }
-      @application.freeze
-      @application
     end
 
     # Helper method your application can use to register new handlers
@@ -42,8 +31,11 @@ module Socker
     # Handler could be anything that implements the .call method, like
     # lambda, Proc or Method...
     #
-    def on(event, handler)
+    def on(event, handler=nil, &block)
       @events ||= {}
+      handler = block unless handler
+      return @callbacks[:when_active] = handler if event == :active
+      return @callbacks[:when_idle] = handler if event == :idle
       raise "Unable register handler for unsupported event: #{event}" unless event_supported?(event)
       @events[event] ||= lambda { |socket, ev| handler.call(socket, ev) }
     end
@@ -53,6 +45,19 @@ module Socker
     # run Rack::URLMap.new('/' => MyServer.new.to_app)
     #
     def to_app
+      @application = lambda do |env|
+        return [501, {}, ['Sorry, but I am websocket app.']] unless is_websocket?(env)
+        connection(env) do |c|
+          WEBSOCKET_STANDARD_EVENTS.each(&register_handler(c, env))
+        end
+      end
+      # This is needed for Puma so we can log the requests to WebSockets
+      @application.class.instance_eval {
+        define_method(:log) { |message| Socker::App.log(message) }
+      }
+      # Prevent any modification of events or application itself at this point.
+      @events.freeze
+      @application.freeze
       @application
     end
 

data/lib/socker/sinatra.rb

@@ -0,0 +1,35 @@
+require 'socker'
+require 'sinatra/base'
+
+module Sinatra
+
+  module Socker
+
+    class RackAdapter
+
+      def initialize(app, options = {})
+        @socker_app  = options[:app]
+        @mount_point = options[:at]
+        @app         = app
+      end
+
+      def call(env)
+        if Rack::Request.new(env).path == @mount_point
+          @socker_app.call(env)
+        else
+          @app.call(env)
+        end
+      end
+
+    end
+
+    def websocket(mount_point, &block)
+      socker_app = ::Socker::App.new
+      socker_app.instance_eval(&block)
+      use Sinatra::Socker::RackAdapter, :app => socker_app.to_app, :at => mount_point
+    end
+
+  end
+
+  register Sinatra::Socker
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: socker
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-17 00:00:00.000000000 Z
+date: 2013-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faye-websocket
@@ -34,6 +34,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/socker/helper.rb
+- lib/socker/sinatra.rb
 - lib/socker/event_handlers.rb
 - lib/socker.rb
 homepage: https://github.com/mfojtik/socker