RUIC 0.2.6 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0cc675abb175c24f21e6c947e4bc3e3abc880c3
-  data.tar.gz: 5e18d03cc07085cccfeab2062ea326da42f2961a
+  metadata.gz: eee889a85158656a06f2ee225244f29d2982cbd2
+  data.tar.gz: d5115b6db5258b3e2bcd437cc50fefd940f3415f
 SHA512:
-  metadata.gz: 0ff4d45f592471d0b143d3083376d17eabb66e12aa18f56c460b0e5c849571b6af933442c2c1fc7901cf7af0789856d0fdc84513d81feb7cc9b8e095fc1b11b5
-  data.tar.gz: 33ec67a3e355b8f52e1b5ddbbbca2a578127ea04963a4b8a227d4f207d8131ecfea8d6b3fcd4441d1fe89ab0fc7da77eb87a0adf233c508702eee8865490f177
+  metadata.gz: 343758edc279b8878a45746fc084a4b955069131a5cc598401c1f1e8a406a299551266ad525b42f6149ff6c9b2b93e6af6ae8ea187b6dd5a0c3ec7684e00bc29
+  data.tar.gz: ba367a8117dbd4b4a47ef16082913b7c08d71199f78051f78882df26ce30551593c39d671c471638e15a257abed1d7fb5a027678b67abc06c2808e8164126c4b

data/README.md

@@ -47,7 +47,7 @@ After this you can access the application as `app`:
 
 ```ruby
 uia '../MyApp.uia'      # Relative to the ruic script file, or absolute
-   
+
 show app.file           #=> /var/projects/UIC/MyApp/main/MyApp.uia
 show app.filename       #=> MyApp.uia
 
@@ -85,7 +85,7 @@ show car.type #=> Model                  # Scene, Layer, Camera, Light, Group, M
                                          # Image, Behavior, Effect, ReferencedMaterial, Text,
                                          # RenderPlugin, Component, (custom materials)
 
-show car.component?  #=> false           # Ask if an element is a component 
+show car.component?  #=> false           # Ask if an element is a component
 assert car.component==sub.scene          # Ask for the owning component; may be the scene
 ```
 
@@ -95,30 +95,30 @@ assert car.component==sub.scene          # Ask for the owning component; may be
 uia 'MyApp.uia'
 main = app.main_presentation
 
-every_asset   = main.find                                      # Array of matching assets
-master_assets = main.find master:true                          # Test for master/nonmaster
-models        = main.find type:'Model'                         # …or based on type
-gamecovers    = main.find name:'Game Cover'                    # …or based on name
-slide2_assets = main.find slide:2                              # …or presence on slide
-rectangles    = main.find attributes:{sourcepath:'#Rectangle'} # …or attribute values
+every_asset   = main.find                                  # Array of matching assets
+master_assets = main.find master:true                      # Test for master/nonmaster
+models        = main.find type:'Model'                     # …or based on type
+gamecovers    = main.find name:'Game Cover'                # …or based on name
+slide2_assets = main.find slide:2                          # …or presence on slide
+rectangles    = main.find attr:{sourcepath:'#Rectangle'}   # …or attribute values
 
 # Combine tests to get more specific
-master_models = main.find type:'Model', master:true            
-slide2_rects  = main.find type:'Model', slide:2, attributes:{sourcepath:'#Rectangle'}
+master_models = main.find type:'Model', master:true
+slide2_rects  = main.find type:'Model', slide:2, attr:{sourcepath:'#Rectangle'}
 nonmaster_s2  = main.find slide:2, master:false
-red_materials = main.find type:'Material', attributes:{ diffuse:[1,0,0] }
+red_materials = main.find type:'Material', attr:{ diffuse:[1,0,0] }
 
 # You can match values more loosely
-pistons       = main.find name:/^Piston/                       # Regex for batch finding
-bottom_row    = main.find attributes:{position:[nil,-200,nil]} # nil for wildcards
+pistons       = main.find name:/^Piston/                   # Regex for batch finding
+bottom_row    = main.find attr:{position:[nil,-200,nil]}   # nil for wildcards in vectors
 
 # Restrict the search to a sub-tree
 group        = main/"Scene.Layer.Group"
-group_models = group.find type:'Model'                 # Original asset is never included
-group_models = main.find under:group, type:'Model'     # Or use `under` for sub-tree
+group_models = group.find type:'Model'                     # Orig asset is never included
+group_models = main.find under:group, type:'Model'         # Or use `under` for sub-tree
 
 # Iterate the results as they are found
-main.find type:'Model', name:/^Piston/ do |model, index|    # Using the index is optional
+main.find type:'Model', name:/^Piston/ do |model, index|   # Using the index is optional
 	show "Model #{index} is named #{model.name}"
 end
 ```
@@ -126,7 +126,7 @@ end
 Notes:
 * `nil` inside an array is a "wildcard" value, allowing you to test only specific values
 * Numbers (both in vectors/colors/rotations and float/long values) must only be within `0.001` to match.
-  * _For example, `attributes:{diffuse:[1,0,0]}` will match a color with `diffuse=".9997 0.0003 0"`_
+  * _For example, `attr:{diffuse:[1,0,0]}` will match a color with `diffuse=".9997 0.0003 0"`_
 * Results of `find` are always in scene-graph order.
 
 
@@ -158,12 +158,12 @@ app.save_all!                                 #=> Write presentations in place
 
 ## Locating MetaData.xml
 RUIC needs access to a UIC `MetaData.xml` file to understand the properties in the various XML files.
-By default RUIC will look in the location specified by `RUIC::DEFAULTMETADATA`, e.g.  
+By default RUIC will look in the location specified by `RUIC::DEFAULTMETADATA`, e.g.
 `C:/Program Files (x86)/NVIDIA Corporation/UI Composer 8.0/res/DataModelMetadata/en-us/MetaData.xml`
 
 If this file is in another location, you can tell the script where to find it either:
 
-* on the command line: `ruic -m path/to/MetaData.xml myscript.ruic` 
+* on the command line: `ruic -m path/to/MetaData.xml myscript.ruic`
 * in your ruic script: `metadata 'path/to/MetaData.xml' # before any 'app' commands`
 
 
@@ -219,6 +219,11 @@ _In decreasing priority…_
 
 # History
 
+## v0.3.0 - 2014-Nov-10
+* Switch attribute filtering to use `attr:{ … }` instead of `attributes:{ … }`
+* Attribute matching now requires that a requested attribute be present, or else the asset matching fails.
+  * _For example, `main.find attr:{ diffusecolor:[nil,nil,nil] }` will now only find assets with a `diffusecolor` attribute._
+
 ## v0.2.5 - 2014-Nov-10
 * Re-adds blank line after REPL result.
 

data/lib/ruic/presentation.rb

@@ -299,21 +299,21 @@ class UIC::Presentation
 	def find(options={})
 		index = -1
 		start = options[:under] ? options[:under].el : @graph
-		(options[:attributes]||={})[:name]=options[:name] if options[:name]
+		(options[:attr]||={})[:name]=options[:name] if options[:name]
 		[].tap do |result|
 			start.xpath('./descendant::*').each do |el|
 				next if options.key?(:type)   && el.name    != options[:type]
 				next if options.key?(:slide)  && !has_slide?(el,options[:slide])
 				next if options.key?(:master) && master?(el)!= options[:master]
 				asset = asset_for_el(el)
-				next if options.key?(:attributes) && options[:attributes].any?{ |att,val|
+				next if options.key?(:attr) && !options[:attr].all?{ |att,val|
 					if asset.properties[att.to_s]
 						value = asset[att.to_s].value
 						case val
-							when Regexp  then val !~ value.to_s
-							when Numeric then (val-value).abs >= 0.001
-							when Array   then value.to_a.zip(val).map{ |a,b| b && (a-b).abs>=0.001 }.any?
-							else value != val
+							when Regexp  then val =~ value.to_s
+							when Numeric then (val-value).abs < 0.001
+							when Array   then value.to_a.zip(val).map{ |a,b| !b || (a-b).abs<0.001 }.all?
+							else value == val
 						end
 					end
 				}

data/lib/ruic/version.rb

@@ -1,3 +1,3 @@
 class RUIC
-	VERSION = '0.2.6'
+	VERSION = '0.3.0'
 end

data/test/filtering.ruic

@@ -9,13 +9,13 @@ 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', attributes:{position:[-150,60,0]} ).length==2
-assert main.find( type:'Model', attributes:{position:[-150,60,0]} ).length==2
-assert main.find( type:'Model', attributes:{position:[nil,60,nil]} ).length==4
-assert main.find( type:'Model', attributes:{sourcepath:'#Cube'} ).length==1
+assert main.find( type:'Model', attr:{position:[-150,60,0]} ).length==2
+assert main.find( type:'Model', attr:{position:[-150,60,0]} ).length==2
+assert main.find( type:'Model', attr:{position:[nil,60,nil]} ).length==4
+assert main.find( type:'Model', attr:{sourcepath:'#Cube'} ).length==1
 assert main.find( under:main/"Scene.Layer.Sphere1" ).length==1
-assert main.find( attributes:{name:'Material'} ).length==4
-assert main.find( attributes:{name:/^Sphere/} ).length==2
+assert main.find( attr:{name:'Material'} ).length==4
+assert main.find( attr:{name:/^Sphere/} ).length==2
 
 # You can use name not as an attribute
 assert main.find( name:'Material' ).length==4

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: RUIC
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.0
 platform: ruby
 authors:
 - Gavin Kistner