sinatra-cometio 0.1.3 → 0.1.4

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.1.4 2013-3-2
+
+* add CometIO::Client
+
 === 0.1.3 2013-2-19
 
 * bugfix queing on CometIO.push

data/lib/sinatra/application.rb

@@ -58,8 +58,8 @@ module Sinatra
       type = params[:type]
       data = params[:data]
       from = params[:session]
-      CometIO.emit type, data, from if type.size > 0
-      {:session => session, :type => type, :data => data}.to_json
+      CometIO.emit type, data, from if type.to_s.size > 0
+      {:session => from, :type => type, :data => data}.to_json
     end
     
   end

data/lib/sinatra/cometio/client.rb

@@ -0,0 +1,63 @@
+require File.expand_path '../../sinatra-cometio/version', File.dirname(__FILE__)
+require 'event_emitter'
+require 'httparty'
+require 'json'
+
+class CometIO
+  class Client
+    class Error < StandardError
+    end
+
+    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
+    end
+
+    def push(type, data)
+      begin
+        res = HTTParty.post @url, :body => {:type => type, :data => data, :session => @session}
+      rescue StandardError, Timeout::Error => e
+        emit :error, "CometIO push error"
+      ensure
+        emit :error, "CometIO push error" unless res.code == 200
+      end
+    end
+
+    def connect
+      self.on :__session_id do |session|
+        @session = session
+        self.emit :connect, @session
+      end
+      get
+      return self
+    end
+
+    private
+    def get
+      Thread.new do
+        loop do
+          begin
+            res = HTTParty.get "#{@url}?session=#{@session}", :timeout => 60000
+            unless res.code == 200
+              self.emit :error, "CometIO get error"
+              sleep 10
+              next
+            else
+              data = JSON.parse res.body
+              self.emit data['type'], data['data']
+            end
+          rescue StandardError, Timeout::Error
+            self.emit :error, "CometIO get error"
+            sleep 10
+            next
+          end
+        end
+      end
+    end
+
+  end
+end

data/lib/sinatra-cometio/version.rb

@@ -1,3 +1,3 @@
 module SinatraCometIO
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

data/sample/Gemfile

@@ -9,3 +9,4 @@ gem 'event_emitter'
 gem 'json'
 gem 'haml'
 gem 'sass'
+gem 'httparty'

data/sample/Gemfile.lock

@@ -1,21 +1,27 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    backports (2.8.2)
+    backports (3.0.3)
     daemons (1.1.9)
     event_emitter (0.2.2)
-    eventmachine (1.0.0)
+    eventmachine (1.0.1)
     foreman (0.61.0)
       thor (>= 0.13.6)
-    haml (3.1.7)
-    json (1.7.6)
-    rack (1.5.1)
-    rack-protection (1.3.2)
+    haml (4.0.0)
+      tilt
+    httparty (0.10.2)
+      multi_json (~> 1.0)
+      multi_xml (>= 0.5.2)
+    json (1.7.7)
+    multi_json (1.6.1)
+    multi_xml (0.5.3)
+    rack (1.5.2)
+    rack-protection (1.4.0)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    sass (3.2.5)
-    sinatra (1.3.4)
+    sass (3.2.6)
+    sinatra (1.3.5)
       rack (~> 1.4)
       rack-protection (~> 1.3)
       tilt (~> 1.3, >= 1.3.3)
@@ -31,7 +37,7 @@ GEM
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
     thor (0.17.0)
-    tilt (1.3.3)
+    tilt (1.3.4)
 
 PLATFORMS
   ruby
@@ -40,6 +46,7 @@ DEPENDENCIES
   event_emitter
   foreman
   haml
+  httparty
   json
   rack
   sass

data/sample/README.md

@@ -20,6 +20,12 @@ Run
 => http://localhost:5000
 
 
+CUI Client
+----------
+
+    % ruby bin/cui_chat_client.rb
+
+
 Deploy Heroku
 -------------
 

data/sample/bin/cui_chat_client.rb

@@ -0,0 +1,26 @@
+require 'rubygems'
+require 'bundler/setup'
+$:.unshift File.expand_path '../../lib', File.dirname(__FILE__)
+require 'sinatra/cometio/client'
+
+name = `whoami`.strip || 'shokai'
+
+client = CometIO::Client.new('http://localhost:5000/cometio/io').connect
+
+client.on :connect do |session|
+  puts "connect!! (session_id:#{session})"
+end
+
+client.on :chat do |data|
+  puts "<#{data['name']}> #{data['message']}"
+end
+
+client.on :error do |err|
+  STDERR.puts err
+end
+
+loop do
+  line = STDIN.gets.strip
+  next if line.empty?
+  client.push :chat, {:message => line, :name => name}
+end

data/sinatra-cometio.gemspec

@@ -22,4 +22,5 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'sinatra-contrib', '>= 1.3.2'
   gem.add_dependency 'json', '>= 1.7.0'
   gem.add_dependency 'event_emitter', '>= 0.2.0'
+  gem.add_dependency 'httparty'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-cometio
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-18 00:00:00.000000000 Z
+date: 2013-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -107,6 +107,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.2.0
+- !ruby/object:Gem::Dependency
+  name: httparty
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Node.js like Comet I/O plugin for Sinatra.
 email:
 - hashimoto@shokai.org
@@ -126,11 +142,13 @@ files:
 - lib/sinatra-cometio/version.rb
 - lib/sinatra/application.rb
 - 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
 - sample/main.rb
 - sample/public/js/index.js