epall-limelight 0.5.1-java → 0.5.2-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
 
@@ -46,17 +47,27 @@ module Limelight
       return stage
     end
 
-    # Lets the Theater know which stage has the limelight (currently active).
+    # Invoked when a stage, blonging to this theater becomes active.  Lets the Theater know which stage
+    # has the limelight (currently active).  Only 1 stage may be active at a time.
     #
     def stage_activated(stage)
       @active_stage = stage
     end
 
+    # Invoked when a stage, belonging to this theater, loose it's status as the active stage. The active_stage is
+    # cleared.  Only 1 stage may be active at a time.
+    #
+    def stage_deactivated(stage)
+      @active_stage = nil
+      @production.theater_empty! if !any_visible_stages?
+    end
+
     # Removes the stage from this theater.
     #
     def stage_closed(stage)
       @stages.delete(stage.name)
       @active_stage = nil if @active_stage == stage
+      @production.theater_empty! if @stages.empty? || !any_visible_stages?
     end
 
     # If no Stages are added, the Theater will provide a default Stage named "Limelight".
@@ -66,11 +77,25 @@ 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)
       return Limelight::Stage.new(self, name, options)
     end
+
+    private ###############################################
+
+    def any_visible_stages?
+     return @stages.values.any? { |s| s.visible? }  
+    end
     
   end
   

data/lib/limelight/version.rb

@@ -6,7 +6,7 @@ module Limelight
     unless defined? MAJOR
       MAJOR  = 0
       MINOR  = 5
-      TINY   = 1
+      TINY   = 2
 
       STRING = [MAJOR, MINOR, TINY].join('.')
       TAG    = "REL_" + [MAJOR, MINOR, TINY].join('_')
@@ -17,4 +17,4 @@ module Limelight
       DESCRIPTION = "#{NAME}-#{STRING} - Limelight\n#{URL}"
     end
   end
-end
+end

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/productions/examples/sandbox/stage_handles/players/sizer.rb

@@ -1,3 +1,6 @@
+#- Copyright � 2008-2009 8th Light, Inc. All Rights Reserved.
+#- Limelight and all included source files are distributed under terms of the GNU LGPL.
+
 module Sizer
 
   def casted

data/spec/limelight/builtin/players/combo_box_spec.rb

@@ -9,7 +9,7 @@ require 'limelight/builtin/players/combo_box'
 describe Limelight::Builtin::Players::ComboBox do
 
   before(:each) do
-    @scene = Limelight::Scene.new(:casting_director => make_mock("caster", :fill_cast => nil))
+    @scene = Limelight::Scene.new(:casting_director => mock("caster", :fill_cast => nil))
     @prop = Limelight::Prop.new(:scene => @scene)
     @prop.include_player(Limelight::Builtin::Players::ComboBox)
   end

data/spec/limelight/builtin/players/radio_button_spec.rb

@@ -9,7 +9,7 @@ require 'limelight/builtin/players/radio_button'
 describe Limelight::Builtin::Players::RadioButton do
 
   before(:each) do
-    @scene = Limelight::Scene.new(:casting_director => make_mock("caster", :fill_cast => nil))
+    @scene = Limelight::Scene.new(:casting_director => mock("caster", :fill_cast => nil))
     @prop = Limelight::Prop.new
     @scene << @prop
     @prop.include_player(Limelight::Builtin::Players::RadioButton)

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/casting_director_spec.rb

@@ -13,7 +13,7 @@ describe Limelight::CastingDirector do
     TestDir.clean
     $casted_props = []
     $casted_players = []
-    @scene = Limelight::Scene.new(:casting_director => make_mock("casting_director", :fill_cast => nil), :path => TestDir.path("scene_path"))
+    @scene = Limelight::Scene.new(:casting_director => mock("casting_director", :fill_cast => nil), :path => TestDir.path("scene_path"))
     @scene.illuminate
     @loader = Limelight::FileLoader.for_root(TestDir.root)
     @casting_director = Limelight::CastingDirector.new(@loader)

data/spec/limelight/commands/create_command_spec.rb

@@ -23,9 +23,9 @@ describe Limelight::Commands::CreateCommand do
   end
 
   it "should create a production" do
-    production_templater = make_mock("production_templater")
+    production_templater = mock("production_templater")
     Limelight::Templates::ProductionTemplater.should_receive(:new).and_return(production_templater)
-    scene_templater = make_mock("scene_templater")
+    scene_templater = mock("scene_templater")
     Limelight::Templates::SceneTemplater.should_receive(:new).and_return(scene_templater)
     production_templater.should_receive(:generate)
     scene_templater.should_receive(:generate)
@@ -35,7 +35,7 @@ describe Limelight::Commands::CreateCommand do
 
   it "should create a scene" do
     Limelight::Templates::ProductionTemplater.should_not_receive(:new)
-    scene_templater = make_mock("scene_templater")
+    scene_templater = mock("scene_templater")
     Limelight::Templates::SceneTemplater.should_receive(:new).and_return(scene_templater)
     scene_templater.should_receive(:generate)
 
@@ -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/commands/pack_command_spec.rb

@@ -16,7 +16,7 @@ describe Limelight::Commands::PackCommand do
   end
 
   it "should pack a production" do
-    mock_packer = make_mock("packer")
+    mock_packer = mock("packer")
     Limelight::Util::Packer.should_receive(:new).and_return(mock_packer)
     mock_packer.should_receive(:pack).with("production_to_pack")
 

data/spec/limelight/commands/unpack_command_spec.rb

@@ -15,7 +15,7 @@ describe Limelight::Commands::UnpackCommand do
     @mock_output = StringIO.new
     Limelight::Commands.output = @mock_output
 
-    @mock_unpacker = make_mock("unpacker")
+    @mock_unpacker = mock("unpacker")
     Limelight::Util::Packer.stub!(:new).and_return(@mock_unpacker)
     @mock_unpacker.stub!(:unpack).and_return "unpacked location"
 

data/spec/limelight/dsl/prop_builder_spec.rb

@@ -7,7 +7,7 @@ require 'limelight/dsl/prop_builder'
 describe Limelight::DSL::PropBuilder do
 
   before(:each) do
-    @caster = make_mock("caster", :fill_cast => nil)
+    @caster = mock("caster", :fill_cast => nil)
     @scene = Limelight::Scene.new(:name => "root", :casting_director => @caster)
   end
 
@@ -118,7 +118,7 @@ describe Limelight::DSL::PropBuilder do
   end
 
   it "should install external props" do
-    loader = make_mock("loader", :exists? => true)
+    loader = mock("loader", :exists? => true)
     loader.should_receive(:load).with("external.rb").and_return("child :id => 123")
 
     root = Limelight::build_props(@scene, :id => 321, :build_loader => loader, :casting_director => @caster) do
@@ -145,7 +145,7 @@ describe Limelight::DSL::PropBuilder do
   end
 
   it "should fail when the external file doesn't exist" do
-    loader = make_mock("loader")
+    loader = mock("loader")
     loader.should_receive(:exists?).with("external.rb").and_return(false)
 
     begin
@@ -158,7 +158,7 @@ describe Limelight::DSL::PropBuilder do
   end
 
   it "should fail with PropException when there's problem in the external file" do
-    loader = make_mock("loader", :exists? => true)
+    loader = mock("loader", :exists? => true)
     loader.should_receive(:load).with("external.rb").and_return("+")
 
     begin
@@ -172,7 +172,7 @@ describe Limelight::DSL::PropBuilder do
 
   it "should build onto an existing block" do
     prop = Limelight::Prop.new
-    scene = Limelight::Scene.new(:casting_director => make_mock(:casting_director, :fill_cast => nil))
+    scene = Limelight::Scene.new(:casting_director => mock(:casting_director, :fill_cast => nil))
     scene << prop
     builder = Limelight::DSL::PropBuilder.new(prop)
     block = Proc.new { one; two { three } }
@@ -229,7 +229,7 @@ describe Limelight::DSL::PropBuilder do
   end
 
   it "should allow instance_variable when installing an external props file" do
-    loader = make_mock("loader", :exists? => true)
+    loader = mock("loader", :exists? => true)
     loader.should_receive(:load).with("external.rb").and_return("child :id => @desired_id")
 
     root = Limelight::build_props(@scene, :id => 321, :build_loader => loader, :casting_director => @caster) do

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/file_chooser_spec.rb

@@ -44,7 +44,7 @@ describe Limelight::FileChooser do
   it "should return the absolute path if a file was selected" do    
     chooser = Limelight::FileChooser.new(:parent => "parent")
     chooser.chooser.should_receive(:showOpenDialog).with("parent").and_return(javax.swing.JFileChooser::APPROVE_OPTION)
-    selected_file = make_mock("selected file", :absolute_path => "selected file's absolute path")
+    selected_file = mock("selected file", :absolute_path => "selected file's absolute path")
     chooser.chooser.should_receive(:getSelectedFile).and_return(selected_file)
 
     chooser.choose_file.should == "selected file's absolute path"

data/spec/limelight/file_filter_spec.rb

@@ -20,8 +20,8 @@ describe Limelight::FileFilter do
     filter = Limelight::FileFilter.new("Some Description") { |file| file.name == "good" }
     
     filter.getDescription().should == "Some Description"
-    bad_file = make_mock("file", :name => "bad")
-    good_file = make_mock("file", :name => "good")
+    bad_file = mock("file", :name => "bad")
+    good_file = mock("file", :name => "good")
     filter.accept(bad_file).should == false
     filter.accept(good_file).should == true
   end

data/spec/limelight/main_spec.rb

@@ -12,8 +12,8 @@ describe Limelight::Main do
   end
 
   it "should run the specified command" do
-    command_class = make_mock("command_class")
-    command = make_mock("command")
+    command_class = mock("command_class")
+    command = mock("command")
 
     Limelight::Commands.should_receive(:[]).with("mock").and_return(command_class)
     command_class.should_receive(:new).and_return(command)

data/spec/limelight/paint_action_spec.rb

@@ -20,7 +20,7 @@ describe Limelight::PaintAction do
     local_pen = nil
     action = Limelight::PaintAction.new { |pen| local_pen = pen }
     
-    graphics = make_mock("graphics", :setColor => nil, :setStroke => nil, :setRenderingHint => nil)
+    graphics = mock("graphics", :setColor => nil, :setStroke => nil, :setRenderingHint => nil)
     action.invoke(graphics)
     
     local_pen.class.should == Limelight::Pen

data/spec/limelight/pen_spec.rb

@@ -7,7 +7,7 @@ require 'limelight/pen'
 describe Limelight::Pen do
 
   before(:each) do
-    @context = make_mock("context", :setColor => nil, :setStroke => nil, :setRenderingHint => nil)
+    @context = mock("context", :setColor => nil, :setStroke => nil, :setRenderingHint => nil)
     @pen = Limelight::Pen.new(@context)
   end
   

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
@@ -18,7 +19,7 @@ describe Limelight::Producer do
   end
 
   it "should take an optional theater on creation" do
-    theater = make_mock("theater")
+    theater = mock("theater")
     producer = Limelight::Producer.new("/tmp", theater)
 
     producer.theater.should == theater
@@ -32,7 +33,7 @@ describe Limelight::Producer do
   it "should load props" do
     TestDir.create_file("test_prod/props.rb", "child :id => 321")
 
-    scene = @producer.load_props(:path => TestDir.path("test_prod"), :casting_director => make_mock("casting_director", :fill_cast => nil))
+    scene = @producer.load_props(:path => TestDir.path("test_prod"), :casting_director => mock("casting_director", :fill_cast => nil))
     scene.illuminate
     scene.children.size.should == 1
     scene.children[0].name.should == "child"
@@ -40,7 +41,7 @@ describe Limelight::Producer do
   end
 
   it "should load props even when props.rd doesn't exist." do
-    scene = @producer.load_props(:path => TestDir.path("test_prod"), :casting_director => make_mock("casting_director", :fill_cast => nil))
+    scene = @producer.load_props(:path => TestDir.path("test_prod"), :casting_director => mock("casting_director", :fill_cast => nil))
     scene.children.size.should == 0
   end
 
@@ -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
@@ -65,7 +66,7 @@ describe Limelight::Producer do
   #    TestDir.create_file("test_prod/props.rb", "one\n+\nthree")
   #
   #    begin
-  #      result = @producer.load_props(:path => TestDir.path("test_prod"), :casting_director => make_mock("casting_director", :fill_cast => nil))
+  #      result = @producer.load_props(:path => TestDir.path("test_prod"), :casting_director => mock("casting_director", :fill_cast => nil))
   #      result.should == nil # should never perform
   #    rescue Limelight::DSL::BuildException => e
   #      e.line_number.should == 3
@@ -131,8 +132,8 @@ describe Limelight::Producer do
   end
 
   it "should open a scene" do
-    stage = make_mock("stage")
-    scene = make_mock("scene")
+    stage = mock("stage")
+    scene = mock("scene")
     @producer.should_receive(:load_props).with(:production => @producer.production, :casting_director => anything, :path => TestDir.path("test_prod/name"), :name => "name").and_return(scene)
     @producer.should_receive(:load_styles).and_return("styles")
     scene.should_receive(:styles=)
@@ -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
@@ -197,8 +198,8 @@ describe Limelight::Producer do
   end
 
   it "should allow options such as instance variables to be passed to open_scene" do
-    stage = make_mock("stage")
-    scene = make_mock("scene")
+    stage = mock("stage")
+    scene = mock("scene")
     @producer.should_receive(:load_props).with(:instance_variables => { :foo => "bar" }, :production => @producer.production, :casting_director => anything, :path => TestDir.path("test_prod/name"), :name => "name").and_return(scene)
     @producer.should_receive(:load_styles).and_return("styles")
     scene.should_receive(:styles=)
@@ -207,4 +208,22 @@ 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
+
+  it "should close a production" do
+    theater = mock("theater")
+    production = mock("production", :theater => theater, :closed? => false)
+    production.should_receive(:closed=).with(true)
+    production.should_receive(:production_closing)
+    theater.should_receive(:close)
+    production.should_receive(:production_closed)
+    Limelight::Context.instance.studio.should_receive(:production_closed).with(production)
+
+    close_thread = @producer.close(production)
+    close_thread.join()
+  end
+  
 end