tanshuku 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92f985a414af971db170f5ce9a171469af6901f47feb4345a3b8ad96d256854e
-  data.tar.gz: 64a303579eb92b6748332d1f15259d4de493c11d32d572fd98a539269f3fffda
+  metadata.gz: 12ed0c4f9a99b9b6e2c988a8fe327cc491420b9586c3128dd6e2493f46819b0a
+  data.tar.gz: a566c0f82f98f54301b3ab91ce23dc09629ba2e5de79970b06b62ac13d54cf10
 SHA512:
-  metadata.gz: e5cd414ab9fcebdb55fa961744ac339d668466200972dfd8e0cc0b46a567f183fc00541cb3ffe784173d1eda3fa63f7c2c796eeee5488b7e396d9fb8dd98ff3e
-  data.tar.gz: f5f1e7a1d50cb26f2e61973903e708e255e2bb76248c6e7e7d14b74dd55a6fbb9a13a842dc2f8bf0f33cc7aae70bf33b500e5a337c8fc3af910a60ce108b8f88
+  metadata.gz: 28d39d2e039b8916441f4bca51c130374002c416d9afd08836166ea354370bbe341be9df7b552e023e5f03c6abc08071493434b3bbb62df862391c55d7f82349
+  data.tar.gz: 0c7e3337b95a5e647e8cd44d2a61df7070ac9897537d047dd10aaff243cd227f3622e68f549152bfc94eaa9f6e34bd6732185fc4812c749e477550bc0ca6303b

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.0"
+  VERSION = "2.0.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tanshuku
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - kg8m
@@ -30,20 +30,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 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 corresponding original URL.
@@ -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.