dddr 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3967837aa56e6910bdf8ffc00d575c521fb1454814c3c9895a7335b17cbc877f
-  data.tar.gz: 77de95c903cff093d1db2d625c0d94dfb58eba214014b731fb40e58abe3c500b
+  metadata.gz: f96ffac1e23446ac9a1c36f4510843e4dc1604def5358f57118ace997c0b7d82
+  data.tar.gz: f2596ac36f26e0f507b1e0daaf26de0fff2708a840eca88b5ea11b433dbb4f4a
 SHA512:
-  metadata.gz: 668227ed62d727887f0866d1eb4ba4b4d5ff9dc293c6122e7b20a828f07d97966dc43572006f1b807d16750e635d6fd91940baead953f1ba4aaa214119e6ffa7
-  data.tar.gz: 65836fea37bc4123d59cd33779e11cb05600b4e0cbd20b08d25cdc9a63a65c33c1c5c122a23911c602fad7f2eefd3eccf77eb899cf97e117926aaeca7bccf75a
+  metadata.gz: ea1ff7abff2d883c5a0fc4ede0f79a8895a062e47832372cdbe4303ce111280c032bb2824a84f8d1bbd538d6b45f5ee9ecc2c3d49e193221211ca8bbca4d55c4
+  data.tar.gz: feca838ebd27c5a28169babab509a6278cc485f81b1de1e8f3b96ae327bdb428ad9887640cd786ce0d127d22f2e300b4b34df0aba6ad2eaff792a1a058d0933d

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,79 +52,61 @@ 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)
         @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 :find, :get
 
-      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
+      def add(entity)
+        uid = SecureRandom.uuid
+        entity.uid = uid
+        @dataset.insert(entity.to_hash)
+        uid
       end
+      alias_method :create, :add
+      alias_method :insert, :add
 
-      alias_method :find, :get
+      # Methods update, delete, get, etc., remain unchanged.
+    end
 
-      def all
-        @dataset.all.map do |row|
-          item = Item.new
-          item.from_hash(row[:uid], row)
-          item
-        end
+    module Entity
+      def self.included(base)
+        base.extend(ClassMethods)
       end
-    end
 
-    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)
+      def to_hash
+        instance_variables.each_with_object({}) do |var, hash|
+          hash[var.to_s.delete("@").to_sym] = instance_variable_get(var)
+        end
       end
-      result
-    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)
+      def from_hash(uid, data_hash)
+        self.uid = uid
+        data_hash.each do |attribute, value|
+          send(:"#{attribute}=", value) if respond_to?(:"#{attribute}=")
         end
       end
     end

data/lib/dddr/version.rb

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

metadata

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