origami 1.2.4 → 1.2.5

data/lib/origami/graphics/xobject.rb

@@ -5,7 +5,7 @@
 
 = Info
 	This file is part of Origami, PDF manipulation framework for Ruby
-	Copyright (C) 2010	Guillaume Delugré <guillaume@security-labs.org>
+	Copyright (C) 2010	Guillaume Delugré <guillaume AT security-labs DOT org>
 	All right reserved.
 	
   Origami is free software: you can redistribute it and/or modify

data/lib/origami/graphics.rb

@@ -5,7 +5,7 @@
 
 = Info
 	This file is part of Origami, PDF manipulation framework for Ruby
-	Copyright (C) 2010	Guillaume Delugr� <guillaume@security-labs.org>
+	Copyright (C) 2010	Guillaume Delugré <guillaume AT security-labs DOT org>
 	All right reserved.
 	
   Origami is free software: you can redistribute it and/or modify

data/lib/origami/header.rb

@@ -5,7 +5,7 @@
 
 = Info
 	This file is part of Origami, PDF manipulation framework for Ruby
-	Copyright (C) 2010	Guillaume Delugr� <guillaume@security-labs.org>
+	Copyright (C) 2010	Guillaume Delugré <guillaume AT security-labs DOT org>
 	All right reserved.
 	
   Origami is free software: you can redistribute it and/or modify

data/lib/origami/javascript.rb

@@ -5,7 +5,7 @@
 
 = Info
 	This file is part of Origami, PDF manipulation framework for Ruby
-	Copyright (C) 2010	Guillaume Delugré <guillaume@security-labs.org>
+	Copyright (C) 2010	Guillaume Delugré <guillaume AT security-labs DOT org>
 	All right reserved.
 	  
   Origami is free software: you can redistribute it and/or modify

data/lib/origami/linearization.rb

@@ -5,7 +5,7 @@
 
 = Info
 	This file is part of Origami, PDF manipulation framework for Ruby
-	Copyright (C) 2010	Guillaume Delugr� <guillaume@security-labs.org>
+	Copyright (C) 2010	Guillaume Delugré <guillaume AT security-labs DOT org>
 	All right reserved.
 	
   Origami is free software: you can redistribute it and/or modify

data/lib/origami/metadata.rb

@@ -5,7 +5,7 @@
 
 = Info
 	This file is part of Origami, PDF manipulation framework for Ruby
-	Copyright (C) 2010	Guillaume Delugré <guillaume@security-labs.org>
+	Copyright (C) 2010	Guillaume Delugré <guillaume AT security-labs DOT org>
 	All right reserved.
 	
   Origami is free software: you can redistribute it and/or modify

data/lib/origami/name.rb

@@ -5,7 +5,7 @@
 
 = Info
 	This file is part of Origami, PDF manipulation framework for Ruby
-	Copyright (C) 2010	Guillaume Delugré <guillaume@security-labs.org>
+	Copyright (C) 2010	Guillaume Delugré <guillaume AT security-labs DOT org>
 	All right reserved.
 	
   Origami is free software: you can redistribute it and/or modify
@@ -92,7 +92,7 @@ module Origami
     end
 
     def ==(object) #:nodoc:
-      @value.to_sym == object
+      self.eql?(object) or @value.to_sym == object
     end
     
     def eql?(object) #:nodoc:

data/lib/origami/null.rb

@@ -5,7 +5,7 @@
 
 = Info
 	This file is part of Origami, PDF manipulation framework for Ruby
-	Copyright (C) 2010	Guillaume Delugr� <guillaume@security-labs.org>
+	Copyright (C) 2010	Guillaume Delugré <guillaume AT security-labs DOT org>
 	All right reserved.
 	
   Origami is free software: you can redistribute it and/or modify

data/lib/origami/numeric.rb

@@ -4,6 +4,10 @@
 	numeric.rb
 
 = Info
+	This file is part of Origami, PDF manipulation framework for Ruby
+	Copyright (C) 2010	Guillaume Delugré <guillaume AT security-labs DOT 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
   the Free Software Foundation, either version 3 of the License, or
@@ -133,7 +137,6 @@ module Origami
     end
     
     alias value to_i
-    
   end
   
   class InvalidRealObjectError < InvalidObjectError #:nodoc:
@@ -182,7 +185,10 @@ module Origami
     end
     
     alias value to_f
-    
+
+    def to_s
+      sprintf("%f", self).sub(/\.0*$|(\.\d*[^0])0*$/, '\1')
+    end
   end
 
 end

data/lib/origami/object.rb

@@ -4,6 +4,10 @@
 	object.rb
 
 = Info
+	This file is part of Origami, PDF manipulation framework for Ruby
+	Copyright (C) 2010	Guillaume Delugré <guillaume AT security-labs DOT 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
   the Free Software Foundation, either version 3 of the License, or
@@ -276,12 +280,16 @@ module Origami
     # Sets whether the object is indirect or not.
     # Indirect objects are allocated numbers at build time.
     #
-    def set_indirect(dir)
-      unless dir == true or dir == false
+    def set_indirect(bool)
+      unless bool == true or bool == false
         raise TypeError, "The argument must be boolean"
       end
-      
-      @indirect = dir
+
+      if not bool
+        @no = @generation = 0
+        @pdf = nil
+      end
+      @indirect = bool
       self
     end
     
@@ -319,7 +327,20 @@ module Origami
     # Deep copy of an object.
     #
     def copy
-      Marshal.load(Marshal.dump(self))
+      saved_pdf = @pdf
+      saved_parent = @parent
+      @pdf = @parent = nil # do not process parent object and document in the copy
+
+      # Perform the recursive copy (quite dirty).
+      copyobj = Marshal.load(Marshal.dump(self))
+
+      # restore saved values
+      @pdf = saved_pdf
+      @parent = saved_parent
+      copyobj.set_pdf(saved_pdf)
+      copyobj.parent = parent
+
+      copyobj
     end
     
     #
@@ -370,6 +391,76 @@ module Origami
       xref_cache[self.reference]
     end
 
+    #
+    # Creates an exportable version of current object.
+    # The exportable version is a copy of _self_ with solved references, no owning PDF and no parent.
+    # References to Catalog or PageTreeNode objects have been destroyed.
+    #
+    # When exported, an object can be moved into another document without hassle.
+    #
+    def export
+      exported_obj = self.logicalize
+      exported_obj.no = exported_obj.generation = 0
+      exported_obj.set_pdf(nil) if exported_obj.is_indirect?
+      exported_obj.parent = nil
+      
+      exported_obj
+    end
+
+    #
+    # Returns a logicalized copy of _self_.
+    # See logicalize! 
+    #
+    def logicalize #:nodoc:
+      self.copy.logicalize!
+    end
+
+    #
+    # Transforms recursively every references to the copy of their respective object.
+    # Catalog and PageTreeNode objects are excluded to limit the recursion.
+    #
+    def logicalize! #:nodoc:
+
+      def resolve_all_references(obj, browsed = [], ref_cache = {})
+        return if browsed.include?(obj)
+        browsed.push(obj)
+
+        if obj.is_a?(ObjectStream)
+          obj.each do |subobj|
+            resolve_all_references(obj, browsed, ref_cache)
+          end
+        end
+
+        if obj.is_a?(Dictionary) or obj.is_a?(Array)
+          obj.map! do |subobj|
+            if subobj.is_a?(Reference)
+              new_obj = 
+                if ref_cache.has_key?(subobj)
+                  ref_cache[subobj]
+                else
+                  ref_cache[subobj] = subobj.solve.copy  
+                end
+              new_obj.no = new_obj.generation = 0
+              new_obj.parent = obj
+
+              new_obj unless new_obj.is_a?(Catalog) or new_obj.is_a?(PageTreeNode)
+            else
+              subobj
+            end
+          end
+
+          obj.each do |subobj|
+            resolve_all_references(subobj, browsed, ref_cache)
+          end
+
+        elsif obj.is_a?(Stream)
+          resolve_all_references(obj.dictionary, browsed, ref_cache)
+        end
+      end
+       
+      resolve_all_references(self)
+    end
+
     #
     # Returns the indirect object which contains this object.
     # If the current object is already indirect, returns self.
@@ -530,5 +621,4 @@ module Origami
     alias output to_s
     
   end
-
 end

data/lib/origami/outline.rb

@@ -5,7 +5,7 @@
 
 = Info
 	This file is part of Origami, PDF manipulation framework for Ruby
-	Copyright (C) 2010	Guillaume Delugré <guillaume@security-labs.org>
+	Copyright (C) 2010	Guillaume Delugré <guillaume AT security-labs DOT org>
 	All right reserved.
 	
   Origami is free software: you can redistribute it and/or modify

data/lib/origami/outputintents.rb

@@ -4,6 +4,10 @@
 	outputintents.rb
 
 = Info
+	This file is part of Origami, PDF manipulation framework for Ruby
+	Copyright (C) 2010	Guillaume Delugré <guillaume AT security-labs DOT 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
   the Free Software Foundation, either version 3 of the License, or

data/lib/origami/page.rb

@@ -4,6 +4,10 @@
 	page.rb
 
 = Info
+	This file is part of Origami, PDF manipulation framework for Ruby
+	Copyright (C) 2010	Guillaume Delugré <guillaume AT security-labs DOT 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
   the Free Software Foundation, either version 3 of the License, or
@@ -25,7 +29,15 @@ module Origami
 
     def append_page(page = Page.new, *more)
       raise InvalidPDFError, "Invalid page tree" if not self.Catalog or not self.Catalog.Pages or not self.Catalog.Pages.is_a?(PageTreeNode)
-      pages = [ page ].concat(more)
+      
+      pages = [ page ].concat(more).map! do |pg|
+        if pg.pdf and pg.pdf != self
+          # Page from another document must be exported.
+          pg.export
+        else
+          pg
+        end
+      end
       
       treeroot = self.Catalog.Pages
       
@@ -43,6 +55,9 @@ module Origami
     def insert_page(index, page)
       raise InvalidPDFError, "Invalid page tree" if not self.Catalog or not self.Catalog.Pages or not self.Catalog.Pages.is_a?(PageTreeNode)
 
+      # Page from another document must be exported.
+      page = page.export if page.pdf and page.pdf != self
+
       self.Catalog.Pages.insert_page(index, page)
       self
     end

data/lib/origami/parser.rb

@@ -4,6 +4,10 @@
 	parser.rb
 
 = Info
+	This file is part of Origami, PDF manipulation framework for Ruby
+	Copyright (C) 2010	Guillaume Delugré <guillaume AT security-labs DOT 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
   the Free Software Foundation, either version 3 of the License, or
@@ -28,9 +32,9 @@ module Origami
     if RUBY_PLATFORM =~ /win32/ or RUBY_PLATFORM =~ /mingw32/
       require "Win32API"
     
-      getStdHandle = Win32API.new("kernel32", "GetStdHandle", ['L'], 'L')
-      @@setConsoleTextAttribute = Win32API.new("kernel32", "SetConsoleTextAttribute", ['L', 'N'], 'I')
-
+      getStdHandle = Win32API.new("kernel32", "GetStdHandle", 'L', 'L')
+      @@getConsoleScreenBufferInfo = Win32API.new("kernel32", "GetConsoleScreenBufferInfo", 'LP', 'L')
+      @@setConsoleTextAttribute = Win32API.new("kernel32", "SetConsoleTextAttribute", 'LN', 'I')
       @@hOut = getStdHandle.call(-11)
     end
 
@@ -68,10 +72,17 @@ module Origami
 
     def self.set_fg_color(color, bright = false, fd = STDOUT) #:nodoc:
       if RUBY_PLATFORM =~ /win32/ or RUBY_PLATFORM =~ /mingw32/
-        if bright then color |= Colors::WHITE end
+        screen_info = "\x00" * 30
+        current = 
+          if @@getConsoleScreenBufferInfo.call(@@hOut, screen_info) == 1
+            screen_info[8,2].unpack('v')[0]
+          else 
+            Colors::GREY
+          end
+        color |= Colors::WHITE if bright
         @@setConsoleTextAttribute.call(@@hOut, color)
         yield
-        @@setConsoleTextAttribute.call(@@hOut, Colors::GREY)
+        @@setConsoleTextAttribute.call(@@hOut, current)
       else
         col, nocol = [color, Colors::GREY].map! { |key| "\033[#{key}m" }
         fd << col

data/lib/origami/parsers/pdf.rb

@@ -5,7 +5,7 @@
 
 = Info
 	This file is part of Origami, PDF manipulation framework for Ruby
-	Copyright (C) 2010	Guillaume Delugré <guillaume@security-labs.org>
+	Copyright (C) 2010	Guillaume Delugré <guillaume AT security-labs DOT org>
 	All right reserved.
 	
   Origami is free software: you can redistribute it and/or modify

data/lib/origami/pdf.rb

@@ -4,6 +4,10 @@
 	pdf.rb
 
 = Info
+	This file is part of Origami, PDF manipulation framework for Ruby
+	Copyright (C) 2010	Guillaume Delugré <guillaume AT security-labs DOT 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
   the Free Software Foundation, either version 3 of the License, or
@@ -61,8 +65,8 @@ require 'origami/parsers/pdf'
 
 module Origami
 
-  VERSION   = "1.2.4"
-  REVISION  = "$Revision$" #:nodoc:
+  VERSION   = "1.2.5"
+  REVISION  = "$Revision: rev 167/, 2013/01/28 11:59:28 $" #:nodoc:
   
   #
   # Global options for Origami.
@@ -511,10 +515,29 @@ module Origami
     # _object_:: The object to add.
     #
     def <<(object)
-      add_to_revision(object, @revisions.last)
+      owner = object.pdf
+
+      #
+      # Does object belongs to another PDF ?
+      #
+      if owner and not owner.equal?(self)
+        import object
+      else
+        add_to_revision(object, @revisions.last)
+      end
     end
     alias :insert :<<
     
+    #
+    # Similar to PDF#insert or PDF#<<, but for an object belonging to another document.
+    # Object will be recursively copied and new version numbers will be assigned.
+    # Returns the new reference to the imported object.
+    # _object_:: The object to import.
+    #
+    def import(object)
+      self.insert(object.export)
+    end
+
     #
     # Adds a new object to a specific revision.
     # If this object has no version number, then a new one will be automatically computed and assignated to him.

data/lib/origami/reference.rb

@@ -4,6 +4,10 @@
 	reference.rb
 
 = Info
+	This file is part of Origami, PDF manipulation framework for Ruby
+	Copyright (C) 2010	Guillaume Delugré <guillaume AT security-labs DOT 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
   the Free Software Foundation, either version 3 of the License, or

data/lib/origami/signature.rb

@@ -4,6 +4,10 @@
 	signature.rb
 
 = Info
+	This file is part of Origami, PDF manipulation framework for Ruby
+	Copyright (C) 2010	Guillaume Delugré <guillaume AT security-labs DOT 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
   the Free Software Foundation, either version 3 of the License, or

data/lib/origami/stream.rb

@@ -4,6 +4,10 @@
 	stream.rb
 
 = Info
+	This file is part of Origami, PDF manipulation framework for Ruby
+	Copyright (C) 2010	Guillaume Delugré <guillaume AT security-labs DOT 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
   the Free Software Foundation, either version 3 of the License, or
@@ -54,7 +58,15 @@ module Origami
       :CCITTFaxDecode,
       :JBIG2Decode,
       :DCTDecode,
-      :JPXDecode
+      :JPXDecode,
+      # abbrev
+      :AHx, # ASCIIHexDecode
+      :A85, # ASCII85Decode
+      :LZW, # LZWDecode
+      :Fl,  # FlateDecode
+      :RL,  # RunLengthDecode
+      :CCF, # CCITTFaxDecode
+      :DCT, # DCTDecode
     ]
     
     attr_accessor :dictionary
@@ -366,7 +378,6 @@ module Origami
       end
 
       Origami::Filter.const_get(filter.value.to_s.sub(/Decode$/,"")).decode(data, params)
-      
     end
     
     def encode_data(data, filter, params) #:nodoc:

data/lib/origami/string.rb

@@ -4,6 +4,10 @@
 	string.rb
 
 = Info
+	This file is part of Origami, PDF manipulation framework for Ruby
+	Copyright (C) 2010	Guillaume Delugré <guillaume AT security-labs DOT 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
   the Free Software Foundation, either version 3 of the License, or

data/lib/origami/trailer.rb

@@ -4,6 +4,10 @@
 	trailer.rb
 
 = Info
+	This file is part of Origami, PDF manipulation framework for Ruby
+	Copyright (C) 2010	Guillaume Delugré <guillaume AT security-labs DOT 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
   the Free Software Foundation, either version 3 of the License, or

data/lib/origami/webcapture.rb

@@ -4,6 +4,10 @@
 	webcapture.rb
 
 = Info
+	This file is part of Origami, PDF manipulation framework for Ruby
+	Copyright (C) 2010	Guillaume Delugré <guillaume AT security-labs DOT 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
   the Free Software Foundation, either version 3 of the License, or

data/lib/origami/xfa.rb

@@ -5,7 +5,7 @@
 
 = Info
 	This file is part of Origami, PDF manipulation framework for Ruby
-	Copyright (C) 2010	Guillaume Delugr� <guillaume@security-labs.org>
+	Copyright (C) 2010	Guillaume Delugré <guillaume AT security-labs DOT org>
 	All right reserved.
 	
   Origami is free software: you can redistribute it and/or modify

data/lib/origami/xreftable.rb

@@ -4,6 +4,10 @@
 	xreftable.rb
 
 = Info
+	This file is part of Origami, PDF manipulation framework for Ruby
+	Copyright (C) 2010	Guillaume Delugré <guillaume AT security-labs DOT 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
   the Free Software Foundation, either version 3 of the License, or

data/test/ts_pdf.rb

@@ -1,4 +1,9 @@
-require 'test/unit/testsuite'
+begin
+  require 'test/unit/testsuite'
+rescue LoadError
+  abort "Error: you need to install test-unit"
+end
+
 require 'tc_pdfparse.rb'
 require 'tc_streams.rb'
 require 'tc_pdfencrypt.rb'