dap 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3bd85239af6fa41370c3842a05c38ebe5f6326bf
-  data.tar.gz: 94f2fd35a90332fcf95d297c46a076beba82d17c
+  metadata.gz: caec5115c33ffe3301d3522090ef651e8ef80cba
+  data.tar.gz: f78403df2edc26901708dae7cc326289696d34dd
 SHA512:
-  metadata.gz: d399dd8304d8b6d44349b93efb1255104145ea4d9d8181f28aeea51196ce8ab215c3844991d9b84a4798b4d0b238c5382a15012911cc632fb6b68dc44ed87868
-  data.tar.gz: 8fa091707e3b5920a6aea17d394f0cfb7d1adc24e02cb1e086643a20596f2c869b00e5ec23ed3da45afb7fd863fea700c20d696edcabcb89fac3f308280df7d2
+  metadata.gz: 06f2a048acf014e685c7f7b869ed660253d5d0fa51f3436562e569927594c10820346134197706f027d58747417d5a111c5f0715f3244f7c67d9fada22b25bb0
+  data.tar.gz: e0ebcd198d2477bcec6335243906a2ca70437b8cc3aaa51af9703414ba3c3aff0d57f8044cf1812c6920457a8c6fae88073642bbc028f9415662d2372e28fbe6

data/lib/dap/filter/geoip2.rb

@@ -216,7 +216,7 @@ class FilterGeoIP2LegacyCompat
     remap = {
       # geoip2 name -> geoip name
       "city.country.iso_code": "country_code",
-      "city.country.name": "country.name",
+      "city.country.name": "country_name",
       "city.postal.code": "postal_code",
       "city.location.latitude": "latitude",
       "city.location.longitude": "longitude",

data/lib/dap/version.rb

@@ -1,3 +1,3 @@
 module Dap
-  VERSION = "1.2.2"
+  VERSION = "1.2.3"
 end

data/test/filters.bats

@@ -184,11 +184,11 @@ load ./test_common
   run bash -c "echo -e '81.2.69.142\n12.81.92.0\n2a02:d9c0::\n2a01:1000::' | GEOIP2_ASN_DATABASE_PATH=test/test_data/geoip2/GeoLite2-ASN-Test.mmdb GEOIP2_CITY_DATABASE_PATH=test/test_data/geoip2/GeoIP2-City-Test.mmdb GEOIP2_ISP_DATABASE_PATH=test/test_data/geoip2/GeoIP2-ISP-Test.mmdb $DAP_EXECUTABLE lines + geo_ip2_city line + geo_ip2_asn line + geo_ip2_isp line + geo_ip2_legacy_compat line + match_remove line.geoip2 + json | jq -Sc -r ."
   assert_success
   # this one only has city data, not ASN/org/ISP
-  assert_line --index 0 '{"line":"81.2.69.142","line.city":"London","line.country.name":"United Kingdom","line.country_code":"GB","line.latitude":"51.5142","line.longitude":"-0.0931","line.postal_code":"","line.region":"ENG","line.region_name":"England"}'
+  assert_line --index 0 '{"line":"81.2.69.142","line.city":"London","line.country_code":"GB","line.country_name":"United Kingdom","line.latitude":"51.5142","line.longitude":"-0.0931","line.postal_code":"","line.region":"ENG","line.region_name":"England"}'
   # this one has ASN/org data in the test databases but none in the city DB
   assert_line --index 1 '{"line":"12.81.92.0","line.asn":"AS7018","line.org":"AT&T Services"}'
   # exists only city
-  assert_line --index 2 '{"line":"2a02:d9c0::","line.country.name":"Turkey","line.country_code":"TR","line.latitude":"39.05901","line.longitude":"34.91155","line.postal_code":""}'
+  assert_line --index 2 '{"line":"2a02:d9c0::","line.country_code":"TR","line.country_name":"Turkey","line.latitude":"39.05901","line.longitude":"34.91155","line.postal_code":""}'
   # exists in ISP
   assert_line --index 3 '{"line":"2a01:1000::","line.asn":"AS5617","line.org":"Telekomunikacja Polska S.A."}'
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dap
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Rapid7 Research
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-30 00:00:00.000000000 Z
+date: 2019-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -283,7 +283,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.14.3
 signing_key: 
 specification_version: 4
 summary: 'DAP: The Data Analysis Pipeline'