RUIC 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eee889a85158656a06f2ee225244f29d2982cbd2
-  data.tar.gz: d5115b6db5258b3e2bcd437cc50fefd940f3415f
+  metadata.gz: 172da4856dff2f533cc1ed9d3473f843b7021436
+  data.tar.gz: 101a76825e44c714cfc3493f99eb9f8c8ea4d642
 SHA512:
-  metadata.gz: 343758edc279b8878a45746fc084a4b955069131a5cc598401c1f1e8a406a299551266ad525b42f6149ff6c9b2b93e6af6ae8ea187b6dd5a0c3ec7684e00bc29
-  data.tar.gz: ba367a8117dbd4b4a47ef16082913b7c08d71199f78051f78882df26ce30551593c39d671c471638e15a257abed1d7fb5a027678b67abc06c2808e8164126c4b
+  metadata.gz: ba253c60367dd684ee31e07c0eff9dad75146b269175f9bce99168f01aab16c80f5a1d66cad9c26914892001b1e1b1da60663cd170ef70f25a62ff8c8f80c469
+  data.tar.gz: 3129ac7e2d073eb79950374296f3e6c67dca6e21df7c5caf85dc9ed6bcee41ea1a0e00cbb630f312a934f501d5f4f0fd73a7d40bac579f6a7f5503b46991d159

data/lib/ruic/assets.rb

@@ -47,7 +47,7 @@ class UIC::Asset
 		end
 
 		def find(criteria={},&block)
-			criteria[:under] ||= self
+			criteria[:_under] ||= self
 			presentation.find(criteria,&block)
 		end
 

data/lib/ruic/presentation.rb

@@ -298,25 +298,27 @@ class UIC::Presentation
 
 	def find(options={})
 		index = -1
-		start = options[:under] ? options[:under].el : @graph
-		(options[:attr]||={})[:name]=options[:name] if options[:name]
+		start = options.key?(:_under) ? options.delete(:_under).el : @graph
 		[].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?(: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 }.all?
-							else value == val
-						end
+				next unless options.all? do |att,val|
+					case att
+						when :_type   then el.name == val
+						when :_slide  then has_slide?(el,val)
+						when :_master then master?(el)==val
+						else
+							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 }.all?
+									else value == val
+								end
+							end
 					end
-				}
+				end
 				yield asset, index+=1 if block_given?
 				result << asset
 			end

data/lib/ruic/version.rb

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

data/test/filtering.ruic

@@ -5,19 +5,15 @@ 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', 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( attr:{name:'Material'} ).length==4
-assert main.find( attr:{name:/^Sphere/} ).length==2
-
-# You can use name not as an attribute
+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
 
@@ -30,9 +26,9 @@ sphere = main/"Scene.Layer.Sphere1"
 assert sphere.find.length==1
 
 # Supplying a block will iterate, including the index
-expected = main.find type:'Model'
+expected = main.find _type:'Model'
 found = 0
-main.find type:'Model' do |mod,i|
+main.find _type:'Model' do |mod,i|
 	found += 1
 	assert mod == expected[i]
 end

metadata

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