payday 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93a7b9df8926467ff4ef1b74328bcb3ee3b5415f
-  data.tar.gz: 1b8798db48db996c6361f1710d79a5635ee5ca19
+  metadata.gz: 6880a9809ee7df8e384b8decd0496858eb7ebb32
+  data.tar.gz: 51bf1bb2e4c33baef16308e4f85b9f2915579d00
 SHA512:
-  metadata.gz: 8ab5469683b247667df125a97f2b066c41f0058623976ec96c746bcf7d614cf16385a9244876c8d24b4e2e0605014c5d045a785cd89a48c8a9cab39e126755d3
-  data.tar.gz: eed2f8315b300d9483012de8e399187c75a74caf55617f401f9d20d3a83ee13cb4294a9aed6c10491e529826f4e47e64698eb1e6543aa1ff006c7f26ae86f41e
+  metadata.gz: 22077148a2506af490538950d278c8afc1bdc755faac7b02e0cf449bab1824481006be542b41b3e6992fb0f651759d7752fd10ea4101c042c75955d2fa264d48
+  data.tar.gz: 5440e42e22b128aef4109c6986e15d73d993562c35df550431864c188fdfb1f9fbe8b9cc6868d749170197b9dc93a8329969b01346d85f8d7e11760be8dfdeb2

data/.gitattributes

@@ -0,0 +1 @@
+*.pdf binary

data/.ruby-version

@@ -1 +1 @@
-ruby-2.1.1
+2.1.5

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # CHANGELOG
 
+## 1.1.3 (2015-01-02)
+
+* Loosened requirements on Money gem.
+* Bumped rspec to latest and cleared up a deprecation warning.
+* Added support for `invoice_date` field (thanks [danielma](https://github.com/danielma)!)
+* Bugfix: Resolved issue where money values were being shown at 1/100th of the intended amount (thanks [watsonbox](https://github.com/watsonbox)!)
+
 ## 1.1.2 (2014-05-03)
 
 * Added NL locale (thanks [jedi4ever](https://github.com/jedi4ever)!).

data/lib/payday/invoice.rb

@@ -5,7 +5,7 @@ module Payday
     include Payday::Invoiceable
 
     attr_accessor :invoice_number, :bill_to, :ship_to, :notes, :line_items, :shipping_rate, :shipping_description,
-                  :tax_rate, :tax_description, :due_at, :paid_at, :refunded_at, :currency, :invoice_details
+                  :tax_rate, :tax_description, :due_at, :paid_at, :refunded_at, :currency, :invoice_details, :invoice_date
 
     def initialize(options =  {})
       self.invoice_number = options[:invoice_number] || nil
@@ -22,6 +22,7 @@ module Payday
       self.refunded_at = options[:refunded_at] || nil
       self.currency = options[:currency] || nil
       self.invoice_details = options[:invoice_details] || []
+      self.invoice_date = options[:invoice_date] || nil
     end
 
     # The tax rate that we're applying, as a BigDecimal

data/lib/payday/pdf_renderer.rb

@@ -126,6 +126,18 @@ module Payday
           table_data << [bold_cell(pdf, I18n.t('payday.invoice.invoice_no', :default => "Invoice #:")),
               bold_cell(pdf, invoice.invoice_number.to_s, :align => :right)]
         end
+        
+        # invoice date
+        if defined?(invoice.invoice_date) && invoice.invoice_date
+          if invoice.invoice_date.is_a?(Date) || invoice.invoice_date.is_a?(Time)
+            invoice_date = invoice.invoice_date.strftime(Payday::Config.default.date_format)
+          else
+            invoice_date = invoice.invoice_date.to_s
+          end
+          
+          table_data << [bold_cell(pdf, I18n.t('payday.invoice.invoice_date', :default => "Invoice Date:")),
+              bold_cell(pdf, invoice_date, :align => :right)]
+        end
 
         # Due on
         if defined?(invoice.due_at) && invoice.due_at
@@ -262,7 +274,10 @@ module Payday
 
       # Converts this number to a formatted currency string
       def self.number_to_currency(number, invoice)
-        Money.new(number, invoice_or_default(invoice, :currency)).format
+        currency = Money::Currency.wrap(invoice_or_default(invoice, :currency))
+        number = number * currency.subunit_to_unit
+        number = number.round unless Money.infinite_precision
+        Money.new(number, 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.1.2"
+  VERSION = "1.1.3"
 end

data/payday.gemspec

@@ -13,11 +13,11 @@ 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", "~> 1.0.0")
-  s.add_dependency("money", "~> 6.1.1")
+  s.add_dependency("money", "~> 6.1")
   s.add_dependency("prawn-svg", "~> 0.15.0.0")
   s.add_dependency("i18n", ">= 0.6.9")
 
-  s.add_development_dependency("rspec", "~> 2.14.1")
+  s.add_development_dependency("rspec", "~> 3.1.0")
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/spec/invoice_spec.rb

@@ -8,7 +8,8 @@ module Payday
           :notes => "These are some notes.",
           :line_items => [LineItem.new(:price => 10, :quantity => 3, :description => "Shirts")],
           :shipping_rate => 15.00, :shipping_description => "USPS Priority Mail:",
-          :tax_rate => 0.125, :tax_description => "Local Sales Tax, 12.5%")
+          :tax_rate => 0.125, :tax_description => "Local Sales Tax, 12.5%",
+          :invoice_date => Date.civil(1993, 4, 12))
 
       expect(i.invoice_number).to eq(20)
       expect(i.bill_to).to eq("Here")
@@ -19,6 +20,7 @@ module Payday
       expect(i.shipping_description).to eq("USPS Priority Mail:")
       expect(i.tax_rate).to eq(BigDecimal.new("0.125"))
       expect(i.tax_description).to eq("Local Sales Tax, 12.5%")
+      expect(i.invoice_date).to eq(Date.civil(1993, 4, 12))
     end
 
     it "should total all of the line items into a subtotal correctly" do
@@ -182,6 +184,7 @@ module Payday
           :tax_rate => 0.1,
           :notes => "These are some crazy awesome notes!",
           :invoice_number => 12,
+          :invoice_date => Date.civil(2011, 1, 1),
           :due_at => Date.civil(2011, 1, 22),
           :bill_to => "Alan Johnson\n101 This Way\nSomewhere, SC 22222",
           :ship_to => "Frank Johnson\n101 That Way\nOther, SC 22229"

data/spec/pdf_renderer_spec.rb

@@ -0,0 +1,11 @@
+require "spec_helper"
+
+module Payday
+	describe PdfRenderer do
+		describe ".number_to_currency" do
+			it "formats numbers to currency currectly" do
+				expect(PdfRenderer.number_to_currency(20, nil)).to eq("$20.00")
+			end
+		end
+	end
+end

data/spec/support/asset_matchers.rb

@@ -16,7 +16,7 @@ RSpec::Matchers.define(:match_binary_asset) do |file_name|
     end
   end
 
-  failure_message_for_should do |actual_output|
+  failure_message do |actual_output|
     expected_output_path = File.join('spec/assets', file_name)
     actual_output_path = File.join('tmp/rendered_output', file_name)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: payday
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Alan Johnson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-03 00:00:00.000000000 Z
+date: 2015-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prawn
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.1
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.1
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: prawn-svg
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: 3.1.0
 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.
@@ -89,6 +89,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitattributes"
 - ".gitignore"
 - ".ruby-version"
 - CHANGELOG.md
@@ -122,6 +123,7 @@ files:
 - spec/assets/tiger.svg
 - spec/invoice_spec.rb
 - spec/line_item_spec.rb
+- spec/pdf_renderer_spec.rb
 - spec/spec_helper.rb
 - spec/support/asset_matchers.rb
 homepage: ''
@@ -154,6 +156,7 @@ test_files:
 - spec/assets/tiger.svg
 - spec/invoice_spec.rb
 - spec/line_item_spec.rb
+- spec/pdf_renderer_spec.rb
 - spec/spec_helper.rb
 - spec/support/asset_matchers.rb
 has_rdoc: