rails_url_shortener 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '00481a62dbd5a849d91d094652186a58f7c8faa238b25c00f3ee05ac30f322b9'
-  data.tar.gz: '06594fa9241eaf4fd745da60d8f6719993baef6768b9d0926a664d6b6867c617'
+  metadata.gz: d3bb06e219a4cd2bdfd83ef3d6b3f892bd1c4194cad99019aecd7c3e206ce4a5
+  data.tar.gz: 815b320b295c2c3d38b695b3412a656f7349fe0a454ddb63d9e127e33db7daef
 SHA512:
-  metadata.gz: de9cfc42dde1ad9426a49bb3b87b17befb2c45a509f0890f2d71d817b7cabe06368ddbd07ed19d3ebc0ed2a049c238ad597f61c9e57488f206126f22ffee07aa
-  data.tar.gz: e01451221e61b78bd9e9b9685d2b43f489817130682db36f5b0f7b1f3bbc09ca095a018066f4a7d28b82912ff6f5edfdec4420c2f968ea77970ac5f4e2da2b6b
+  metadata.gz: 452449b98fdec6c11fe2f544239552fd70d7c701caf7db69e8b9a581b62921f964c3dc21c163daf3b6be65b58ceaed8948d2e8a42b1b877ff1d0033689773814
+  data.tar.gz: 1b20f5faa06077c88256df869aae288e863e729ee84060e752d19186116ff96b78c7ebf35482171f48a240261b6cfb163ba57eb78e91368b44d21b44bcfe8d9d

data/app/jobs/rails_url_shortener/application_job.rb

@@ -0,0 +1,9 @@
+module RailsUrlShortener
+  class ApplicationJob < ActiveJob::Base
+    # Automatically retry jobs that encountered a deadlock
+    # retry_on ActiveRecord::Deadlocked
+
+    # Most jobs are safe to ignore if the underlying records are no longer available
+    # discard_on ActiveJob::DeserializationError
+  end
+end

data/app/jobs/rails_url_shortener/ip_crawler_job.rb

@@ -0,0 +1,35 @@
+module RailsUrlShortener
+  class IpCrawlerJob < ApplicationJob
+    queue_as :default
+
+    require 'http'
+    require 'json'
+
+    ##
+    # 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.find_by(ip: visit.ip).updated_at <= Time.now - 3.months
+        # 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 = Ipgeo.find_by(ip: visit.ip)
+          ipgeo.update(JSON.parse(ip.body).transform_keys { |key| key.to_s.underscore }.slice(*Ipgeo.column_names))
+        end
+      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.ipgeo = ipgeo
+        end
+      end
+    rescue Exception => e
+      print('Error' + e.to_s)
+    end
+  end
+end

data/app/models/rails_url_shortener/ipgeo.rb

@@ -0,0 +1,5 @@
+module RailsUrlShortener
+  class Ipgeo < ApplicationRecord
+    has_many :visits
+  end
+end

data/app/models/rails_url_shortener/visit.rb

@@ -2,6 +2,7 @@ module RailsUrlShortener
   require 'json'
   class Visit < ApplicationRecord
     belongs_to :url
+    belongs_to :ipgeo, optional: true
 
     ##
     # Parse a request information and save
@@ -15,7 +16,7 @@ module RailsUrlShortener
         false
       else
         # save
-        Visit.create(
+        visit = Visit.create(
           url: url,
           ip: request.ip,
           browser: browser.name,
@@ -25,6 +26,9 @@ module RailsUrlShortener
           bot: browser.bot?,
           user_agent: request.headers['User-Agent']
         )
+        # We enqueue a job for get more data later
+        IpCrawlerJob.perform_later(visit)
+        visit
       end
     end
   end

data/db/migrate/20220418184647_create_rails_url_shortener_ipgeos.rb

@@ -0,0 +1,28 @@
+class CreateRailsUrlShortenerIpgeos < ActiveRecord::Migration[7.0]
+  def up
+    create_table :rails_url_shortener_ipgeos do |t|
+      t.string  :ip
+      t.string  :country
+      t.string  :country_code
+      t.string  :region
+      t.string  :region_name
+      t.string  :city
+      t.string  :lat
+      t.string  :lon
+      t.string  :timezone
+      t.string  :isp
+      t.string  :org
+      t.string  :as
+      t.boolean :mobile
+      t.boolean :proxy
+      t.boolean :hosting
+      t.timestamps
+    end
+    add_column :rails_url_shortener_visits, :ipgeo_id, :integer
+    add_index :rails_url_shortener_visits, :ipgeo_id
+  end
+  def down
+    remove_column :rails_url_shortener_visits, :ipgeo_id
+    drop_table :rails_url_shortener_ipgeos
+  end
+end

data/lib/rails_url_shortener/engine.rb

@@ -2,5 +2,6 @@ module RailsUrlShortener
   class Engine < ::Rails::Engine
     isolate_namespace RailsUrlShortener
     require 'browser'
+    require 'http'
   end
 end

data/lib/rails_url_shortener/version.rb

@@ -1,3 +1,3 @@
 module RailsUrlShortener
-  VERSION = "0.1.4"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_url_shortener
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - a-chacon
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-17 00:00:00.000000000 Z
+date: 2022-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.15.0
+- !ruby/object:Gem::Dependency
+  name: http
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.0.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.0.4
 description: RailsUrlShortener is a simple engine that provide to your rail's app
   the functionalities for short URLs. Like bitly.com, but working on your project
   only.
@@ -66,12 +80,16 @@ files:
 - Rakefile
 - app/controllers/rails_url_shortener/urls_controller.rb
 - app/helpers/rails_url_shortener/urls_helper.rb
+- app/jobs/rails_url_shortener/application_job.rb
+- app/jobs/rails_url_shortener/ip_crawler_job.rb
 - app/models/rails_url_shortener/application_record.rb
+- app/models/rails_url_shortener/ipgeo.rb
 - app/models/rails_url_shortener/url.rb
 - app/models/rails_url_shortener/visit.rb
 - config/routes.rb
 - db/migrate/20220407202526_create_rails_url_shortener_urls.rb
 - db/migrate/20220407202539_create_rails_url_shortener_visits.rb
+- db/migrate/20220418184647_create_rails_url_shortener_ipgeos.rb
 - lib/generators/rails_url_shortener/rails_url_shortener_generator.rb
 - lib/generators/rails_url_shortener/templates/initializer.rb
 - lib/rails_url_shortener.rb
@@ -83,9 +101,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.1.4
+  changelog_uri: https://www.github.com/a-chacon/rails-url-shortener/releases/tag/v0.2.0
   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.1.4
+  source_code_uri: https://github.com/a-chacon/rails-url-shortener/tree/v0.2.0
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []