RUIC 0.6.0 → 0.6.1

data/lib/ruic/attributes.rb

@@ -1,178 +1,179 @@
-#encoding: utf-8
-class UIC::Property
-	# Each property has a generic default value
-	class << self; attr_accessor :default; end
-
-	# …and instances of a particular property can have their own default value
-	attr_accessor :default
-	def initialize(el); @el = el; end
-	def name; @name||=@el['name']; end
-	def type; @type||=@el['type'] ? (@el['type']=='float' ? 'Float' : @el['type']) : 'Float'; 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; @default ||= (@el['default'] || self.class.default); end
-	def get(asset,slide)
-		if asset.slide? || asset.has_slide?(slide)
-			asset.presentation.get_attribute(asset,name,slide) || default
-		end
-	end
-	def set(asset,new_value,slide_name_or_index)
-		asset.presentation.set_attribute(asset,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
-				# Getting the asset on a particular slide makes it weird
-			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.gsub( '\\', '/' ).sub( /^.\// ,'' )
-			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 )
-			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::MetaData::AssetBase)
-			@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, @asset ).sub(/^[^:.]+:/,'')
-					# when :root     then @asset.presentation.path_to( @object ).sub(/^[^:.]+:/,'')
-				end
-			end
-			@asset.presentation.set_attribute( @asset, @name, @slide, path )
-		end
-	end
-
-	class Font < self
-		self.default = 'Arimo-Regular'
-		def get(asset,slide); "fonts/#{super}.ttf"; end # TODO: how to support non-ttf fonts?
-		def set(asset,new_value,slide_name_or_index)
-			# TODO: how to support non-ttf fonts?
-			super( asset, new_value.sub(%r{^\.[/\\]},'').sub(%r{^fonts[/\\]},'').sub(%r{\.ttf$},''), slide_name_or_index )
-		end
-	end
-
-	Import     = String #TODO: a real class
-	Mesh       = String #TODO: a real class
-	Renderable = 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
+	# Each property has a generic default value
+	class << self; attr_accessor :default; end
+
+	# …and instances of a particular property can have their own default value
+	attr_accessor :default
+	def initialize(el); @el = el; end
+	def name; @name||=@el['name']; end
+	def type; @type||=@el['type'] ? (@el['type']=='float' ? 'Float' : @el['type']) : 'Float'; 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; @default ||= (@el['default'] || self.class.default); end
+	def get(asset,slide)
+		if asset.slide? || asset.has_slide?(slide)
+			asset.presentation.get_attribute(asset,name,slide) || default
+		end
+	end
+	def set(asset,new_value,slide_name_or_index)
+		asset.presentation.set_attribute(asset,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
+				# Getting the asset on a particular slide makes it weird
+			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.gsub( '\\', '/' ).sub( /^.\// ,'' )
+			end
+		end
+	end
+	class PathBuffer < Texture; 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 )
+			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::MetaData::AssetBase)
+			@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, @asset ).sub(/^[^:.]+:/,'')
+					# when :root     then @asset.presentation.path_to( @object ).sub(/^[^:.]+:/,'')
+				end
+			end
+			@asset.presentation.set_attribute( @asset, @name, @slide, path )
+		end
+	end
+
+	class Font < self
+		self.default = 'Arimo-Regular'
+		def get(asset,slide); "fonts/#{super}.ttf"; end # TODO: how to support non-ttf fonts?
+		def set(asset,new_value,slide_name_or_index)
+			# TODO: how to support non-ttf fonts?
+			super( asset, new_value.sub(%r{^\.[/\\]},'').sub(%r{^fonts[/\\]},'').sub(%r{\.ttf$},''), slide_name_or_index )
+		end
+	end
+
+	Import     = String #TODO: a real class
+	Mesh       = String #TODO: a real class
+	Renderable = 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/effect.rb

@@ -1,32 +1,32 @@
-class UIC::Effect
-	include UIC::FileBacked
-	attr_reader :lua
-	def initialize( lua_path )
-		self.file = lua_path
-		load_from_file if file_found?
-	end
-	def load_from_file
-		@lua = File.read(file,encoding:'utf-8')
-	end
-
-	def errors?
-		!errors.empty?
-	end
-
-	def errors
-		file_found? ? [] : ["File not found: '#{file}'"]
-	end
-
-end
-
-class UIC::Application::Effect < UIC::Effect
-	include UIC::ElementBacked
-	# @!parse extend UIC::ElementBacked::ClassMethods
-	xmlattribute :id
-	xmlattribute :src
-	def initialize(application,el)
-		self.owner = application
-		self.el    = el
-		super( application.absolute_path(src) )
-	end
+class UIC::Effect
+	include UIC::FileBacked
+	attr_reader :lua
+	def initialize( lua_path )
+		self.file = lua_path
+		load_from_file if file_found?
+	end
+	def load_from_file
+		@lua = File.read(file,encoding:'utf-8')
+	end
+
+	def errors?
+		!errors.empty?
+	end
+
+	def errors
+		file_found? ? [] : ["File not found: '#{file}'"]
+	end
+
+end
+
+class UIC::Application::Effect < UIC::Effect
+	include UIC::ElementBacked
+	# @!parse extend UIC::ElementBacked::ClassMethods
+	xmlattribute :id
+	xmlattribute :src
+	def initialize(application,el)
+		self.owner = application
+		self.el    = el
+		super( application.absolute_path(src) )
+	end
 end

data/lib/ruic/nicebytes.rb

@@ -0,0 +1,29 @@
+module NiceBytes
+	K = 2.0**10
+	M = 2.0**20
+	G = 2.0**30
+	T = 2.0**40
+	def nice_bytes( bytes, max_digits=3 )
+		value, suffix, precision = case bytes
+			when 0...K
+				[ bytes, 'B', 0 ]
+			else
+				value, suffix = case bytes
+					when K...M then [ bytes / K, 'kB' ]
+					when M...G then [ bytes / M, 'MB' ]
+					when G...T then [ bytes / G, 'GB' ]
+					else            [ bytes / T, 'TB' ]
+				end
+				used_digits = case value
+					when   0...10   then 1
+					when  10...100  then 2
+					when 100...1000 then 3
+					else 4
+				end
+				leftover_digits = max_digits - used_digits
+				[ value, suffix, leftover_digits > 0 ? leftover_digits : 0 ]
+		end
+		"%.#{precision}f#{suffix}" % value
+	end
+	module_function :nice_bytes
+end