sinatra-cometio 0.5.6 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2d4bcecc45017cc73256cad7afa8424be83162c
-  data.tar.gz: d722c7b6be85852d63d1b011ce97fa8d1c293138
+  metadata.gz: a88f058c708fa162b68b6f66cb07535ef05c8f67
+  data.tar.gz: 2f6bd541e6c0139cba9d6b29a18249faff22134c
 SHA512:
-  metadata.gz: 3faffbfe215f98cd092e2ce48a9ca849c16dff81de741030b71936988069fbd620605e0d762ccb68d19f57b734600ee693beec8b8d6f0ae248fe64307f093508
-  data.tar.gz: b795964ad56a975f1ee07993c6130efdd73cb80c439db4bae11aeb63be86b9638f2a6da2fb66828b7939feea5a13f24a9af17722274ac918438ae74de2fb4743
+  metadata.gz: c4cdefcf0d376a53ba88d47e8319f5eab919dbb49c20171ec8f58976b2a4178167ade6558d29d2072e9940da479691a32acdb626004cf5912a583b06a5662c7a
+  data.tar.gz: 5a8f974d7a6f815e88557557102cf0c98e25a711dbbad647f3e4948363b7d42e819382ea23a37ea47c1ca0cf9c1261dc7656a10b1b87ad0e0ae258a67b0a1ac7

data/History.txt

@@ -1,3 +1,9 @@
+=== 0.5.7 2013-05-27
+
+* bugfix JSON parse error at classic style
+* set :cometio, :allow_crossdomain => true
+* add constructor arguments in JS lib
+
 === 0.5.6 2013-05-23
 
 * post with JSON for nested Array

data/README.md

@@ -30,7 +30,7 @@ Server Side
 ```ruby
 require 'sinatra'
 require 'sinatra/cometio'
-set :cometio, :timeout => 120, :post_interval => 1
+set :cometio, :timeout => 120, :post_interval => 1, :allow_crossdomain => false
 
 run Sinatra::Application
 ```

data/lib/js/cometio.js

@@ -1,7 +1,8 @@
-var CometIO = function(){
+var CometIO = function(url, opts){
   new EventEmitter().apply(this);
-  this.url = "<%= cometio_url %>";
-  this.session = null;
+  if(typeof opts === "undefined" || opts === null) opts = {};
+  this.url = url || "<%= cometio_url %>";
+  this.session = opts.session || null;
   var running = false;
   var self = this;
   var post_queue = [];
@@ -32,7 +33,7 @@ var CometIO = function(){
     );
     post_queue = [];
   };
-  setInterval(flush, <%= (CometIO.options[:post_interval]*1000).to_i %>);
+  setInterval(flush, <%= (Sinatra::CometIO.options[:post_interval]*1000).to_i %>);
 
   this.push = function(type, data){
     if(!running || !self.session){
@@ -81,7 +82,7 @@ var CometIO = function(){
         },
         type : "GET",
         dataType : "json",
-        timeout : <%= (CometIO.options[:timeout]+10)*1000 %>
+        timeout : <%= (Sinatra::CometIO.options[:timeout]+10)*1000 %>
       }
     );
   };

data/lib/sinatra-cometio/application.rb

@@ -11,6 +11,7 @@ module Sinatra
       end
 
       app.get '/cometio/io' do
+        response["Access-Control-Allow-Origin"] = "*" if CometIO.options[:allow_crossdomain]
         stream :keep_open do |s|
           session = params[:session].to_s.empty? ? CometIO.create_session(request.ip) : params[:session]
           CometIO.sessions[session][:stream] = s
@@ -41,7 +42,8 @@ module Sinatra
       end
 
       app.post '/cometio/io' do
-        data = JSON.parse params[:json] rescue halt 500, 'JSON parse error'
+        response["Access-Control-Allow-Origin"] = "*" if CometIO.options[:allow_crossdomain]
+        data = ::JSON.parse params[:json] rescue halt 500, 'JSON parse error'
         from = data['session']
         halt 400, 'no session' if !from or from.empty?
         events = data['events']

data/lib/sinatra-cometio/options.rb

@@ -12,7 +12,8 @@ module Sinatra
     def self.default_options
       {
         :timeout => [120, lambda{|v| v.kind_of? Fixnum and v >= 20 }],
-        :post_interval => [1, lambda{|v| [Fixnum, Float].include? v.class and v >= 1 }]
+        :post_interval => [1, lambda{|v| [Fixnum, Float].include? v.class and v >= 1 }],
+        :allow_crossdomain => [false, lambda{|v| [true, false].include? v }]
       }
     end
 

data/lib/sinatra-cometio/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
   module CometIO
-    VERSION = '0.5.6'
+    VERSION = '0.5.7'
   end
 end

data/sample/config.ru

@@ -14,6 +14,6 @@ require 'sass'
 require File.dirname(__FILE__)+'/main'
 
 set :haml, :escape_html => true
-set :cometio, :timeout => 60, :post_interval => 2
+set :cometio, :timeout => 60, :post_interval => 2, :allow_crossdomain => false
 
 run ChatApp

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-cometio
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.7
 platform: ruby
 authors:
 - Sho Hashimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-22 00:00:00.000000000 Z
+date: 2013-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler