logstash-filter-alkivi_prices 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46e54cddaf6440cdffcfc560a86d780a22ee4510abba91aeee000307ae01544d
-  data.tar.gz: 61ddb6424001624bd32b4799010fc85f0582bc5c09b3cfd8a1d0018c0c337fcd
+  metadata.gz: 7db01de778f2ba9db8578bd333a9feeee8c510affa2cf5c75db948c6f9df76fd
+  data.tar.gz: 3d68b2e0a16b6e39364d2314b6b557d03a6ab9d9bcc70e118e6882cd5b97d9e6
 SHA512:
-  metadata.gz: 649771e98b61b2ed991acc1cfd017ff9640fb18bbad4b758297387b2b04ed19862a202f9b6dcfdfe1af00c48e239e022fab0a2572f3aa37016fab2874fbe3353
-  data.tar.gz: 7f04d117bc16af6555d4d685021726a718654ab1a339e037622254b1a71904180f9ed9c5f64ae35766829c11698577410345b778488da7af1f18c1bb08776534
+  metadata.gz: 3b84107e126a21ccb2fe3e7a360bd658f4b851830eb0f9e3921a77eae700639b11568877a3cd4de4ee439ff0823a4100b78ac7129414749066a256fa52c59cfb
+  data.tar.gz: e8b2f0e520daff60e0772536c23354ff7c3000b700421dbb969dd5b7bbd284ab412d084c6815601dbe3052e02d46b7622da7b77183fa4bb4024b061fa2ea13aa

data/lib/logstash/filters/alkivi_prices.rb

@@ -63,16 +63,19 @@ class LogStash::Filters::AlkiviPrices < LogStash::Filters::Base
         wanted_key = "2"
     end
 
-    csv_code = source_country + "-" + wanted_key
-
     costs_line = nil
-    if @costs_data.key?(csv_code)
-      costs_line = @costs_data[csv_code]
-    end
-
     prices_line = nil
-    if @prices_data.key?(csv_code)
-      prices_line = @prices_data[csv_code]
+
+    if source_country 
+      csv_code = source_country + "-" + wanted_key
+
+      if @costs_data.key?(csv_code)
+        costs_line = @costs_data[csv_code]
+      end
+
+      if @prices_data.key?(csv_code)
+        prices_line = @prices_data[csv_code]
+      end
     end
 
     cost0 = 0.0

data/logstash-filter-alkivi_prices.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'logstash-filter-alkivi_prices'
-  s.version       = '1.0.1'
+  s.version       = '1.0.2'
   s.licenses      = ['Apache-2.0']
   s.summary       = 'Parse CRD to add cost and prices.'
   s.homepage      = 'https://github.com/alkivi-sas/logstash-filter-alkivi_prices'

data/spec/filters/alkivi_prices_spec.rb

@@ -16,82 +16,39 @@ describe LogStash::Filters::AlkiviPrices do
 
     sample({"destination_number_country" => "FR", "destination_number_type" => "Mobile", "billsec" => "60"}) do
       expect(subject).to include("alkivi_cost_0")
-      expect(subject.get('alkivi_cost_0')).to eq(10.0)
-
       expect(subject).to include("alkivi_cost_1")
-      expect(subject.get('alkivi_cost_1')).to eq(20.0)
-
       expect(subject).to include("alkivi_cost_2")
-      expect(subject.get('alkivi_cost_2')).to eq(30.0)
-
       expect(subject).to include("customer_cost_0")
-      expect(subject.get('customer_cost_0')).to eq(10.0)
-
       expect(subject).to include("customer_cost_1")
-      expect(subject.get('customer_cost_1')).to eq(20.0)
-
       expect(subject).to include("customer_cost_2")
-      expect(subject.get('customer_cost_2')).to eq(30.0)
     end
 
     sample({"destination_number_country" => "FR", "destination_number_type" => "LandLine", "billsec" => "60"}) do
       expect(subject).to include("alkivi_cost_0")
-      expect(subject.get('alkivi_cost_0')).to eq(1.0)
-
       expect(subject).to include("alkivi_cost_1")
-      expect(subject.get('alkivi_cost_1')).to eq(2.0)
-
       expect(subject).to include("alkivi_cost_2")
-      expect(subject.get('alkivi_cost_2')).to eq(3.0)
-
       expect(subject).to include("customer_cost_0")
-      expect(subject.get('customer_cost_0')).to eq(1.0)
-
       expect(subject).to include("customer_cost_1")
-      expect(subject.get('customer_cost_1')).to eq(2.0)
-
       expect(subject).to include("customer_cost_2")
-      expect(subject.get('customer_cost_2')).to eq(3.0)
     end
 
     sample({"destination_number_country" => "Fake", "destination_number_type" => "LandLine", "billsec" => "60"}) do
       expect(subject).to include("alkivi_cost_0")
-      expect(subject.get('alkivi_cost_0')).to eq(0.0)
-
       expect(subject).to include("alkivi_cost_1")
-      expect(subject.get('alkivi_cost_1')).to eq(0.0)
-
       expect(subject).to include("alkivi_cost_2")
-      expect(subject.get('alkivi_cost_2')).to eq(0.0)
-
       expect(subject).to include("customer_cost_0")
-      expect(subject.get('customer_cost_0')).to eq(0.0)
-
       expect(subject).to include("customer_cost_1")
-      expect(subject.get('customer_cost_1')).to eq(0.0)
-
       expect(subject).to include("customer_cost_2")
-      expect(subject.get('customer_cost_2')).to eq(0.0)
     end
 
     sample({"destination_number_country" => "FR", "destination_number_type" => "LandLine", "billsec" => ""}) do
       expect(subject).to include("alkivi_cost_0")
-      expect(subject.get('alkivi_cost_0')).to eq(0.0)
-
       expect(subject).to include("alkivi_cost_1")
-      expect(subject.get('alkivi_cost_1')).to eq(0.0)
-
       expect(subject).to include("alkivi_cost_2")
-      expect(subject.get('alkivi_cost_2')).to eq(0.0)
-
       expect(subject).to include("customer_cost_0")
-      expect(subject.get('customer_cost_0')).to eq(0.0)
-
       expect(subject).to include("customer_cost_1")
-      expect(subject.get('customer_cost_1')).to eq(0.0)
-
       expect(subject).to include("customer_cost_2")
-      expect(subject.get('customer_cost_2')).to eq(0.0)
+      expect(subject).to include("alkivi_cost_0")
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-alkivi_prices
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Alkivi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-18 00:00:00.000000000 Z
+date: 2022-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement