friendly_uuid 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 758a0f77edc544b560ea4cd7488a882689c71b02e0fd07bac1d4957995ad5de3
-  data.tar.gz: e1cfef7017d033c98a9789b8d60b17b9fb0db6ed4b4c2f927240791b4cf2c1f7
+  metadata.gz: cf8d5e72bcdfc392496d82ff2edb0f3bb16f5fbb390c4bfeee593e4a4f1d809a
+  data.tar.gz: ac2ca5df9575b956d6057faac4b061e9f4d5cbfc1bf8b678cc6f1f9249d949e2
 SHA512:
-  metadata.gz: cc4de547875e962ddedf7c1ba406e7ae11d2a1a5a3b48dff1d5a64ab6f7a9e1f9fe3620ac2c291d44e1f16675a30280edce24b16dcf3df0ec4dcfed0e9580ebe
-  data.tar.gz: 11a12408b53044ac36f75fcdf2045004a14cec834b4375d7593ab71d70cc3d7781b324a31d55de580a4aab3484f33b49a33732a667a306a903d8fca6821813c1
+  metadata.gz: 3c030af33c0bad3efe7e7eba15b8ab9146883c4ce3bb1c2cdbe3a53964b34306d54c83749fc3ac814b04d08aaf8299dcc221ef4676bc2a838a9a8b4d55b897f1
+  data.tar.gz: 9772457ed4a6441ec49db31e42529fd400c33fb6caab0d73d5193c23c48477e858b14eaa63467b40e6b7ad466153d21e70a15b7322458bf915a5ca317a87ef3f

data/lib/friendly_uuid.rb

@@ -21,22 +21,21 @@ module FriendlyUUID
 
   module Class
     def find(*ids)
-      super(self.expand(ids))
+      ids = self.expand(ids) if ids.flatten.any? { |id| id.present? }
+
+      super(ids)
     end
 
     def expand(short_uuids)
-      # If a single ID passed as a string
-      return self.expand_to_record(short_uuids).id if short_uuids.class == String
-
-      # If a single ID passed as a non-nested array
-      if short_uuids[0].class != Array && short_uuids.length == 1
-        return self.expand_to_record(short_uuids.join).id
-      end
-
-      short_uuids.flatten!
-
-      short_uuids.map do |uuid|
-        self.expand_to_record(uuid).id
+      if short_uuids.is_a?(String)
+        self.expand_to_record(short_uuids)&.id
+      elsif short_uuids[0].is_a?(String) && short_uuids.length == 1
+        self.expand_to_record(short_uuids.join)&.id
+      elsif short_uuids.is_a?(Array)
+        short_uuids.flatten!
+        short_uuids.map do |uuid|
+          self.expand_to_record(uuid.to_s)&.id
+        end
       end
     end
 
@@ -49,10 +48,7 @@ module FriendlyUUID
     end
 
     def expand_to_record(short_uuid)
-      raise ActiveRecord::RecordNotFound unless short_uuid
-      record = self.possible_expansions(short_uuid).first
-      raise ActiveRecord::RecordNotFound unless record
-      record
+      self.possible_expansions(short_uuid).first
     end
 
     def possible_expansions(short_uuid)

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: friendly_uuid
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Ben Carlsson
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2020-10-11 00:00:00.000000000 Z
@@ -20,7 +20,7 @@ description: |2
       FriendlyUUID URLs are exactly as unique as they need to be. The first record will be one character. Would-be collisions expand to two characters, and so on.
 
       FriendlyUUID is inspired by friendly_id, but is focused on being lightweight and specific to models with UUID primary keys.
-email: qhiiyr@gmail.com
+email: ben@twos.dev
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -28,17 +28,18 @@ files:
 - lib/friendly_uuid.rb
 homepage: https://github.com/glacials/friendly_uuid
 licenses:
-- MIT
+- CC-BY-NC-SA-4.0
+- LicenseRef-Licenseland
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -46,7 +47,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.4
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Make UUIDs pretty enough for use in URLs
 test_files: []