projects
/
redact.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bumped version number to 0.1.5.
[redact.git]
/
lib
/
redact
/
redact.rb
diff --git
a/lib/redact/redact.rb
b/lib/redact/redact.rb
index 260f34208c31afa73de7d7a2613406ac43c1b91b..379bb026c2464988fd5460bf4409daec0ec70de1 100644
(file)
--- a/
lib/redact/redact.rb
+++ b/
lib/redact/redact.rb
@@
-1,5
+1,5
@@
#--
#--
-# $Id: redact.rb
25 2005-04-14 19:42:06
Z tilman $
+# $Id: redact.rb
73 2005-09-21 16:20:52
Z tilman $
#
# Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
#
#
# Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
#
@@
-57,7
+57,7
@@
class String
end
module Redact
end
module Redact
- VERSION = "0.1.
0
"
+ VERSION = "0.1.
5
"
class RedactError < StandardError; end
class RedactError < StandardError; end
@@
-90,6
+90,7
@@
module Redact
block_given? ? (yield c) : c
end
block_given? ? (yield c) : c
end
+ protected
def to_eet_name
"Edje_File"
end
def to_eet_name
"Edje_File"
end
@@
-123,12
+124,14
@@
module Redact
@value = value.to_str.dup.freeze
end
@value = value.to_str.dup.freeze
end
+ protected
def to_eet_name
"Edje_Data"
end
end
class FontDirectory < Array # :nodoc:
def to_eet_name
"Edje_Data"
end
end
class FontDirectory < Array # :nodoc:
+ protected
def to_eet_name
"Edje_Font_Directory"
end
def to_eet_name
"Edje_Font_Directory"
end
@@
-139,18
+142,21
@@
module Redact
end
class FontDirectoryEntry # :nodoc:
end
class FontDirectoryEntry # :nodoc:
- attr_reader :
filename
+ attr_reader :
save_as, :filename, :alias
- def initialize(filename)
+ def initialize(fn_alias, filename)
+ @save_as = fn_alias.to_str.dup.freeze
@filename = filename.to_str.dup.freeze
@filename = filename.to_str.dup.freeze
+ @alias = "Edje." + fn_alias.sub(/.[^.]+$/, "").freeze
end
end
+ protected
def to_eet_name
"Edje_Font_Directory_Entry"
end
def to_eet_properties
def to_eet_name
"Edje_Font_Directory_Entry"
end
def to_eet_properties
- {"entry" => [@
filename
]}
+ {"entry" => [@
alias
]}
end
end
end
end
@@
-161,6
+167,7
@@
module Redact
entry.id = size - 1
end
entry.id = size - 1
end
+ protected
def to_eet_name
"Edje_Image_Directory"
end
def to_eet_name
"Edje_Image_Directory"
end
@@
-173,7
+180,8
@@
module Redact
class ImageDirectoryEntry # :nodoc:
attr_reader :filename, :image, :id
class ImageDirectoryEntry # :nodoc:
attr_reader :filename, :image, :id
- def initialize(filename)
+ def initialize(im_alias, filename)
+ @alias = im_alias.to_str.dup.freeze
@filename = filename.to_str.dup.freeze
@image = Imlib2::Image.load(@filename)
@id = -1
@filename = filename.to_str.dup.freeze
@image = Imlib2::Image.load(@filename)
@id = -1
@@
-191,12
+199,13
@@
module Redact
end
end
end
end
+ protected
def to_eet_name
"Edje_Image_Directory_Entry"
end
def to_eet_properties
def to_eet_name
"Edje_Image_Directory_Entry"
end
def to_eet_properties
- {"entry" => [@
filename
],
+ {"entry" => [@
alias
],
"source_type" => [@source_type],
"source_param" => [@source_param],
"id" => [@id]}
"source_type" => [@source_type],
"source_param" => [@source_param],
"id" => [@id]}
@@
-204,6
+213,7
@@
module Redact
end
class CollectionDirectory < Array # :nodoc:
end
class CollectionDirectory < Array # :nodoc:
+ protected
def to_eet_name
"Edje_Part_Collection_Directory"
end
def to_eet_name
"Edje_Part_Collection_Directory"
end
@@
-219,6
+229,7
@@
module Redact
@id = col.id
end
@id = col.id
end
+ protected
def to_eet_name
"Edje_Part_Collection_Directory_Entry"
end
def to_eet_name
"Edje_Part_Collection_Directory_Entry"
end
@@
-248,7
+259,8
@@
module Redact
end
def script=(v)
end
def script=(v)
- @script = v.to_str.dup
+ v = v.to_str
+ @script = (File.exist?(v) ? File.read(v) : v).dup
end
def part(name, type = :invalid) # :yields: part
end
def part(name, type = :invalid) # :yields: part
@@
-265,7
+277,7
@@
module Redact
ImagePart
else
raise(ArgumentError,
ImagePart
else
raise(ArgumentError,
- "invalid p
rogram
type - #{type.to_s}")
+ "invalid p
art
type - #{type.to_s}")
end
p = klass.new(self, @parts.size, name)
end
p = klass.new(self, @parts.size, name)
@@
-326,6
+338,7
@@
module Redact
end
end
end
end
+ protected
def to_eet_name
"Edje_Part_Collection"
end
def to_eet_name
"Edje_Part_Collection"
end