RubyGems - shooting_star - Versions diffs - 2.0.1 → 2.0.2 - Mend

shooting_star 2.0.1 → 2.0.2

Files changed (18) hide show

data/History.txt CHANGED Viewed

@@ -1,4 +1,15 @@
-*** 2.0.1 / 2007-05-16
+*** 2.0.2 / 2007-06-09
++ 1 major enhancement:
+  + Added chat generator.
++ 1 minor enhancement:
+  + Default client configuration.
+  + Changed reconnecting interval from 1 sec to 3 sec.
++ 1 minor bugfix:
+  + Suppressed invalid access to closed channel.
+*** 2.0.1 / 2007-05-20
 + 1 minor enhancement:
   + Added dependencies of gems.
 + 2 minor bug fix:

data/Manifest.txt CHANGED Viewed

@@ -37,3 +37,15 @@ vendor/plugins/meteor_strike/generators/meteor/templates/view.rhtml
 vendor/plugins/meteor_strike/generators/meteor/templates/migration.rb
 vendor/plugins/meteor_strike/generators/meteor/templates/unit_test.rb
 vendor/plugins/meteor_strike/generators/meteor/templates/functional_test.rb
+vendor/plugins/meteor_strike/generators/chat
+vendor/plugins/meteor_strike/generators/chat/chat_generator.rb
+vendor/plugins/meteor_strike/generators/chat/templates
+vendor/plugins/meteor_strike/generators/chat/templates/controller.rb
+vendor/plugins/meteor_strike/generators/chat/templates/model.rb
+vendor/plugins/meteor_strike/generators/chat/templates/helper.rb
+vendor/plugins/meteor_strike/generators/chat/templates/layout.rhtml
+vendor/plugins/meteor_strike/generators/chat/templates/index.rhtml
+vendor/plugins/meteor_strike/generators/chat/templates/show.rhtml
+vendor/plugins/meteor_strike/generators/chat/templates/migration.rb
+vendor/plugins/meteor_strike/generators/chat/templates/unit_test.rb
+vendor/plugins/meteor_strike/generators/chat/templates/functional_test.rb

data/lib/shooting_star/server.rb CHANGED Viewed

@@ -56,10 +56,7 @@ module ShootingStar
       unless @params['__t__']
         make_connection(path)
       else
-        unless Channel[@channel]
-          Channel.new(@channel)
-          log "Channel opened: #{@channel}"
-        end
+        prepare_channel(@channel)
         unless @@servers[@signature] || @params['__t__'] == 'rc'
           notify(:event => :enter, :uid => @uid, :tag => @tag)
           log "Connected: #{@uid}"
@@ -71,6 +68,8 @@ module ShootingStar
         @@servers[@signature] = self
         wait_for
       end
+    rescue MethodNotAcceptable
+      write_and_close
     rescue Exception => e
       log "ERROR: #{e.message}\n#{e.backtrace.join("\n")}\n#{data}"
       write_and_close
@@ -166,12 +165,21 @@ module ShootingStar
     # the execution buffer, they'll be flushed and return on the spot.
     def wait_for
       log "Wait for: #{@channel}:#{@uid}:#{@tag.join(',')}:#{@signature}"
-      if Channel[@channel].join(self)
+      if prepare_channel(@channel).join(self)
         log "Flushed: #{@channel}:#{@uid}:#{@tag.join(',')}:#{@signature}"
       end
       @waiting = true
     end
+    # prepare channel object.
+    def prepare_channel(channel)
+      unless Channel[channel]
+        Channel.new(channel)
+        log "Channel opened: #{channel}"
+      end
+      Channel[channel]
+    end
     # add execution line to the buffer.
     def execute(id, params)
       sweep_timeout = ShootingStar::CONFIG.sweep_timeout
@@ -198,7 +206,6 @@ module ShootingStar
       assets = URI.parse(@params['execute'])
       assets.path = '/javascripts/prototype.js'
       assets.query = assets.fragment = nil
       send_data "HTTP/1.1 200 OK\nContent-Type: text/html\n\n" +
       <<-"EOH"
       <html><head><script type="text/javascript" src="#{assets}"></script>
@@ -210,7 +217,7 @@ module ShootingStar
         var request = new Ajax.Request(#{path.to_json},
           {evalScript: true, onComplete: function(xhr){
             setTimeout(function(){connect(true)},
-              xhr.getResponseHeader('Content-Type') ? 0 : 1000);
+              xhr.getResponseHeader('Content-Type') ? 0 : 3000);
           }, postBody: body.toQueryString()});
         var disconnect = function()
         { request.options.onComplete = function(){};

data/lib/shooting_star.rb CHANGED Viewed

@@ -7,7 +7,7 @@ require 'shooting_star/config'
 require 'shooting_star/shooter'
 module ShootingStar
-  VERSION = '2.0.1'
+  VERSION = '2.0.2'
   CONFIG = Config.new(
     :config => 'config/shooting_star.yml',
     :pid_file => 'log/shooting_star.pid',

data/vendor/plugins/meteor_strike/generators/chat/chat_generator.rb ADDED Viewed

@@ -0,0 +1,45 @@
+class ChatGenerator < Rails::Generator::NamedBase
+  def initialize(runtime_args, runtime_options)
+    base_name = runtime_args.shift || 'chat'
+    runtime_args.unshift(base_name)
+    super
+  end
+  def manifest
+    controller_class = "#{class_name}Controller"
+    controller_file = "#{file_name}_controller"
+    record do |m|
+      m.class_collisions(controller_class, "#{controller_class}Test")
+      m.class_collisions(class_name, "#{class_name}Test")
+      m.directory File.join('app/controllers', class_path)
+      m.directory File.join('test/functional', class_path)
+      m.directory File.join('app/views', class_path, file_name)
+      m.directory File.join('app/models', class_path)
+      m.directory File.join('test/unit', class_path)
+      m.template 'controller.rb',
+        File.join('app/controllers', class_path, "#{controller_file}.rb")
+      m.template 'functional_test.rb',
+        File.join('test/functional', class_path, "#{controller_file}_test.rb")
+      m.template 'helper.rb',
+        File.join('app/helpers', class_path, "#{file_name}_helper.rb")
+      m.template 'layout.rhtml',
+        File.join('app/views', class_path, "layouts/#{file_name}.rhtml")
+      m.template 'index.rhtml',
+        File.join('app/views', class_path, "#{file_name}/index.rhtml")
+      m.template 'show.rhtml',
+        File.join('app/views', class_path, "#{file_name}/show.rhtml")
+      m.template 'model.rb',
+        File.join('app/models', class_path, "#{file_name}.rb")
+      m.template 'unit_test.rb',
+        File.join('test/unit', class_path, "#{file_name}_test.rb")
+      m.migration_template 'migration.rb', 'db/migrate',
+        :migration_file_name => "create_#{file_name.pluralize}"
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+class <%= class_name %>Controller < ApplicationController
+  layout '<%= file_name %>', :only => :index
+  def index
+    @chats = <%= class_name %>.find(:all).reverse
+  end
+  def show
+    @chat = <%= class_name %>.find(params[:id])
+  end
+  def talk
+    @chat = <%= class_name %>.create!(params[:chat])
+    content = render_component_as_string :action => 'show', :id => @chat.id
+    javascript = render_to_string :update do |page|
+      page.insert_html :top, 'chat-list', content
+    end
+    Meteor.shoot '<%= file_name %>', javascript
+    render :update do |page|
+      page[:chat_message].clear
+      page[:chat_message].focus
+    end
+  end
+end

data/vendor/plugins/meteor_strike/generators/chat/templates/functional_test.rb ADDED Viewed

@@ -0,0 +1,17 @@
+require File.dirname(__FILE__) + '/../test_helper'
+require '<%= file_name %>_controller'
+# Re-raise errors caught by the controller.
+class <%= class_name %>Controller; def rescue_action(e) raise e end; end
+class <%= class_name %>ControllerTest < Test::Unit::TestCase
+  def setup
+    @controller = <%= class_name %>Controller.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+  end
+  def test_truth
+    assert true
+  end
+end

data/vendor/plugins/meteor_strike/generators/chat/templates/helper.rb ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ module MeteorHelper
2	+ end

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

@@ -0,0 +1,11 @@
+<%% form_remote_for(:chat, :url => {:action => 'talk'}) do |f| %>
+  <%%= f.text_field :name %>
+  <%%= submit_tag 'Talk' %><br />
+  <%%= f.text_area :message, :rows => 3 %>
+<%% end %>
+<ul id="chat-list">
+<%% for chat in @chats %>
+  <%%= render_component :action => 'show', :id => chat.id %>
+<%% end %>
+</ul>
+<%%= meteor_strike '<%= file_name %>' %>

data/vendor/plugins/meteor_strike/generators/chat/templates/layout.rhtml ADDED Viewed

@@ -0,0 +1,12 @@
+<!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" />
+  <title><%= class_name %>: <%%= controller.action_name %></title>
+  <%%= javascript_include_tag :defaults %>
+</head>
+<body>
+  <%%= yield %>
+</body>
+</html>

data/vendor/plugins/meteor_strike/generators/chat/templates/migration.rb ADDED Viewed

@@ -0,0 +1,13 @@
+class Create<%= class_name.pluralize %> < ActiveRecord::Migration
+  def self.up
+    create_table '<%= file_name.pluralize %>' do |t|
+      t.column :name, :string
+      t.column :message, :text
+      t.column :created_at, :datetime
+    end
+  end
+  def self.down
+    drop_table '<%= file_name.pluralize %>'
+  end
+end

data/vendor/plugins/meteor_strike/generators/chat/templates/model.rb ADDED Viewed

@@ -0,0 +1,3 @@
+class <%= class_name %> < ActiveRecord::Base
+  validates_presence_of :name, :message
+end

data/vendor/plugins/meteor_strike/generators/chat/templates/show.rhtml ADDED Viewed

@@ -0,0 +1,5 @@
+<li>
+  <span><%%=h @chat.name %></span>
+  <span><%%=h @chat.message %></span>
+</li>

data/vendor/plugins/meteor_strike/generators/chat/templates/unit_test.rb ADDED Viewed

@@ -0,0 +1,7 @@
+require File.dirname(__FILE__) + '/../test_helper'
+class <%= class_name %>Test < Test::Unit::TestCase
+  def test_truth
+    assert true
+  end
+end

data/vendor/plugins/meteor_strike/generators/meteor/meteor_generator.rb CHANGED Viewed

@@ -34,9 +34,8 @@ class MeteorGenerator < Rails::Generator::NamedBase
       m.template 'unit_test.rb',
         File.join('test/unit', class_path, "#{file_name}_test.rb")
-      m.migration_template 'migration.rb',
-        File.join('db/migrate', class_path),
-        :migration_file_name => 'create_meteors'
+      m.migration_template 'migration.rb', 'db/migrate',
+        :migration_file_name => "create_#{file_name.pluralize}"
     end
   end
 end

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

@@ -6,6 +6,7 @@ class Meteor < ActiveRecord::Base
     LISTINGS = [:listeners, :listeners_with, :channels, :signatures]
     def initialize(config)
+      config['shooting_star'] ||= {'shooter' => 'druby://localhost:7123'}
       uris = config['shooting_star']['shooter']
       @shooters = [uris].flatten.map{|uri| DRbObject.new_with_uri(uri)}
     end

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

@@ -20,6 +20,9 @@ module MeteorStrike
       end
       @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}"
@@ -56,6 +59,7 @@ module MeteorStrike
         };
         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){

metadata CHANGED Viewed

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification
-rubygems_version: 0.9.3
+rubygems_version: 0.9.0
 specification_version: 1
 name: shooting_star
 version: !ruby/object:Gem::Version
-  version: 2.0.1
-date: 2007-05-20 00:00:00 +09:00
+  version: 2.0.2
+date: 2007-06-08 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
@@ -69,6 +69,18 @@ files:
 - vendor/plugins/meteor_strike/generators/meteor/templates/migration.rb
 - vendor/plugins/meteor_strike/generators/meteor/templates/unit_test.rb
 - vendor/plugins/meteor_strike/generators/meteor/templates/functional_test.rb
+- vendor/plugins/meteor_strike/generators/chat
+- vendor/plugins/meteor_strike/generators/chat/chat_generator.rb
+- vendor/plugins/meteor_strike/generators/chat/templates
+- vendor/plugins/meteor_strike/generators/chat/templates/controller.rb
+- vendor/plugins/meteor_strike/generators/chat/templates/model.rb
+- vendor/plugins/meteor_strike/generators/chat/templates/helper.rb
+- vendor/plugins/meteor_strike/generators/chat/templates/layout.rhtml
+- vendor/plugins/meteor_strike/generators/chat/templates/index.rhtml
+- vendor/plugins/meteor_strike/generators/chat/templates/show.rhtml
+- vendor/plugins/meteor_strike/generators/chat/templates/migration.rb
+- vendor/plugins/meteor_strike/generators/chat/templates/unit_test.rb
+- vendor/plugins/meteor_strike/generators/chat/templates/functional_test.rb
 test_files:
 - test/test_helper.rb
 - test/test_shooting_star.rb