darjeelink 0.14.4 → 0.14.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0f395d01b733415c7836867132dd888ac5f5dcd567a338e8d1d845d5e12a952
-  data.tar.gz: fdf3c1b4f775a88169adacd74ae43529a00c1ae16f05df0e7f904226ae95d6e4
+  metadata.gz: 11b58c6d79e63e250e80fccc4dc0ab8aa6e1daf8848e51e14afd9a3637a6dea2
+  data.tar.gz: 2ab545a7e59ac4a248f773ead73aeb4e35b3937afd3ffb37b912a1c537c6c8ea
 SHA512:
-  metadata.gz: 67c05cf3fab55ab937a75a511d55f231aef131b21fbb9baabcae3ba0819014346532e91d321b1674231e9bdce32f4bef7d52bf2e1eecc92635e62b6902fed322
-  data.tar.gz: 914f84301d2cdd53df3501180082dc556b7bae47a415c4775fd750a07343a2f7fd466be5d49c37761bf76d653df4e003ac0e0f4c52fd6ca4c7d9d9b35cbf80a1
+  metadata.gz: 92311cceed07587d5e2ba80c25849e1e7a39d4f7e37351482bd6eaa2d65b47bf712ff25600acae1b6508cab6ed65dc792cf9506b94093d8275005027e620bd75
+  data.tar.gz: ed319fe3f5aaded52f783defcaedeb9efa2e199cf1a6e060cc23ad68318c872de5b95d49af7146ec4b2c0b2c9758e0afb493edf156c92dea947d8b61ccfcbdf1

data/README.md

@@ -131,6 +131,10 @@ Note that if you are running in a vagrant VM, most of these steps can be done fr
 - Run `gem build darjeelink.gemspec` this will output a file `darjeelink-X.X.X.gem` the version should match what version.rb and github.
 - Run `gem push darjeelink-X.X.X.gem`
 
+## TODOs
+
+We have a few TODOs in the project. Please grep for TODO in the codebase to see them, and consider picking one up during maintainance.
+
 ## GDPR
 No personally identifiable data is stored about the public by this gem.
 It does not store information on individual clicks, only a counter of how many times a link has been clicked.

data/app/controllers/darjeelink/api_controller.rb

@@ -53,7 +53,7 @@ module Darjeelink
     def valid_authorization_token?(username_token)
       username, token = username_token.split ':'
 
-      stored_token = ApiToken.find_by(username: username, active: true)&.token
+      stored_token = ApiToken.find_by(username:, active: true)&.token
       return false if stored_token.nil?
 
       ActiveSupport::SecurityUtils.secure_compare(

data/app/controllers/darjeelink/application_controller.rb

@@ -9,15 +9,20 @@ module Darjeelink
 
     private
 
+    def determine_ip_to_verify
+      if Rails.application.client_ip_header
+        request.headers[Rails.application.client_ip_header]
+      else
+        request.ip
+      end
+    end
+
     # Check user IP address against whitelist from ENV
     def check_ip_whitelist
       return unless Rails.env.production?
       return unless Rails.application.config.permitted_ips
-      ip_to_verify = if Rails.application.config.respond_to?(:client_ip_header) && Rails.application.config.client_ip_header.present?
-          request.headers[Rails.application.config.client_ip_header]
-        else
-          request.ip
-        end
+
+      ip_to_verify = determine_ip_to_verify
 
       return if Rails.application.config.permitted_ips.split(',').include? ip_to_verify
 

data/app/importers/darjeelink/short_link_importer.rb

@@ -24,7 +24,7 @@ module Darjeelink
 
     def create_short_link(url, auto_generated_key, custom_key)
       shortened_path = custom_key.present? ? custom_key : auto_generated_key
-      ::Darjeelink::ShortLink.create!(url: url, shortened_path: shortened_path)
+      ::Darjeelink::ShortLink.create!(url:, shortened_path:)
     rescue ActiveRecord::RecordNotUnique
       duplicates << "#{url}/#{custom_key || auto_generated_key}"
     end

data/lib/darjeelink/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Darjeelink
-  VERSION = '0.14.4'
+  VERSION = '0.14.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: darjeelink
 version: !ruby/object:Gem::Version
-  version: 0.14.4
+  version: 0.14.5
 platform: ruby
 authors:
 - James Hulme
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-28 00:00:00.000000000 Z
+date: 2024-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -17,6 +17,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.9'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.9'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: omniauth-google-oauth2
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: 6.1.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: 6.1.7
 - !ruby/object:Gem::Dependency
   name: rebrandly
   requirement: !ruby/object:Gem::Requirement
@@ -192,7 +198,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
+description: 
 email:
 - james@38degrees.org.uk
 executables: []
@@ -244,8 +250,9 @@ files:
 homepage: https://github.com/38degrees/darjeelink
 licenses:
 - MIT
-metadata: {}
-post_install_message:
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -260,8 +267,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.21
-signing_key:
+rubygems_version: 3.3.26
+signing_key: 
 specification_version: 4
 summary: URL Shortener
 test_files: []