RUIC 0.4.0 → 0.4.1

data/test/customclasses.ruic

@@ -14,8 +14,8 @@ assert effect['starttime',1] == 0
 assert effect['NoiseSamp'].value == 'maps/effects/brushnoise.dds'
 
 material = main/"Scene.Layer.Rectangle.Material"
-assert material.properties.length == 11 # 6 shared asset, 1 MaterialBase, 4 from material
+assert material.properties.length == 12 # 6 shared asset, 2 MaterialBase, 4 from material
 assert material.name == "Material"
 assert material['uEnvironmentMappingEnabled']
 assert !material['ATTRIBUTE-DOES-NOT-EXIST']
-assert material['uEnvironmentTexture',1] == 'maps/materials/spherical_checker.png'
+assert material['uEnvironmentTexture',1] == 'maps/materials/spherical_checker.png'

data/test/filtering.ruic

@@ -1,35 +1,44 @@
-metadata 'MetaData.xml'
-
-uia 'projects/SimpleScene/SimpleScene.uia'
-show app.errors if app.errors?
-
-main = app.main_presentation
-
-assert main.find( _type:'Model' ).length==4
-assert main.find( _type:'Model', _slide:0 ).length==3
-assert main.find( _type:'Model', _slide:1 ).length==4
-assert main.find( _type:'Model', _slide:1, _master:false ).length==1
-assert main.find( _type:'Model', position:[-150,60,0] ).length==2
-assert main.find( _type:'Model', position:[-150,60,0] ).length==2
-assert main.find( _type:'Model', position:[nil,60,nil] ).length==4
-assert main.find( _type:'Model', sourcepath:'#Cube' ).length==1
-assert main.find( _under:main/"Scene.Layer.Sphere1" ).length==1
-assert main.find( name:'Material' ).length==4
-assert main.find( name:/^Sphere/ ).length==2
-
-# Return values are in Scene graph order
-assert main.find.first == main/"Scene"
-assert main.find.last  == main/"Scene.Layer.NonMaster.Material"
-
-# Any asset can be used as the 'root'
-sphere = main/"Scene.Layer.Sphere1"
-assert sphere.find.length==1
-
-# Supplying a block will iterate, including the index
-expected = main.find _type:'Model'
-found = 0
-main.find _type:'Model' do |mod,i|
-	found += 1
-	assert mod == expected[i]
-end
-assert found==4
+metadata 'MetaData.xml'
+
+uia 'projects/SimpleScene/SimpleScene.uia'
+show app.errors if app.errors?
+
+main = app.main_presentation
+
+assert main.find( _type:'Model' ).length==4
+assert main.find( _type:'Model', _slide:0 ).length==3
+assert main.find( _type:'Model', _slide:1 ).length==4
+assert main.find( _type:'Model', _slide:1, _master:false ).length==1
+assert main.find( _type:'Model', position:[-150,60,0] ).length==2
+assert main.find( _type:'Model', position:[-150,60,0] ).length==2
+assert main.find( _type:'Model', position:[nil,60,nil] ).length==4
+assert main.find( _type:'Model', sourcepath:'#Cube' ).length==1
+assert main.find( _under:main/"Scene.Layer.Sphere1" ).length==1
+assert main.find( name:'Material' ).length==4
+assert main.find( name:/^Sphere/ ).length==2
+
+# Return values are in Scene graph order
+assert main.find.first == main/"Scene"
+assert main.find.last  == main/"Scene.Layer.NonMaster.Material"
+
+# Any asset can be used as the 'root'
+sphere = main/"Scene.Layer.Sphere1"
+assert sphere.find.length==1
+
+# Supplying a block will iterate, including the index
+expected = main.find _type:'Model'
+found = 0
+main.find _type:'Model' do |mod,i|
+	found += 1
+	assert mod == expected[i]
+end
+assert found==4
+
+#
+['NOPE',false,/NOPE/,-1,[-1],nil].each do |v|
+	assert main.find(__type:v).length==0
+	assert main.find(NOPE:v).length==0
+	assert main.find('NOPE'=>v).length==0
+end
+
+show "All #{File.basename(__FILE__)} assertions successful."

data/test/futureassets.ruic

@@ -0,0 +1,9 @@
+metadata 'MetaData-simple.xml'
+uia 'projects/CustomClasses/CustomClasses.uia'  # required before other commands
+show app.errors if app.errors?
+
+future = app["#future"]
+
+assert xyzzy=future.find(_type:'XYZZY').first
+assert xyzzy.type == 'XYZZY'
+assert xyzzy['eyeball',0]==true # Unknown assets inherit from Asset

data/test/paths.ruic

@@ -0,0 +1,19 @@
+#!/usr/bin/env ruic
+metadata 'MetaData.xml'         # optional; also may be set via -m flag
+uia 'projects/Paths/Paths.uia'  # required before other commands
+
+show "Uh oh!", app.errors if app.errors?
+
+main = app.main
+paths = main.find _type:'Path'
+assert paths.length == 5
+assert paths.first == main/"Scene.Layer.Path1"
+assert paths.first['width'].value == 17
+
+assert main.find(_type:'PathAnchorPoint').length == 25
+
+assert paths.first.anchors
+assert paths.first.anchors.first == paths.first.find(_type:'PathAnchorPoint').first
+
+
+show "All assertions successful"

data/test/projects/CustomClasses/CustomClasses.uia

@@ -2,5 +2,6 @@
 <application xmlns="http://nvidia.com/uicomposer">
 	<assets initial="CustomClasses">
 		<presentation id="CustomClasses"	src="CustomClasses.uip"/>
+		<presentation id="future"	src="FutureAsset.uip"/>
 	</assets>
 </application>

data/test/projects/CustomClasses/FutureAsset.uip

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<UIP version="3" >
+	<Project >
+		<ProjectSettings author="" company="" presentationWidth="800" presentationHeight="480" maintainAspect="False" />
+		<Graph >
+			<Scene id="Scene" >
+				<XYZZY id="future"/>
+			</Scene>
+		</Graph>
+		<Logic >
+			<State name="Master Slide" component="#Scene" >
+				<Add ref="#future" />
+				<State id="Scene-Slide1" name="Slide1" />
+			</State>
+		</Logic>
+	</Project>
+</UIP>

data/test/projects/SimpleScene/SimpleScene.uia

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application xmlns="http://nvidia.com/uicomposer">
-	<assets><presentation id="main"	src="SimpleScene.uip"/></assets>
-</application>
+<?xml version="1.0" encoding="UTF-8"?>
+<application xmlns="http://nvidia.com/uicomposer">
+	<assets><presentation id="main"	src="SimpleScene.uip"/></assets>
+</application>

data/test/projects/SimpleScene/SimpleScene.uip

@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<UIP version="3">
-	<Project>
-		<ProjectSettings author="" company="" presentationWidth="800" presentationHeight="480" maintainAspect="False"/>
-		<Graph>
-			<Scene id="Scene">
-				<Layer id="Layer">
-					<Camera id="Camera"/>
-					<Light id="Light"/>
-					<Model id="Sphere"><Material id="Material"/></Model>
-					<Model id="Sphere2"><Material id="Material_001"/></Model>
-					<Model id="Cube"><Material id="Material_002"/></Model>
-					<Model id="Sphere3"><Material id="Material_003"/></Model>
-				</Layer>
-			</Scene>
-		</Graph>
-		<Logic>
-			<State name="Master Slide" component="#Scene">
-				<Add ref="#Layer"/>
-				<Add ref="#Camera"/>
-				<Add ref="#Light"/>
-				<Add ref="#Sphere"  name="Sphere1" position="-150 60 0" sourcepath="#Sphere"/>
-				<Add ref="#Material" diffuse="0 0.752941 0"/>
-				<Add ref="#Sphere2" name="Sphere2" position="150 60.0004 0" sourcepath="#Sphere"/>
-				<Add ref="#Material_001" diffuse="0 0.75287 0"/>
-				<Add ref="#Cube" name="Cube" position="0 60 0" rotation="-30 60 -20" sourcepath="#Cube"/>
-				<Add ref="#Material_002" name="Material" diffuse="0.5 0 0"/>
-				<State id="Scene-Slide1" name="Slide1">
-					<Add ref="#Sphere3"  name="NonMaster" position="-150 60 0" sourcepath="#Sphere"/>
-					<Add ref="#Material_003" diffuse="0 0.752941 0"/>
-				</State>
-			</State>
-		</Logic>
-	</Project>
-</UIP>
+<?xml version="1.0" encoding="UTF-8" ?>
+<UIP version="3">
+	<Project>
+		<ProjectSettings author="" company="" presentationWidth="800" presentationHeight="480" maintainAspect="False"/>
+		<Graph>
+			<Scene id="Scene">
+				<Layer id="Layer">
+					<Camera id="Camera"/>
+					<Light id="Light"/>
+					<Model id="Sphere"><Material id="Material"/></Model>
+					<Model id="Sphere2"><Material id="Material_001"/></Model>
+					<Model id="Cube"><Material id="Material_002"/></Model>
+					<Model id="Sphere3"><Material id="Material_003"/></Model>
+				</Layer>
+			</Scene>
+		</Graph>
+		<Logic>
+			<State name="Master Slide" component="#Scene">
+				<Add ref="#Layer"/>
+				<Add ref="#Camera"/>
+				<Add ref="#Light"/>
+				<Add ref="#Sphere"  name="Sphere1" position="-150 60 0" sourcepath="#Sphere"/>
+				<Add ref="#Material" diffuse="0 0.752941 0"/>
+				<Add ref="#Sphere2" name="Sphere2" position="150 60.0004 0" sourcepath="#Sphere"/>
+				<Add ref="#Material_001" diffuse="0 0.75287 0"/>
+				<Add ref="#Cube" name="Cube" position="0 60 0" rotation="-30 60 -20" sourcepath="#Cube"/>
+				<Add ref="#Material_002" name="Material" diffuse="0.5 0 0"/>
+				<State id="Scene-Slide1" name="Slide1">
+					<Add ref="#Sphere3"  name="NonMaster" position="-150 60 0" sourcepath="#Sphere"/>
+					<Add ref="#Material_003" diffuse="0 0.752941 0"/>
+				</State>
+			</State>
+		</Logic>
+	</Project>
+</UIP>

data/test/properties.ruic

@@ -17,6 +17,7 @@ assert app['#logic']==app['../BMW_Cluster/states/logic.scxml']
 
 main = app['#main']                         # Look up a presentation by asset id
 assert main == app.main_presentation        # …or ask for the main rendered presentation
+assert main == app.main                     # …also available as a shortcut name
 assert main.filename == 'BMW_Cluster.uip'   # You can also ask for the full path via .file
 assert main == app['BMW_Cluster.uip']       # Look up a presentation by asset id
 

data/test/referencematerials.ruic

@@ -1,52 +1,52 @@
-require 'fileutils'
-FileUtils.copy_entry('projects/ReferencedMaterials','projects/_RefMat',false,false,true)
-
-metadata 'MetaData.xml'
-
-uia 'projects/_RefMat/ReferencedMaterials.uia'
-show app.errors if app.errors?
-
-layer   = app/'main:Scene.Layer'
-cubemat = layer/"Cube"/"Material"
-
-# Ensure that the diffuse attribute is linked and present on multiple slides
-assert cubemat['diffuse'].linked?
-assert cubemat.has_slide?(0)
-assert cubemat.has_slide?(1)
-assert cubemat.has_slide?(2)
-assert cubemat['diffuse',1].r == 0.5
-assert cubemat['diffuse',2].r == 0.5
-
-# When we do not unlink, values remain shared
-cubemat['diffuse',1].r = 1
-cubemat['diffuse',2].r = 0.2
-assert cubemat['diffuse',1].r == cubemat['diffuse',2].r
-
-# Ensure that we can unlink an attribute and vary the values per slide
-cubemat['diffuse'].unlink
-assert !cubemat['diffuse'].linked?
-cubemat['diffuse',1].r = 1
-cubemat['diffuse',2].r = 0.2
-assert cubemat['diffuse',1].r == 1
-assert cubemat['diffuse',2].r == 0.2
-
-# We can swap a material with a referenced material
-model = cubemat.parent
-assert model
-ref = cubemat.replace_with_referenced_material
-assert cubemat.parent.nil?                  # The old material is removed from the graph
-assert ref.parent==model                    # The new material is where the old was
-assert ref['id'] == cubemat['id']           # The new material has the same id and name
-assert ref.name == 'Material'
-assert ref['referencedmaterial',0].object.nil?       # New referenced materials start out with no reference
-assert ref['referencedmaterial',0].type == :absolute # New references default to absolute
-
-ref['referencedmaterial'].unlink
-%w[Sphere Sphere2].each.with_index do |name,s|
-	# You can set a reference directly to an object, or alternatively
-	# ref['referencedmaterial',1].object = layer/name/"Material"
-	ref['referencedmaterial',s+1] = layer/name/"Material"
-	ref['referencedmaterial',s+1].type = :path
-end
-
-app.save_all!
+require 'fileutils'
+FileUtils.copy_entry('projects/ReferencedMaterials','projects/_RefMat',false,false,true)
+
+metadata 'MetaData.xml'
+
+uia 'projects/_RefMat/ReferencedMaterials.uia'
+show app.errors if app.errors?
+
+layer   = app/'main:Scene.Layer'
+cubemat = layer/"Cube"/"Material"
+
+# Ensure that the diffuse attribute is linked and present on multiple slides
+assert cubemat['diffuse'].linked?
+assert cubemat.has_slide?(0)
+assert cubemat.has_slide?(1)
+assert cubemat.has_slide?(2)
+assert cubemat['diffuse',1].r == 0.5
+assert cubemat['diffuse',2].r == 0.5
+
+# When we do not unlink, values remain shared
+cubemat['diffuse',1].r = 1
+cubemat['diffuse',2].r = 0.2
+assert cubemat['diffuse',1].r == cubemat['diffuse',2].r
+
+# Ensure that we can unlink an attribute and vary the values per slide
+cubemat['diffuse'].unlink
+assert !cubemat['diffuse'].linked?
+cubemat['diffuse',1].r = 1
+cubemat['diffuse',2].r = 0.2
+assert cubemat['diffuse',1].r == 1
+assert cubemat['diffuse',2].r == 0.2
+
+# We can swap a material with a referenced material
+model = cubemat.parent
+assert model
+ref = cubemat.replace_with_referenced_material
+assert cubemat.parent.nil?                  # The old material is removed from the graph
+assert ref.parent==model                    # The new material is where the old was
+assert ref['id'] == cubemat['id']           # The new material has the same id and name
+assert ref.name == 'Material'
+assert ref['referencedmaterial',0].object.nil?       # New referenced materials start out with no reference
+assert ref['referencedmaterial',0].type == :absolute # New references default to absolute
+
+ref['referencedmaterial'].unlink
+%w[Sphere Sphere2].each.with_index do |name,s|
+	# You can set a reference directly to an object, or alternatively
+	# ref['referencedmaterial',1].object = layer/name/"Material"
+	ref['referencedmaterial',s+1] = layer/name/"Material"
+	ref['referencedmaterial',s+1].type = :path
+end
+
+app.save_all!

data/test/usage.ruic

@@ -1,20 +1,20 @@
-metadata 'MetaData.xml'                     # optional; also may be set via -m flag
-# uia 'projects/CustomClasses/CustomClasses.uia'  # required before other commands
-uia 'projects/BMW_Cluster/BMW_Cluster.uia'  # required before other commands
-show app.errors if app.errors?
-
-show app.image_usage      # hash mapping image paths, relative to uia, to arrays of things referencing them: materials; scxml visual actions; effects; 
-show app.image_paths      # Just the paths
-show app.mesh_usage       # mapping mesh paths (postfixed with version numbers) to referencing elements
-show app.mesh_paths       # Just the paths (no version number information)
-show app.script_usage     # hash mapping lua paths, relative to uia, to arrays of things referencing them: presentation/application behaviors
-show app.script_paths     # just the paths
-show app.material_usage   # hash mapping materials paths, relative to uia, to arrays referencing material elements
-show app.material_paths   # just the paths
-show app.font_usage       # hash mapping font paths, relative to uia, to arrays of referencing text elements
-show app.font_paths       # just the paths
-show app.effect_usage     # hash mapping effect paths, relative to uia, to arrays of referencing effect elements
-show app.effect_paths     # just the paths
-
-show app.referenced_paths
-show app.unused_files     # Remember to check for .uip and .scxml not referenced by .uia
+metadata 'MetaData.xml'                     # optional; also may be set via -m flag
+# uia 'projects/CustomClasses/CustomClasses.uia'  # required before other commands
+uia 'projects/BMW_Cluster/BMW_Cluster.uia'  # required before other commands
+show app.errors if app.errors?
+
+show app.image_usage      # hash mapping image paths, relative to uia, to arrays of things referencing them: materials; scxml visual actions; effects; 
+show app.image_paths      # Just the paths
+show app.mesh_usage       # mapping mesh paths (postfixed with version numbers) to referencing elements
+show app.mesh_paths       # Just the paths (no version number information)
+show app.script_usage     # hash mapping lua paths, relative to uia, to arrays of things referencing them: presentation/application behaviors
+show app.script_paths     # just the paths
+show app.material_usage   # hash mapping materials paths, relative to uia, to arrays referencing material elements
+show app.material_paths   # just the paths
+show app.font_usage       # hash mapping font paths, relative to uia, to arrays of referencing text elements
+show app.font_paths       # just the paths
+show app.effect_usage     # hash mapping effect paths, relative to uia, to arrays of referencing effect elements
+show app.effect_paths     # just the paths
+
+show app.referenced_paths
+show app.unused_files     # Remember to check for .uip and .scxml not referenced by .uia

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: RUIC
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Gavin Kistner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-11 00:00:00.000000000 Z
+date: 2014-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -151,13 +151,17 @@ files:
 - lib/ruic/statemachine.rb
 - lib/ruic/version.rb
 - ruic.gemspec
+- test/MetaData-simple.xml
 - test/MetaData.xml
 - test/customclasses.ruic
 - test/filtering.ruic
+- test/futureassets.ruic
 - test/nonmaster.ruic
+- test/paths.ruic
 - test/projects/CustomClasses/Brush Strokes.effect
 - test/projects/CustomClasses/CustomClasses.uia
 - test/projects/CustomClasses/CustomClasses.uip
+- test/projects/CustomClasses/FutureAsset.uip
 - test/projects/CustomClasses/copper.material
 - test/projects/CustomClasses/maps/UV-Checker.png
 - test/projects/CustomClasses/maps/effects/brushnoise.dds
@@ -189,8 +193,30 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Library and DSL analyzing and manipulating UI Composer applications and presentations.
-test_files: []
+test_files:
+- test/MetaData-simple.xml
+- test/MetaData.xml
+- test/customclasses.ruic
+- test/filtering.ruic
+- test/futureassets.ruic
+- test/nonmaster.ruic
+- test/paths.ruic
+- test/projects/CustomClasses/Brush Strokes.effect
+- test/projects/CustomClasses/CustomClasses.uia
+- test/projects/CustomClasses/CustomClasses.uip
+- test/projects/CustomClasses/FutureAsset.uip
+- test/projects/CustomClasses/copper.material
+- test/projects/CustomClasses/maps/UV-Checker.png
+- test/projects/CustomClasses/maps/effects/brushnoise.dds
+- test/projects/CustomClasses/maps/materials/spherical_checker.png
+- test/projects/ReferencedMaterials/ReferencedMaterials.uia
+- test/projects/ReferencedMaterials/ReferencedMaterials.uip
+- test/projects/SimpleScene/SimpleScene.uia
+- test/projects/SimpleScene/SimpleScene.uip
+- test/properties.ruic
+- test/referencematerials.ruic
+- test/usage.ruic