sinatra-cometio 0.3.9 → 0.4.0

data/Gemfile

@@ -2,5 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in sinatra-cometio.gemspec
 gemspec
-gem 'minitest'
-gem 'thin'

data/History.txt

@@ -1,3 +1,9 @@
+=== 0.4.0 2013-03-23
+
+* rename CometIO::Client -> Sinatra::CometIO::Client
+* use gem.add_development_dependency
+* delete sample/Gemfile
+
 === 0.3.9 2013-03-21
 
 * emit "error" on push before connect

data/README.md

@@ -44,11 +44,12 @@ io.push :light, {:value => 150}, {:to => session_id} # to specific client
 Client Side
 
 ```html
-<script src="//ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js"></script>
+<script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
 <script src="<%= cometio_js %>"></script>
 ```
 ```javascript
 var io = new CometIO().connect();
+
 io.on("temperature", function(value){
   console.log("server temperature : " + value);
 }); // => "server temperature : 35"
@@ -63,7 +64,9 @@ io.on("light", function(data){
 Client Side
 
 ```javascript
-io.push("chat", {name: "shokai", message: "hello"}); // client -> server
+io.on("connect", function(){
+  io.push("chat", {name: "shokai", message: "hello"}); // client -> server
+});
 ```
 
 Server Side
@@ -80,8 +83,8 @@ end
 Client Side
 
 ```javascript
-io.on("connect", function(session){
-  alert("connect!!");
+io.on("connect", function(session_id){
+  alert("connect!! "+session_id);
 });
 ```
 
@@ -90,6 +93,7 @@ Server Side
 ```ruby
 io.on :connect do |session|
   puts "new client <#{session}>"
+  io.push :hello, "hello new client!!"
 end
 
 io.on :disconnect do |session|

data/lib/sinatra-cometio/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
   module CometIO
-    VERSION = '0.3.9'
+    VERSION = '0.4.0'
   end
 end

data/lib/sinatra/cometio/client.rb

@@ -3,74 +3,76 @@ require 'event_emitter'
 require 'httparty'
 require 'json'
 
-module CometIO
-  class Client
-    class Error < StandardError
-    end
+module Sinatra
+  module CometIO
+    class Client
+      class Error < StandardError
+      end
 
-    include EventEmitter
-    attr_reader :url, :session
+      include EventEmitter
+      attr_reader :url, :session
 
-    def initialize(url)
-      raise ArgumentError, "invalid URL (#{url})" unless url.kind_of? String and url =~ /^https?:\/\/.+/
-      @url = url
-      @session = nil
-      @running = false
-    end
+      def initialize(url)
+        raise ArgumentError, "invalid URL (#{url})" unless url.kind_of? String and url =~ /^https?:\/\/.+/
+        @url = url
+        @session = nil
+        @running = false
+      end
 
-    def push(type, data)
-      begin
-        res = HTTParty.post @url, :timeout => 10, :body => {:type => type, :data => data, :session => @session}
-        emit :error, "CometIO push error" unless res.code == 200
-      rescue StandardError, Timeout::Error => e
-        emit :error, "CometIO push error"
+      def push(type, data)
+        begin
+          res = HTTParty.post @url, :timeout => 10, :body => {:type => type, :data => data, :session => @session}
+          emit :error, "CometIO push error" unless res.code == 200
+        rescue StandardError, Timeout::Error => e
+          emit :error, "CometIO push error"
+        end
       end
-    end
 
-    def connect
-      return self if @running
-      self.on :__session_id do |session|
-        @session = session
-        self.emit :connect, @session
+      def connect
+        return self if @running
+        self.on :__session_id do |session|
+          @session = session
+          self.emit :connect, @session
+        end
+        @running = true
+        get
+        return self
       end
-      @running = true
-      get
-      return self
-    end
 
-    def close
-      @running = false
-      self.remove_listener :__session_id
-    end
+      def close
+        @running = false
+        self.remove_listener :__session_id
+      end
 
-    private
-    def get
-      Thread.new do
-        while @running do
-          begin
-            res = HTTParty.get "#{@url}?session=#{@session}", :timeout => 120
-            unless res.code == 200
+      private
+      def get
+        Thread.new do
+          while @running do
+            begin
+              res = HTTParty.get "#{@url}?session=#{@session}", :timeout => 120
+              unless res.code == 200
+                self.emit :error, "CometIO get error"
+                sleep 10
+                next
+              else
+                data_arr = JSON.parse res.body
+                data_arr = [data_arr] unless data_arr.kind_of? Array
+                data_arr.each do |data|
+                  self.emit data['type'], data['data']
+                end
+                next
+              end
+            rescue Timeout::Error, JSON::ParserError
+              next
+            rescue StandardError
               self.emit :error, "CometIO get error"
               sleep 10
               next
-            else
-              data_arr = JSON.parse res.body
-              data_arr = [data_arr] unless data_arr.kind_of? Array
-              data_arr.each do |data|
-                self.emit data['type'], data['data']
-              end
-              next
             end
-          rescue Timeout::Error, JSON::ParserError
-            next
-          rescue StandardError
-            self.emit :error, "CometIO get error"
-            sleep 10
-            next
           end
         end
       end
-    end
 
+    end
   end
 end

data/sample/bin/cui_chat_client.rb

@@ -5,7 +5,7 @@ require 'sinatra/cometio/client'
 
 name = `whoami`.strip || 'shokai'
 
-client = CometIO::Client.new('http://localhost:5000/cometio/io').connect
+client = Sinatra::CometIO::Client.new('http://localhost:5000/cometio/io').connect
 
 client.on :connect do |session|
   puts "connect!! (session_id:#{session})"

data/sample/config.ru

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'bundler/setup'
 Bundler.require
+require 'sinatra'
 require 'sinatra/base'
 if development?
   $stdout.sync = true
@@ -8,6 +9,8 @@ if development?
   $:.unshift File.expand_path '../lib', File.dirname(__FILE__)
 end
 require 'sinatra/cometio'
+require 'haml'
+require 'sass'
 require File.dirname(__FILE__)+'/main'
 
 set :haml, :escape_html => true

data/sinatra-cometio.gemspec

@@ -16,6 +16,11 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
+  gem.add_development_dependency 'minitest'
+  gem.add_development_dependency 'thin'
+  gem.add_development_dependency 'haml'
+  gem.add_development_dependency 'sass'
+
   gem.add_dependency 'sinatra-contrib', '>= 1.3.2'
   gem.add_dependency 'sinatra', '>= 1.3.0'
   gem.add_dependency 'eventmachine', '>= 1.0.0'

data/test/test_cometio.rb

@@ -11,7 +11,7 @@ class TestCometio < MiniTest::Unit::TestCase
   end
 
   def test_simple
-    client = CometIO::Client.new(App.cometio_url).connect
+    client = Sinatra::CometIO::Client.new(App.cometio_url).connect
     post_data = {:time => Time.now.to_s, :msg => 'hello!!'}
     res = nil
     client.on :broadcast do |data|
@@ -35,7 +35,7 @@ class TestCometio < MiniTest::Unit::TestCase
   def test_client_to_client2
     ## client --> server --> client2
 
-    client = CometIO::Client.new(App.cometio_url).connect
+    client = Sinatra::CometIO::Client.new(App.cometio_url).connect
     post_data = {:time => Time.now.to_s, :msg => 'hello!!', :to => nil}
     res = nil
     client.on :message do |data|
@@ -44,7 +44,7 @@ class TestCometio < MiniTest::Unit::TestCase
 
     res2 = nil
     client.on :connect do |session|
-      client2 = CometIO::Client.new(App.cometio_url).connect
+      client2 = Sinatra::CometIO::Client.new(App.cometio_url).connect
       client2.on :connect do |session2|
         post_data['to'] = session2
         client.push :message, post_data
@@ -69,7 +69,7 @@ class TestCometio < MiniTest::Unit::TestCase
 
   def test_broadcast
     ## client --> server --> client&client2
-    client = CometIO::Client.new(App.cometio_url).connect
+    client = Sinatra::CometIO::Client.new(App.cometio_url).connect
     post_data = {:time => Time.now.to_s, :msg => 'hello!!'}
     res = nil
     client.on :broadcast do |data|
@@ -79,7 +79,7 @@ class TestCometio < MiniTest::Unit::TestCase
 
     res2 = nil
     client.on :connect do |session|
-      client2 = CometIO::Client.new(App.cometio_url).connect
+      client2 = Sinatra::CometIO::Client.new(App.cometio_url).connect
       client2.on :connect do |session2|
         client.push :broadcast, post_data
       end

data/test/test_helper.rb

@@ -1,11 +1,10 @@
+$:.unshift File.expand_path '../lib', File.dirname(__FILE__)
 require 'rubygems'
 require 'bundler/setup'
 require 'minitest/autorun'
 require 'sinatra/cometio/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
     App.stop

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-cometio
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,72 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-21 00:00:00.000000000 Z
+date: 2013-03-23 00:00:00.000000000 Z
 dependencies:
+- !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
@@ -132,9 +196,6 @@ files:
 - lib/sinatra/cometio.rb
 - lib/sinatra/cometio/client.rb
 - sample/.gitignore
-- sample/Gemfile
-- sample/Gemfile.lock
-- sample/Procfile
 - sample/README.md
 - sample/bin/cui_chat_client.rb
 - sample/config.ru

data/sample/Gemfile

@@ -1,11 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'foreman'
-gem 'sinatra-contrib'
-gem 'sinatra'
-gem 'thin'
-gem 'event_emitter'
-gem 'json'
-gem 'haml'
-gem 'sass'
-gem 'httparty'

data/sample/Gemfile.lock

@@ -1,54 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    backports (3.1.1)
-    daemons (1.1.9)
-    event_emitter (0.2.4)
-    eventmachine (1.0.3)
-    foreman (0.62.0)
-      thor (>= 0.13.6)
-    haml (4.0.1)
-      tilt
-    httparty (0.10.2)
-      multi_json (~> 1.0)
-      multi_xml (>= 0.5.2)
-    json (1.7.7)
-    multi_json (1.7.1)
-    multi_xml (0.5.3)
-    rack (1.5.2)
-    rack-protection (1.5.0)
-      rack
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    sass (3.2.7)
-    sinatra (1.3.6)
-      rack (~> 1.4)
-      rack-protection (~> 1.3)
-      tilt (~> 1.3, >= 1.3.3)
-    sinatra-contrib (1.3.2)
-      backports (>= 2.0)
-      eventmachine
-      rack-protection
-      rack-test
-      sinatra (~> 1.3.0)
-      tilt (~> 1.3)
-    thin (1.5.1)
-      daemons (>= 1.0.9)
-      eventmachine (>= 0.12.6)
-      rack (>= 1.0.0)
-    thor (0.17.0)
-    tilt (1.3.6)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  event_emitter
-  foreman
-  haml
-  httparty
-  json
-  sass
-  sinatra
-  sinatra-contrib
-  thin

data/sample/Procfile

@@ -1 +0,0 @@
-web: bundle exec rackup config.ru -p $PORT