ip_lookup 1.1.0 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa5e7ff8053216bab3b111d02bf910ef281ba71c8a8abed3c6727810a47b7c5e
-  data.tar.gz: 68939591bbaaac10a9dee2bbb7c5ded2d1df946e4317734c88882c4403c251a7
+  metadata.gz: 8d6593b39b336032a59d5271dd66cdd0eab98d761eae3f4b9ba7e5029781ee2d
+  data.tar.gz: 31a52ea45909d4de79db6f0d43e8d3cbb1d927c27970c6ff3ed2c4c363e033b2
 SHA512:
-  metadata.gz: 0af25c457c827ea5424ac13aaee00902636e97d169e1f18264452e0873c7c54f247e05fec9d6d448d5f6cc8d4bb997d1a6a1cdb345274e734a39f8d01af99965
-  data.tar.gz: 3876a9eebabc872ae120833b480986465c7fb37a3116d334ae9d9bfef63e93a3f98ada1888f68fb028caef0378d8b8c8560a0aa7479c1d762e48f590fcf54dc5
+  metadata.gz: bf2cbaaf566345c12f089321f89fa818d72122da8924fb8e5284b2d5edb39db35fe302b210ab69a4bb3a7e3a62044ad7f6f22b541d65798f6921d2412b1581ef
+  data.tar.gz: ec4966ad08a3467f51ed81abafe752b332e76fa9d69d83815ff35706c6081e7bdafe1e258b5195101c5619c1903337a441f03e8931eb79e3c8b4ef723d734899

data/README.md

@@ -26,7 +26,6 @@ Or install it yourself as:
 
 Before using the gem the db file needs to be downloaded / updated. 
 
-
 ```ruby
 # download / update database
 IPLookup.DB.update update_period: 30, update_uri: "http://path_to_database_GeoLite2-City.mmdb.gz"
@@ -35,12 +34,12 @@ IPLookup.DB.update update_period: 30, update_uri: "http://path_to_database_GeoLi
 - default update_period (in days): 30
 - default update_uri: http://geolite.maxmind.com/download/geoip/database/GeoLite2-City.mmdb.gz
 
-*NOTE: The gem provides a RubyGems post-install hook to download / update the db.*
+*NOTE: The gem provides post-install hook to download / update the db using Gem extensions.*
 
 ### Usage
 
 ```ruby
-ip_lookup = IPLookup.new("213.61.214.178"), silent_exceptions: false
+ip_lookup = IPLookup.new "213.61.214.178", silent_exceptions: false
 
 ip_lookup.country 
 # => "de"
@@ -58,6 +57,8 @@ ip_lookup.subdivision
 *Defaults:*
 - silent_exceptions: false
 
+*NOTE: If silent exceptions is set to true, IPLookup returns default values in case the IP address couln't be looked up.
+
 ## Development
 
 After checking out the repo, run bin/setup to install dependencies. Then, run `rake spec` to run the tests. You can also run bin/console for an interactive prompt that will allow you to experiment.

data/lib/ip_lookup.rb

@@ -14,35 +14,36 @@ class IPLookup
   def initialize(ip_address, silent_exceptions: false)
     @silent_exceptions = silent_exceptions
     @result = DB.new(silent_exceptions).lookup(ip_address)
+  rescue IPAddr::InvalidAddressError, IPAddr::AddressFamilyError => e
+    raise e unless silent_exceptions
   end
 
   def country
-    error_handler(DEFAULT_COUNTRY) do
-      iso_code = result.country.iso_code
-      iso_code ? iso_code.downcase : DEFAULT_COUNTRY
-    end
+    return DEFAULT_COUNTRY unless result&.found?
+
+    iso_code = result.country.iso_code
+    iso_code ? iso_code.downcase : DEFAULT_COUNTRY
   end
 
   def timezone
-    error_handler(DEFAULT_TIMEZONE) do
-      timezone = result.location.time_zone
+    return DEFAULT_TIMEZONE unless result&.found?
 
-      timezone ||= timezone_for result.country.iso_code if result.country.iso_code
+    timezone = result.location.time_zone
 
-      timezone || DEFAULT_TIMEZONE
-    end
+    timezone ||= timezone_for result.country.iso_code if result.country.iso_code
+    timezone || DEFAULT_TIMEZONE
   end
 
   def coordinates
-    error_handler(DEFAULT_COORDINATES) do
-      [result.location.latitude, result.location.longitude]
-    end
+    return DEFAULT_COORDINATES unless result&.found?
+
+    [result.location.latitude, result.location.longitude]
   end
 
   def subdivision
-    error_handler(DEFAULT_SUBDIVISION) do
-      result.subdivisions.any? ? result.subdivisions.first.iso_code.downcase : DEFAULT_SUBDIVISION
-    end
+    return DEFAULT_SUBDIVISION unless result&.found?
+
+    result.subdivisions.any? ? result.subdivisions.first.iso_code.downcase : DEFAULT_SUBDIVISION
   end
 
   private
@@ -51,12 +52,4 @@ class IPLookup
     tz = TZInfo::Country.get iso_code
     tz.zone_identifiers.first if tz.zone_identifiers.any?
   end
-
-  def error_handler(default)
-    result&.found? ? yield : default
-  rescue IPAddr::InvalidAddressError, IPAddr::AddressFamilyError
-    raise e unless silent_exceptions
-
-    default
-  end
 end

data/lib/ip_lookup/db.rb

@@ -15,26 +15,25 @@ class IPLookup
     end
 
     def lookup(ip_address)
-      db.lookup ip_address
+      self.class.db.lookup ip_address
     rescue Errno::ENOENT
       raise DBFileNotFoundError, "Couldn't find DB file. Please update DB before using lookup." unless silent_exceptions
     end
 
-    def self.mutex
-      @mutex ||= Mutex.new
-    end
-
-    private
+    class << self
 
-    def db
-      self.class.mutex.synchronize do
-        @db ||= begin
-          MaxMindDB.new self.class.full_db_path
+      def db
+        mutex.synchronize do
+          @db ||= begin
+            MaxMindDB.new full_db_path
+          end
         end
       end
-    end
 
-    class << self
+      def mutex
+        @mutex ||= Mutex.new
+      end
+
       def update(update_period: DEFAULT_UPDATE_PERIOD_IN_DAYS, update_uri: DEFAULT_UPDATE_URI)
         return unless update_db? update_period
 

data/lib/ip_lookup/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class IPLookup
-  VERSION = "1.1.0"
+  VERSION = "1.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ip_lookup
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.2
 platform: ruby
 authors:
 - Ole Richter
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-14 00:00:00.000000000 Z
+date: 2018-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: maxminddb