origami 1.2.2 → 1.2.3

data/lib/origami/dictionary.rb

@@ -184,6 +184,8 @@ module Origami
       alias value to_h
 
       def method_missing(field, *args) #:nodoc:
+        raise NoMethodError, "No method `#{field}' for #{self.class}" unless field.to_s[0,1] =~ /[A-Z]/
+
         if field.to_s[-1,1] == '='
           self[field.to_s[0..-2].to_sym] = args.first
         else

data/lib/origami/encryption.rb

@@ -302,6 +302,8 @@ module Origami
       attr_writer :stm_algo
       attr_writer :str_algo
 
+      private
+
       def physicalize(options = {})
 
         def build(obj, revision, options) #:nodoc:
@@ -1357,9 +1359,7 @@ module Origami
         end
 
         def password_to_utf8(passwd) #:nodoc:
-          p=Origami::ByteString.new(passwd).to_utf8[0, 127]
-          hexprint p
-          p
+          Origami::ByteString.new(passwd).to_utf8[0, 127]
         end
       
       end

data/lib/origami/file.rb

@@ -48,12 +48,18 @@ module Origami
         fd = path
         params[:EmbeddedName] ||= ''
       else
-        fd = File.open(path, 'r').binmode
+        fd = File.open(File.expand_path(path), 'r').binmode
         params[:EmbeddedName] ||= File.basename(path)
       end
       
       fstream = EmbeddedFileStream.new
-      fstream.data = fd.read
+
+      if ''.respond_to? :force_encoding
+        fstream.data = fd.read.force_encoding('binary') # 1.9
+      else
+        fstream.data = fd.read
+      end
+
       fstream.setFilter(params[:Filter])
       
       name = params[:EmbeddedName]

data/lib/origami/graphics/xobject.rb

@@ -78,6 +78,17 @@ module Origami
       @instructions
     end
 
+    def draw_image(name, attr = {})
+      load! if @instructions.nil?
+
+      x, y = attr[:x], attr[:y]
+
+      @instructions << PDF::Instruction.new('q')
+      @instructions << PDF::Instruction.new('cm', 300, 0, 0, 300, x, y)
+      @instructions << PDF::Instruction.new('Do', name)
+      @instructions << PDF::Instruction.new('Q')
+    end
+
     #
     # Draw a straight line from the point at coord _from_, to the point at coord _to_.
     #
@@ -492,6 +503,50 @@ module Origami
       field   :Measure,           :Type => Dictionary, :Version => "1.7", :ExtensionLevel => 3
       field   :PtData,            :Type => Dictionary, :Version => "1.7", :ExtensionLevel => 3
 
+      def self.from_image_file(path, format = nil)
+
+        if path.respond_to?(:read)
+          fd = path
+        else
+          fd = File.open(File.expand_path(path), 'r').binmode
+          format ||= File.extname(path) 
+          format.slice!(0) if format and format[0,1] == '.'
+        end
+     
+        if ''.respond_to? :force_encoding
+          data = fd.read.force_encoding('binary') # 1.9
+        else
+          data = fd.read
+        end
+
+        fd.close
+
+        image = ImageXObject.new
+
+        raise ArgumentError, "Missing file format" if format.nil?
+        case format.downcase
+          when 'jpg', 'jpeg', 'jpe', 'jif', 'jfif', 'jfi'
+            image.setFilter :DCTDecode    
+            image.rawdata = data
+
+            image
+
+          when 'jp2','jpx','j2k','jpf','jpm','mj2'
+            image.setFilter :JPXDecode
+            image.rawdata = data
+            
+            image
+
+          when 'jb2', 'jbig', 'jbig2'
+            image.setFilter :JBIG2Decode
+            image.rawdata = data
+
+            image
+        else
+          raise NotImplementedError, "Unknown file format: '#{format}'"
+        end
+      end
+
       #
       # Converts an ImageXObject stream into an image file data.
       # Output format depends on the stream encoding: 

data/lib/origami/javascript.rb

@@ -211,7 +211,7 @@ module Origami
 
           acro_method 'read',
             Arg[:name => 'nBytes', :type => Numeric, :required => true] do |nBytes|
-              @data.slice!(0, nBytes)
+              @data.slice!(0, nBytes).unpack("H*")[0]
             end
         end
 

data/lib/origami/name.rb

@@ -128,6 +128,8 @@ module Origami
     def self.contract(name) #:nodoc:
      
       i = 0
+      name = name.dup
+
       while i < name.length
 
         if name[i,1] == "#"
@@ -156,11 +158,9 @@ module Origami
       
       forbiddenchars = /[ #\t\r\n\0\[\]<>()%\/]/
       
-      name.gsub!(forbiddenchars) do |c|
+      name.gsub(forbiddenchars) do |c|
         "#" + c[0].ord.to_s(16).rjust(2,"0")
       end
-      
-      name
     end
     
     def real_type ; Name end

data/lib/origami/page.rb

@@ -423,6 +423,16 @@ module Origami
       end
     end
 
+    #
+    # Returns the array of Annotation objects of the Page.
+    #
+    def annotations
+      annots = self.Annots
+      return [] unless annots.is_a?(Array)
+      
+      annots.map{|annot| annot.solve} 
+    end
+
     #
     # Embed a SWF Flash application in the page.
     #

data/lib/origami/pdf.rb

@@ -61,8 +61,8 @@ require 'origami/parsers/pdf'
 
 module Origami
 
-  VERSION   = "1.2.2"
-  REVISION  = "$Revision: rev 135/, 2011/10/17 11:59:41 $" #:nodoc:
+  VERSION   = "1.2.3"
+  REVISION  = "$Revision: rev 143/, 2011/10/20 16:22:40 $" #:nodoc:
   
   #
   # Global options for Origami.
@@ -264,13 +264,6 @@ module Origami
       self
     end
     
-    #
-    # Returns the virtual file size as it would be taking on disk.
-    #
-    def filesize
-      self.to_bin(:rebuildxrefs => false).size
-    end
-    
     #
     # Saves the current document. 
     # _filename_:: The path where to save this PDF.
@@ -301,9 +294,9 @@ module Origami
       
       intents_as_pdfa1 if options[:intent] =~ /pdf[\/-]?A1?/i
       self.delinearize! if options[:delinearize] and self.is_linearized?
-      self.compile(options) if options[:recompile]
+      compile(options) if options[:recompile]
 
-      fd.write self.to_bin(options)
+      fd.write output(options)
       fd.close
       
       self
@@ -541,6 +534,130 @@ module Origami
       object.reference
     end
 
+    #
+    # Ends the current Revision, and starts a new one.
+    #
+    def add_new_revision
+      
+      root = @revisions.last.trailer[:Root] unless @revisions.empty?
+
+      @revisions << Revision.new(self)
+      @revisions.last.trailer = Trailer.new
+      @revisions.last.trailer.Root = root
+
+      self
+    end
+
+    #
+    # Removes a whole document revision.
+    # _index_:: Revision index, first is 0.
+    #
+    def remove_revision(index)
+      if index < 0 or index > @revisions.size
+        raise IndexError, "Not a valid revision index"
+      end
+
+      if @revisions.size == 1
+        raise InvalidPDFError, "Cannot remove last revision"
+      end
+
+      @revisions.delete_at(index)
+      self
+    end
+    
+    #
+    # Looking for an object present at a specified file offset.
+    #
+    def get_object_by_offset(offset) #:nodoc:
+      self.indirect_objects.find { |obj| obj.file_offset == offset }
+    end   
+
+    #
+    # Remove an object.
+    #
+    def delete_object(no, generation = 0)
+      
+      case no
+        when Reference
+          target = no
+        when ::Integer
+          target = Reference.new(no, generation)
+      else
+        raise TypeError, "Invalid parameter type : #{no.class}" 
+      end
+      
+      @revisions.each do |rev|
+        rev.body.delete(target)
+      end
+
+    end
+
+    #
+    # Search for an indirect object in the document.
+    # _no_:: Reference or number of the object.
+    # _generation_:: Object generation.
+    #
+    def get_object(no, generation = 0, use_xrefstm = true) #:nodoc:
+      case no
+        when Reference
+          target = no
+        when ::Integer
+           target = Reference.new(no, generation)
+        when Origami::Object
+          return no
+      else
+        raise TypeError, "Invalid parameter type : #{no.class}" 
+      end
+      
+      set = indirect_objects_table
+     
+      #
+      # Search through accessible indirect objects.
+      #
+      if set.include?(target)
+        set[target]
+      elsif use_xrefstm == true
+        # Look into XRef streams.
+
+        if @revisions.last.has_xrefstm?
+          xrefstm = @revisions.last.xrefstm
+
+          done = []
+          while xrefstm.is_a?(XRefStream) and not done.include?(xrefstm)
+            xref = xrefstm.find(target.refno)
+            
+            #
+            # We found a matching XRef.
+            #
+            if xref.is_a?(XRefToCompressedObj)
+              objstm = get_object(xref.objstmno, 0, false)
+
+              object = objstm.extract_by_index(xref.index)
+              if object.is_a?(Origami::Object) and object.no == target.refno
+                return object
+              else
+                return objstm.extract(target.refno)
+              end
+            elsif xrefstm.has_field?(:Prev)
+              done << xrefstm
+              xrefstm = get_object_by_offset(xrefstm.Prev)
+            else
+              break
+            end
+          end
+        end
+
+        #
+        # Lastly search directly into Object streams (might be very slow).
+        #
+        stream = set.values.find_all{|obj| obj.is_a?(ObjectStream)}.find do |objstm| objstm.include?(target.refno) end
+        stream && stream.extract(target.refno)
+      end
+      
+    end
+
+    alias :[] :get_object
+  
     #
     # Returns a new number/generation for future object.
     #
@@ -561,6 +678,37 @@ module Origami
       [ no, 0 ]
     end
     
+    ##########################
+    private
+    ##########################
+    
+    #
+    # Compute and update XRef::Section for each Revision.
+    #
+    def rebuildxrefs
+      
+      size = 0
+      startxref = @header.to_s.size
+      
+      @revisions.each do |revision|
+      
+        revision.objects.each do |object|
+          startxref += object.to_s.size
+        end
+        
+        size += revision.body.size
+        revision.xreftable = buildxrefs(revision.objects)
+        
+        revision.trailer ||= Trailer.new
+        revision.trailer.Size = size + 1
+        revision.trailer.startxref = startxref
+        
+        startxref += revision.xreftable.to_s.size + revision.trailer.to_s.size
+      end
+      
+      self
+    end
+    
     #
     # This method is meant to recompute, verify and correct main PDF structures, in order to output a proper file.
     # * Allocates objects references.
@@ -596,90 +744,192 @@ module Origami
     end
     
     #
-    # Returns the final binary representation of the current document.
-    # _rebuildxrefs_:: Computes xrefs while writing objects (default true).
-    # _obfuscate_:: Do some basic syntactic object obfuscation.
+    # Cleans the document from its references.
+    # Indirects objects are made direct whenever possible.
+    # TODO: Circuit-checking to avoid infinite induction
     #
-    def to_bin(params = {})
-   
-      has_objstm = self.indirect_objects.any?{|obj| obj.is_a?(ObjectStream)}
-
-      options =
-      {
-        :rebuildxrefs => true,
-        :noindent => false,
-        :obfuscate => false,
-        :use_xrefstm => has_objstm,
-        :use_xreftable => (not has_objstm),
-        :up_to_revision => @revisions.size
-      }
-      options.update(params)
-
-      options[:up_to_revision] = @revisions.size if options[:up_to_revision] > @revisions.size
+    def logicalize #:nodoc:
 
-      # Reset to default params if no xrefs are chosen (hybrid files not supported yet)
-      if options[:use_xrefstm] == options[:use_xreftable]
-        options[:use_xrefstm] = has_objstm
-        options[:use_xreftable] = (not has_objstm)
-      end
+      fail "Not yet supported"
 
-      # Get trailer dictionary
-      trailer_info = get_trailer_info
-      if trailer_info.nil?
-        raise InvalidPDFError, "No trailer information found"
-      end
-      trailer_dict = trailer_info.dictionary
- 
-      prev_xref_offset = nil
-      xrefstm_offset = nil
-      xreftable_offset = nil
-    
-      # Header
-      bin = ""
-      bin << @header.to_s
+      processed = []
       
-      # For each revision
-      @revisions[0, options[:up_to_revision]].each do |rev|
-        
-        # Create xref table/stream.
-        if options[:rebuildxrefs] == true
-          lastno_table, lastno_stm = 0, 0
-          brange_table, brange_stm = 0, 0
-          
-          xrefs_stm = [ XRef.new(0, 0, XRef::FREE) ]
-          xrefs_table = [ XRef.new(0, XRef::FIRSTFREE, XRef::FREE) ]
+      def convert(root) #:nodoc:
 
-          if options[:use_xreftable] == true
-            xrefsection = XRef::Section.new
-          end
+        replaced = []
+        if root.is_a?(Dictionary) or root.is_a?(Array)
+          
+          root.each { |obj|
+            convert(obj)
+          }
 
-          if options[:use_xrefstm] == true
-            xrefstm = rev.xrefstm || XRefStream.new
-            if xrefstm == rev.xrefstm
-              xrefstm.clear
+          root.map! { |obj|
+            if obj.is_a?(Reference)
+              target = obj.solve
+              # Streams can't be direct objects
+              if target.is_a?(Stream)
+                obj
+              else
+                replaced << obj
+                target
+              end
             else
-              add_to_revision(xrefstm, rev) 
+              obj
             end
-          end
+          }
+          
         end
-       
-        objset = rev.objects
-        
-        objset.find_all{|obj| obj.is_a?(ObjectStream)}.each do |objstm|
-          objset |= objstm.objects
-        end if options[:rebuildxrefs] == true and options[:use_xrefstm] == true
 
-        # For each object, in number order
-        objset.sort.each do |obj|
-         
-          # Create xref entry.
-          if options[:rebuildxrefs] == true
-           
-            # Adding subsections if needed
-            if options[:use_xreftable] and (obj.no - lastno_table).abs > 1
-              xrefsection << XRef::Subsection.new(brange_table, xrefs_table)
+        replaced
+      end
 
-              xrefs_table.clear
+      @revisions.each do |revision|
+        revision.objects.each do |obj|
+          processed.concat(convert(obj))
+        end
+      end
+
+    end
+    
+    #
+    # Converts a logical PDF view into a physical view ready for writing.
+    #
+    def physicalize
+     
+      #
+      # Indirect objects are added to the revision and assigned numbers.
+      #
+      def build(obj, revision) #:nodoc:
+
+        #
+        # Finalize any subobjects before building the stream.
+        #
+        if obj.is_a?(ObjectStream)
+          obj.each do |subobj|
+            build(subobj, revision)
+          end
+        end
+  
+        obj.pre_build
+
+        if obj.is_a?(Dictionary) or obj.is_a?(Array)
+            
+            obj.map! do |subobj|
+              if subobj.is_indirect?
+                if get_object(subobj.reference)
+                  subobj.reference
+                else
+                  ref = add_to_revision(subobj, revision)
+                  build(subobj, revision)
+                  ref
+                end
+              else
+                subobj
+              end
+            end
+            
+            obj.each do |subobj|
+              build(subobj, revision)
+            end
+            
+        elsif obj.is_a?(Stream)
+          build(obj.dictionary, revision)
+        end
+
+        obj.post_build
+        
+      end
+      
+      indirect_objects_by_rev.each do |obj, revision|
+          build(obj, revision)          
+      end
+      
+      self
+    end
+
+    #
+    # Returns the final binary representation of the current document.
+    #
+    def output(params = {})
+   
+      has_objstm = self.indirect_objects.any?{|obj| obj.is_a?(ObjectStream)}
+
+      options =
+      {
+        :rebuildxrefs => true,
+        :noindent => false,
+        :obfuscate => false,
+        :use_xrefstm => has_objstm,
+        :use_xreftable => (not has_objstm),
+        :up_to_revision => @revisions.size
+      }
+      options.update(params)
+
+      options[:up_to_revision] = @revisions.size if options[:up_to_revision] > @revisions.size
+
+      # Reset to default params if no xrefs are chosen (hybrid files not supported yet)
+      if options[:use_xrefstm] == options[:use_xreftable]
+        options[:use_xrefstm] = has_objstm
+        options[:use_xreftable] = (not has_objstm)
+      end
+
+      # Get trailer dictionary
+      trailer_info = get_trailer_info
+      if trailer_info.nil?
+        raise InvalidPDFError, "No trailer information found"
+      end
+      trailer_dict = trailer_info.dictionary
+ 
+      prev_xref_offset = nil
+      xrefstm_offset = nil
+      xreftable_offset = nil
+    
+      # Header
+      bin = ""
+      bin << @header.to_s
+      
+      # For each revision
+      @revisions[0, options[:up_to_revision]].each do |rev|
+        
+        # Create xref table/stream.
+        if options[:rebuildxrefs] == true
+          lastno_table, lastno_stm = 0, 0
+          brange_table, brange_stm = 0, 0
+          
+          xrefs_stm = [ XRef.new(0, 0, XRef::FREE) ]
+          xrefs_table = [ XRef.new(0, XRef::FIRSTFREE, XRef::FREE) ]
+
+          if options[:use_xreftable] == true
+            xrefsection = XRef::Section.new
+          end
+
+          if options[:use_xrefstm] == true
+            xrefstm = rev.xrefstm || XRefStream.new
+            if xrefstm == rev.xrefstm
+              xrefstm.clear
+            else
+              add_to_revision(xrefstm, rev) 
+            end
+          end
+        end
+       
+        objset = rev.objects
+        
+        objset.find_all{|obj| obj.is_a?(ObjectStream)}.each do |objstm|
+          objset.concat objstm.objects
+        end if options[:rebuildxrefs] == true and options[:use_xrefstm] == true
+
+        # For each object, in number order
+        objset.sort.each do |obj|
+         
+          # Create xref entry.
+          if options[:rebuildxrefs] == true
+           
+            # Adding subsections if needed
+            if options[:use_xreftable] and (obj.no - lastno_table).abs > 1
+              xrefsection << XRef::Subsection.new(brange_table, xrefs_table)
+
+              xrefs_table.clear
               brange_table = obj.no
             end
             if options[:use_xrefstm] and (obj.no - lastno_stm).abs > 1
@@ -774,265 +1024,6 @@ module Origami
       bin
     end
     
-    #
-    # Compute and update XRef::Section for each Revision.
-    #
-    def rebuildxrefs
-      
-      size = 0
-      startxref = @header.to_s.size
-      
-      @revisions.each do |revision|
-      
-        revision.objects.each do |object|
-          startxref += object.to_s.size
-        end
-        
-        size += revision.body.size
-        revision.xreftable = buildxrefs(revision.objects)
-        
-        revision.trailer ||= Trailer.new
-        revision.trailer.Size = size + 1
-        revision.trailer.startxref = startxref
-        
-        startxref += revision.xreftable.to_s.size + revision.trailer.to_s.size
-      end
-      
-      self
-    end
-    
-    #
-    # Ends the current Revision, and starts a new one.
-    #
-    def add_new_revision
-      
-      root = @revisions.last.trailer[:Root] unless @revisions.empty?
-
-      @revisions << Revision.new(self)
-      @revisions.last.trailer = Trailer.new
-      @revisions.last.trailer.Root = root
-
-      self
-    end
-
-    #
-    # Removes a whole document revision.
-    # _index_:: Revision index, first is 0.
-    #
-    def remove_revision(index)
-      if index < 0 or index > @revisions.size
-        raise IndexError, "Not a valid revision index"
-      end
-
-      if @revisions.size == 1
-        raise InvalidPDFError, "Cannot remove last revision"
-      end
-
-      @revisions.delete_at(index)
-      self
-    end
-    
-    #
-    # Looking for an object present at a specified file offset.
-    #
-    def get_object_by_offset(offset) #:nodoc:
-      self.indirect_objects.find { |obj| obj.file_offset == offset }
-    end   
-
-    #
-    # Remove an object.
-    #
-    def delete_object(no, generation = 0)
-      
-      case no
-        when Reference
-          target = no
-        when ::Integer
-          target = Reference.new(no, generation)
-      else
-        raise TypeError, "Invalid parameter type : #{no.class}" 
-      end
-      
-      @revisions.each do |rev|
-        rev.body.delete(target)
-      end
-
-    end
-
-    #
-    # Search for an indirect object in the document.
-    # _no_:: Reference or number of the object.
-    # _generation_:: Object generation.
-    #
-    def get_object(no, generation = 0, use_xrefstm = true) #:nodoc:
-      case no
-        when Reference
-          target = no
-        when ::Integer
-           target = Reference.new(no, generation)
-        when Origami::Object
-          return no
-      else
-        raise TypeError, "Invalid parameter type : #{no.class}" 
-      end
-      
-      set = indirect_objects_table
-     
-      #
-      # Search through accessible indirect objects.
-      #
-      if set.include?(target)
-        set[target]
-      elsif use_xrefstm == true
-        # Look into XRef streams.
-
-        if @revisions.last.has_xrefstm?
-          xrefstm = @revisions.last.xrefstm
-
-          done = []
-          while xrefstm.is_a?(XRefStream) and not done.include?(xrefstm)
-            xref = xrefstm.find(target.refno)
-            
-            #
-            # We found a matching XRef.
-            #
-            if xref.is_a?(XRefToCompressedObj)
-              objstm = get_object(xref.objstmno, 0, false)
-
-              object = objstm.extract_by_index(xref.index)
-              if object.is_a?(Origami::Object) and object.no == target.refno
-                return object
-              else
-                return objstm.extract(target.refno)
-              end
-            elsif xrefstm.has_field?(:Prev)
-              done << xrefstm
-              xrefstm = get_object_by_offset(xrefstm.Prev)
-            else
-              break
-            end
-          end
-        end
-
-        #
-        # Lastly search directly into Object streams (might be very slow).
-        #
-        stream = set.values.find_all{|obj| obj.is_a?(ObjectStream)}.find do |objstm| objstm.include?(target.refno) end
-        stream && stream.extract(target.refno)
-      end
-      
-    end
-
-    alias :[] :get_object
-  
-    #
-    # Converts a logical PDF view into a physical view ready for writing.
-    #
-    def physicalize
-     
-      #
-      # Indirect objects are added to the revision and assigned numbers.
-      #
-      def build(obj, revision) #:nodoc:
-
-        #
-        # Finalize any subobjects before building the stream.
-        #
-        if obj.is_a?(ObjectStream)
-          obj.each do |subobj|
-            build(subobj, revision)
-          end
-        end
-  
-        obj.pre_build
-
-        if obj.is_a?(Dictionary) or obj.is_a?(Array)
-            
-            obj.map! do |subobj|
-              if subobj.is_indirect?
-                if get_object(subobj.reference)
-                  subobj.reference
-                else
-                  ref = add_to_revision(subobj, revision)
-                  build(subobj, revision)
-                  ref
-                end
-              else
-                subobj
-              end
-            end
-            
-            obj.each do |subobj|
-              build(subobj, revision)
-            end
-            
-        elsif obj.is_a?(Stream)
-          build(obj.dictionary, revision)
-        end
-
-        obj.post_build
-        
-      end
-      
-      indirect_objects_by_rev.each do |obj, revision|
-          build(obj, revision)          
-      end
-      
-      self
-    end
-
-    #
-    # Cleans the document from its references.
-    # Indirects objects are made direct whenever possible.
-    # TODO: Circuit-checking to avoid infinite induction
-    #
-    def logicalize #:nodoc:
-
-      fail "Not yet supported"
-
-      processed = []
-      
-      def convert(root) #:nodoc:
-
-        replaced = []
-        if root.is_a?(Dictionary) or root.is_a?(Array)
-          
-          root.each { |obj|
-            convert(obj)
-          }
-
-          root.map! { |obj|
-            if obj.is_a?(Reference)
-              target = obj.solve
-              # Streams can't be direct objects
-              if target.is_a?(Stream)
-                obj
-              else
-                replaced << obj
-                target
-              end
-            else
-              obj
-            end
-          }
-          
-        end
-
-        replaced
-      end
-
-      @revisions.each do |revision|
-        revision.objects.each do |obj|
-          processed.concat(convert(obj))
-        end
-      end
-
-    end
-    
-    ##########################
-    private
-    ##########################
-    
     #
     # Instanciates basic structures required for a valid PDF file.
     #
@@ -1044,6 +1035,10 @@ module Origami
       self
     end
     
+    def filesize #:nodoc:
+      output(:rebuildxrefs => false).size
+    end
+    
     def version_required #:nodoc:
       
       max = [ 1.0, 0 ]

data/lib/origami/signature.rb

@@ -196,7 +196,7 @@ module Origami
       #
       #  Flattening the PDF to get file view.
       #
-      self.compile
+      compile
       
       #
       # Creating an empty Xref table to compute signature byte range.
@@ -218,7 +218,7 @@ module Origami
       #
       rebuildxrefs
       
-      filedata = self.to_bin
+      filedata = output()
       signable_data = filedata[digsig.ByteRange[0],digsig.ByteRange[1]] + filedata[digsig.ByteRange[2],digsig.ByteRange[3]]
       
       signature = 
@@ -321,7 +321,7 @@ module Origami
       #
       #  Flattening the PDF to get file view.
       #
-      self.compile
+      compile
       
       #
       # Creating an empty Xref table to compute signature byte range.
@@ -343,7 +343,7 @@ module Origami
       #
       rebuildxrefs
       
-      filedata = self.to_bin
+      filedata = output()
       signable_data = filedata[digsig.ByteRange[0],digsig.ByteRange[1]] + filedata[digsig.ByteRange[2],digsig.ByteRange[3]]
       
       signature = OpenSSL::PKCS7.sign(certificate, key, signable_data, [], OpenSSL::PKCS7::DETACHED | OpenSSL::PKCS7::BINARY).to_der

data/lib/origami/xreftable.rb

@@ -336,6 +336,15 @@ module Origami
       @xrefs = nil
     end
 
+    def entries
+      load! if @xrefs.nil?
+
+      @xrefs
+    end
+
+    #
+    # Returns XRef entries present in this stream.
+    #
     def pre_build #:nodoc:
       load! if @xrefs.nil?
 
@@ -386,7 +395,7 @@ module Origami
     end
 
     def clear
-      @rawdata, @data = nil, ''
+      self.data = ''
       @xrefs = []
       self.Index = []
     end
@@ -410,11 +419,11 @@ module Origami
         entrymask = "B#{type_w << 3}B#{field1_w << 3}B#{field2_w << 3}"
         size = @data.size / (type_w + field1_w + field2_w)
 
-        entries = @data.unpack(entrymask * size).map!{|field| field.to_i(2) }
+        xentries = @data.unpack(entrymask * size).map!{|field| field.to_i(2) }
 
         @xrefs = []
         size.times do |i|
-          type,field1,field2 = entries[i*3],entries[i*3+1],entries[i*3+2]
+          type,field1,field2 = xentries[i*3].ord,xentries[i*3+1].ord,xentries[i*3+2].ord
           case type
             when XREF_FREE
               @xrefs << XRef.new(field1, field2, XRef::FREE)
@@ -430,7 +439,7 @@ module Origami
     end
 
     def save! #:nodoc:
-      @data = ""
+      self.data = ""
 
       type_w, field1_w, field2_w = self.W
       @xrefs.each do |xref| @data << xref.to_xrefstm_data(type_w, field1_w, field2_w) end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: origami
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 1
   - 2
-  - 2
-  version: 1.2.2
+  - 3
+  version: 1.2.3
 platform: ruby
 authors: 
 - "Guillaume Delugr\xC3\xA9"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-18 00:00:00 +02:00
+date: 2011-10-20 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -51,20 +51,18 @@ files:
 - lib/origami/boolean.rb
 - lib/origami/catalog.rb
 - lib/origami/destinations.rb
-- lib/origami/dictionary.rb
 - lib/origami/export.rb
-- lib/origami/file.rb
 - lib/origami/filters.rb
 - lib/origami/filters/ascii.rb
 - lib/origami/filters/crypt.rb
 - lib/origami/filters/dct.rb
 - lib/origami/filters/flate.rb
-- lib/origami/filters/jbig2.rb
-- lib/origami/filters/jpx.rb
 - lib/origami/filters/lzw.rb
 - lib/origami/filters/predictors.rb
 - lib/origami/filters/runlength.rb
 - lib/origami/filters/ccitt.rb
+- lib/origami/filters/jpx.rb
+- lib/origami/filters/jbig2.rb
 - lib/origami/font.rb
 - lib/origami/functions.rb
 - lib/origami/graphics.rb
@@ -77,16 +75,13 @@ files:
 - lib/origami/graphics/colors.rb
 - lib/origami/graphics/xobject.rb
 - lib/origami/header.rb
-- lib/origami/javascript.rb
 - lib/origami/linearization.rb
 - lib/origami/metadata.rb
-- lib/origami/name.rb
 - lib/origami/null.rb
 - lib/origami/numeric.rb
 - lib/origami/obfuscation.rb
 - lib/origami/outline.rb
 - lib/origami/outputintents.rb
-- lib/origami/page.rb
 - lib/origami/parsers/pdf/linear.rb
 - lib/origami/parsers/pdf.rb
 - lib/origami/parsers/fdf.rb
@@ -101,12 +96,17 @@ files:
 - lib/origami/object.rb
 - lib/origami/extensions/fdf.rb
 - lib/origami/extensions/ppklite.rb
-- lib/origami/xreftable.rb
 - lib/origami/parser.rb
-- lib/origami/encryption.rb
+- lib/origami/javascript.rb
 - lib/origami/signature.rb
-- lib/origami/pdf.rb
+- lib/origami/xreftable.rb
+- lib/origami/page.rb
 - lib/origami/acroform.rb
+- lib/origami/name.rb
+- lib/origami/encryption.rb
+- lib/origami/dictionary.rb
+- lib/origami/pdf.rb
+- lib/origami/file.rb
 - lib/origami.rb
 - bin/config/pdfcop.conf.yml
 - bin/gui/about.rb