alfa_insurance 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 036ece7ad59c8afea309a75ed9c109c27c666963290b6b10c2e47de8609a38d1
-  data.tar.gz: c21cc073ff5ab7b9c1548f632c006f8c977f48d528a41623db3563916bf7906f
+  metadata.gz: 42e9ed6c30beda70cd6590f58f2703bfc2ecb741d7d5bb3f6f94d2b8bb72169c
+  data.tar.gz: '084c653092c927f042a53e69315f1ec96ab46529baa083fe6e1ec76e7db4a1a5'
 SHA512:
-  metadata.gz: bbb1aa7b122b8932bb1e37fdaabeb8f086419cc86e992739d37cc1503d1483e61ae882dfe558a34aca3ca28abfab65065fcadca115f2a1d29d0e135507d7978b
-  data.tar.gz: 92bc427be8abc379c298bf56b8a0f2ced301545528cab85cb3fcbdb01a569475549c0cfedba670d6d3ff6a33f523c7086d71e7889535984c634b3917344cec03
+  metadata.gz: aa37ec72faaab78d249a3303af3beae0ea6b9479fb26948b4f285472d2e3cb1b90c788e3932d414f18170439cfa98f42d24b525ad487d0bc9c8943ad5e568071
+  data.tar.gz: f3a150e2aaec16235a4eb956c8e99073ef72f7951a6097736b9cb8fd90106f28c0387e68a1bf0f0823e9dcfeb35b06e5601a787d056d407a1143f5765fba0ebc

data/alfa_insurance.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "nokogiri", "~> 1"
   spec.add_dependency "money", "~> 6.7"
 
-  spec.add_development_dependency "bundler", "~> 1.14"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "vcr"

data/lib/alfa_insurance/base_client.rb

@@ -2,19 +2,21 @@ module AlfaInsurance
   class BaseClient
     SANDBOX_WSDL = 'https://uat-tes.alfastrah.ru/travel-ext-services/TravelExtService?wsdl'.freeze
 
-    attr_accessor :log, :log_level, :operator, :product_code, :wsdl, :timeout
+    attr_accessor :log, :log_level, :logger, :operator, :product_code, :wsdl, :timeout
 
-    def initialize(debug: false, wsdl: SANDBOX_WSDL, operator:, product_code:, timeout: 5)
+    def initialize(debug: false, wsdl: SANDBOX_WSDL, operator:, product_code:, timeout: 5, logger: nil)
       if debug
         @log_level = :debug
         @log = true
       else
         @log = false
       end
+
       @wsdl = wsdl
       @operator = operator
       @product_code = product_code
       @timeout = timeout
+      @logger = logger
     end
 
     def get_available_products
@@ -79,6 +81,7 @@ module AlfaInsurance
         wsdl: wsdl,
         log_level: log_level,
         log: log,
+        logger: logger,
         pretty_print_xml: log,
         open_timeout: timeout,
         read_timeout: timeout

data/lib/alfa_insurance/find_response.rb

@@ -26,15 +26,11 @@ module AlfaInsurance
     end
 
     def risk_values
-      @risk_values ||= risk_values_from(policy, currency: risk_currency)
+      @risk_values ||= risk_values_from(policy)
     end
 
   private
 
-    def risk_currency
-      policy.dig(:risk_currency, :@value)
-    end
-
     def policy
       @policy ||= body[:policy_information] || {}
     end

data/lib/alfa_insurance/response.rb

@@ -22,19 +22,29 @@ module AlfaInsurance
 
     private
 
-    def risk_values_from(data, currency:)
+    def risk_values_from(data, currency: nil)
       raw_values = data[:risk_value]
       raw_values = [raw_values] unless raw_values.is_a?(Array)
 
       raw_values.each_with_object({}) do |item, result|
         risk_type = item[:@risk_type]
         risk_value = item[:@value]
-        result[risk_type] = to_money(risk_value, currency)
+        value_currency = currency || risk_currency(risk_type)
+        result[risk_type] = to_money(risk_value, value_currency)
       end
     end
 
     def to_money(amount, currency)
       Money.from_amount(amount.to_f, currency)
     end
+
+    def risk_currency(risk_type)
+      risk_currency_data = policy.dig(:risk_currency)
+      if risk_currency_data.is_a?(Array)
+        risk_currency_data.find { |currency_hash| currency_hash[:@risk_type] == risk_type }[:@value]
+      else
+        risk_currency_data[:@value]
+      end
+    end
   end
 end

data/lib/alfa_insurance/version.rb

@@ -1,3 +1,3 @@
 module AlfaInsurance
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alfa_insurance
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Alexander Sviridov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-30 00:00:00.000000000 Z
+date: 2020-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: savon
@@ -56,16 +56,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement