moss_generator 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f95b7ed0d7074f3ca87040394af09e0ba85bdd2f68eb70dcec3166027c2b204
-  data.tar.gz: 8f333d25b73c6c3b03941bd15e7dd0ee8b96d35f0ad7469c99e8ca2512bfa142
+  metadata.gz: b22a165ad650e03060e839cd9ea483817eec530a42836fc8f5e9d935aa2cebd5
+  data.tar.gz: 3989024f80875480c50112e1360d6100e14d75cfceff9ab99a569a447de1becb
 SHA512:
-  metadata.gz: a2d2cdc21fa1fc84da5561cf73b506d79f25c034d3f12d68eea7b4e9bca20fb46a2c7a2709c6d7ad9dce49b717308dabfaf251f7fdb8f6e476750b026ac67eda
-  data.tar.gz: ba490e2a77965cbf52957977482e85ba6011f2374fa9c223abb8f528311d56a4f677f6b6f6841fa1b2d83978698739d7c787ca072b619af00a324343c0ca3936
+  metadata.gz: 45da0e44d80d6f5f04f762c948af8e91127b2deedd6d67ea23b77a8f731797a98e5674272d8084e9bfbff391803d18cefcbe0716ef802d000dc15aac58420416
+  data.tar.gz: 3ab6c4be61713bf7032db78373d156c7a397a41d8ee1173097316d059229dfa7133e2416c01b1b60e29ad6fef43545cc3fe218e2553eda2ac42f6173a7da9eae

data/.rubocop.yml

@@ -10,6 +10,9 @@ AllCops:
 Layout/LineLength:
   Max: 80
 
+Metrics/ClassLength:
+  Max: 120
+
 Metrics/ParameterLists:
   Max: 6
 
@@ -18,4 +21,4 @@ Metrics/BlockLength:
     - 'spec/**/*'
 
 RSpec/NestedGroups:
-  Max: 5
+  Max: 6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    moss_generator (0.5.2)
+    moss_generator (0.6.0)
       countries (~> 4.0)
       money (~> 6.14)
       valvat (~> 1.1)

data/lib/moss_generator/stripe_charge_row.rb

@@ -98,7 +98,37 @@ module MossGenerator
     end
 
     def fetch_country_code
-      charge.dig('payment_method_details', 'card', 'country')
+      source_country || payment_method_country || fallback_country
+    end
+
+    def source_country
+      return source_owner_country if source_type.nil?
+
+      charge.dig('source', source_type, 'country') ||
+        charge.dig('source', source_type, 'address_country')
+    end
+
+    def payment_method_country
+      return if payment_type.nil?
+
+      charge.dig('payment_method_details', payment_type, 'country') ||
+        charge.dig('payment_method_details', payment_type, 'address_country')
+    end
+
+    def source_type
+      charge.dig('source', 'type') || charge.dig('source', 'object')
+    end
+
+    def source_owner_country
+      charge.dig('source', 'owner', 'address', 'country')
+    end
+
+    def payment_type
+      charge.dig('payment_method_details', 'type')
+    end
+
+    def fallback_country
+      charge.dig('shipping', 'address', 'country')
     end
 
     def amount_with_vat

data/lib/moss_generator/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: moss_generator
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - frdrkolsson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-04 00:00:00.000000000 Z
+date: 2022-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: countries