rails_url_shortener 0.2.3 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b57e818e54f05c9209a2534ec6e76d551252a6595a8e1f81354752d46cb4fcb
-  data.tar.gz: 9da77343ba94664263e077045f4cf42bbace11ca49a6c010a7267e0b48fc5ccd
+  metadata.gz: 20985bb8cc91463fdc5482bd63d3cc20f4d246bd061b2a3379183ab2ef00ebc3
+  data.tar.gz: d84145481a224bbf71071da27a85a2a358190e487cceff531586daa6b245c8e8
 SHA512:
-  metadata.gz: 41b359b19b5d04a080f1081057b2fe90995a485ce537e33a5a543b71e2e01d8ebe3a2ac606bf6009927ec1a7d37db58c21631e3fd51206e0cacedde771f7bdbd
-  data.tar.gz: 72b1c6b431acc29a3050a25f0db5be0e651756c6e923027b708be1440cfc7dc335b0bd0ee3a5cf2dcaf19904c02e99e6723aaa0fb106bb56daae29f418a5ead6
+  metadata.gz: 9df5be0690db7d0939e18a1db2ae9aeb68f243cbc4e1a99ea908ac59099c835b09ebbe89e64c4ba237065419e2de82115519a195d723942452943a5bb58fc298
+  data.tar.gz: 2a2e9fc7fc7180ba824aee0080c65bf1729915171a93ade15f97dd36ade234f39750fe713ed89a83a4fcb0a21d6f7b92d0dab6b95eda4ecfe62c20e3e00de62e

data/README.md

@@ -15,6 +15,7 @@ A few of the things you can do with RailsUrlShortener:
 * The short links can be associated with a model in your app.
 * Save interesting things like browser, system and ip data of the 'un-shortened' request.
 * Temporal short links using the expires_at option.
+* Get IP data from third part service.
 
 ## Usage
 
@@ -80,6 +81,15 @@ Or using the model class:
 RailsUrlShortener::Visit.all # all in database
 ```
 
+And a Visit is related to a Ipgeo model that contain information about the ip, so you can view this using the active record relation:
+```ruby
+RailsUrlShortener::Visit.first.ipgeo # Ipgeo object that contain information of the ip
+```
+
+### Ip data
+
+When a Visit record is created, a job is enqueue for get Ip data from [this](https://ip-api.com/) service and create the Ipgeo record. It is integrated to the free endpoint, so if you think that you have more than 45 different IPS querying in a minute to your app, we need to think in a new solution.
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/Rakefile

@@ -1,8 +1,26 @@
-require "bundler/setup"
+# frozen_string_literal: true
 
-APP_RAKEFILE = File.expand_path("test/dummy/Rakefile", __dir__)
-load "rails/tasks/engine.rake"
+require 'bundler/setup'
 
-load "rails/tasks/statistics.rake"
+APP_RAKEFILE = File.expand_path('test/dummy/Rakefile', __dir__)
+load 'rails/tasks/engine.rake'
 
-require "bundler/gem_tasks"
+load 'rails/tasks/statistics.rake'
+
+require 'bundler/gem_tasks'
+require 'rake/testtask'
+
+Rake::TestTask.new(:test) do |t|
+  t.warning = false
+  t.libs << 'test'
+  t.libs << 'lib'
+  t.test_files = FileList['test/**/*test.rb']
+end
+
+require 'rubocop/rake_task'
+
+RuboCop::RakeTask.new do |task|
+  task.requires << 'rubocop-minitest'
+end
+
+task default: %i[test rubocop]

data/app/controllers/rails_url_shortener/urls_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsUrlShortener
   class UrlsController < ActionController::Metal
     include ActionController::StrongParameters

data/app/helpers/rails_url_shortener/urls_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsUrlShortener
   module UrlsHelper
     ##
@@ -19,8 +21,8 @@ module RailsUrlShortener
       if url_object.errors.empty?
         # options for url_for
         options = {
-          controller: "rails_url_shortener/urls",
-          action: "show",
+          controller: 'rails_url_shortener/urls',
+          action: 'show',
           key: url_object.key,
           host: RailsUrlShortener.host
         }.merge(url_options)

data/app/jobs/rails_url_shortener/application_job.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsUrlShortener
   class ApplicationJob < ActiveJob::Base
     # Automatically retry jobs that encountered a deadlock

data/app/jobs/rails_url_shortener/ip_crawler_job.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsUrlShortener
   class IpCrawlerJob < ApplicationJob
     queue_as :default
@@ -9,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 <= 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.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 Exception => e
-      print('Error' + e.to_s)
+      visit.update(ipgeo: ipgeo) unless ipgeo.nil?
     end
   end
 end

data/app/models/rails_url_shortener/application_record.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsUrlShortener
   class ApplicationRecord < ActiveRecord::Base
     self.abstract_class = true

data/app/models/rails_url_shortener/ipgeo.rb

@@ -1,5 +1,14 @@
+# frozen_string_literal: true
+
 module RailsUrlShortener
   class Ipgeo < ApplicationRecord
-    has_many :visits
+    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/app/models/rails_url_shortener/url.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsUrlShortener
   class Url < ApplicationRecord
     # variables
@@ -5,7 +7,7 @@ module RailsUrlShortener
 
     # relations
     belongs_to :owner, polymorphic: true, optional: true
-    has_many :visits
+    has_many :visits, dependent: :nullify
 
     # validations
     validates :key, presence: true, length: { minimum: RailsUrlShortener.minimum_key_length }, uniqueness: true
@@ -14,9 +16,9 @@ module RailsUrlShortener
     # exclude records in which expiration time is set and expiration time is greater than current time
     scope :unexpired, -> { where(arel_table[:expires_at].eq(nil).or(arel_table[:expires_at].gt(::Time.current))) }
 
+    after_initialize :set_attr
     # callbacks
     before_validation :generate_key
-    after_initialize :set_attr
 
     ##
     # set default instance variables values
@@ -74,14 +76,14 @@ module RailsUrlShortener
     end
 
     def generate_key
-      if key.nil?
-        loop do
-          # plus to the key length if after 10 attempts was not found a candidate
-          self.key_length += 1 if generating_retries >= 10
-          self.key = key_candidate
-          self.generating_retries += 1
-          break unless self.class.exists?(key: key)
-        end
+      return unless key.nil?
+
+      loop do
+        # plus to the key length if after 10 attempts was not found a candidate
+        self.key_length += 1 if generating_retries >= 10
+        self.key = key_candidate
+        self.generating_retries += 1
+        break unless self.class.exists?(key: key)
       end
     end
   end

data/app/models/rails_url_shortener/visit.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsUrlShortener
   require 'json'
   class Visit < ApplicationRecord
@@ -11,19 +13,19 @@ module RailsUrlShortener
 
     def self.parse_and_save(url, request)
       # browser detection
-      browser = Browser.new(request.headers['User-Agent'])
-      if !RailsUrlShortener.save_bots_visits && browser.bot?
+      browser(request)
+      if !RailsUrlShortener.save_bots_visits && @browser.bot?
         false
       else
         # save
         visit = Visit.create(
           url: url,
           ip: request.ip,
-          browser: browser.name,
-          browser_version: browser.full_version,
-          platform: browser.platform.name,
-          platform_version: browser.platform.version,
-          bot: browser.bot?,
+          browser: @browser.name,
+          browser_version: @browser.full_version,
+          platform: @browser.platform.name,
+          platform_version: @browser.platform.version,
+          bot: @browser.bot?,
           user_agent: request.headers['User-Agent']
         )
         # We enqueue a job for get more data later
@@ -31,5 +33,9 @@ module RailsUrlShortener
         visit
       end
     end
+
+    def self.browser(request)
+      @browser = Browser.new(request.headers['User-Agent'])
+    end
   end
 end

data/db/migrate/20220418184647_create_rails_url_shortener_ipgeos.rb

@@ -21,6 +21,7 @@ class CreateRailsUrlShortenerIpgeos < ActiveRecord::Migration[7.0]
     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

data/lib/generators/rails_url_shortener/rails_url_shortener_generator.rb

@@ -1,11 +1,11 @@
+# frozen_string_literal: true
+
 require 'rails/generators'
 
 class RailsUrlShortenerGenerator < Rails::Generators::Base
-
-  source_root File.expand_path("templates", __dir__)
+  source_root File.expand_path('templates', __dir__)
 
   def copy
-    copy_file "initializer.rb", "config/initializers/rails_url_shortener.rb"
+    copy_file 'initializer.rb', 'config/initializers/rails_url_shortener.rb'
   end
-
 end

data/lib/generators/rails_url_shortener/templates/initializer.rb

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 CHARSETS = {
   alphanum: ('a'..'z').to_a + (0..9).to_a,
   alphacase: ('a'..'z').to_a + ('A'..'Z').to_a,
-  alphanumcase: ('A'..'Z').to_a + ('a'..'z').to_a  + (0..9).to_a
-}
+  alphanumcase: ('A'..'Z').to_a + ('a'..'z').to_a + (0..9).to_a
+}.freeze
 
-RailsUrlShortener.host = "localhost:3000"           # the host used for the helper
-RailsUrlShortener.default_redirect = "/"            # where the users are redirect if the link doesn't exists or is expired.
+RailsUrlShortener.host = 'localhost:3000'           # the host used for the helper
+RailsUrlShortener.default_redirect = '/'            # where the users are redirect if the link is not found.
 RailsUrlShortener.charset = CHARSETS[:alphanumcase] # used for generate the keys, better long.
 RailsUrlShortener.key_length = 6                    # Key length for random generator
 RailsUrlShortener.minimum_key_length = 3            # minimun permited for a key

data/lib/rails_url_shortener/engine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsUrlShortener
   class Engine < ::Rails::Engine
     isolate_namespace RailsUrlShortener

data/lib/rails_url_shortener/version.rb

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

data/lib/rails_url_shortener.rb

@@ -1,15 +1,16 @@
-require "rails_url_shortener/version"
-require "rails_url_shortener/engine"
+# frozen_string_literal: true
 
-module RailsUrlShortener
+require 'rails_url_shortener/version'
+require 'rails_url_shortener/engine'
 
+module RailsUrlShortener
   ##
   # constants
   CHARSETS = {
     alphanum: ('a'..'z').to_a + (0..9).to_a,
     alphacase: ('a'..'z').to_a + ('A'..'Z').to_a,
-    alphanumcase: ('A'..'Z').to_a + ('a'..'z').to_a  + (0..9).to_a
-  }
+    alphanumcase: ('A'..'Z').to_a + ('a'..'z').to_a + (0..9).to_a
+  }.freeze
 
   ##
   # host for build final url on helper
@@ -37,5 +38,4 @@ module RailsUrlShortener
   # so if you put this configuration like false could lose some visits to your link
   # by default saving all requests
   mattr_accessor :save_bots_visits, default: true
-
 end

data/lib/tasks/rails_url_shortener_tasks.rake

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # desc "Explaining what the task does"
 # task :rails_url_shortener do
 #   # Task goes here

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: rails_url_shortener
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.6
 platform: ruby
 authors:
 - a-chacon
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-20 00:00:00.000000000 Z
+date: 2022-05-30 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 7.0.2.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 7.0.2.3
 - !ruby/object:Gem::Dependency
   name: browser
   requirement: !ruby/object:Gem::Requirement
@@ -66,9 +52,9 @@ dependencies:
     - - ">="
       - !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.
+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.
 email:
 - andres.ch@protonmail.com
 executables: []
@@ -101,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.3
+  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.3
+  source_code_uri: https://github.com/a-chacon/rails-url-shortener/tree/v0.2.6
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []