dddr 1.0.8 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4646e8a727ff71b363a29bf0efe1bc952e999ecc726c51e898e3013734992b4d
-  data.tar.gz: 31d7837d050a1cdba539cd7705a5ad52d2cbb1006998d0c34179bbdc99e82d1e
+  metadata.gz: 46a9b18b953d2365bebe6f55b8772d89489133bbca231e7622318b3e8fd44ed1
+  data.tar.gz: 07fa42336f6a55f867eeb111b459803126aa62fd2dc694c5733fb1bf74a36371
 SHA512:
-  metadata.gz: ff6a74ec83c1846a561804fffe3d6d0e96a0b618ab0d9672b2fd130f8d3620a6dc105029a0d64e0639d0795ecfa1eb46a9ffc9c42fd775ef371db49d643809a5
-  data.tar.gz: ca5cfacbc23a24b65dc55c606d4052d213c53b84ee645e9f721c1052a05175ba5f29e84c6296810b8dbba898d27303dfb4a5cf549e4f77de295d2a98dde05085
+  metadata.gz: c660616726df5f0a8a6f267c0c303bc77b79323751db7da29e87d18214582c26b6977cc243bd75b32ebf64cf1635d159ef16dc642066e13dd4bfa688383ba68b
+  data.tar.gz: 6b333f66013aff5cc3938d199b1d0580d7f350a073304289e20de9afd55c053ee6117b8e0ce5886e9c3cd9896f8c531cd7b7d1a9be9e82b2cf57e8013a73b895

data/lib/dddr/version.rb

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

data/lib/dddr.rb

@@ -30,148 +30,128 @@ module Dddr
 
     module ClassMethods
       def queries(&block)
-        const_set(:Queries, Module.new(&block))
-        self::Repository.include(const_get(:Queries)) if const_defined?(:Repository)
-      end
-
-      def associations(repository, &block)
-        const_set(:AssociationMethod, Module.new(&block))
-        repository.include(const_get(:AssociationMethod))
+        @queries_module ||= Module.new
+        @queries_module.module_eval(&block)
       end
 
       def const_missing(name)
+        if name == :Repository
+          create_repository_for(self)
+        else
+          super
+        end
+      end
 
-        @@context = self
+      private
 
-        if defined?(self::Queries)
-          @@queries = self::Queries
+      def create_repository_for(entity_class)
+        repository_class = Class.new(RepositoryBase) do
+          define_singleton_method(:new) do |*args|
+            super(entity_class)
+          end
         end
 
-        if name == :Repository
+        repository_class.include(@queries_module) if instance_variable_defined?(:@queries_module)
 
-          repository_class = Class.new do
-            def initialize(entity_class = @@context)
-              @entity_class = entity_class
-              env = Dddr.configuration.env
-
-              unless Dir.exist? Dddr.configuration.data_dir
-                
-                if Dddr.configuration.data_dir.include? "/var/" 
-                  `sudo mkdir -p #{Dddr.configuration.data_dir}/#{Dddr.configuration.container}/#{env}/`
-                  `sudo chown $USER #{Dddr.configuration.data_dir}/#{Dddr.configuration.container}/#{env}/`
-                else
-                  `mkdir -p #{Dddr.configuration.data_dir}/#{Dddr.configuration.container}/#{env}/`
-                end
-
-              end
-
-              @name = "#{Dddr.configuration.data_dir}/#{Dddr.configuration.container}/#{env}/#{entity_class.name.downcase}"
-            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
-              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)
-              entity.last_updated_at = DateTime.now.to_s
-              SDBM.open(@name) do |db|
-                db[entity.uid] = Marshal.dump(entity.to_hash)
-              end
-              entity
-            end
-
-            alias_method :modify, :update
-            alias_method :change, :update
-            alias_method :edit, :update
-            alias_method :revise, :update
-            alias_method :alter, :update
-
-            def delete(entity)
-              SDBM.open(@name) do |db|
-                db.delete(entity.uid)
-              end
-            end
-
-            alias_method :remove, :delete
-            alias_method :erase, :delete
-            alias_method :discard, :delete
-            alias_method :destroy, :delete
-            alias_method :wipe, :delete
-
-            def get(uid)
-              all.find { |e| e.uid == uid }
-            end
-
-            alias_method :fetch, :get
-            alias_method :retrieve, :get
-            alias_method :find, :get
-            alias_method :acquire, :get
-            alias_method :obtain, :get
-
-            def reset!
-              if Dddr.configuration.env == "test"
-                all.map { |e| delete(e) }
-                return
-              end
-
-              puts "Warning: This will delete all records. Are you sure? (y/n)"
-              confirmation = gets.chomp
-
-              if confirmation.downcase == "y"
-                puts "Type 'reset' to confirm."
-                final_confirmation = gets.chomp
-
-                if final_confirmation.downcase == "reset"
-                  all.map { |e| delete(e) }
-                  puts "All records have been deleted."
-                else
-                  puts "Reset cancelled."
-                end
-              else
-                puts "Reset cancelled."
-              end
-            end
-
-            def count
-              all.count
-            end
-
-            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
-              end
-              result
-            end
-          end
+        const_set(:Repository, repository_class)
+      end
+    end
 
-          if defined?(@@queries)
-            repository_class.include @@queries
+    class RepositoryBase
+      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
+        unless Dir.exist?(data_dir)
+          if data_dir.include?("/var/")
+            `sudo mkdir -p #{data_dir}/#{container}/#{env}/`
+            `sudo chown $USER #{data_dir}/#{container}/#{env}/`
+          else
+            `mkdir -p #{data_dir}/#{container}/#{env}/`
           end
+        end
+        @name = "#{data_dir}/#{container}/#{env}/#{entity_class.name.downcase}"
+      end
 
-          const_set(name, repository_class)
-        else
-          super
+      def count
+        all.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
+        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
+
+      alias_method :modify, :update
+      alias_method :change, :update
+      alias_method :edit, :update
+      alias_method :revise, :update
+      alias_method :alter, :update
+
+      def delete(entity)
+        return unless entity.uid
+        SDBM.open(@name) do |db|
+          db.delete(entity.uid)
         end
       end
+
+      alias_method :remove, :delete
+      alias_method :erase, :delete
+      alias_method :discard, :delete
+      alias_method :destroy, :delete
+      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
+      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
+        end
+        result
+      end
     end
 
     def to_hash
@@ -184,8 +164,7 @@ module Dddr
     end
 
     def new?
-      return true if created_at.nil?
-      false
+      created_at.nil?
     end
 
     def from_hash(uid, data_hash)
@@ -198,8 +177,6 @@ module Dddr
       end
     end
   end
-
-  # Your code goes here...
 end
 
 Dddr.configure

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dddr
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.1.0
 platform: ruby
 authors:
 - Delaney Burke
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-12-28 00:00:00.000000000 Z
+date: 2024-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sdbm
@@ -66,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.21
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Domain Driven Design Repository