floor_calculator 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c9a29685f7d4b2abb4e140d89c7e3aec911a7fd
-  data.tar.gz: 88439edb17d4f8c5f022f755c6c6d3ebba0210c0
+  metadata.gz: 8545db4c50032048bbb5848243c2ec1d0e4cee70
+  data.tar.gz: 386510178eed75014f1a78faf3444f1c8af62676
 SHA512:
-  metadata.gz: 928a60f6ca3861a18075eda3a3d12062475e7135df021917a72a846d7beff232f7c28a29f4d7e03dc0467550f2f7b335949b39bcf0e0149777f4aa21dc61d74a
-  data.tar.gz: 1af3242a8ca6c988332e679a5e0e355c6a98e127ff1fef4c70609fd2c65579bbcd410d8bbe4e3bb7ac7c6737a473518a8e2282f8939a1b38288de8dd6006c814
+  metadata.gz: ad9a4853bc96963413eaaa0223076084ac8ba9cf494f5581d67c5c1ce22bd22f558d16b4cff58d58f217b51f8a1029bc5ca98a9845c878c9181da15a02946fb0
+  data.tar.gz: 18879e8286cb8fc9619ca64897105329d9c4d5944124211f2b74a44a30003744b1fe45f03398b0aa12c84410739812b9bec61176e1e1d01cb33b1ddadb2f08c2

data/lib/floor_calculator/pricer.rb

@@ -37,6 +37,7 @@ module FloorCalculator
     def prepare_options(offer, price)
       {
         source: offer[:source_catalog],
+        country: offer.country.to_s.downcase,
         destination: offer.catalog,
         price: price,
         condition: offer.condition,

data/lib/floor_calculator/solver.rb

@@ -13,8 +13,12 @@ module FloorCalculator
       @markups = markups
       markup = markups.fetch(markup_name.to_s, {})
       source_formula = source_markup(markup, options[:source])
-      @formula = destination_markup(source_formula, options[:destination])
-      raise "Formula not found for: #{options[:source]}, #{options[:destination]}" if @formula.nil?
+      country_formula = country_markup(source_formula, options[:country].to_s.downcase)
+      @formula = destination_markup(country_formula, options[:destination])
+      if @formula.nil?
+        raise "Formula not found for: #{options[:source]}, "\
+              "#{options[:country].to_s.downcase}, #{options[:destination]}"
+      end
       @price = options[:price]
       @weight = options[:weight]
       @fast = options[:fast]
@@ -34,6 +38,10 @@ module FloorCalculator
       result
     end
 
+    def country_markup(source, country)
+      source.fetch(country) { source.fetch('default', {}) }
+    end
+
     def destination_markup(source, destination)
       source.fetch(destination) { source.fetch('default', nil) }
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: floor_calculator
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Marek Mikołajczyk