limelight 0.5.0-java → 0.5.1-java

data/lib/limelight/theater.rb

@@ -15,7 +15,8 @@ module Limelight
     #
     attr_reader :active_stage
     
-    def initialize
+    def initialize(production)
+      @production = production
       @stages = {}
     end
 
@@ -57,6 +58,7 @@ module Limelight
     def stage_closed(stage)
       @stages.delete(stage.name)
       @active_stage = nil if @active_stage == stage
+      @production.theater_empty! if @stages.empty?
     end
 
     # If no Stages are added, the Theater will provide a default Stage named "Limelight".
@@ -66,6 +68,14 @@ module Limelight
       return self["Limelight"]
     end
 
+    # Close this theater.  All stages in this theater will be closed and the active_stage will be nil'ed.
+    #
+    def close
+      @stages.values.each { |stage| stage.close }
+      @stages.clear
+      @active_stage = nil
+    end
+
     protected #############################################
 
     def build_stage(name, options)

data/lib/limelight/version.rb

@@ -6,7 +6,7 @@ module Limelight
     unless defined? MAJOR
       MAJOR  = 0
       MINOR  = 5
-      TINY   = 0
+      TINY   = 1
 
       STRING = [MAJOR, MINOR, TINY].join('.')
       TAG    = "REL_" + [MAJOR, MINOR, TINY].join('_')

data/productions/examples/sandbox/alerts/players/alerts.rb

@@ -11,7 +11,7 @@ module Alerts
 
   def open_incompatible_production
     production_path = File.join(path, "incompatible_production")
-    Thread.new { Limelight::Studio.open(production_path) }
+    Thread.new { Limelight::Context.instance.studio.open(production_path) }
   end
 
 end

data/spec/limelight/builtin/utilities_production/utilities_production_spec.rb

@@ -5,9 +5,10 @@ require File.expand_path(File.dirname(__FILE__) + "/spec_helper")
 
 describe "Utilitites Production" do
 
-  uses_scene "none"
+  uses_limelight
 
   before(:each) do
+    @result = nil
     production.production_opening
   end
 
@@ -17,8 +18,43 @@ describe "Utilitites Production" do
   end
 
   after(:all) do
-    #    Java::java.awt.Frame.getFrames.each { |frame| frame.close; frame.dispose; puts frame }
-    #    Java::limelight.util.Threads.showAll
+#    Java::java.awt.Frame.getFrames.each { |frame| frame.close; frame.dispose; puts frame }
+#    Java::limelight.util.Threads.showAll
+  end
+
+  def start_alert()
+    @thread = Thread.new do
+      begin
+        @result = production.alert("Some Message")
+      rescue Exception => e
+        puts e
+        puts e.backtrace
+      end
+    end
+  end
+
+  def start_proceed_with_incompatible_version()
+    @thread = Thread.new do
+      begin
+        @result = production.proceed_with_incompatible_version?("Some Production", "1.2.3")
+      rescue Exception => e
+        puts e
+        puts e.backtrace
+      end
+    end
+  end
+
+  def wait_for
+    10.times do
+      return if yield
+      sleep(0.1)                                                                  
+    end
+    raise "the desired condition was not met on time"
+  end
+
+  def scene_open?(stage_name)
+    stage = production.theater[stage_name]
+    return stage != nil && stage.current_scene != nil
   end
 
   it "should construct stage on load_with_incomptible_version_scene" do
@@ -51,30 +87,6 @@ describe "Utilitites Production" do
     scene.find("current_version_label").text.should == Limelight::VERSION::STRING
   end
 
-  def start_proceed_with_incompatible_version()
-    @thread = Thread.new do
-      begin
-        @result = production.proceed_with_incompatible_version?("Some Production", "1.2.3")
-      rescue Exception => e
-        puts e
-        puts e.backtrace
-      end
-    end
-  end
-
-  def wait_for
-    10.times do
-      return if yield
-      sleep(0.1)
-    end
-    raise "the desired condition was not met on time"
-  end
-
-  def scene_open?(stage_name)
-    stage = production.theater[stage_name]
-    return stage != nil && stage.current_scene != nil
-  end
-
   it "should return true when clicking proceed" do
     @result = nil
     start_proceed_with_incompatible_version()
@@ -99,17 +111,6 @@ describe "Utilitites Production" do
     @result.should == false
   end
 
-  def start_alert()
-    @thread = Thread.new do
-      begin
-        @result = production.alert("Some Message")
-      rescue Exception => e
-        puts e
-        puts e.backtrace
-      end
-    end
-  end
-
   it "should construct alert stage" do
     production.load_alert_scene("Some Message")
     stage = production.theater["Alert"]

data/spec/limelight/commands/create_command_spec.rb

@@ -60,7 +60,7 @@ describe Limelight::Commands::CreateCommand do
     @command.scene_name.should == "default_scene"
     @command.template_type.should == "production"
     @command.production_path.should == "blah"
-    @command.spec_path.should == "blah/spec"
+    @command.spec_path.should == "spec"
   end
 
   it "should have a default production path" do

data/spec/limelight/commands/open_command_spec.rb

@@ -8,6 +8,7 @@ require 'limelight/producer'
 describe Limelight::Commands::OpenCommand do
 
   before(:all) do
+    @studio = Limelight::Studio.install
     @command_class = Limelight::Commands::OpenCommand
     @command = @command_class.new
   end
@@ -18,14 +19,14 @@ describe Limelight::Commands::OpenCommand do
 
   it "should open a production" do
     Limelight::Main.should_receive(:initialize_context)
-    Limelight::Studio.should_receive(:open).with("production_name")
+    @studio.should_receive(:open).with("production_name")
 
     @command.run(["production_name"])
   end
 
   it "should open the default production" do
     Limelight::Main.should_receive(:initialize_context)
-    Limelight::Studio.should_receive(:open).with(@command_class::DEFAULT_PRODUCTION)
+    @studio.should_receive(:open).with(@command_class::DEFAULT_PRODUCTION)
 
     @command.run([])
   end
@@ -43,8 +44,8 @@ describe Limelight::Commands::OpenCommand do
 
   it "should start the studio on drb" do
     Limelight::Main.should_receive(:initialize_context)
-    Limelight::Studio.should_receive(:publish_on_drb).with(1234)
-    Limelight::Studio.should_receive(:open).with("some_prod")
+    @studio.should_receive(:publish_on_drb).with(1234)
+    @studio.should_receive(:open).with("some_prod")
 
     @command.run ["-d", "1234", "some_prod"]
   end

data/spec/limelight/dsl/stage_builder_spec.rb

@@ -8,7 +8,7 @@ require 'limelight/theater'
 describe Limelight::DSL::StageBuilder do
   
   before(:each) do
-    @theater = Limelight::Theater.new
+    @theater = Limelight::Theater.new(nil)
   end
 
   it "should give no stages if empty" do

data/spec/limelight/producer_spec.rb

@@ -8,9 +8,10 @@ describe Limelight::Producer do
 
   before(:each) do
     TestDir.clean
-    Limelight::Studio.reset
+    Limelight::Studio.uninstall
     @root_dir = TestDir.path("test_prod")
     @producer = Limelight::Producer.new(@root_dir)
+    Limelight::Studio.install
   end
 
   it "should have loader on creation" do
@@ -52,7 +53,7 @@ describe Limelight::Producer do
 
   it "should load styles" do
     TestDir.create_file("test_prod/styles.rb", "alpha { width 100 }")
-    Limelight::Studio.stub!(:builtin_styles).and_return({})
+    Limelight::Producer.stub!(:builtin_styles).and_return({})
 
     styles = @producer.load_styles(Limelight::Scene.new(:path => TestDir.path("test_prod")))
     styles.size.should == 1
@@ -142,7 +143,7 @@ describe Limelight::Producer do
   end
 
   it "should load empty styles if styles.rb doesn't exist" do
-    Limelight::Studio.stub!(:builtin_styles).and_return({})
+    Limelight::Producer.stub!(:builtin_styles).and_return({})
 
     @producer.load_styles(Limelight::Scene.new(:path => TestDir.path("test_prod"))).should == {}
   end
@@ -207,4 +208,9 @@ describe Limelight::Producer do
     @producer.open_scene("name", stage, :instance_variables => { :foo => "bar" })
   end
   
+  it "should give the same buildin_styles hash twice" do
+    Limelight::Producer.builtin_styles.should be(Limelight::Producer.builtin_styles)
+    Limelight::Producer.builtin_styles["limelight_builtin_players_curtains"].should_not == nil
+  end
+  
 end

data/spec/limelight/production_spec.rb

@@ -9,6 +9,7 @@ describe Limelight::Production, "Instance methods" do
   before(:each) do
     @producer = make_mock("producer")
     @theater = make_mock("theater")
+    @studio = Limelight::Studio.install
     @production = Limelight::Production.new("/tmp")
     @production.producer = @producer
     @production.theater = @theater
@@ -20,20 +21,6 @@ describe Limelight::Production, "Instance methods" do
     @production.path.should == "/tmp"
   end
 
-  it "should be indexed" do
-    Limelight::Studio.index(@production)
-    Limelight::Studio[@production.name].should == @production
-  end
-
-  it "should raise an error when setting the name to a duplicate name" do
-    @production.name = "Bill"
-    Limelight::Studio.index(@production)
-
-    production = Limelight::Production.new("/tmp")
-    Limelight::Studio.index(production)
-    lambda { production.name = "Bill" }.should raise_error(Limelight::LimelightException, "Production name 'Bill' is already taken")
-  end
-
   it "should get it's name from the file" do
     Limelight::Production.new("/tmp").name.should == "tmp"
     Limelight::Production.new("/Somewhere/over/the/rainbow").name.should == "rainbow"
@@ -72,12 +59,20 @@ describe Limelight::Production, "Instance methods" do
 
   it "should tell studio it closed and triger it's closing events" do
     @production.should_receive(:production_closing)
-    Limelight::Studio.should_receive(:production_closed).with(@production)
+    @studio.should_receive(:production_closed).with(@production)
     @production.should_receive(:production_closed)
+    @theater.should_receive(:close)
 
     @production.close
   end
 
+  it "should handle empty theater" do
+    @production.should_receive(:allow_close?).at_least(1).and_return(true)
+    @production.should_receive(:close)
+
+    @production.theater_empty!
+  end
+
   describe "with files" do
 
     after(:each) do

data/spec/limelight/stage_spec.rb

@@ -5,12 +5,12 @@ require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 require 'limelight/stage'
 require 'limelight/scene'
 require 'limelight/theater'
-require 'limelight/studio'
 
 describe Limelight::Stage do
 
   before(:each) do
-    @theater = Limelight::Theater.new
+    @production = mock("production")
+    @theater = Limelight::Theater.new(@production)
     @stage = @theater.add_stage("George")
     @stage.should_remain_hidden = true
     Limelight::Context.instance.frameManager = Java::limelight.ui.model.InertFrameManager.new
@@ -126,7 +126,10 @@ describe Limelight::Stage do
   end
 
   describe "when opening a scene" do
+
     before(:each) do
+      @production.stub!(:theater_empty!)
+      Limelight::Studio.install
       @scene = Limelight::Scene.new
       @scene.stub!(:illuminate)
     end
@@ -182,6 +185,17 @@ describe Limelight::Stage do
       @stage.current_scene.should == nil
     end
 
+    it "should clean up when replacing scene" do
+      @stage.open(@scene)
+      new_scene = Limelight::Scene.new(:name => "new scene")
+      new_scene.stub!(:illuminate)
+
+      @stage.open(new_scene)
+
+      @scene.visible?.should == false
+      @stage.current_scene.should == new_scene
+    end
+
     it "should be removed from the theater when closed" do
       @stage.open(@scene)
       @theater["George"].should be(@stage)
@@ -191,7 +205,9 @@ describe Limelight::Stage do
     end
 
     it "should open an alert" do
-      Limelight::Studio.utilities_production.should_receive(:alert).with("Some Message")
+      utilities_production = mock("utilities_production")
+      Limelight::Context.instance.studio.should_receive(:utilities_production).and_return(utilities_production)              
+      utilities_production.should_receive(:alert).with("Some Message")
 
       @stage.alert("Some Message")
       sleep(0.01)

data/spec/limelight/theater_spec.rb

@@ -8,7 +8,8 @@ require 'limelight/stage'
 describe Limelight::Theater do
 
   before(:each) do
-    @theater = Limelight::Theater.new
+    @production = mock("production", :theater_empty! => nil)
+    @theater = Limelight::Theater.new(@production)
     @stage = @theater.add_stage("default")
   end
   
@@ -69,4 +70,24 @@ describe Limelight::Theater do
     @theater.active_stage.should == nil
   end
 
+  it "should notify the production when all the stages are closed" do
+    @production.should_receive(:theater_empty!)
+    
+    @theater.stage_closed(@stage)
+  end
+
+  it "should close" do
+    stage2 = @theater.add_stage("two")
+    stage3 = @theater.add_stage("three")
+    @theater.stage_activated(stage3)
+    stage2.should_receive(:close)
+    stage3.should_receive(:close)
+
+    @theater.close
+
+    @theater.stages.length.should == 0
+    @theater.active_stage.should == nil
+
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: limelight
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.5.1
 platform: java
 authors: 
 - Micah Martin, 8th Light
@@ -9,7 +9,7 @@ autorequire: init
 bindir: bin
 cert_chain: []
 
-date: 2009-10-21 00:00:00 -05:00
+date: 2009-10-27 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -56,7 +56,6 @@ files:
 - lib/limelight/button_group_cache.rb
 - lib/limelight/casting_director.rb
 - lib/limelight/client
-- lib/limelight/client/playbills.rb
 - lib/limelight/commands
 - lib/limelight/commands/command.rb
 - lib/limelight/commands/create_command.rb
@@ -80,6 +79,7 @@ files:
 - lib/limelight/java_couplings.rb
 - lib/limelight/java_util.rb
 - lib/limelight/limelight_exception.rb
+- lib/limelight/limelight_init.rb
 - lib/limelight/main.rb
 - lib/limelight/paint_action.rb
 - lib/limelight/pen.rb
@@ -133,7 +133,6 @@ files:
 - spec/limelight/builtin/utilities_production/spec_helper.rb
 - spec/limelight/builtin/utilities_production/utilities_production_spec.rb
 - spec/limelight/casting_director_spec.rb
-- spec/limelight/client/playbills_spec.rb
 - spec/limelight/commands/command_spec.rb
 - spec/limelight/commands/create_command_spec.rb
 - spec/limelight/commands/freeze_command_spec.rb
@@ -159,7 +158,6 @@ files:
 - spec/limelight/scene_spec.rb
 - spec/limelight/stage_spec.rb
 - spec/limelight/string_spec.rb
-- spec/limelight/studio_spec.rb
 - spec/limelight/styles_spec.rb
 - spec/limelight/templates/production_templater_spec.rb
 - spec/limelight/templates/scene_templater_spec.rb
@@ -415,6 +413,6 @@ rubyforge_project: limelight
 rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
-summary: Limelight-0.5.0 - Limelight http://limelight.8thlight.com
+summary: Limelight-0.5.1 - Limelight http://limelight.8thlight.com
 test_files: []