skv_report 0.1.0 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7fd4ecad8c4ea82f45641e416b37f9046fe39048b7bde532e2998f3ede8d934b
-  data.tar.gz: e359d4e13c9ca9a311c06bb3450cb7d0f008f80b9d5ada0dbdfded8b3aef50ec
+  metadata.gz: '090c92585c0b6d65add97fc64d0d60ce4ebd93c7b04a0d857bd711cf2ea833ab'
+  data.tar.gz: 42874efacf3f252ec232a3f20cdd3231a8d8fae23e8e9b98fa72c1f40805450d
 SHA512:
-  metadata.gz: c5bcf4cafe1ba9310c2f17c356414346608ec9fd3c17bf65b2e53ddc3d300f8c4156ad3fdb4fbdb1a8b26d4dd3246cc114841d77235e21fcb4be051c6403ba33
-  data.tar.gz: 14ea05feda440ea52e57a38e2c6ff670cb15321e577461534fc19ee1c95f8c74ae17b1a62eb2a726d446cb7d9150994e256ffc102936259eaae3ef11c29fd406
+  metadata.gz: 02d1349106880152c72335e0c8d8bc49906d9c28c52816046d8a40b9fc900e5b5388687c9075755312485099ab5202b89620d5dd484be093b244994f51e28dd0
+  data.tar.gz: 47d6544906fd3cbfb3dbb995ba13272d801fe9187c3e7f1b62d243fdd3e26032217dff53b2e01abc6a5c14f5e0b3a77f45937413782b8ef92001c856743a57fc

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    skv_report (0.1.0)
+    skv_report (0.3.3)
+      countries (~> 3.1.0)
       money (~> 6.14)
       valvat (~> 1.1)
 
@@ -17,19 +18,24 @@ GEM
     builder (3.2.4)
     byebug (11.1.3)
     coderay (1.1.3)
-    concurrent-ruby (1.1.7)
+    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)
       rack
       socksify
-    i18n (1.8.7)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
+    i18n_data (0.11.0)
     method_source (1.0.0)
-    money (6.14.0)
+    money (6.14.1)
       i18n (>= 0.6.4, <= 2)
-    nokogiri (1.11.1-x86_64-darwin)
+    nokogiri (1.11.3-x86_64-darwin)
       racc (~> 1.4)
     nori (2.6.0)
     parallel (1.20.1)
@@ -89,8 +95,10 @@ 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)
+    unicode_utils (1.4.0)
     valvat (1.1.0)
       savon (>= 2.3.0)
     wasabi (3.6.1)

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/exchange_rates.rb

@@ -9,41 +9,28 @@ module SKVReport
 
     class NoRateForCurrencyError < StandardError; end
 
-    attr_reader :rates, :start_at, :base, :end_at
+    attr_reader :rates, :base_currency
 
     def initialize(rates = {})
-      @rates = rates['rates']
+      @rates = rates['rates'] || rates['dates_with_rates']
       @base_currency = rates['base']
-      @start_at = Date.parse(rates['start_at'])
-      @end_at = Date.parse(rates['end_at'])
     end
 
-    def rate_for(to_currency, date)
-      date_for_rate = find_previous_existing_date(Date.parse(date))
-      raise_no_rates_for_date_error(date) if date_for_rate.nil?
+    def rate_for(from_currency, date)
+      date_rates = rates[date]
+      raise_no_rates_for_date_error(date) if date_rates.nil?
 
-      rate = rates.dig(date_for_rate.to_s, to_currency.upcase)
+      rate = rates.dig(date, from_currency.upcase)
       return rate unless rate.nil?
 
-      raise NoRateForCurrencyError, "currency: #{to_currency}\nrates: #{rates}"
+      raise NoRateForCurrencyError,
+            "currency: #{from_currency}\nrates: #{rates}"
     end
 
     private
 
-    # Test number of times this recursive method is called?
-    def find_previous_existing_date(date)
-      return nil if date_outside_of_range?(date)
-
-      rates[date.to_s].nil? ? find_previous_existing_date(date - 1) : date
-    end
-
-    def date_outside_of_range?(date)
-      date < start_at || date > end_at
-    end
-
     def raise_no_rates_for_date_error(date)
-      raise NoRatesForDateError,
-            "date: #{date}\nstart_at: #{start_at}\nend_at: #{end_at}"
+      raise NoRatesForDateError, "date: #{date}\navailable_dates: #{rates.keys}"
     end
   end
 end

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
@@ -50,7 +68,7 @@ module SKVReport
     end
 
     def convert_amount_to_sek(exchange_rate)
-      (charge['amount'] * exchange_rate).round
+      (charge['amount'] * (1 / exchange_rate)).round
     end
 
     def not_completed?

data/lib/skv_report/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SKVReport
-  VERSION = '0.1.0'
+  VERSION = '0.3.3'
 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.1.0
+  version: 0.3.3
 platform: ruby
 authors:
 - frdrkolsson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-17 00:00:00.000000000 Z
+date: 2021-04-30 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.3
+rubygems_version: 3.2.15
 signing_key: 
 specification_version: 4
 summary: Generates CSV complete string for Skatteverkets Periodisk Sammanfattning