sinatra-websocketio 0.0.1 → 0.0.2

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.0.2 2013-03-08
+
+* set :websocketio, :port => 8080
+
 === 0.0.1 2013-03-08
 
 * release

data/README.md

@@ -30,6 +30,7 @@ Server Side
 ```ruby
 require 'sinatra'
 require 'sinatra/websocketio'
+set :websocketio, :port => 8080
 
 run Sinatra::Application
 ```

data/lib/sinatra/websocketio.rb

@@ -5,6 +5,7 @@ require 'digest/md5'
 require 'event_emitter'
 require 'sinatra/streaming'
 require File.expand_path '../sinatra-websocketio/version', File.dirname(__FILE__)
+require File.expand_path '../sinatra-websocketio/options', File.dirname(__FILE__)
 require File.expand_path '../sinatra-websocketio/websocketio', File.dirname(__FILE__)
 require File.expand_path '../sinatra-websocketio/application', File.dirname(__FILE__)
 

data/lib/sinatra-websocketio/application.rb

@@ -1,13 +1,21 @@
 
 module Sinatra::WebSocketIO
 
+  def websocketio=(options)
+    WebSocketIO.options = options
+  end
+
+  def websocketio
+    WebSocketIO.options
+  end
+
   helpers do
     def websocketio_js
       "#{env['rack.url_scheme']}://#{env['HTTP_HOST']}#{env['SCRIPT_NAME']}/websocketio/websocketio.js"
     end
 
     def websocketio_url
-      "ws://#{env['SERVER_NAME']}:#{WebSocketIO.port}"
+      "ws://#{env['SERVER_NAME']}:#{WebSocketIO.options[:port]}"
     end
   end
 

data/lib/sinatra-websocketio/options.rb

@@ -0,0 +1,35 @@
+class WebSocketIO
+
+  def self.default_options
+    {
+      :port => [8080, lambda{|v| v.kind_of? Fixnum }]
+    }
+  end
+
+  def self.options
+    @@options ||= (
+                   opts = {}
+                   default_options.each do |k,v|
+                     opts[k] = v[0]
+                   end
+                   opts
+                   )
+  end
+
+  def self.options=(opts)
+    @@options = {}
+    opts.each do |k,v|
+      k = k.to_sym
+      if default_options.include? k
+        @@options[k] = default_options[k][1].call(v) ? v : default_options[k][0]
+      else
+        @@options[k] = v
+      end
+    end
+    default_options.each do |k, v|
+      @@options[k] = v unless @@options.include? k
+    end
+    @@options
+  end
+
+end

data/lib/sinatra-websocketio/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
   module WebSocketIO
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/lib/sinatra-websocketio/websocketio.rb

@@ -1,17 +1,12 @@
 class WebSocketIO
 
-  def self.port
-    @@port ||= 8080
-  end
-
-  def self.start(port=8080)
-    @@port = port
+  def self.start
     EM::defer do
       while !EM::reactor_running? do
         sleep 1
       end
-      puts "WebSocketIO.start port:#{port}"
-      EM::WebSocket.run :host => "0.0.0.0", :port => port do |ws|
+      puts "WebSocketIO.start port:#{options[:port]}"
+      EM::WebSocket.run :host => "0.0.0.0", :port => options[:port] do |ws|
         ws.onopen do |handshake|
           params = parse_handshake_params handshake.path
           session_id = params[:session] || (create_session Socket.unpack_sockaddr_in ws.get_peername)

data/sample/config.ru

@@ -11,5 +11,6 @@ require 'sinatra/websocketio'
 require File.dirname(__FILE__)+'/main'
 
 set :haml, :escape_html => true
+set :websocketio, :port => 8080
 
 run Sinatra::Application

data/sinatra-websocketio.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |gem|
   gem.email         = ["hashimoto@shokai.org"]
   gem.description   = %q{Node.js like WebSocket I/O plugin for Sinatra.}
   gem.summary       = gem.description
-  gem.homepage      = "http://shokai.github.com/sinatra-websocketio"
+  gem.homepage      = "https://github.com/shokai/sinatra-websocketio"
 
   gem.files         = `git ls-files`.split($/).reject{|i| i=="Gemfile.lock" }
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-websocketio
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-07 00:00:00.000000000 Z
+date: 2013-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -140,6 +140,7 @@ files:
 - lib/js/websocketio.js
 - lib/sinatra-websocketio.rb
 - lib/sinatra-websocketio/application.rb
+- lib/sinatra-websocketio/options.rb
 - lib/sinatra-websocketio/version.rb
 - lib/sinatra-websocketio/websocketio.rb
 - lib/sinatra/websocketio.rb
@@ -153,7 +154,7 @@ files:
 - sample/views/index.haml
 - sample/views/main.scss
 - sinatra-websocketio.gemspec
-homepage: http://shokai.github.com/sinatra-websocketio
+homepage: https://github.com/shokai/sinatra-websocketio
 licenses: []
 post_install_message: 
 rdoc_options: []