dddr 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 348b677b23aa6781f82ed84d35a72e2cbb2873245380194cb2a33d017bd4eb29
-  data.tar.gz: 174ee9771fcb8633cf1661e96e1b419c78ba7dc98b47f333665c8bbf1b7d4cfa
+  metadata.gz: d7ad39d7137de961ad7d5a3998b4e47acf2e500b18c4c22872d6d4267c921c14
+  data.tar.gz: 482665fcf1eb5722ebf0942c6e521d0f4b673cb51e30378cdb0e72a448997728
 SHA512:
-  metadata.gz: 717aa4966cdf9b930d223b48257cef1b0de8a8397017b0d13dab766f662d1a1f91b55baf1e6d6de98a580e1f887d5fb57af5f5050fede90172b18a839e9b9216
-  data.tar.gz: a3fb0a6b030793c96a688abf6f803dfd9324132d53f479353fbe4edb67f30325110d17d57204dc295606f494eba8492784520fb9c3405c1aacc00d2568996136
+  metadata.gz: d5b1958c7a3c414c8a7b2ae32d94f84ca21c615d0752cab9d41676f2cc2edca33d16107235ec52d665ecaed04a9ababa88f855c68a6b7f063ba5cd896aef9584
+  data.tar.gz: c5b55bf5b7f9567999159a528739a24e687afcdbffab569b5b037bf184990eb98cdc47068b83bf4683eabfa27a921029e9e8876905c4e886298e9769f05cf406

data/lib/dddr/sequel.rb

@@ -1,6 +1,30 @@
+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,64 +54,32 @@ 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
-      end
+        @dataset.where(uid: entity.uid).update(entity.to_hash)
+
+      end 
 
       alias_method :modify, :update
       alias_method :change, :update
@@ -96,10 +88,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 +98,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
 
@@ -142,7 +124,7 @@ module Dddr
       end
       result
     end
-
+    
     def from_hash(uid, data_hash)
       self.uid = uid
       data_hash.each do |attribute, value|
@@ -152,5 +134,6 @@ module Dddr
         end
       end
     end
+
   end
 end

data/lib/dddr/version.rb

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

data/lib/dddr.rb

@@ -55,6 +55,13 @@ 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 +70,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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dddr
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Delaney Burke
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-02-12 00:00:00.000000000 Z
+date: 2024-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sdbm