friendly_uuid 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a30a5351eaad80263a47cdfe1bb76994bbb93c9e455c56a32dbafa232f71b49a
-  data.tar.gz: af3e8aa4a342a951e88626f2ca199f0017a63ba0a4fb9e5333d8f056720cdf9a
+  metadata.gz: cf8d5e72bcdfc392496d82ff2edb0f3bb16f5fbb390c4bfeee593e4a4f1d809a
+  data.tar.gz: ac2ca5df9575b956d6057faac4b061e9f4d5cbfc1bf8b678cc6f1f9249d949e2
 SHA512:
-  metadata.gz: 28a9eb11b1c06bacf19406691661162d7056d9d20c318d92b5bb7becf09daf2796552070f3341d682e46accfd41bc0818a7b11374257fa61332ee8032672fcfd
-  data.tar.gz: 49b3acb11d0bd5209a34a163013a3083224f608164045fb1160d47bc1262d1c22f31196490858e215e8a53705e67fee2f6c56148ba4863a7cd1bd23fb9658414
+  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)
@@ -69,7 +65,7 @@ module FriendlyUUID
     end
 
     def substr_query
-      case self.connection_config[:adapter]
+      case adapter
       when "mysql2"
         raise ValueError("Sorry, FriendlyUUID does not support MySQL")
       when "postgresql"
@@ -80,5 +76,13 @@ module FriendlyUUID
         raise ValueError("Unknown database type; FriendlyUUID cannot support it")
       end
     end
+
+    def adapter
+      if respond_to?(:connection_db_config)
+        connection_db_config.configuration_hash[:adapter]
+      else
+        connection_config[:adapter]
+      end
+    end
   end
 end

metadata

@@ -1,18 +1,26 @@
 --- !ruby/object:Gem::Specification
 name: friendly_uuid
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Ben Carlsson
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2020-10-11 00:00:00.000000000 Z
 dependencies: []
-description: FriendlyUUID shortens every UUID to have only as many characters as it
-  needs to be unique.
-email: qhiiyr@gmail.com
+description: |2
+      FriendlyUUID is a Rails gem that shortens your UUID records' URLs.
+
+      What once was 758d633c-61d4-4dfc-ba52-b7b498971097 becomes 758d.
+
+      FriendlyUUID does not introduce any new state to your models, even under the hood.
+
+      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: ben@twos.dev
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -20,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:
   - - ">="
@@ -38,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: []