projects
/
redact.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bumped version to 0.1.6.
[redact.git]
/
lib
/
redact
/
redact.rb
diff --git
a/lib/redact/redact.rb
b/lib/redact/redact.rb
index d0da5d7859b655ad2d47d78eb78e28827a4b5fc4..4ffc5eee4f9100d07e703e838d7e1134e3a25f03 100644
(file)
--- a/
lib/redact/redact.rb
+++ b/
lib/redact/redact.rb
@@
-1,6
+1,4
@@
#--
#--
-# $Id: redact.rb 44 2005-06-08 17:35:49Z tilman $
-#
# Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
#
# Permission is hereby granted, free of charge, to any person obtaining
# Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
#
# Permission is hereby granted, free of charge, to any person obtaining
@@
-57,7
+55,7
@@
class String
end
module Redact
end
module Redact
- VERSION = "0.1.
1
"
+ VERSION = "0.1.
6
"
class RedactError < StandardError; end
class RedactError < StandardError; end
@@
-142,10
+140,12
@@
module Redact
end
class FontDirectoryEntry # :nodoc:
end
class FontDirectoryEntry # :nodoc:
- attr_reader :
filename
+ attr_reader :
save_as, :filename, :alias
- def initialize(filename)
- @filename = find_font(filename.to_str).freeze
+ def initialize(fn_alias, filename)
+ @save_as = fn_alias.to_str.dup.freeze
+ @filename = filename.to_str.dup.freeze
+ @alias = "Edje." + fn_alias.sub(/.[^.]+$/, "").freeze
end
protected
end
protected
@@
-154,17
+154,7
@@
module Redact
end
def to_eet_properties
end
def to_eet_properties
- {"entry" => [@filename]}
- end
-
- private
- def find_font(file)
- [".", OPTIONS.font_dir].each do |d|
- f2 = File.join(d, file)
- return f2 if File.file?(f2)
- end
-
- nil
+ {"entry" => [@alias]}
end
end
end
end
@@
-188,8
+178,9
@@
module Redact
class ImageDirectoryEntry # :nodoc:
attr_reader :filename, :image, :id
class ImageDirectoryEntry # :nodoc:
attr_reader :filename, :image, :id
- def initialize(filename)
- @filename = find_image(filename.to_str).freeze
+ 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
@source_type = 1 # COMP
@image = Imlib2::Image.load(@filename)
@id = -1
@source_type = 1 # COMP
@@
-212,21
+203,11
@@
module Redact
end
def to_eet_properties
end
def to_eet_properties
- {"entry" => [@
filename
],
+ {"entry" => [@
alias
],
"source_type" => [@source_type],
"source_param" => [@source_param],
"id" => [@id]}
end
"source_type" => [@source_type],
"source_param" => [@source_param],
"id" => [@id]}
end
-
- private
- def find_image(file)
- [".", OPTIONS.image_dir].each do |d|
- f2 = File.join(d, file)
- return f2 if File.file?(f2)
- end
-
- nil
- end
end
class CollectionDirectory < Array # :nodoc:
end
class CollectionDirectory < Array # :nodoc:
@@
-276,7
+257,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