polish_invoicer 0.0.17 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 30aae34862581c0cf334768c5e69ed53441f4b9dc6c6cde5294798798d1d57f0
-  data.tar.gz: b991b0506ae5cf5f26ac420c21109459b50b963de2e001e20bafbb2c892d3627
+SHA1:
+  metadata.gz: 0fc8bf6fc56f4965b836ec978706298b87fe546c
+  data.tar.gz: 52143a033a9b5b28f3ba2fe679133483e7db345a
 SHA512:
-  metadata.gz: 67189d35f8560f7d8518dcc42c06d04342f34976bb145bb121e38b01df79cd0fdc86e3eede9e92ffdafbf2f47a35022977e7c1e369f4a37586c57673e14e6ce2
-  data.tar.gz: 53b2303d40daa51205c0c37e51790cb6abf43b154d6973908f57761f67a22c96ad9ba90f80e4397ba6b1b437be02bf37155870438039488c19f11d427e9f9f61
+  metadata.gz: 53519d2d129f94d734b08e11b0c42793fe31e00bc407dc205d242742bc876890c39c6b89e8cbdf51217b18c9856a77d2a0cf650df34891286d297559e20033cb
+  data.tar.gz: 475133fcbf1c2ea0a483560b953652c2f6cfc538d5ca4b2e2820786737fbc5bbe5ae47d6e67eca552f708451edc36999a8c5c64819e724aa14d6aac0f091680f

data/.rubocop.yml

@@ -0,0 +1,6 @@
+Style/Documentation:
+  Enabled: false
+
+Metrics/LineLength:
+  Enabled: true
+  Max: 100

data/.travis.yml

@@ -1,5 +1,6 @@
 language: ruby
 rvm:
-  - 2.2.7
-  - 2.3.4
-  - 2.4.1
+  - 2.2.10
+  - 2.3.7
+  - 2.4.4
+  - 2.5.1

data/README.md

@@ -1,11 +1,8 @@
 # PolishInvoicer [![Code Climate](https://codeclimate.com/github/macuk/polish_invoicer.png)](https://codeclimate.com/github/macuk/polish_invoicer) [![Build Status](https://travis-ci.org/macuk/polish_invoicer.png?branch=master)](https://travis-ci.org/macuk/polish_invoicer)
 
-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.
+PolishInvoicer gem creates Polish invoices and proforms in HTML and PDF formats.
 
-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](https://www.jzk.pl/2017).
+Description is in Polish because of a specific case of this gem.
 
 ## Installation
 
@@ -130,10 +127,7 @@ invoice.valid?
 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"
-    }
+    { :vat=>"Stawka VAT spoza listy dopuszczalnych wartości" }
 
 ## Dodatkowe metody
 

data/lib/polish_invoicer/presenter.rb

@@ -31,13 +31,13 @@ module PolishInvoicer
     end
 
     def copy_additional_params
-      %w(net_value vat_value gross_value).each do |field|
+      %w[net_value vat_value gross_value].each do |field|
         @out[field.to_sym] = @invoice.send(field)
       end
     end
 
     def format_dates
-      %w(trade_date create_date payment_date).each do |field|
+      %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'
@@ -45,7 +45,7 @@ module PolishInvoicer
     end
 
     def format_prices
-      %w(net_value vat_value gross_value).each do |field|
+      %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('.', ',')

data/lib/polish_invoicer/validator.rb

@@ -17,6 +17,7 @@ module PolishInvoicer
       check_price
       check_vat
       check_proforma
+      check_create_and_payment_date
       @errors.empty?
     end
 
@@ -71,20 +72,20 @@ module PolishInvoicer
     end
 
     def check_price
-      unless @invoice.price.is_a?(Numeric)
-        @errors[:price] = 'Cena musi być liczbą'
-      else
+      if @invoice.price.is_a?(Numeric)
         @errors[:price] = 'Cena musi być liczbą dodatnią' unless @invoice.price > 0
+      else
+        @errors[:price] = 'Cena musi być liczbą'
       end
     end
 
     def check_vat
-      unless Vat.valid?(@invoice.vat)
-        @errors[:vat] = 'Stawka VAT spoza listy dopuszczalnych wartości'
-      else
+      if Vat.valid?(@invoice.vat)
         if Vat.zw?(@invoice.vat) && blank?(@invoice.no_vat_reason)
           @errors[:no_vat_reason] = 'Konieczne jest podanie podstawy prawnej zwolnienia z podatku VAT'
         end
+      else
+        @errors[:vat] = 'Stawka VAT spoza listy dopuszczalnych wartości'
       end
     end
 
@@ -94,6 +95,13 @@ module PolishInvoicer
       @errors[:paid] = 'Proforma nie może być opłacona'
     end
 
+    def check_create_and_payment_date
+      return if @errors[:create_date]
+      return if @errors[:payment_date]
+      return if @invoice.create_date <= @invoice.payment_date
+      @errors[:payment_date] = 'Termin płatności musi być wcześniejszy niż data wystawienia'
+    end
+
     def blank?(value)
       value.to_s.strip == ''
     end

data/lib/polish_invoicer/vat.rb

@@ -22,8 +22,6 @@ module PolishInvoicer
       rate != -1 ? rate : 0
     end
 
-    private
-
     def self.hash
       h = {}
       rates.each do |r|

data/lib/polish_invoicer/version.rb

@@ -1,3 +1,3 @@
 module PolishInvoicer
-  VERSION = '0.0.17'.freeze
+  VERSION = '0.0.18'.freeze
 end

data/test/presenter_test.rb

@@ -35,9 +35,9 @@ module PolishInvoicer
       @invoice.comments = 'Test'
       data = Presenter.new(@invoice).data
       assert_equal ['Test'], data[:comments]
-      @invoice.comments = %w(A B)
+      @invoice.comments = %w[A B]
       data = Presenter.new(@invoice).data
-      assert_equal %w(A B), data[:comments]
+      assert_equal %w[A B], data[:comments]
     end
 
     def test_vat

data/test/validator_test.rb

@@ -8,20 +8,6 @@ module PolishInvoicer
       @invoice = OpenStruct.new
     end
 
-    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)
-      @invoice.send("#{field}=", value)
-      v = Validator.new(@invoice)
-      v.valid?
-      assert_nil v.errors[field]
-    end
-
     def test_number_validation
       check_error(:number)
       check_ok(:number, '1/2014')
@@ -110,7 +96,7 @@ module PolishInvoicer
       check_ok(:proforma, false)
     end
 
-    def test_proforma_could_not_be_paid
+    def test_proforma_not_paid
       @invoice.paid = true
       @invoice.proforma = true
       v = Validator.new(@invoice)
@@ -122,21 +108,13 @@ module PolishInvoicer
       assert_nil v.errors[:paid]
     end
 
-    def test_seller_and_buyer_nip_presence
+    def test_nip_presence
       check_error(:seller_nip)
       check_ok(:buyer_nip)
       check_ok(:seller_nip, '123')
       check_ok(:buyer_nip, '123')
     end
 
-    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?
-      assert_nil v.errors[:create_date], msg
-    end
-
     def test_no_vat_reason_presence
       @invoice.vat = 23
       v = Validator.new(@invoice)
@@ -151,5 +129,33 @@ module PolishInvoicer
       v.valid?
       assert_nil v.errors[:no_vat_reason]
     end
+
+    def test_create_and_payment_date
+      @invoice.create_date = Date.parse('2018-04-10')
+      @invoice.payment_date = Date.parse('2018-04-01')
+      v = Validator.new(@invoice)
+      v.valid?
+      assert v.errors[:payment_date]
+      @invoice.payment_date = Date.parse('2018-04-17')
+      v = Validator.new(@invoice)
+      v.valid?
+      assert_nil v.errors[:payment_date]
+    end
+
+    private
+
+    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)
+      @invoice.send("#{field}=", value)
+      v = Validator.new(@invoice)
+      v.valid?
+      assert_nil v.errors[field]
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polish_invoicer
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
 platform: ruby
 authors:
 - Piotr Macuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-26 00:00:00.000000000 Z
+date: 2018-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -102,6 +102,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
@@ -152,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: Creates polish invoices and proforms as HTML or PDF files