foobara-redis-crud-driver 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db6c81dfe5009f3f778ec4f05b6bd0d6809718ba126fe0dba259c3666e344cd5
-  data.tar.gz: e30d4ff3154a4396106550c5ff8c46c00e160b62ec54ec8f93c74cb50d72d850
+  metadata.gz: 5eb2adfa4e202e290ad4b2c85fec629e93fa1a7f214005e245aa425c2d1af906
+  data.tar.gz: 9818c7e4f4dcde783028afd1eb64a5d20a0d95dba4bfe6b41af961a127fcdb50
 SHA512:
-  metadata.gz: 78efec1418b1fca8b349719f3fd4e7777f09460577bb9e1f12e38246a48f35cd65e1957f077c8e64147bbcd68c005c3a0fb9c12dc87d6711904b18863d7d4e55
-  data.tar.gz: 60547f0d67c390429179ad01a30e6338667ffe7cd6236fee88ae3bd061fa9ae9a5a3b36a221ccc11b435be29c15a6815134f276a967effebe0499bb2bf9a300f
+  metadata.gz: a647944c1560caba524ac82c5a34f0c6f99d96fa1b5b949cc896245f2eeb9e83b647f62f52d9e3ee377b172a49023cb1b74a60c7d3eae56e67bb58bc812a51ee
+  data.tar.gz: a5d4f012659d33094e54c2dac09692cbdb67653013262fd43a64d0f13ee25d078b5443ac28db9881bdb0ce04c507cbfd334184edbfadb7ff218b086c9e541519

data/.ruby-version

@@ -1 +1 @@
-3.2.2
+3.4.3

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [0.0.5] - 2025-05-15
+
+- Support string primary keys
+
+## [0.0.4] - 2025-01-07
+
+- Bump Ruby to 3.4.1
+
 ## [0.0.3] - 2024-11-30
 
 - Make use of default crud driver methods

data/src/foobara/redis_crud_driver.rb

@@ -39,19 +39,13 @@ module Foobara
     end
 
     class Table < Persistence::EntityAttributesCrudDriver::Table
-      def initialize(...)
-        super
-
+      def get_id
         unless entity_class.primary_key_type.type_symbol == :integer
-          # TODO: when primary key is a string such as a uuid we should
-          # probably set the score to 0 and use other methods. But not interested in implementing that stuff now.
           # :nocov:
           raise "Only integer primary keys are supported for now"
           # :nocov:
         end
-      end
 
-      def get_id
         redis.incr(sequence_key)
       end
 
@@ -83,6 +77,7 @@ module Foobara
         end
       end
 
+      # TODO: move this up to base class as a default
       def find!(record_id)
         attributes = find(record_id)
 
@@ -112,7 +107,7 @@ module Foobara
 
         # TODO: use redis.multi here
         redis.hset(record_key_prefix(record_id), attributes)
-        redis.zadd(primary_keys_index_key, record_id, record_id)
+        redis.zadd(primary_keys_index_key, id_to_score(record_id), record_id)
         find(record_id)
       end
 
@@ -201,20 +196,57 @@ module Foobara
       def batches_of_primary_keys
         limit = [0, 50]
 
-        lower_bound = 0
+        if string_primary_key?
+          lower_bound = "-"
+          upper_bound = "+"
+          command = :zrangebylex
+        else
+          lower_bound = 0
+          upper_bound = "+inf"
+          command =   :zrangebyscore
+        end
 
         Enumerator.new do |yielder|
           loop do
-            batch = redis.zrangebyscore(primary_keys_index_key, lower_bound, "+inf", limit:)
-
+            batch = redis.send(command, primary_keys_index_key, lower_bound, upper_bound, limit:)
             break if batch.empty?
 
             yielder << batch
 
-            lower_bound = batch.last.to_i + 1
+            lower_bound = if string_primary_key?
+                            "(#{batch.last}"
+                          else
+                            id_to_score(batch.last) + 1
+                          end
           end
         end.lazy
       end
+
+      def id_to_score(id)
+        if string_primary_key?
+          0
+        else
+          id.to_i
+        end
+      end
+
+      def string_primary_key?
+        primary_key_symbol == :string
+      end
+
+      def primary_key_symbol
+        return @primary_key_symbol if defined?(@primary_key_symbol)
+
+        type_symbol = entity_class.primary_key_type.type_symbol
+
+        unless [:integer, :string].include?(type_symbol)
+          # :nocov:
+          raise "Only integer and string primary keys are supported for now"
+          # :nocov:
+        end
+
+        @primary_key_symbol = type_symbol
+      end
     end
   end
 end

metadata

@@ -1,29 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: foobara-redis-crud-driver
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - Miles Georgi
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-30 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foobara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.125
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.125
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -60,7 +59,6 @@ metadata:
   source_code_uri: https://github.com/foobara/redis-crud-driver
   changelog_uri: https://github.com/foobara/redis-crud-driver/blob/main/CHANGELOG.md
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -69,15 +67,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.2.2
+      version: 3.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.23
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Provides support for entity CRUD in Redis for Foobara
 test_files: []