prawn-fillform 0.0.15 → 0.0.16

data/lib/prawn-fillform.rb

@@ -77,10 +77,13 @@ module Prawn
       end
 
       def font_size
+        return 12.0 unless deref(@dictionary[:DA])
         deref(@dictionary[:DA]).split(" ")[1].to_f
       end
 
       def font_style
+        return :normal unless deref(@dictionary[:DA])
+
         style = case deref(@dictionary[:DA]).split(" ")[0].split(",").last.to_s.downcase
         when "bold" then :bold
         when "italic" then :italic
@@ -93,6 +96,7 @@ module Prawn
       end
 
       def font_color
+        return "0000" unless deref(@dictionary[:DA])
         Prawn::Graphics::Color.rgb2hex(deref(@dictionary[:DA]).split(" ")[3..5].collect { |e| e.to_f * 255 }).to_s
       end
 
@@ -214,8 +218,11 @@ module Prawn
         fields.each do |field|
           number = page.to_s.split("_").last.to_i
           go_to_page(number)
-          value = data[page][field.name].fetch(:value) rescue nil
-          options = data[page][field.name].fetch(:options) rescue nil
+
+          field_hash = data[page].try(:[], field.name) || data[field.name]
+
+          value = field_hash.fetch(:value) rescue nil
+          options = field_hash.fetch(:options) rescue nil
           options ||= {}
 
           if value
@@ -231,7 +238,9 @@ module Prawn
                                     :width => options[:width] || field.width,
                                     :height => options[:height] || field.height,
                                     :valign => options[:valign] || :center,
-                                    :size => options[:font_size] || field.font_size,
+
+                                    # Default to the document font size if the field size is 0
+                                    :size => options[:font_size] || ((size = field.font_size) > 0.0 ? size : font_size),
                                     :style => options[:font_style] || field.font_style
             elsif field.type == :button
 

data/lib/prawn-fillform/version.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 module Prawn
   module Fillform
-    VERSION = "0.0.15"
+    VERSION = "0.0.16"
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prawn-fillform
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-16 00:00:00.000000000 Z
+date: 2013-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prawn