From: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Wed, 21 Sep 2005 16:00:31 +0000 (+0000)
Subject: Collection#script= and ExecScriptProgram#script= now accept a filename, too.
X-Git-Tag: redact-0.1.5~3
X-Git-Url: http://git.code-monkey.de/?p=redact.git;a=commitdiff_plain;h=da6a7a4135192be1eb7b31a7f4a6aba9a4b6bf83

Collection#script= and ExecScriptProgram#script= now accept a filename, too.
---

diff --git a/ChangeLog b/ChangeLog
index d443d03..2a5a3e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,11 @@
 --
-$Id: ChangeLog 70 2005-09-21 15:56:55Z tilman $
+$Id: ChangeLog 71 2005-09-21 16:00:31Z tilman $
 ++
 
 2005-09-21 Tilman Sauerbeck (tilman at code-monkey de)
         * lib/redact/part.rb: Added Description#inherit
+        * lib/redact/{redact,program}.rb: Collection#script= resp
+          ExecScriptProgram#script= now accept a filename, too
 
 2005-09-19 Tilman Sauerbeck (tilman at code-monkey de)
         * lib/redact/part.rb: Fixed ImageDescription#set_border, which
diff --git a/lib/redact/program.rb b/lib/redact/program.rb
index 4a17120..2342b53 100644
--- a/lib/redact/program.rb
+++ b/lib/redact/program.rb
@@ -1,5 +1,5 @@
 #--
-# $Id: program.rb 33 2005-04-24 15:54:39Z tilman $
+# $Id: program.rb 71 2005-09-21 16:00:31Z tilman $
 #
 # Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
 #
@@ -212,7 +212,8 @@ module Redact
 		end
 
 		def script=(v)
-			@script = v.to_str.dup
+			v = v.to_str
+			@script = (File.exist?(v) ? File.read(v) : v).dup
 		end
 	end
 
diff --git a/lib/redact/redact.rb b/lib/redact/redact.rb
index a4c37fd..2a91f20 100644
--- a/lib/redact/redact.rb
+++ b/lib/redact/redact.rb
@@ -1,5 +1,5 @@
 #--
-# $Id: redact.rb 64 2005-08-25 21:22:04Z tilman $
+# $Id: redact.rb 71 2005-09-21 16:00:31Z tilman $
 #
 # Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
 #
@@ -259,7 +259,8 @@ module Redact
 		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