lib/origami/boolean.rb in origami-1.2.7 vs lib/origami/boolean.rb in origami-2.0.0

@@ -1,101 +1,91 @@
 =begin
 
-= File
-	boolean.rb
+    This file is part of Origami, PDF manipulation framework for Ruby
+    Copyright (C) 2016	Guillaume Delugré.
 
-= 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 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.
+    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/>.
+    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 InvalidBooleanObjectError < InvalidObjectError #:nodoc:
-  end
+    class InvalidBooleanObjectError < InvalidObjectError #:nodoc:
+    end
 
-  #
-  # Class representing a Boolean Object.
-  # A Boolean Object can be *true* or *false*.
-  #
-  class Boolean
-  
-    include Origami::Object
-    
-    TOKENS = [ %w{ true false } ] #:nodoc:
-  
-    @@regexp = Regexp.new(WHITESPACES + "(#{TOKENS.first.join('|')})")
-    
     #
-    # Creates a new Boolean value.
-    # _value_:: *true* or *false*.
+    # Class representing a Boolean Object.
+    # A Boolean Object can be *true* or *false*.
     #
-    def initialize(value)
-      
-      unless value.is_a?(TrueClass) or value.is_a?(FalseClass)
-        raise TypeError, "Expected type TrueClass or FalseClass, received #{value.class}."
-      end
-      
-      super()
-      
-      @value = (value == nil || value == false) ? false : true
-    end
-    
-    def to_s #:nodoc:
-      super(@value.to_s)
-    end
-    
-    def self.parse(stream, parser = nil) #:nodoc:
+    class Boolean
+        include Origami::Object
 
-      offset = stream.pos
-    
-      if stream.scan(@@regexp).nil?
-        raise InvalidBooleanObjectError
-      end
+        TOKENS = %w{ true false } #:nodoc:
+        @@regexp = Regexp.new(WHITESPACES + "(?<value>#{Regexp.union(TOKENS)})")
 
-      value = stream[2] == "true" ? true : false
-        
-      bool = Boolean.new(value)
-      bool.file_offset = offset
+        #
+        # Creates a new Boolean value.
+        # _value_:: *true* or *false*.
+        #
+        def initialize(value)
+            unless value.is_a?(TrueClass) or value.is_a?(FalseClass)
+                raise TypeError, "Expected type TrueClass or FalseClass, received #{value.class}."
+            end
 
-      bool
-    end
-    
-    #
-    # Converts self into a Ruby boolean, that is TrueClass or FalseClass instance.
-    #
-    def value
-      @value
-    end
+            super()
 
-    def self.native_type ; Boolean end
-    
-    def false?
-      @value == false
-    end
-    
-    def true?
-      @value == true
-    end
+            @value = (value == true)
+        end
 
-    def ==(bool)
-      @value == bool
-    end
+        def to_s #:nodoc:
+            super(@value.to_s)
+        end
 
-  end
+        def self.parse(stream, parser = nil) #:nodoc:
+            offset = stream.pos
+
+            if stream.scan(@@regexp).nil?
+                raise InvalidBooleanObjectError
+            end
+
+            value = (stream['value'] == "true")
+
+            bool = Boolean.new(value)
+            bool.file_offset = offset
+
+            bool
+        end
+
+        #
+        # Converts self into a Ruby boolean, that is TrueClass or FalseClass instance.
+        #
+        def value
+            @value
+        end
+
+        def self.native_type ; Boolean end
+
+        def false?
+            @value == false
+        end
+
+        def true?
+            @value == true
+        end
+
+        def ==(bool)
+            @value == bool
+        end
+    end
 
 end