sinatra-cometio 0.3.2 → 0.3.3

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.3.3 2013-03-17
+
+* read javascript - Sinatra::CometIO.javascript
+
 === 0.3.2 2013-03-16
 
 * fix README

data/lib/sinatra-cometio/application.rb

@@ -1,29 +1,13 @@
 module Sinatra
   module CometIO
 
-    def cometio=(options)
-      CometIO.options = options
-    end
-
-    def cometio
-      CometIO.options
-    end
-
     def self.registered(app)
       app.helpers Sinatra::Streaming
       app.helpers Sinatra::CometIO::Helpers
 
       app.get '/cometio/cometio.js' do
         content_type 'application/javascript'
-        @js ||= (
-                 js = ''
-                 Dir.glob(File.expand_path '../js/*.js', File.dirname(__FILE__)).sort.each do |i|
-                   File.open(i) do |f|
-                     js += f.read
-                   end
-                 end
-                 ERB.new(js).result(binding)
-                 )
+        @js ||= ERB.new(Sinatra::CometIO.javascript).result(binding)
       end
 
       app.get '/cometio/io' do

data/lib/sinatra-cometio/javascript.rb

@@ -0,0 +1,16 @@
+module Sinatra
+  module CometIO
+
+    def self.javascript(*js_file_names)
+      js_file_names = ['cometio.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-cometio/options.rb

@@ -1,6 +1,14 @@
 module Sinatra
   module CometIO
 
+    def cometio=(options)
+      CometIO.options = options
+    end
+
+    def cometio
+      CometIO.options
+    end
+
     def self.default_options
       {
         :timeout => [120, lambda{|v| v.kind_of? Fixnum and v >= 20 }]

data/lib/sinatra-cometio/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
   module CometIO
-    VERSION = '0.3.2'
+    VERSION = '0.3.3'
   end
 end

data/lib/sinatra/cometio.rb

@@ -7,6 +7,7 @@ require File.expand_path '../sinatra-cometio/version', File.dirname(__FILE__)
 require File.expand_path '../sinatra-cometio/helpers', File.dirname(__FILE__)
 require File.expand_path '../sinatra-cometio/options', File.dirname(__FILE__)
 require File.expand_path '../sinatra-cometio/cometio', File.dirname(__FILE__)
+require File.expand_path '../sinatra-cometio/javascript', File.dirname(__FILE__)
 require File.expand_path '../sinatra-cometio/application', File.dirname(__FILE__)
 
 module Sinatra

data/sample/Gemfile.lock

@@ -13,7 +13,7 @@ GEM
       multi_json (~> 1.0)
       multi_xml (>= 0.5.2)
     json (1.7.7)
-    multi_json (1.6.1)
+    multi_json (1.7.0)
     multi_xml (0.5.3)
     rack (1.5.2)
     rack-protection (1.5.0)

data/test/test_helper.rb

@@ -1,4 +1,5 @@
 require 'rubygems'
+require 'bundler/setup'
 require 'minitest/autorun'
 require 'sinatra/cometio/client'
 require File.expand_path 'app', File.dirname(__FILE__)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-cometio
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -142,6 +142,7 @@ files:
 - lib/sinatra-cometio/application.rb
 - lib/sinatra-cometio/cometio.rb
 - lib/sinatra-cometio/helpers.rb
+- lib/sinatra-cometio/javascript.rb
 - lib/sinatra-cometio/options.rb
 - lib/sinatra-cometio/version.rb
 - lib/sinatra/cometio.rb