payday 1.0.3 → 1.0.4

data/Gemfile

@@ -1,4 +1,3 @@
 source "http://rubygems.org"
 
 gemspec
-

data/lib/payday/pdf_renderer.rb

@@ -1,26 +1,26 @@
 module Payday
-  
+
   # The PDF renderer. We use this internally in Payday to render pdfs, but really you should just need to call
   # {{Payday::Invoiceable#render_pdf}} to render pdfs yourself.
   class PdfRenderer
-    
+
     # Renders the given invoice as a pdf on disk
-    def self.render_to_file(invoice, path)    
+    def self.render_to_file(invoice, path)
       pdf(invoice).render_file(path)
     end
-  
+
     # Renders the given invoice as a pdf, returning a string
     def self.render(invoice)
       pdf(invoice).render
     end
-  
+
     private
       def self.pdf(invoice)
         pdf = Prawn::Document.new(:page_size => invoice_or_default(invoice, :page_size))
 
         # set up some default styling
         pdf.font_size(8)
-        
+
         stamp(invoice, pdf)
         company_banner(invoice, pdf)
         bill_to_ship_to(invoice, pdf)
@@ -28,12 +28,12 @@ module Payday
         line_items_table(invoice, pdf)
         totals_lines(invoice, pdf)
         notes(invoice, pdf)
-        
+
         page_numbers(pdf)
 
         pdf
       end
-      
+
       def self.stamp(invoice, pdf)
         stamp = nil
         if invoice.paid?
@@ -53,41 +53,41 @@ module Payday
 
         pdf.fill_color "000000"
       end
-      
+
       def self.company_banner(invoice, pdf)
         # render the logo
         logo_info = pdf.image(invoice_or_default(invoice, :invoice_logo), :at => pdf.bounds.top_left)
-        
+
         # render the company details
         table_data = []
         table_data << [bold_cell(pdf, invoice_or_default(invoice, :company_name).strip, :size => 12)]
-        
+
         invoice_or_default(invoice, :company_details).lines.each { |line| table_data << [line] }
-        
+
         table = pdf.make_table(table_data, :cell_style => { :borders => [], :padding => 0 })
         pdf.bounding_box([pdf.bounds.width - table.width, pdf.bounds.top], :width => table.width, :height => table.height + 5) do
           table.draw
         end
-        
+
         pdf.move_cursor_to(pdf.bounds.top - logo_info.scaled_height - 20)
       end
-      
+
       def self.bill_to_ship_to(invoice, pdf)
         bill_to_cell_style = { :borders => [], :padding => [2, 0]}
         bill_to_ship_to_bottom = 0
-        
+
         # render bill to
         pdf.float do
-          table = pdf.table([[bold_cell(pdf, I18n.t('payday.invoice.bill_to', :default => "Bill To"))], 
+          table = pdf.table([[bold_cell(pdf, I18n.t('payday.invoice.bill_to', :default => "Bill To"))],
               [invoice.bill_to]], :column_widths => [200], :cell_style => bill_to_cell_style)
           bill_to_ship_to_bottom = pdf.cursor
         end
 
         # render ship to
         if defined?(invoice.ship_to) && !invoice.ship_to.nil?
-          table = pdf.make_table([[bold_cell(pdf, I18n.t('payday.invoice.ship_to', :default => "Ship To"))], 
+          table = pdf.make_table([[bold_cell(pdf, I18n.t('payday.invoice.ship_to', :default => "Ship To"))],
               [invoice.ship_to]], :column_widths => [200], :cell_style => bill_to_cell_style)
-          
+
           pdf.bounding_box([pdf.bounds.width - table.width, pdf.cursor], :width => table.width, :height => table.height + 2) do
             table.draw
           end
@@ -97,14 +97,14 @@ module Payday
         bill_to_ship_to_bottom = pdf.cursor if pdf.cursor < bill_to_ship_to_bottom
         pdf.move_cursor_to(bill_to_ship_to_bottom - 20)
       end
-      
+
       def self.invoice_details(invoice, pdf)
         # invoice details
         table_data = []
 
         # invoice number
         if defined?(invoice.invoice_number) && invoice.invoice_number
-          table_data << [bold_cell(pdf, I18n.t('payday.invoice.invoice_no', :default => "Invoice #:")), 
+          table_data << [bold_cell(pdf, I18n.t('payday.invoice.invoice_no', :default => "Invoice #:")),
               bold_cell(pdf, invoice.invoice_number.to_s, :align => :right)]
         end
 
@@ -116,7 +116,7 @@ module Payday
             due_date = invoice.due_at.to_s
           end
 
-          table_data << [bold_cell(pdf, I18n.t('payday.invoice.due_date', :default => "Due Date:")), 
+          table_data << [bold_cell(pdf, I18n.t('payday.invoice.due_date', :default => "Due Date:")),
               bold_cell(pdf, due_date, :align => :right)]
         end
 
@@ -128,13 +128,13 @@ module Payday
             paid_date = invoice.paid_at.to_s
           end
 
-          table_data << [bold_cell(pdf, I18n.t('payday.invoice.paid_date', :default => "Paid Date:")), 
+          table_data << [bold_cell(pdf, I18n.t('payday.invoice.paid_date', :default => "Paid Date:")),
               bold_cell(pdf, paid_date, :align => :right)]
         end
 
         # loop through invoice_details and include them
         invoice.each_detail do |key, value|
-          table_data << [bold_cell(pdf, key), 
+          table_data << [bold_cell(pdf, key),
               bold_cell(pdf, value, :align => :right)]
         end
 
@@ -142,12 +142,12 @@ module Payday
           pdf.table(table_data, :cell_style => { :borders => [], :padding => [1, 10, 1, 1] })
         end
       end
-      
+
       def self.line_items_table(invoice, pdf)
         table_data = []
-        table_data << [bold_cell(pdf, I18n.t('payday.line_item.description', :default => "Description"), :borders => []), 
-            bold_cell(pdf, I18n.t('payday.line_item.unit_price', :default => "Unit Price"), :align => :center, :borders => []), 
-            bold_cell(pdf, I18n.t('payday.line_item.quantity', :default => "Quantity"), :align => :center, :borders => []), 
+        table_data << [bold_cell(pdf, I18n.t('payday.line_item.description', :default => "Description"), :borders => []),
+            bold_cell(pdf, I18n.t('payday.line_item.unit_price', :default => "Unit Price"), :align => :center, :borders => []),
+            bold_cell(pdf, I18n.t('payday.line_item.quantity', :default => "Quantity"), :align => :center, :borders => []),
             bold_cell(pdf, I18n.t('payday.line_item.amount', :default => "Amount"), :align => :center, :borders => [])]
         invoice.line_items.each do |line|
           table_data << [line.description,
@@ -157,7 +157,7 @@ module Payday
         end
 
         pdf.move_cursor_to(pdf.cursor - 20)
-        pdf.table(table_data, :width => pdf.bounds.width, :header => true, 
+        pdf.table(table_data, :width => pdf.bounds.width, :header => true,
             :cell_style => {:border_width => 0.5, :border_color => "cccccc", :padding => [5, 10]},
             :row_colors => ["dfdfdf", "ffffff"]) do
           # left align the number columns
@@ -170,29 +170,29 @@ module Payday
           column_widths = natural
         end
       end
-      
+
       def self.totals_lines(invoice, pdf)
         table_data = []
-        table_data << [bold_cell(pdf, I18n.t('payday.invoice.subtotal', :default => "Subtotal:")), 
+        table_data << [bold_cell(pdf, I18n.t('payday.invoice.subtotal', :default => "Subtotal:")),
             cell(pdf, number_to_currency(invoice.subtotal, invoice), :align => :right)]
         if invoice.tax_rate > 0
           table_data << [bold_cell(pdf,
-              invoice.tax_description.nil? ? I18n.t('payday.invoice.tax', :default => "Tax:") : invoice.tax_description), 
+              invoice.tax_description.nil? ? I18n.t('payday.invoice.tax', :default => "Tax:") : invoice.tax_description),
               cell(pdf, number_to_currency(invoice.tax, invoice), :align => :right)]
         end
         if invoice.shipping_rate > 0
           table_data << [bold_cell(pdf,
-              invoice.shipping_description.nil? ? I18n.t('payday.invoice.shipping', :default => "Shipping:") : invoice.shipping_description), 
+              invoice.shipping_description.nil? ? I18n.t('payday.invoice.shipping', :default => "Shipping:") : invoice.shipping_description),
               cell(pdf, number_to_currency(invoice.shipping, invoice), :align => :right)]
         end
-        table_data << [bold_cell(pdf, I18n.t('payday.invoice.total', :default => "Total:"), :size => 12), 
+        table_data << [bold_cell(pdf, I18n.t('payday.invoice.total', :default => "Total:"), :size => 12),
             cell(pdf, number_to_currency(invoice.total, invoice), :size => 12, :align => :right)]
         table = pdf.make_table(table_data, :cell_style => { :borders => [] })
         pdf.bounding_box([pdf.bounds.width - table.width, pdf.cursor], :width => table.width, :height => table.height + 2) do
           table.draw
         end
       end
-      
+
       def self.notes(invoice, pdf)
         if defined?(invoice.notes) && invoice.notes
           pdf.move_cursor_to(pdf.cursor - 30)
@@ -206,13 +206,13 @@ module Payday
           pdf.text(invoice.notes.to_s)
         end
       end
-      
+
       def self.page_numbers(pdf)
         if pdf.page_count > 1
           pdf.number_pages("<page> / <total>", [pdf.bounds.right - 18, -15])
         end
       end
-      
+
       def self.invoice_or_default(invoice, property)
         if invoice.respond_to?(property) && invoice.send(property)
           invoice.send(property)
@@ -220,21 +220,21 @@ module Payday
           Payday::Config.default.send(property)
         end
       end
-  
+
       def self.cell(pdf, text, options = {})
         Prawn::Table::Cell::Text.make(pdf, text, options)
       end
-    
+
       def self.bold_cell(pdf, text, options = {})
         options[:font] = "Helvetica-Bold"
         cell(pdf, text, options)
       end
-    
+
       # Converts this number to a formatted currency string
       def self.number_to_currency(number, invoice)
         number.to_money(invoice_or_default(invoice, :currency)).format
       end
-    
+
       def self.max_cell_width(cell_proxy)
         max = 0
         cell_proxy.each do |cell|
@@ -242,7 +242,7 @@ module Payday
             max = cell.natural_content_width
           end
         end
-      
+
         max
       end
   end

data/lib/payday/version.rb

@@ -2,5 +2,5 @@
 module Payday
   
   # Current Version
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

data/payday.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.summary     = %q{git remote add origin git@github.com:commondream/payday.git}
   s.description = %q{Payday is a library for rendering invoices. At present it supports rendering invoices to pdfs, but we're planning on adding support for other formats in the near future.}
 
-  s.add_dependency("prawn", "~> 0.11.1")
+  s.add_dependency("prawn", "~> 0.12.0")
   s.add_dependency("money", "~> 3.6.1")
   s.add_dependency("i18n", ">= 0.5.0")
 

metadata

@@ -1,72 +1,69 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: payday
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.0.4
   prerelease: 
-  version: 1.0.3
 platform: ruby
-authors: 
+authors:
 - Alan Johnson
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-24 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-17 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: prawn
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70204475070780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.11.1
+      - !ruby/object:Gem::Version
+        version: 0.12.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: money
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70204475070780
+- !ruby/object:Gem::Dependency
+  name: money
+  requirement: &70204475070280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 3.6.1
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: i18n
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70204475070280
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: &70204475069820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.5.0
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: minitest
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70204475069820
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: &70204475069380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-description: Payday is a library for rendering invoices. At present it supports rendering invoices to pdfs, but we're planning on adding support for other formats in the near future.
-email: 
+  prerelease: false
+  version_requirements: *70204475069380
+description: Payday is a library for rendering invoices. At present it supports rendering
+  invoices to pdfs, but we're planning on adding support for other formats in the
+  near future.
+email:
 - alan@commondream.net
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - README.md
@@ -94,35 +91,31 @@ files:
 - test/invoice_test.rb
 - test/line_item_test.rb
 - test/test_helper.rb
-has_rdoc: true
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: git remote add origin git@github.com:commondream/payday.git
-test_files: 
+test_files:
 - test/invoice_test.rb
 - test/line_item_test.rb
 - test/test_helper.rb