shooting_star 3.1.0 → 3.2.0

data/History.txt

@@ -1,8 +1,29 @@
+*** 3.2.0 / 2007-08-09
++ 3 major enhancements:
+  + Automatic activation/deactivation of flash client.
+  + Ported meteor_strike.swf from CS3 to mtasc.
+  + Heart beat.
+  - Serialized event execution.
++ 7 minor enhancements:
+  + shooting_star.yml is processed by ERB.
+  + Updated implementation of observers.
+  + Updated chat generator with connection notification.
+  + Added sample chat observer script (see script/chat_observer).
+  + Separated views of xhr and flash html into views/.
+  + Added an event which will fire when connection is established.
+  + Added debugging mode to meteor_strike.
++ 6 minor spec changes:
+  + Changed default pid file location from log/ to tmp/pids/.
+  + options[:connected] obsoleted. Please use options[:event] instead.
+  + Became independent from alias_method_chain in order to support applications
+    which use older versions (<1.2) of ruby on rails.
+  + Added :debug option to meteor_strike helper.
+  + Added :heartbeart option to meteor_strike helper.
+  + Added :noflash option to meteor_strike helper.
+
 *** 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`.

data/Manifest.txt

@@ -24,6 +24,11 @@ vendor/plugins/meteor_strike/Rakefile
 vendor/plugins/meteor_strike/init.rb
 vendor/plugins/meteor_strike/lib
 vendor/plugins/meteor_strike/lib/meteor_strike.rb
+vendor/plugins/meteor_strike/lib/meteor_strike
+vendor/plugins/meteor_strike/lib/meteor_strike/helper.rb
+vendor/plugins/meteor_strike/views
+vendor/plugins/meteor_strike/views/xhr.rhtml
+vendor/plugins/meteor_strike/views/flash.rhtml
 vendor/plugins/meteor_strike/test
 vendor/plugins/meteor_strike/test/meteor_strike_test.rb
 vendor/plugins/meteor_strike/generators

data/Rakefile

@@ -37,7 +37,7 @@ desc 'default gem task.'
 task :gem => 'gem:default'
 
 desc 'update generator template files.'
-task 'update_generator_template_files' do
+task 'update_generator_template_files' => :swf do
   templates = 'vendor/plugins/meteor_strike/generators/meteor/templates'
   cp 'app/controllers/meteor_controller.rb',
     templates + '/controller.rb'
@@ -51,7 +51,21 @@ task 'update_generator_template_files' do
     templates + '/unit_test.rb'
   cp 'test/functional/meteor_controller_test.rb',
     templates + '/functional_test.rb'
+  cp 'public/meteor_strike.swf',
+    templates + '/meteor_strike.swf'
 end
 
 desc 'test all tests'
 task 'test:all' => [:test, 'test:plugins', 'test:exts', 'test:libs']
+
+desc 'default task'
+task :default => 'test:all'
+
+desc 'make swf file'
+task :swf => 'public/meteor_strike.swf'
+
+file 'public/meteor_strike.swf' => 'as/meteor_strike.as' do
+  sh ['mtasc -version 6 -header 300:300:30',
+      '-swf public/meteor_strike.swf',
+      '-main as/meteor_strike.as'].join(' ')
+end

data/lib/shooting_star.rb

@@ -4,14 +4,15 @@ require 'drb/drb'
 require 'yaml'
 require 'ftools'
 require 'fileutils'
+require 'erb'
 require 'shooting_star/config'
 require 'shooting_star/shooter'
 
 module ShootingStar
-  VERSION = '3.1.0'
+  VERSION = '3.2.0'
   CONFIG = Config.new(
     :config => 'config/shooting_star.yml',
-    :pid_file => 'log/shooting_star.pid',
+    :pid_file => 'tmp/pids/shooting_star.pid',
     :log_file => 'log/shooting_star.log',
     :daemon => false,
     :slient => false,
@@ -24,12 +25,14 @@ module ShootingStar
       @log_file = nil
     end
     config_file = options[:config] || CONFIG.config
-    CONFIG.merge!(YAML.load_file(config_file)) if File.exist?(config_file)
+    if File.exist?(config_file)
+      CONFIG.merge!(YAML.load(ERB.new(open(config_file).read).result))
+    end
     CONFIG.merge!(options)
   end
 
   def self.shooter
-    @@shooter ||= DRbObject.new_with_uri(CONFIG.shooter.uri)
+    @@shooter ||= DRb.start_service && DRbObject.new(nil, CONFIG.shooter.uri)
   end
 
   # install config file and plugin
@@ -48,6 +51,8 @@ module ShootingStar
     end
     log_dir = File.join(base_dir, 'log')
     FileUtils.mkdir_p(log_dir) unless File.exist?(log_dir)
+    pid_dir = File.join(base_dir, 'tmp/pids')
+    FileUtils.mkdir_p(pid_dir) unless File.exist?(pid_dir)
     plugin_dir = File.join(base_dir, 'vendor/plugins')
     FileUtils.mkdir_p(plugin_dir) unless File.exist?(plugin_dir)
     meteor_strike_dir = File.join(plugin_dir, 'meteor_strike')
@@ -84,7 +89,7 @@ module ShootingStar
         @log_file.close if @log_file
       end
       log "shooting_star service started."
-      Process.kill(:ALRM, Process.ppid) if CONFIG.daemon
+      Process.kill(:ALRM, Process.ppid) rescue nil if CONFIG.daemon
       block.call if block
     end
   end
@@ -111,7 +116,7 @@ module ShootingStar
   end
 
   def self.report
-    puts "#{'-' * 79}\nconnections channel name\n#{'-' * 79}"
+    puts "#{'-' * 79}\nconnections channel_name\n#{'-' * 79}"
     total_connections = 0
     shooter.channels.each do |channel_path|
       count = shooter.count(channel_path)
@@ -121,6 +126,13 @@ module ShootingStar
       total_connections +=  count
     end
     puts "#{'-' * 79}\n%11d %s\n#{'-' * 79}" % [total_connections, 'TOTAL']
+    total_observers = 0
+    puts "observers   channel_name\n#{'-' * 79}"
+    shooter.observers.each do |channel_path, observers|
+      puts "%11d %s" % [observers.size, channel_path]
+      total_observers += observers.size
+    end
+    puts "#{'-' * 79}\n%11d %s\n#{'-' * 79}" % [total_observers, 'TOTAL']
   end
 
   def self.timestamp

data/lib/shooting_star/channel.rb

@@ -1,23 +1,22 @@
-require 'set'
-
 module ShootingStar
   class Channel
     attr_reader :path, :waiters
     @@channels = {}
+    @@observers = Hash.new{|h,k| h[k] = Hash.new}
 
     def initialize(channel_path)
       @path = channel_path
       @waiters = Hash.new
-      @observers = Set.new
       @@channels[path] = self
     end
 
     def transmit(id, params)
       if event = params[:event]
-        @observers.each do |obs|
+        observers = @@observers.has_key?(@path) ? @@observers[@path].dup : nil
+        observers.each do |name, obs|
           begin obs.__send__(event, params) if obs.respond_to?(event)
-          rescue Exception; @observers.delete(obs) end
-        end
+          rescue Exception; Channel.ignore(@path, name) end
+        end if observers
       end
       @waiters.each do |signature, server|
         server.commit if server.respond(id, params)
@@ -30,12 +29,19 @@ module ShootingStar
     end
 
     def leave(server) @waiters.delete(server.signature) end
-    def observe(observer) @observers << observer end
-    def ignore(observer) @observers.delete(observer) end
-
-    def self.[](channel_path); @@channels[channel_path] end
+    def self.[](channel_path) @@channels[channel_path] end
     def self.list; @@channels.keys end
     def self.sweep; @@channels.delete_if{|k,v| v.waiters.empty?} end
+    def self.observers; @@observers end
+
+    def self.observe(channel_path, observer)
+      @@observers[channel_path][observer.name] = observer
+    end
+
+    def self.ignore(channel_path, name)
+      @@observers[channel_path].delete(name)
+      @@observers.delete(channel_path) if @@observers[channel_path].empty?
+    end
 
     def self.cleanup(channel_path)
       if @@channels[channel_path] && @@channels[channel_path].waiters.empty?

data/lib/shooting_star/server.rb

@@ -25,6 +25,7 @@ module ShootingStar
 
     # receive the data sent from client.
     def receive_data(data)
+      return if data.length == 0
       return send_policy_file if @data.length == 0 &&
         data == "<policy-file-request/>"
       @data += data
@@ -64,7 +65,7 @@ module ShootingStar
         @uid = @@uids[@signature] ||= @params['uid']
         @tag = @@tags[@signature] ||=
           (@params['tag'] || '').split(',').map{|i| CGI.unescape(i)}
-        unless @@servers[@signature] || @type == 'rc'
+        if !@@servers[@signature] && @type != 'rc'
           notify(:event => :enter, :uid => @uid, :tag => @tag)
           log "Connected: #{@uid}"
         end
@@ -165,6 +166,8 @@ module ShootingStar
       event_id = ShootingStar::timestamp
       log "Event(#{event_id}): #{@channel_path}:#{params.inspect}"
       Channel[@channel_path].transmit("event-#{event_id}", params)
+    rescue Exception => e
+      log "ERROR: #{e.message}\n#{e.backtrace.join("\n")}"
     end
 
     # wait for commands or events until they occur. if they're already in
@@ -194,7 +197,7 @@ module ShootingStar
       query += "&" + FormEncoder.encode(params) if params
       @execution += <<-"EOH"
       (function(){
-        var ms1 = document.getElementById('meteor-strike-1');
+        var ms1 = document.getElementById('meteor-strike-1-form');
         var box = ms1 ? ms1.parentNode : document.body;
         var iframe = document.createElement('iframe');
         var remove = function(){box.removeChild(iframe)};
@@ -214,9 +217,16 @@ module ShootingStar
       assets = URI.parse(@params['execute'])
       assets.path = '/javascripts/prototype.js'
       assets.query = assets.fragment = nil
+      query = @query.sub(%r[\&sig=\d+], '')
+      query += "&" + FormEncoder.encode(:event => :init, :type => :xhr)
+      heartbeat = @params['heartbeat'].to_i
       send_data "HTTP/1.1 200 OK\nContent-Type: text/html\n\n" +
       <<-"EOH"
-      <html><head><script type="text/javascript" src="#{assets}"></script>
+      <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+       "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+      <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head>
+      <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
+      <script type="text/javascript" src="#{assets}"></script>
       <script type="text/javascript">
       //<![CDATA[
       var connect = function(reconnect)
@@ -232,10 +242,15 @@ module ShootingStar
           request.transport.abort();
         };
         Event.observe(window, 'unload', disconnect);
+        if(#{heartbeat} > 0) setTimeout(function(){
+          if(request.transport.readyState == 1) disconnect(), connect(true);
+        }, [#{heartbeat}, 60].max() * 1000);
       };
       setTimeout(function(){connect(false)}, 0);
       //]]>
-      </script></head><body></body></html>
+      </script></head><body>
+        <iframe src="#{@params['execute']}/0?#{query}"></iframe>
+      </body></html>
       EOH
     rescue Exception
     ensure

data/lib/shooting_star/shooter.rb

@@ -3,11 +3,11 @@ require 'shooting_star/channel'
 # DRbObject
 module ShootingStar
   class Shooter
-    # broadcast message
-    def shoot(channel_path, id, tag)
+    # broadcast/multicast message
+    def shoot(channel_path, id, tag, options = {})
       return unless Channel[channel_path]
-      log "Shot: #{channel_path}:#{id}:#{tag.join(',')}"
-      Channel[channel_path].transmit(id, :tag => tag)
+      log "Shot: #{channel_path}:#{id}:#{tag.join(',')}:#{options}"
+      Channel[channel_path].transmit(id, options.merge(:tag => tag))
     end
 
     # update client properties
@@ -18,6 +18,7 @@ module ShootingStar
 
     def signature; ShootingStar::timestamp end
     def channels; Channel.list end
+    def observers; Channel.observers end
     def sweep; Channel.sweep end
 
     # count up listeners
@@ -56,12 +57,8 @@ module ShootingStar
 
     # observe server side events
     def observe(channel_path, observer)
-      Channel[channel_path].observe(observer)
-    end
-
-    # ignore server side events
-    def ignore(channel_path, observer)
-      Channel[channel_path].ignore(observer)
+      Channel.observe(channel_path, observer)
+    rescue Exception 
     end
 
   private

data/test/lib/shooting_star_test.rb

@@ -6,14 +6,16 @@ require 'thread'
 $command_line = 'echo "testing"'
 
 class ShootingStarTest < Test::Unit::TestCase
-  module TestObserver
-    def self.enter(params) @params = params end
-    def self.params; @params end
+  class TestObserver
+    include DRb::DRbUndumped
+    def name; 'test-observer' end
+    def enter(params) @params = params end
+    def params; @params end
   end
 
   def setup
     @config = ShootingStar.configure :silent => true,
-      :pid_file => 'log/shooting_star.test.pid',
+      :pid_file => 'tmp/pids/shooting_star.test.pid',
       :log_file => 'log/shooting_star.test.log',
       :server => {:host => '127.0.0.1', :port => 8081},
       :shooter => {:uri => 'druby://127.0.0.1:7124'}
@@ -69,22 +71,25 @@ class ShootingStarTest < Test::Unit::TestCase
     assert_not_nil client2
     shooter = DRbObject.new_with_uri('druby://127.0.0.1:7124')
     assert_not_nil shooter
-    shooter.observe('test/channel', TestObserver)
+    observer = TestObserver.new
+    assert_not_nil observer
+    shooter.observe('test/channel', observer)
     mutex = Mutex.new
     mutex.lock
-    assert_nil TestObserver.params
+    assert_nil observer.params
     Thread.new do
       send(client1, "POST", "test/channel", "#{@query}&__t__=c")
       mutex.unlock
     end
     mutex.lock
-    assert_nil TestObserver.params
+    assert_nil observer.params
     Thread.new do
       send(client2, "POST", "test/channel", "#{@query2}&__t__=c")
       mutex.unlock
     end
     mutex.lock
-    assert_equal :enter, TestObserver.params[:event]
+    assert_not_nil observer.params
+    assert_equal :enter, observer.params[:event]
     assert_not_nil result1 = client1.read
     assert_not_nil result1.index('meteor/strike/event-')
     shooter.shoot("test/channel", 12, [])

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

@@ -21,4 +21,12 @@ class <%= class_name %>Controller < ApplicationController
       page[:chat_message].focus
     end
   end
+
+  def connect
+    @chat = <%= class_name %>.new(
+      :name => '(* system *)',
+      :created_at => Time.now,
+      :message => "connection established on #{params[:client_type]}.")
+    render :action => 'show'
+  end
 end

data/vendor/plugins/meteor_strike/generators/chat/templates/index.rhtml

@@ -8,4 +8,11 @@
   <%%= render_component :action => 'show', :id => chat.id %>
 <%% end %>
 </ul>
-<%%= meteor_strike '<%= file_name %>' %>
+<%%= meteor_strike '<%= file_name %>', :event => %Q{
+  switch(params.event){
+  case 'init':
+    new Ajax.Updater('chat-list', #{url_for(:action => 'connect').to_json}, {
+      insertion: Insertion.Top, parameters: {client_type: params.type}});
+    break;
+  }
+} %>

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

@@ -1,22 +1,31 @@
 require 'drb/drb'
 
 class Meteor < ActiveRecord::Base
+  DEFAULT_SERVER_URI = 'localhost:8080'
+  DEFAULT_SHOOTER_URI = 'druby://localhost:7123'
+
   class Shooter
     COUNTERS = [:count, :count_with]
     LISTINGS = [:listeners, :listeners_with, :channels, :signatures]
+    EITHEROFS = [:signature]
+    MAX_RETRY = 10
 
     def initialize(config)
-      config['shooting_star'] ||= {'shooter' => 'druby://localhost:7123'}
+      config['shooting_star'] ||= {'shooter' => Meteor::DEFAULT_SHOOTER_URI}
       uris = config['shooting_star']['shooter']
-      @shooters = [uris].flatten.map{|uri| DRbObject.new_with_uri(uri)}
+      @shooters = [uris].flatten.map{|uri| DRbObject.new(nil, uri)}
     end
 
     COUNTERS.each do |m|
-      define_method(m){|*a| call(m, *a).inject(0){|r,c| r += c}}
+      eval "def #{m}(*a, &b) call('#{m}',*a,&b).inject(0){|r,c| r+=c} end"
     end
 
     LISTINGS.each do |m|
-      define_method(m){|*a| call(m, *a).inject([]){|r,c| r.concat c}}
+      eval "def #{m}(*a, &b) call('#{m}',*a,&b).inject([]){|r,c|r.concat c} end"
+    end
+    
+    EITHEROFS.each do |m|
+      eval "def #{m}(*a, &b) round_robin('#{m}',*a,&b) end"
     end
 
     def method_missing(method, *args, &block)
@@ -29,21 +38,44 @@ class Meteor < ActiveRecord::Base
         begin
           result << shooter.__send__(method, *args, &block)
         rescue Exception => e
-          Meteor.logger.error "#{e.message}\n#{e.backtrace.join("\n")}"
+          Meteor::logger.error "#{e.message}\n#{e.backtrace.join("\n")}"
         end
         result
       end || []
     end
+
+    def round_robin(method, *args, &block)
+      @round_robin_counter = (@round_robin_counter.to_i + 1) % @shooters.size
+      @shooters[@round_robin_counter].__send__(method, *args, &block)
+    rescue Exception
+      (@retry_counter = @retry_counter.to_i + 1) <= MAX_RETRY ? retry : raise
+    end
+  end
+
+  def self.config
+    returning(configurations[RAILS_ENV]['shooting_star'] || {}) do |config|
+      config['server'] ||= DEFAULT_SERVER_URI
+      config['shooter'] ||= DEFAULT_SHOOTER_URI
+    end
+  end
+
+  def self.servers
+    config['server'].kind_of?(Array) ? config['server'] : [config['server']]
+  end
+
+  def self.server
+    @round_robin_counter = (@round_robin_counter.to_i + 1) % servers.size
+    servers[@round_robin_counter]
   end
 
   def self.shooter
-    @@shooter ||= ::Meteor::Shooter.new(configurations[RAILS_ENV])
+    @@shooter ||= DRb.start_service && Shooter.new(configurations[RAILS_ENV])
   end
 
-  def self.shoot(channel, javascript, tag = [])
+  def self.shoot(channel_path, javascript, tag = [], options = {})
     meteor = Meteor.new(:javascript => javascript)
     returning(meteor.save) do |succeeded|
-      shooter.shoot(channel, meteor.id, tag) if succeeded
+      shooter.shoot(channel_path, meteor.id, tag, options) if succeeded
     end
   end
 end

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

@@ -1,16 +1,19 @@
-<html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
-<%= javascript_tag %Q{
-(function(){
-  var channel = #{@channel.to_json};
-  var javascript = #{@javascript.to_json};
-  var execute = function(){
-    var meteorStrike = parent.parent.meteorStrike[channel];
-    if(meteorStrike) meteorStrike.execute(javascript);
-    else setTimeout(execute, 0);
-  }
-  execute();
-})();
-}%>
+  <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
+  <%= javascript_tag %Q{
+  (function(){
+    var channel = #{@channel.to_json};
+    var javascript = #{@javascript.to_json};
+    var execute = function(){
+      var ms = parent.parent.meteorStrike[channel];
+      if(ms) ms.execute(javascript);
+      else setTimeout(execute, 0);
+    };
+    execute();
+  })();
+  }%>
 </head>
 </html>

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

@@ -1,172 +1,5 @@
-require 'uri'
-require 'md5'
+require 'meteor_strike/helper'
 
 module MeteorStrike
-  module Helper
-    def self.included(base)
-      base.class_eval do
-        alias_method_chain :form_tag, :timestamp
-      end
-    end
-
-    def meteor_strike(channel, options = {})
-      if !options[:cache] && !@meteor_strike
-        cc = controller.headers['Cache-Control'] || ''
-        cc += ', ' unless cc.empty?
-        cc += 'no-store, no-cache, must-revalidate, max-age=0, '
-        cc += 'post-check=0, pre-check=0'
-        controller.headers['Cache-Control'] = cc
-      end
-      @meteor_strike ||= 0 and @meteor_strike += 1
-      config = ActiveRecord::Base.configurations[RAILS_ENV]['shooting_star']
-      config ||= {}
-      config['server'] ||= 'localhost:8080'
-      config['shooter'] ||= 'druby://localhost:7123'
-      server = config['server'].kind_of?(Array) ?
-        config['server'][rand(config['server'].length)] : config['server']
-      shooting_star_uri = "#{server}/#{channel}"
-      if config['random_subdomain'] && /[A-z]/ === server
-        subdomain = (1..6).map{(rand(26)+?a).chr}.to_s
-        shooting_star_uri = [subdomain, shooting_star_uri].join('.')
-      end
-      uri = url_for(:only_path => false).split('/')[0..2].join('/')
-      uid = options[:uid] ? CGI.escape(options[:uid].to_s) : ''
-      tags = options[:tag] || []
-      tag = tags.map{|i| CGI.escape(i.to_s)}.join(',')
-      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=#{host_port}"].join('&')
-      flash_html = flash_tag(flash_vars) unless options[:noflash]
-      <<-"EOH"
-      <div style="position: absolute; top: -99999px; left: -99999px">
-      <iframe id="#{iframe_id}" name="#{iframe_id}"></iframe>
-      <form id="#{iframe_id}-form" target="#{iframe_id}" method="POST"
-        action="http://#{shooting_star_uri}">
-        <input name="execute" value="#{uri}/meteor/strike" />
-        <input name="tag" /><input name="uid" /><input name="sig" />
-      </form>
-      <script type="text/javascript">
-      //<![CDATA[
-      var meteorStrike = meteorStrike || $H();
-      Event.observe(window, 'load', function(){
-        var channel = #{channel.to_json};
-        var UID = #{uid.to_json}, TAGS = #{tags.to_json};
-        var encodeTags = function(tags){
-          var encode = function(i){return encodeURIComponent(i)};
-          return $A(tags).uniq().map(encode).join(',');
-        };
-        var ms = meteorStrike[channel] = meteorStrike[channel] || new Object;
-        ms.getTags = function(){return TAGS};
-        ms.getUid = function(){return UID};
-        ms.execute = function(js){eval(js)};
-        ms.event = function(params){#{options[:event]}};
-        ms.update = function(uid, tags){
-          new Ajax.Request(#{update_uri.to_json}, {postBody: $H({
-            channel: channel, uid: uid || UID,
-            tag: encodeTags(tags || TAGS), sig: #{sig.to_json}
-          }).toQueryString(), asynchronous: true});
-          UID = uid, TAGS = tags;
-        };
-        ms.tuneIn = function(tags){
-          ms.update(UID, TAGS.concat(tags || []).uniq());
-        };
-        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){
-            setTimeout(function(){ 
-              var form = $("#{iframe_id}-form");
-              form.uid.value = #{uid.to_json};
-              form.tag.value = #{tag.to_json};
-              form.sig.value = #{sig.to_json};
-              form.submit();
-              setTimeout(function(){#{options[:connected]}}, 0);
-            }, 0);
-          }
-        }catch(e){}
-      });
-      function meteor_strike_#{@meteor_strike}_DoFSCommand(command, 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 &&
-        navigator.userAgent.indexOf("Windows 3.1") == -1)
-      {
-        document.write([
-          '<script language="VBScript"\\>',
-          'On Error Resume Next',
-          ['Sub meteor_strike_', #{@meteor_strike},
-           '_FSCommand(ByVal command, ByVal args)'].join(''),
-          ['  Call meteor_strike_', #{@meteor_strike},
-           '_DoFSCommand(command, args)'].join(''),
-          'End Sub', '</script\\>'].join(#{"\n".to_json}));
-      }
-      //]]>
-      </script>#{flash_html}</div>
-      EOH
-    end
-
-  private
-    # Workaround for Safari's strange behaviour after back navigation.
-    # Safari never posts if form elements are not modified since back
-    # navigation. So we append timestamp before submitting.
-    def form_tag_with_timestamp(urlop = {}, options = {}, *arg, &block)
-      options = options.stringify_keys
-      (options['onsubmit'] ||= '').insert(0, %Q[
-        if(!this.__ts__){
-          var ts = document.createElement('input');
-          ts.name = ts.id = '__ts__';
-          ts.type = 'hidden';
-          this.appendChild(ts);
-        }
-        this.__ts__.value = new Number(new Date()).toString(32);
-      ]) unless /^get$/i === options['method']
-      form_tag_without_timestamp(urlop, options, *arg, &block)
-    end 
-
-    def flash_tag(flash_vars)
-      flash_code_base = ['http://fpdownload.macromedia.com/',
-        'pub/shockwave/cabs/flash/swflash.cab#version=6,0,0,0'].join('')
-      swf_path = File.join(RAILS_ROOT, 'public/meteor_strike.swf')
-      swf_timestamp = File.mtime(swf_path).to_i
-      <<-"EOH"
-      <object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000"
-       codebase="#{flash_code_base}" width="0" height="0"
-       id="meteor_strike_#{@meteor_strike}">
-      <param name="allowScriptAccess" value="sameDomain" />
-      <param name="FlashVars" value="#{flash_vars}" />
-      <param name="movie" value="/meteor_strike.swf?#{swf_timestamp}" />
-      <param name="menu" value="false" />
-      <param name="quality" value="high" />
-      <param name="devicefont" value="true" />
-      <param name="bgcolor" value="#ffffff" />
-      <embed src="/meteor_strike.swf?#{swf_timestamp}" menu="false"
-       quality="high" devicefont="true" bgcolor="#ffffff" width="0" height="0"
-       swLiveConnect="true" id="meteor_strike_#{@meteor_strike}"
-       name="meteor_strike_#{@meteor_strike}" flashvars="#{flash_vars}"
-       allowScriptAccess="sameDomain" type="application/x-shockwave-flash"
-       pluginspage="http://www.macromedia.com/go/getflashplayer" />
-      </object>
-      EOH
-    end
-  end
+  PLUGIN_ROOT = File.join(File.dirname(__FILE__), '..')
 end

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

@@ -0,0 +1,71 @@
+require 'set'
+require 'md5'
+
+module MeteorStrike
+  module Helper
+    def self.included(base)
+      base.class_eval do
+        alias_method :form_tag_without_timestamp, :form_tag
+        alias_method :form_tag, :form_tag_with_timestamp
+      end
+    end
+
+    def meteor_strike(channel, options = {})
+      if !options[:cache] && !@meteor_strike
+        cc = controller.headers['Cache-Control'] || ''
+        cc += ', ' unless cc.empty?
+        cc += 'no-store, no-cache, must-revalidate, max-age=0, '
+        cc += 'post-check=0, pre-check=0'
+        controller.headers['Cache-Control'] = cc
+      end
+      @meteor_strike ||= 0 and @meteor_strike += 1
+      config = Meteor::config
+      server = Meteor::server
+      shooting_star_uri = "#{server}/#{channel}"
+      if config['random_subdomain'] && /[A-z]/ === server
+        subdomain = (1..6).map{(rand(26)+?a).chr}.to_s
+        shooting_star_uri = [subdomain, shooting_star_uri].join('.')
+      end
+      uri = url_for(:only_path => false).split('/')[0..2].join('/')
+      uid = options[:uid] ? CGI.escape(options[:uid].to_s) : ''
+      tags = options[:tag] || []
+      tag = tags.map{|i| CGI.escape(i.to_s)}.join(',')
+      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=#{host_port}",
+        "heartbeat=#{options[:heartbeat]}", "debug=#{options[:debug].to_json}"
+      ].join('&')
+      unless options[:noflash]
+        @flash_html = render :use_full_path => false,
+          :file => File.join(PLUGIN_ROOT, 'views/flash.rhtml'),
+          :locals => {:flash_vars => flash_vars}
+      end
+      render :file => File.join(PLUGIN_ROOT, 'views/xhr.rhtml'),
+        :use_full_path => false, :locals => {:iframe_id => iframe_id,
+        :shooting_star_uri => shooting_star_uri, :uri => uri,
+        :channel => channel, :uid => uid, :tag => tag, :tags => tags,
+        :sig => sig, :options => options, :update_uri => update_uri}
+    end
+
+  private
+    # Workaround for Safari's strange behaviour after back navigation.
+    # Safari never posts if form elements are not modified since back
+    # navigation. So we append timestamp before submitting.
+    def form_tag_with_timestamp(urlop = {}, options = {}, *arg, &block)
+      options = options.stringify_keys
+      (options['onsubmit'] ||= '').insert(0, %Q[
+        if(!this.__ts__){
+          var ts = document.createElement('input');
+          ts.name = ts.id = '__ts__';
+          ts.type = 'hidden';
+          this.appendChild(ts);
+        }
+        this.__ts__.value = new Number(new Date()).toString(32);
+      ]) unless /^get$/i === options['method']
+      form_tag_without_timestamp(urlop, options, *arg, &block)
+    end 
+  end
+end

data/vendor/plugins/meteor_strike/test/meteor_strike_test.rb

@@ -1,11 +1,12 @@
 require 'test/unit'
 require 'rubygems'
 require 'active_support'
-require File.join(File.dirname(__FILE__), '../lib/meteor_strike')
 begin
   require 'redgreen'
 rescue
 end
+$: << File.join(File.dirname(__FILE__), '../lib')
+require 'meteor_strike'
 
 class MeteorStrikeTest < Test::Unit::TestCase
   def test_meteor_strike

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

@@ -0,0 +1,23 @@
+<%
+  flash_code_base = ['http://fpdownload.macromedia.com/',
+    'pub/shockwave/cabs/flash/swflash.cab#version=6,0,0,0'].join('')
+  swf_path = File.join(RAILS_ROOT, 'public/meteor_strike.swf')
+  swf_timestamp = File.mtime(swf_path).to_i
+%>
+<object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000"
+ codebase="<%= flash_code_base %>" width="300" height="300"
+ id="meteor_strike_<%= @meteor_strike %>">
+  <param name="allowScriptAccess" value="sameDomain" />
+  <param name="FlashVars" value="<%= flash_vars %>" />
+  <param name="movie" value="/meteor_strike.swf?<%= swf_timestamp %>" />
+  <param name="menu" value="false" />
+  <param name="quality" value="high" />
+  <param name="devicefont" value="true" />
+  <param name="bgcolor" value="#ffffff" />
+  <embed src="/meteor_strike.swf?<%= swf_timestamp %>" menu="false"
+   quality="high" devicefont="true" bgcolor="#ffffff" width="300" height="300"
+   swLiveConnect="true" id="meteor_strike_<%= @meteor_strike %>"
+   name="meteor_strike_<%= @meteor_strike %>" flashvars="<%= flash_vars %>"
+   allowScriptAccess="sameDomain" type="application/x-shockwave-flash"
+   pluginspage="http://www.macromedia.com/go/getflashplayer" />
+</object>

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

@@ -0,0 +1,110 @@
+<div style="position: absolute;
+  <%- if options[:debug] -%>
+    top: 0px; right: 0px;
+  <%- else -%>
+    top: -99999px; left: -99999px;
+  <%- end -%>">
+  <iframe id="<%= iframe_id %>" name="<%= iframe_id %>"></iframe>
+  <form id="<%= iframe_id %>-form" target="<%= iframe_id %>" method="POST"
+    action="http://<%= shooting_star_uri %>">
+    <input name="execute" value="<%= uri %>/meteor/strike" />
+    <input name="tag" /><input name="uid" /><input name="sig" />
+    <input name="heartbeat" value="<%= options[:heartbeat] %>" />
+  </form>
+  <%= javascript_tag %Q{
+    var meteorStrike = meteorStrike || $H();
+    meteorStrike.getFlashVersion = function(){
+      if(#{options[:noflash].to_json}) return 0;
+      var version = 0, ua = navigator.userAgent;
+      if(navigator.plugins && navigator.mimeTypes.length){
+        var x = navigator.plugins["Shockwave Flash"];
+        if(x && x.description) {
+          version = parseInt(x.description.replace(/([a-zA-Z]|\\s)+/, ""
+            ).replace(/(\\s+r|\\s+b[0-9]+)/, ".").split(".")[0]);
+        }
+      }else if(!ua || ua.indexOf("Windows CE") == -1){
+        try{
+          var axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash");
+          try{
+            axo.AllowScriptAccess = 'always';
+            version = axo.GetVariable('$version').split(' ')[1].split(",")[0];
+          }catch(e){version = 6}
+        }catch(e){}
+      }
+      return version;
+    };
+    (function(){
+      var channel = #{channel.to_json};
+      var UID = #{uid.to_json}, TAGS = #{tags.to_json};
+      var encodeTags = function(tags){
+        var encode = function(i){return encodeURIComponent(i)};
+        return $A(tags).uniq().map(encode).join(',');
+      };
+      var ms = meteorStrike[channel] = meteorStrike[channel] || new Object;
+      ms.getTags = function(){return TAGS};
+      ms.getUid = function(){return UID};
+      ms.execute = function(js){eval(js)};
+      ms.event = function(params){
+        if(params.event == 'init'){
+          if(ms.connection) return Element.remove('#{iframe_id}');
+          ms.connection = params.type;
+        }
+        (function(){#{options[:event]}})();
+      };
+      ms.update = function(uid, tags){
+        new Ajax.Request(#{update_uri.to_json}, {postBody: $H({
+          channel: channel, uid: uid || UID,
+          tag: encodeTags(tags || TAGS), sig: #{sig.to_json}
+        }).toQueryString(), asynchronous: true});
+        UID = uid, TAGS = tags;
+      };
+      ms.tuneIn = function(tags){
+        ms.update(UID, TAGS.concat(tags || []).uniq());
+      };
+      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());
+      };
+      setTimeout(ms.connector = function(){ 
+        if(ms.connection) return;
+        var form = $("#{iframe_id}-form");
+        form.uid.value = #{uid.to_json};
+        form.tag.value = #{tag.to_json};
+        form.sig.value = #{sig.to_json};
+        form.submit();
+        setTimeout(ms.connector, 3000);
+      }, meteorStrike.getFlashVersion() >= 6 ? 3000 : 0);
+    })();
+    function meteor_strike_#{@meteor_strike}_DoFSCommand(command, args){
+      var ms = meteorStrike[#{channel.to_json}];
+      switch(command){
+      case 'execute': ms.execute(args); break;
+      case 'event':
+        if(args == 'connect') ms.event({event: 'init', type: 'flash'});
+        break;
+      }
+    }
+    if(navigator.appName && navigator.appName.indexOf("Microsoft") != -1 &&
+      navigator.userAgent.indexOf("Windows") != -1 &&
+      navigator.userAgent.indexOf("Windows 3.1") == -1){
+      document.write([
+        '<script language="VBScript"\\>',
+        'On Error Resume Next',
+        ['Sub meteor_strike_', #{@meteor_strike},
+         '_FSCommand(ByVal command, ByVal args)'].join(''),
+        ['  Call meteor_strike_', #{@meteor_strike},
+         '_DoFSCommand(command, args)'].join(''),
+        'End Sub', '</script\\>'].join(#{"\n".to_json}));
+    }
+    if(meteorStrike.getFlashVersion() >= 6){
+      document.write(#{@flash_html.to_json});
+    }
+  } %>
+</div>

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.3
 specification_version: 1
 name: shooting_star
 version: !ruby/object:Gem::Version 
-  version: 3.1.0
-date: 2007-07-18 00:00:00 +09:00
+  version: 3.2.0
+date: 2007-08-09 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
@@ -56,6 +56,11 @@ files:
 - vendor/plugins/meteor_strike/init.rb
 - vendor/plugins/meteor_strike/lib
 - vendor/plugins/meteor_strike/lib/meteor_strike.rb
+- vendor/plugins/meteor_strike/lib/meteor_strike
+- vendor/plugins/meteor_strike/lib/meteor_strike/helper.rb
+- vendor/plugins/meteor_strike/views
+- vendor/plugins/meteor_strike/views/xhr.rhtml
+- vendor/plugins/meteor_strike/views/flash.rhtml
 - vendor/plugins/meteor_strike/test
 - vendor/plugins/meteor_strike/test/meteor_strike_test.rb
 - vendor/plugins/meteor_strike/generators