origami 1.2.3 → 1.2.4

data/bin/gui/hexview.rb

@@ -4,26 +4,26 @@
 	hexview.rb
 
 = Info
-	This file is part of Origami, PDF manipulation framework for Ruby
+	This file is part of PDF Walker, a graphical PDF file browser
 	Copyright (C) 2010	Guillaume Delugré <guillaume@security-labs.org>
 	All right reserved.
 	
-  Origami is free software: you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License as published by
+  PDF Walker is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
 
-  Origami is distributed in the hope that it will be useful,
+  PDF Walker is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU Lesser General Public License for more details.
+  GNU General Public License for more details.
 
-  You should have received a copy of the GNU Lesser General Public License
-  along with Origami.  If not, see <http://www.gnu.org/licenses/>.
+  You should have received a copy of the GNU General Public License
+  along with PDF Walker.  If not, see <http://www.gnu.org/licenses/>.
 
 =end
 
-require 'gui/hexdump'
+require 'gui/gtkhex'
 
 module PDFWalker
 
@@ -44,21 +44,15 @@ module PDFWalker
         set_policy(POLICY_AUTOMATIC, POLICY_AUTOMATIC)
 
         @current_obj = nil
-        @valuebuffer = TextBuffer.new
-        @valueview = TextView.new(@valuebuffer).set_editable(false).set_cursor_visible(false).set_left_margin(5).set_right_margin(5)
+        
+        @view = HexEditor.new
+        @view.show_offsets(true)
 
-        @valuebuffer.create_tag( "HexView",
-          :weight => Pango::WEIGHT_BOLD, 
-          #:foreground => "black", 
-          :family => "Courier", 
-          :scale => Pango::AttrScale::LARGE
-        )
-
-        add_with_viewport @valueview
+        add_with_viewport @view
       end
 
       def clear
-        @valuebuffer.set_text("")
+        @view.set_data ''
       end
 
       def load(object)
@@ -69,14 +63,11 @@ module PDFWalker
 
           case object
             when Origami::Stream
-              @valuebuffer.set_text(object.data.to_s.hexdump)
-            when Origami::HexaString
-              @valuebuffer.set_text(object.value.to_s.hexdump)
-            when Origami::ByteString
-              @valuebuffer.set_text(object.to_utf8)
+              @view.set_data(object.data)
+            when Origami::String
+              @view.set_data(object.value)
           end
 
-          @valuebuffer.apply_tag("HexView", @valuebuffer.start_iter, @valuebuffer.end_iter)
           @current_obj = object
 
         rescue Exception => e 

data/bin/gui/imgview.rb

@@ -4,22 +4,22 @@
 	imgview.rb
 
 = Info
-	This file is part of Origami, PDF manipulation framework for Ruby
+	This file is part of PDF Walker, a graphical PDF file browser
 	Copyright (C) 2010	Guillaume Delugr� <guillaume@security-labs.org>
 	All right reserved.
 	
-  Origami is free software: you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License as published by
+  PDF Walker is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
 
-  Origami is distributed in the hope that it will be useful,
+  PDF Walker is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU Lesser General Public License for more details.
+  GNU General Public License for more details.
 
-  You should have received a copy of the GNU Lesser General Public License
-  along with Origami.  If not, see <http://www.gnu.org/licenses/>.
+  You should have received a copy of the GNU General Public License
+  along with PDF Walker.  If not, see <http://www.gnu.org/licenses/>.
 
 =end
 

data/bin/gui/menu.rb

@@ -4,22 +4,22 @@
 	menu.rb
 
 = Info
-	This file is part of Origami, PDF manipulation framework for Ruby
+	This file is part of PDF Walker, a graphical PDF file browser
 	Copyright (C) 2010	Guillaume Delugr� <guillaume@security-labs.org>
 	All right reserved.
 	
-  Origami is free software: you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License as published by
+  PDF Walker is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
 
-  Origami is distributed in the hope that it will be useful,
+  PDF Walker is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU Lesser General Public License for more details.
+  GNU General Public License for more details.
 
-  You should have received a copy of the GNU Lesser General Public License
-  along with Origami.  If not, see <http://www.gnu.org/licenses/>.
+  You should have received a copy of the GNU General Public License
+  along with PDF Walker.  If not, see <http://www.gnu.org/licenses/>.
 
 =end
 
@@ -266,7 +266,7 @@ module PDFWalker
       
       AccelMap.add_entry("<PDF Walker>/File/Open", Gdk::Keyval::GDK_O, Gdk::Window::CONTROL_MASK)
       AccelMap.add_entry("<PDF Walker>/File/Refresh", Gdk::Keyval::GDK_R, Gdk::Window::CONTROL_MASK)
-      AccelMap.add_entry("<PDF Walker>/File/Close", Gdk::Keyval::GDK_X, Gdk::Window::CONTROL_MASK)
+      AccelMap.add_entry("<PDF Walker>/File/Close", Gdk::Keyval::GDK_W, Gdk::Window::CONTROL_MASK)
       AccelMap.add_entry("<PDF Walker>/File/Save", Gdk::Keyval::GDK_S, Gdk::Window::CONTROL_MASK)
       AccelMap.add_entry("<PDF Walker>/File/Quit", Gdk::Keyval::GDK_Q, Gdk::Window::CONTROL_MASK)
       AccelMap.add_entry("<PDF Walker>/Document/Search", Gdk::Keyval::GDK_F, Gdk::Window::CONTROL_MASK)

data/bin/gui/properties.rb

@@ -4,22 +4,22 @@
 	properties.rb
 
 = Info
-	This file is part of Origami, PDF manipulation framework for Ruby
+	This file is part of PDF Walker, a graphical PDF file browser
 	Copyright (C) 2010	Guillaume Delugr� <guillaume@security-labs.org>
 	All right reserved.
 	
-  Origami is free software: you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License as published by
+  PDF Walker is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
 
-  Origami is distributed in the hope that it will be useful,
+  PDF Walker is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU Lesser General Public License for more details.
+  GNU General Public License for more details.
 
-  You should have received a copy of the GNU Lesser General Public License
-  along with Origami.  If not, see <http://www.gnu.org/licenses/>.
+  You should have received a copy of the GNU General Public License
+  along with PDF Walker.  If not, see <http://www.gnu.org/licenses/>.
 
 =end
 
@@ -54,21 +54,34 @@ module PDFWalker
         super("Document properties", parent, Dialog::MODAL, [Stock::CLOSE, Dialog::RESPONSE_NONE])
         
         docframe = Frame.new(" File properties ")
+        stat = File.stat(parent.filename)
         
-        i = Iconv.new("UTF-8//IGNORE//TRANSLIT", "ISO-8859-1")
+        if RUBY_VERSION < '1.9'
+          require 'iconv'
+          i = Iconv.new("UTF-8//IGNORE//TRANSLIT", "ISO-8859-1")
+
+          creation_date = i.iconv(stat.ctime.to_s)
+          last_modified = i.iconv(stat.mtime.to_s)
+          fd = File.open(parent.filename, 'rb')
+          md5sum = Digest::MD5.hexdigest(fd.read)
+          fd.close
+          i.close
+        else
+          creation_date = stat.ctime.to_s.encode("utf-8", :invalid => :replace, :undef => :replace)
+          last_modified = stat.mtime.to_s.encode("utf-8", :invalid => :replace, :undef => :replace)
+          md5sum = Digest::MD5.hexdigest(File.binread(parent.filename))
+        end
         
-        stat = File.stat(parent.filename)
         labels = 
         [ 
           [ "Filename:", parent.filename ],
           [ "File size:", "#{File.size(parent.filename)} bytes" ],
-          [ "MD5:", Digest::MD5.hexdigest(File.open(parent.filename).read) ],
+          [ "MD5:", md5sum ],
           [ "Read-only:", "#{not stat.writable?}" ],
-          [ "Creation date:", i.iconv("#{stat.ctime}") ],
-          [ "Last modified:", i.iconv("#{stat.mtime}") ]
+          [ "Creation date:", creation_date ],
+          [ "Last modified:", last_modified ]
         ]
-        i.close
-        
+
         doctable = Table.new(labels.size + 1, 3)
         
         row = 0

data/bin/gui/signing.rb

@@ -4,22 +4,22 @@
 	signing.rb
 
 = Info
-	This file is part of Origami, PDF manipulation framework for Ruby
+	This file is part of PDF Walker, a graphical PDF file browser
 	Copyright (C) 2010	Guillaume Delugr� <guillaume@security-labs.org>
 	All right reserved.
 	
-  Origami is free software: you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License as published by
+  PDF Walker is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
 
-  Origami is distributed in the hope that it will be useful,
+  PDF Walker is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU Lesser General Public License for more details.
+  GNU General Public License for more details.
 
-  You should have received a copy of the GNU Lesser General Public License
-  along with Origami.  If not, see <http://www.gnu.org/licenses/>.
+  You should have received a copy of the GNU General Public License
+  along with PDF Walker.  If not, see <http://www.gnu.org/licenses/>.
 
 =end
 

data/bin/gui/textview.rb

@@ -4,28 +4,25 @@
 	textview.rb
 
 = Info
-	This file is part of Origami, PDF manipulation framework for Ruby
+	This file is part of PDF Walker, a graphical PDF file browser
 	Copyright (C) 2010	Guillaume Delugré <guillaume@security-labs.org>
 	All right reserved.
 	
-  Origami is free software: you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License as published by
+  PDF Walker is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
 
-  Origami is distributed in the hope that it will be useful,
+  PDF Walker is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU Lesser General Public License for more details.
+  GNU General Public License for more details.
 
-  You should have received a copy of the GNU Lesser General Public License
-  along with Origami.  If not, see <http://www.gnu.org/licenses/>.
+  You should have received a copy of the GNU General Public License
+  along with PDF Walker.  If not, see <http://www.gnu.org/licenses/>.
 
 =end
 
-require 'kconv'
-require 'gui/hexdump'
-
 module PDFWalker
 
   class Walker < Window
@@ -56,7 +53,7 @@ module PDFWalker
         
         @pdfbuffer.create_tag("Object", 
           :weight => Pango::WEIGHT_BOLD, 
-          :foreground => "darkblue", 
+          #:foreground => "darkblue", 
           :family => "Courier", 
           :scale => Pango::AttrScale::LARGE
         )
@@ -74,15 +71,15 @@ module PDFWalker
             stm = "#{object.no} #{object.generation} obj\n"
             stm << object.dictionary.to_s
             
-            if object.rawdata.is_binary_data?
-              stm << "stream\n[Binary data]\nendstream"
-            else
-              stm << "stream\n#{object.rawdata}endstream"
-            end
+            #if object.rawdata.is_binary_data?
+            #  stm << "stream\n[Binary data]\nendstream"
+            #else
+            #  stm << "stream\n#{object.rawdata}endstream"
+            #end
             
             @pdfbuffer.set_text(stm)
             
-          elsif (not object.is_a?(::Array) or object.is_a?(Array)) and 
+          elsif not (object.is_a?(::Array) or object.is_a?(Array)) and 
                 not object.is_a?(PDF) and not object.is_a?(Adobe::PPKLite) and 
                 not object.is_a?(PDF::Revision) and not object.is_a?(Adobe::PPKLite::Revision) and
                 not object.is_a?(XRefToCompressedObj)

data/bin/gui/treeview.rb

@@ -4,22 +4,22 @@
 	treeview.rb
 
 = Info
-	This file is part of Origami, PDF manipulation framework for Ruby
+	This file is part of PDF Walker, a graphical PDF file browser 
 	Copyright (C) 2010	Guillaume Delugré <guillaume@security-labs.org>
 	All right reserved.
 	
-  Origami is free software: you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License as published by
+  PDF Walker is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
 
-  Origami is distributed in the hope that it will be useful,
+  PDF Walker is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU Lesser General Public License for more details.
+  GNU General Public License for more details.
 
-  You should have received a copy of the GNU Lesser General Public License
-  along with Origami.  If not, see <http://www.gnu.org/licenses/>.
+  You should have received a copy of the GNU General Public License
+  along with PDF Walker.  If not, see <http://www.gnu.org/licenses/>.
 
 =end
 
@@ -285,7 +285,7 @@ module PDFWalker
         name = 
           case object
             when Origami::String
-              '"' + object.value + '"'
+              '"' + object.to_utf8 + '"'
             when Origami::Number, Name
               object.value.to_s
             else

data/bin/gui/walker.rb

@@ -6,22 +6,22 @@
 	walker.rb
 
 = Info
-	This file is part of Origami, PDF manipulation framework for Ruby
+	This file is part of PDF Walker, a graphical PDF file browser 
 	Copyright (C) 2010	Guillaume Delugré <guillaume@security-labs.org>
 	All right reserved.
 	
-  Origami is free software: you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License as published by
+  PDF Walker is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
 
-  Origami is distributed in the hope that it will be useful,
+  PDF Walker is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU Lesser General Public License for more details.
+  GNU General Public License for more details.
 
-  You should have received a copy of the GNU Lesser General Public License
-  along with Origami.  If not, see <http://www.gnu.org/licenses/>.
+  You should have received a copy of the GNU General Public License
+  along with PDF Walker.  If not, see <http://www.gnu.org/licenses/>.
 
 =end
 

data/bin/gui/xrefs.rb

@@ -4,22 +4,22 @@
 	xrefs.rb
 
 = Info
-	This file is part of Origami, PDF manipulation framework for Ruby
+	This file is part of PDF Walker, a graphical PDF file browser 
 	Copyright (C) 2010	Guillaume Delugré <guillaume@security-labs.org>
 	All right reserved.
 	
-  Origami is free software: you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License as published by
+  PDF Walker is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
 
-  Origami is distributed in the hope that it will be useful,
+  PDF Walker is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU Lesser General Public License for more details.
+  GNU General Public License for more details.
 
-  You should have received a copy of the GNU Lesser General Public License
-  along with Origami.  If not, see <http://www.gnu.org/licenses/>.
+  You should have received a copy of the GNU General Public License
+  along with PDF Walker.  If not, see <http://www.gnu.org/licenses/>.
 
 =end
 

data/bin/pdf2ruby

@@ -26,11 +26,11 @@
 =end
 
 require 'optparse'
-require 'ftools'
+require 'fileutils'
 begin
+  ORIGAMIDIR = "#{File.dirname(__FILE__)}/../lib"
   require 'origami'
 rescue LoadError
-  ORIGAMIDIR = "#{File.dirname(__FILE__)}/../lib"
   $: << ORIGAMIDIR
   require 'origami'
 end
@@ -315,7 +315,11 @@ puts "Processing the object hierarchy..."
 @current_idx = 0
 while @current_idx != @obj_route.size
   varname = @obj_route[@current_idx]
-  obj = target[@var_hash.index(varname)]
+  if RUBY_VERSION < '1.9'
+    obj = target[@var_hash.index(varname)]
+  else
+    obj = target[@var_hash.key(varname)]
+  end
   
   @code_hash[varname] ||= {}
   @code_hash[varname][:body] = objectToRuby(obj, 0, varname, true)

data/bin/pdfencrypt

@@ -102,8 +102,8 @@ begin
 
   pdf = PDF.read(target, params)
   pdf.encrypt(
-    :user_password  => @options[:password], 
-    :owner_password => @options[:password], 
+    :user_passwd  => @options[:password], 
+    :owner_passwd => @options[:password], 
     :cipher         => @options[:cipher], 
     :key_size       => @options[:key_size],
     :hardened       => @options[:hardened]