lib/sinatra-websocketio/application.rb in sinatra-websocketio-0.0.6 vs lib/sinatra-websocketio/application.rb in sinatra-websocketio-0.1.0

@@ -1,35 +1,30 @@
+module Sinatra
+  module WebSocketIO
 
-module Sinatra::WebSocketIO
+    def websocketio=(options)
+      WebSocketIO.options = options
+    end
 
-  def websocketio=(options)
-    WebSocketIO.options = options
-  end
+    def websocketio
+      WebSocketIO.options
+    end
 
-  def websocketio
-    WebSocketIO.options
-  end
+    def self.registered(app)
+      app.helpers Sinatra::WebSocketIO::Helpers
 
-  helpers do
-    def websocketio_js
-      "#{env['rack.url_scheme']}://#{env['HTTP_HOST']}#{env['SCRIPT_NAME']}/websocketio/websocketio.js"
+      app.get '/websocketio/websocketio.js' do
+        content_type 'application/javascript'
+        @js ||= (
+                 js = ''
+                 Dir.glob(File.expand_path '../js/*.js', File.dirname(__FILE__)).each do |i|
+                   File.open(i) do |f|
+                     js += f.read
+                   end
+                 end
+                 ERB.new(js).result(binding)
+                 )
+      end
     end
 
-    def websocketio_url
-      "ws://#{env['SERVER_NAME']}:#{WebSocketIO.options[:port]}"
-    end
   end
-
-  get '/websocketio/websocketio.js' do
-    content_type 'application/javascript'
-    @js ||= (
-             js = ''
-             Dir.glob(File.expand_path '../js/*.js', File.dirname(__FILE__)).each do |i|
-               File.open(i) do |f|
-                 js += f.read
-               end
-             end
-             ERB.new(js).result(binding)
-             )
-  end
-
 end