shooting_star 3.0.0 → 3.1.0

data/History.txt

@@ -1,3 +1,20 @@
+*** 3.1.0 / 2007-07-18
++ 1 major enhancement:
+  + Added 2 meteor_strike functions 'tuneInOut' and 'tuneOutIn'.
+  - Automatic activation/deactivation of flash client.
+  - Serialized event execution.
+
++ 1 minor enhancement:
+  + FileUtil is used instead of `shell command`.
+
++ 1 critical bugfix:
+  + Fixed broken `shooting_star init'.
+
++ 3 minor bugfixes:
+  + Corrected initialization order of meteor_strike DOM elements.
+  + Managed uncertainty situation of JS/Flash initialization.
+  + Applied a patch from Koizuka.
+
 *** 3.0.0 / 2007-06-22
 + 3 major enhancements:
   + Added flush client.

data/lib/shooting_star/server.rb

@@ -52,21 +52,22 @@ module ShootingStar
       end
       # load or create session informations
       @signature ||= @params['sig']
-      @channel_path ||= path[1..-1].split('?', 2)[0]
-      @query = "channel=#{@channel_path}&sig=#{@signature}"
+      channel_path = path[1..-1].split('?', 2)[0]
+      @channel_path ||= CGI.unescape(channel_path)
+      @query = "channel=#{channel_path}&sig=#{@signature}"
       @type = @params['__t__']
       # process verb
       if !@type
         make_connection(path)
       else
         prepare_channel(@channel_path)
+        @uid = @@uids[@signature] ||= @params['uid']
+        @tag = @@tags[@signature] ||=
+          (@params['tag'] || '').split(',').map{|i| CGI.unescape(i)}
         unless @@servers[@signature] || @type == 'rc'
           notify(:event => :enter, :uid => @uid, :tag => @tag)
           log "Connected: #{@uid}"
         end
-        @uid = @@uids[@signature] ||= @params['uid']
-        @tag = @@tags[@signature] ||=
-          (@params['tag'] || '').split(',').map{|i| CGI.unescape(i)}
         @executing = @@executings[@signature] ||= Hash.new
         @@servers[@signature] = self
         wait_for
@@ -193,15 +194,17 @@ module ShootingStar
       query += "&" + FormEncoder.encode(params) if params
       @execution += <<-"EOH"
       (function(){
+        var ms1 = document.getElementById('meteor-strike-1');
+        var box = ms1 ? ms1.parentNode : document.body;
         var iframe = document.createElement('iframe');
-        var remove = function(){document.body.removeChild(iframe)};
+        var remove = function(){box.removeChild(iframe)};
         var timer = setTimeout(remove, #{sweep_timeout});
         iframe.onload = function(){
           clearTimeout(timer);
           setTimeout(remove, 0);
         };
         iframe.src = '#{@params['execute']}/#{id}?#{query}';
-        document.body.appendChild(iframe);
+        box.appendChild(iframe);
       })();
       EOH
     end

data/lib/shooting_star.rb

@@ -3,11 +3,12 @@ require 'asteroid'
 require 'drb/drb'
 require 'yaml'
 require 'ftools'
+require 'fileutils'
 require 'shooting_star/config'
 require 'shooting_star/shooter'
 
 module ShootingStar
-  VERSION = '3.0.0'
+  VERSION = '3.1.0'
   CONFIG = Config.new(
     :config => 'config/shooting_star.yml',
     :pid_file => 'log/shooting_star.pid',
@@ -33,9 +34,9 @@ module ShootingStar
 
   # install config file and plugin
   def self.init
-    base_dir = CONFIG.directory || `pwd`.chop
+    base_dir = CONFIG.directory || FileUtils.pwd
     config_dir = File.join(base_dir, 'config')
-    `mkdir -p #{config_dir}` unless File.exist? config_dir
+    FileUtils.mkdir_p config_dir unless File.exist?(config_dir)
     config_file = File.join(config_dir, 'shooting_star.yml')
     unless File.exist? config_file
       open(config_file, 'w') do |file|
@@ -46,14 +47,13 @@ module ShootingStar
       end
     end
     log_dir = File.join(base_dir, 'log')
-    `mkdir -p #{log_dir}` unless File.exist? log_dir
+    FileUtils.mkdir_p(log_dir) unless File.exist?(log_dir)
     plugin_dir = File.join(base_dir, 'vendor/plugins')
-    `mkdir -p #{plugin_dir}` unless File.exist? plugin_dir
+    FileUtils.mkdir_p(plugin_dir) unless File.exist?(plugin_dir)
     meteor_strike_dir = File.join(plugin_dir, 'meteor_strike')
     src_dir = File.join(File.dirname(__FILE__),
       '../vendor/plugins/meteor_strike')
-    `mkdir -p #{meteor_strike_dir}`
-    `cp -Rf #{src_dir}/* #{meteor_strike_dir}`
+    FileUtils.cp_r(src_dir, plugin_dir)
   end
 
   def self.start(&block)

data/vendor/plugins/meteor_strike/generators/meteor/templates/controller.rb

@@ -4,7 +4,7 @@ class MeteorController < ApplicationController
   after_filter :notify_execution, :only => [:strike]
 
   def strike
-    @channel = params[:channel].split('/').map{|i| CGI.escape(i)}.join('/')
+    @channel = params[:channel]
     if params[:event].blank?
       meteor = Meteor.find(params[:id])
       @javascript = meteor.javascript

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

@@ -4,9 +4,12 @@
 (function(){
   var channel = #{@channel.to_json};
   var javascript = #{@javascript.to_json};
-  var meteorStrike = parent.parent.meteorStrike[channel];
-  if(meteorStrike) meteorStrike.execute(javascript);
-  else alert('Connection is not established to the ShootingStar server.');
+  var execute = function(){
+    var meteorStrike = parent.parent.meteorStrike[channel];
+    if(meteorStrike) meteorStrike.execute(javascript);
+    else setTimeout(execute, 0);
+  }
+  execute();
 })();
 }%>
 </head>

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

@@ -36,9 +36,10 @@ module MeteorStrike
       update_uri = "#{uri}/meteor/update"
       sig = Meteor.shooter.signature
       iframe_id = "meteor-strike-#{@meteor_strike}"
+      host_port = (server.split(':') << '80')[0..1].join(':')
       flash_vars = [
         "channel=#{channel}", "tag=#{tag}", "uid=#{uid}", "sig=#{sig}",
-        "base_uri=#{uri}", "server=#{server}"].join('&')
+        "base_uri=#{uri}", "server=#{host_port}"].join('&')
       flash_html = flash_tag(flash_vars) unless options[:noflash]
       <<-"EOH"
       <div style="position: absolute; top: -99999px; left: -99999px">
@@ -47,7 +48,7 @@ module MeteorStrike
         action="http://#{shooting_star_uri}">
         <input name="execute" value="#{uri}/meteor/strike" />
         <input name="tag" /><input name="uid" /><input name="sig" />
-      </form>#{flash_html}</div>
+      </form>
       <script type="text/javascript">
       //<![CDATA[
       var meteorStrike = meteorStrike || $H();
@@ -76,6 +77,14 @@ module MeteorStrike
         ms.tuneOut = function(tags){
           ms.update(UID, Array.prototype.without.apply(TAGS, tags));
         };
+        ms.tuneInOut = function(tagsIn, tagsOut){
+          var tags = TAGS.concat(tagsIn || []).uniq();
+          ms.update(UID, Array.prototype.without.apply(tags, tagsOut));
+        };
+        ms.tuneOutIn = function(tagsOut, tagsIn){
+          var tags = Array.prototype.without.apply(TAGS, tagsOut);
+          ms.update(UID, tags.concat(tagsIn || []).uniq());
+        };
         try{
           var noflash = #{options[:noflash].to_json};
           if(noflash || !flashVersion || flashVersion < 6){
@@ -91,7 +100,12 @@ module MeteorStrike
         }catch(e){}
       });
       function meteor_strike_#{@meteor_strike}_DoFSCommand(command, args){
-        if(command == 'execute') eval(args);
+        switch(command){
+        case 'execute': eval(args); break;
+        case 'event':
+          if(args == 'connect') (function(){#{options[:connected]}})();
+          break;
+        }
       }
       if(navigator.appName && navigator.appName.indexOf("Microsoft") != -1 &&
         navigator.userAgent.indexOf("Windows") != -1 &&
@@ -107,7 +121,7 @@ module MeteorStrike
           'End Sub', '</script\\>'].join(#{"\n".to_json}));
       }
       //]]>
-      </script>
+      </script>#{flash_html}</div>
       EOH
     end
 

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.3
 specification_version: 1
 name: shooting_star
 version: !ruby/object:Gem::Version 
-  version: 3.0.0
-date: 2007-06-22 00:00:00 +09:00
+  version: 3.1.0
+date: 2007-07-18 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
@@ -93,8 +93,10 @@ rdoc_options:
 - --exclude
 - ext/asteroid
 - README.txt
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- History.txt
+- Manifest.txt
+- README.txt
 executables: 
 - shooting_star
 extensions: 
@@ -118,5 +120,5 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.0
+        version: 1.2.1
     version: