limelight 0.4.0-java → 0.5.0-java

data/spec/{dsl → limelight/dsl}/stage_builder_spec.rb

@@ -1,7 +1,7 @@
 #- Copyright � 2008-2009 8th Light, Inc. All Rights Reserved.
 #- Limelight and all included source files are distributed under terms of the GNU LGPL.
 
-require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
+require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
 require 'limelight/dsl/stage_builder'
 require 'limelight/theater'
 

data/spec/{dsl → limelight/dsl}/styles_builder_spec.rb

@@ -1,30 +1,30 @@
 #- Copyright � 2008-2009 8th Light, Inc. All Rights Reserved.
 #- Limelight and all included source files are distributed under terms of the GNU LGPL.
 
-require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
+require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
 require 'limelight/dsl/styles_builder'
 
 describe Limelight::DSL::StylesBuilder do
 
   before(:each) do
   end
-  
+
   it "should build a hash" do
     result = Limelight.build_styles
-    
+
     result.class.should == Hash
     result.size.should == 0
   end
-  
+
   it "should build one style" do
     result = Limelight.build_styles do
       root
     end
-    
+
     result.size.should == 1
     result["root"].class.should == Limelight::Styles::RichStyle
   end
-  
+
   it "should build one style with styling" do
     result = Limelight.build_styles do
       root do
@@ -33,14 +33,14 @@ describe Limelight::DSL::StylesBuilder do
         transparency "50%"
       end
     end
-    
+
     result.size.should == 1
     style = result["root"]
     style.width.should == "100"
     style.top_border_color.should == "#0000ffff"
     style.transparency.should == "50%"
   end
-  
+
   it "should raise an error on invalid styles" do
     lambda do
       Limelight.build_styles do
@@ -50,18 +50,18 @@ describe Limelight::DSL::StylesBuilder do
       end
     end.should raise_error(Limelight::DSL::StyleBuilderException)
   end
-  
+
   it "should build multiple styles" do
     result = Limelight.build_styles do
       one { width 100 }
       two { width 50 }
     end
-    
+
     result.size.should == 2
     result["one"].width.should == "100"
     result["two"].width.should == "50"
   end
-  
+
   it "should allow hover styles" do
     styles = Limelight.build_styles do
       root do
@@ -71,7 +71,7 @@ describe Limelight::DSL::StylesBuilder do
         end
       end
     end
-    
+
     styles.size.should == 2
     styles["root"].width.should == "100"
     styles["root.hover"].width.should == "50"
@@ -142,7 +142,6 @@ describe Limelight::DSL::StylesBuilder do
       two { width 123 }
     end
 
-    styles1.should == styles2
     styles2.size.should == 2
     one = styles2["one"]
     two = styles2["two"]
@@ -151,5 +150,45 @@ describe Limelight::DSL::StylesBuilder do
     two.width.should == "123"
   end
 
+  it "should be able to modify style within same build" do
+    styles = Limelight.build_styles do
+      one { width 100 }
+      one { height 200 }
+    end
+
+    styles["one"].width.should == "100"
+    styles["one"].height.should == "200"
+  end
+
+  it "should beable to extend existing styles but not modify them" do
+    styles1 = Limelight.build_styles do
+      one { width 100; height 200 }
+    end
+    styles2 = Limelight.build_styles(styles1) do
+      one { width 300 }
+    end
+
+    styles1["one"].width.should == "100"
+    styles1["one"].height.should == "200"
+    styles2["one"].width.should == "300"
+    styles2["one"].height.should == "200"
+
+    styles1["one"].height = "400"
+    styles2["one"].height.should == "400"
+  end
+
+  it "should be able to explicitely extend extendable_styles" do
+    styles1 = Limelight.build_styles do
+      one { width 100; height 200 }
+    end
+    styles2 = Limelight.build_styles(styles1) do
+      two { extends "one"; x 25 }
+    end
+
+    styles2["two"].width.should == "100"
+    styles2["two"].height.should == "200"
+    styles2["two"].x.should == "25"
+  end
+
 end
 

data/spec/{file_chooser_spec.rb → limelight/file_chooser_spec.rb}

@@ -1,7 +1,7 @@
 #- Copyright � 2008-2009 8th Light, Inc. All Rights Reserved.
 #- Limelight and all included source files are distributed under terms of the GNU LGPL.
 
-require File.expand_path(File.dirname(__FILE__) + "/spec_helper")
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 require 'limelight/file_chooser'
 
 describe Limelight::FileChooser do

data/spec/{file_filter_spec.rb → limelight/file_filter_spec.rb}

@@ -1,7 +1,7 @@
 #- Copyright � 2008-2009 8th Light, Inc. All Rights Reserved.
 #- Limelight and all included source files are distributed under terms of the GNU LGPL.
 
-require File.expand_path(File.dirname(__FILE__) + "/spec_helper")
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 require 'limelight/file_filter'
 
 describe Limelight::FileFilter do

data/spec/{file_loader_spec.rb → limelight/file_loader_spec.rb}

@@ -1,7 +1,7 @@
 #- Copyright � 2008-2009 8th Light, Inc. All Rights Reserved.
 #- Limelight and all included source files are distributed under terms of the GNU LGPL.
 
-require File.expand_path(File.dirname(__FILE__) + "/spec_helper")
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 require 'limelight/file_loader'
 
 describe Limelight::FileLoader do

data/spec/{gems_spec.rb → limelight/gems_spec.rb}

@@ -1,7 +1,7 @@
 #- Copyright � 2008-2009 8th Light, Inc. All Rights Reserved.
 #- Limelight and all included source files are distributed under terms of the GNU LGPL.
 
-require File.expand_path(File.dirname(__FILE__) + "/spec_helper")
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 require "limelight/gems"
 require 'limelight/production'
 
@@ -57,9 +57,9 @@ describe Limelight::Gems do
     end
 
     it "should load all the gems in a production" do
-      TestDir.create_file("prod/__resources/gems/gem1/limelight_init.rb", "Limelight::Gems.install('gem1', ['fee'])")
-      TestDir.create_file("prod/__resources/gems/gem2/limelight_init.rb", "Limelight::Gems.install('gem2', ['fie'])")
-      TestDir.create_file("prod/__resources/gems/gem3/limelight_init.rb", "Limelight::Gems.install('gem3', ['foe', 'fum'])")
+      TestDir.create_file("prod/__resources/gems/gems/gem1/limelight_init.rb", "Limelight::Gems.install('gem1', ['fee'])")
+      TestDir.create_file("prod/__resources/gems/gems/gem2/limelight_init.rb", "Limelight::Gems.install('gem2', ['fie'])")
+      TestDir.create_file("prod/__resources/gems/gems/gem3/limelight_init.rb", "Limelight::Gems.install('gem3', ['foe', 'fum'])")
       path = []
       Limelight::Gems.stub!(:load_path).and_return(path)
 
@@ -81,6 +81,12 @@ describe Limelight::Gems do
 
       path.length.should == 0
     end
+    
+    it "should set the gem home and gem path to the __resources/gems so that using the gem command within frozen gems will work" do
+      Gem.should_receive(:use_paths).with(@production.gems_root, Gem.default_path)
+      
+      Limelight::Gems.install_gems_in_production(@production)
+    end
   end
 
 end

data/spec/{java_util_spec.rb → limelight/java_util_spec.rb}

@@ -1,7 +1,7 @@
 #- Copyright � 2008-2009 8th Light, Inc. All Rights Reserved.
 #- Limelight and all included source files are distributed under terms of the GNU LGPL.
 
-require File.expand_path(File.dirname(__FILE__) + "/spec_helper")
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 require 'limelight/java_util'
 
 describe Class do

data/spec/{main_spec.rb → limelight/main_spec.rb}

@@ -1,7 +1,7 @@
 #- Copyright � 2008-2009 8th Light, Inc. All Rights Reserved.
 #- Limelight and all included source files are distributed under terms of the GNU LGPL.
 
-require File.expand_path(File.dirname(__FILE__) + "/spec_helper")
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 require 'limelight/main'
 
 describe Limelight::Main do

data/spec/{paint_action_spec.rb → limelight/paint_action_spec.rb}

@@ -1,7 +1,7 @@
 #- Copyright � 2008-2009 8th Light, Inc. All Rights Reserved.
 #- Limelight and all included source files are distributed under terms of the GNU LGPL.
 
-require File.expand_path(File.dirname(__FILE__) + "/spec_helper")
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 require 'limelight/paint_action'
 
 describe Limelight::PaintAction do

data/spec/{pen_spec.rb → limelight/pen_spec.rb}

@@ -1,7 +1,7 @@
 #- Copyright � 2008-2009 8th Light, Inc. All Rights Reserved.
 #- Limelight and all included source files are distributed under terms of the GNU LGPL.
 
-require File.expand_path(File.dirname(__FILE__) + "/spec_helper")
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 require 'limelight/pen'
 
 describe Limelight::Pen do

data/spec/{producer_spec.rb → limelight/producer_spec.rb}

@@ -1,7 +1,7 @@
 #- Copyright � 2008-2009 8th Light, Inc. All Rights Reserved.
 #- Limelight and all included source files are distributed under terms of the GNU LGPL.
 
-require File.expand_path(File.dirname(__FILE__) + "/spec_helper")
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 require 'limelight/producer'
 
 describe Limelight::Producer do
@@ -52,7 +52,7 @@ describe Limelight::Producer do
 
   it "should load styles" do
     TestDir.create_file("test_prod/styles.rb", "alpha { width 100 }")
-    @producer.builtin_styles = {}
+    Limelight::Studio.stub!(:builtin_styles).and_return({})
 
     styles = @producer.load_styles(Limelight::Scene.new(:path => TestDir.path("test_prod")))
     styles.size.should == 1
@@ -135,7 +135,6 @@ describe Limelight::Producer do
     scene = make_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")
-    @producer.should_receive(:merge_with_root_styles).with("styles")
     scene.should_receive(:styles=)
     stage.should_receive(:open).with(scene)
 
@@ -143,7 +142,7 @@ describe Limelight::Producer do
   end
 
   it "should load empty styles if styles.rb doesn't exist" do
-    @producer.builtin_styles = {}
+    Limelight::Studio.stub!(:builtin_styles).and_return({})
 
     @producer.load_styles(Limelight::Scene.new(:path => TestDir.path("test_prod"))).should == {}
   end
@@ -189,12 +188,6 @@ describe Limelight::Producer do
     @producer.open
   end
 
-  it "should give the same buildin_styles hash twice" do
-    @producer.builtin_styles.should_not be(@producer.builtin_styles)
-    # Try again
-    @producer.builtin_styles.should_not be(@producer.builtin_styles)
-  end
-
   it "should check limelight version" do
     @producer.production.should_receive(:minimum_limelight_version).and_return("0.0.0")
     @producer.version_compatible?.should == true
@@ -208,11 +201,10 @@ describe Limelight::Producer do
     scene = make_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")
-    @producer.should_receive(:merge_with_root_styles).with("styles")
     scene.should_receive(:styles=)
     stage.should_receive(:open).with(scene)
 
     @producer.open_scene("name", stage, :instance_variables => { :foo => "bar" })
   end
-
+  
 end

data/spec/{production_spec.rb → limelight/production_spec.rb}

@@ -1,7 +1,7 @@
 #- Copyright � 2008-2009 8th Light, Inc. All Rights Reserved.
 #- Limelight and all included source files are distributed under terms of the GNU LGPL.
 
-require File.expand_path(File.dirname(__FILE__) + "/spec_helper")
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 require 'limelight/production'
 
 describe Limelight::Production, "Instance methods" do
@@ -13,22 +13,22 @@ describe Limelight::Production, "Instance methods" do
     @production.producer = @producer
     @production.theater = @theater
   end
-  
+
   it "should know it path, producer, and theater" do
     @production.producer.should == @producer
     @production.theater.should == @theater
     @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")
@@ -37,23 +37,27 @@ describe Limelight::Production, "Instance methods" do
   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"
-    Limelight::Production.new("my_name/is/kid").name.should == "kid"   
+    Limelight::Production.new("my_name/is/kid").name.should == "kid"
   end
 
-  it "should know it's init file" do
+  it "should know its init file" do
     @production.init_file.should == "/tmp/init.rb"
   end
 
-  it "should know it's stages file" do
+  it "should know its stages file" do
     @production.stages_file.should == "/tmp/stages.rb"
   end
 
-  it "should know it's styles file" do
+  it "should know its styles file" do
     @production.styles_file.should == "/tmp/styles.rb"
   end
 
-  it "should know it's gems directory" do
-    @production.gems_directory.should == "/tmp/__resources/gems"
+  it "should know its gems directory" do
+    @production.gems_directory.should == "/tmp/__resources/gems/gems"
+  end
+  
+  it "should know its gems root" do
+    @production.gems_root.should == "/tmp/__resources/gems"
   end
 
   it "should provide paths to it's scenes" do
@@ -74,6 +78,23 @@ describe Limelight::Production, "Instance methods" do
     @production.close
   end
 
+  describe "with files" do
+
+    after(:each) do
+      TestDir.clean
+    end
+    
+    it "should load it's root styles" do
+      TestDir.create_file("test_prod/styles.rb", "a_style { width 100; height 200 }")
+      @production = Limelight::Production.new( TestDir.path("test_prod"))
+
+      styles = @production.root_styles
+      styles["a_style"].width.should == "100"
+      styles["a_style"].height.should == "200"
+      @production.root_styles.should be(styles)
+    end
+  end
+
 end
 
 

data/spec/{prop_spec.rb → limelight/prop_spec.rb}

@@ -1,7 +1,7 @@
 #- Copyright � 2008-2009 8th Light, Inc. All Rights Reserved.
 #- Limelight and all included source files are distributed under terms of the GNU LGPL.
 
-require File.expand_path(File.dirname(__FILE__) + "/spec_helper")
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 require 'limelight/prop'
 require 'limelight/dsl/styles_builder'
 require 'limelight/scene'
@@ -64,6 +64,13 @@ describe Limelight::Prop do
     @prop.illuminate
     @prop.id.should == "root"
   end
+  
+  it "not start out being illuminated" do
+    prop = Limelight::Prop.new(nil)
+    
+    prop.should_not be_illuminated
+  end
+  
 
   def build_prop_tree
     @child1 = Limelight::Prop.new(:id => "child1", :name => "child_class")
@@ -151,7 +158,7 @@ describe Limelight::Prop do
 
   it "should set styles upon adding to parent" do
     styles = Limelight::build_styles { child { width 123 } }
-    scene = Limelight::Scene.new(:casting_director => @casting_director, :styles => styles)
+    scene = Limelight::Scene.new(:casting_director => @casting_director, :styles_hash => styles)
     prop = Limelight::Prop.new(:name => "child")
     scene.illuminate
 
@@ -383,6 +390,27 @@ describe Limelight::Prop do
       @scene.find("child").should == nil
       @scene.find("grandchild").should == nil
     end
+    
+    it "should index it's id when being re-added to the prop tree" do
+      child = Limelight::Prop.new(:id => "child")
+      @prop << child
+      @prop.remove(child)
+      @prop << child
+
+      @scene.find("child").should == child
+    end
+    
+    it "should traverse and index children when being re-added to the prop tree" do
+      grandchild = Limelight::Prop.new(:id => "grandchild")
+      child = Limelight::Prop.new(:id => "child")
+      child << grandchild
+      @prop << child
+      @prop.remove(child)
+      @prop << child
+      
+      @scene.find("grandchild").should == grandchild
+    end
+    
 
   end