origami 2.0.0 → 2.0.1

data/lib/origami/graphics/path.rb

@@ -99,12 +99,12 @@ module Origami
     end
 
     class PDF::Instruction
-        insn  'm', Real, Real do |canvas, x,y|
+        insn 'm', Real, Real do |canvas, x,y|
             canvas.gs.current_path << (subpath = Graphics::Path.new)
             subpath.current_point = [x,y]
         end
 
-        insn  'l', Real, Real do |canvas, x,y|
+        insn 'l', Real, Real do |canvas, x,y|
             if canvas.gs.current_path.empty?
                 raise InvalidPathError, "No current point is defined"
             end
@@ -116,14 +116,14 @@ module Origami
             subpath.add_segment(Graphics::Path::Line.new(from, to))
         end
 
-        insn  'h' do |canvas|
+        insn 'h' do |canvas|
             unless canvas.gs.current_path.empty?
                 subpath = canvas.gs.current_path.last
                 subpath.close! unless subpath.is_closed?
             end
         end
 
-        insn  're', Real, Real, Real, Real do |canvas, x,y,width,height|
+        insn 're', Real, Real, Real, Real do |canvas, x,y,width,height|
             tx = x + width
             ty = y + height
             canvas.gs.current_path << (subpath = Graphics::Path.new)
@@ -133,50 +133,50 @@ module Origami
             subpath.close!
         end
 
-        insn  'S' do |canvas|
+        insn 'S' do |canvas|
             canvas.stroke_path
         end
 
-        insn  's' do |canvas|
+        insn 's' do |canvas|
             canvas.gs.current_path.last.close!
             canvas.stroke_path
         end
 
-        insn  'f' do |canvas|
+        insn 'f' do |canvas|
             canvas.fill_path
         end
 
-        insn  'F' do |canvas|
+        insn 'F' do |canvas|
             canvas.fill_path
         end
 
-        insn  'f*' do |canvas|
+        insn 'f*' do |canvas|
             canvas.fill_path
         end
 
-        insn  'B' do |canvas|
+        insn 'B' do |canvas|
             canvas.fill_path
             canvas.stroke_path
         end
 
-        insn  'B*' do |canvas|
+        insn 'B*' do |canvas|
             canvas.fill_path
             canvas.stroke_path
         end
 
-        insn  'b' do |canvas|
+        insn 'b' do |canvas|
             canvas.gs.current_path.last.close!
             canvas.fill_path
             canvas.stroke_path
         end
 
-        insn  'b*' do |canvas|
+        insn 'b*' do |canvas|
             canvas.gs.current_path.last.close!
             canvas.fill_path
             canvas.stroke_path
         end
 
-        insn  'n'
+        insn 'n'
     end
 
 end

data/lib/origami/graphics/patterns.rb

@@ -51,11 +51,11 @@ module Origami
                 field   :PatternType,           :Type => Integer, :Default => Pattern::Type::TILING, :Required => true
                 field   :PaintType,             :Type => Integer, :Required => true
                 field   :TilingType,            :Type => Integer, :Required => true
-                field   :BBox,                  :Type => Array, :Required => true
+                field   :BBox,                  :Type => Rectangle, :Required => true
                 field   :XStep,                 :Type => Number, :Required => true
                 field   :YStep,                 :Type => Number, :Required => true
                 field   :Resources,             :Type => Resources, :Required => true
-                field   :Matrix,                :Type => Array, :Default => [ 1, 0, 0, 1, 0, 0 ]
+                field   :Matrix,                :Type => Array.of(Number, length: 6), :Default => [ 1, 0, 0, 1, 0, 0 ]
             end
 
             class Shading < Dictionary
@@ -63,37 +63,48 @@ module Origami
                 include Pattern
 
                 module Type
-                    FUNCTIONBASED               = 1
+                    FUNCTION_BASED              = 1
                     AXIAL                       = 2
                     RADIAL                      = 3
                     FREEFORM_TRIANGLE_MESH      = 4
                     LATTICEFORM_TRIANGLE_MESH   = 5
                     COONS_PATCH_MESH            = 6
-                    TENSORPRODUCT_PATCH_MESH     = 7
+                    TENSORPRODUCT_PATCH_MESH    = 7
                 end
 
                 field   :PatternType,           :Type => Integer, :Default => Pattern::Type::SHADING, :Required => true
                 field   :Shading,               :Type => [ Dictionary, Stream ], :Required => true
-                field   :Matrix,                :Type => Array, :Default => [ 1, 0, 0, 1, 0, 0 ]
-                field   :ExtGState,             :Type => Dictionary
+                field   :Matrix,                :Type => Array.of(Number, length: 6), :Default => [ 1, 0, 0, 1, 0, 0 ]
+                field   :ExtGState,             :Type => ExtGState
 
+                # Fields common to all shading objects.
                 module ShadingObject
                     def self.included(receiver)
                         receiver.field   :ShadingType,         :Type => Integer, :Required => true
                         receiver.field   :ColorSpace,          :Type => [ Name, Array ], :Required => true
                         receiver.field   :Background,          :Type => Array
-                        receiver.field   :BBox,                :Type => Array
+                        receiver.field   :BBox,                :Type => Rectangle
                         receiver.field   :AntiAlias,           :Type => Boolean, :Default => false
                     end
                 end
 
+                # Fields common to all Mesh shadings.
+                module Mesh
+                    def self.included(receiver)
+                        receiver.field   :BitsPerCoordinate,   :Type => Integer, :Required => true
+                        receiver.field   :BitsPerComponent,    :Type => Integer, :Required => true
+                        receiver.field   :Decode,              :Type => Array.of(Number), :Required => true
+                        receiver.field   :Function,            :Type => [ Dictionary, Stream ]
+                    end
+                end
+
                 class FunctionBased < Dictionary
                     include StandardObject
                     include ShadingObject
 
-                    field   :ShadingType,         :Type => Integer, :Default => Shading::Type::FUNCTIONBASED, :Required => true
-                    field   :Domain,              :Type => Array, :Default => [ 0.0, 1.0, 0.0, 1.0 ]
-                    field   :Matrix,              :Type => Array, :Default => [ 1, 0, 0, 1, 0, 0 ]
+                    field   :ShadingType,         :Type => Integer, :Default => Shading::Type::FUNCTION_BASED, :Required => true
+                    field   :Domain,              :Type => Array.of(Number, length: 4), :Default => [ 0.0, 1.0, 0.0, 1.0 ]
+                    field   :Matrix,              :Type => Array.of(Number, length: 6), :Default => [ 1, 0, 0, 1, 0, 0 ]
                     field   :Function,            :Type => [ Dictionary, Stream ], :Required => true
                 end
 
@@ -102,10 +113,10 @@ module Origami
                     include ShadingObject
 
                     field   :ShadingType,         :Type => Integer, :Default => Shading::Type::AXIAL, :Required => true
-                    field   :Coords,              :Type => Array, :Required => true
-                    field   :Domain,              :Type => Array, :Default => [ 0.0, 1.0 ]
+                    field   :Coords,              :Type => Array.of(Number, length: 4), :Required => true
+                    field   :Domain,              :Type => Array.of(Number, length: 2), :Default => [ 0.0, 1.0 ]
                     field   :Function,            :Type => [ Dictionary, Stream ], :Required => true
-                    field   :Extend,              :Type => Array, :Default => [ false, false ]
+                    field   :Extend,              :Type => Array.of(Boolean, length: 2), :Default => [ false, false ]
                 end
 
                 class Radial < Dictionary
@@ -113,54 +124,41 @@ module Origami
                     include ShadingObject
 
                     field   :ShadingType,         :Type => Integer, :Default => Shading::Type::RADIAL, :Required => true
-                    field   :Coords,              :Type => Array, :Required => true
-                    field   :Domain,              :Type => Array, :Default => [ 0.0, 1.0 ]
+                    field   :Coords,              :Type => Array.of(Number, length: 6), :Required => true
+                    field   :Domain,              :Type => Array.of(Number, length: 2), :Default => [ 0.0, 1.0 ]
                     field   :Function,            :Type => [ Dictionary, Stream ], :Required => true
-                    field   :Extend,              :Type => Array, :Default => [ false, false ]
+                    field   :Extend,              :Type => Array.of(Boolean, length: 2), :Default => [ false, false ]
                 end
 
                 class FreeFormTriangleMesh < Stream
                     include ShadingObject
+                    include Mesh
 
                     field   :ShadingType,         :Type => Integer, :Default => Shading::Type::FREEFORM_TRIANGLE_MESH, :Required => true
-                    field   :BitsPerCoordinate,   :Type => Integer, :Required => true
-                    field   :BitsPerComponent,    :Type => Integer, :Required => true
                     field   :BitsPerFlag,         :Type => Integer, :Required => true
-                    field   :Decode,              :Type => Array, :Required => true
-                    field   :Function,            :Type => [ Dictionary, Stream ]
                 end
 
                 class LatticeFormTriangleMesh < Stream
                     include ShadingObject
+                    include Mesh
 
                     field   :ShadingType,         :Type => Integer, :Default => Shading::Type::LATTICEFORM_TRIANGLE_MESH, :Required => true
-                    field   :BitsPerCoordinate,   :Type => Integer, :Required => true
-                    field   :BitsPerComponent,    :Type => Integer, :Required => true
                     field   :VerticesPerRow,      :Type => Integer, :Required => true
-                    field   :Decode,              :Type => Array, :Required => true
-                    field   :Function,            :Type => [ Dictionary, Stream ]
                 end
 
                 class CoonsPathMesh < Stream
                     include ShadingObject
+                    include Mesh
 
                     field   :ShadingType,         :Type => Integer, :Default => Shading::Type::COONS_PATCH_MESH, :Required => true
-                    field   :BitsPerCoordinate,   :Type => Integer, :Required => true
-                    field   :BitsPerComponent,    :Type => Integer, :Required => true
                     field   :BitsPerFlag,         :Type => Integer, :Required => true
-                    field   :Decode,              :Type => Array, :Required => true
-                    field   :Function,            :Type => [ Dictionary, Stream ]
                 end
 
                 class TensorProductPatchMesh < Stream
                     include ShadingObject
 
                     field   :ShadingType,         :Type => Integer, :Default => Shading::Type::TENSORPRODUCT_PATCH_MESH, :Required => true
-                    field   :BitsPerCoordinate,   :Type => Integer, :Required => true
-                    field   :BitsPerComponent,    :Type => Integer, :Required => true
                     field   :BitsPerFlag,         :Type => Integer, :Required => true
-                    field   :Decode,              :Type => Array, :Required => true
-                    field   :Function,            :Type => [ Dictionary, Stream ]
                 end
             end
 
@@ -168,7 +166,7 @@ module Origami
     end
 
     class PDF::Instruction
-        insn  'sh', Name
+        insn 'sh',  Name
     end
 
 end

data/lib/origami/graphics/render.rb

@@ -59,4 +59,3 @@ module Origami
 
     end
 end
-

data/lib/origami/graphics/state.rb

@@ -133,17 +133,17 @@ module Origami
     end #module Graphics
 
     class PDF::Instruction
-        insn  'q' do |canvas| canvas.gs.save; canvas.gs.reset end
-        insn  'Q' do |canvas| canvas.gs.restore end
-        insn  'w', Real do |canvas, lw| canvas.gs.line_width = lw end
-        insn  'J', Real do |canvas, lc| canvas.gs.line_cap = lc end
-        insn  'j', Real do |canvas, lj| canvas.gs.line_join = lj end
-        insn  'M', Real do |canvas, ml| canvas.gs.miter_limit = ml end
-
-        insn  'd', Array, Integer do |canvas, array, phase|
+        insn 'q' do |canvas| canvas.gs.save; canvas.gs.reset end
+        insn 'Q' do |canvas| canvas.gs.restore end
+        insn 'w', Real do |canvas, lw| canvas.gs.line_width = lw end
+        insn 'J', Real do |canvas, lc| canvas.gs.line_cap = lc end
+        insn 'j', Real do |canvas, lj| canvas.gs.line_join = lj end
+        insn 'M', Real do |canvas, ml| canvas.gs.miter_limit = ml end
+
+        insn 'd', Array, Integer do |canvas, array, phase|
             canvas.gs.dash_pattern = Graphics::DashPattern.new array, phase
         end
 
-        insn  'ri', Name do |canvas, ri| canvas.gs.rendering_intent = ri end
+        insn 'ri', Name do |canvas, ri| canvas.gs.rendering_intent = ri end
     end
 end

data/lib/origami/graphics/text.rb

@@ -109,22 +109,22 @@ module Origami
         #
         # Text instructions definitions
         #
-        insn  'Tc', Real do |canvas, cS| canvas.gs.text_state.char_spacing = cS end
-        insn  'Tw', Real do |canvas, wS| canvas.gs.text_state.word_spacing = wS end
-        insn  'Tz', Real do |canvas, s| canvas.gs.text_state.scaling = s end
-        insn  'TL', Real do |canvas, l| canvas.gs.text_state.leading = l end
+        insn 'Tc', Real do |canvas, cS| canvas.gs.text_state.char_spacing = cS end
+        insn 'Tw', Real do |canvas, wS| canvas.gs.text_state.word_spacing = wS end
+        insn 'Tz', Real do |canvas, s| canvas.gs.text_state.scaling = s end
+        insn 'TL', Real do |canvas, l| canvas.gs.text_state.leading = l end
 
-        insn  'Tf', Name, Real do |canvas, font, size|
+        insn 'Tf', Name, Real do |canvas, font, size|
             canvas.gs.text_state.font = font
             canvas.gs.text_state.font_size = size
         end
 
-        insn  'Tr', Integer do |canvas, r| canvas.gs.text_state.rendering_mode = r end
-        insn  'Ts', Real do |canvas, s| canvas.gs.text_state.text_rise = s end
-        insn  'BT' do |canvas| canvas.gs.text_state.begin_text_object end
-        insn  'ET' do |canvas| canvas.gs.text_state.end_text_object end
+        insn 'Tr', Integer do |canvas, r| canvas.gs.text_state.rendering_mode = r end
+        insn 'Ts', Real do |canvas, s| canvas.gs.text_state.text_rise = s end
+        insn 'BT' do |canvas| canvas.gs.text_state.begin_text_object end
+        insn 'ET' do |canvas| canvas.gs.text_state.end_text_object end
 
-        insn  'Td', Real, Real do |canvas, tx, ty|
+        insn 'Td', Real, Real do |canvas, tx, ty|
             unless canvas.gs.text_state.is_in_text_object?
                 raise TextStateError, "Must be in a text object to use operator : Td"
             end
@@ -134,7 +134,7 @@ module Origami
             Matrix.rows([[1,0,0],[0,1,0],[tx, ty, 1]]) * canvas.gs.text_state.text_line_matrix
         end
 
-        insn  'TD', Real, Real do |canvas, tx, ty|
+        insn 'TD', Real, Real do |canvas, tx, ty|
             unless canvas.gs.text_state.is_in_text_object?
                 raise TextStateError, "Must be in a text object to use operator : TD"
             end
@@ -146,7 +146,7 @@ module Origami
             Matrix.rows([[1,0,0],[0,1,0],[tx,ty,1]]) * canvas.gs.text_state.text_line_matrix
         end
 
-        insn  'Tm', Real, Real, Real, Real, Real, Real do |canvas, a,b,c,d,e,f,g|
+        insn 'Tm', Real, Real, Real, Real, Real, Real do |canvas, a, b, c, d, e, f|
             unless canvas.gs.text_state.is_in_text_object?
                 raise TextStateError, "Must be in a text object to use operator : Tm"
             end
@@ -156,7 +156,7 @@ module Origami
             Matrix.rows([[a,b,0],[c,d,0],[e,f,1]])
         end
 
-        insn  'T*' do |canvas|
+        insn 'T*' do |canvas|
             unless canvas.gs.text_state.is_in_text_object?
                 raise TextStateError, "Must be in a text object to use operator : T*"
             end
@@ -168,7 +168,7 @@ module Origami
             Matrix.rows([[1,0,0],[0,1,0],[tx, ty, 1]]) * canvas.gs.text_state.text_line_matrix
         end
 
-        insn  'Tj', String do |canvas, s|
+        insn 'Tj', String do |canvas, s|
             unless canvas.gs.text_state.is_in_text_object?
                 raise TextStateError, "Must be in a text object to use operator : Tj"
             end
@@ -176,7 +176,7 @@ module Origami
             canvas.write_text(s)
         end
 
-        insn  "'", String do |canvas, s|
+        insn "'", String do |canvas, s|
             unless canvas.gs.text_state.is_in_text_object?
                 raise TextStateError, "Must be in a text object to use operator : '"
             end
@@ -190,7 +190,7 @@ module Origami
             canvas.write_text(s)
         end
 
-        insn  '"', Real, Real, String do |canvas, w, c, s|
+        insn '"', Real, Real, String do |canvas, w, c, s|
             unless canvas.gs.text_state.is_in_text_object?
                 raise TextStateError, "Must be in a text object to use operator : \""
             end
@@ -207,7 +207,7 @@ module Origami
             canvas.write_text(s)
         end
 
-        insn  'TJ', Array do |canvas, arr|
+        insn 'TJ', Array do |canvas, arr|
             arr.each do |g|
                 case g
                 when Fixnum,Float then

data/lib/origami/graphics/xobject.rb

@@ -45,7 +45,7 @@ module Origami
         end
 
         def render(engine)
-            load! if @instructions.nil?
+            load!
 
             @instructions.each do |instruction|
                 instruction.render(engine)
@@ -67,13 +67,13 @@ module Origami
         end
 
         def instructions
-            load! if @instructions.nil?
+            load!
 
             @instructions
         end
 
         def draw_image(name, attr = {})
-            load! if @instructions.nil?
+            load!
 
             x, y = attr[:x], attr[:y]
 
@@ -94,14 +94,14 @@ module Origami
         # Draw a polygon from a array of coordinates.
         #
         def draw_polygon(coords = [], attr = {})
-            load! if @instructions.nil?
+            load!
 
-            stroke_color  = attr[:stroke_color] || DEFAULT_STROKE_COLOR
-            fill_color    = attr[:fill_color] || DEFAULT_FILL_COLOR
-            line_cap      = attr[:line_cap] || DEFAULT_LINECAP
-            line_join     = attr[:line_join] || DEFAULT_LINEJOIN
-            line_width    = attr[:line_width] || DEFAULT_LINEWIDTH
-            dash_pattern  = attr[:dash] || DEFAULT_DASHPATTERN
+            stroke_color  = attr.fetch(:stroke_color, DEFAULT_STROKE_COLOR)
+            fill_color    = attr.fetch(:fill_color, DEFAULT_FILL_COLOR)
+            line_cap      = attr.fetch(:line_cap, DEFAULT_LINECAP)
+            line_join     = attr.fetch(:line_join, DEFAULT_LINEJOIN)
+            line_width    = attr.fetch(:line_width, DEFAULT_LINEWIDTH)
+            dash_pattern  = attr.fetch(:dash, DEFAULT_DASHPATTERN)
 
             stroke        = attr[:stroke].nil? ? true : attr[:stroke]
             fill          = attr[:fill].nil? ? false : attr[:fill]
@@ -147,14 +147,14 @@ module Origami
         # Draw a rectangle at position (_x_,_y_) with defined _width_ and _height_.
         #
         def draw_rectangle(x, y, width, height, attr = {})
-            load! if @instructions.nil?
+            load!
 
-            stroke_color  = attr[:stroke_color] || DEFAULT_STROKE_COLOR
-            fill_color    = attr[:fill_color] || DEFAULT_FILL_COLOR
-            line_cap      = attr[:line_cap] || DEFAULT_LINECAP
-            line_join     = attr[:line_join] || DEFAULT_LINEJOIN
-            line_width    = attr[:line_width] || DEFAULT_LINEWIDTH
-            dash_pattern  = attr[:dash] || DEFAULT_DASHPATTERN
+            stroke_color  = attr.fetch(:stroke_color, DEFAULT_STROKE_COLOR)
+            fill_color    = attr.fetch(:fill_color, DEFAULT_FILL_COLOR)
+            line_cap      = attr.fetch(:line_cap, DEFAULT_LINECAP)
+            line_join     = attr.fetch(:line_join, DEFAULT_LINEJOIN)
+            line_width    = attr.fetch(:line_width, DEFAULT_LINEWIDTH)
+            dash_pattern  = attr.fetch(:dash, DEFAULT_DASHPATTERN)
 
             stroke        = attr[:stroke].nil? ? true : attr[:stroke]
             fill          = attr[:fill].nil? ? false : attr[:fill]
@@ -195,20 +195,20 @@ module Origami
         # _attr_:: Formatting attributes.
         #
         def write(text, attr = {})
-            load! if @instructions.nil?
-
-            x,y       = attr[:x], attr[:y]
-            font      = attr[:font] || DEFAULT_FONT
-            size      = attr[:size] || DEFAULT_SIZE
-            leading   = attr[:leading] || DEFAULT_LEADING
-            color     = attr[:color] || attr[:fill_color] || DEFAULT_STROKE_COLOR
-            stroke_color = attr[:stroke_color] || DEFAULT_STROKE_COLOR
-            line_width    = attr[:line_width] || DEFAULT_LINEWIDTH
-            word_spacing  = attr[:word_spacing]
-            char_spacing  = attr[:char_spacing]
-            scale     = attr[:scale]
-            rise      = attr[:rise]
-            rendering = attr[:rendering]
+            load!
+
+            x, y      = attr[:x], attr[:y]
+            font      = attr.fetch(:font, DEFAULT_FONT)
+            size      = attr.fetch(:size, DEFAULT_SIZE)
+            leading   = attr.fetch(:leading, DEFAULT_LEADING)
+            color     = attr.fetch(:color, attr.fetch(:fill_color, DEFAULT_STROKE_COLOR))
+            stroke_color = attr.fetch(:stroke_color, DEFAULT_STROKE_COLOR)
+            line_width    = attr.fetch(:line_width, DEFAULT_LINEWIDTH)
+            word_spacing  = attr.fetch(:word_spacing, @canvas.gs.text_state.word_spacing)
+            char_spacing  = attr.fetch(:char_spacing, @canvas.gs.text_state.char_spacing)
+            scale     = attr.fetch(:scale, @canvas.gs.text_state.scaling)
+            rise      = attr.fetch(:rise, @canvas.gs.text_state.text_rise)
+            rendering = attr.fetch(:rendering, @canvas.gs.text_state.rendering_mode)
 
             @instructions << PDF::Instruction.new('ET').render(@canvas) if (x or y) and @canvas.gs.text_state.is_in_text_object?
 
@@ -218,12 +218,12 @@ module Origami
 
             set_text_font(font, size)
             set_text_pos(x, y) if x or y
-            set_text_leading(leading) if leading
-            set_text_rendering(rendering) if rendering
-            set_text_rise(rise) if rise
-            set_text_scale(scale) if scale
-            set_text_word_spacing(word_spacing) if word_spacing
-            set_text_char_spacing(char_spacing) if char_spacing
+            set_text_leading(leading)
+            set_text_rendering(rendering)
+            set_text_rise(rise)
+            set_text_scale(scale)
+            set_text_word_spacing(word_spacing)
+            set_text_char_spacing(char_spacing)
             set_fill_color(color)
             set_stroke_color(stroke_color)
             set_line_width(line_width)
@@ -234,14 +234,16 @@ module Origami
         end
 
         def paint_shading(shade)
-            load! if @instructions.nil?
+            load!
+
             @instructions << PDF::Instruction.new('sh', shade).render(@canvas)
 
             self
         end
 
         def set_text_font(fontname, size)
-            load! if @instructions.nil?
+            load!
+
             if fontname != @canvas.gs.text_state.font or size != @canvas.gs.text_state.font_size
                 @instructions << PDF::Instruction.new('Tf', fontname, size).render(@canvas)
             end
@@ -250,14 +252,16 @@ module Origami
         end
 
         def set_text_pos(tx,ty)
-            load! if @instructions.nil?
+            load!
+
             @instructions << PDF::Instruction.new('Td', tx, ty).render(@canvas)
 
             self
         end
 
         def set_text_leading(leading)
-            load! if @instructions.nil?
+            load!
+
             if leading != @canvas.gs.text_state.leading
                 @instructions << PDF::Instruction.new('TL', leading).render(@canvas)
             end
@@ -266,7 +270,8 @@ module Origami
         end
 
         def set_text_rendering(rendering)
-            load! if @instructions.nil?
+            load!
+
             if rendering != @canvas.gs.text_state.rendering_mode
                 @instructions << PDF::Instruction.new('Tr', rendering).render(@canvas)
             end
@@ -275,7 +280,8 @@ module Origami
         end
 
         def set_text_rise(rise)
-            load! if @instructions.nil?
+            load!
+
             if rise != @canvas.gs.text_state.text_rise
                 @instructions << PDF::Instruction.new('Ts', rise).render(@canvas)
             end
@@ -284,7 +290,8 @@ module Origami
         end
 
         def set_text_scale(scaling)
-            load! if @instructions.nil?
+            load!
+
             if scale != @canvas.gs.text_state.scaling
                 @instructions << PDF::Instruction.new('Tz', scaling).render(@canvas)
             end
@@ -293,7 +300,8 @@ module Origami
         end
 
         def set_text_word_spacing(word_spacing)
-            load! if @instructions.nil?
+            load!
+
             if word_spacing != @canvas.gs.text_state.word_spacing
                 @instructions << PDF::Instruction.new('Tw', word_spacing).render(@canvas)
             end
@@ -302,7 +310,8 @@ module Origami
         end
 
         def set_text_char_spacing(char_spacing)
-            load! if @instructions.nil?
+            load!
+
             if char_spacing != @canvas.gs.text_state.char_spacing
                 @instructions << PDF::Instruction.new('Tc', char_spacing).render(@canvas)
             end
@@ -311,7 +320,7 @@ module Origami
         end
 
         def set_fill_color(color)
-            load! if @instructions.nil?
+            load!
 
             @instructions << ( i =
                 if (color.respond_to? :r and color.respond_to? :g and color.respond_to? :b) or (color.is_a?(::Array) and color.size == 3)
@@ -341,7 +350,7 @@ module Origami
         end
 
         def set_stroke_color(color)
-            load! if @instructions.nil?
+            load!
 
             @instructions << ( i =
                 if (color.respond_to? :r and color.respond_to? :g and color.respond_to? :b) or (color.is_a?(::Array) and color.size == 3)
@@ -371,7 +380,8 @@ module Origami
         end
 
         def set_dash_pattern(pattern)
-            load! if @instructions.nil?
+            load!
+
             unless @canvas.gs.dash_pattern.eql? pattern
                 @instructions << PDF::Instruction.new('d', pattern.array, pattern.phase).render(@canvas)
             end
@@ -380,7 +390,8 @@ module Origami
         end
 
         def set_line_width(width)
-            load! if @instructions.nil?
+            load!
+
             if @canvas.gs.line_width != width
                 @instructions << PDF::Instruction.new('w', width).render(@canvas)
             end
@@ -389,7 +400,8 @@ module Origami
         end
 
         def set_line_cap(cap)
-            load! if @instructions.nil?
+            load!
+
             if @canvas.gs.line_cap != cap
                 @instructions << PDF::Instruction.new('J', cap).render(@canvas)
             end
@@ -398,7 +410,8 @@ module Origami
         end
 
         def set_line_join(join)
-            load! if @instructions.nil?
+            load!
+
             if @canvas.gs.line_join != join
                 @instructions << PDF::Instruction.new('j', join).render(@canvas)
             end
@@ -409,6 +422,8 @@ module Origami
         private
 
         def load!
+            return unless @instructions.nil?
+
             decode!
 
             code = StringScanner.new self.data
@@ -471,12 +486,12 @@ module Origami
         end
 
         # TODO :nodoc:
-        def paint_shading(shade)
+        def paint_shading(_shade)
             raise NotImplementedError
         end
 
         # TODO :nodoc:
-        def set_text_font(font, size)
+        def set_text_font(_font, _size)
             raise NotImplementedError
         end
 
@@ -607,7 +622,7 @@ module Origami
             field   :PtData,        :Type => Dictionary, :Version => "1.7", :ExtensionLevel => 3
 
             def pre_build
-                self.Resources = Resources.new.pre_build unless has_field?(:Resources)
+                self.Resources = Resources.new.pre_build unless self.key?(:Resources)
 
                 super
             end
@@ -645,7 +660,6 @@ module Origami
                 else
                     data = File.binread(File.expand_path(path))
                     format ||= File.extname(path)
-                    format.slice!(0) if format and format[0,1] == '.'
                 end
 
                 image = ImageXObject.new
@@ -656,22 +670,18 @@ module Origami
                     image.setFilter :DCTDecode
                     image.encoded_data = data
 
-                    image
-
                 when 'jp2','jpx','j2k','jpf','jpm','mj2'
                     image.setFilter :JPXDecode
                     image.encoded_data = data
 
-                    image
-
                 when 'jb2', 'jbig', 'jbig2'
                     image.setFilter :JBIG2Decode
                     image.encoded_data = data
-
-                    image
                 else
                     raise NotImplementedError, "Unknown file format: '#{format}'"
                 end
+
+                image
             end
 
             #
@@ -700,35 +710,35 @@ module Origami
 
                 case cs = self.ColorSpace.value
                 when Color::Space::DEVICE_GRAY
-                    colortype = 0
+                    color_type = 0
                     components = 1
                 when Color::Space::DEVICE_RGB
-                    colortype = 2
+                    color_type = 2
                     components = 3
                 when ::Array
-                    cstype = cs[0].is_a?(Reference) ? cs[0].solve : cs[0]
-                    case cstype.value
+                    cs_type = cs[0]
+                    case cs_type
                     when :Indexed
-                        colortype = 3
+                        color_type = 3
                         components = 3
-                        csbase = cs[1].is_a?(Reference) ? cs[1].solve : cs[1]
-                        lookup = cs[3].is_a?(Reference) ? cs[3].solve : cs[3]
+                        cs_base = cs[1]
+                        lookup = cs[3]
 
                     when :ICCBased
-                        iccprofile = cs[1].is_a?(Reference) ? cs[1].solve : cs[1]
+                        icc_profile = cs[1]
                         raise InvalidColorError,
-                                "Invalid ICC Profile parameter" unless iccprofile.is_a?(Stream)
+                                "Invalid ICC Profile parameter" unless icc_profile.is_a?(Stream)
 
-                        case iccprofile.N
+                        case icc_profile.N
                         when 1
-                            colortype = 0
+                            color_type = 0
                             components = 1
                         when 3
-                            colortype = 2
+                            color_type = 2
                             components = 3
                         else
                             raise InvalidColorError,
-                                    "Invalid number of components in ICC profile: #{iccprofile.N}"
+                                    "Invalid number of components in ICC profile: #{icc_profile.N}"
                         end
                     else
                         raise InvalidColorError, "Unsupported color space: #{self.ColorSpace}"
@@ -738,7 +748,7 @@ module Origami
                 end
 
                 bpc = self.BitsPerComponent || 8
-                w,h = self.Width, self.Height
+                w, h = self.Width, self.Height
                 pixels = self.data
 
                 hdr = [137, 80, 78, 71, 13, 10, 26, 10].pack('C*')
@@ -749,7 +759,7 @@ module Origami
                     'IHDR',
                     [
                         w, h,
-                        bpc, colortype, 0, 0, 0
+                        bpc, color_type, 0, 0, 0
                     ].pack("N2C5")
                 ]
 
@@ -788,7 +798,7 @@ module Origami
                     ]
                 end
 
-                if colortype == 3
+                if color_type == 3
                     lookup =
                         case lookup
                         when Stream then lookup.data
@@ -797,10 +807,10 @@ module Origami
                             raise InvalidColorError, "Invalid indexed palette table"
                         end
 
-                    raise InvalidColorError, "Invalid base color space" unless csbase
+                    raise InvalidColorError, "Invalid base color space" unless cs_base
                     palette = ""
 
-                    case csbase.value
+                    case cs_base
                     when Color::Space::DEVICE_GRAY
                         lookup.each_byte do |g|
                             palette << Color.gray_to_rgb(g).pack("C3")
@@ -815,13 +825,13 @@ module Origami
                         end
                     when ::Array
 
-                        case csbase[0].solve.value
+                        case cs_base[0]
                         when :ICCBased
-                            iccprofile = csbase[1].solve
+                            icc_profile = cs_base[1]
                             raise InvalidColorError,
-                                    "Invalid ICC Profile parameter" unless iccprofile.is_a?(Stream)
+                                    "Invalid ICC Profile parameter" unless icc_profile.is_a?(Stream)
 
-                            case iccprofile.N
+                            case icc_profile.N
                             when 1
                                 lookup.each_byte do |g|
                                     palette << Color.gray_to_rgb(g).pack("C3")
@@ -830,20 +840,20 @@ module Origami
                                 palette << lookup[0, (lookup.size / 3) * 3]
                             else
                                 raise InvalidColorError,
-                                        "Invalid number of components in ICC profile: #{iccprofile.N}"
+                                        "Invalid number of components in ICC profile: #{icc_profile.N}"
                             end
                         else
-                            raise InvalidColorError, "Unsupported color space: #{csbase}"
+                            raise InvalidColorError, "Unsupported color space: #{cs_base}"
                         end
                     else
-                        raise InvalidColorError, "Unsupported color space: #{csbase}"
+                        raise InvalidColorError, "Unsupported color space: #{cs_base}"
                     end
 
-                    if iccprofile
+                    if icc_profile
                         chunks <<
                         [
                             'iCCP',
-                            'ICC Profile' + "\x00\x00" + Zlib::Deflate.deflate(iccprofile.data, Zlib::BEST_COMPRESSION)
+                            'ICC Profile' + "\x00\x00" + Zlib::Deflate.deflate(icc_profile.data, Zlib::BEST_COMPRESSION)
                         ]
                     end
 
@@ -855,12 +865,12 @@ module Origami
 
                     bpr = w
 
-                else # colortype != 3
-                    if iccprofile
+                else # color_type != 3
+                    if icc_profile
                         chunks <<
                         [
                             'iCCP',
-                            'ICC Profile' + "\x00\x00" + Zlib::Deflate.deflate(iccprofile.data, Zlib::BEST_COMPRESSION)
+                            'ICC Profile' + "\x00\x00" + Zlib::Deflate.deflate(icc_profile.data, Zlib::BEST_COMPRESSION)
                         ]
                     end