regeoip 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42c391fc1d30f34e2f857747689ca75f8b00b6bb
-  data.tar.gz: 6535edca0dc1bc8c276685fd611c53221d8e3ea1
+  metadata.gz: 6bc6d306e1c1a792694ac124bd99e245b845b7b3
+  data.tar.gz: 8fec8b08376b3da6ebfb6eb5c2e48291458afce5
 SHA512:
-  metadata.gz: bcedd343030441a904efd6eecb9013705d663eed2d59f303a6ad8496e6932c042193bce5a68d3108e87d3f866b6c107a7edaab1789eacec9a07a5c545c0a3415
-  data.tar.gz: fca5eab7be00f1f3f7d3078a39bf9ad95f0bd6cc2e6f78da2ca5ebb1f0009f214ae342bc36e91d391db32f68e2e2d7b30ad3423a198021a40ba51ad73fd36bde
+  metadata.gz: 14a739b1bac7c2792a99a72cf5dfda28b23fd6ba5908fcb75653ed3918da317de517c0a444594d6ad4c5d282fe5532a7ed3b5bd133b9522af373bbbc5a415d23
+  data.tar.gz: b8defdc9d27f5903665b9b06a1dcf2e35a6a0e71b6bd139d2f7f7d8f07081585f8b59e0e3dc4e1de98e639585723cdfd857b4dca344dcfe506b77c1a6a09faeb

data/.circleci/config.yml

@@ -0,0 +1,41 @@
+# Ruby CircleCI 2.0 configuration file
+#
+# Check https://circleci.com/docs/2.0/language-ruby/ for more details
+#
+version: 2
+jobs:
+  build:
+    docker:
+      # specify the version you desire here
+       - image: circleci/ruby:2.2.8
+
+      # Specify service dependencies here if necessary
+      # CircleCI maintains a library of pre-built images
+      # documented at https://circleci.com/docs/2.0/circleci-images/
+      # - image: circleci/postgres:9.4
+
+    working_directory: ~/repo
+
+    steps:
+      - checkout
+
+      # Download and cache dependencies
+      - restore_cache:
+          keys:
+          - v1-dependencies-{{ checksum "Gemfile.lock" }}
+          # fallback to using the latest cache if no exact match is found
+          - v1-dependencies-
+
+      - run:
+          name: install dependencies
+          command: |
+            bundle install --jobs=4 --retry=3 --path vendor/bundle
+
+      - save_cache:
+          paths:
+            - ./vendor/bundle
+          key: v1-dependencies-{{ checksum "Gemfile.lock" }}
+
+      - run:
+          name: run tests
+          command: bundle exec rspec spec/

data/README.md

@@ -1,9 +1,9 @@
 # Regeoip
 
-Regeoip come with GeoIP.dat and GeoIPv6.dat so that it will resolve
-either IPv4 or IPv4 to country without a need for a request.
+Regeoip come with GeoLite2-City.mmdb so that it will resolve
+either IPv4 or IPv6 to country and city without a need for a request.
 
-All you need is: `Regeoip.resolve_country_code2(ip)`
+All you need is: `Regeoip.resolve(ip)`
 
 ## Installation
 
@@ -23,13 +23,16 @@ Or install it yourself as:
 
 ## Usage
 
+Get all location data:
+    Regeoip.resolve(ip)
+
 Get country data:
 
     Regeoip.resolve_country(ip)
 
 Get country code:
 
-    Regeoip.resolve_country_code2(ip)
+    Regeoip.resolve_country_code(ip)
 
 ## Development
 

data/lib/regeoip.rb

@@ -1,32 +1,32 @@
 require 'regeoip/version'
-require 'geoip'
+require 'maxminddb'
 
 module Regeoip
   def self.resolve_country(ip)
-    return nil if ip.nil?
-    if ip.to_s =~ /^[0-9.]+$/
-      geoipv4.country(ip)
+    if (geo_info = resolve(ip))
+      geo_info.country
     else
-      geoipv6.country(ip.to_s)
+      nil
     end
   end
 
-  def self.resolve_country_code2(ip)
+  def self.resolve_country_code(ip)
     if (country = resolve_country(ip))
-      country.country_code2
+      country.iso_code
     else
       nil
     end
   end
 
-  private
-
-  def self.geoipv4
-    @geoipv4 ||= GeoIP.new(local_path('GeoIP.dat'))
+  def self.resolve(ip)
+    return nil if ip.nil?
+    max_mind_db.lookup(ip.to_s)
   end
 
-  def self.geoipv6
-    @geoipv6 ||= GeoIP.new(local_path('GeoIPv6.dat'))
+  private
+
+  def self.max_mind_db
+    @max_mind_db ||= MaxMindDB.new(local_path('GeoLite2-City.mmdb'))
   end
 
   def self.local_path(file)

data/lib/regeoip/version.rb

@@ -1,3 +1,3 @@
 module Regeoip
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/regeoip.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "geoip", "~> 1.6.2"
+  spec.add_dependency "maxminddb", "~> 0.1.22"
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: regeoip
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Phuong Nguyen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-11 00:00:00.000000000 Z
+date: 2019-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: geoip
+  name: maxminddb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: 0.1.22
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: 0.1.22
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -74,6 +74,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -81,8 +82,7 @@ files:
 - README.md
 - Rakefile
 - bin/setup
-- lib/GeoIP.dat
-- lib/GeoIPv6.dat
+- lib/GeoLite2-City.mmdb
 - lib/regeoip.rb
 - lib/regeoip/version.rb
 - regeoip.gemspec
@@ -105,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.2
 signing_key: 
 specification_version: 4
 summary: Resolve ipv4 and ipv6 to country code without need for extra http request