RUIC 0.2.3 → 0.2.5

data/lib/ruic/attributes.rb

@@ -1,164 +1,165 @@
-#encoding: utf-8
-class UIC::Property
-	class << self; attr_accessor :default; end
-	def initialize(el); @el = el; end
-	def name; @name||=@el['name']; end
-	def type; @type||=@el['type']; end
-	def formal; @formal||=@el['formalName'] || @el['name']; end
-	def min; @el['min']; end
-	def max; @el['max']; end
-	def description; @desc||=@el['description']; end
-	def default; @def ||= (@el['default'] || self.class.default); end
-	def get(asset,slide)
-		if asset.slide? || asset.has_slide?(slide)
-			asset.presentation.get_attribute(asset.el,name,slide) || default
-		end
-	end
-	def set(asset,new_value,slide_name_or_index)
-		asset.presentation.set_attribute(asset.el,name,slide_name_or_index,new_value)
-	end
-	def inspect
-		"<#{type} '#{name}'>"
-	end
-
-	class String < self
-		self.default = ''
-	end
-	MultiLineString = String
-
-	class Float < self
-		self.default = 0.0
-		def get(asset,slide); super.to_f; end
-	end
-	class Long < self
-		self.default = 0
-		def get(asset,slide); super.to_i; end
-	end
-	class Boolean < self
-		self.default = false
-		def get(asset,slide); super=='True'; end
-		def set(asset,new_value,slide_name_or_index)
-			super( asset, new_value ? 'True' : 'False', slide_name_or_index )
-		end
-	end
-	class Vector < self
-		self.default = '0 0 0'
-		def get(asset,slide)
-			VectorValue.new(asset,self,slide,super)
-		end
-		def set(asset,new_value,slide_name_or_index)
-			new_value = new_value.join(' ') if new_value.is_a?(Array)
-			super( asset, new_value, slide_name_or_index )
-		end
-	end
-	Rotation = Vector
-	Color    = Vector
-	class Image < self
-		self.default = nil
-		def get(asset,slide)
-			if idref = super
-				result = asset.presentation.asset_by_id( idref[1..-1] )
-				slide ? result.on_slide( slide ) : result
-			end
-		end
-		def set(asset,new_value,slide)
-			raise "Setting image attributes not yet supported"
-		end
-	end
-	class Texture < String
-		def get(asset,slide)
-			if path=super
-				path.empty? ? nil : path
-			end
-		end
-	end
-
-	class ObjectRef < self
-		self.default = nil
-		def get(asset,slide)
-			ref  = super
-			type = :absolute
-			obj  = nil
-			unless ref=='' || ref.nil?
-				type = ref[0]=='#' ? :absolute : :path
-				ref = type==:absolute ? asset.presentation.asset_by_id( ref[1..-1] ) : asset.presentation.at( ref, asset.el )
-			end
-			ObjectReference.new(asset,self,slide,ref,type)
-		end
-		def set(asset,new_object,slide)
-			get(asset,slide).object = new_object
-		end
-	end
-
-	class ObjectReference
-		attr_reader :object, :type
-		def initialize(asset,property,slide,object=nil,type=nil)
-			@asset    = asset
-			@name     = property.name
-			@slide    = slide
-			@object   = object
-			@type     = type
-		end
-		def object=(new_object)
-			raise "ObjectRef must be set to an asset (not a #{new_object.class.name})" unless new_object.is_a?(UIC::Asset::Root)
-			@object = new_object
-			write_value!
-		end
-		def type=(new_type)
-			raise "ObjectRef types must be either :absolute or :path (not #{new_type.inspect})" unless [:absolute,:path].include?(new_type)
-			@type = new_type
-			write_value!
-		end
-		private
-		def write_value!
-			path = case @object
-				when NilClass then ""
-				else case @type
-					when :absolute then "##{@object.el['id']}"
-					when :path     then @asset.presentation.path_to( @object.el, @asset.el ).sub(/^[^:.]+:/,'')
-					# when :root     then @asset.presentation.path_to( @object.el ).sub(/^[^:.]+:/,'')
-				end
-			end
-			@asset.presentation.set_attribute( @asset.el, @name, @slide, path )
-		end
-	end
-
-	Import     = String #TODO: a real class
-	Mesh       = String #TODO: a real class
-	Renderable = String #TODO: a real class
-	Font       = String #TODO: a real class
-	FontSize   = Long
-
-	StringListOrInt = String #TODO: a real class
-
-	class VectorValue
-		attr_reader :x, :y, :z
-		def initialize(asset,property,slide,str)
-			@asset    = asset
-			@property = property
-			@slide    = slide
-			@x, @y, @z = str.split(/\s+/).map(&:to_f)
-		end
-		def setall
-			@property.set( @asset, to_s, @slide )
-		end
-		def x=(n); @x=n; setall end
-		def y=(n); @y=n; setall end
-		def z=(n); @z=n; setall end
-		alias_method :r, :x
-		alias_method :g, :y
-		alias_method :b, :z
-		alias_method :r=, :x=
-		alias_method :g=, :y=
-		alias_method :b=, :z=
-		def inspect
-			"<#{@asset.path}.#{@property.name}: #{self}>"
-		end
-		def to_s
-			to_a.join(' ')
-		end
-		def to_a
-			[x,y,z]
-		end
-	end
-end
+#encoding: utf-8
+class UIC::Property
+	class << self; attr_accessor :default; end
+	def initialize(el); @el = el; end
+	def name; @name||=@el['name']; end
+	def type; @type||=@el['type']; end
+	def formal; @formal||=@el['formalName'] || @el['name']; end
+	def min; @el['min']; end
+	def max; @el['max']; end
+	def description; @desc||=@el['description']; end
+	def default; @def ||= (@el['default'] || self.class.default); end
+	def get(asset,slide)
+		if asset.slide? || asset.has_slide?(slide)
+			asset.presentation.get_attribute(asset.el,name,slide) || default
+		end
+	end
+	def set(asset,new_value,slide_name_or_index)
+		asset.presentation.set_attribute(asset.el,name,slide_name_or_index,new_value)
+	end
+	def inspect
+		"<#{type} '#{name}'>"
+	end
+
+	class String < self
+		self.default = ''
+	end
+	MultiLineString = String
+
+	class Float < self
+		self.default = 0.0
+		def get(asset,slide); super.to_f; end
+	end
+	class Long < self
+		self.default = 0
+		def get(asset,slide); super.to_i; end
+	end
+	class Boolean < self
+		self.default = false
+		def get(asset,slide); super=='True'; end
+		def set(asset,new_value,slide_name_or_index)
+			super( asset, new_value ? 'True' : 'False', slide_name_or_index )
+		end
+	end
+	class Vector < self
+		self.default = '0 0 0'
+		def get(asset,slide)
+			VectorValue.new(asset,self,slide,super)
+		end
+		def set(asset,new_value,slide_name_or_index)
+			new_value = new_value.join(' ') if new_value.is_a?(Array)
+			super( asset, new_value, slide_name_or_index )
+		end
+	end
+	Rotation = Vector
+	Color    = Vector
+	Float2   = Vector
+	class Image < self
+		self.default = nil
+		def get(asset,slide)
+			if idref = super
+				result = asset.presentation.asset_by_id( idref[1..-1] )
+				slide ? result.on_slide( slide ) : result
+			end
+		end
+		def set(asset,new_value,slide)
+			raise "Setting image attributes not yet supported"
+		end
+	end
+	class Texture < String
+		def get(asset,slide)
+			if path=super
+				path.empty? ? nil : path
+			end
+		end
+	end
+
+	class ObjectRef < self
+		self.default = nil
+		def get(asset,slide)
+			ref  = super
+			type = :absolute
+			obj  = nil
+			unless ref=='' || ref.nil?
+				type = ref[0]=='#' ? :absolute : :path
+				ref = type==:absolute ? asset.presentation.asset_by_id( ref[1..-1] ) : asset.presentation.at( ref, asset.el )
+			end
+			ObjectReference.new(asset,self,slide,ref,type)
+		end
+		def set(asset,new_object,slide)
+			get(asset,slide).object = new_object
+		end
+	end
+
+	class ObjectReference
+		attr_reader :object, :type
+		def initialize(asset,property,slide,object=nil,type=nil)
+			@asset    = asset
+			@name     = property.name
+			@slide    = slide
+			@object   = object
+			@type     = type
+		end
+		def object=(new_object)
+			raise "ObjectRef must be set to an asset (not a #{new_object.class.name})" unless new_object.is_a?(UIC::Asset::Root)
+			@object = new_object
+			write_value!
+		end
+		def type=(new_type)
+			raise "ObjectRef types must be either :absolute or :path (not #{new_type.inspect})" unless [:absolute,:path].include?(new_type)
+			@type = new_type
+			write_value!
+		end
+		private
+		def write_value!
+			path = case @object
+				when NilClass then ""
+				else case @type
+					when :absolute then "##{@object.el['id']}"
+					when :path     then @asset.presentation.path_to( @object.el, @asset.el ).sub(/^[^:.]+:/,'')
+					# when :root     then @asset.presentation.path_to( @object.el ).sub(/^[^:.]+:/,'')
+				end
+			end
+			@asset.presentation.set_attribute( @asset.el, @name, @slide, path )
+		end
+	end
+
+	Import     = String #TODO: a real class
+	Mesh       = String #TODO: a real class
+	Renderable = String #TODO: a real class
+	Font       = String #TODO: a real class
+	FontSize   = Long
+
+	StringListOrInt = String #TODO: a real class
+
+	class VectorValue
+		attr_reader :x, :y, :z
+		def initialize(asset,property,slide,str)
+			@asset    = asset
+			@property = property
+			@slide    = slide
+			@x, @y, @z = str.split(/\s+/).map(&:to_f)
+		end
+		def setall
+			@property.set( @asset, to_s, @slide )
+		end
+		def x=(n); @x=n; setall end
+		def y=(n); @y=n; setall end
+		def z=(n); @z=n; setall end
+		alias_method :r, :x
+		alias_method :g, :y
+		alias_method :b, :z
+		alias_method :r=, :x=
+		alias_method :g=, :y=
+		alias_method :b=, :z=
+		def inspect
+			"<#{@asset.path}.#{@property.name}: #{self}>"
+		end
+		def to_s
+			to_a.join(' ')
+		end
+		def to_a
+			[x,y,z]
+		end
+	end
+end

data/lib/ruic/ripl-after-result.rb

@@ -0,0 +1,12 @@
+module Ripl::AfterResult
+	def print_result(result)
+		super
+		if after=config[:after_result]
+			if after.respond_to?(:call)
+				after.call(result)
+			else
+				puts after
+			end
+		end
+	end
+end

data/lib/ruic/version.rb

@@ -1,3 +1,3 @@
-class RUIC
-	VERSION = '0.2.3'
+class RUIC
+	VERSION = '0.2.5'
 end

data/ruic.gemspec

@@ -1,26 +1,26 @@
-# encoding: UTF-8
-$: << File.expand_path("../lib", __FILE__)
-require "ruic/version"
-
-Gem::Specification.new do |s|
-  s.name        = "RUIC"
-  s.version     = RUIC::VERSION
-  s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Gavin Kistner"]
-  s.email       = ["gavin@phrogz.net"]
-  s.license     = "MIT License"
-  s.summary     = %q{Library and DSL analyzing and manipulating UI Composer applications and presentations.}
-  s.description = %q{RUIC is a library that understands the XML formats used by NVIDIA's "UI Composer" tool suite. In addition to APIs for analyzing and manipulating these files—the UIC portion of the library—it also includes a mini DSL for writing scripts that can be run by the `ruic` interpreter.}
-  s.homepage    = "https://github.com/Phrogz/RUIC"
-
-  s.add_runtime_dependency "nokogiri", '~> 1'
-  s.add_runtime_dependency "ripl", '~> 0'
-  s.add_runtime_dependency "ripl-multi_line", '~> 0'
-  s.add_runtime_dependency "ripl-irb", '~> 0'
-
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
-  s.bindir        = 'bin'
+# encoding: UTF-8
+$: << File.expand_path("../lib", __FILE__)
+require "ruic/version"
+
+Gem::Specification.new do |s|
+  s.name        = "RUIC"
+  s.version     = RUIC::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Gavin Kistner"]
+  s.email       = ["gavin@phrogz.net"]
+  s.license     = "MIT License"
+  s.summary     = %q{Library and DSL analyzing and manipulating UI Composer applications and presentations.}
+  s.description = %q{RUIC is a library that understands the XML formats used by NVIDIA's "UI Composer" tool suite. In addition to APIs for analyzing and manipulating these files—the UIC portion of the library—it also includes a mini DSL for writing scripts that can be run by the `ruic` interpreter.}
+  s.homepage    = "https://github.com/Phrogz/RUIC"
+
+  s.add_runtime_dependency "nokogiri", '~> 1'
+  s.add_runtime_dependency "ripl", '~> 0'
+  s.add_runtime_dependency "ripl-multi_line", '~> 0'
+  s.add_runtime_dependency "ripl-irb", '~> 0'
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+  s.bindir        = 'bin'
 end

data/test/filtering.ruic

@@ -1,39 +1,39 @@
-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', 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( under:main/"Scene.Layer.Sphere1" ).length==1
-assert main.find( attributes:{name:'Material'} ).length==4
-assert main.find( attributes:{name:/^Sphere/} ).length==2
-
-# You can use name not as an attribute
-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
+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', 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( under:main/"Scene.Layer.Sphere1" ).length==1
+assert main.find( attributes:{name:'Material'} ).length==4
+assert main.find( attributes:{name:/^Sphere/} ).length==2
+
+# You can use name not as an attribute
+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