darjeelink 0.13.3 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33acf43d8f9a2344bb3e9ea0d802232776c616f41461351fdf6ca1853acc46ca
-  data.tar.gz: ff59ffc23185354d3b1e83f819f1700d888e8100409dce52437cc3ceb1aefd59
+  metadata.gz: 96f614f236d3e7d9d03fe066719066ce2b4e1d3e5673fd0c78756bcdbfe0bbe6
+  data.tar.gz: b698bd03bf5d648650aa72b8056e47ee952211732dda6257837e1e2b87f21853
 SHA512:
-  metadata.gz: 0e2fbc92bf253a980681d2614d74c3c5eb86f02e8f6078d50eefce580866906e9e803c9a83f215a1d2329b1ae5af74c7a194dcb45cbf69dadd0a5c14d61fd393
-  data.tar.gz: 41bf0de36f7baec2b7864f64522ee7ddcf3ebb0c9cb6f1bd997a58098feda5b54c2ae67b2d98b7b42faa16028455cb3e86814d494733a82a6a6465cac9810f21
+  metadata.gz: 76068de4b9ac74d9bce9e2255cc9b28637dc3d32dcd8409d1b12598f14cb92508abf730b8f2a693873b24b485e7202708e9b8ad8639e88f921054f8841559421
+  data.tar.gz: 7f56e2b13c2f9041205e65e792a9b9afb72779d516bed82dc652379a1ff482c94f515627681e065a4116c5a8c51355029bf4b2b07faa71fcd92f3becdc2fdc55

data/README.md

@@ -101,7 +101,10 @@ Each key is a hyphenated source-medium.  If you just want the source then omit t
 Each value is a slightly more readable version for display.
 
 ## Development
-The recommended approach is to use Vagrant. `vagrant up` will create an isolated darjeelink instance.
+
+Docker can be used to run tests easily - 'docker-compose up' should run the unit tests.
+
+Another approach is to use Vagrant. `vagrant up` will create an isolated darjeelink instance.
 Before you run `vagrant up`, make sure to create `.env.development` & `.env.test` files as detailed below.
 
 ### Setup development environment

data/app/controllers/darjeelink/short_links_controller.rb

@@ -60,7 +60,7 @@ module Darjeelink
       begin
         yield
       rescue ActiveRecord::RecordNotUnique
-        flash[:error] = "#{params[:shortened_path]} already used! Choose a different custom path"
+        flash[:error] = "#{short_link_params[:shortened_path]} already used! Choose a different custom path"
         return redirect_to(error_redirect_path)
       rescue ActiveRecord::RecordInvalid => e
         flash[:error] = e.message.to_s

data/app/models/darjeelink/short_link.rb

@@ -1,8 +1,16 @@
 # frozen_string_literal: true
 
+require 'securerandom'
+
 module Darjeelink
   class ShortLink < ApplicationRecord
-    after_save :generate_short_link
+    # ActiveRecord::RecordNotUnique error unable to be raised in a transaction that is not committed
+    after_commit :generate_short_link
+
+    def self.auto_generate_shortened_path
+      # our current db has a case insensitive constraint so we might as well downcase here before we get to db level
+      pp SecureRandom.urlsafe_base64(3).downcase
+    end
 
     validates_presence_of :url
     validates :url, :shortened_path, format: {
@@ -31,26 +39,14 @@ module Darjeelink
     def generate_short_link
       return if shortened_path.present?
 
-      update!(shortened_path: auto_generate_shortened_path)
-    end
-
-    ALPHABET = (('a'..'z').to_a + ('A'..'Z').to_a + ('0'..'9').to_a + ['-', '_']).freeze
-
-    def auto_generate_shortened_path
-      # from http://refactormycode.com/codes/125-base-62-encoding
-      # with only minor modification
-      i = id
-      return ALPHABET[0] if i.zero?
-
-      generated_path = []
-      base = ALPHABET.length
-
-      while i.positive?
-        generated_path << ALPHABET[i.modulo(base)]
-        i /= base
+      begin
+        attempt ||= 0
+        update!(shortened_path: self.class.auto_generate_shortened_path)
+      rescue ActiveRecord::RecordNotUnique
+        # we only want to try 5 times to prevent infinite loop
+        attempt += 1
+        attempt <= 5 ? retry : raise
       end
-
-      generated_path.join.reverse
     end
   end
 end

data/lib/darjeelink/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: darjeelink
 version: !ruby/object:Gem::Version
-  version: 0.13.3
+  version: 0.14.0
 platform: ruby
 authors:
 - James Hulme
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-24 00:00:00.000000000 Z
+date: 2023-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -253,7 +253,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.1'
+      version: 3.1.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="