wagon 0.9.1 → 0.9.2

data/VERSION

@@ -1 +1 @@
-0.9.1
+0.9.2

data/bin/wagon

@@ -7,7 +7,7 @@
 #   -h, --help        Displays this help message
 #   -v, --version     Display the version, then exit
 #   -V, --verbose     Verbose output
-#   -t, --title       Override the default title with your own
+#   -t, --title       The title displayed on each page (default is the ward name)
 #   -r, --rows        Number of rows per page (default is 6)
 #   -c, --columns     Number of columns per page (default is 7)
 #   -p, --padding     Padding between households (default is 2)

data/lib/wagon/directory.rb

@@ -4,6 +4,10 @@ require 'stringio'
 
 module Wagon
   class Directory < Page
+    def ward
+      @parent
+    end
+    
     def photo_directory_path
       return @photo_directory_path unless @photo_directory_path.nil?
       
@@ -24,42 +28,56 @@ module Wagon
     end
     
     def to_pdf(options = {})
-      options = {:columns => 7, :rows => 6, :padding => 2, :font_size => 8, :address => true, :phone_number => true, :email => true}.merge(options)
+      options = {
+        :columns      => 7,
+        :rows         => 6,
+        :padding      => 2,
+        :font_size    => 8,
+        :address      => true,
+        :phone_number => true,
+        :email        => true,
+        :title        => "#{ward.name}"
+      }.merge(options.delete_if {|k,v| v.nil? })
       
-      Prawn::Document.new(:skip_page_creation => true, :left_margin => 10, :right_margin => 10, :top_margin => 20, :bottom_margin => 10) do |pdf|
+      Prawn::Document.new(:left_margin => 10, :right_margin => 10, :top_margin => 10, :bottom_margin => 10) do |pdf|
+        header_height = 10
+        footer_height = 10
         columns       = options[:columns].to_f
         rows          = options[:rows].to_f
         padding       = options[:padding].to_f
         grid_width    = pdf.bounds.width / columns
-        grid_height   = pdf.bounds.height / rows
+        grid_height   = (pdf.bounds.height - header_height - footer_height) / rows
         box_width     = grid_width - (padding * 2)
         box_height    = grid_height - (padding * 2)
         pages         = (households.size.to_f / (columns * rows)).ceil()
-        info_lines    = 1 + [:address, :phone_number, :email].inject(0) { |sum, item| sum += item ? 1 : 0 }
         pdf.font_size = options[:font_size].to_i
+        info_count    = 1 + [:address, :phone_number, :email].inject(0) { |sum, item| sum += options[item] ? 1 : 0 }
+        info_height   = pdf.font.height*info_count
         
         (0...pages).each do |page|
-          pdf.start_new_page
+          pdf.start_new_page unless page == 0
+          pdf.text(options[:title], :at => [pdf.bounds.right/2 - pdf.width_of(options[:title], :size => 12)/2, pdf.bounds.top - header_height/2], :size => 12)
+          pdf.text("For Church Use Only", :at => [pdf.bounds.right/2 - pdf.width_of("For Church Use Only")/2, pdf.bounds.bottom + footer_height/2])
           (0...rows).each do |row|
-            y = pdf.bounds.top - row*grid_height
+            y = pdf.bounds.top - row*grid_height - header_height
             (0...columns).each do |column|
               break if (index = page*rows*columns+row*columns+column) >= households.size
               household = households[index]
               x         = pdf.bounds.left + column*grid_width
               pdf.bounding_box([x, y], :width => grid_width, :height => grid_height) do
                 pdf.bounding_box([pdf.bounds.left + padding, pdf.bounds.top - padding], :width => box_width, :height => box_height) do
-                  information = []
-                  information.push(household.name)
-                  information.push(*household.address.street) if options[:address]
-                  information.push(household.phone_number) if options[:phone_number]
-                  information.push(household.members.first.email) if options[:email]
+                  info = []
+                  info.push(household.name)
+                  info.push(*household.address.street) if options[:address]
+                  info.push(household.phone_number) if options[:phone_number]
+                  info.push(household.members.first.email) if options[:email]
                   
-                  pdf.image(household.has_image? ? StringIO.new(household.image_data) : './extra/placeholder.jpg',
-                            :position => :center, :fit => [box_width, box_height - (padding*2 + pdf.font.height*info_lines)] )
+                  pdf.image(household.has_image? ? StringIO.new(household.image_data) : './extra/placeholder.jpg', :position => :center, :fit => [box_width, box_height - (padding*2 + info_height)] )
                   
-                  pdf.move_down(padding)
-                  information.compact.each do |line|
-                    pdf.text(line, :align => :center, :size => pdf.font_size.downto(1).detect() { |size| pdf.width_of(line.to_s, :size => size) <= box_width })
+                  pdf.bounding_box([pdf.bounds.left, pdf.bounds.bottom + info_height], :height => info_height+1, :width => pdf.bounds.width) do
+                    info.compact.each do |line|
+                      pdf.text(line, :align => :center, :size => pdf.font_size.downto(1).detect() { |size| pdf.width_of(line.to_s, :size => size) <= box_width })
+                    end
                   end
                 end
               end

data/lib/wagon/page.rb

@@ -4,8 +4,8 @@ module Wagon
   class Page
     attr_reader :connection
     
-    def initialize(connection, url)
-      @connection, @url = connection, url
+    def initialize(connection, url, parent = nil)
+      @connection, @url, @parent = connection, url, parent
     end
     
     def source

data/lib/wagon/ward.rb

@@ -11,7 +11,7 @@ module Wagon
     end
     
     def directory
-      @directory ||= Directory.new(connection, directory_path)
+      @directory ||= Directory.new(connection, directory_path, self)
     end
     
     def households

data/spec/wagon/directory_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '../../spec_helper')
 describe "Wagon::Directory" do
   
   before(:each) do
-    @page = Wagon::Directory.new($user, $user.ward.directory_path)
+    @page = Wagon::Directory.new($user, $user.ward.directory_path, $user.ward)
   end
   
   it "should find the photo directory link" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: wagon
 version: !ruby/object:Gem::Version 
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors: 
 - Devin Christensen