apache-log-geo 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5f696d02b3eea816384b389250916a180e3b219ad52ecc01ad8fcc42ce664de
-  data.tar.gz: 3b2c584d7cde234fd15918eca2826d4d674806d43bf8ea244b22022916b55dab
+  metadata.gz: b688bc33811dda59d01daba379846ea91eca0e7b2d125739f0e7f98c327985d6
+  data.tar.gz: 1e69c302666c3b5f38458af38f0a4094f82a9e12fe3f52bd1008a91cac4bae96
 SHA512:
-  metadata.gz: 57bb8e647db969849aa7e341def0459ec28c0ccc7806e6cca6a5d6c63beb976bdd097621f6d4f66a8a65b7b780ab5a76653cf190fd83ceb99b3a1be2f96e81e5
-  data.tar.gz: d3341602fb3df5c81af39f1dfcbdbf83576472bdc4bcc1208538db93497e6153f18c2afe50b73787524aa524d428e0a3c2e1310dc1b248e28b48fed5fd3109ff
+  metadata.gz: '0184047e4a91342815ddbf89dd4bf0cc2745b4aeb0f6ecb82416d498c9363f46566f0b423d16ac71c60d29f04accef9069ab12590542ecd553491956f96f29cc'
+  data.tar.gz: 3ce1c92a2d35de14ec126193b9196332cdba6a1b67ca173fceaf0483e346ddd7b1b655d9ab0e5c1277b98414e9c69ded4fe06a3500a1cc02c958c8aeaacef707

data/README.md

@@ -17,11 +17,12 @@ key & install geoipupdate to fetch the db file.
 
     gem install apache-log-geo
 
-It uses a C extension [geoip2_c][], instead of the official maxmind-db
-gem, for in my local tests, the latter (in conjunction with the Ruby
-IO) is 9 (nine) times slower!
+By default it uses the official maxmind-db gem, but if you also do
 
-[geoip2_c]: https://github.com/fluent-plugins-nursery/geoip2_c
+    gem install geoip2_c
+
+the pkg will automatically load it in maxmind-db stead. geoip2_c is a
+C extension that works *much* faster.
 
 ## Usage
 

data/apache-log-geo

@@ -45,8 +45,11 @@ OptionParser.new do |o|
   o.on("--sub regexp", "subdivisions") { |v| opt[:query][:subdivisions] = v }
 end.parse!
 
+errx 2, "no db adaptors found" unless (db_adapter = db_adapter_load)
+
 begin
-  geo = GeoDB.new opt[:db]
+  warnx "db_adapter: #{db_adapter}" if $DEBUG
+  geo = db_adapter.new opt[:db]
 rescue
   errx 2, $!
 end

data/lib.rb

@@ -274,15 +274,11 @@ module ApacheLogGeo
   }
 end
 
-require 'geoip2'
-
-class ApacheLogGeo::GeoDB
-  def initialize path
-    @db = GeoIP2::Database.new path
-  end
+class ApacheLogGeo::DB
+  def lookup _ip; raise 'not implemented'; end
 
   def get ip
-    r = @db.lookup ip rescue nil
+    r = lookup ip
     return nil unless r
 
     {
@@ -298,3 +294,38 @@ class ApacheLogGeo::GeoDB
     }
   end
 end
+
+module ApacheLogGeo
+  def db_adapter_load
+    adapters = {
+      "geoip2" => {
+        klass: Geoip2_c,
+        gem: ['geoip2_c', '~> 0.3.3'] # can't specify it in .gemspec!
+      },
+      "maxmind/db" => { klass: Maxmind},
+    }
+    adapter = adapters.keys.detect do |k|
+      begin
+        gem(*adapters[k][:gem]) if adapters[k][:gem]
+        require k
+      rescue LoadError
+        next nil
+      end
+      k
+    end
+
+    adapters[adapter][:klass]
+  end
+end
+
+# Available adapters
+
+class ApacheLogGeo::Geoip2_c < ApacheLogGeo::DB # a C extension
+  def initialize path; @db = GeoIP2::Database.new path; end
+  def lookup ip; @db.lookup ip rescue nil; end
+end
+
+class ApacheLogGeo::Maxmind < ApacheLogGeo::DB # a pure ruby implementation
+  def initialize path; @db = MaxMind::DB.new path, mode: MaxMind::DB::MODE_MEMORY; end
+  def lookup ip; @db.get ip rescue nil; end
+end

data/mmdb-lookup

@@ -57,8 +57,11 @@ OptionParser.new do |o|
   o.on("-f fmt", "output format: json, shell") { |v| opt[:fmt] = v }
 end.parse!
 
+errx 2, "no db adaptors found" unless (db_adapter = db_adapter_load)
+
 begin
-  geo = GeoDB.new opt[:db]
+  warnx "db_adapter: #{db_adapter}" if $DEBUG
+  geo = db_adapter.new opt[:db]
 rescue
   errx 2, $!
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: apache-log-geo
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Alexander Gromnitsky
 autorequire: 
 bindir: "."
 cert_chain: []
-date: 2020-03-09 00:00:00.000000000 Z
+date: 2020-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: geoip2_c
+  name: maxmind-db
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 1.1.0
 description: |
   An offline GeoIP CLI filter for Apache (common, combined) logs.
   It's like grep but with a knowledge about what data an ip
@@ -38,14 +38,15 @@ files:
 - "./apache-log-geo"
 - "./mmdb-lookup"
 - README.md
-- apache-log-geo
 - lib.rb
-- mmdb-lookup
 homepage: https://github.com/gromnitsky/apache-log-geo
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message: |
+  *******************************************************************
+  Make sure to install geoip2_c ~> 0.3.3 gem for maximum performance!
+  *******************************************************************
 rdoc_options: []
 require_paths:
 - lib
@@ -53,7 +54,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="