em-cometio-client 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
---- 
-SHA512: 
-  metadata.gz: 1d2c863dde4908fc650be1807cb52ebc4d6830e4f0ed39c40e365f737a20c56ce35e3b7800608edcf293bd1596ea2467b29633dcfdc4728f8ba5986a101de764
-  data.tar.gz: 167970809b4741fb5ccdc72ef7305ebe3fdbf8ca9fa04abb0be3bd98cc8bbbbcd276a514aebf18c7287a75165a3242cee9e29a3bcbb29a45c0ca8ae36076390d
-SHA1: 
-  metadata.gz: dab8ae4e2635bdc7c47d3a2ad5820d585da8de26
-  data.tar.gz: fed2b23db5cb1caeae2fbbd52527e14a13274ef3
+---
+SHA1:
+  metadata.gz: 3aa9aae21b543d2bf036a2bf43057977f45e783a
+  data.tar.gz: 92475676563a8aaeec26a4d5e3f34648d4ab7122
+SHA512:
+  metadata.gz: 2ef2b31825a0e3aec99cf58d2ccb301721a24634ac256abaa30a2cca869327d4c47d7e31b0a48cad3ba459cbd1f650d30b143da325e342c4b2f77688510c945e
+  data.tar.gz: cf8d43790befe20e18e0414f19587a60f304c48f668597bdabd914dfc9b4932d1a57451c3217c990ceaad58e9f2ca0368f61c2e389a8db9313bef639c26f0755

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.1.1 2013-05-29
+
+* post with JSON for nested Array
+
 === 0.1.0 2013-04-02
 
 * use queue on push

data/README.md

@@ -66,9 +66,14 @@ Test
 
     % gem install bundler
     % bundle install
-    % export PORT=5000
-    % export PID_FILE=/tmp/em-cometio-client-testapp.pid
-    % rake test
+
+start server
+
+    % bundle exec rake test_server
+
+test
+
+    % bundle exec rake test
 
 
 Contributing

data/Rakefile

@@ -5,4 +5,10 @@ Rake::TestTask.new do |t|
   t.pattern = "test/test_*.rb"
 end
 
+desc "Start test server"
+task :test_server do
+  require File.expand_path 'test/app', File.dirname(__FILE__)
+  App.start
+end
+
 task :default => :test

data/lib/em-cometio-client/client.rb

@@ -20,11 +20,11 @@ module EventMachine
       private
       def flush
         return if !@running or @post_queue.size < 1
-        post_data = {:session => @session, :events => @post_queue}
+        post_data = {:json => {:session => @session, :events => @post_queue}.to_json}
+        @post_queue = []
         that = self
         http = EM::HttpRequest.new(@url, :connect_timeout => 10).
           post(:body => post_data)
-        @post_queue = []
         http.callback do |res|
         end
         http.errback do |err|

data/lib/em-cometio-client/version.rb

@@ -1,7 +1,7 @@
 module EventMachine
   module CometIO
     class Client
-      VERSION = "0.1.0"
+      VERSION = "0.1.1"
     end
   end
 end

data/test/app.rb

@@ -12,46 +12,15 @@ class App
     "http://localhost:#{port}/cometio/io"
   end
 
-  def self.pid_file
-    ENV['PID_FILE'] || "/tmp/em-cometio-client-testapp.pid"
-  end
-
   def self.app_dir
     File.expand_path 'app', File.dirname(__FILE__)
   end
 
-  def self.pid
-    return unless @running
-    File.open(pid_file) do |f|
-      pid = f.gets.strip.to_i
-      return pid if pid > 0
-    end
-    return
-  end
-
   def self.start
     return if @running
-    File.delete pid_file if File.exists? pid_file
-    Thread.new do
-      IO::popen "cd #{app_dir} && PID_FILE=#{pid_file} rackup config.ru -p #{port} > /dev/null 2>&1"
-    end
     @running = true
-    100.times do
-      if File.exists? pid_file
-        sleep 1
-        return true
-      end
-      sleep 0.1
-    end
-    @running = false
-    return false
-  end
-
-  def self.stop
-    return unless @running
-    system "kill #{pid}"
-    File.delete pid_file if File.exists? pid_file
-    @running = false
+    cmd = "cd #{app_dir} && bundle exec rackup config.ru -p #{port}"
+    system cmd
   end
 
 end

data/test/app/config.ru

@@ -2,6 +2,7 @@ require 'rubygems'
 require 'bundler'
 Bundler.require
 $stdout.sync = true
+$:.unshift File.expand_path '../../lib', File.dirname(__FILE__)
 require 'sinatra'
 require 'sinatra/base'
 require 'sinatra/cometio'

data/test/app/main.rb

@@ -1,8 +1,3 @@
-pid_file = ENV['PID_FILE'] || "/tmp/sinatra-cometio-test-pid"
-File.open(pid_file, "w+") do |f|
-  f.write Process.pid.to_s
-end
-
 class TestApp < Sinatra::Base
   register Sinatra::CometIO
   io = Sinatra::CometIO

data/test/test_em_cometio_client.rb

@@ -1,14 +1,6 @@
 require File.expand_path 'test_helper', File.dirname(__FILE__)
 
-class TestEmCometioClient < MiniTest::Unit::TestCase
-
-  def setup
-    App.start
-  end
-
-  def teardown
-    App.stop
-  end
+class TestEmCometioClient < MiniTest::Test
 
   def test_simple
     post_data = {:time => Time.now.to_s, :msg => 'hello!!'}

data/test/test_helper.rb

@@ -4,12 +4,3 @@ $:.unshift File.expand_path '../lib', File.dirname(__FILE__)
 require 'minitest/autorun'
 require 'em-cometio-client'
 require File.expand_path 'app', File.dirname(__FILE__)
-
-['SIGHUP', 'SIGINT', 'SIGKILL', 'SIGTERM'].each do |sig|
-  Kernel.trap sig do
-    App.stop
-    EM::add_timer do
-      EM::stop
-    end
-  end
-end

metadata

@@ -1,87 +1,120 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: em-cometio-client
-version: !ruby/object:Gem::Version 
-  version: 0.1.0
+version: !ruby/object:Gem::Version
+  version: 0.1.1
 platform: ruby
-authors: 
+authors:
 - Sho Hashimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-04-02 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-05-28 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: minitest
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - &id002 
-      - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: sinatra-cometio
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id002
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sinatra-cometio
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: thin
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id002
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: thin
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: eventmachine
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id002
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: eventmachine
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: em-http-request
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id002
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: em-http-request
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id002
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: event_emitter
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: event_emitter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
         version: 0.2.0
   type: :runtime
-  version_requirements: *id008
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 description: Sinatra CometIO client for eventmachine
-email: 
+email:
 - hashimoto@shokai.org
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - History.txt
@@ -100,30 +133,31 @@ files:
 - test/test_helper.rb
 homepage: https://github.com/shokai/em-cometio-client
 licenses: []
-
 metadata: {}
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id002
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id002
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Sinatra CometIO client for eventmachine
-test_files: 
+test_files:
 - test/app.rb
 - test/app/config.ru
 - test/app/main.rb
 - test/test_em_cometio_client.rb
 - test/test_helper.rb
+has_rdoc: