sinatra-cometio 0.4.3 → 0.5.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5f2a85bfa87462fa70ad499c1667c9709b6b1b8c
+  data.tar.gz: c616152d43be0b88ad5c4c8b5a78416248efffeb
+SHA512:
+  metadata.gz: c74e253c71ffb4f9174032ba4182aa66f05178f984d6eb2b675d30222919cfb6a11687eb0fb6bbb60dca16132e05de3bde326dc2ee5c520d2a099b14c7bc76ac
+  data.tar.gz: ce5cef5013ebc0aa373e1a337dbfb333b4cabc4293f040facf6bc880f9ae6e9045941ba3dc8b3ff9f81ab89321da76391f871063f76baca8188de21bbfddcf34

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.5.0 2013-04-02
+
+* use queue javascript side push
+
 === 0.4.3 2013-03-26
 
 * bugfix Sinatra::CometIO::push

data/lib/js/cometio.js

@@ -4,16 +4,18 @@ var CometIO = function(){
   this.session = null;
   var running = false;
   var self = this;
+  var post_queue = [];
 
-  this.push = function(type, data){
-    if(!self.session){
-      self.emit("error", "CometIO not connected");
-      return;
-    }
+  var flush = function(){
+    if(!running || post_queue.length < 1) return;
+    var post_data = {
+      session: self.session,
+      events: post_queue
+    };
     $.ajax(
       {
         url : self.url,
-        data : {type : type, data : data, session : self.session},
+        data : post_data,
         success : function(data){
         },
         error : function(req, stat, e){
@@ -26,6 +28,16 @@ var CometIO = function(){
         timeout : 10000
       }
     );
+    post_queue = [];
+  };
+  setInterval(flush, 1000);
+
+  this.push = function(type, data){
+    if(!running || !self.session){
+      self.emit("error", "CometIO not connected");
+      return;
+    }
+    post_queue.push({type: type, data: data})
   };
 
   this.connect = function(){

data/lib/sinatra/cometio/client.rb

@@ -22,8 +22,12 @@ module Sinatra
       end
 
       def push(type, data)
+        post_data = {
+          :session => @session,
+          :events => [{:type => type, :data => data}]
+        }
         begin
-          res = HTTParty.post @url, :timeout => 10, :body => {:type => type, :data => data, :session => @session}
+          res = HTTParty.post @url, :timeout => 10, :body => post_data
           emit :error, "CometIO push error" unless res.code == 200
         rescue StandardError, Timeout::Error => e
           emit :error, "CometIO push error"

data/lib/sinatra-cometio/application.rb

@@ -43,14 +43,18 @@ module Sinatra
       app.post '/cometio/io' do
         from = params[:session]
         halt 400, 'no session' if from.empty?
-        type = params[:type]
-        data = params[:data]
+        events = params[:events]
+        halt 400, 'no data' unless [Hash, Array].include? events.class
+        events = events.keys.sort.map{|i| events[i] } if events.kind_of? Hash
         EM::defer do
-          CometIO.emit type, data, from unless type.to_s.empty?
+          events.each do |e|
+            next if !e['type'] or e['type'].empty?
+            CometIO.emit e['type'], e['data'], from
+          end
         end
         stream :keep_open do |s|
           begin
-            s.write({:session => from, :type => type, :data => data}.to_json)
+            s.write({:session => from, :success => true}.to_json)
             s.flush
             s.close
           rescue

data/lib/sinatra-cometio/cometio.rb

@@ -39,6 +39,7 @@ module Sinatra
             s[:stream].close
             s[:queue].push :type => type, :data => data
           end
+          s[:stream] = nil
         else
           s[:queue].push :type => type, :data => data
         end

data/lib/sinatra-cometio/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
   module CometIO
-    VERSION = '0.4.3'
+    VERSION = '0.5.0'
   end
 end

data/sinatra-cometio.gemspec

@@ -27,6 +27,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'sinatra', '>= 1.3.0'
   gem.add_dependency 'eventmachine', '>= 1.0.0'
   gem.add_dependency 'json', '>= 1.7.0'
-  gem.add_dependency 'event_emitter', '>= 0.2.4'
+  gem.add_dependency 'event_emitter', '>= 0.2.5'
   gem.add_dependency 'httparty', '>= 0.10.2'
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-cometio
 version: !ruby/object:Gem::Version
-  version: 0.4.3
-  prerelease: 
+  version: 0.5.0
 platform: ruby
 authors:
 - Sho Hashimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-26 00:00:00.000000000 Z
+date: 2013-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,177 +27,155 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.3.2
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: event_emitter
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 0.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 0.2.5
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.10.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.10.2
 description: Comet component for Sinatra RocketIO
@@ -243,33 +218,26 @@ files:
 - test/test_helper.rb
 homepage: https://github.com/shokai/sinatra-cometio
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2224878140655385903
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2224878140655385903
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Comet component for Sinatra RocketIO
 test_files:
 - test/app.rb