skv_report 0.3.0 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c31bd0550e519a43a66dd68769bc31ff1fe7b0b31bcbedb00ceb347c2f0aa85c
-  data.tar.gz: b207e0835e2775c0715ac331a8e76ca9f3eb7418af1ecd1f06addb6ea90f4e2b
+  metadata.gz: 97b2b470ab5c999c069d598bb3f4cd544e9bd9a731a1ab45ad4837f131db6375
+  data.tar.gz: 5d131ea902c9e17041d5a9eeac5fdb0222ed3325c26267257f3804717067c554
 SHA512:
-  metadata.gz: 8ff058a181aacd7bd378aa29b92671b9f1899a6d9839d8818621c682f217066fea9f439efbdc9258d2fc923a1b9af76762cee6774a0b1524ae80e2c5c88dc800
-  data.tar.gz: c3b3244deca7946db8709cdca43b1b15dfa732837b3c900d49591dc378848c522569977fc20fa15d71e69ca46aa120593a3390d85ecfa1f5b1cb11f3ea3689cf
+  metadata.gz: efce1d73aa969417b74a0ebd0c401f6956fc1ca379818692382d1d76111a2d12d1225fe2316f1d0d2f05e70a652cf7007a2478f8f58e9c3d777c07bad3e53e05
+  data.tar.gz: fb547c8abef76120d513df937a34bb5f0a3bc75491774aaff7cf6729e3842a7c289f42ea6d066acc0ab70d1ac02b51d662fb98d8d00b6fe00391cd9001f39a46

data/Gemfile.lock

@@ -1,14 +1,15 @@
 PATH
   remote: .
   specs:
-    skv_report (0.3.0)
+    skv_report (0.3.4)
+      countries (~> 3.1.0)
       money (~> 6.14)
       valvat (~> 1.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     akami (1.3.1)
       gyoku (>= 0.4.0)
@@ -18,18 +19,25 @@ GEM
     byebug (11.1.3)
     coderay (1.1.3)
     concurrent-ruby (1.1.8)
+    countries (3.1.0)
+      i18n_data (~> 0.11.0)
+      sixarm_ruby_unaccent (~> 1.1)
+      unicode_utils (~> 1.4)
     diff-lcs (1.4.4)
     gyoku (1.3.1)
       builder (>= 2.1.2)
-    httpi (2.4.5)
+    httpi (2.5.0)
       rack
       socksify
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
+    i18n_data (0.11.0)
     method_source (1.0.0)
+    mini_portile2 (2.6.1)
     money (6.14.1)
       i18n (>= 0.6.4, <= 2)
-    nokogiri (1.11.3-x86_64-darwin)
+    nokogiri (1.12.5)
+      mini_portile2 (~> 2.6.1)
       racc (~> 1.4)
     nori (2.6.0)
     parallel (1.20.1)
@@ -42,7 +50,7 @@ GEM
       byebug (~> 11.0)
       pry (~> 0.13.0)
     public_suffix (4.0.6)
-    racc (1.5.2)
+    racc (1.6.0)
     rack (2.2.3)
     rainbow (3.0.0)
     rake (13.0.3)
@@ -89,9 +97,11 @@ GEM
       nokogiri (>= 1.8.1)
       nori (~> 2.4)
       wasabi (~> 3.4)
+    sixarm_ruby_unaccent (1.2.0)
     socksify (1.7.1)
     unicode-display_width (1.7.0)
-    valvat (1.1.0)
+    unicode_utils (1.4.0)
+    valvat (1.1.2)
       savon (>= 2.3.0)
     wasabi (3.6.1)
       addressable
@@ -99,6 +109,7 @@ GEM
       nokogiri (>= 1.4.2)
 
 PLATFORMS
+  ruby
   x86_64-darwin-19
 
 DEPENDENCIES

data/README.md

@@ -42,9 +42,13 @@ SKVReport::Stripe.call(charges, period, year, company_information, rates)
 
 ## Development
 
+The main branch in this repository is called `main`.
+
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+To install this gem onto your local machine, run `bundle exec rake install`.
+
+To release a new version, update the version number in `version.rb`, and then make a release on GitHub which will automatically build the gem and upload to rubygems.
 
 ## Exchange rates
 

data/lib/skv_report/stripe.rb

@@ -6,8 +6,6 @@ require 'skv_report/stripe_charge_row'
 module SKVReport
   # Generate SKV CSV string from Stripe charge
   class Stripe
-    class NoTurnoverCountryError < StandardError; end
-
     class UndefinedTypeOfSalesError < StandardError; end
 
     attr_reader :charges, :period, :year, :company_information, :rates

data/lib/skv_report/stripe_charge_row.rb

@@ -3,6 +3,7 @@
 require 'money'
 require 'valvat/local'
 require 'date'
+require 'countries/global'
 
 module SKVReport
   # Parse charge data from single Stripe charge
@@ -19,7 +20,7 @@ module SKVReport
     #
     def initialize(charge, exchange_rates)
       @charge = charge
-      @buyer_vat_number = charge.dig('customer', 'tax_info', 'tax_id') || ''
+      @buyer_vat_number = vat_number
       @exchange_rates = exchange_rates
     end
 
@@ -28,15 +29,32 @@ module SKVReport
     end
 
     def skippable?
-      swedish_buyer? || !valid_vat_number? || not_completed? || refunded?
+      buyer_vat_number.nil? ||
+        swedish_buyer? ||
+        !valid_vat_number? ||
+        !eu_member? ||
+        not_completed? ||
+        refunded?
     end
 
     private
 
+    def vat_number
+      tax_object = charge.dig('customer', 'tax_ids', 'data').find do |tax_data|
+        tax_data['type'].casecmp?('eu_vat')
+      end
+
+      tax_object&.fetch('value', '')
+    end
+
     def swedish_buyer?
       buyer_vat_number[0...2].casecmp?('SE')
     end
 
+    def eu_member?
+      ISO3166::Country.new(buyer_vat_number[0...2])&.in_eu?
+    end
+
     def valid_vat_number?
       Valvat::Syntax.validate(buyer_vat_number)
     end

data/lib/skv_report/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SKVReport
-  VERSION = '0.3.0'
+  VERSION = '0.3.4'
 end

data/skv_report.gemspec

@@ -32,6 +32,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   # spec.add_dependency to register a new dependency of your gem
+  spec.add_dependency 'countries', '~> 3.1.0'
   spec.add_dependency 'money', '~> 6.14'
   spec.add_dependency 'valvat', '~> 1.1'
 

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: skv_report
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.4
 platform: ruby
 authors:
 - frdrkolsson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-04-20 00:00:00.000000000 Z
+date: 2021-11-03 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: countries
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: money
   requirement: !ruby/object:Gem::Requirement
@@ -85,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Generates CSV complete string for Skatteverkets Periodisk Sammanfattning