sinatra-websocketio 0.1.0 → 0.1.1

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.1.1 2013-03-17
+
+* read javascript file - Sinatra::WebSocketIO.javascript
+
 === 0.1.0 2013-03-16
 
 * support modular style application

data/lib/sinatra-websocketio/application.rb

@@ -1,28 +1,12 @@
 module Sinatra
   module WebSocketIO
 
-    def websocketio=(options)
-      WebSocketIO.options = options
-    end
-
-    def websocketio
-      WebSocketIO.options
-    end
-
     def self.registered(app)
       app.helpers Sinatra::WebSocketIO::Helpers
 
       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)
-                 )
+        @js ||= ERB.new(Sinatra::WebSocketIO.javascript).result(binding)
       end
     end
 

data/lib/sinatra-websocketio/javascript.rb

@@ -0,0 +1,16 @@
+module Sinatra
+  module WebSocketIO
+
+    def self.javascript(*js_file_names)
+      js_file_names = ['websocketio.js', 'event_emitter.js'] if js_file_names.empty?
+      js = ''
+      js_file_names.each do |i|
+        File.open(File.expand_path "../js/#{i}", File.dirname(__FILE__)) do |f|
+          js += f.read
+        end
+      end
+      js
+    end
+
+  end
+end

data/lib/sinatra-websocketio/options.rb

@@ -1,6 +1,14 @@
 module Sinatra
   module WebSocketIO
 
+    def websocketio=(options)
+      WebSocketIO.options = options
+    end
+
+    def websocketio
+      WebSocketIO.options
+    end
+
     def self.default_options
       {
         :port => [8080, lambda{|v| v.kind_of? Fixnum and v > 0 }]

data/lib/sinatra-websocketio/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
   module WebSocketIO
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/lib/sinatra/websocketio.rb

@@ -8,6 +8,7 @@ require File.expand_path '../sinatra-websocketio/version', File.dirname(__FILE__
 require File.expand_path '../sinatra-websocketio/helpers', 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/javascript', File.dirname(__FILE__)
 require File.expand_path '../sinatra-websocketio/application', File.dirname(__FILE__)
 
 module Sinatra

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      = "https://github.com/shokai/sinatra-websocketio"
+  gem.homepage      = "http://shokai.github.com/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) }

data/test/test_helper.rb

@@ -1,9 +1,10 @@
 require 'rubygems'
+require 'bundler/setup'
+$:.unshift File.expand_path '../lib', File.dirname(__FILE__)
 require 'minitest/autorun'
 require 'em-websocketio-client'
 require File.expand_path 'app', File.dirname(__FILE__)
 
-$:.unshift File.expand_path '../lib', File.dirname(__FILE__)
 
 ['SIGHUP', 'SIGINT', 'SIGKILL', 'SIGTERM'].each do |sig|
   Kernel.trap sig do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-websocketio
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -159,6 +159,7 @@ files:
 - lib/sinatra-websocketio.rb
 - lib/sinatra-websocketio/application.rb
 - lib/sinatra-websocketio/helpers.rb
+- lib/sinatra-websocketio/javascript.rb
 - lib/sinatra-websocketio/options.rb
 - lib/sinatra-websocketio/version.rb
 - lib/sinatra-websocketio/websocketio.rb
@@ -179,7 +180,7 @@ files:
 - test/app/main.rb
 - test/test_helper.rb
 - test/test_websocketio.rb
-homepage: https://github.com/shokai/sinatra-websocketio
+homepage: http://shokai.github.com/sinatra-websocketio
 licenses: []
 post_install_message: 
 rdoc_options: []