sinatra-rocketio-linda 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bd0f0169cf2d5ffbd3ddb33d57c714f2c4cc60c
-  data.tar.gz: 009f53e47103bc7f183cc73c8e957467e097ca61
+  metadata.gz: 4f961baf37e6d4b33c7d5efdb8b20bd6c1d5eb97
+  data.tar.gz: 2c484ead40fc4246964fe2dc16528edf1e063d13
 SHA512:
-  metadata.gz: 8d6d37b957f7a54c21ce502c157c507cbb22f47954b290463784996c72bae67bc72ed3662d94bb7c923c8bba0faad0d3e7a6e1993acb343115f877d5519f6807
-  data.tar.gz: 2081757894b6210a146fbd42b0b997664076b4cd2d04ce26e76fb1cbcdda6405cf88e04e560cbb05ed1b61d7930701cf3a2b9daeeb516c809b4a6bdbf83e48b4
+  metadata.gz: 124abdcece62bcfd64717082315224741138fdc8fa689b8ce89981353f27cfdb8e603d5070c56fa31e407f8ea2fdf1f9f0ef88a3da02c676baa7a3b81533e7d8
+  data.tar.gz: 969ace1dbde8e3c8ef73a34b7fe51915920969af0e27907386ded1d8eefbb9a56aca59dac3ac2a2f27b2369d3b5101396256e0d6b97d66c3d7bcdf7565bb1e94

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.0.5 2013-05-20
+
+* include rocketio_js into linda_js
+* passed all tests
+
 === 0.0.4 2013-05-19
 
 * move Tuple/TupleSpace code to linda gem (https://rubygems.org/gems/linda)

data/README.md

@@ -66,7 +66,6 @@ Client Side
 
 ```html
 <script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
-<script src="<%= rocketio_js %>"></script>
 <script src="<%= linda_js %>"></script>
 ```
 

data/lib/sinatra-rocketio-linda/javascript.rb

@@ -3,12 +3,19 @@ module Sinatra
     module Linda
 
       def self.javascript(*js_file_names)
-        js_file_names = ['linda.js']
+        js_file_names = ['rocketio.js', 'linda.js']
         js = ''
         js_file_names.each do |i|
-          File.open(File.expand_path "../js/#{i}", File.dirname(__FILE__)) do |f|
-            js += f.read+"\n"
-          end
+          js += case i
+                when 'rocketio.js'
+                  Sinatra::RocketIO.javascript
+                else
+                  j = ''
+                  File.open(File.expand_path "../js/#{i}", File.dirname(__FILE__)) do |f|
+                    j = f.read
+                  end
+                  j
+                end + "\n"
         end
         js
       end

data/lib/sinatra-rocketio-linda/linda.rb

@@ -60,7 +60,7 @@ end
       next
     end
     eid = Sinatra::RocketIO::Linda[space].__send__ func, tuple do |tuple|
-      Sinatra::RocketIO.push "__linda_#{func}_callback_#{callback}", tuple.data, :to => client.session
+      Sinatra::RocketIO.push "__linda_#{func}_callback_#{callback}", tuple, :to => client.session
     end
     Sinatra::RocketIO.on :disconnect do |_client|
       Sinatra::RocketIO::Linda[space].remove_callback eid if client.session == _client.session

data/lib/sinatra/rocketio/linda/version.rb

@@ -1,7 +1,7 @@
 module Sinatra
   module RocketIO
     module Linda
-      VERSION = "0.0.4"
+      VERSION = "0.0.5"
     end
   end
 end

data/sample/main.rb

@@ -9,6 +9,10 @@ io.on :disconnect do |client|
   puts "bye <#{client}>"
 end
 
+io.on :* do |event, data, client|
+  puts "#{event} - #{data}  <#{client}>" if event.to_s =~ /linda/
+end
+
 linda.on :error do |err|
   STDERR.puts err
 end

data/sample/views/client.haml

@@ -4,7 +4,6 @@
     %meta{'http-equiv' => 'Content-Type', :content => 'text/html', :charset => 'UTF-8'}
     %title Linda Client on RocketIO
     %script{:src => "//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"}
-    %script{:src => rocketio_js}
     %script{:src => linda_js}
     %script{:src => "/client.js"}
   %body

data/sample/views/worker.haml

@@ -4,7 +4,6 @@
     %meta{'http-equiv' => 'Content-Type', :content => 'text/html', :charset => 'UTF-8'}
     %title Linda Worker on RocketIO
     %script{:src => "//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"}
-    %script{:src => rocketio_js}
     %script{:src => linda_js}
     %script{:src => "/worker.js"}
   %body

data/test/test_rubyclient.rb

@@ -110,7 +110,7 @@ class TestRubyClient < MiniTest::Test
         _tuple1 = tuple
       end
       sleep 3
-      @client.io.push :check_expire, []
+      push :check_expire, nil
       ts.read ["expire",1,2] do |tuple|
         _tuple2 = tuple
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-rocketio-linda
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Sho Hashimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-18 00:00:00.000000000 Z
+date: 2013-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler