tanshuku 0.0.10 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8126e6ece1367088566945159c232716b022d71d30dcf33ca6689c5433a9850
-  data.tar.gz: b9cfd16613a396e9e2ab36811ca41c9a98a80b6f045f3bd3a3fb1938dc9b69e3
+  metadata.gz: 06377e7737ccb49d4080ce2a728f4ba5ca98d00bd14f85838e3e888c899327d1
+  data.tar.gz: 63065a557df15b3c6ca45b9af168a9562a8aae1f9a41bb7b3db7a2ad9adaa82f
 SHA512:
-  metadata.gz: 372e5a161e2d4ece17641df2978c50defc764eb8db53114e10469da15ddce2a1b52d25d452299c240d384b39df50bd705153246cb5201a4ffb5d6988dcf077c6
-  data.tar.gz: c6fe73ec40e14f78e9af4b2838f2b895970ea3ada9df65932125db326358eebfc52d62cace498027fb5cf2df589dbe34ca63852610c5dd15e486155129c92e90
+  metadata.gz: 5bab0a2c9c7b26ec1f34ef02d465ecea40435e890e6381a6e3140850e5738a803141906f5bb6ca2b2ff715935d5380eb3119b66f556ce231d8f584b21d5f66d3
+  data.tar.gz: 14d22e0bb7de15a6c37de42e314be5521f2e3ff77bd8511cacfd1cf0847791b4a234c98e459a01e1443f52990672b9be636828f90a3aaf10fb67bc6d4fb9e8f6

data/app/models/tanshuku/url.rb

@@ -8,6 +8,8 @@ require "securerandom"
 
 module Tanshuku
   class Url < ActiveRecord::Base
+    DEFAULT_NAMESPACE = ""
+
     MAX_URL_LENGTH = 10_000
     URL_PATTERN = %r{\A(?:https?://\w+|/)}
     KEY_LENGTH = 20
@@ -20,7 +22,7 @@ module Tanshuku
     # duplicated. Then rescue the exception and try to retry.
     # validates :url, :hashed_url, :key, uniqueness: true
 
-    def self.shorten(original_url)
+    def self.shorten(original_url, namespace: DEFAULT_NAMESPACE, url_options: {})
       raise ArgumentError, "original_url should be present" unless original_url
 
       url = normalize_url(original_url)
@@ -29,11 +31,11 @@ module Tanshuku
       begin
         transaction do
           record =
-            create_or_find_by!(hashed_url: hash_url(url)) do |r|
+            create_or_find_by!(hashed_url: hash_url(url, namespace:)) do |r|
               r.attributes = { url:, key: generate_key }
             end
 
-          record.shortened_url
+          record.shortened_url(url_options)
         end
       # ActiveRecord::RecordNotFound is raised when the key is duplicated.
       rescue ActiveRecord::RecordNotFound => e
@@ -50,9 +52,9 @@ module Tanshuku
       original_url
     end
 
-    def self.find_by_url(url)
+    def self.find_by_url(url, namespace: DEFAULT_NAMESPACE)
       normalized_url = normalize_url(url)
-      hashed_url = hash_url(normalized_url)
+      hashed_url = hash_url(normalized_url, namespace:)
 
       find_by(hashed_url:)
     end
@@ -64,8 +66,8 @@ module Tanshuku
       parsed_url.normalize.to_s
     end
 
-    def self.hash_url(url)
-      Digest::SHA512.hexdigest(url)
+    def self.hash_url(url, namespace: DEFAULT_NAMESPACE)
+      Digest::SHA512.hexdigest(namespace.to_s + url)
     end
 
     def self.generate_key
@@ -73,11 +75,16 @@ module Tanshuku
     end
 
     def self.report_exception(exception:, original_url:)
-      logger.warn("Tanshuku - Failed to shorten a URL: #{exception.inspect} for #{original_url.inspect}")
+      Tanshuku.config.exception_reporter.call(exception:, original_url:)
     end
 
-    def shortened_url
-      Tanshuku::Engine.routes.url_for(controller: "tanshuku/urls", action: :show, key:)
+    def shortened_url(url_options = {})
+      url_options = url_options.symbolize_keys
+      url_options[:controller] = "tanshuku/urls"
+      url_options[:action] = :show
+      url_options[:key] = key
+
+      Tanshuku::Engine.routes.url_for(url_options)
     end
   end
 end

data/config/routes.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 Tanshuku::Engine.routes.draw do
-  default_url_options Tanshuku.default_url_options
+  default_url_options Tanshuku.config.default_url_options
 
   get "/:key", to: "urls#show"
 end

data/lib/tanshuku/configuration.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Tanshuku
+  class Configuration
+    module DefaultExceptionReporter
+      def self.call(exception:, original_url:)
+        Rails.logger.warn("Tanshuku - Failed to shorten a URL: #{exception.inspect} for #{original_url.inspect}")
+      end
+    end
+
+    include ActiveModel::Attributes
+
+    attribute :default_url_options, default: {}
+    attribute :exception_reporter, default: DefaultExceptionReporter
+  end
+end

data/lib/tanshuku/version.rb

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

data/lib/tanshuku.rb

@@ -1,8 +1,17 @@
 # frozen_string_literal: true
 
+require_relative "tanshuku/configuration"
 require_relative "tanshuku/engine"
 require_relative "tanshuku/version"
 
 module Tanshuku
-  mattr_accessor :default_url_options, default: {}
+  def self.config
+    Mutex.new.synchronize do
+      @config ||= Configuration.new
+    end
+  end
+
+  def self.configure
+    yield config
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tanshuku
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.12
 platform: ruby
 authors:
 - kg8m
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-25 00:00:00.000000000 Z
+date: 2023-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -56,6 +56,7 @@ files:
 - config/routes.rb
 - db/migrate/20230220123456_create_tanshuku_urls.rb
 - lib/tanshuku.rb
+- lib/tanshuku/configuration.rb
 - lib/tanshuku/engine.rb
 - lib/tanshuku/version.rb
 homepage: https://github.com/kg8m/tanshuku
@@ -81,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: Tanshuku is a simple and performance aware Rails engine for shortening URLs.