polish_invoicer 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06b01319cc715a21e74a8e2969c2da83e9b2a1ca
-  data.tar.gz: b6a554a0b705fb5d9db3c52b4da25285c0e09564
+  metadata.gz: 312fe8f98e08534aee77cd955333f5ef46d71254
+  data.tar.gz: 4b95737c8385e6443fd496367fd4a8504cd99b75
 SHA512:
-  metadata.gz: 605299516ed407eac04ea06b76ec7142b749d6602c1049cb3815aa6d24960f94f01f0e30e7c4bc9df7662284bfa126bb3ce1c1bea1e68bd9bcb2fe513425c5ea
-  data.tar.gz: 74e035ef3f48d5501319073bd852bd4839afc09e2d37d434a49115907e76c627c2e7e020582d26647949c8efaf5d30ba08dc82f88c029f4853209501d5e5e338
+  metadata.gz: 9ec09c10060ec883d524c1504f433ec3dfcbfbfe8a46e17ef4d8e8a9fdad515e0d62582ad130539de30fe779809792d148724e246ce43d2a2158a0815baa1a5c
+  data.tar.gz: 6d04f34ebf85cdc467f49b3541bd98baaa8fb220430c697830b507c412f2f1292f96e3d9ea4e1281458bdb4591e36ec8e416b6fefebfc02d0ee3a860965fc5fe

data/.gitignore

@@ -14,3 +14,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+/.idea

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
 rvm:
-  - 2.0.0
-  - 1.9.3
+  - 2.2.7
+  - 2.3.4
+  - 2.4.1

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2014 Piotr Macuk
+Copyright (c) 2014-2017 Piotr Macuk
 
 MIT License
 

data/README.md

@@ -3,9 +3,9 @@
 PolishInvoicer gem creates polish invoices and proforms as HTML or PDF files.
 Gem description will be in polish language because of specific case of this gem.
 
-Gem jest zgodny z nową [ustawą o podatku VAT](http://www.przepisy.gofin.pl/przepisy,3,32,32,670,55454,20140101,faktury.html), która weszła w życie z dniem 1 stycznia 2014.
+Gem jest zgodny z nową [ustawą o podatku VAT](http://www.przepisy.gofin.pl/przepisy,2,32,32,670,,,ustawa-z-dnia-11032004-r-o-podatku-od-towarow-i-uslug.html), która weszła w życie z dniem 1 stycznia 2017.
 
-[Krótkie podsumowanie zmian w wystawianiu faktur](http://www.jzk.pl/zmiany-2014).
+[Krótkie podsumowanie zmian w wystawianiu faktur](https://www.jzk.pl/2017).
 
 ## Installation
 
@@ -28,7 +28,7 @@ Or install it yourself as:
 ```ruby
 require 'polish_invoicer'
 
-invoice = PolishInvoicer::Invoice.new({
+invoice = PolishInvoicer::Invoice.new(
   number: '1/2014',                       # numer faktury
   create_date: Date.today,                # data wystawienia
   trade_date: Date.today,                 # data wykonania usługi
@@ -45,7 +45,7 @@ invoice = PolishInvoicer::Invoice.new({
   payment_date: Date.today + 14,          # data płatności
   proforma: true,                         # znacznik proformy
   paid: false,                            # znacznik opłacenia usługi
-})
+)
 if invoice.valid?
   invoice.save_to_html('/path/to/proforma.html')
   invoice.save_to_pdf('/path/to/proforma.pdf')
@@ -98,6 +98,7 @@ invoice.save_to_pdf('/path/to/invoice.pdf')
 ### Parametry dodatkowe
 
     :buyer_nip,           # NIP nabywcy (string)
+    :recipient,           # odbiorca faktury (tablica stringów)    
     :comments,            # uwagi (string lub tablica stringów)
     :pkwiu,               # numer PKWiU (string)
     :no_vat_reason,       # podstawa prawna zwolnienia z VAT (string)
@@ -128,7 +129,7 @@ puts invoice.errors.inspect
     {
       :vat=>"Stawka VAT spoza listy dopuszczalnych wartości",
       :create_date=>"Data wystawienia nie może być późniejsza niż 15 dzień następnego miesiąca po wykonaniu usługi"
-      }
+    }
 
 ## Dodatkowe metody
 

data/Rakefile

@@ -1,9 +1,9 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
+require 'bundler/gem_tasks'
+require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
+  t.libs << 'test'
   t.test_files = FileList['test/*_test.rb']
 end
 
-task :default => :test
+task default: :test

data/doc/invoice.rb

@@ -1,7 +1,6 @@
-# encoding: utf-8
 require 'polish_invoicer'
 
-invoice = PolishInvoicer::Invoice.new({
+invoice = PolishInvoicer::Invoice.new(
   number: '1/2014',                       # numer faktury
   create_date: Date.today,                # data wystawienia
   trade_date: Date.today,                 # data wykonania usługi
@@ -16,6 +15,6 @@ invoice = PolishInvoicer::Invoice.new({
   item_name: 'Usługi programistyczne',    # nazwa usługi
   price: 3500,                            # cena (domyślnie brutto)
   payment_date: Date.today + 14,          # data płatności
-})
+)
 invoice.save_to_html('/tmp/invoice.html')
 invoice.save_to_pdf('/tmp/invoice.pdf')

data/doc/proforma.rb

@@ -1,7 +1,6 @@
-# encoding: utf-8
 require 'polish_invoicer'
 
-invoice = PolishInvoicer::Invoice.new({
+invoice = PolishInvoicer::Invoice.new(
   number: '1/2014/PROFORMA',              # numer faktury
   create_date: Date.today,                # data wystawienia
   trade_date: Date.today,                 # data wykonania usługi
@@ -18,6 +17,6 @@ invoice = PolishInvoicer::Invoice.new({
   payment_date: Date.today + 14,          # data płatności
   proforma: true,
   paid: false
-})
+)
 invoice.save_to_html('/tmp/proforma.html')
 invoice.save_to_pdf('/tmp/proforma.pdf')

data/lib/polish_invoicer/invoice.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 module PolishInvoicer
   class Invoice
     AVAILABLE_PARAMS = [
@@ -9,6 +8,7 @@ module PolishInvoicer
       :seller_nip,        # NIP sprzedawcy (string)
       :buyer,             # adres nabywcy (tablica stringów)
       :buyer_nip,         # NIP nabywcy (string)
+      :recipient,         # odbiorca faktury (tablica stringów)
       :item_name,         # nazwa usługi (string)
       :price,             # cena w złotych (float)
       :gross_price,       # znacznik rodzaju ceny (netto/brutto), domyślnie: true (boolean)
@@ -21,19 +21,19 @@ module PolishInvoicer
       :footer,            # treść umieszczana w stopce faktury (string)
       :proforma,          # znacznik faktury pro-forma, domyślnie: false (boolean)
       :no_vat_reason,     # podstawa prawna zwolnienia z VAT (string)
-    ]
+    ].freeze
 
-    attr_accessor *AVAILABLE_PARAMS
+    attr_accessor(*AVAILABLE_PARAMS)
     attr_accessor :template_path
     attr_accessor :logger, :wkhtmltopdf_path, :wkhtmltopdf_command
 
-    def initialize(params={})
+    def initialize(params = {})
       set_defaults
       params.each do |k, v|
         raise "Nierozpoznany parametr #{k}" unless AVAILABLE_PARAMS.include?(k)
         send("#{k}=", v)
       end
-      @validator = Validator.new(self)
+      @validator = PolishInvoicer::Validator.new(self)
     end
 
     def errors
@@ -47,7 +47,7 @@ module PolishInvoicer
     # cena/wartość netto
     def net_value
       return price unless gross_price
-      price / (1 + Vat.to_i(vat)/100.0)
+      price / (1 + Vat.to_i(vat) / 100.0)
     end
 
     # kwota VAT
@@ -58,7 +58,7 @@ module PolishInvoicer
     # cena/wartość brutto
     def gross_value
       return price if gross_price
-      price + price * Vat.to_i(vat)/100.0
+      price + price * Vat.to_i(vat) / 100.0
     end
 
     def save_to_html(path)
@@ -76,19 +76,20 @@ module PolishInvoicer
       Presenter.new(self).data
     end
 
-    protected
-      def set_defaults
-        @gross_price = true
-        @vat = 23
-        @payment_type = 'Przelew'
-        @paid = true
-        @proforma = false
-      end
+    private
 
-      def validate!
-        return if valid?
-        error_messages = errors.map { |k, v| "#{k}: #{v}" }.join(', ')
-        raise "Parametry do wystawienia faktury są nieprawidłowe: #{error_messages}"
-      end
+    def set_defaults
+      @gross_price = true
+      @vat = 23
+      @payment_type = 'Przelew'
+      @paid = true
+      @proforma = false
+    end
+
+    def validate!
+      return if valid?
+      error_messages = errors.map { |k, v| "#{k}: #{v}" }.join(', ')
+      raise "Parametry do wystawienia faktury są nieprawidłowe: #{error_messages}"
+    end
   end
 end

data/lib/polish_invoicer/presenter.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 module PolishInvoicer
   class Presenter
     attr_accessor :invoice
@@ -19,45 +18,46 @@ module PolishInvoicer
       @out
     end
 
-    protected
-      def copy_available_params
-        Invoice::AVAILABLE_PARAMS.each do |field|
-          @out[field] = @invoice.send(field)
-        end
-      end
+    private
 
-      def remove_redundand_params
-        @out.delete(:price)
+    def copy_available_params
+      Invoice::AVAILABLE_PARAMS.each do |field|
+        @out[field] = @invoice.send(field)
       end
+    end
 
-      def copy_additional_params
-        %w(net_value vat_value gross_value).each do |field|
-          @out[field.to_sym] = @invoice.send(field)
-        end
-      end
+    def remove_redundand_params
+      @out.delete(:price)
+    end
 
-      def format_dates
-        %w(trade_date create_date payment_date).each do |field|
-          v = @invoice.send(field)
-          next unless v
-          @out[field.to_sym] = v.strftime "%d.%m.%Y"
-        end
+    def copy_additional_params
+      %w(net_value vat_value gross_value).each do |field|
+        @out[field.to_sym] = @invoice.send(field)
       end
+    end
 
-      def format_prices
-        %w(net_value vat_value gross_value).each do |field|
-          v = @invoice.send(field)
-          next unless v
-          @out[field.to_sym] = sprintf("%02.2f", v).gsub('.', ',')
-        end
+    def format_dates
+      %w(trade_date create_date payment_date).each do |field|
+        v = @invoice.send(field)
+        next unless v
+        @out[field.to_sym] = v.strftime '%d.%m.%Y'
       end
+    end
 
-      def format_comments
-        @out[:comments] = [@invoice.comments].flatten.compact
+    def format_prices
+      %w(net_value vat_value gross_value).each do |field|
+        v = @invoice.send(field)
+        next unless v
+        @out[field.to_sym] = sprintf('%02.2f', v).tr('.', ',')
       end
+    end
 
-      def format_vat
-        @out[:vat] = Vat.to_s(@invoice.vat)
-      end
+    def format_comments
+      @out[:comments] = [@invoice.comments].flatten.compact
+    end
+
+    def format_vat
+      @out[:vat] = Vat.to_s(@invoice.vat)
+    end
   end
 end

data/lib/polish_invoicer/validator.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 module PolishInvoicer
   class Validator
     attr_reader :errors
@@ -18,107 +17,84 @@ module PolishInvoicer
       check_price
       check_vat
       check_proforma
-      check_create_and_trade_date_correlation
       @errors.empty?
     end
 
-    protected
-      def check_presence
-        check_blank(:number, 'Numer nie może być pusty')
-        check_blank(:create_date, 'Data wystawienia nie może być pusta')
-        check_blank(:trade_date, 'Data sprzedaży nie może być pusta')
-        check_blank(:seller, 'Sprzedawca nie może być pusty')
-        check_blank(:buyer, 'Nabywca nie może być pusty')
-        check_blank(:item_name, 'Nazwa usługi nie może być pusta')
-        check_blank(:price, 'Cena nie może być pusta')
-        check_blank(:vat, 'Stawka VAT nie może być pusta')
-        check_blank(:payment_type, 'Rodzaj płatności nie może być pusty')
-        check_blank(:payment_date, 'Termin płatności nie może być pusty')
-        check_blank(:seller_nip, 'NIP sprzedawcy nie może być pusty')
-      end
-
-      def check_not_nil
-        @errors[:gross_price] = 'Konieczne jest ustawienie znacznika rodzaju ceny (netto/brutto)' if @invoice.gross_price.nil?
-        @errors[:paid] = 'Konieczne jest ustawienie znacznika opłacenia faktury' if @invoice.paid.nil?
-      end
+    private
 
-      def check_arrays
-        @errors[:seller] = 'Sprzedawca musi być podany jako tablica stringów' unless @invoice.seller.is_a?(Array)
-        @errors[:buyer] = 'Nabywca musi być podany jako tablica stringów' unless @invoice.buyer.is_a?(Array)
-      end
+    def check_presence
+      check_blank(:number, 'Numer nie może być pusty')
+      check_blank(:create_date, 'Data wystawienia nie może być pusta')
+      check_blank(:trade_date, 'Data sprzedaży nie może być pusta')
+      check_blank(:seller, 'Sprzedawca nie może być pusty')
+      check_blank(:buyer, 'Nabywca nie może być pusty')
+      check_blank(:item_name, 'Nazwa usługi nie może być pusta')
+      check_blank(:price, 'Cena nie może być pusta')
+      check_blank(:vat, 'Stawka VAT nie może być pusta')
+      check_blank(:payment_type, 'Rodzaj płatności nie może być pusty')
+      check_blank(:payment_date, 'Termin płatności nie może być pusty')
+      check_blank(:seller_nip, 'NIP sprzedawcy nie może być pusty')
+    end
 
-      def check_booleans
-        unless [true, false].include?(@invoice.gross_price)
-          @errors[:gross_price] = 'Znacznik rodzaju ceny musi być podany jako boolean'
-        end
-        unless [true, false].include?(@invoice.paid)
-          @errors[:paid] = 'Znacznik opłacenia faktury musi być podany jako boolean'
-        end
-        unless [true, false].include?(@invoice.proforma)
-          @errors[:proforma] = 'Znacznik faktury pro-forma musi być podany jako boolean'
-        end
-      end
+    def check_not_nil
+      @errors[:gross_price] = 'Konieczne jest ustawienie znacznika rodzaju ceny (netto/brutto)' if @invoice.gross_price.nil?
+      @errors[:paid] = 'Konieczne jest ustawienie znacznika opłacenia faktury' if @invoice.paid.nil?
+    end
 
-      def check_dates
-        @errors[:create_date] = 'Data wystawienia musi być typu Date' unless @invoice.create_date.is_a?(Date)
-        @errors[:trade_date] = 'Data sprzedaży musi być typu Date' unless @invoice.trade_date.is_a?(Date)
-        @errors[:payment_date] = 'Termin płatności musi być typu Date' unless @invoice.payment_date.is_a?(Date)
-      end
+    def check_arrays
+      @errors[:seller] = 'Sprzedawca musi być podany jako tablica stringów' unless @invoice.seller.is_a?(Array)
+      @errors[:buyer] = 'Nabywca musi być podany jako tablica stringów' unless @invoice.buyer.is_a?(Array)
+    end
 
-      def check_price
-        unless @invoice.price.is_a?(Numeric)
-          @errors[:price] = 'Cena musi być liczbą'
-        else
-          @errors[:price] = 'Cena musi być liczbą dodatnią' unless @invoice.price > 0
-        end
+    def check_booleans
+      unless [true, false].include?(@invoice.gross_price)
+        @errors[:gross_price] = 'Znacznik rodzaju ceny musi być podany jako boolean'
       end
-
-      def check_vat
-        unless Vat.valid?(@invoice.vat)
-          @errors[:vat] = 'Stawka VAT spoza listy dopuszczalnych wartości'
-        else
-          if Vat.zw?(@invoice.vat) and blank?(@invoice.no_vat_reason)
-            @errors[:no_vat_reason] = 'Konieczne jest podanie podstawy prawnej zwolnienia z podatku VAT'
-          end
-        end
+      unless [true, false].include?(@invoice.paid)
+        @errors[:paid] = 'Znacznik opłacenia faktury musi być podany jako boolean'
       end
-
-      def check_proforma
-        return unless @invoice.proforma
-        return unless @invoice.paid
-        @errors[:paid] = 'Proforma nie może być opłacona'
+      unless [true, false].include?(@invoice.proforma)
+        @errors[:proforma] = 'Znacznik faktury pro-forma musi być podany jako boolean'
       end
+    end
 
-      def blank?(value)
-        value.to_s.strip == ''
-      end
+    def check_dates
+      @errors[:create_date] = 'Data wystawienia musi być typu Date' unless @invoice.create_date.is_a?(Date)
+      @errors[:trade_date] = 'Data sprzedaży musi być typu Date' unless @invoice.trade_date.is_a?(Date)
+      @errors[:payment_date] = 'Termin płatności musi być typu Date' unless @invoice.payment_date.is_a?(Date)
+    end
 
-      def check_blank(key, msg)
-        value = @invoice.send(key)
-        @errors[key] = msg if blank?(value)
+    def check_price
+      unless @invoice.price.is_a?(Numeric)
+        @errors[:price] = 'Cena musi być liczbą'
+      else
+        @errors[:price] = 'Cena musi być liczbą dodatnią' unless @invoice.price > 0
       end
+    end
 
-      def check_create_and_trade_date_correlation
-        return unless @invoice.create_date
-        return unless @invoice.trade_date
-        cd = @invoice.create_date
-        td = @invoice.trade_date
-        # data wystawienia max 30 dni przed wykonaniem usługi
-        if cd < td and (td - cd > 30)
-          msg = 'Data wystawienia nie może być wcześniejsza niż ' +
-                '30 dni przed wykonaniem usługi'
-          @errors[:create_date] = msg
-        end
-        # data wystawienie max 15 dnia następnego miesiąca po wykonaniu usługi
-        if cd > td
-          td_nm = td.next_month
-          cd_dl = Date.new(td_nm.year, td_nm.month, 15)
-          if cd > cd_dl
-            msg = 'Data wystawienia nie może być późniejsza niż ' +
-                  '15 dzień następnego miesiąca po wykonaniu usługi'
-            @errors[:create_date] = msg
-          end
+    def check_vat
+      unless Vat.valid?(@invoice.vat)
+        @errors[:vat] = 'Stawka VAT spoza listy dopuszczalnych wartości'
+      else
+        if Vat.zw?(@invoice.vat) && blank?(@invoice.no_vat_reason)
+          @errors[:no_vat_reason] = 'Konieczne jest podanie podstawy prawnej zwolnienia z podatku VAT'
         end
       end
+    end
+
+    def check_proforma
+      return unless @invoice.proforma
+      return unless @invoice.paid
+      @errors[:paid] = 'Proforma nie może być opłacona'
+    end
+
+    def blank?(value)
+      value.to_s.strip == ''
+    end
+
+    def check_blank(key, msg)
+      value = @invoice.send(key)
+      @errors[key] = msg if blank?(value)
+    end
   end
 end

data/lib/polish_invoicer/vat.rb

@@ -19,18 +19,19 @@ module PolishInvoicer
 
     # Potrzebne do obliczeń netto/vat/brutto
     def self.to_i(rate)
-      (rate != -1) ? rate : 0
+      rate != -1 ? rate : 0
     end
 
-    protected
-      def self.hash
-        h = {}
-        rates.each do |r|
-          name = "#{r}%"
-          name = 'zw.' if r == -1
-          h[name] = r
-        end
-        h
+    private
+
+    def self.hash
+      h = {}
+      rates.each do |r|
+        name = "#{r}%"
+        name = 'zw.' if r == -1
+        h[name] = r
       end
+      h
+    end
   end
 end

data/lib/polish_invoicer/version.rb

@@ -1,3 +1,3 @@
 module PolishInvoicer
-  VERSION = "0.0.5"
+  VERSION = '0.0.6'.freeze
 end

data/lib/polish_invoicer/writer.rb

@@ -22,15 +22,16 @@ module PolishInvoicer
       @writer.save_to_pdf(path)
     end
 
-    protected
-      def create_writer
-        @writer = Slim2pdf::Writer.new(template_path)
-        @writer.wkhtmltopdf_path = wkhtmltopdf_path
-        @writer.wkhtmltopdf_command = wkhtmltopdf_command
-        @writer.logger = logger
-        data = @invoice.to_hash
-        @writer.data = data
-        @writer.footer_text = data[:footer]
-      end
+    private
+
+    def create_writer
+      @writer = Slim2pdf::Writer.new(template_path)
+      @writer.wkhtmltopdf_path = wkhtmltopdf_path
+      @writer.wkhtmltopdf_command = wkhtmltopdf_command
+      @writer.logger = logger
+      data = @invoice.to_hash
+      @writer.data = data
+      @writer.footer_text = data[:footer]
+    end
   end
 end

data/lib/polish_invoicer.rb

@@ -1,14 +1,10 @@
-require "date"
+require 'date'
 require 'pathname'
 
-require "polish_invoicer/version"
-require "polish_invoicer/vat"
-require "polish_invoicer/validator"
+require 'polish_invoicer/version'
+require 'polish_invoicer/vat'
+require 'polish_invoicer/validator'
 require 'slim2pdf'
-require "polish_invoicer/writer"
-require "polish_invoicer/presenter"
-require "polish_invoicer/invoice"
-
-module PolishInvoicer
-  # Your code goes here...
-end
+require 'polish_invoicer/writer'
+require 'polish_invoicer/presenter'
+require 'polish_invoicer/invoice'

data/polish_invoicer.gemspec

@@ -1,26 +1,27 @@
-# coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'polish_invoicer/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "polish_invoicer"
+  spec.name          = 'polish_invoicer'
   spec.version       = PolishInvoicer::VERSION
-  spec.authors       = ["Piotr Macuk"]
-  spec.email         = ["piotr@macuk.pl"]
-  spec.description   = %q{Creates polish invoices and proforms as HTML or PDF files}
-  spec.summary       = %q{Creates polish invoices and proforms as HTML or PDF files}
-  spec.homepage      = ""
-  spec.license       = "MIT"
+  spec.authors       = ['Piotr Macuk']
+  spec.email         = ['piotr@macuk.pl']
+  spec.description   = 'Creates polish invoices and proforms as HTML or PDF files'
+  spec.summary       = 'Creates polish invoices and proforms as HTML or PDF files'
+  spec.homepage      = ''
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "simplecov"
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'minitest'
+  spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'rubocop'
 
-  spec.add_dependency 'slim2pdf', '~> 0.0.4'
+  spec.add_dependency 'slim2pdf'
 end

data/test/invoice_test.rb

@@ -1,20 +1,19 @@
-# encoding: utf-8
 require 'test_helper'
 
 module PolishInvoicer
-  class InvoiceTest < MiniTest::Unit::TestCase
+  class InvoiceTest < Minitest::Test
     def test_init
       i = Invoice.new
       assert i.is_a?(Invoice)
     end
 
     def test_set_available_param
-      i = Invoice.new({number: '1/2014'})
+      i = Invoice.new(number: '1/2014')
       assert_equal '1/2014', i.number
     end
 
     def test_set_unavailable_param
-      assert_raises(RuntimeError) { i = Invoice.new({test: 'abc'}) }
+      assert_raises(RuntimeError) { Invoice.new(test: 'abc') }
     end
 
     def test_validation_delegation
@@ -27,7 +26,7 @@ module PolishInvoicer
     end
 
     def test_net_value
-      i = Invoice.new({price: 123.45, gross_price: false, vat: 23})
+      i = Invoice.new(price: 123.45, gross_price: false, vat: 23)
       assert_in_delta 123.45, i.net_value, 0.01
       i.gross_price = true
       assert_in_delta 100.37, i.net_value, 0.01
@@ -43,7 +42,7 @@ module PolishInvoicer
     end
 
     def test_vat_value
-      i = Invoice.new({price: 123.45, gross_price: false, vat: 23})
+      i = Invoice.new(price: 123.45, gross_price: false, vat: 23)
       assert_in_delta 28.39, i.vat_value, 0.01
       i.gross_price = true
       assert_in_delta 23.08, i.vat_value, 0.01
@@ -54,7 +53,7 @@ module PolishInvoicer
     end
 
     def test_gross_value
-      i = Invoice.new({price: 123.45, gross_price: false, vat: 23})
+      i = Invoice.new(price: 123.45, gross_price: false, vat: 23)
       assert_in_delta 151.84, i.gross_value, 0.01
       i.gross_price = true
       assert_in_delta 123.45, i.gross_value, 0.01
@@ -92,7 +91,7 @@ module PolishInvoicer
       i = create_valid_invoice
       path = '/tmp/test.html'
       i.save_to_html(path)
-      assert File.exists?(path)
+      assert File.exist?(path)
       File.unlink(path)
     end
 
@@ -100,12 +99,12 @@ module PolishInvoicer
       i = create_valid_invoice
       path = '/tmp/test.pdf'
       i.save_to_pdf(path)
-      assert File.exists?(path)
+      assert File.exist?(path)
       File.unlink(path)
     end
 
     def test_to_hash
-      i = Invoice.new({price: 123.45, gross_price: false})
+      i = Invoice.new(price: 123.45, gross_price: false)
       h = i.to_hash
       assert h[:paid] # default
       assert_equal false, h[:gross_price] # params

data/test/presenter_test.rb

@@ -1,8 +1,7 @@
-# encoding: utf-8
 require 'test_helper'
 
 module PolishInvoicer
-  class PresenterTest < MiniTest::Unit::TestCase
+  class PresenterTest < Minitest::Test
     require 'ostruct'
 
     def setup
@@ -36,9 +35,9 @@ module PolishInvoicer
       @invoice.comments = 'Test'
       data = Presenter.new(@invoice).data
       assert_equal ['Test'], data[:comments]
-      @invoice.comments = ['A', 'B']
+      @invoice.comments = %w(A B)
       data = Presenter.new(@invoice).data
-      assert_equal ['A', 'B'], data[:comments]
+      assert_equal %w(A B), data[:comments]
     end
 
     def test_vat

data/test/test_generator.rb

@@ -1,7 +1,6 @@
-# encoding: utf-8
 require 'polish_invoicer'
 
-i = PolishInvoicer::Invoice.new({
+i = PolishInvoicer::Invoice.new(
   number: '1/2014', create_date: Date.today, trade_date: Date.today,
   seller: ['Abaka sp. z o.o.', 'ul. Jasna 10', '10-234 Kraków'],
   buyer: ['Fabryki słodyczy S.A.', 'ul. Słodka 12/34', '12-345 Warszawa'],
@@ -9,9 +8,11 @@ i = PolishInvoicer::Invoice.new({
   price: 123.45, payment_date: Date.today,
   comments: 'Test uwag', footer: 'Stopka faktury plus tekst promocyjny',
   seller_nip: '123-456-78-90', buyer_nip: '987-654-32-10'
-})
+)
 
 i.save_to_pdf('/tmp/invoice-default.pdf')
+i.recipient = ['Szkoła Podstawowa Nr 1', 'ul. Zielona 10', '81-222 Gdynia', 'Nr ewid: SP1/2017']
+i.save_to_pdf('/tmp/invoice-with-recipient.pdf')
 i.paid = false
 i.save_to_pdf('/tmp/invoice-not-paid.pdf')
 i.proforma = true

data/test/test_helper.rb

@@ -8,12 +8,12 @@ require 'polish_invoicer'
 require 'minitest/autorun'
 
 def create_valid_invoice
-  invoice = PolishInvoicer::Invoice.new({
+  invoice = PolishInvoicer::Invoice.new(
     number: '1/2014', create_date: Date.today, trade_date: Date.today,
     seller: ['Seller'], buyer: ['Buyer'],
     seller_nip: '123-123-22-33', buyer_nip: '554-333-22-11',
     item_name: 'Title', price: 123.45, payment_date: Date.today
-  })
+  )
   assert invoice.valid?
   invoice
 end

data/test/validator_test.rb

@@ -1,21 +1,21 @@
 require 'test_helper'
 
 module PolishInvoicer
-  class ValidatorTest < MiniTest::Unit::TestCase
+  class ValidatorTest < Minitest::Test
     require 'ostruct'
 
     def setup
       @invoice = OpenStruct.new
     end
 
-    def check_error(field, value=nil)
+    def check_error(field, value = nil)
       @invoice.send("#{field}=", value)
       v = Validator.new(@invoice)
       v.valid?
       assert v.errors[field]
     end
 
-    def check_ok(field, value=nil)
+    def check_ok(field, value = nil)
       @invoice.send("#{field}=", value)
       v = Validator.new(@invoice)
       v.valid?
@@ -129,47 +129,26 @@ module PolishInvoicer
       check_ok(:buyer_nip, '123')
     end
 
-    def check_dates_ok(create_date, trade_date, msg=nil)
+    def check_dates_ok(create_date, trade_date, msg = nil)
       @invoice.create_date = Date.parse(create_date)
       @invoice.trade_date = Date.parse(trade_date)
-      v = Validator.new(@invoice); v.valid?
+      v = Validator.new(@invoice)
+      v.valid?
       assert_nil v.errors[:create_date], msg
     end
 
-    def check_dates_error(create_date, trade_date, msg=nil)
-      @invoice.create_date = Date.parse(create_date)
-      @invoice.trade_date = Date.parse(trade_date)
-      v = Validator.new(@invoice); v.valid?
-      assert v.errors[:create_date], msg
-    end
-
-    # data wystawienia max 30 dni przed wykonaniem usługi
-    def test_create_and_trade_date_correlation_before_trade
-      check_dates_ok('2014-01-01', '2014-01-01', 'B1')
-      check_dates_ok('2014-01-01', '2014-01-31', 'B2')
-      check_dates_error('2014-01-01', '2014-02-01', 'B3')
-      check_dates_ok('2014-01-02', '2014-02-01', 'B4')
-    end
-
-    # data wystawienie max 15 dnia następnego miesiąca po wykonaniu usługi
-    def test_create_and_trade_date_correlation_after_trade
-      check_dates_ok('2014-02-15', '2014-01-01', 'A1')
-      check_dates_error('2014-02-16', '2014-01-01', 'A2')
-      check_dates_error('2014-02-16', '2014-01-02', 'A3')
-      check_dates_error('2014-02-16', '2014-01-31', 'A4')
-      check_dates_ok('2014-02-15', '2014-01-31', 'A5')
-      check_dates_ok('2014-03-15', '2014-02-15', 'A6')
-    end
-
     def test_no_vat_reason_presence
       @invoice.vat = 23
-      v = Validator.new(@invoice); v.valid?
+      v = Validator.new(@invoice)
+      v.valid?
       assert_nil v.errors[:no_vat_reason]
       @invoice.vat = -1
-      v = Validator.new(@invoice); v.valid?
+      v = Validator.new(@invoice)
+      v.valid?
       assert v.errors[:no_vat_reason]
       @invoice.no_vat_reason = 'reason'
-      v = Validator.new(@invoice); v.valid?
+      v = Validator.new(@invoice)
+      v.valid?
       assert_nil v.errors[:no_vat_reason]
     end
   end

data/test/vat_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 module PolishInvoicer
-  class VatTest < MiniTest::Unit::TestCase
+  class VatTest < Minitest::Test
     def test_valid
       assert Vat.valid?(23)
       assert Vat.valid?(0)

data/test/writer_test.rb

@@ -1,14 +1,13 @@
-# encoding: utf-8
 require 'test_helper'
 
 module PolishInvoicer
-  class WriterTest < MiniTest::Unit::TestCase
+  class WriterTest < Minitest::Test
     def test_save_to_html
       invoice = create_valid_invoice
       writer = Writer.new(invoice)
       path = '/tmp/test.html'
       writer.save_to_html(path)
-      assert File.exists?(path)
+      assert File.exist?(path)
       File.unlink(path)
     end
 
@@ -17,7 +16,7 @@ module PolishInvoicer
       writer = Writer.new(invoice)
       path = '/tmp/test.pdf'
       writer.save_to_pdf(path)
-      assert File.exists?(path)
+      assert File.exist?(path)
       File.unlink(path)
     end
 

data/tpl/invoice.slim

@@ -46,7 +46,11 @@ html
             br
           - if buyer_nip
             = "NIP: #{buyer_nip}"
-
+          - if recipient
+            h4 Odbiorca
+            - recipient.each do |line|
+              = line
+              br
       hr
 
       .row

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: polish_invoicer
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Piotr Macuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-13 00:00:00.000000000 Z
+date: 2017-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -52,20 +66,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: slim2pdf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: '0'
 description: Creates polish invoices and proforms as HTML or PDF files
 email:
 - piotr@macuk.pl
@@ -122,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Creates polish invoices and proforms as HTML or PDF files