dddr 2.1.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 348b677b23aa6781f82ed84d35a72e2cbb2873245380194cb2a33d017bd4eb29
-  data.tar.gz: 174ee9771fcb8633cf1661e96e1b419c78ba7dc98b47f333665c8bbf1b7d4cfa
+  metadata.gz: d2f6afaa1eb4dfe12d0b23863245fed79c2bceaa2d4b07a800d6139f25ff4c11
+  data.tar.gz: ef76a7d071a37b57ad42872b8ce08acff77ceb613c5d8fbcdbd180ae5066b6c1
 SHA512:
-  metadata.gz: 717aa4966cdf9b930d223b48257cef1b0de8a8397017b0d13dab766f662d1a1f91b55baf1e6d6de98a580e1f887d5fb57af5f5050fede90172b18a839e9b9216
-  data.tar.gz: a3fb0a6b030793c96a688abf6f803dfd9324132d53f479353fbe4edb67f30325110d17d57204dc295606f494eba8492784520fb9c3405c1aacc00d2568996136
+  metadata.gz: 86b6bbe5171e50157b17bf4a1ba79852950b331c8e1f13e5219f81363228341cfd7f9166830ced1ef2d0cd93ff6d29580a49f31e50ac35aadcb8e64beedfb978
+  data.tar.gz: d11b34ef26630fac36b37ebe45bbc63d768fe7a96db17df10f9cf8e65f68da5dda2b440f1add108a816e00d20ca6cd2df4a314ab4102ebb3b931cbd10d756335

data/.rspec

@@ -1,3 +1,3 @@
---format documentation
+--format progress
 --color
 --require spec_helper

data/.rspecrc

@@ -0,0 +1,4 @@
+--color
+--profile
+--progress
+

data/lib/dddr/sdbm.rb

@@ -31,6 +31,7 @@ module Dddr
 
     class RepositoryBase
       def initialize(entity_class)
+        @mutex = Mutex.new
         @entity_class = entity_class
         setup_data_directory(entity_class)
         @serializer = Dddr::Serializer.new(Dddr.configuration.serializer)
@@ -62,31 +63,31 @@ module Dddr
       def count
         all.count
       end
-      
+
       def to_csv
         env = Dddr.configuration.env
         data_dir = Dddr.configuration.data_dir
-        container = Dddr.configuration.container        
+        container = Dddr.configuration.container
         CSV.open("#{data_dir}/#{container}/#{env}/#{self.class.name}.csv", "w") do |csv|
           csv = all.first&.to_hash&.keys
           all.each do |entity|
             csv << entity.to_hash.values
-          end        
-        end      
+          end
+        end
       end
 
-      
-
       def add(entity)
-        uid = SecureRandom.uuid
-        entity.uid = uid
-        entity.created_at ||= DateTime.now.to_s
-        entity.last_updated_at ||= entity.created_at
-
-        SDBM.open(@data_dir) do |db|
-          db[uid] = @serializer.dump(entity.to_hash)
+        @mutex.synchronize do
+          uid = SecureRandom.uuid
+          entity.uid = uid
+          entity.created_at ||= DateTime.now.to_s
+          entity.last_updated_at ||= entity.created_at
+
+          SDBM.open(@data_dir) do |db|
+            db[uid] = @serializer.dump(entity.to_hash)
+          end
+          uid
         end
-        uid
       end
 
       alias_method :create, :add
@@ -97,11 +98,13 @@ module Dddr
 
       def update(entity)
         return unless entity.uid
-        entity.last_updated_at = DateTime.now.to_s
-        SDBM.open(@data_dir) do |db|
-          db[entity.uid] = @serializer.dump(entity.to_hash)
+        @mutex.synchronize do
+          entity.last_updated_at = DateTime.now.to_s
+          SDBM.open(@data_dir) do |db|
+            db[entity.uid] = @serializer.dump(entity.to_hash)
+          end
+          entity
         end
-        entity
       end
 
       alias_method :modify, :update
@@ -112,8 +115,10 @@ module Dddr
 
       def delete(entity)
         return unless entity.uid
-        SDBM.open(@data_dir) do |db|
-          db.delete(entity.uid)
+        @mutex.synchronize do
+          SDBM.open(@data_dir) do |db|
+            db.delete(entity.uid)
+          end
         end
       end
 
@@ -124,28 +129,32 @@ module Dddr
       alias_method :wipe, :delete
 
       def get(uid)
-        SDBM.open(@data_dir) do |db|
-          data = db[uid]
-          return unless data
+        @mutex.synchronize do
+          SDBM.open(@data_dir) do |db|
+            data = db[uid]
+            return unless data
 
-          entity = @entity_class.new
-          entity.from_hash(uid, @serializer.load(data))
-          entity
+            entity = @entity_class.new
+            entity.from_hash(uid, @serializer.load(data))
+            entity
+          end
         end
       end
 
       alias_method :find, :get
 
       def all
-        result = []
-        SDBM.open(@data_dir) do |db|
-          db.each do |key, value|
-            entity = @entity_class.new
-            entity.from_hash(key, @serializer.load(value))
-            result << entity unless entity.deleted
+        @mutex.synchronize do
+          result = []
+          SDBM.open(@data_dir) do |db|
+            db.each do |key, value|
+              entity = @entity_class.new
+              entity.from_hash(key, @serializer.load(value))
+              result << entity unless entity.deleted
+            end
           end
+          result
         end
-        result
       end
     end
 
@@ -159,11 +168,13 @@ module Dddr
     end
 
     def from_hash(uid, data_hash)
-      self.uid = uid
-      data_hash&.each do |attribute, value|
-        attribute = attribute.to_sym
-        if respond_to?(:"#{attribute}=")
-          send(:"#{attribute}=", value)
+      Mutex.new.synchronize do 
+        self.uid = uid
+        data_hash&.each do |attribute, value|
+          attribute = attribute.to_sym
+          if respond_to?(:"#{attribute}=")
+            send(:"#{attribute}=", value)
+          end
         end
       end
     end

data/lib/dddr/sequel.rb

@@ -1,6 +1,29 @@
+require "sequel"
+
+::Sequel::Model.plugin :timestamps
+
 module Dddr
   module Sequel
     module ClassMethods
+      def create_properties(*names)
+        names.each do |name|
+          name.each do |name|
+            attr_accessor name
+          end
+        end
+      end
+
+      def from_row(row)
+        item = new
+        item.from_hash(row[:uid], row)
+        item
+      end
+
+      def table(name = nil)
+        @@table_name = name unless name.nil?
+        @@table_name
+      end
+
       def queries(&block)
         @queries_module ||= Module.new
         @queries_module.module_eval(&block)
@@ -30,63 +53,29 @@ module Dddr
     end
 
     class RepositoryBase
+      attr_reader :dataset
+
       def initialize(entity_class)
         @entity_class = entity_class
-        setup_data_directory(entity_class)
-      end
-
-      def setup_data_directory(entity_class)
-        env = Dddr.configuration.env
-        data_dir = Dddr.configuration.data_dir
-        container = Dddr.configuration.container
-        raise Dddr::Error, "Container name is required" unless container
-
-        # Construct the target directory path
-        @name = "#{data_dir}/#{container}/#{env}/#{entity_class.name.downcase}"
-
-        begin
-          # Ensure all directories in the path are created
-          FileUtils.mkdir_p(@name)
-
-          # Change ownership only if the path starts with "/var/"
-          if @name.start_with?("/var/")
-            FileUtils.chown_R(ENV["USER"], nil, @name)
-          end
-        rescue Errno::ENOENT => e
-          # Log or handle the error
-          raise "Failed to create or access the directory: #{e.message}"
-        end
+        @dataset = Dddr.configuration.db[@entity_class.table]
+        @entity_class.create_properties(@dataset.columns)
       end
 
       def count
-        all.count
+        @dataset.count
       end
 
       def add(entity)
         uid = SecureRandom.uuid
         entity.uid = uid
-        entity.created_at ||= DateTime.now.to_s
-        entity.last_updated_at ||= entity.created_at
-
-        SDBM.open(@name) do |db|
-          db[uid] = Marshal.dump(entity.to_hash)
-        end
+        @dataset.insert(entity.to_hash)
         uid
       end
-
       alias_method :create, :add
       alias_method :insert, :add
-      alias_method :put, :add
-      alias_method :append, :add
-      alias_method :store, :add
 
       def update(entity)
-        return unless entity.uid
-        entity.last_updated_at = DateTime.now.to_s
-        SDBM.open(@name) do |db|
-          db[entity.uid] = Marshal.dump(entity.to_hash)
-        end
-        entity
+        @dataset.where(uid: entity.uid).update(entity.to_hash)
       end
 
       alias_method :modify, :update
@@ -96,10 +85,7 @@ module Dddr
       alias_method :alter, :update
 
       def delete(entity)
-        return unless entity.uid
-        SDBM.open(@name) do |db|
-          db.delete(entity.uid)
-        end
+        @dataset.where(uid: entity.uid).delete
       end
 
       alias_method :remove, :delete
@@ -109,28 +95,21 @@ module Dddr
       alias_method :wipe, :delete
 
       def get(uid)
-        SDBM.open(@name) do |db|
-          data = db[uid]
-          return unless data
-
-          entity = @entity_class.new
-          entity.from_hash(uid, Marshal.load(data))
-          entity
-        end
+        row = @dataset.where(uid: uid).first
+        raise Dddr::Error, "UID is required" unless row
+        item = Item.new
+        item.from_hash(uid, row)
+        item
       end
 
       alias_method :find, :get
 
       def all
-        result = []
-        SDBM.open(@name) do |db|
-          db.each do |key, value|
-            entity = @entity_class.new
-            entity.from_hash(key, Marshal.load(value))
-            result << entity unless entity.deleted
-          end
+        @dataset.all.map do |row|
+          item = Item.new
+          item.from_hash(row[:uid], row)
+          item
         end
-        result
       end
     end
 

data/lib/dddr/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dddr
-  VERSION = "2.1.0"
+  VERSION = "2.3.0"
 end

data/lib/dddr.rb

@@ -3,12 +3,12 @@
 require "sdbm"
 require "securerandom"
 require "date"
-require 'csv'
+require "csv"
 require "ostruct"
 require "fileutils"
 require "oj"
 require "msgpack"
-
+require "thread"
 require_relative "dddr/sdbm"
 require_relative "dddr/sequel"
 require_relative "dddr/version"
@@ -22,8 +22,9 @@ module Dddr
 
   class MessagePack
     def self.load(obj)
-      ::MessagePack.unpack(obj) 
+      ::MessagePack.unpack(obj)
     end
+
     def self.dump(obj)
       obj.to_msgpack
     end
@@ -31,15 +32,20 @@ module Dddr
 
   class Serializer
     def initialize(engine)
+      @mutex = Mutex.new
       @engine = engine
     end
 
     def dump(obj)
-      @engine.dump(obj)
+      @mutex.synchronize do
+        @engine.dump(obj)
+      end
     end
 
     def load(obj)
-      @engine.load(obj)
+      @mutex.synchronize do
+        @engine.load(obj)
+      end
     end
   end
 
@@ -55,6 +61,12 @@ module Dddr
   class Error < StandardError; end
 
   module Entity
+    def self.create_properties(*names)
+      names.each do |name|
+        attr_accessor name
+      end
+    end
+
     def self.included(base)
       if Dddr.configuration.engine == :sdbm
         Dddr::ENTITIES << base
@@ -63,7 +75,7 @@ module Dddr
       end
       if Dddr.configuration.engine == :sequel
         include Dddr::Sequel
-        base.extend(Dddr::Sdbm::ClassMethods)
+        base.extend(Dddr::Sequel::ClassMethods)
       end
     end
 

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: dddr
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Delaney Burke
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-02-12 00:00:00.000000000 Z
+date: 2024-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sdbm
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.32'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.32'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.11'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.11'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
@@ -77,6 +77,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".rspec"
+- ".rspecrc"
 - ".standard.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md