moss_generator 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad1ddceb7b906a75ee7db040f6f02daa81743a0740ee9f3c060d6ec91b4fdf29
-  data.tar.gz: 94c9ba93ab8d08a7db9829cadd1c9e2cc5770777d09015e6bbbfa085aa207cd5
+  metadata.gz: 94864f353514bae1dc92e750adda259be65c3834431a20e3cc20a1316585dec9
+  data.tar.gz: 2d829fd20c5fa6e1c3a62041f279d04b60a8c4815b090fcf35ab9c3cf0a5904f
 SHA512:
-  metadata.gz: 2c550595f24be6127e4555c58320e6e48c331cd17a8e74000ea57fbf7939d53c73c31bb390b3d7f71d84f7b0768f7c823e519a93b2b90bc226f30b6945bbb8af
-  data.tar.gz: d803e9ec37eceb859a5d726d0a5376659a979039add06b84a2d8ce47dc2cb19a55adbc2be9f7cad0f4f88a7ed00095b430a3dbe641811996f7fbe87fded1f378
+  metadata.gz: ca4ffc090bfd23e9f33498f030f0094dcaa02dbf8f4790c62ad6a320b608dd8166a7c65d866877f4c923cbe16f44abdac10ac198e0b81b153e806adefa40fe87
+  data.tar.gz: 7a7702bd3cbe463060d88c9e7973ce015a1079dc288467500a9b17fb26d970142791d491f3d6a02f5b0235e2df1ad8fcce0d9b9c091bdb6976dfe241b265b83d

data/.rubocop.yml

@@ -13,3 +13,6 @@ Layout/LineLength:
 Metrics/BlockLength:
   Exclude:
     - 'spec/**/*'
+
+RSpec/NestedGroups:
+  Max: 4

data/Gemfile.lock

@@ -1,16 +1,40 @@
 PATH
   remote: .
   specs:
-    moss_generator (0.1.5)
+    moss_generator (0.2.0)
+      money (~> 6.14)
+      valvat (~> 1.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    akami (1.3.1)
+      gyoku (>= 0.4.0)
+      nokogiri
     ast (2.4.1)
+    builder (3.2.4)
+    concurrent-ruby (1.1.7)
     diff-lcs (1.4.4)
+    gyoku (1.3.1)
+      builder (>= 2.1.2)
+    httpi (2.4.5)
+      rack
+      socksify
+    i18n (1.8.7)
+      concurrent-ruby (~> 1.0)
+    money (6.14.0)
+      i18n (>= 0.6.4, <= 2)
+    nokogiri (1.11.1-x86_64-darwin)
+      racc (~> 1.4)
+    nori (2.6.0)
     parallel (1.20.1)
     parser (3.0.0.0)
       ast (~> 2.4.1)
+    public_suffix (4.0.6)
+    racc (1.5.2)
+    rack (2.2.3)
     rainbow (3.0.0)
     rake (13.0.3)
     regexp_parser (2.0.3)
@@ -48,7 +72,22 @@ GEM
       rubocop (~> 1.0)
       rubocop-ast (>= 1.1.0)
     ruby-progressbar (1.10.1)
+    savon (2.12.1)
+      akami (~> 1.2)
+      builder (>= 2.1.2)
+      gyoku (~> 1.2)
+      httpi (~> 2.3)
+      nokogiri (>= 1.8.1)
+      nori (~> 2.4)
+      wasabi (~> 3.4)
+    socksify (1.7.1)
     unicode-display_width (1.7.0)
+    valvat (1.1.0)
+      savon (>= 2.3.0)
+    wasabi (3.6.1)
+      addressable
+      httpi (~> 2.0)
+      nokogiri (>= 1.4.2)
 
 PLATFORMS
   x86_64-darwin-19

data/lib/moss_generator.rb

@@ -6,4 +6,6 @@ require_relative 'moss_generator/stripe'
 
 # Generate CSV-formatted string for MOSS report
 module MossGenerator
+  Money.default_currency = Money::Currency.new('SEK')
+  Money.rounding_mode = BigDecimal::ROUND_HALF_UP
 end

data/lib/moss_generator/stripe.rb

@@ -66,7 +66,7 @@ module MossGenerator
       [turnover_country,
        country,
        format_to_two_decimals(charges.first.vat_rate),
-       format_to_two_decimals(charges.sum(&:amount)),
+       format_to_two_decimals(charges.sum(&:amount_without_vat)),
        format_to_two_decimals(charges.sum(&:vat_amount))]
     end
 

data/lib/moss_generator/stripe_charge_row.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 require 'moss_generator/vat_rate'
+require 'money'
+require 'valvat/local'
 
 module MossGenerator
   # Parse charge data from single Stripe charge
@@ -9,6 +11,8 @@ module MossGenerator
 
     class NoVatRateForCountryError < StandardError; end
 
+    class NotInSwedishKronorError < StandardError; end
+
     attr_reader :charge
 
     def initialize(charge)
@@ -21,8 +25,12 @@ module MossGenerator
       raise NoConsumptionCountryError, "charge: #{charge}"
     end
 
-    def amount
-      amount_without_vat
+    def amount_without_vat
+      Money.new(amount_with_vat * percent_without_vat, 'SEK').dollars.to_f
+    end
+
+    def amount_without_vat_cents
+      Money.new(amount_with_vat * percent_without_vat, 'SEK').cents
     end
 
     def vat_rate
@@ -30,7 +38,9 @@ module MossGenerator
     end
 
     def vat_amount
-      amount * vat_rate_calculatable_percent
+      Money.new(amount_without_vat_cents * vat_rate_calculatable_percent, 'SEK')
+           .dollars
+           .to_f
     end
 
     def skippable?
@@ -40,7 +50,9 @@ module MossGenerator
     private
 
     def company?
-      charge.dig('metadata', 'vat_number').nil? ? false : true
+      return false if charge.dig('metadata', 'vat_number').nil?
+
+      Valvat::Syntax.validate(charge.dig('metadata', 'vat_number'))
     end
 
     def not_completed?
@@ -51,12 +63,13 @@ module MossGenerator
       charge['refunded']
     end
 
-    def amount_without_vat
-      amount_with_vat * percent_without_vat
-    end
-
     def amount_with_vat
-      charge.dig('balance_transaction', 'amount')
+      balance_transaction = charge['balance_transaction']
+      currency = balance_transaction['currency']
+      return balance_transaction['amount'] if currency == 'sek'
+
+      raise NotInSwedishKronorError,
+            "balance_transaction: #{balance_transaction}"
     end
 
     def percent_without_vat

data/lib/moss_generator/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MossGenerator
-  VERSION = '0.1.5'
+  VERSION = '0.2.0'
 end

data/moss_generator.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ['frdrkolsson']
   spec.email         = ['fredrik.olsson@standout.se']
 
-  spec.summary       = 'Skatteverket Mini One Stop Shop(MOSS) generator.'
+  spec.summary       = 'Skatteverket Mini One Stop Shop (MOSS) generator.'
   spec.description   = spec.summary
   spec.homepage      = 'https://github.com/standout/moss_generator'
   spec.license       = 'MIT'
@@ -30,8 +30,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  # Uncomment to register a new dependency of your gem
-  # spec.add_dependency "example-gem", "~> 1.0"
+  # spec.add_dependency to register a new dependency of your gem
+  spec.add_dependency 'money', '~> 6.14'
+  spec.add_dependency 'valvat', '~> 1.1'
 
   # For more information and examples about making a new gem, checkout our
   # guide at: https://bundler.io/guides/creating_gem.html

metadata

@@ -1,16 +1,44 @@
 --- !ruby/object:Gem::Specification
 name: moss_generator
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - frdrkolsson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-15 00:00:00.000000000 Z
-dependencies: []
-description: Skatteverket Mini One Stop Shop(MOSS) generator.
+date: 2021-01-18 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: money
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.14'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.14'
+- !ruby/object:Gem::Dependency
+  name: valvat
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+description: Skatteverket Mini One Stop Shop (MOSS) generator.
 email:
 - fredrik.olsson@standout.se
 executables: []
@@ -61,5 +89,5 @@ requirements: []
 rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
-summary: Skatteverket Mini One Stop Shop(MOSS) generator.
+summary: Skatteverket Mini One Stop Shop (MOSS) generator.
 test_files: []