foobara-redis-crud-driver 0.0.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8a81120a1e087040686a18fb873d84b701d578708b59cb14d6c842206f56d3e
-  data.tar.gz: 35ef909f9222826cc36bc73e585f91d54235b4ff10dae6cb3c6182c85982d96a
+  metadata.gz: a54546ecb7497876846a64f0306c99630365e16051abc72b98af54332f51921b
+  data.tar.gz: 1c8acd4863e4ed466a2a4e90b49050c4cd5d6aa689c981c9d98538e064ab82a5
 SHA512:
-  metadata.gz: 60fa11bed5950a363f2a08bf3e789175c012b24614703cb82a70bde0ec63ab8f115323e79f6b4de93ad9b0f357220774ca6ca50d96f47b0b1928358587c7e4ef
-  data.tar.gz: 385faf75c6a4a8de419ab96eec05c995cd90acd96a649da7afdd5cfd7c683bc4138b35e39c1954fe9a48e28cfe073b68ba08df3cdfb9176b31f43efc3eeda02d
+  metadata.gz: 1332d039107309e3743b6289ed84315719eeecb760d4ddd6c7a4bdbbcb66d0faaf8fc853c8b8aeddfa440cf74f7565594652b254388474527151d8482a9e2a05
+  data.tar.gz: f971e1135cf1bacb5a15f5c0ee6c4cb45f0247202793e8c453f5c34f8b7d56659dd25c7bae2c90a1118b99c22728bdc53fa378cd2b761210091d27bcfc5e42be

data/.ruby-version

@@ -1 +1 @@
-3.4.1
+3.4.3

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [0.0.6] - 2025-06-16
+
+- Move crud-driver-specific specs to foobara-crud-driver-spec-helpers gem
+
+## [0.0.5] - 2025-05-15
+
+- Support string primary keys
+
 ## [0.0.4] - 2025-01-07
 
 - Bump Ruby to 3.4.1

data/src/foobara/redis_crud_driver.rb

@@ -39,23 +39,17 @@ 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
 
-      def all
+      def all(page_size: nil)
         Enumerator.new do |yielder|
           batches_of_primary_keys.each do |batch|
             raw_records = redis.pipelined do |p|
@@ -83,17 +77,6 @@ module Foobara
         end
       end
 
-      # TODO: move this up to base class as a default
-      def find!(record_id)
-        attributes = find(record_id)
-
-        unless attributes
-          raise CannotFindError.new(record_id, "does not exist")
-        end
-
-        attributes
-      end
-
       def insert(attributes)
         attributes = Util.deep_dup(attributes)
 
@@ -113,7 +96,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
 
@@ -202,20 +185,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,28 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: foobara-redis-crud-driver
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors:
 - Miles Georgi
 bindir: bin
 cert_chain: []
-date: 2025-01-07 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.131
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.131
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -61,7 +61,6 @@ metadata:
   rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
-- lib
 - src
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
@@ -74,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Provides support for entity CRUD in Redis for Foobara
 test_files: []