payday 1.1.1 → 1.1.2

data/spec/invoice_spec.rb

@@ -62,7 +62,7 @@ module Payday
       # $1000 in Hats
       i.line_items << LineItem.new(:price => 5, :quantity => 200, :description => "Hats")
 
-      expect(i.total).to eq(BigDecimal.new("1234"))
+      expect(i.total).to eq(BigDecimal.new("1243"))
     end
 
     it "is overdue when it's past date and unpaid" do
@@ -80,6 +80,16 @@ module Payday
       expect(i.overdue?).to eq(true)
     end
 
+    it "shouldn't be refunded when not marked refunded" do
+      i = Invoice.new
+      expect(i.refunded?).not_to eq(true)
+    end
+
+    it "should be refunded when marked as refunded" do
+      i = Invoice.new(:refunded_at => Date.today)
+      expect(i.refunded?).to eq(true)
+    end
+
     it "shouldn't be paid when not marked paid" do
       i = Invoice.new
       expect(i.paid?).not_to eq(true)
@@ -120,57 +130,64 @@ module Payday
         Config.default.reset
       end
 
-      it "should be able to render to a file" do
+      let(:invoice) { new_invoice(invoice_params) }
+      let(:invoice_params) { {} }
+
+      it "should render to a file" do
         File.unlink("tmp/testing.pdf") if File.exists?("tmp/testing.pdf")
 
-        i = Invoice.new(:tax_rate => 0.1, :notes => "These are some crazy awesome notes!", :invoice_number => 12,
-            :due_at => Date.civil(2011, 1, 22), #:paid_at => Date.civil(2012, 2, 22),
-            :bill_to => "Alan Johnson\n101 This Way\nSomewhere, SC 22222",
-            :ship_to => "Frank Johnson\n101 That Way\nOther, SC 22229",
-            :invoice_details => {"Ordered By:" => "Alan Johnson", "Paid By:" => "Dude McDude"})
+        invoice.render_pdf_to_file("tmp/testing.pdf")
+
+        expect(File.exists?("tmp/testing.pdf")).to be true
+      end
 
-        Payday::Config.default.company_details = "10 This Way\nManhattan, NY 10001\n800-111-2222\nawesome@awesomecorp.com"
+      context 'with some invoice details' do
+        let(:invoice_params) { {
+          :invoice_details => { "Ordered By:" => "Alan Johnson", "Paid By:" => "Dude McDude" }
+        } }
 
-        30.times do
-          i.line_items << LineItem.new(:price => 20, :quantity => 5, :description => "Pants")
-          i.line_items << LineItem.new(:price => 10, :quantity => 3, :description => "Shirts")
-          i.line_items << LineItem.new(:price => 5, :quantity => 200, :description => "Hats")
-        end
+        it "should render an invoice correctly" do
+          Payday::Config.default.company_details = "10 This Way\nManhattan, NY 10001\n800-111-2222\nawesome@awesomecorp.com"
 
-        i.render_pdf_to_file("tmp/testing.pdf")
+          invoice.line_items += [
+            LineItem.new(:price => 20, :quantity => 5, :description => "Pants"),
+            LineItem.new(:price => 10, :quantity => 3, :description => "Shirts"),
+            LineItem.new(:price => 5, :quantity => 200, :description => "Hats")
+          ] * 30
 
-        expect(File.exists?("tmp/testing.pdf")).to eq(true)
+          expect(invoice.render_pdf).to match_binary_asset 'testing.pdf'
+        end
       end
 
-      it "should be able to render to a string" do
-        i = Invoice.new(:tax_rate => 0.1, :notes => "These are some crazy awesome notes!", :invoice_number => 12,
-          :due_at => Date.civil(2011, 1, 22), :paid_at => Date.civil(2012, 2, 22),
-          :bill_to => "Alan Johnson\n101 This Way\nSomewhere, SC 22222", :ship_to => "Frank Johnson\n101 That Way\nOther, SC 22229")
-
-        3.times do
-          i.line_items << LineItem.new(:price => 20, :quantity => 5, :description => "Pants")
-          i.line_items << LineItem.new(:price => 10, :quantity => 3, :description => "Shirts")
-          i.line_items << LineItem.new(:price => 5, :quantity => 200.0, :description => "Hats")
+      context 'paid, with an svg logo' do
+        before do
+          Payday::Config.default.invoice_logo = { :filename => "spec/assets/tiger.svg", :size => "100x100" }
         end
 
-        expect(i.render_pdf).not_to eq(nil)
-      end
+        let(:invoice_params) { { :paid_at => Date.civil(2012, 2, 22) } }
 
-      it "should be able to render with an svg logo" do
-        Payday::Config.default.invoice_logo = { :filename => "assets/tiger.svg", :size => "100x100" }
-        i = Invoice.new(:tax_rate => 0.1, :notes => "These are some crazy awesome notes!", :invoice_number => 12,
-          :due_at => Date.civil(2011, 1, 22), :paid_at => Date.civil(2012, 2, 22),
-          :bill_to => "Alan Johnson\n101 This Way\nSomewhere, SC 22222", :ship_to => "Frank Johnson\n101 That Way\nOther, SC 22229")
+        it 'should render an invoice correctly' do
+          invoice.line_items += [
+            LineItem.new(:price => 20, :quantity => 5, :description => "Pants"),
+            LineItem.new(:price => 10, :quantity => 3, :description => "Shirts"),
+            LineItem.new(:price => 5, :quantity => 200.0, :description => "Hats")
+          ] * 3
 
-        3.times do
-          i.line_items << LineItem.new(:price => 20, :quantity => 5, :description => "Pants")
-          i.line_items << LineItem.new(:price => 10, :quantity => 3, :description => "Shirts")
-          i.line_items << LineItem.new(:price => 5, :quantity => 200.0, :description => "Hats")
+          expect(invoice.render_pdf).to match_binary_asset 'svg.pdf'
         end
+      end
 
-        i.render_pdf_to_file("tmp/svg.pdf")
-
-        expect(i.render_pdf).not_to eq(nil)
+      def new_invoice(params = {})
+        default_params = {
+          :tax_rate => 0.1,
+          :notes => "These are some crazy awesome notes!",
+          :invoice_number => 12,
+          :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"
+        }
+
+        Invoice.new(default_params.merge(params))
       end
     end
   end

data/spec/spec_helper.rb

@@ -1,9 +1,8 @@
-require 'rubygems'
-require 'bundler/setup'
+require_relative '../lib/payday'
 
-require 'payday'
-require 'date'
-require 'time'
+# Requires supporting ruby files with custom matchers and macros, etc, in
+# spec/support/ and its subdirectories.
+Dir["spec/support/**/*.rb"].each { |f| require f[5..-1] }
 
 RSpec.configure do |config|
   # some (optional) config here

data/spec/support/asset_matchers.rb

@@ -0,0 +1,25 @@
+require 'fileutils'
+
+# Usage: expect(renderer.render).to match_binary_asset('pdf/test.pdf')
+RSpec::Matchers.define(:match_binary_asset) do |file_name|
+  match do |actual_output|
+    expected_path = File.join('spec/assets', file_name)
+    expected_output = File.binread(expected_path)
+
+    (actual_output == expected_output).tap do |result|
+      unless result
+        output_path = File.join('tmp/rendered_output', file_name)
+
+        FileUtils.mkdir_p(File.dirname(output_path))
+        File.open(output_path, "wb") { |f| f.write actual_output }
+      end
+    end
+  end
+
+  failure_message_for_should do |actual_output|
+    expected_output_path = File.join('spec/assets', file_name)
+    actual_output_path = File.join('tmp/rendered_output', file_name)
+
+    "expected output to match '#{expected_output_path}' (see #{actual_output_path})"
+  end
+end

metadata

@@ -1,96 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: payday
 version: !ruby/object:Gem::Version
-  version: 1.1.1
-  prerelease: 
+  version: 1.1.2
 platform: ruby
 authors:
 - Alan Johnson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-20 00:00:00.000000000 Z
+date: 2014-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prawn
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: money
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.6.1
+        version: 6.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.6.1
+        version: 6.1.1
 - !ruby/object:Gem::Dependency
   name: prawn-svg
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.15.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.15.0.0
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.9
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.1
 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.
@@ -100,13 +89,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- ".ruby-version"
 - CHANGELOG.md
 - Gemfile
 - README.md
 - Rakefile
-- assets/default_logo.png
-- assets/tiger.svg
 - lib/generators/payday/setup/USAGE
 - lib/generators/payday/setup/setup_generator.rb
 - lib/generators/payday/setup/templates/invoice.rb
@@ -123,44 +111,49 @@ files:
 - lib/payday/locale/en.yml
 - lib/payday/locale/es.yml
 - lib/payday/locale/fr.yml
+- lib/payday/locale/nl.yml
 - lib/payday/locale/zh-CN.yml
 - lib/payday/pdf_renderer.rb
 - lib/payday/version.rb
 - payday.gemspec
+- spec/assets/default_logo.png
+- spec/assets/svg.pdf
+- spec/assets/testing.pdf
+- spec/assets/tiger.svg
 - spec/invoice_spec.rb
 - spec/line_item_spec.rb
 - spec/spec_helper.rb
+- spec/support/asset_matchers.rb
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2492971967055799217
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2492971967055799217
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: git remote add origin git@github.com:commondream/payday.git
 test_files:
+- spec/assets/default_logo.png
+- spec/assets/svg.pdf
+- spec/assets/testing.pdf
+- spec/assets/tiger.svg
 - spec/invoice_spec.rb
 - spec/line_item_spec.rb
 - spec/spec_helper.rb
+- spec/support/asset_matchers.rb
+has_rdoc: