Merge branch 'MishaConway-fix-for-undefined-method-decode-for-nil-class'

Author: excid3

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    prefixed_ids (1.5.0)
+    prefixed_ids (1.5.1)
       hashids (>= 1.0.0, < 2.0.0)
       rails (>= 6.0.0)
 

lib/prefixed_ids.rb

@@ -84,6 +84,9 @@ module Finder
     class_methods do
       def find(*ids)
         prefix_ids = *ids.map do |id|
+          # Skip if model doesn't use prefixed ids
+          next id unless _prefix_id.present?
+
           prefix_id = _prefix_id.decode(id, fallback: _prefix_id_fallback)
           raise Error, "#{id} is not a valid prefix_id" if !_prefix_id_fallback && prefix_id.nil?
           prefix_id

lib/prefixed_ids/version.rb

@@ -1,3 +1,3 @@
 module PrefixedIds
-  VERSION = "1.5.0"
+  VERSION = "1.5.1"
 end

test/dummy/app/models/nonprefixed_item.rb

@@ -0,0 +1,4 @@
+class NonprefixedItem < ApplicationRecord
+  # Does not use prefixed IDs
+  belongs_to :user
+end

test/dummy/app/models/user.rb

@@ -2,4 +2,5 @@ class User < ApplicationRecord
   has_prefix_id :user
   has_many :accounts
   has_many :posts
+  has_many :nonprefixed_items
 end

test/dummy/db/migrate/20230503211115_create_nonprefixed_items.rb

@@ -0,0 +1,8 @@
+class CreateNonprefixedItems < ActiveRecord::Migration[6.1]
+  def change
+    create_table :nonprefixed_items do |t|
+      t.integer :user_id
+      t.timestamps
+    end
+  end
+end

test/dummy/db/schema.rb

@@ -10,13 +10,19 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2023_03_22_131821) do
+ActiveRecord::Schema.define(version: 2023_05_03_211115) do
   create_table "accounts", force: :cascade do |t|
     t.integer "user_id"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
   end
 
+  create_table "nonprefixed_items", force: :cascade do |t|
+    t.integer "user_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
   create_table "posts", force: :cascade do |t|
     t.integer "user_id", null: false
     t.datetime "created_at", null: false

test/fixtures/nonprefixed_items.yml

@@ -0,0 +1,14 @@
+one:
+  user: one
+
+two:
+  user: two
+
+three:
+  user: three
+
+four:
+  user: one
+
+five:
+  user: one

test/prefixed_ids_test.rb

@@ -163,4 +163,12 @@ class PrefixedIdsTest < ActiveSupport::TestCase
       Team.find(ActiveRecord::FixtureSet.identify(:one))
     end
   end
+
+  test "calling find on an associated model without prefix id succeeds" do
+    nonprefixed_item = nonprefixed_items(:one)
+    user = users(:one)
+
+    assert_equal user.nonprefixed_items.find(nonprefixed_item.id), nonprefixed_item
+    assert_raises(ActiveRecord::RecordNotFound) { user.nonprefixed_items.find(9999999) }
+  end
 end