payday 1.0.0beta4 → 1.0.0beta5

data/README.md

@@ -27,7 +27,7 @@ Example:
 
 Documentation
 ===
-Documentation for the latest version of Payday is available at [rdoc.info](http://rdoc.info/github/commondream/payday/v1.0.0beta2/frames).
+Documentation for the latest version of Payday is available at [rdoc.info](http://rdoc.info/github/commondream/payday/v1.0.0beta5/frames).
 
 Customizing Your Logo and Company Name
 ===
@@ -112,7 +112,7 @@ There's also an example Rails application running on Heroku at [http://payday-ex
 
 Contributing
 ===
-Payday is pretty young, so there's still a good bit of work to be done. Feel free to fork the project, make some changes, and send a pull request. If you're unsure about what to work on, send me a message on GitHub. I'd love the help!
+Payday is pretty young, so there's still a good bit of work to be done. I highly recommend sending me a message on GitHub before making too many changes, just to make sure that two folks aren't doing the same work, but beyond that feel free to fork the project, make some changes, and send a pull request. If you're unsure about what to work on but would like to help, send me a message on GitHub. I'd love the help!
 
 To Do
 ===
@@ -122,7 +122,6 @@ Here's what we're planning on working on with Payday in the near future:
 * Release 1.0!
 
 * Actually get a designer to style the invoices.
-* Add support for currencies other than USD
 * Add support for Money gem or BigDecimal or general numerics (right now we support BigDecimal and general numerics)
 * Add support for blank line items
 * Add support for indented line items

data/lib/payday.rb

@@ -2,6 +2,7 @@
 require 'date'
 require 'bigdecimal'
 require 'prawn'
+require 'money'
 
 require File.join(File.dirname(__FILE__), "payday", "version")
 require File.join(File.dirname(__FILE__), "payday", "config")

data/lib/payday/config.rb

@@ -16,6 +16,7 @@ module Payday
         self.company_name = "Awesome Corp"
         self.company_details = "awesomecorp@commondream.net"
         self.date_format = "%B %e, %Y"
+        self.currency = "USD"
       end
   end
 end

data/lib/payday/pdf_renderer.rb

@@ -54,12 +54,15 @@ module Payday
       
       def self.company_banner(invoice, pdf)
         # render the logo
-        logo_info = pdf.image(invoice_or_default(invoice, :invoice_logo), :at => pdf.bounds.top_left, :fit => [200, 100])
+        logo_info = pdf.image(invoice_or_default(invoice, :invoice_logo), :at => pdf.bounds.top_left)
         
         # render the company details
+        company_details = invoice_or_default(invoice, :company_details)
+        company_details = company_details.lines.inject("") { |combined, line| combined << line.strip }
+        
         table_data = []
-        table_data << [bold_cell(pdf, invoice_or_default(invoice, :company_name), :size => 12)]
-        table_data << [invoice_or_default(invoice, :company_details)]
+        table_data << [bold_cell(pdf, invoice_or_default(invoice, :company_name).strip, :size => 12)]
+        table_data << [company_details]
         table = pdf.make_table(table_data, :cell_style => { :borders => [], :padding => [2, 0] })
         pdf.bounding_box([pdf.bounds.width - table.width, pdf.bounds.top], :width => table.width, :height => table.height) do
           table.draw
@@ -136,8 +139,8 @@ module Payday
             bold_cell(pdf, "Quantity", :align => :center, :borders => []), 
             bold_cell(pdf, "Amount", :align => :center, :borders => [])]
         invoice.line_items.each do |line|
-          table_data << [line.description, number_to_currency(line.price), BigDecimal.new(line.quantity.to_s).to_s("F"),
-              number_to_currency(line.amount)]
+          table_data << [line.description, number_to_currency(line.price, invoice), BigDecimal.new(line.quantity.to_s).to_s("F"),
+              number_to_currency(line.amount, invoice)]
         end
 
         pdf.move_cursor_to(pdf.cursor - 20)
@@ -156,10 +159,10 @@ module Payday
       
       def self.totals_lines(invoice, pdf)
         table_data = []
-        table_data << [bold_cell(pdf, "Subtotal:"), cell(pdf, number_to_currency(invoice.subtotal), :align => :right)]
-        table_data << [bold_cell(pdf, "Tax:"), cell(pdf, number_to_currency(invoice.tax), :align => :right)]
+        table_data << [bold_cell(pdf, "Subtotal:"), cell(pdf, number_to_currency(invoice.subtotal, invoice), :align => :right)]
+        table_data << [bold_cell(pdf, "Tax:"), cell(pdf, number_to_currency(invoice.tax, invoice), :align => :right)]
         table_data << [bold_cell(pdf, "Total:", :size => 12), 
-            cell(pdf, number_to_currency(invoice.total), :size => 12, :align => :right)]
+            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
@@ -202,8 +205,9 @@ module Payday
         number.to_s.gsub(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1#{delimiter}")
       end
     
-      def self.number_to_currency(number)
-        number_with_delimiter(sprintf("$%.02f", number))
+      # 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)

data/lib/payday/version.rb

@@ -2,5 +2,5 @@
 module Payday
   
   # Current Version
-  VERSION = "1.0.0beta4"
+  VERSION = "1.0.0beta5"
 end

data/payday.gemspec

@@ -13,6 +13,7 @@ Gem::Specification.new do |s|
   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.pre")
+  s.add_dependency("money", "~> 3.6.1")
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: payday
 version: !ruby/object:Gem::Version 
-  hash: 62196363
+  hash: 62196361
   prerelease: 5
   segments: 
   - 1
   - 0
   - 0
   - beta
-  - 4
-  version: 1.0.0beta4
+  - 5
+  version: 1.0.0beta5
 platform: ruby
 authors: 
 - Alan Johnson
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-08 00:00:00 -05:00
+date: 2011-03-09 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -37,6 +37,22 @@ dependencies:
         version: 0.11.1.pre
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: money
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 3
+        - 6
+        - 1
+        version: 3.6.1
+  type: :runtime
+  version_requirements: *id002
 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