shooting_star 3.2.4 → 3.2.5

data/History.txt

@@ -1,3 +1,9 @@
+*** 3.2.5 / 2007-12-10
++ 1 major enhancement
+  + Implemented user agent detection for ipod/iphone.
++ 1 minor bugfix
+  + Fixed acquisition of meteorStrike object in iframe.
+
 *** 3.2.4 / 2007-09-20
 + 1 major spec change:
   + Using ExternalInterface instead of fscommand.

data/lib/shooting_star/server.rb

@@ -240,8 +240,9 @@ module ShootingStar
       assets = URI.parse(@params['execute'])
       assets.path = '/javascripts/prototype.js'
       assets.query = assets.fragment = nil
-      query = @query.sub(%r[\&sig=\d+], '') + '&__s__=0'
+      query = @query.sub(%r[\&sig=\d+], '')
       query += "&" + FormEncoder.encode(:event => :init, :type => :xhr)
+      query += '#0'
       event_id = MD5.new("event-init-xhr-#{Asteroid::now}").to_s
       heartbeat = @params['heartbeat'].to_i
       send_data "HTTP/1.1 200 OK\nContent-Type: text/html\n\n" +

data/lib/shooting_star/version.rb

@@ -1,3 +1,3 @@
 module ShootingStar
-  VERSION = '3.2.4'
+  VERSION = '3.2.5'
 end

data/test/test_helper.rb

@@ -31,3 +31,9 @@ class Test::Unit::TestCase
 
   # Add more helper methods to be used by all tests here...
 end
+
+class ActionController::TestRequest
+  def user_agent
+    env['HTTP_USER_AGENT'] || self.class.to_s
+  end
+end

data/vendor/plugins/meteor_strike/generators/meteor/templates/view.rhtml

@@ -8,9 +8,9 @@
     var channel = #{@channel.to_json};
     var javascript = #{@javascript.to_json};
     var execute = function(){
-      var ms = parent.parent.meteorStrike[channel];
+      var ms = (parent.meteorStrike || parent.parent.meteorStrike)[channel];
       if(ms) ms.evaluate(javascript, location.hash.slice(1));
-      else setTimeout(evaluate, 0);
+      else setTimeout(execute, 0);
     };
     execute();
   })();

data/vendor/plugins/meteor_strike/lib/meteor_strike/helper.rb

@@ -18,6 +18,9 @@ module MeteorStrike
         cc += 'post-check=0, pre-check=0'
         controller.headers['Cache-Control'] = cc
       end
+      if !!request.user_agent[/iPhone|iPod/]
+        options[:noflash] = true
+      end
       @meteor_strike = controller.install_meteor_strike
       config = Meteor::config
       server = Meteor::server

data/vendor/plugins/meteor_strike/views/xhr.rhtml

@@ -45,8 +45,11 @@
       ms.getTags = function(){return TAGS};
       ms.getUid = function(){return UID};
       ms.executionQueue = {};
-      ms.executionCounter = 0;
+      ms.executionCounter = null;
       ms.evaluate = function(js, serialId){
+        if(ms.executionCounter == null){
+          ms.executionCounter = serialId;
+        }
         ms.executionQueue[serialId] = js;
         if(serialId == ms.executionCounter){
           while(js = ms.executionQueue[ms.executionCounter]){
@@ -54,6 +57,14 @@
             delete ms.executionQueue[ms.executionCounter];
             ++ms.executionCounter;
           }
+        }else{
+          setTimeout(function(){
+            if(js = ms.executionQueue[this]){
+              eval(js);
+              delete ms.executionQueue[this];
+              ms.executionCounter = null;
+            }
+          }.bind(serialId), 3000);
         }
       };
       ms.event = function(params){

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: shooting_star
 version: !ruby/object:Gem::Version 
-  version: 3.2.4
-date: 2007-09-21 00:00:00 +09:00
+  version: 3.2.5
+date: 2007-12-10 00:00:00 +09:00
 summary: Our goal is development of practical comet server which will be achieving over 100,000 simultaneous connections per host. On this purpose, we abandon portability and use system calls depending on particular OS such as epoll and kqueue.
 require_paths: 
 - lib