tanshuku 0.0.8 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4b9a3b20b2baf4c09ad35c5e10d00419ec7e3492f885b3cceb9cc129355f722
-  data.tar.gz: f66396318dcb615cef25136c8e6206cf3b857ea4907cb0fb45f1195f4e53caf5
+  metadata.gz: a8126e6ece1367088566945159c232716b022d71d30dcf33ca6689c5433a9850
+  data.tar.gz: b9cfd16613a396e9e2ab36811ca41c9a98a80b6f045f3bd3a3fb1938dc9b69e3
 SHA512:
-  metadata.gz: 02f976e4e5b3d24cbdb867eba134387f74b4050b65238d26a2307308b12ce55413fbe42fe95bfff68e3b25deca790eed20852ee50ea2069be2cbd0c8430aab38
-  data.tar.gz: efaf9a395bab9c57a3cb985cc93f699c5f5c39dd8c776d23ebae71531b2a398044dd1c15c452bbbdeb988961b492179aa6fc821910dd71a65d03197182f0e80f
+  metadata.gz: 372e5a161e2d4ece17641df2978c50defc764eb8db53114e10469da15ddce2a1b52d25d452299c240d384b39df50bd705153246cb5201a4ffb5d6988dcf077c6
+  data.tar.gz: c6fe73ec40e14f78e9af4b2838f2b895970ea3ada9df65932125db326358eebfc52d62cace498027fb5cf2df589dbe34ca63852610c5dd15e486155129c92e90

data/Rakefile

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
-require "bundler/gem_tasks"
+require "bundler/setup"
 
-require "rubocop/rake_task"
+APP_RAKEFILE = File.expand_path("spec/dummy/Rakefile", __dir__)
+load "rails/tasks/engine.rake"
 
-RuboCop::RakeTask.new
+load "rails/tasks/statistics.rake"
 
-task default: :rubocop
+require "bundler/gem_tasks"

data/app/models/tanshuku/url.rb

@@ -9,34 +9,41 @@ require "securerandom"
 module Tanshuku
   class Url < ActiveRecord::Base
     MAX_URL_LENGTH = 10_000
-    URL_PATTERN = %r{\A(?:https?:/)?/\w+}
+    URL_PATTERN = %r{\A(?:https?://\w+|/)}
     KEY_LENGTH = 20
 
     validates :url, :hashed_url, :key, presence: true
     validates :url, length: { maximum: MAX_URL_LENGTH }
-    validates :url, format: { with: URL_PATTERN }
+    validates :url, format: { with: URL_PATTERN }, allow_blank: true
 
     # Don't validate uniqueness of unique attributes. Raise ActiveRecord::RecordNotUnique instead if the attributes get
     # duplicated. Then rescue the exception and try to retry.
     # validates :url, :hashed_url, :key, uniqueness: true
 
-    def self.shorten(original_url, retries: 0)
+    def self.shorten(original_url)
+      raise ArgumentError, "original_url should be present" unless original_url
+
       url = normalize_url(original_url)
+      retries = 0
 
-      transaction do
-        record =
-          create_or_find_by!(hashed_url: hash_url(url)) do |r|
-            r.attributes = { url:, key: generate_key }
-          end
+      begin
+        transaction do
+          record =
+            create_or_find_by!(hashed_url: hash_url(url)) do |r|
+              r.attributes = { url:, key: generate_key }
+            end
 
-        record.shortened_url
-      end
-    rescue ActiveRecord::RecordNotUnique => e
-      if retries < 10
-        shorten(url, retries: retries + 1)
-      else
-        report_exception(exception: e, original_url:)
-        original_url
+          record.shortened_url
+        end
+      # ActiveRecord::RecordNotFound is raised when the key is duplicated.
+      rescue ActiveRecord::RecordNotFound => e
+        if retries < 10
+          retries += 1
+          retry
+        else
+          report_exception(exception: e, original_url:)
+          original_url
+        end
       end
     rescue StandardError => e
       report_exception(exception: e, original_url:)

data/lib/tanshuku/engine.rb

@@ -3,5 +3,9 @@
 module Tanshuku
   class Engine < ::Rails::Engine
     isolate_namespace Tanshuku
+
+    config.generators do |g|
+      g.test_framework :rspec
+    end
   end
 end

data/lib/tanshuku/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Tanshuku
-  VERSION = "0.0.8"
+  VERSION = "0.0.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tanshuku
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.10
 platform: ruby
 authors:
 - kg8m
 autorequire:
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2023-02-24 00:00:00.000000000 Z
+date: 2023-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -38,92 +38,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '7'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-description: Tanshuku is a Rails engine for shortening URLs. Tanshuku generates a
-  shortened URL per a normalized original URL.
+description: Tanshuku is a simple and performance aware Rails engine for shortening
+  URLs. Tanshuku generates a shortened URL per a normalized original URL.Tanshuku
+  redirects from a shortened URL to its correspond original URL.
 email:
 - takumi.kagiyama@gmail.com
 executables: []
@@ -167,5 +84,5 @@ requirements: []
 rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
-summary: Tanshuku is a Rails engine for shortening URLs.
+summary: Tanshuku is a simple and performance aware Rails engine for shortening URLs.
 test_files: []