encoded_id-rails 0.6.1 → 1.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 245fb340a94ca73cff62e2e466ee1f6a8f10195b1df94e0c1d37334c66168925
-  data.tar.gz: ffdecb93e8b75ddd0e63da9f5c3d686f80e986fb73035c27bb57882c1982723d
+  metadata.gz: 6279bf9520a50983edc402bdc6a94fd4888c7c77f3c50484841535962ce50cc0
+  data.tar.gz: 4fdbddfc863dbe9acd25c4ad51551aef70c0c4972a5d18d29a134a848d73e5e7
 SHA512:
-  metadata.gz: c1add38768e797d2e57270a600bd84717141edcdd955c4e5b91c38cfc9585f8aa207099d737bae6f68d2f1364aace46877f50ea014ab2063a44fa718a2ace98a
-  data.tar.gz: 47629d384bca18518bbf69645c9e0e8c4ddb0fb1bd064fa006593e3d7ac32d78951486ff442ad6b0d7012a4fbdeb8c79268998e518d24a4435caa7dc9226ebeb
+  metadata.gz: '0784b0541785da4f291f8a303674c72598622016693efb060adc3a8cd75fd68b1299b755e381777ecf45616e3217e05f9fe9eefccf53dce2d6fb3e118bd1313e'
+  data.tar.gz: 01fba9fb0fb764cfac1953997da5637915b55badd90e586f01c60eda9ab4182d4a2fe9be531e420fbe95172442d4e2e12346c8422e06f26c86541a9000648ab2

data/CHANGELOG.md

@@ -1,5 +1,32 @@
 ## [Unreleased]
 
+## [1.0.0.beta1] - 2023-08-07
+
+### Breaking changes
+
+- `#encoded_id` now defaults to returning an 'annotated' ID, one in which a prefix is added to the encoded ID to indicate 
+  the 'type' of the record the ID represents. This can be disabled. IDs generated by older versions of this gem will 
+  decode correctly. But not that IDs generated by this version onwards will not decode correctly by older versions of this 
+  gem so make sure to disable annotation if you need to support older versions of this gem.
+- `#name_for_encoded_id_slug` no longer provides a default implementation, it is up to the user to define this method,
+  or configure the gem to use a different method name.
+- `#slugged_encoded_id` no longer takes a `with:` parameter. To specify the name of the method to call to generate the
+  slug, use the `slug_value_method_name` configuration option.
+
+### Added
+
+- `#encoded_id_hash` has been added to return only the encoded ID without an annotation prefix. If annotation is disabled, 
+  this method is basically an alias to `#encoded_id`.
+- `.find_all_by_encoded_id` has been added to return all records matching the given encoded ID. This will return all
+  matching records whose IDs are encoded in the encoded_id. Missing records are ignored.
+- `.find_all_by_encoded_id!` like `.find_all_by_encoded_id` but raises an `ActiveRecord::RecordNotFound` exception if
+  *any* of the records are not found.
+
+
+## [0.6.2] - 2023-02-09
+
+- Fix `encoded_id` memoization clearing when record is duplicated
+
 ## [0.6.1] - 2023-02-09
 
 - Fix `#encoded_id` to return nil if `#id` is nil

data/Gemfile

@@ -10,9 +10,9 @@ group :development, :test do
 
   gem "minitest", "~> 5.0"
 
-  gem "standard", "~> 1.3"
+  gem "standard", "~> 1.30"
 
-  gem "steep", "~> 1.2"
+  gem "steep", "~> 1.5"
 
   gem "sqlite3", "~> 1.5"
 end

data/README.md

@@ -8,20 +8,37 @@ EncodedID lets you turn numeric or hex IDs into reversible and human friendly ob
 class User < ApplicationRecord
   include EncodedId::Model
 
+  # An optional slug for the encoded ID string. This is prepended to the encoded ID string, and is solely 
+  # to make the ID human friendly, or useful in URLs. It is not required for finding records by encoded ID.
   def name_for_encoded_id_slug
     full_name
   end
+  
+  # An optional prefix on the encoded ID string to help identify the model it belongs to.
+  # Default is to use model's parameterized name, but can be overridden, or disabled.
+  # Note it is not required for finding records by encoded ID.
+  def annotation_for_encoded_id
+    "usr"
+  end
 end
 
+# You can find by the encoded ID
 user = User.find_by_encoded_id("p5w9-z27j") # => #<User id: 78>
-user.encoded_id                             # => "p5w9-z27j"
-user.slugged_encoded_id                     # => "bob-smith--p5w9-z27j"
+user.encoded_id                             # => "usr_p5w9-z27j"
+user.slugged_encoded_id                     # => "bob-smith--usr_p5w9-z27j"
+
+# You can find by a slugged & annotated encoded ID
+user == User.find_by_encoded_id("bob-smith--usr_p5w9-z27j") # => true
+
+# Encoded IDs can encode multiple IDs at the same time
+users = User.find_all_by_encoded_id("7aq60zqw") # => [#<User id: 78>, #<User id: 45>]
 ```
 
 # Features
 
 - encoded IDs are reversible (see [`encoded_id`](https://github.com/stevegeek/encoded_id))
 - supports slugged IDs (eg `my-cool-product-name--p5w9-z27j`) that are URL friendly (assuming your alphabet is too)
+- supports annotated IDs to help identify the model the encoded ID belongs to (eg for a `User` the encoded ID might be `user_p5w9-z27j`) 
 - encoded string can be split into groups of letters to improve human-readability (eg `abcd-efgh`)
 - supports multiple IDs encoded in one encoded string (eg imagine the encoded ID `7aq60zqw` might decode to two IDs `[78, 45]`)
 - supports custom alphabets for the encoded string (at least 16 characters needed)
@@ -135,6 +152,8 @@ user = User.find_by_encoded_id("p5w9-z27j")  # => #<User id: 78>
 user.encoded_id  # => "p5w9-z27j"
 ```
 
+Note when an encoded ID string contains multiple IDs, this method will return the record for the first ID.
+
 ### `.find_by_encoded_id!`
 
 Like `.find!` but accepts an encoded ID string instead of an ID. Raises `ActiveRecord::RecordNotFound` if no record is found.
@@ -146,6 +165,18 @@ user = User.find_by_encoded_id!("p5w9-z27j")  # => #<User id: 78>
 user = User.find_by_encoded_id!("encoded-id-that-is-not-found")  # => ActiveRecord::RecordNotFound
 ```
 
+Note when an encoded ID string contains multiple IDs, this method will return the record for the first ID.
+
+### `.find_all_by_encoded_id`
+
+Like `.find_by_encoded_id` but when an encoded ID string contains multiple IDs, 
+this method will return an array of records.
+
+### `.find_all_by_encoded_id!`
+
+Like `.find_by_encoded_id!` but when an encoded ID string contains multiple IDs, 
+this method will return an array of records.
+
 ### `.where_encoded_id`
 
 A helper for creating relations. Decodes the encoded ID string before passing it to `.where`.
@@ -198,44 +229,90 @@ end
 User.encoded_id_salt  # => "my-user-model-salt"
 ```
 
+### `#encoded_id_hash`
+
+Returns only the encoded 'hashId' part of the encoded ID for the record:
+
+```ruby
+user = User.create(name: "Bob Smith")
+user.encoded_id  # => "p5w9-z27j"
+```
+
+
 ### `#encoded_id`
 
-Use the `encoded_id` instance method to get the encoded ID for the record:
+Returns the encoded ID for the record, with an annotation (if it is enabled):
 
 ```ruby
 user = User.create(name: "Bob Smith")
+user.encoded_id  # => "user_p5w9-z27j"
+```
+
+By default, the annotation comes from the underscored model name. However, you can change this by either:
+
+- overriding `#annotation_for_encoded_id` on the model
+- overriding `#annotation_for_encoded_id` on all models via your `ApplicationRecord`
+- change the method called to get the annotation via setting the `annotation_method_name` config options in your initializer
+- disable the annotation via setting the `annotation_method_name` config options in your initializer to `nil`
+
+
+Examples: 
+
+```ruby
+EncodedId::Rails.configuration.annotation_method_name = :name
+user.encoded_id  # => "bob_smith_p5w9-z27j"
+```
+
+```ruby
+EncodedId::Rails.configuration.annotation_method_name = nil
 user.encoded_id  # => "p5w9-z27j"
 ```
 
+```ruby
+class User < ApplicationRecord
+  include EncodedId::Model
+  
+  def annotation_for_encoded_id
+    "foo"
+  end
+end
+
+user = User.create(name: "Bob Smith")
+user.encoded_id  # => "foo_p5w9-z27j"
+```
+
+Note that you can also configure the annotation separator via the `annotated_id_separator` config option in your initializer,
+but it must be set to a string that only contains character that are not part of the alphabet used to encode the ID.
+
+```ruby
+EncodedId::Rails.configuration.annotated_id_separator = "^^"
+user.encoded_id  # => "foo^^p5w9-z27j"
+```
 
 ### `#slugged_encoded_id`
 
 Use the `slugged_encoded_id` instance method to get the slugged version of the encoded ID for the record. 
-Calls `#name_for_encoded_id_slug` on the record to get the slug part of the encoded ID:
 
 ```ruby
 user = User.create(name: "Bob Smith")
 user.slugged_encoded_id  # => "bob-smith--p5w9-z27j"
 ```
 
-### `#name_for_encoded_id_slug`
-
-Use `#name_for_encoded_id_slug` to specify what will be used to create the slug part of the encoded ID. 
-By default it calls `#name` on the instance, or if the instance does not respond to 
-`name` (or the value returned is blank) then uses the Model name.
+Calls `#name_for_encoded_id_slug` on the record to get the slug part of the encoded ID.
+By default, `#name_for_encoded_id_slug` raises, and must be overridden, or configured via the `slug_value_method_name` config option in your initializer:
 
 ```ruby
 class User < ApplicationRecord
   include EncodedId::Model
 
-  # If User has an attribute `name`, that will be used for the slug, 
-  # otherwise `user` will be used as determined by the class name.
+  # Assuming user has a name attribute
+  def name_for_encoded_id_slug
+    name
+  end
 end
 
 user = User.create(name: "Bob Smith")
 user.slugged_encoded_id  # => "bob-smith--p5w9-z27j"
-user2 = User.create(name: "")
-user2.slugged_encoded_id  # => "user--i74r-bn28"
 ```
 
 You can optionally override this method to define your own slug:
@@ -253,6 +330,21 @@ user = User.create(superhero_name: "Super Dev")
 user.slugged_encoded_id  # => "super-dev--37nw-8nh7"
 ```
 
+Configure the method called by setting the `slug_value_method_name` config option in your initializer:
+
+```ruby
+EncodedId::Rails.configuration.slug_value_method_name = :name
+user.slugged_encoded_id  # => "bob-smith--p5w9-z27j"
+```
+
+Note that you can also configure the slug separator via the `slugged_id_separator` config option in your initializer,
+but it must be set to a string that only contains character that are not part of the alphabet used to encode the ID.
+
+```ruby
+EncodedId::Rails.configuration.annotated_id_separator = "***"
+user.encoded_id  # => "bob-smith***p5w9-z27j"
+```
+
 ## To use on all models
 
 Simply add the mixin to your `ApplicationRecord`:

data/Steepfile

@@ -1,6 +1,4 @@
 target :lib do
   check "lib/encoded_id"
   signature "sig"
-
-  library "encoded_id"
 end

data/lib/encoded_id/rails/annotated_id.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require "cgi"
+
+module EncodedId
+  module Rails
+    class AnnotatedId
+      def initialize(annotation:, id_part:, separator: "_")
+        @annotation = annotation
+        @id_part = id_part
+        @separator = separator
+      end
+
+      def annotated_id
+        unless @id_part.present? && @annotation.present?
+          raise ::StandardError, "The model does not provide a valid ID and/or annotation"
+        end
+        "#{@annotation.to_s.parameterize}#{CGI.escape(@separator)}#{@id_part}"
+      end
+    end
+  end
+end

data/lib/encoded_id/rails/annotated_id_parser.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module EncodedId
+  module Rails
+    class AnnotatedIdParser
+      def initialize(annotated_id, separator: "_")
+        if separator && annotated_id.include?(separator)
+          parts = annotated_id.split(separator)
+          @id = parts.last
+          @annotation = parts[0..-2]&.join(separator)
+        else
+          @id = annotated_id
+        end
+      end
+
+      attr_reader :annotation, :id
+    end
+  end
+end

data/lib/encoded_id/rails/configuration.rb

@@ -9,14 +9,20 @@ module EncodedId
         :group_separator,
         :alphabet,
         :id_length,
-        :slugged_id_separator
+        :slug_value_method_name,
+        :slugged_id_separator,
+        :annotation_method_name, # Set to nil to disable annotated IDs
+        :annotated_id_separator
 
       def initialize
         @character_group_size = 4
         @group_separator = "-"
         @alphabet = ::EncodedId::Alphabet.modified_crockford
         @id_length = 8
+        @slug_value_method_name = :name_for_encoded_id_slug
         @slugged_id_separator = "--"
+        @annotation_method_name = :annotation_for_encoded_id
+        @annotated_id_separator = "_"
       end
     end
   end

data/lib/encoded_id/rails/encoder_methods.rb

@@ -10,7 +10,8 @@ module EncodedId
 
       def decode_encoded_id(slugged_encoded_id, options = {})
         return if slugged_encoded_id.blank?
-        encoded_id = encoded_id_parser(slugged_encoded_id).id
+        annotated_encoded_id = SluggedIdParser.new(slugged_encoded_id, separator: EncodedId::Rails.configuration.slugged_id_separator).id
+        encoded_id = AnnotatedIdParser.new(annotated_encoded_id, separator: EncodedId::Rails.configuration.annotated_id_separator).id
         return if !encoded_id || encoded_id.blank?
         encoded_id_coder(options).decode(encoded_id)
       end
@@ -21,10 +22,6 @@ module EncodedId
         EncodedId::Rails::Salt.new(self, EncodedId::Rails.configuration.salt).generate!
       end
 
-      def encoded_id_parser(slugged_encoded_id)
-        SluggedIdParser.new(slugged_encoded_id, separator: EncodedId::Rails.configuration.slugged_id_separator)
-      end
-
       def encoded_id_coder(options = {})
         config = EncodedId::Rails.configuration
         EncodedId::Rails::Coder.new(

data/lib/encoded_id/rails/finder_methods.rb

@@ -4,24 +4,38 @@ module EncodedId
   module Rails
     module FinderMethods
       # Find by encoded ID and optionally ensure record ID is the same as constraint (can be slugged)
-      def find_by_encoded_id(slugged_encoded_id, with_id: nil)
-        decoded_id = decode_encoded_id(slugged_encoded_id)
-        return if decoded_id.blank?
-        record = find_by(id: decoded_id)
+      def find_by_encoded_id(encoded_id, with_id: nil)
+        decoded_id = decode_encoded_id(encoded_id)
+        return if decoded_id.nil? || decoded_id.blank?
+        record = find_by(id: decoded_id.first)
         return unless record
         return if with_id && with_id != record.send(:id)
         record
       end
 
-      def find_by_encoded_id!(slugged_encoded_id, with_id: nil)
-        decoded_id = decode_encoded_id(slugged_encoded_id)
-        raise ActiveRecord::RecordNotFound if decoded_id.blank?
-        record = find_by(id: decoded_id)
+      def find_by_encoded_id!(encoded_id, with_id: nil)
+        decoded_id = decode_encoded_id(encoded_id)
+        raise ActiveRecord::RecordNotFound if decoded_id.nil? || decoded_id.blank?
+        record = find_by(id: decoded_id.first)
         if !record || (with_id && with_id != record.send(:id))
           raise ActiveRecord::RecordNotFound
         end
         record
       end
+
+      def find_all_by_encoded_id(encoded_id)
+        decoded_ids = decode_encoded_id(encoded_id)
+        return if decoded_ids.blank?
+        where(id: decoded_ids).to_a
+      end
+
+      def find_all_by_encoded_id!(encoded_id)
+        decoded_ids = decode_encoded_id(encoded_id)
+        raise ActiveRecord::RecordNotFound if decoded_ids.nil? || decoded_ids.blank?
+        records = where(id: decoded_ids).to_a
+        raise ActiveRecord::RecordNotFound if records.blank? || records.size != decoded_ids.size
+        records
+      end
     end
   end
 end

data/lib/encoded_id/rails/model.rb

@@ -12,35 +12,51 @@ module EncodedId
         base.extend(QueryMethods)
       end
 
+      def encoded_id_hash
+        return unless id
+        return @encoded_id_hash if defined?(@encoded_id_hash) && !id_changed?
+        self.class.encode_encoded_id(id)
+      end
+
       def encoded_id
         return unless id
         return @encoded_id if defined?(@encoded_id) && !id_changed?
-        @encoded_id = self.class.encode_encoded_id(id)
+        encoded = encoded_id_hash
+        annotated_by = EncodedId::Rails.configuration.annotation_method_name
+        return @encoded_id = encoded unless annotated_by && encoded
+        separator = EncodedId::Rails.configuration.annotated_id_separator
+        @encoded_id = EncodedId::Rails::AnnotatedId.new(id_part: encoded, annotation: send(annotated_by.to_s), separator: separator).annotated_id
       end
 
-      def slugged_encoded_id(with: :name_for_encoded_id_slug)
+      def slugged_encoded_id
         return unless id
         return @slugged_encoded_id if defined?(@slugged_encoded_id) && !id_changed?
-        @slugged_encoded_id = EncodedId::Rails::SluggedId.new(
-          self,
-          slug_method: with,
-          id_method: :encoded_id,
-          separator: EncodedId::Rails.configuration.slugged_id_separator
-        ).slugged_id
+        with = EncodedId::Rails.configuration.slug_value_method_name
+        separator = EncodedId::Rails.configuration.slugged_id_separator
+        encoded = encoded_id
+        return unless encoded
+        @slugged_encoded_id = EncodedId::Rails::SluggedId.new(id_part: encoded, slug_part: send(with.to_s), separator: separator).slugged_id
+      end
+
+      # By default the annotation is the model name (it will be parameterized)
+      def annotation_for_encoded_id
+        name = self.class.name
+        raise StandardError, "The default annotation requires the model class to have a name" if name.nil?
+        name.underscore
       end
 
-      # By default slug created from class name, but can be overridden
+      # By default trying to generate a slug without defining how will raise.
+      # You either override this method per model, pass an alternate method name to
+      # #slugged_encoded_id or setup an alias to another model method in your ApplicationRecord class
       def name_for_encoded_id_slug
-        class_name = self.class.name
-        raise StandardError, "Class must have a `name`, cannot create a slug" if !class_name || class_name.blank?
-        class_name.underscore
+        raise StandardError, "You must define a method to generate the slug for the encoded ID of #{self.class.name}"
       end
 
       # When duplicating an ActiveRecord object, we want to reset the memoized encoded_id
       def dup
         super.tap do |new_record|
-          new_record.instance_variable_set(:@encoded_id, nil)
-          new_record.instance_variable_set(:@slugged_encoded_id, nil)
+          new_record.send(:remove_instance_variable, :@encoded_id) if new_record.instance_variable_defined?(:@encoded_id)
+          new_record.send(:remove_instance_variable, :@slugged_encoded_id) if new_record.instance_variable_defined?(:@slugged_encoded_id)
         end
       end
     end

data/lib/encoded_id/rails/path_param.rb

@@ -7,7 +7,7 @@ module EncodedId
   module Rails
     module PathParam
       def to_param
-        encoded_id
+        encoded_id || raise(StandardError, "Cannot create path param for #{self.class.name} without an encoded id")
       end
     end
   end

data/lib/encoded_id/rails/slugged_id.rb

@@ -5,20 +5,17 @@ require "cgi"
 module EncodedId
   module Rails
     class SluggedId
-      def initialize(from_object, slug_method: :name_for_encoded_id_slug, id_method: :id, separator: "--")
-        @from_object = from_object
-        @slug_method = slug_method
-        @id_method = id_method
+      def initialize(slug_part:, id_part:, separator: "--")
+        @slug_part = slug_part
+        @id_part = id_part
         @separator = separator
       end
 
       def slugged_id
-        slug_part = @from_object.send(@slug_method)
-        id_part = @from_object.send(@id_method)
-        unless id_part.present? && slug_part.present?
-          raise ::StandardError, "The model does not return a valid ID (:#{@id_method}) and/or slug (:#{@slug_method})"
+        unless @id_part.present? && @slug_part.present?
+          raise ::StandardError, "The model does not return a valid ID and/or slug"
         end
-        "#{slug_part.to_s.parameterize}#{CGI.escape(@separator)}#{id_part}"
+        "#{@slug_part.to_s.parameterize}#{CGI.escape(@separator)}#{@id_part}"
       end
     end
   end

data/lib/encoded_id/rails/slugged_path_param.rb

@@ -7,7 +7,7 @@ module EncodedId
   module Rails
     module SluggedPathParam
       def to_param
-        slugged_encoded_id
+        slugged_encoded_id || raise(StandardError, "Cannot create path param for #{self.class.name} without an encoded id")
       end
     end
   end

data/lib/encoded_id/rails/version.rb

@@ -2,6 +2,6 @@
 
 module EncodedId
   module Rails
-    VERSION = "0.6.1"
+    VERSION = "1.0.0.beta1"
   end
 end

data/lib/encoded_id/rails.rb

@@ -5,6 +5,8 @@ require_relative "rails/configuration"
 require_relative "rails/coder"
 require_relative "rails/slugged_id"
 require_relative "rails/slugged_id_parser"
+require_relative "rails/annotated_id"
+require_relative "rails/annotated_id_parser"
 require_relative "rails/salt"
 require_relative "rails/encoder_methods"
 require_relative "rails/query_methods"

data/rbs_collection.yaml

@@ -9,8 +9,6 @@ sources:
 path: .gem_rbs_collection
 
 gems:
-  - name: encoded_id-rails
-    ignore: true
   - name: cgi
   # Skip loading rbs gem's RBS.
   # It's unnecessary if you don't use rbs as a library.

data/sig/encoded_id/rails.rbs

@@ -8,7 +8,10 @@ module EncodedId
       attr_accessor character_group_size: ::Integer
       attr_accessor alphabet: ::EncodedId::Alphabet
       attr_accessor id_length: ::Integer
+      attr_accessor slug_value_method_name: ::Symbol
       attr_accessor slugged_id_separator: ::String
+      attr_accessor annotation_method_name: ::Symbol
+      attr_accessor annotated_id_separator: ::String
 
       def initialize: () -> void
     end
@@ -43,28 +46,41 @@ module EncodedId
     end
 
     class SluggedId
-      def initialize: (untyped from_object, ?slug_method: ::Symbol, ?id_method: ::Symbol, ?separator: ::String)-> void
-
-      @from_object: untyped
-      @slug_method: ::Symbol
-      @id_method: ::Symbol
+      def initialize: (slug_part: ::String, id_part: ::String, ?separator: ::String)-> void
+      @slug_part: ::String
+      @id_part: ::String
       @separator: ::String
 
       def slugged_id: -> ::String
     end
 
+    class AnnotatedId
+      def initialize: (annotation: ::String, id_part: ::String, ?separator: ::String)-> void
+      @annotation: ::String
+      @id_part: ::String
+      @separator: ::String
+
+      def annotated_id: -> ::String
+    end
+
     class SluggedIdParser
       def initialize: (::String slugged_id, ?separator: ::String) -> void
 
       attr_reader slug: ::String?
-      attr_reader id: ::String?
+      attr_reader id: ::String
+    end
+
+    class AnnotatedIdParser
+      def initialize: (::String annotated_id, ?separator: ::String) -> void
+
+      attr_reader annotation: ::String?
+      attr_reader id: ::String
     end
 
     module EncoderMethods
-      def encode_encoded_id: (untyped id, ?::Hash[::Symbol, untyped] options) -> ::String
+      def encode_encoded_id: (::Array[::Integer] | ::Integer id, ?::Hash[::Symbol, untyped] options) -> ::String
       def decode_encoded_id: (::String slugged_encoded_id, ?::Hash[::Symbol, untyped] options) -> ::Array[::Integer]?
       def encoded_id_salt: () -> ::String
-      def encoded_id_parser: (::String slugged_encoded_id) -> ::EncodedId::Rails::SluggedIdParser
       def encoded_id_coder: (?::Hash[::Symbol, untyped] options) -> ::EncodedId::Rails::Coder
     end
 
@@ -72,9 +88,11 @@ module EncodedId
       def find_by: (*untyped) -> (nil | untyped)
     end
 
-    module FinderMethods : EncoderMethods, _ActiveRecordFinderMethod
-      def find_by_encoded_id: (::String slugged_encoded_id, ?with_id: ::Symbol?) -> untyped?
-      def find_by_encoded_id!: (::String slugged_encoded_id, ?with_id: ::Symbol?) -> untyped
+    module FinderMethods : EncoderMethods, _ActiveRecordFinderMethod, _ActiveRecordQueryMethod
+      def find_by_encoded_id: (::String encoded_id, ?with_id: ::Symbol?) -> untyped?
+      def find_by_encoded_id!: (::String encoded_id, ?with_id: ::Symbol?) -> untyped
+      def find_all_by_encoded_id: (::String encoded_id) -> untyped?
+      def find_all_by_encoded_id!: (::String encoded_id) -> untyped
     end
 
     interface _ActiveRecordQueryMethod
@@ -86,9 +104,12 @@ module EncodedId
     end
 
     module Model : ActiveRecord::Base
+      # From ActiveRecord
       extend ActiveRecord::FinderMethods
       extend ActiveRecord::QueryMethods
+      def id_changed?: -> bool
 
+      # From EncodedId::Rails::Model
       extend EncoderMethods
       extend FinderMethods
       extend QueryMethods
@@ -96,13 +117,15 @@ module EncodedId
       @encoded_id: ::String
       @slugged_encoded_id: ::String
 
-      def encoded_id: () -> ::String
-      def slugged_encoded_id: (?with: ::Symbol) -> ::String
-      def name_for_encoded_id_slug: () -> ::String
+      def encoded_id_hash: -> ::String?
+      def encoded_id: -> ::String?
+      def slugged_encoded_id: -> ::String?
+      def name_for_encoded_id_slug: -> ::String
+      def annotation_for_encoded_id: -> ::String
     end
 
     interface _ActiveRecordToParam
-      def to_param: () -> ::String
+      def to_param: -> ::String
     end
 
     module PathParam : Model, _ActiveRecordToParam

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: encoded_id-rails
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 1.0.0.beta1
 platform: ruby
 authors:
 - Stephen Ierodiaconou
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-02-09 00:00:00.000000000 Z
+date: 2023-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -56,14 +56,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 1.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 1.0.0.rc1
 description: ActiveRecord concern to use EncodedID to turn IDs into reversible and
   human friendly obfuscated strings.
 email:
@@ -82,6 +82,8 @@ files:
 - gemfiles/rails_6.0.gemfile
 - gemfiles/rails_7.0.gemfile
 - lib/encoded_id/rails.rb
+- lib/encoded_id/rails/annotated_id.rb
+- lib/encoded_id/rails/annotated_id_parser.rb
 - lib/encoded_id/rails/coder.rb
 - lib/encoded_id/rails/configuration.rb
 - lib/encoded_id/rails/encoder_methods.rb
@@ -117,11 +119,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Use `encoded_id` with ActiveRecord models