dddr 2.4.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3967837aa56e6910bdf8ffc00d575c521fb1454814c3c9895a7335b17cbc877f
-  data.tar.gz: 77de95c903cff093d1db2d625c0d94dfb58eba214014b731fb40e58abe3c500b
+  metadata.gz: d6acdebe892f8a4b6cdf9ca92fda7bf75ed5b9070cef4ab7026c5422e8afd3ff
+  data.tar.gz: 3139cede6e45ca82aece8f39bd85683b87f6892aa4a58592878f348ab4e47d3b
 SHA512:
-  metadata.gz: 668227ed62d727887f0866d1eb4ba4b4d5ff9dc293c6122e7b20a828f07d97966dc43572006f1b807d16750e635d6fd91940baead953f1ba4aaa214119e6ffa7
-  data.tar.gz: 65836fea37bc4123d59cd33779e11cb05600b4e0cbd20b08d25cdc9a63a65c33c1c5c122a23911c602fad7f2eefd3eccf77eb899cf97e117926aaeca7bccf75a
+  metadata.gz: 6fea9815112baa6abd60096e2de8da23f509711fef58792bb87dbc4a776ff5057d43d549260c85937ddbfd6a4ae6eff3c47053f6220e8d7dac7de500708e4224
+  data.tar.gz: d2bb17024d3c636b0687817b270f18020359abcbea4ad9f937756f6bd04f8b43eaf377d193ed8537d6fb2e33729377c579e68ef0df9b0f4fdff0e295f14d9757

data/lib/dddr/sequel.rb

@@ -1,15 +1,13 @@
 require "sequel"
+require "securerandom"
 
-::Sequel::Model.plugin :timestamps
-
+# Assuming Dddr.configuration.db is already set up to return a Sequel database connection
 module Dddr
   module Sequel
     module ClassMethods
       def create_properties(*names)
-        names.each do |name|
-          name.each do |name|
-            attr_accessor name
-          end
+        names.flatten.each do |name|
+          attr_accessor name
         end
       end
 
@@ -20,8 +18,8 @@ module Dddr
       end
 
       def table(name = nil)
-        @@table_name = name unless name.nil?
-        @@table_name
+        @table_name = name unless name.nil?
+        @table_name
       end
 
       def queries(&block)
@@ -41,13 +39,12 @@ module Dddr
 
       def create_repository_for(entity_class)
         repository_class = Class.new(RepositoryBase) do
-          define_singleton_method(:new) do |*args|
-            super(entity_class)
+          define_singleton_method(:entity_class) do
+            entity_class
           end
         end
 
         repository_class.include(@queries_module) if instance_variable_defined?(:@queries_module)
-
         const_set(:Repository, repository_class)
       end
     end
@@ -55,81 +52,50 @@ module Dddr
     class RepositoryBase
       attr_reader :dataset
 
-      def initialize(entity_class)
-        @entity_class = entity_class
-        @dataset = Dddr.configuration.db[@entity_class.table]
-        @entity_class.create_properties(@dataset.columns)
+      def initialize
+        @dataset = Dddr.configuration.db[self.class.entity_class.table]
+        self.class.entity_class.create_properties(@dataset.columns)
       end
 
       def count
         @dataset.count
       end
 
-      def add(entity)
-        uid = SecureRandom.uuid
-        entity.uid = uid
-        @dataset.insert(entity.to_hash)
-        uid
+      def get(uid)
+        row = @dataset.where(uid: uid).first
+        self.class.entity_class.from_row(row) if row
       end
-      alias_method :create, :add
-      alias_method :insert, :add
 
       def update(entity)
+        entity.last_updated_at = DateTime.now
         @dataset.where(uid: entity.uid).update(entity.to_hash)
       end
 
-      alias_method :modify, :update
-      alias_method :change, :update
-      alias_method :edit, :update
-      alias_method :revise, :update
-      alias_method :alter, :update
+      def all
+        @dataset.map { |row| self.class.entity_class.from_row(row) }
+      end
 
       def delete(entity)
         @dataset.where(uid: entity.uid).delete
       end
-
-      alias_method :remove, :delete
-      alias_method :erase, :delete
-      alias_method :discard, :delete
-      alias_method :destroy, :delete
-      alias_method :wipe, :delete
-
-      def get(uid)
-        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
-        @dataset.all.map do |row|
-          item = Item.new
-          item.from_hash(row[:uid], row)
-          item
-        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
 
-    def to_hash
-      result = {}
-      instance_variables.each do |var_name|
-        attribute_name = var_name.to_s[1..].to_sym
-        result[attribute_name] = instance_variable_get(var_name)
+        @dataset.insert(entity.to_hash)
+        uid
       end
-      result
-    end
+      alias_method :create, :add
+      alias_method :insert, :add
 
-    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)
-        end
-      end
+      # Methods update, delete, get, etc., remain unchanged.
     end
+
+    
   end
 end

data/lib/dddr/version.rb

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

data/lib/dddr.rb

@@ -75,6 +75,20 @@ module Dddr
       end
 
     end
+    
+    def to_hash
+      instance_variables.each_with_object({}) do |var, hash|
+        hash[var.to_s.delete("@").to_sym] = instance_variable_get(var)
+      end
+    end
+
+    def from_hash(uid, data_hash)
+      self.uid = uid
+      data_hash.each do |attribute, value|
+        send(:"#{attribute}=", value) if respond_to?(:"#{attribute}=")
+      end
+    end
+
 
     attr_accessor :uid, :created_at, :last_updated_at, :deleted, :deleted_at
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dddr
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Delaney Burke
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-03-12 00:00:00.000000000 Z
+date: 2024-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sdbm