based_uuid 0.5.2 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12b33dff554590869533e56e76997cf63cd436acd9bd0d95a86c574ea1419d63
-  data.tar.gz: 2b98906ea6459f21d32c9ec0170cd443333a2529570f6cf8d9731d117792d529
+  metadata.gz: 5499342189f8b46811d3d620d6074dbd6620bc3cbc8882f39261b428a5fbcc41
+  data.tar.gz: 4ed71b83bf2f7271466256c5a215f217ba4c300665aeb895e6fa2da2b1308ea9
 SHA512:
-  metadata.gz: 1592b674765c4230b53adac6071197d812cef83ea8237523e713db4e64dbc2c1d0e9f383d20c2f132bd3c64f702b4b0ad112977b44e87e8501c7c5d92febdce0
-  data.tar.gz: a9b2f1c4d393c7c8c84b21b76f1d3b54c2df4582b237738dd9f6ecfc0339339ddf1333739d5b4ce399da01b8306411c870f4b1c9c7a6217de5777a46c9d76546
+  metadata.gz: edaf5ab4385cb65dff10739d12801b98c0085fb9d54d9841c480783c014ff47d2359b16acaf03b426a7a17049968f0bea1d54e0cc5063d4679105bb5813a9655
+  data.tar.gz: c81d9c3aa7c122516c846cb0470b45d2352f2db8bcc051a22c6da6d5d7f9a33892dab095f719677512cfd9d29d8f891f971c1d084f212cbe4283ea76425a87c5

data/.rubocop.yml

@@ -23,3 +23,7 @@ Layout/LineLength:
 
 Naming/PredicateName:
   Enabled: false
+
+# https://github.com/rubocop/rubocop/issues/7298
+Lint/UselessAccessModifier:
+  Enabled: false

data/README.md

@@ -1,4 +1,4 @@
-# BasedUUID: double-clickable, URL-friendly UUIDs for your Rails models
+# BasedUUID: URL-friendly UUIDs for Rails models
 
 [![Build Status](https://github.com/pch/based_uuid/workflows/Tests/badge.svg)](https://github.com/pch/based_uuid/actions) [![Gem Version](https://badge.fury.io/rb/based_uuid.svg)](https://badge.fury.io/rb/based_uuid)
 
@@ -6,13 +6,13 @@
 Generate “double-clickable”, URL-friendly UUIDs with (optional) prefixes:
 
 ```
-user_4yoiald3wfbvpeu2sbsk7cssdi
-acc_ejwqg7b3gvaphiylb25xq545tm
+user_763j02ryxh8dbs56mgcjqrmmgt #=> e61c802c-7bb1-4357-929a-9064af8a521a
+bpo_12dm1qresn83st62reqdw7f7cv  #=> 226d037c-3b35-40f3-a30b-0ebb78779d9b
 ```
 
-This gem works by encoding UUIDs into 26-character lowercase strings using [Crockford’s base32](https://www.crockford.com/base32.html) encoding. The optional prefix helps you identify the model it represents.
+This gem encodes UUID primary keys into 26-character lowercase strings using [Crockford’s base32](https://www.crockford.com/base32.html) encoding. The optional prefix helps you identify the model it represents.
 
-BasedUUID doesn’t affect how your ActiveRecord primary key UUIDs are stored in the database. Prefix and base32 encoding are only used for presentation.
+BasedUUID assumes that you have a [UUID primary key](https://guides.rubyonrails.org/v5.0/active_record_postgresql.html#uuid) (`id`) in your ActiveRecord model. It doesn’t affect how your primary key UUIDs are stored in the database. Prefixes and base32-encoded strings are only used for presentation.
 
 ## Installation
 
@@ -24,7 +24,7 @@ gem "based_uuid"
 
 ## Usage
 
-BasedUUID assumes that you have a [UUID primary key](https://guides.rubyonrails.org/v5.0/active_record_postgresql.html#uuid) in your ActiveRecord model.
+Add the following line to your model class:
 
 ```ruby
 class BlogPost < ApplicationRecord
@@ -32,8 +32,8 @@ class BlogPost < ApplicationRecord
 end
 
 post = BlogPost.last
-post.based_uuid #=> bpo_3ah4veflijgy7de6bflk7k4ld4
-post.based_uuid(prefix: false) #=> 3ah4veflijgy7de6bflk7k4ld4
+post.based_uuid #=> bpo_12dm1qresn83st62reqdw7f7cv
+post.based_uuid(prefix: false) #=> 12dm1qresn83st62reqdw7f7cv
 ```
 
 ### Lookup
@@ -41,13 +41,13 @@ post.based_uuid(prefix: false) #=> 3ah4veflijgy7de6bflk7k4ld4
 BasedUUID includes a `find_by_based_uuid` model method to look up records:
 
 ```ruby
-BlogPost.find_by_based_uuid("bpo_3ah4veflijgy7de6bflk7k4ld4")
+BlogPost.find_by_based_uuid("bpo_12dm1qresn83st62reqdw7f7cv")
 
 # or without the prefix:
-BlogPost.find_by_based_uuid("3ah4veflijgy7de6bflk7k4ld4")
+BlogPost.find_by_based_uuid("12dm1qresn83st62reqdw7f7cv")
 
 # there’s also the bang version:
-BlogPost.find_by_based_uuid!("3ah4veflijgy7de6bflk7k4ld4")
+BlogPost.find_by_based_uuid!("12dm1qresn83st62reqdw7f7cv")
 ```
 
 ### Generic lookup
@@ -55,17 +55,17 @@ BlogPost.find_by_based_uuid!("3ah4veflijgy7de6bflk7k4ld4")
 The gem provides a generic lookup method to help you find the correct model for the UUID, based on prefix:
 
 ```ruby
-BasedUUID.find("bpo_3ah4veflijgy7de6bflk7k4ld4")
+BasedUUID.find("bpo_12dm1qresn83st62reqdw7f7cv")
 #=> #<BlogPost>
-BasedUUID.find("acc_ejwqg7b3gvaphiylb25xq545tm")
-#=> #<Account>
+BasedUUID.find("user_763j02ryxh8dbs56mgcjqrmmgt")
+#=> #<User>
 ```
 
 **⚠️ NOTE:** Rails lazy-loads models in the development environment, so this method won’t know about your models until you’ve referenced them at least once. If you’re using this method in a Rails console, you’ll need to run `BlogPost` (or any other model) before you can use it.
 
 ### BasedUUID as default URL identifiers
 
-BasedUUID aims to be unintrusive and it doesn’t affect how Rails URLs are generated, so if you want to use it as default URL param, add this to your model:
+BasedUUID aims to be non-intrusive and it doesn’t affect how Rails URLs are generated, so if you want to use it as default URL param, add this to your model:
 
 ```ruby
 def to_param
@@ -73,6 +73,35 @@ def to_param
 end
 ```
 
+### Custom UUID column name
+
+`BasedUUID` will respect the value of `Model.primary_key`, so it supports custom primary key names:
+
+```ruby
+class Transaction < ApplicationRecord
+  self.primary_key = "txid"
+
+  has_based_uuid prefix: :tx
+end
+```
+
+If you want to use a different column, other than the primary key, you can pass it as an option to `has_based_uuid`:
+
+```ruby
+class Session < ApplicationRecord
+  has_based_uuid prefix: :sid, uuid_column: :session_id
+end
+```
+
+### Use outside ActiveRecord
+
+BasedUUID can be used outside ActiveRecord, too. You can encode any UUID with it:
+
+```ruby
+BasedUUID.encode(uuid: "226d037c-3b35-40f3-a30b-0ebb78779d9b", prefix: :bpo)
+BasedUUID.decode("bpo_12dm1qresn83st62reqdw7f7cv")
+```
+
 * * *
 
 ## Development
@@ -89,4 +118,4 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/pch/ba
 
 This gem is heavily inspired by [Stripe IDs](https://stripe.com/docs/api) and the [prefixed_ids](https://github.com/excid3/prefixed_ids/tree/master) gem by Chris Oliver.
 
-Parts of the base32 encoding code are borrowed from the [ulid gem](https://github.com/rafaelsales/ulid) by Rafael Sales.
+Parts of the base32 encoding code are borrowed from the [ulid](https://github.com/rafaelsales/ulid) gem by Rafael Sales.

data/lib/based_uuid/has_based_uuid.rb

@@ -2,7 +2,6 @@ require "active_support/lazy_load_hooks"
 require "active_support/concern"
 require "active_support/core_ext/object/blank"
 require "active_support/core_ext/class/attribute"
-require "active_record"
 
 module BasedUUID
   module HasBasedUUID
@@ -10,13 +9,16 @@ module BasedUUID
 
     included do
       class_attribute :_based_uuid_prefix
+      class_attribute :_based_uuid_column
     end
 
     class_methods do
-      def has_based_uuid(prefix: nil)
+      def has_based_uuid(prefix: nil, uuid_column: primary_key)
         include ModelExtensions
 
         self._based_uuid_prefix = prefix
+        self._based_uuid_column = uuid_column
+
         BasedUUID.register_model_prefix(prefix, self) if prefix
       end
     end
@@ -27,27 +29,34 @@ module BasedUUID
 
     class_methods do
       def find_by_based_uuid(token)
-        prefix, uuid_base32 = BasedUUID.split(token)
-        raise ArgumentError, "Invalid prefix" if prefix && prefix.to_sym != _based_uuid_prefix
-
-        find_by(primary_key => Base32UUID.decode(uuid_base32))
+        decode_and_find_based_uuid(token:)
       end
 
       def find_by_based_uuid!(token)
-        find_by_based_uuid(token) or raise ActiveRecord::RecordNotFound
+        decode_and_find_based_uuid(token:, raise_error: true)
+      end
+
+      private
+
+      def decode_and_find_based_uuid(token:, raise_error: false)
+        prefix, uuid_base32 = BasedUUID.split(token)
+        raise ArgumentError, "Invalid prefix" if prefix && prefix.to_sym != _based_uuid_prefix
+
+        method_name = raise_error ? :find_by! : :find_by
+        send(method_name, _based_uuid_column => Base32UUID.decode(uuid_base32))
       end
     end
 
     def based_uuid(prefix: true)
-      raise ArgumentError, "UUID is empty" if _primary_key_value.blank?
+      raise ArgumentError, "UUID is empty" if _uuid_column_value.blank?
 
-      BasedUUID.based_uuid(uuid: _primary_key_value, prefix: prefix ? self.class._based_uuid_prefix : nil)
+      BasedUUID.encode(uuid: _uuid_column_value, prefix: prefix ? self.class._based_uuid_prefix : nil)
     end
 
     private
 
-    def _primary_key_value
-      self[self.class.primary_key]
+    def _uuid_column_value
+      self[self.class._based_uuid_column]
     end
   end
 end

data/lib/based_uuid/version.rb

@@ -1,3 +1,3 @@
 module BasedUUID
-  VERSION = "0.5.2".freeze
+  VERSION = "0.6.1".freeze
 end

data/lib/based_uuid.rb

@@ -30,11 +30,16 @@ module BasedUUID
       [prefix.presence, uuid_base32]
     end
 
-    def based_uuid(uuid:, prefix:)
+    def encode(uuid:, prefix:)
       uuid_base32 = Base32UUID.encode(uuid)
       return uuid_base32 unless prefix
 
       "#{prefix}#{delimiter}#{uuid_base32}"
     end
+
+    def decode(token)
+      _, uuid_base32 = split(token)
+      Base32UUID.decode(uuid_base32)
+    end
   end
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: based_uuid
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.1
 platform: ruby
 authors:
 - Piotr Chmolowski
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-06 00:00:00.000000000 Z
+date: 2023-12-07 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '7.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement