Change transaction constructors to accept parent store instance

CHANGELOG.md

@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [Unreleased] - 
+
+### Changed
+- Change transaction constructors to accept parent store instance as argument
+
 ## [0.21.0] - 2024-08-02
 
 ### Added

src/mel/memory.cr

@@ -92,7 +92,7 @@ module Mel
     end
 
     def transaction(& : Transaction -> _)
-      yield Transaction.new(queue, tasks, progress)
+      yield Transaction.new(self)
     end
 
     def truncate
@@ -139,24 +139,24 @@ module Mel
     struct Transaction
       include Store::Transaction
 
-      def initialize(@queue : Queue, @tasks : Tasks, @progress : Progress)
+      def initialize(@memory : Memory)
       end
 
       def create(task : Task)
-        @queue[task.id] ||= task.time.to_unix
-        @tasks[task.id] ||= task.to_json
+        @memory.queue[task.id] ||= task.time.to_unix
+        @memory.tasks[task.id] ||= task.to_json
       end
 
       def update(task : Task)
         time = task.retry_time || task.time
 
-        @queue[task.id] = time.to_unix
-        @tasks[task.id] = task.to_json
+        @memory.queue[task.id] = time.to_unix
+        @memory.tasks[task.id] = task.to_json
       end
 
       def set_progress(id : String, value : Int, description : String)
         report = Mel::Progress::Report.new(id, description, value)
-        @progress[id] = ProgressEntry.new(report.to_json)
+        @memory.progress[id] = ProgressEntry.new(report.to_json)
       end
     end
 

src/redis.cr

@@ -131,7 +131,7 @@ module Mel
 
     def transaction(& : Transaction -> _)
       @client.multi do |redis|
-        yield Transaction.new(redis, key)
+        yield Transaction.new(self, redis)
       end
     end
 
@@ -161,38 +161,42 @@ module Mel
     struct Transaction
       include Store::Transaction
 
-      def initialize(@client : ::Redis::Transaction, @key : Key)
+      def initialize(@redis : Redis, @client : ::Redis::Transaction)
       end
 
-      def self.new(url : String, namespace = :mel)
-        new URI.parse(url), namespace
+      def self.new(redis : Redis, url : String)
+        new redis, URI.parse(url)
       end
 
-      def self.new(url : URI, namespace = :mel)
-        new ::Redis::Connection.new(url), namespace
+      def self.new(redis : Redis, url : URI)
+        new redis, ::Redis::Connection.new(url)
       end
 
-      def self.new(connection : Redis::Connection, namespace = :mel)
-        new Redis::Transaction.new(connection), namespace
+      def self.new(redis : Redis, connection : Redis::Connection)
+        new redis, ::Redis::Transaction.new(connection)
       end
 
       def create(task : Task)
-        @client.zadd(@key.name, {"NX", task.time.to_unix.to_s, task.id})
-        @client.set(@key.name(task.id), task.to_json, nx: true)
+        @client.zadd(
+          @redis.key.name,
+          {"NX", task.time.to_unix.to_s, task.id}
+        )
+
+        @client.set(@redis.key.name(task.id), task.to_json, nx: true)
       end
 
       def update(task : Task)
         time = task.retry_time || task.time
 
-        @client.zadd(@key.name, time.to_unix.to_s, task.id)
-        @client.set(@key.name(task.id), task.to_json)
+        @client.zadd(@redis.key.name, time.to_unix.to_s, task.id)
+        @client.set(@redis.key.name(task.id), task.to_json)
       end
 
       def set_progress(id : String, value : Int, description : String)
         report = Progress::Report.new(id, description, value)
 
         @client.set(
-          @key.progress(id),
+          @redis.key.progress(id),
           report.to_json,
           ex: Mel.settings.progress_expiry
         )