moss_generator 0.1.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3afa29e4a1e8b9b65c08865b7422feee8ccf38ae9e438f4a53fe286a50c6578d
-  data.tar.gz: 0aab051d4d1b1f298de2a8aba41d62b0fb9fc5fdd95c73e87ea8d68c0aad8722
+  metadata.gz: b18873ce424594b2a4cafe9dd26d23f6688352561e59820aa7f8229911cc4857
+  data.tar.gz: cc35447764a10b96f53035af22e5429809ad7ea10dc7adcb835089e0e69b5024
 SHA512:
-  metadata.gz: 385d013dac1ac59573715db433f3b48a600ccbf6313b6b66247dc1d98caf51b10a7eaf95cd99c3113cdfba2596d6969051eae4b5b6da9fd63d81e1af449a1d52
-  data.tar.gz: 448272b98a2f174eb435f2fab99a5068348af7531e346b38c11cd798b77994fbcbd4aa1305afeb61e74e8425d9243fca6551eae3069cfe0d8f3630b35de94f66
+  metadata.gz: 5ff56e1b296d590a99db183d73cd1b4ebb80efbfaaccceb4df5862bc7a01da9d06f50340fe5a941a3c463a556af1293b5dbc6a500938b6bb52b264c54d53af04
+  data.tar.gz: 6ec37d480db38da5abc948afd423928741e25b0c4273dbb02c8e373fe74ca697d04f86cc2e8c424061ae536c4697b6790a1910fff46ffef7fd33841380b68234

data/.github/workflows/gempush.yml

@@ -1,5 +1,9 @@
 name: Gem push
-on: [push]
+
+on:
+  release:
+    types: [published]
+
 jobs:
   github:
     name: Build + Publish to GitHub

data/.github/workflows/main.yml

@@ -1,6 +1,6 @@
 name: Ruby
 
-on: [push,pull_request]
+on: [pull_request]
 
 jobs:
   build:

data/.rubocop.yml

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

data/Gemfile.lock

@@ -1,16 +1,55 @@
 PATH
   remote: .
   specs:
-    moss_generator (0.1.2)
+    moss_generator (0.4.0)
+      countries (~> 3.1)
+      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)
+    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)
+      rack
+      socksify
+    i18n (1.8.10)
+      concurrent-ruby (~> 1.0)
+    i18n_data (0.11.0)
+    method_source (1.0.0)
+    money (6.14.1)
+      i18n (>= 0.6.4, <= 2)
+    nokogiri (1.11.3-x86_64-darwin)
+      racc (~> 1.4)
+    nori (2.6.0)
     parallel (1.20.1)
     parser (3.0.0.0)
       ast (~> 2.4.1)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-byebug (3.9.0)
+      byebug (~> 11.0)
+      pry (~> 0.13.0)
+    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,13 +87,31 @@ 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)
+    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)
+      addressable
+      httpi (~> 2.0)
+      nokogiri (>= 1.4.2)
 
 PLATFORMS
   x86_64-darwin-19
 
 DEPENDENCIES
   moss_generator!
+  pry-byebug
   rake (~> 13.0)
   rspec (~> 3.0)
   rubocop (~> 1.7)

data/config/vat_rates.json

@@ -130,7 +130,7 @@
   },
   "DE": {
     "country_name": "Germany",
-    "standard_rate": 19,
+    "standard_rate": 16,
     "reduced_rates": {
       "foodstuffs": 7,
       "books": 7,

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('EUR')
+  Money.rounding_mode = BigDecimal::ROUND_HALF_UP
 end

data/lib/moss_generator/stripe.rb

@@ -8,17 +8,18 @@ module MossGenerator
   class Stripe
     class NoTurnoverCountryError < StandardError; end
 
-    attr_reader :charges, :vat_number, :period, :year
+    attr_reader :charges, :vat_number, :period, :year, :rates
 
-    def initialize(charges, vat_number, period, year)
+    def initialize(charges, vat_number, period, year, rates)
       @charges = charges
       @vat_number = vat_number
       @period = period
       @year = year
+      @rates = rates
     end
 
-    def self.call(charges, vat_number, period, year)
-      new(charges, vat_number, period, year).call
+    def self.call(charges, vat_number, period, year, rates)
+      new(charges, vat_number, period, year, rates).call
     end
 
     def call
@@ -45,8 +46,11 @@ module MossGenerator
 
     def group_charges_rows
       charges_rows = charges.map do |charge|
-        MossGenerator::StripeChargeRow.new(charge)
-      end
+        charge_row = MossGenerator::StripeChargeRow.new(charge, rates)
+        next if charge_row.skippable?
+
+        charge_row
+      end.compact
       charges_rows.group_by(&:country_code)
     end
 
@@ -63,7 +67,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,9 @@
 # frozen_string_literal: true
 
 require 'moss_generator/vat_rate'
+require 'money'
+require 'valvat/local'
+require 'countries'
 
 module MossGenerator
   # Parse charge data from single Stripe charge
@@ -9,10 +12,13 @@ module MossGenerator
 
     class NoVatRateForCountryError < StandardError; end
 
-    attr_reader :charge
+    class NoExchangeRateForCurrencyOrDateError < StandardError; end
 
-    def initialize(charge)
+    attr_reader :charge, :rates
+
+    def initialize(charge, rates)
       @charge = charge
+      @rates = rates
     end
 
     def country_code
@@ -21,8 +27,12 @@ module MossGenerator
       raise NoConsumptionCountryError, "charge: #{charge}"
     end
 
-    def amount
-      charge.dig('balance_transaction', 'amount')
+    def amount_without_vat
+      Money.new(amount_with_vat * percent_without_vat).dollars.to_f
+    end
+
+    def amount_without_vat_cents
+      Money.new(amount_with_vat * percent_without_vat).cents
     end
 
     def vat_rate
@@ -30,18 +40,77 @@ module MossGenerator
     end
 
     def vat_amount
-      amount * vat_rate_calculatable_percent
+      Money.new(amount_without_vat_cents * vat_rate_calculatable_percent)
+           .dollars
+           .to_f
+    end
+
+    def skippable?
+      not_completed? ||
+        company? ||
+        fetch_country_code.nil? ||
+        sold_outside_of_eu? ||
+        swedish_charge? ||
+        refunded?
     end
 
     private
 
+    def company?
+      return false if charge.dig('metadata', 'vat_number').nil?
+
+      Valvat::Syntax.validate(charge.dig('metadata', 'vat_number'))
+    end
+
+    def sold_outside_of_eu?
+      ISO3166::Country.new(fetch_country_code).in_eu? ? false : true
+    end
+
+    def swedish_charge?
+      fetch_country_code.casecmp?('SE')
+    end
+
+    def not_completed?
+      charge['status'] != 'succeeded'
+    end
+
+    def refunded?
+      charge['refunded']
+    end
+
+    def percent_without_vat
+      1 / (vat_rate_calculatable_percent + 1)
+    end
+
     def vat_rate_calculatable_percent
       (vat_rate.to_f / 100)
     end
 
     def fetch_country_code
-      charge.dig('payment_method_details', 'card', 'country') ||
-        charge.dig('billing_details', 'address', 'country')
+      charge.dig('payment_method_details', 'card', 'country')
+    end
+
+    def amount_with_vat
+      return if skippable?
+      return charge['amount'] if charge['currency'].casecmp?('eur')
+
+      exchanged_amount = calculate_amount_from_rate
+      return exchanged_amount unless exchanged_amount.nil?
+
+      raise NoExchangeRateForCurrencyOrDateError, "charge: #{charge}"
+    end
+
+    def calculate_amount_from_rate
+      # Have to reverse the rate. The base rate is in EUR, so if we have a rate
+      # to SEK, the rate will represent the rate from EUR to SEK, but we need
+      # the other way around.
+      date = Time.at(charge['created']).to_date.to_s
+      currency = charge['currency'].upcase
+      rate = rates.dig(date, currency)
+      return if rate.nil?
+
+      reversed_rate = 1 / rate
+      charge['amount'] * reversed_rate
     end
   end
 end

data/lib/moss_generator/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MossGenerator
-  VERSION = '0.1.2'
+  VERSION = '0.4.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,12 @@ 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 'countries', '~> 3.1'
+  spec.add_dependency 'money', '~> 6.14'
+  spec.add_dependency 'valvat', '~> 1.1'
+
+  spec.add_development_dependency 'pry-byebug'
 
   # 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,72 @@
 --- !ruby/object:Gem::Specification
 name: moss_generator
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.4.0
 platform: ruby
 authors:
 - frdrkolsson
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-12 00:00:00.000000000 Z
-dependencies: []
-description: Skatteverket Mini One Stop Shop(MOSS) generator.
+date: 2021-04-13 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'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+- !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'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  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'
+description: Skatteverket Mini One Stop Shop (MOSS) generator.
 email:
 - fredrik.olsson@standout.se
 executables: []
@@ -43,7 +99,7 @@ metadata:
   homepage_uri: https://github.com/standout/moss_generator
   source_code_uri: https://github.com/standout/moss_generator
   changelog_uri: https://github.com/standout/moss_generator
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -58,8 +114,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key:
+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: []