rails_url_shortener 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6aeebf6acccb2b42410986eb0328a509bebf98a1615a60836804f8c62e525ecf
-  data.tar.gz: 7a08775acadc07b9d0a12286056a02f496db98eebe6e87bc913c91d230f60d82
+  metadata.gz: 20985bb8cc91463fdc5482bd63d3cc20f4d246bd061b2a3379183ab2ef00ebc3
+  data.tar.gz: d84145481a224bbf71071da27a85a2a358190e487cceff531586daa6b245c8e8
 SHA512:
-  metadata.gz: b38105a3f020cbf8304bf8a19f9db19c4ff6e1aa4b7f6364060a54d10d0d5d97094d17d39e2b96b0002325fe03816b899eb8a021f3bfa015186e93c871f1a08e
-  data.tar.gz: 500fc4916e53ce218043ba388c9302f9010f614adf4ac90bb790b835792bb381192181eeb8beff8c8dd93825d736785cac84edf208843d1c2e67c6c712769020
+  metadata.gz: 9df5be0690db7d0939e18a1db2ae9aeb68f243cbc4e1a99ea908ac59099c835b09ebbe89e64c4ba237065419e2de82115519a195d723942452943a5bb58fc298
+  data.tar.gz: 2a2e9fc7fc7180ba824aee0080c65bf1729915171a93ade15f97dd36ade234f39750fe713ed89a83a4fcb0a21d6f7b92d0dab6b95eda4ecfe62c20e3e00de62e

data/app/jobs/rails_url_shortener/ip_crawler_job.rb

@@ -11,32 +11,17 @@ module RailsUrlShortener
     # this function get the ip related data
     #
     # create or update an existing record information for an ip
-
     def perform(visit)
       if Ipgeo.exists?(ip: visit.ip)
         ipgeo = Ipgeo.find_by(ip: visit.ip)
-        if Ipgeo.find_by(ip: visit.ip).updated_at <= 3.months.ago
-          # Then update
-          ip = HTTP.get("http://ip-api.com/json/#{visit.ip}?fields=status,message,country,countryCode,region,regionName,city,zip,lat,lon,timezone,isp,org,as,mobile,proxy,hosting,query")
-          if ip.code == 200
-            ipgeo.update(JSON.parse(ip.body).transform_keys { |key| key.to_s.underscore }.slice(*Ipgeo.column_names))
-            visit.update(ipgeo: ipgeo)
-          end
-        else
-          visit.update(ipgeo: ipgeo)
-        end
+        # update if older than three months
+        ipgeo.update_from_remote if ipgeo.updated_at <= 3.months.ago
       elsif !Ipgeo.exists?(ip: visit.ip)
         # Then create a new record
-        ip = HTTP.get("http://ip-api.com/json/#{visit.ip}?fields=status,message,country,countryCode,region,regionName,city,zip,lat,lon,timezone,isp,org,as,mobile,proxy,hosting,query")
-        if ip.code == 200
-          ipgeo = Ipgeo.new(JSON.parse(ip.body).transform_keys { |key| key.to_s.underscore }.slice(*Ipgeo.column_names))
-          ipgeo.ip = JSON.parse(ip.body)['query']
-          ipgeo.save
-          visit.update(ipgeo: ipgeo)
-        end
+        ipgeo = Ipgeo.create(ip: visit.ip)
+        ipgeo.update_from_remote
       end
-    rescue StandarError => e
-      Rails.logger.debug { "Error#{e}" }
+      visit.update(ipgeo: ipgeo) unless ipgeo.nil?
     end
   end
 end

data/app/models/rails_url_shortener/ipgeo.rb

@@ -3,5 +3,12 @@
 module RailsUrlShortener
   class Ipgeo < ApplicationRecord
     has_many :visits, dependent: :nullify
+
+    def update_from_remote
+      @ip = HTTP.get("http://ip-api.com/json/#{ip}?fields=status,message,country,countryCode,region,regionName,city,zip,lat,lon,timezone,isp,org,as,mobile,proxy,hosting,query")
+      return unless @ip.code == 200
+
+      update(JSON.parse(@ip.body).transform_keys { |key| key.to_s.underscore }.slice(*Ipgeo.column_names))
+    end
   end
 end

data/lib/rails_url_shortener/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RailsUrlShortener
-  VERSION = '0.2.5'
+  VERSION = '0.2.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_url_shortener
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - a-chacon
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-20 00:00:00.000000000 Z
+date: 2022-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: browser
@@ -87,9 +87,9 @@ licenses:
 - GPL-3.0
 metadata:
   bug_tracker_uri: https://www.github.com/a-chacon/rails-url-shortener/issues
-  changelog_uri: https://www.github.com/a-chacon/rails-url-shortener/releases/tag/v0.2.5
+  changelog_uri: https://www.github.com/a-chacon/rails-url-shortener/releases/tag/v0.2.6
   documentation_uri: https://github.com/a-chacon/rails-url-shortener/blob/main/README.md
-  source_code_uri: https://github.com/a-chacon/rails-url-shortener/tree/v0.2.5
+  source_code_uri: https://github.com/a-chacon/rails-url-shortener/tree/v0.2.6
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []