sinatra-cometio 0.0.9 → 0.1.0

data/History.txt

@@ -1,4 +1,8 @@
-=== 0.0.9 2013-01-4
+=== 0.1.0 2013-2-6
+
+* use EventEmitter.js
+
+=== 0.0.9 2013-1-4
 
 * use bundler gem template
 

data/lib/js/cometio.js

@@ -1,4 +1,5 @@
 var CometIO = function(){
+  new EventEmitter().apply(this);
   this.url = "<%= cometio_url %>";
   this.session = null;
   var self = this;
@@ -54,47 +55,4 @@ var CometIO = function(){
       }
     );
   };
-
-  this.events = new Array();
-  this.on = function(type, listener, opts){
-    if(typeof listener !== "function") return;
-    var event_id = self.events.length > 0 ? 1 + self.events[self.events.length-1].id : 0
-    var params = {
-      id: event_id,
-      type: type,
-      listener: listener
-    };
-    for(i in opts){
-      if(!params[i]) params[i] = opts[i];
-    };
-    self.events.push(params);
-    return event_id;
-  };
-
-  this.once = function(type, listener){
-    this.on(type, listener, {once: true});
-  };
-
-  this.emit = function(type, data){
-    for(var i = 0; i < self.events.length; i++){
-      var e = self.events[i];
-      if(e.type == type) e.listener(data);
-      if(e.once) this.removeListener(e.id);
-    }
-  };
-
-  this.removeListener = function(id_or_type){
-    for(var i = self.events.length-1; i >= 0; i--){
-      var e = self.events[i];
-      switch(typeof id_or_type){
-      case "number":
-        if(e.id == id_or_type) self.events.splice(i,1);
-        break
-      case "string":
-        if(e.type == id_or_type) self.events.splice(i,1);
-        break
-      }
-    }
-  };
-
 };

data/lib/js/event_emitter.js

@@ -0,0 +1,61 @@
+// event_emitter.js v0.0.3
+// https://github.com/shokai/EventEmitter.js
+// (c) 2013 Sho Hashimoto <hashimoto@shokai.org>
+// The MIT License
+var EventEmitter = function(){
+  var self = this;
+  this.apply = function(target, prefix){
+    if(!prefix) prefix = "";
+    for(var func in self){
+      if(self.hasOwnProperty(func)){
+        target[prefix+func] = this[func];
+      }
+    }
+  };
+  this.__events = new Array();
+  this.on = function(type, listener, opts){
+    if(typeof listener !== "function") return;
+    var event_id = self.__events.length > 0 ? 1 + self.__events[self.__events.length-1].id : 0
+    var params = {
+      id: event_id,
+      type: type,
+      listener: listener
+    };
+    for(i in opts){
+      if(!params[i]) params[i] = opts[i];
+    };
+    self.__events.push(params);
+    return event_id;
+  };
+
+  this.once = function(type, listener){
+    self.on(type, listener, {once: true});
+  };
+
+  this.emit = function(type, data){
+    for(var i = 0; i < self.__events.length; i++){
+      var e = self.__events[i];
+      if(e.type == type) e.listener(data);
+      if(e.once) self.removeListener(e.id);
+    }
+  };
+
+  this.removeListener = function(id_or_type){
+    for(var i = self.__events.length-1; i >= 0; i--){
+      var e = self.__events[i];
+      switch(typeof id_or_type){
+      case "number":
+        if(e.id == id_or_type) self.__events.splice(i,1);
+        break
+      case "string":
+        if(e.type == id_or_type) self.__events.splice(i,1);
+        break
+      }
+    }
+  };
+
+};
+
+if(typeof exports !== 'undefined'){
+  exports.EventEmitter = EventEmitter;
+}

data/lib/sinatra-cometio.rb

@@ -0,0 +1,5 @@
+$:.unshift(File.dirname(__FILE__)) unless
+  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
+
+require 'sinatra-cometio/version'
+puts SinatraCometIO::VERSION

data/lib/sinatra-cometio/version.rb

@@ -1,3 +1,3 @@
-module SinatraCometio
-  VERSION = '0.0.9'
+module SinatraCometIO
+  VERSION = '0.1.0'
 end

data/lib/sinatra/application.rb

@@ -15,9 +15,11 @@ module Sinatra
     get '/cometio/cometio.js' do
       content_type 'application/javascript'
       @js ||= (
-               js = nil
-               File.open(File.expand_path '../js/cometio.js', File.dirname(__FILE__)) do |f|
-                 js = f.read
+               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)
                )

data/sample/Gemfile.lock

@@ -1,23 +1,23 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    backports (2.6.5)
+    backports (2.8.2)
     daemons (1.1.9)
-    event_emitter (0.1.0)
+    event_emitter (0.2.2)
     eventmachine (1.0.0)
-    foreman (0.60.2)
+    foreman (0.61.0)
       thor (>= 0.13.6)
     haml (3.1.7)
-    json (1.7.5)
-    rack (1.4.1)
-    rack-protection (1.2.0)
+    json (1.7.6)
+    rack (1.5.1)
+    rack-protection (1.3.2)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    sass (3.2.3)
-    sinatra (1.3.3)
-      rack (~> 1.3, >= 1.3.6)
-      rack-protection (~> 1.2)
+    sass (3.2.5)
+    sinatra (1.3.4)
+      rack (~> 1.4)
+      rack-protection (~> 1.3)
       tilt (~> 1.3, >= 1.3.3)
     sinatra-contrib (1.3.2)
       backports (>= 2.0)
@@ -30,7 +30,7 @@ GEM
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
-    thor (0.16.0)
+    thor (0.17.0)
     tilt (1.3.3)
 
 PLATFORMS

data/sinatra-cometio.gemspec

@@ -4,7 +4,7 @@ require 'sinatra-cometio/version'
 
 Gem::Specification.new do |gem|
   gem.name          = "sinatra-cometio"
-  gem.version       = SinatraCometio::VERSION
+  gem.version       = SinatraCometIO::VERSION
   gem.authors       = ["Sho Hashimoto"]
   gem.email         = ["hashimoto@shokai.org"]
   gem.description   = %q{Node.js like Comet I/O plugin for Sinatra.}
@@ -21,5 +21,5 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'eventmachine', '>= 1.0.0'
   gem.add_dependency 'sinatra-contrib', '>= 1.3.2'
   gem.add_dependency 'json', '>= 1.7.0'
-  gem.add_dependency 'event_emitter', '>= 0.1.0'
+  gem.add_dependency 'event_emitter', '>= 0.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-cometio
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-03 00:00:00.000000000 Z
+date: 2013-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
 description: Node.js like Comet I/O plugin for Sinatra.
 email:
 - hashimoto@shokai.org
@@ -118,11 +118,11 @@ files:
 - Gemfile
 - History.txt
 - LICENSE.txt
-- Manifest.txt
-- PostInstall.txt
 - README.md
 - Rakefile
 - lib/js/cometio.js
+- lib/js/event_emitter.js
+- lib/sinatra-cometio.rb
 - lib/sinatra-cometio/version.rb
 - lib/sinatra/application.rb
 - lib/sinatra/cometio.rb

data/Manifest.txt

@@ -1,27 +0,0 @@
-.gitignore
-Gemfile
-Gemfile.lock
-History.txt
-Manifest.txt
-PostInstall.txt
-README.rdoc
-Rakefile
-lib/js/cometio.js
-lib/sinatra-cometio.rb
-lib/sinatra/application.rb
-lib/sinatra/cometio.rb
-sample/.gitignore
-sample/Gemfile
-sample/Gemfile.lock
-sample/Procfile
-sample/README.md
-sample/config.ru
-sample/main.rb
-sample/public/js/index.js
-sample/views/index.haml
-sample/views/main.scss
-script/console
-script/destroy
-script/generate
-test/test_helper.rb
-test/test_sinatra-cometio.rb

data/PostInstall.txt

@@ -1,7 +0,0 @@
-
-For more information on sinatra-cometio, see http://sinatra-cometio.rubyforge.org
-
-NOTE: Change this information in PostInstall.txt 
-You can also delete it if you don't want it.
-
-