origami 1.2.7 → 2.0.0

data/lib/origami/null.rb

@@ -1,75 +1,66 @@
 =begin
 
-= File
-	null.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
-  (at your option) any later version.
-
-  Origami 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.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with Origami.  If not, see <http://www.gnu.org/licenses/>.
+    This file is part of Origami, PDF manipulation framework for Ruby
+    Copyright (C) 2016	Guillaume Delugré.
+
+    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
+    (at your option) any later version.
+
+    Origami 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.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with Origami.  If not, see <http://www.gnu.org/licenses/>.
 
 =end
 
 module Origami
 
-  class InvalidNullObjectError < InvalidObjectError #:nodoc:
-  end
-  
-  #
-  # Class representing  Null Object.
-  #
-  class Null
-    
-    include Origami::Object
-    
-    TOKENS = %w{ null } #:nodoc:
-    
-    @@regexp = Regexp.new(WHITESPACES + TOKENS.first)
-    
-    def initialize
-      super
-    end
-    
-    def self.parse(stream, parser = nil) #:nodoc:
-
-      offset = stream.pos
-      
-      if stream.skip(@@regexp).nil?
-        raise InvalidNullObjectError
-      end
-      
-      null = Null.new
-      null.file_offset = offset
-
-      null
+    class InvalidNullObjectError < InvalidObjectError #:nodoc:
     end
-    
+
     #
-    # Returns *nil*.
+    # Class representing  Null Object.
     #
-    def value
-      nil
-    end
-    
-    def to_s #:nodoc:
-      super(TOKENS.first)
+    class Null
+        include Origami::Object
+
+        TOKENS = %w{ null } #:nodoc:
+        @@regexp = Regexp.new(WHITESPACES + TOKENS.first)
+
+        def initialize
+            super
+        end
+
+        def self.parse(stream, parser = nil) #:nodoc:
+            offset = stream.pos
+
+            if stream.skip(@@regexp).nil?
+                raise InvalidNullObjectError
+            end
+
+            null = Null.new
+            null.file_offset = offset
+
+            null
+        end
+
+        #
+        # Returns *nil*.
+        #
+        def value
+            nil
+        end
+
+        def to_s #:nodoc:
+            super(TOKENS.first)
+        end
+
+        def self.native_type ; Null end
     end
 
-    def self.native_type ; Null end
-    
-  end
-  
 end

data/lib/origami/numeric.rb

@@ -1,25 +1,20 @@
 =begin
 
-= File
-	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
-  (at your option) any later version.
-
-  Origami 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.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with Origami.  If not, see <http://www.gnu.org/licenses/>.
+    This file is part of Origami, PDF manipulation framework for Ruby
+    Copyright (C) 2016	Guillaume Delugré.
+
+    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
+    (at your option) any later version.
+
+    Origami 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.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with Origami.  If not, see <http://www.gnu.org/licenses/>.
 
 =end
 
@@ -27,176 +22,168 @@ require 'delegate'
 
 module Origami
 
-  class InvalidIntegerObjectError < InvalidObjectError #:nodoc:
-  end
-
-  #
-  # Class representing a PDF number (Integer, or Real).
-  #
-  module Number
-    include Origami::Object
-    
-    def ~
-      self.class.new(~self.to_i)
-    end
-    
-    def |(val)
-      self.class.new(self.to_i | val)
-    end
-    
-    def &(val)
-      self.class.new(self.to_i & val)
-    end
-    
-    def ^(val)
-      self.class.new(self.to_i ^ val)
-    end
-    
-    def <<(val)
-      self.class.new(self.to_i << val)
-    end
-    
-    def >>(val)
-      self.class.new(self.to_i >> val)
-    end
-    
-    def +(val)
-      self.class.new(self.to_i + val)
-    end
-    
-    def -(val)
-      self.class.new(self.to_i - val)
-    end
-    
-    def -@
-      self.class.new(-self.to_i)
-    end
-    
-    def *(val)
-      self.class.new(self.to_i * val)
-    end
-    
-    def /(val)
-      self.class.new(self.to_i / val)
-    end
-    
-    def abs
-      self.class.new(self.to_i.abs)
-    end
-    
-    def **(val)
-      self.class.new(self.to_i ** val)
-    end
-    
-    def to_s
-      super(value.to_s)
-    end
-    
-    module ClassMethods #:nodoc:all
-      def native_type; Number end
-    end
-
-    def self.included(receiver) #:nodoc:
-      receiver.extend(ClassMethods)
+    class InvalidIntegerObjectError < InvalidObjectError #:nodoc:
     end
-    
-    def self.native_type; Number end #:nodoc:
-  end
-  
-  #
-  # Class representing an Integer Object.
-  #
-  class Integer < DelegateClass(Bignum)
-    
-    include Number
-    
-    TOKENS = [ "(\\+|-)?[\\d]+[^.]?" ] #:nodoc:
-
-    REGEXP_TOKEN = Regexp.new(TOKENS.first)
-
-    @@regexp = Regexp.new(WHITESPACES + "((\\+|-)?[\\d]+)")
 
     #
-    # Creates a new Integer from  a Ruby Fixnum / Bignum.
-    # _i_:: The Integer value.
+    # Class representing a PDF number (Integer, or Real).
     #
-    def initialize(i = 0)
-      
-      unless i.is_a?(::Integer)
-        raise TypeError, "Expected type Fixnum or Bignum, received #{i.class}."
-      end
+    module Number
+        include Origami::Object
 
-      super(i)
-    end
-      
-    def self.parse(stream, parser = nil) #:nodoc:
+        def ~
+            self.class.new(~self.to_i)
+        end
+
+        def |(val)
+            self.class.new(self.to_i | val)
+        end
+
+        def &(val)
+            self.class.new(self.to_i & val)
+        end
+
+        def ^(val)
+            self.class.new(self.to_i ^ val)
+        end
+
+        def <<(val)
+            self.class.new(self.to_i << val)
+        end
+
+        def >>(val)
+            self.class.new(self.to_i >> val)
+        end
+
+        def +(val)
+            self.class.new(self.to_i + val)
+        end
+
+        def -(val)
+            self.class.new(self.to_i - val)
+        end
+
+        def -@
+            self.class.new(-self.to_i)
+        end
 
-      offset = stream.pos
+        def *(val)
+            self.class.new(self.to_i * val)
+        end
 
-      if not stream.scan(@@regexp)
-        raise InvalidIntegerObjectError, "Invalid integer format"
-      end
+        def /(val)
+            self.class.new(self.to_i / val)
+        end
 
-      value = stream[2].to_i
-      int = Integer.new(value)
-      int.file_offset = offset
+        def abs
+            self.class.new(self.to_i.abs)
+        end
 
-      int
+        def **(val)
+            self.class.new(self.to_i ** val)
+        end
+
+        def to_s
+            super(value.to_s)
+        end
+
+        module ClassMethods #:nodoc:all
+            def native_type; Number end
+        end
+
+        def self.included(receiver) #:nodoc:
+            receiver.extend(ClassMethods)
+        end
+
+        def self.native_type; Number end #:nodoc:
     end
-    
-    alias value to_i
-  end
-  
-  class InvalidRealObjectError < InvalidObjectError #:nodoc:
-  end
-
-  #
-  # Class representing a Real number Object.
-  # PDF real numbers are arbitrary precision numbers, depending on architectures.
-  #
-  class Real < DelegateClass(Float)
-    
-    include Number
-    
-    TOKENS = [ "(\\+|-)?([\\d]*\\.[\\d]+|[\\d]+\\.[\\d]*)([eE](\\+|-)?[\\d]+)?" ] #:nodoc:
-
-    REGEXP_TOKEN = Regexp.new(TOKENS.first)
-    
-    @@regexp = Regexp.new(WHITESPACES + "(" + TOKENS.first + ")")
-    
+
     #
-    # Creates a new Real from a Ruby Float.
-    # _f_:: The new Real value.
+    # Class representing an Integer Object.
     #
-    def initialize(f = 0)
-      
-      unless f.is_a?(Float)
-        raise TypeError, "Expected type Float, received #{f.class}."
-      end
-      
-      super(f)
+    class Integer < DelegateClass(Bignum)
+        include Number
+
+        TOKENS = [ "(\\+|-)?[\\d]+[^.]?" ] #:nodoc:
+        REGEXP_TOKEN = Regexp.new(TOKENS.first)
+
+        @@regexp = Regexp.new(WHITESPACES + "(?<int>(\\+|-)?[\\d]+)")
+
+        #
+        # Creates a new Integer from  a Ruby Fixnum / Bignum.
+        # _i_:: The Integer value.
+        #
+        def initialize(i = 0)
+            unless i.is_a?(::Integer)
+                raise TypeError, "Expected type Fixnum or Bignum, received #{i.class}."
+            end
+
+            super(i)
+        end
+
+        def self.parse(stream, parser = nil) #:nodoc:
+            offset = stream.pos
+
+            if not stream.scan(@@regexp)
+                raise InvalidIntegerObjectError, "Invalid integer format"
+            end
+
+            value = stream['int'].to_i
+            int = Integer.new(value)
+            int.file_offset = offset
+
+            int
+        end
+
+        alias value to_i
     end
-  
-    def self.parse(stream, parser = nil) #:nodoc:
-
-      offset = stream.pos
-      
-      if not stream.scan(@@regexp)
-        raise InvalidRealObjectError, "Invalid real number format"
-      end
-       
-      value = stream[2].to_f
-      real = Real.new(value)
-      real.file_offset = offset
-
-      real
+
+    class InvalidRealObjectError < InvalidObjectError #:nodoc:
     end
-    
-    alias value to_f
 
-    def to_s
-      sprintf("%f", self).sub(/\.0*$|(\.\d*[^0])0*$/, '\1')
+    #
+    # Class representing a Real number Object.
+    # PDF real numbers are arbitrary precision numbers, depending on architectures.
+    #
+    class Real < DelegateClass(Float)
+        include Number
+
+        TOKENS = [ "(\\+|-)?([\\d]*\\.[\\d]+|[\\d]+\\.[\\d]*)([eE](\\+|-)?[\\d]+)?" ] #:nodoc:
+        REGEXP_TOKEN = Regexp.new(TOKENS.first)
+
+        @@regexp = Regexp.new(WHITESPACES + "(?<real>#{TOKENS.first})")
+
+        #
+        # Creates a new Real from a Ruby Float.
+        # _f_:: The new Real value.
+        #
+        def initialize(f = 0)
+            unless f.is_a?(Float)
+                raise TypeError, "Expected type Float, received #{f.class}."
+            end
+
+            super(f)
+        end
+
+        def self.parse(stream, parser = nil) #:nodoc:
+            offset = stream.pos
+
+            if not stream.scan(@@regexp)
+                raise InvalidRealObjectError, "Invalid real number format"
+            end
+
+            value = stream['real'].to_f
+            real = Real.new(value)
+            real.file_offset = offset
+
+            real
+        end
+
+        alias value to_f
+
+        def to_s
+            sprintf("%f", self).sub(/\.0*$|(\.\d*[^0])0*$/, '\1')
+        end
     end
-  end
 
 end