tanshuku 1.0.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 751d1c1f90f9971762a9a7ae487b8323fbfe4d9f6993cc94d9d8e1498c36f8d0
-  data.tar.gz: abb9053bcf5f52ecaa831d8a57fde2e36e87f5e5ed32588778ed8f43f7b8ad02
+  metadata.gz: 12ed0c4f9a99b9b6e2c988a8fe327cc491420b9586c3128dd6e2493f46819b0a
+  data.tar.gz: a566c0f82f98f54301b3ab91ce23dc09629ba2e5de79970b06b62ac13d54cf10
 SHA512:
-  metadata.gz: bf8a091f25271f333101f5be219c96aa45d23ccc3bf30991799430cbf6219a11271dbc4621b5763deb825cfa0d3f9db13a5d96ecc052c38b3b9d47e408c0f61c
-  data.tar.gz: a49d215042a71564d34ea5e9ce5450b0bd72e8351d7a9d05d3219502045b4cccb5ecd8eff9bba07e4c7a03a70133e83855320b85f9ac2531351898b4b528b668
+  metadata.gz: 28d39d2e039b8916441f4bca51c130374002c416d9afd08836166ea354370bbe341be9df7b552e023e5f03c6abc08071493434b3bbb62df862391c55d7f82349
+  data.tar.gz: 0c7e3337b95a5e647e8cd44d2a61df7070ac9897537d047dd10aaff243cd227f3622e68f549152bfc94eaa9f6e34bd6732185fc4812c749e477550bc0ca6303b

data/README.md

@@ -1,9 +1,3 @@
-[![RubyGems.org](https://img.shields.io/badge/RubyGems.org-Tanshuku%20v1-red)](https://rubygems.org/gems/tanshuku/versions/1.0.0)
-[![Ruby 2.5+](https://img.shields.io/badge/Ruby-2.5+-red)](https://www.ruby-lang.org)
-[![Rails 5.1+](https://img.shields.io/badge/Rails-5.1+-red)](https://rubyonrails.org/)
-[![MIT License](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE)
-[![Checks](https://github.com/kg8m/tanshuku/actions/workflows/checks.yml/badge.svg?branch=1-0-stable)](https://github.com/kg8m/tanshuku/blob/1-0-stable/.github/workflows/checks.yml)
-
 # Tanshuku
 
 Tanshuku is a simple and small Rails engine that makes it easier to shorten URLs.

data/app/models/tanshuku/url.rb

@@ -26,11 +26,10 @@ module Tanshuku
     DEFAULT_NAMESPACE = ""
 
     validates :url, :hashed_url, :key, presence: true
+    validates :url, length: { maximum: proc { Tanshuku.config.max_url_length } }
     validates :url, format: { with: proc { Tanshuku.config.url_pattern } }, allow_blank: true
 
     # Don’t validate uniqueness of unique attributes. Raise ActiveRecord::RecordNotUnique instead if the attributes get
-    validate :validates_length_of_url
-
     # duplicated. Then rescue the exception and try to retry.
     # validates :url, :hashed_url, :key, uniqueness: true
 
@@ -104,15 +103,6 @@ module Tanshuku
       original_url
     end
 
-    unless respond_to?(:create_or_find_by!)
-      # https://github.com/rails/rails/blob/v6.0.0/activerecord/lib/active_record/relation.rb#L218-L222
-      def self.create_or_find_by!(attributes, &block)
-        transaction(requires_new: true) { create!(attributes, &block) }
-      rescue ActiveRecord::RecordNotUnique
-        find_by!(attributes)
-      end
-    end
-
     # Finds a {Tanshuku::Url} record by a non-shortened URL.
     #
     # @param url [String] A non-shortened URL.
@@ -185,14 +175,6 @@ module Tanshuku
 
       Tanshuku::Engine.routes.url_for(url_options)
     end
-
-    private
-
-    def validates_length_of_url
-      if url && url.length > Tanshuku.config.max_url_length
-        errors.add(:url, :too_long, count: Tanshuku.config.max_url_length)
-      end
-    end
   end
   # rubocop:enable Rails/ApplicationRecord
 end

data/db/migrate/20230220123456_create_tanshuku_urls.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class CreateTanshukuUrls < ActiveRecord::Migration[5.1]
+class CreateTanshukuUrls < ActiveRecord::Migration[6.0]
   def change
     create_table :tanshuku_urls do |t|
       t.text :url, null: false

data/lib/tanshuku/configuration.rb

@@ -42,84 +42,7 @@ module Tanshuku
       end
     end
 
-    if defined?(ActiveModel::Attributes)
-      include ActiveModel::Attributes
-    else
-      # https://github.com/rails/rails/blob/v5.2.8.1/activemodel/lib/active_model/attributes.rb
-      # https://github.com/rails/rails/blob/v5.2.8.1/activemodel/lib/active_model/type/integer.rb
-      concerning :PetitModelAttributes do
-        const_set :NO_DEFAULT_PROVIDED, Object.new
-
-        class_methods do
-          # rubocop:disable Metrics/MethodLength
-
-          # A petit and limited implementation of `ActiveModel::Attributes`'s `attribute` method for backward
-          # compatibility.
-          #
-          # @param name [Symbol] An attribute name.
-          # @param cast_type [Symbol,nil] A type to cast the attribute's value.
-          # @param default [Object] A default value of the attribute.
-          #
-          # @return [void]
-          def attribute(name, cast_type = nil, default: NO_DEFAULT_PROVIDED)
-            attr_reader name
-
-            case cast_type
-            when nil
-              attr_writer name
-            when :integer
-              class_eval(<<~RUBY, __FILE__, __LINE__ + 1)
-                def #{name}=(value)          # def max_url_length=(value)
-                  @#{name} =                 #   @max_url_length =
-                    case value               #     case value
-                    when true                #     when true
-                      1                      #       1
-                    when false               #     when false
-                      0                      #       0
-                    when nil                 #     when nil
-                      nil                    #       nil
-                    else                     #     else
-                      value.to_i rescue nil  #       value.to_i rescue nil
-                    end                      #     end
-                end                          # end
-              RUBY
-            else
-              raise ArgumentError, "Non-supported cast type: #{cast_type.inspect}"
-            end
-
-            return if default == NO_DEFAULT_PROVIDED
-
-            mod =
-              Module.new do
-                class_eval(<<~RUBY, __FILE__, __LINE__ + 1)
-                  def initialize(*args)                # def initialize(*args)
-                    super                              #   super
-                    self.#{name} = #{default.inspect}  #   self.max_url_length = 10_000
-                  end                                  # end
-                RUBY
-              end
-            prepend mod
-          end
-          # rubocop:enable Metrics/MethodLength
-        end
-      end
-    end
-
-    # @!attribute [rw] default_url_options
-    #   Default URL options for Rails’ +url_for+. Defaults to +{}+.
-    #
-    #   @return [Hash]
-    #   @return [void] If you set an invalid object.
-    #
-    #   @note
-    #     The example below means that the configured host and protocol are used. Shortened URLs will be like
-    #     +https://example.com/t/abcdefghij0123456789+.
-    #
-    #   @example
-    #     # config/initializers/tanshuku.rb
-    #     Tanshuku.configure do |config|
-    #       config.default_url_options = { host: "example.com", protocol: :https }
-    #     end
+    include ActiveModel::Attributes
     attribute :default_url_options, default: {}
 
     # @!attribute [rw] max_url_length

data/lib/tanshuku/version.rb

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

data/lib/tanshuku.rb

@@ -15,9 +15,9 @@ module Tanshuku
   #   {Tanshuku.configure} for configuration.
   def self.config
     # Disable this cop but use `Tanshuku::Configuration#configure` for thread-safety.
-    # rubocop:disable ThreadSafety/ClassInstanceVariable
+    # rubocop:disable ThreadSafety/InstanceVariableInClassMethod
     @config ||= Configuration.new
-    # rubocop:enable ThreadSafety/ClassInstanceVariable
+    # rubocop:enable ThreadSafety/InstanceVariableInClassMethod
   end
 
   # Configures Tanshuku.

data/lib/tasks/check_all.rb

@@ -21,9 +21,7 @@ class CheckAll
   end
 
   def call
-    # rubocop:disable ThreadSafety/NewThread
     TASKNAMES.map { |taskname| Thread.new(taskname, &executor) }.each(&:join)
-    # rubocop:enable ThreadSafety/NewThread
     output_result
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tanshuku
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.0
 platform: ruby
 authors:
 - kg8m
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-16 00:00:00.000000000 Z
+date: 2023-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -30,7 +30,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.0'
@@ -40,7 +40,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.0'
@@ -85,17 +85,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '3.0'
   - - "<"
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Tanshuku is a simple and performance aware Rails engine for shortening URLs.