has_public_id 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1bfdbb495ebd35dbba710e54a1257df584866df
-  data.tar.gz: d3d051f8b14977452ea29855986d5c4cfcf45e3b
+  metadata.gz: 2c6f7e2297b06b7dbb118b60faa7e0fdd4bf1400
+  data.tar.gz: bd594783a44a5762c9a7477f5bc17149f0ffae3a
 SHA512:
-  metadata.gz: 3f41e94856864dc1d828892b7c17da23dbe1dc888d97acf0f36c95bd6a686033e7281f7a43cd35f3332ecdb6678916885e6d7eeb6e28a4673e2f6f95763360e1
-  data.tar.gz: 7b44432e54df200836978eb51aa1ab48247c94b71e46974c7727fec43b1ce3a8f6939299008595169f37137e6a48732ddbc2b4e2796d6414201cb668d3e9f0bf
+  metadata.gz: 851e3c7626f2696dd7c194af8711352c9a64f65070086c835dfada466135650c08df42ecfa114edfedd57e78132fdf71ffaa9a77185f2c509d4ba333a284d09b
+  data.tar.gz: 8d8a0d6f329c95f898959a3d87d711e906942fca0826ab49a1c8fe736d6e33528aa724c6edb3083dee232ba7e9bcaf5dc441a0e6689a3771ce21ed32a4bc45b5

data/lib/has_public_id/activerecord/mixin.rb

@@ -38,6 +38,9 @@ module HasPublicId
             end
 
             def find_by_public_id!(public_id)
+              if public_id.blank?
+                raise ::ActiveRecord::RecordNotFound.new("Couldn't find #{self.name} without an ID")
+              end
               where(self.public_id_attr => public_id).first or
                 raise ::ActiveRecord::RecordNotFound.new("Couldn't find #{self.name} with #{public_id}")
             end

data/lib/has_public_id/version.rb

@@ -1,3 +1,3 @@
 module HasPublicId
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

data/test/dummy/log/test.log

@@ -482,3 +482,162 @@ UserTest: test_use_group-by_sql
   User Load (0.1ms)  SELECT "users".* FROM "users"
   User Load (0.1ms)  SELECT "users".* FROM "users"
    (0.1ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (2.5ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (3.8ms)  CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar, "ident" varchar, "created_at" datetime, "updated_at" datetime) 
+   (2.7ms)  CREATE TABLE "schema_migrations" ("version" varchar NOT NULL) 
+   (0.2ms)  select sqlite_version(*)
+   (8.5ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.2ms)  SELECT version FROM "schema_migrations"
+   (6.6ms)  INSERT INTO "schema_migrations" (version) VALUES ('20140109180823')
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.2ms)  begin transaction
+  Fixture Delete (0.7ms)  DELETE FROM "users"
+  Fixture Insert (0.6ms)  INSERT INTO "users" ("name", "ident", "created_at", "updated_at", "id") VALUES ('Sammy', NULL, '2016-02-05 21:49:23', '2016-02-05 21:49:23', 980190962)
+  Fixture Insert (0.1ms)  INSERT INTO "users" ("name", "ident", "created_at", "updated_at", "id") VALUES ('Joe', NULL, '2016-02-05 21:49:23', '2016-02-05 21:49:23', 298486374)
+  Fixture Insert (0.1ms)  INSERT INTO "users" ("name", "ident", "created_at", "updated_at", "id") VALUES ('Susan', NULL, '2016-02-05 21:49:23', '2016-02-05 21:49:23', 113629430)
+   (3.0ms)  commit transaction
+   (0.1ms)  begin transaction
+----------------------------------------
+AdminTest: test_identifier_doesnt_change
+----------------------------------------
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.5ms)  INSERT INTO "users" ("ident", "created_at", "updated_at") VALUES (?, ?, ?)  [["ident", "user-LH6Sobn1hYds"], ["created_at", "2016-02-05 21:49:23.360170"], ["updated_at", "2016-02-05 21:49:23.360170"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+  Admin Load (0.2ms)  SELECT  "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 980190963]]
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+  Admin Load (0.0ms)  SELECT  "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 980190963]]
+   (2.3ms)  rollback transaction
+   (0.1ms)  begin transaction
+--------------------------------------------------
+AdminTest: test_identifier_initializes_from_parent
+--------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+--------------------------------------------------
+AdminTest: test_inherited_class_has_public_id_attr
+--------------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+-------------------------------------------
+HasPublicId::UtilTest: test_char_set.length
+-------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+--------------------------------------------------
+HasPublicId::UtilTest: test_generate_random_suffix
+--------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+----------------------------------------------------------
+HasPublicId::UtilTest: test_generate_random_suffix(length)
+----------------------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+------------------------------------------------------------
+HasPublicId::UtilTest: test_new_public_id(with_blank_prefix)
+------------------------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+------------------------------------------------------------
+HasPublicId::UtilTest: test_new_public_id(with_false_prefix)
+------------------------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+---------------------------------------------------------
+HasPublicId::UtilTest: test_new_public_id(with_join_with)
+---------------------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+----------------------------------------------------------
+HasPublicId::UtilTest: test_new_public_id(with_nil_prefix)
+----------------------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+------------------------------------------------------
+HasPublicId::UtilTest: test_new_public_id(with_prefix)
+------------------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+---------------------------
+HasPublicIdTest: test_Mixin
+---------------------------
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+  Fixture Delete (0.3ms)  DELETE FROM "users"
+  Fixture Insert (0.1ms)  INSERT INTO "users" ("name", "ident", "created_at", "updated_at", "id") VALUES ('Sammy', NULL, '2016-02-05 21:49:23', '2016-02-05 21:49:23', 980190962)
+  Fixture Insert (0.1ms)  INSERT INTO "users" ("name", "ident", "created_at", "updated_at", "id") VALUES ('Joe', NULL, '2016-02-05 21:49:23', '2016-02-05 21:49:23', 298486374)
+  Fixture Insert (0.1ms)  INSERT INTO "users" ("name", "ident", "created_at", "updated_at", "id") VALUES ('Susan', NULL, '2016-02-05 21:49:23', '2016-02-05 21:49:23', 113629430)
+   (2.7ms)  commit transaction
+   (0.1ms)  begin transaction
+--------------------------------
+UserTest: test_find_by_public_id
+--------------------------------
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.2ms)  INSERT INTO "users" ("name", "ident", "created_at", "updated_at") VALUES (?, ?, ?, ?)  [["name", "joey"], ["ident", "user-Fq4ANV6QbsR6"], ["created_at", "2016-02-05 21:49:23.470557"], ["updated_at", "2016-02-05 21:49:23.470557"]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+  User Load (0.1ms)  SELECT  "users".* FROM "users" WHERE "users"."ident" = ?  ORDER BY "users"."id" ASC LIMIT 1  [["ident", "user-Fq4ANV6QbsR6"]]
+  User Load (0.0ms)  SELECT  "users".* FROM "users" WHERE "users"."ident" = ?  ORDER BY "users"."id" ASC LIMIT 1  [["ident", "bad_key"]]
+   (2.2ms)  rollback transaction
+   (0.1ms)  begin transaction
+---------------------------------
+UserTest: test_find_by_public_id!
+---------------------------------
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.3ms)  INSERT INTO "users" ("name", "ident", "created_at", "updated_at") VALUES (?, ?, ?, ?)  [["name", "joey"], ["ident", "user-dao36sMDjrAd"], ["created_at", "2016-02-05 21:49:23.476339"], ["updated_at", "2016-02-05 21:49:23.476339"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+  User Load (0.1ms)  SELECT  "users".* FROM "users" WHERE "users"."ident" = ?  ORDER BY "users"."id" ASC LIMIT 1  [["ident", "user-dao36sMDjrAd"]]
+  User Load (0.0ms)  SELECT  "users".* FROM "users" WHERE "users"."ident" = ?  ORDER BY "users"."id" ASC LIMIT 1  [["ident", "bad_key"]]
+   (2.2ms)  rollback transaction
+   (0.1ms)  begin transaction
+---------------------------------------
+UserTest: test_identifier_doesnt_change
+---------------------------------------
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.2ms)  INSERT INTO "users" ("ident", "created_at", "updated_at") VALUES (?, ?, ?)  [["ident", "user-nayg4RJOocRW"], ["created_at", "2016-02-05 21:49:23.482573"], ["updated_at", "2016-02-05 21:49:23.482573"]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+  User Load (0.0ms)  SELECT  "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 980190963]]
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+  User Load (0.0ms)  SELECT  "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 980190963]]
+   (2.2ms)  rollback transaction
+   (0.1ms)  begin transaction
+-------------------------------------
+UserTest: test_identifier_initializes
+-------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+-------------------------------------
+UserTest: test_initialize_public_ids!
+-------------------------------------
+   (0.2ms)  SELECT COUNT(*) FROM "users" WHERE "users"."ident" IS NULL
+  User Load (0.2ms)  SELECT  "users".* FROM "users" WHERE "users"."ident" IS NULL  ORDER BY "users"."id" ASC LIMIT 1000
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.4ms)  UPDATE "users" SET "ident" = ?, "updated_at" = ? WHERE "users"."id" = ?  [["ident", "user-oLVkWf91KCxJ"], ["updated_at", "2016-02-05 21:49:23.492904"], ["id", 113629430]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.9ms)  UPDATE "users" SET "ident" = ?, "updated_at" = ? WHERE "users"."id" = ?  [["ident", "user-2iZlSjEc0HaP"], ["updated_at", "2016-02-05 21:49:23.495449"], ["id", 298486374]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.0ms)  UPDATE "users" SET "ident" = ?, "updated_at" = ? WHERE "users"."id" = ?  [["ident", "user-SgF6oYQjYhMc"], ["updated_at", "2016-02-05 21:49:23.497431"], ["id", 980190962]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SELECT COUNT(*) FROM "users" WHERE "users"."ident" IS NULL
+   (2.4ms)  rollback transaction
+   (0.1ms)  begin transaction
+----------------------------
+UserTest: test_new_public_id
+----------------------------
+   (0.1ms)  rollback transaction
+   (0.2ms)  begin transaction
+------------------------------------------
+UserTest: test_to_param_matches_identifier
+------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+-------------------------------
+UserTest: test_use_group-by_sql
+-------------------------------
+  User Load (0.2ms)  SELECT name, count(name) as count FROM "users" GROUP BY "users"."name"
+  User Load (0.1ms)  SELECT "users".* FROM "users"
+  User Load (0.1ms)  SELECT "users".* FROM "users"
+   (0.0ms)  rollback transaction

data/test/dummy/test/models/user_test.rb

@@ -41,6 +41,7 @@ class UserTest < ActiveSupport::TestCase
     u = User.create(name: 'joey')
     assert_equal u, User.find_by_public_id!(u.to_param), "Can't be looked up by #{u.to_param}"
     assert_raises(ActiveRecord::RecordNotFound){ User.find_by_public_id!('bad_key') }
+    assert_raises(ActiveRecord::RecordNotFound){ User.find_by_public_id!(nil) }
   end
 
   test "initialize_public_ids!" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: has_public_id
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Graham Melcher