limelight 0.4.0-java → 0.5.0-java

data/lib/limelight/file_loader.rb

@@ -19,7 +19,7 @@ module Limelight
       @root = File.expand_path(root)
     end
 
-    def path_to(path)
+    def path_to(path)     
       if (path == File.expand_path(path))
         return path
       else

data/lib/limelight/gems.rb

@@ -39,7 +39,9 @@ module Limelight
           end
         end
 
-        self.current_production = nil
+        Gem.use_paths(self.current_production.gems_root, Gem.default_path)
+
+        self.current_production = nil        
       end
 
     end

data/lib/limelight/java_couplings.rb

@@ -21,6 +21,7 @@ module Limelight #:nodoc:
   module Util #:nodoc:
     Colors = Java::limelight.util.Colors
     Version = Java::limelight.util.Version
+    Debug = Java::limelight.util.Debug
   end
 
   module UI #:nodoc:

data/lib/limelight/producer.rb

@@ -5,7 +5,6 @@ require 'limelight/file_loader'
 require 'limelight/dsl/prop_builder'
 require 'limelight/dsl/styles_builder'
 require 'limelight/dsl/stage_builder'
-require 'limelight/dsl/production_builder'
 require 'limelight/casting_director'
 require 'limelight/stage'
 require 'limelight/dsl/build_exception'
@@ -103,7 +102,6 @@ module Limelight
       scene_name = File.basename(path)
       scene = load_props(options.merge(:production => @production, :casting_director => casting_director, :path => path, :name => scene_name))
       styles = load_styles(scene)
-      merge_with_root_styles(styles)
       scene.styles = styles
       stage.open(scene)
       return scene
@@ -146,45 +144,10 @@ module Limelight
     # Loads the specified 'styles.rb' file and created a Hash of Styles.
     #
     def load_styles(context)
-      styles = builtin_styles
-      return styles if not File.exists?(context.styles_file)
-      content = IO.read(context.styles_file)
-      return Limelight.build_styles(styles) do
-        begin
-          eval content
-        rescue Exception => e
-          raise DSL::BuildException.new(context.styles_file, content, e)
-        end
-      end
-    end
-
-    # A production with multiple Scenes may have a 'styles.rb' file in the root directory.  This is called the
-    # root_style.  This method loads the root_styles, if they haven't already been loaded, and returns them.
-    #
-    def root_styles
-      return @root_syles if @root_syles   
-      if File.exists?(@production.styles_file)
-        @root_styles = load_styles(@production)
-      else
-        @root_styles = {}
-      end
-      return @root_styles
-    end
-
-    # Returns a hash of all the built-in Limglight Styles
-    #
-    def builtin_styles
-      return @builtin_styles.dup if @builtin_styles
-      builtin_styles_file = File.join($LIMELIGHT_LIB, "limelight", "builtin", "styles.rb")
-      content = IO.read(builtin_styles_file)
-      @builtin_styles = Limelight.build_styles do
-        begin
-          eval content
-        rescue Exception => e
-          raise BuildException.new(filename, content, e)
-        end
-      end
-      return @builtin_styles.dup
+      extendable_styles = Studio.builtin_styles.merge(@production.root_styles)
+      return extendable_styles.dup if not File.exists?(context.styles_file)
+      new_styles = Limelight.build_styles_from_file(context.styles_file, extendable_styles)
+      return extendable_styles.merge(new_styles)
     end
 
     def establish_production #:nodoc:
@@ -204,12 +167,6 @@ module Limelight
 
     private ###############################################
 
-    def merge_with_root_styles(styles)
-      root_styles.each_pair do |key, value|
-        styles[key] = value if !styles.has_key?(key)
-      end
-    end
-
     def unpack_production(production_name)
       packer = Limelight::Util::Packer.new()
       dest_dir = File.join(Data.productions_dir, rand.to_s.sub("0.", ""))

data/lib/limelight/production.rb

@@ -73,6 +73,12 @@ module Limelight
     # Returns the path to the production's gems directory
     #
     def gems_directory
+      return @root.path_to("__resources/gems/gems")
+    end
+    
+    # Returns the path to the productions gems root
+    #
+    def gems_root
       return @root.path_to("__resources/gems")
     end
 
@@ -144,6 +150,20 @@ module Limelight
       return :root
     end
 
+    # A production with multiple Scenes may have a 'styles.rb' file in the root directory.  This is called the
+    # root_styles.  This method loads the root_styles, if they haven't already been loaded, and returns them.
+    #
+    def root_styles
+      unless @root_styles
+        if File.exists?(styles_file)
+          @root_styles = Limelight.build_styles_from_file(styles_file)
+        else
+          @root_styles = {}
+        end
+      end
+      return @root_styles
+    end
+
   end
 
 end

data/lib/limelight/prop.rb

@@ -50,11 +50,10 @@ module Limelight
     # until the prop is added to a Prop tree with a Scene.
     #
     def initialize(hash = {})
-      @options = hash
+      @options = hash || {}
       @children = []
       @style = Styles::ScreenableStyle.new
       @panel = UI::Model::Panel.new(self)
-      @illuminated = false
     end
 
     # Add a Prop as a child of this Prop.
@@ -139,8 +138,8 @@ module Limelight
       end
     end
 
-    # Searches all children for Props with the specified name.  Returns an Array of matching Props. Returns an
-    # empty Array is none are found.
+    # Searches all descendant of the Prop (including itself) for Props with the specified name.
+    # Returns an Array of matching Props. Returns an empty Array if none are found.
     #
     def find_by_name(name, results = [])
       results << self if @name == name
@@ -191,14 +190,16 @@ module Limelight
     # unusual name because it's not part of public api
     def set_parent(parent) #:nodoc:
       @parent = parent
-      illuminate if @parent.illuminated?
+      if @parent.illuminated?
+        illuminate
+      end
     end
 
     # Allows the addition of extra initialization options.  Will raise an exception if the Prop has already been
     # illuminated (added to a scene).
     #
     def add_options(more_options)
-      raise "Too late to add options" if @options.nil?
+      raise "Too late to add options" if illuminated?
       @options.merge!(more_options)
     end
 
@@ -219,6 +220,13 @@ module Limelight
       return panel.get_box_inside_borders.clone
     end
 
+    # Returns a Box representing the bounds inside the padding of the prop.  This is the area where child props may
+    # be located
+    #
+    def child_area
+      return panel.getChildConsumableArea().clone
+    end
+
     # Returns a Pen object. Pen objects allow to you to draw directly on the screen, withing to bounds of this Prop.
     #
     def pen
@@ -279,31 +287,31 @@ module Limelight
     event :button_pressed
     event :value_changed
 
-    # TODO Try to get me our of public scope
+    # TODO Try to get me out of public scope
     #
-    def illuminate #:nodoc:     
-      return if @options.nil?
-
-      set_id(@options.delete(:id))
-      @name = @options.delete(:name)
-      @players = @options.delete(:players)
-      @additional_styles = @options.delete(:styles)
-
-      inherit_styles
-      scene.casting_director.fill_cast(self)
-      apply_options
-
-      @options = nil
+    def illuminate #:nodoc:
+      if illuminated?
+        scene.index_prop(self) if @id
+      else
+        set_id(@options.delete(:id))
+        @name = @options.delete(:name)
+        @players = @options.delete(:players)
+        @additional_styles = @options.delete(:styles)
 
-      @illuminated = true
+        inherit_styles
+        scene.casting_director.fill_cast(self)
+        apply_options
 
+        @options = nil
+      end
+      
       children.each do |child|
-        child.illuminate unless child.illuminated?
+        child.illuminate
       end
     end
 
     def illuminated? #:nodoc:
-      return @illuminated
+      return @options.nil?
     end  
 
     private ###############################################
@@ -340,7 +348,7 @@ module Limelight
     def inherit_styles
       style_names = []
       style_names << @name unless @name.nil?
-      style_names += @additional_styles.gsub(',', ' ').split(' ') unless @additional_styles.nil?
+      style_names += @additional_styles.gsub(',', ' ').split(' ') unless @additional_styles.nil?   
       style_names.each do |style_name|    
         new_style = scene.styles[style_name]
         @style.add_extension(new_style) if new_style
@@ -355,13 +363,5 @@ module Limelight
       end
     end
 
-    # Why is this method here?  No one appears to use it.
-    #    def disinherit_styles
-    #      return if @name.nil?
-    #      old_style = scene.styles[@name]
-    #      @style.remove_extension(old_style) if old_style
-    #      @hover_style = nil
-    #    end
-
   end
 end

data/lib/limelight/scene.rb

@@ -124,9 +124,10 @@ module Limelight
     end
         
     def illuminate #:nodoc:
-      @styles = @options.has_key?(:styles) ? @options.delete(:styles) : (@styles || {})
+      @styles = @options.delete(:styles_hash) || @styles || {}
       @casting_director = @options.delete(:casting_director) if @options.has_key?(:casting_director)
       @path = @options.delete(:path) if @options.has_key?(:path)
+      @production = @options.delete(:production) if @options.has_key?(:production)
       super
     end
 

data/lib/limelight/specs/spec_helper.rb

@@ -5,6 +5,8 @@ require 'spec'
 require File.expand_path(File.dirname(__FILE__) + "/../../init")
 require 'limelight/scene'
 require 'limelight/producer'
+require 'limelight/string'
+require 'limelight/specs/test_scene_opener'
 
 module Limelight
   module Specs
@@ -12,27 +14,14 @@ module Limelight
     class << self
       attr_accessor :producer
     end
-
+    
     module SpecHelper
-
-      def open_scene
-        if @ll_spec_options[:stage]
-          stage = producer.theater[@ll_spec_options[:stage]]
-          raise "No such stage: '#{@ll_spec_options[:stage]}'" unless stage
-        else
-          stage = producer.theater.default_stage
-        end
-
-        stage.should_remain_hidden = @ll_spec_options[:hidden]
-
-        @scene = producer.open_scene(@scene_name.to_s, stage)
-      end
-
       def scene
-        open_scene unless @scene
+        if !@scene
+          @scene = TestSceneOpener.new(producer, @ll_spec_options, @prop_block).open_scene 
+        end
         return @scene
       end
-
     end
   end
 end
@@ -42,12 +31,17 @@ module Spec
     class ExampleGroup
 
       def self.uses_scene(scene_name, options = {})
+        uses_limelight({:scene => scene_name}.merge(options))
+      end
+      
+      def self.uses_limelight(options, &prop_block)
         include Limelight::Specs::SpecHelper
-
+        
         before(:each) do
-          @scene_name = scene_name
           @ll_spec_options = options
-          @scene = nil
+          @prop_block = prop_block
+          @player = @scene = nil
+          create_accessor_for(@ll_spec_options[:with_player]) if @ll_spec_options[:with_player]
         end
       end
 
@@ -60,7 +54,7 @@ module Spec
           end
         end
       end
-
+                                                                             
       def producer
         if Limelight::Specs.producer.nil?
           if $with_ui
@@ -79,7 +73,15 @@ module Spec
       def production
         return producer.production
       end
-
+      
+      def create_accessor_for(player_name)
+        accessor = <<-EOF
+          def #{player_name}
+            return scene.find('#{player_name}')
+          end
+EOF
+        eval(accessor)
+      end
     end
   end
 end

data/lib/limelight/specs/test_scene_opener.rb

@@ -0,0 +1,60 @@
+module Limelight
+  module Specs
+    module SpecHelper
+
+      class TestSceneOpener
+        def initialize(producer, ll_spec_options, prop_block)
+          @producer = producer
+          @prop_block = prop_block
+          @production = producer.production
+          @ll_spec_options = ll_spec_options
+        end
+  
+        def create_player_helper
+          player_name = @ll_spec_options[:with_player]
+          Limelight.build_props(@scene, :build_loader => @production.root) do
+            __test_prop({:name =>player_name, :players => "#{player_name}", :id => "#{player_name}"})
+          end        
+        end
+
+        def setup_player_spec
+          path = @production.scene_directory(@ll_spec_options[:scene_path]) 
+          @scene = Scene.new(:production => @production, :casting_director => @producer.casting_director, :path => path, :name => @ll_spec_options[:scene_name])
+
+          if @prop_block
+            Limelight.build_props(@scene, :build_loader => @production.root, &@prop_block)
+          elsif @ll_spec_options[:with_player]
+            create_player_helper
+          end
+
+          styles = @producer.load_styles(@scene)
+          @scene.styles = @producer.load_styles(@scene)
+          @stage.open(@scene)
+        end
+
+        def setup_stage
+          if @ll_spec_options[:stage]
+            @stage = @producer.theater[@ll_spec_options[:stage]]
+            raise "No such stage: '#{@ll_spec_options[:stage]}'" unless @stage
+          else
+            @stage = @producer.theater.default_stage
+          end
+
+          @stage.should_remain_hidden = @ll_spec_options[:hidden] || true
+        end
+
+        def open_scene
+          setup_stage
+
+          if @ll_spec_options[:scene]
+            @scene = @producer.open_scene(@ll_spec_options[:scene].to_s, @stage)
+          elsif @ll_spec_options[:scene_path]
+            setup_player_spec
+          end
+    
+          return @scene
+        end
+      end
+    end
+  end
+end

data/lib/limelight/string.rb

@@ -9,7 +9,7 @@ class String
   #   "and_seven_years".camalized(:lower) # => "andSevenYears"
   #
   def camalized(starting_case = :upper)
-    value = self.downcase.gsub(/[_| ][a-z]/) { |match| match[-1..-1].upcase }
+    value = self.downcase.gsub(/[_| |\-][a-z]/) { |match| match[-1..-1].upcase }
     value = value[0..0].upcase + value[1..-1] if starting_case == :upper
     return value
   end

data/lib/limelight/studio.rb

@@ -1,4 +1,4 @@
-#- Copyright ? 2008-2009 8th Light, Inc. All Rights Reserved.
+#- Copyright � 2008-2009 8th Light, Inc. All Rights Reserved.
 #- Limelight and all included source files are distributed under terms of the GNU LGPL.
 
 require 'limelight/producer'
@@ -59,17 +59,15 @@ module Limelight
 
       # Opens the production at the specified path.
       #
-      def open(production_path)
+      def open(production_path)        
         begin
           producer = Producer.new(production_path)
           production = producer.production
           index(production)
           producer.open
           return production
-        rescue Exception => e
-          # TODO MDM - open the error in a window
-          puts e
-          puts e.backtrace
+        rescue StandardError => e
+          alert_and_shutdown(e)
         end
       end
 
@@ -86,7 +84,7 @@ module Limelight
         return if @is_shutdown || @is_shutting_down
         return unless should_allow_shutdown
         @is_shutting_down = true
-        @index.each { |production| production.close }
+        @index.each { |production| production.close } if @index
         @utilities_production.close if @utilities_production
         @is_shutdown = true
         Thread.new { Context.instance().shutdown }
@@ -95,8 +93,8 @@ module Limelight
       # Called when a production is closed to notify the studio of the event.
       #
       def production_closed(production)
-        @index.delete(production)
-        shutdown if(@index.empty?)
+        @index.delete(production) if @index
+        shutdown if @index && @index.empty?
       end
 
       # Returns an array of all the productions
@@ -122,6 +120,16 @@ module Limelight
         return @utilities_production
       end
 
+      # Returns a hash of all the built-in Limglight Styles
+      #
+      def builtin_styles
+        unless @builtin_styles
+          builtin_styles_file = File.join($LIMELIGHT_LIB, "limelight", "builtin", "styles.rb")
+          @builtin_styles = Limelight.build_styles_from_file(builtin_styles_file)
+        end
+        return @builtin_styles
+      end
+
       private #############################################
 
       def assign_unique_name(production) #:nodoc:
@@ -142,6 +150,17 @@ module Limelight
         production.name = count.to_s
       end
 
+      def alert_and_shutdown(e)
+        begin
+          message = "#{e}\n#{e.backtrace.join("\n")}"
+          utilities_production.alert(message)
+          shutdown if @index.nil? || @index.empty?
+        rescue Exception => e
+          puts e
+          puts e.backtrace
+        end
+      end
+
     end
 
     # Same as the class level method.