k_domain 0.0.23 → 0.0.28

data/lib/k_domain/schemas/domain.rb

@@ -5,6 +5,14 @@ module KDomain
   module Schemas
     class Domain < Dry::Struct
       class Model < Dry::Struct
+        class Relationship < KDomain::Schemas::RailsStructure::NameOptsType
+          attribute :relation_type , Types::Coercible::Symbol
+
+          def to_s
+            "#{relation_type}: :#{name} fk: #{opts[:foreign_key]}"
+          end
+        end
+
         class Column < Dry::Struct
           attribute :name                 , Types::Strict::String                         #  "source_account_id"
           attribute :name_plural          , Types::Strict::String                         #  "source_account_ids"
@@ -17,35 +25,62 @@ module KDomain
           attribute :array                , Types::Strict::Bool.optional.default(nil)     #  null
 
           # Calculated value
-          attribute :structure_type       , Types::Coercible::Symbol #
-          # attribute :foreign_key          , Types::Strict::Bool.optional.default(nil)     #
-          # attribute :foreign_table        , Types::Strict::String                         #
-          # attribute :foreign_table_plural , Types::Strict::String                         #
+          attribute :structure_type       , Types::Coercible::Symbol
 
-          # def data_column
-          #   @columns_data ||= structure_type?(:data)
-          # end
-
-          # def structure_type?(*structure_types)
-          #   structure_types.include?(column.structure_type)
-          # end
+          # Any column may have a bunch of related models using various relationship types (belong_to, has_one, has_many etc...)
+          attr_accessor :relationships
 
           def db_type
             return @db_type if defined? @db_type
 
-            @db_type = DB_TYPE[type] || '******'
+            @db_type = KDomain::Schemas::DB_TYPE[type] || '******'
           end
 
           def ruby_type
             return @ruby_type if defined? @ruby_type
 
-            @ruby_type = RUBY_TYPE[type] || '******'
+            @ruby_type = KDomain::Schemas::RUBY_TYPE[type] || '******'
           end
 
           def csharp_type
             return @csharp_type if defined? @csharp_type
 
-            @csharp_type = CSHARP_TYPE[type] || '******'
+            @csharp_type = KDomain::Schemas::CSHARP_TYPE[type] || '******'
+          end
+
+          def to_h
+            {
+              name: name,
+              name_plural: name_plural,
+              type: type,
+              precision: precision,
+              scale: scale,
+              default: default,
+              default_as_code: value_as_code(default),
+              null: null,
+              null_as_code: value_as_code(null), # handlebars does not like null property name
+              limit: limit,
+              array: array,
+              array_as_code: value_as_code(array),
+              db_type: db_type,
+              ruby_type: ruby_type,
+              csharp_type: csharp_type,
+              structure_type: structure_type,
+              relationships: relationships
+            }
+          end
+
+          private
+
+          def value_as_code(value)
+            return value if value.nil?
+
+            case value
+            when String # , Hash
+              "'#{value}'"
+            else
+              value.to_s
+            end
           end
         end
 
@@ -53,6 +88,10 @@ module KDomain
           attribute :name               , Types::Strict::String.optional.default(nil)
           attribute :type               , Types::Strict::String.optional.default(nil)
           attribute :exist              , Types::Strict::Bool
+
+          def exist?
+            exist
+          end
         end
 
         attribute :name                 , Types::Strict::String
@@ -64,6 +103,9 @@ module KDomain
         attribute :columns              , Types::Strict::Array.of(KDomain::Schemas::Domain::Model::Column)
         attribute :file                 , Types::Strict::String.optional.default(nil)
 
+        # Link <KDomain::Schemas::RailsStructure::Model> to the domain model
+        attr_accessor :rails_model
+
         def ruby?
           file && File.exist?(file)
         end
@@ -72,43 +114,43 @@ module KDomain
           pk.exist
         end
 
+        def create_update_timestamp?
+          names = columns_timestamp.map(&:name)
+
+          (names & %w[created_at updated_at]).any?
+        end
+
+        # Custom model configurations such as main_key and traits
+        def config
+          @config ||= KDomain.configuration.find_model(name.to_sym)
+        end
+
         # If filled in, the model has a main field that is useful for rendering and may be used for unique constraint, may also be called display_name
         def main_key
-          @main_key ||= MainKey.lookup(name, columns_data)
+          @main_key ||= config.main_key || KDomain.configuration.fallback_key(columns_data)
         end
 
         def traits
-          @traits ||= Traits.lookup(name)
+          config.traits
         end
 
-        # def where()
-        # end
-
-        # def columns_where()
-        # end
-
-        # Column filters
-
         def columns_data
           @columns_data ||= columns_for_structure_types(:data)
         end
 
-        # def columns_data_optional
-        #   @columns_data_optional ||= columns_for_structure_types(:data).select { |c| true }
-        # end
-
-        # def columns_data_required
-        #   @columns_data_required ||= columns_for_structure_types(:data).select { |c| false }
-        # end
-
         def columns_primary
           @columns_primary ||= columns_for_structure_types(:primary_key)
         end
 
-        def columns_foreign
+        def columns_foreign_key
           @columns_foreign ||= columns_for_structure_types(:foreign_key)
         end
 
+        # polymorphic foreign keys
+        def columns_foreign_type
+          @columns_foreign_type ||= columns_for_structure_types(:foreign_type)
+        end
+
         def columns_timestamp
           @columns_data_timestamp ||= columns_for_structure_types(:timestamp)
         end
@@ -118,11 +160,11 @@ module KDomain
         end
 
         def columns_virtual
-          @columns_virtual ||= columns_for_structure_types(:timestamp, :deleted_at)
+          @columns_virtual ||= columns_for_structure_types(:foreign_type, :timestamp, :deleted_at)
         end
 
         def columns_data_foreign
-          @columns_data_foreign ||= columns_for_structure_types(:data, :foreign_key)
+          @columns_data_foreign ||= columns_for_structure_types(:data, :foreign_key, :foreign_type)
         end
         alias rows_fields_and_fk columns_data_foreign
 
@@ -132,12 +174,12 @@ module KDomain
         alias rows_fields_and_pk columns_data_primary
 
         def columns_data_virtual
-          @columns_data_virtual ||= columns_for_structure_types(:data, :timestamp, :deleted_at)
+          @columns_data_virtual ||= columns_for_structure_types(:data, :foreign_type, :timestamp, :deleted_at)
         end
         alias rows_fields_and_virtual columns_data_virtual
 
         def columns_data_foreign_virtual
-          @columns_data_foreign_virtual ||= columns_for_structure_types(:data, :foreign_key, :timestamp, :deleted_at)
+          @columns_data_foreign_virtual ||= columns_for_structure_types(:data, :foreign_key, :foreign_type, :timestamp, :deleted_at)
         end
 
         private
@@ -148,7 +190,6 @@ module KDomain
       end
 
       attribute :models , Types::Strict::Array.of(KDomain::Schemas::Domain::Model)
-      # attribute :erd_files            , Types::Strict::Array.of(KDomain::DomainModel::ErdFile)
     end
   end
 end

data/lib/k_domain/schemas/{domain/_.rb → domain_types.rb}

@@ -1,14 +1,7 @@
 # frozen_string_literal: true
 
-# log.warn 'models->domain' if AppDebug.require?
-
-require_relative './models/column'
-require_relative './models/model'
-require_relative './erd_file'
-require_relative './domain'
-
 module KDomain
-  module DomainModel
+  module Schemas
     RUBY_TYPE = {
       text: 'String',
       string: 'String',

data/lib/k_domain/schemas/{domain_model.rb → main_dataset.rb}

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-# DomainModel holds the entire domain model including database and ancillary information
+# MainDataset holds the entire domain model including database and ancillary information
 module KDomain
   module Schemas
-    class DomainModel < Dry::Struct
+    class MainDataset < Dry::Struct
       attribute :domain           , KDomain::Schemas::Domain
       attribute :database         , KDomain::Schemas::Database
       attribute :dictionary       , KDomain::Schemas::Dictionary

data/lib/k_domain/schemas/rails_structure.rb

@@ -51,6 +51,16 @@ module KDomain
         attribute :attr_accessor?             , Types::Array.of(Types::Strict::String)
         attribute :attr_reader?               , Types::Array.of(Types::Strict::String)
         attribute :attr_writer?               , Types::Array.of(Types::Strict::String)
+
+        # Not sure if I need to do a behaviours by column names
+        # def belongs_to_by(foreign_key: )
+        # end
+        # def has_one_by(foreign_key: )
+        # end
+        # def has_many_by(foreign_key: )
+        # end
+        # def has_and_belongs_to_many_to_by(foreign_key: )
+        # end
       end
 
       class Method < Dry::Struct

data/lib/k_domain/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module KDomain
-  VERSION = '0.0.23'
+  VERSION = '0.0.28'
 end

data/lib/k_domain.rb

@@ -5,13 +5,16 @@ require 'dry-struct'
 require 'k_log'
 require 'peeky'
 require 'k_domain/version'
+require 'k_domain/config/_'
 require 'k_domain/schemas/_'
 require 'k_domain/raw_db_schema/transform'
 require 'k_domain/raw_db_schema/load'
 require 'k_domain/domain_model/transform'
 require 'k_domain/domain_model/transform_steps/_'
 require 'k_domain/domain_model/load'
+require 'k_domain/domain_model/build_rich_models'
 require 'k_domain/rails_code_extractor/_'
+require 'k_domain/queries/_'
 
 # # This is useful if you want to initialize structures via Hash
 # class SymbolizeStruct < Dry::Struct
@@ -19,6 +22,8 @@ require 'k_domain/rails_code_extractor/_'
 # end
 
 module KDomain
+  extend KDomain::Config
+
   # raise KDomain::Error, 'Sample message'
   class Error < StandardError; end
 
@@ -35,7 +40,7 @@ module KDomain
   # Your code goes here...
 end
 
-if ENV['KLUE_DEBUG']&.to_s&.downcase == 'true'
+if ENV.fetch('KLUE_DEBUG', 'false').downcase == 'true'
   namespace = 'KDomain::Version'
   file_path = $LOADED_FEATURES.find { |f| f.include?('k_domain/version') }
   version = KDomain::VERSION.ljust(9)

data/templates/custom/action_controller.rb

@@ -3,34 +3,5 @@ module ActionController
     def self.require(require)
       add(:require, require)
     end
-    # def self.rescue_from(type)#, &block)
-    #   # block_source = nil
-    #   # block_source = lambda_source(block, 'default_scope') if block_given?
-
-    #   add(:rescue_from, {
-    #         type: type#,
-    #         # block: block_source
-    #       })
-    # end
-    # def self.helper_method(*names)
-    #   add(:helper_method, {
-    #         names: names
-    #       })
-    # end
-    # def self.helper(name)
-    #   add(:helper, {
-    #         name: name
-    #       })
-    # end
-    # def self.http_basic_authenticate_with(**opts)
-    #   add(:http_basic_authenticate_with, {
-    #         opts: opts
-    #       })
-    # end
-    # def self.protect_from_forgery(**opts)
-    #   add(:protect_from_forgery, {
-    #         opts: opts
-    #       })
-    # end
   end
 end

data/templates/custom/controller_interceptors.rb

@@ -10,18 +10,14 @@ class Rails
     )
   end
 end
-class RegionConfig
-  def self.require_value(*_p, **_o, &block); end
-end
-
 class ApplicationController < ActionController::Base
+  def self.require(*_p, **_o); end
 end
 
 module Admin
   class BaseController < ActionController::Base
   end
 end
-
 module Api
   module V1
     class BaseController < ActionController::Base
@@ -38,12 +34,18 @@ module Portal
   class BaseController < ApplicationController
   end
 end
-
 module ActiveRecord
   class RecordNotFound
   end
 end
-
+class RegionConfig < ActiveRecord::Base
+  def self.require_value(*_p, **_o, &block)
+    return 'ABC'
+  end
+  def self.get_value
+    return 'ABC'
+  end
+end
 module Aws
   class Credentials
     def initialize(*_p, **_o, &block); end

data/templates/custom/model_interceptors.rb

@@ -11,11 +11,32 @@ module ActsAsCommentable
   end
 end
 
+
 module Scopes
   module CompanyScopes
   end
 end
 
+module DeIdentifiable
+  def deidentifiable(*_p, **_o); end
+end
+
+class Company < ActiveRecord::Base
+  extend DeIdentifiable
+end
+class Estimate < ActiveRecord::Base
+  extend DeIdentifiable
+end
+class Invoice < ActiveRecord::Base
+  extend DeIdentifiable
+end
+class Address < ActiveRecord::Base
+  extend DeIdentifiable
+end
+class Contact < ActiveRecord::Base
+  extend DeIdentifiable
+end
+
 class Thread
   def initialize(*_p, **_o, &block); end
 end
@@ -41,17 +62,41 @@ module ApiLoggable; end
 module Excludable; end
 module Bookmarkable; end
 module Categorizable; end
-module PgSearch; end
+module PgSearch
+  module Model
+  end
+end
 module Excludable; end
-module JsonbStore; end
+module JsonbStore
+  def self.included(klass)
+    klass.extend(ClassMethods)
+  end
 
+  module ClassMethods
+    def jsonb_store(*_p, **_o); end
+  end
+end
 module ActionView
   module Helpers
     module NumberHelper
     end
   end
 end
-
+module PrintSpeak
+  class Application
+    def self.google_oath_secret_key
+      'ABC'
+    end
+  end
+end
+class RegionConfig < ActiveRecord::Base
+  def self.require_value(*_p, **_o, &block)
+    'ABC'
+  end
+  def self.get_value
+    return 'ABC'
+  end
+end
 module RailsUpgrade
   def rails4?
     true

data/templates/rails/active_record.rb

@@ -4,6 +4,8 @@ module ActiveRecord
   class Base
     extend RubyCodeExtractor::BehaviourAccessors
 
+    def self.require(*_p, **_o); end
+
     def self.singleton_class
       Class.new do
         def send(*_p, **_o); end

data/templates/sample_config.rb

@@ -0,0 +1,47 @@
+KDomain.configure do |config|
+  config.default_main_key  = nil
+  config.default_traits    = %i[
+    trait1
+    trait2
+    trait3
+  ]
+
+  config.fallback_keys              = %i[
+    name
+    category
+    description
+    global
+    key
+    klass
+    message
+    lead_source
+    body
+    status
+    subject
+  ]
+
+  config.register_entity(:action_log              , main_key: :action)
+  config.register_entity(:backup                  , main_key: :filename)
+  config.register_entity(:campaign_calendar_entry , main_key: :date)
+  config.register_entity(:campaign_count          , main_key: :total_count)
+  config.register_entity(:comment                 , main_key: :title)
+  config.register_entity(:contact_group           , main_key: :email)
+  config.register_entity(:email_alias             , main_key: :email)
+  config.register_entity(:unsubscribe             , main_key: :email)
+  config.register_entity(:email_credential        , main_key: :credentials)
+  config.register_entity(:email_soft_bounce       , main_key: :email_address)
+  config.register_entity(:suppressed_address      , main_key: :email_address)
+  config.register_entity(:email_template_value    , main_key: :value)
+  config.register_entity(:email_validation        , main_key: :address)
+  config.register_entity(:enterprise_togglefield  , main_key: :field)
+  config.register_entity(:event_stat              , main_key: :event_type)
+  config.register_entity(:holiday_date            , main_key: :date)
+  config.register_entity(:job_stat                , main_key: :job_name)
+  config.register_entity(:original_user           , main_key: :target_user_id)
+  config.register_entity(:pending_attachment      , main_key: :file_name)
+  config.register_entity(:sales_base_tax          , main_key: :total)
+  config.register_entity(:shared_user             , main_key: :shared_id)
+  config.register_entity(:task_repeat             , main_key: :repeat_type)
+  config.register_entity(:user                    , main_key: :username)
+  config.register_entity(:token                   , main_key: :gmail_history_id)
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: k_domain
 version: !ruby/object:Gem::Version
-  version: 0.0.23
+  version: 0.0.28
 platform: ruby
 authors:
 - David Cruwys
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-30 00:00:00.000000000 Z
+date: 2022-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -74,8 +74,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".builders/config/_.rb"
-- ".builders/setup.rb"
+- ".builders/boot.rb"
+- ".builders/generators/configuration_generator.rb"
+- ".builders/run.rb"
 - ".github/workflows/main.yml"
 - ".gitignore"
 - ".rspec"
@@ -97,6 +98,10 @@ files:
 - hooks/update-version
 - k_domain.gemspec
 - lib/k_domain.rb
+- lib/k_domain/config/_.rb
+- lib/k_domain/config/config.rb
+- lib/k_domain/config/configuration.rb
+- lib/k_domain/domain_model/build_rich_models.rb
 - lib/k_domain/domain_model/load.rb
 - lib/k_domain/domain_model/transform.rb
 - lib/k_domain/domain_model/transform_steps/_.rb
@@ -109,6 +114,9 @@ files:
 - lib/k_domain/domain_model/transform_steps/step6_rails_structure_models.rb
 - lib/k_domain/domain_model/transform_steps/step7_rails_structure_controllers.rb
 - lib/k_domain/domain_model/transform_steps/step8_domain_columns.rb
+- lib/k_domain/queries/_.rb
+- lib/k_domain/queries/base_query.rb
+- lib/k_domain/queries/domain_model_query.rb
 - lib/k_domain/rails_code_extractor/_.rb
 - lib/k_domain/rails_code_extractor/extract_controller.rb
 - lib/k_domain/rails_code_extractor/extract_model.rb
@@ -119,7 +127,6 @@ files:
 - lib/k_domain/schemas/database.rb
 - lib/k_domain/schemas/dictionary.rb
 - lib/k_domain/schemas/domain.rb
-- lib/k_domain/schemas/domain/_.rb
 - lib/k_domain/schemas/domain/erd_file.rb
 - lib/k_domain/schemas/domain/old/belongs_to.rb
 - lib/k_domain/schemas/domain/old/column_old.rb
@@ -137,8 +144,9 @@ files:
 - lib/k_domain/schemas/domain/old/statistics.rb
 - lib/k_domain/schemas/domain/old/validate.rb
 - lib/k_domain/schemas/domain/old/validates.rb
-- lib/k_domain/schemas/domain_model.rb
+- lib/k_domain/schemas/domain_types.rb
 - lib/k_domain/schemas/investigate.rb
+- lib/k_domain/schemas/main_dataset.rb
 - lib/k_domain/schemas/rails_resource.rb
 - lib/k_domain/schemas/rails_structure.rb
 - lib/k_domain/version.rb
@@ -146,12 +154,11 @@ files:
 - templates/custom/controller_interceptors.rb
 - templates/custom/model_interceptors.rb
 - templates/load_schema.rb
-- templates/old_printspeek_schema copy.rb
-- templates/old_printspeek_schema.rb
 - templates/rails/action_controller.rb
 - templates/rails/active_record.rb
 - templates/ruby_code_extractor/attach_class_info.rb
 - templates/ruby_code_extractor/behaviour_accessors.rb
+- templates/sample_config.rb
 - templates/simple/controller_interceptors.rb
 homepage: http://appydave.com/gems/k-domain
 licenses:
@@ -168,14 +175,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: K Domain builds complex domain schemas by combining the database schema with

data/.builders/config/_.rb

@@ -1,3 +0,0 @@
-puts '_'
-
-#require 'config/_initialize'

data/.builders/setup.rb

@@ -1,30 +0,0 @@
-require 'config/_'
-require_relative "../lib/k_domain"
-
-db_schema_ruby_file = '/Users/davidcruwys/dev/printspeak/printspeak-master/db/schema.rb'
-
-# /Users/davidcruwys/dev/printspeak/printspeak/.builders/config/raw/schema_printspeak.rb
-output_folder = File.expand_path('../.output')
-db_schema_json_file = File.join(output_folder, 'db_schema.json')
-schema_loader_file = File.join(output_folder, 'schema_printspeak.rb')
-
-transformer = KDomain::RawDbSchema::Transform.new(db_schema_ruby_file)
-transformer.template_file = '/Users/davidcruwys/dev/kgems/k_domain/templates/old_printspeek_schema.rb'
-puts db_schema_ruby_file
-puts transformer.template_file
-transformer.call
-transformer.write_json(db_schema_json_file)
-transformer.write_schema_loader(schema_loader_file)
-# transformer.schema
-
-
-# transform = KDomain::DomainModel::Transform.new(
-#   db_schema: db_schema,
-#   target_file: target_file,
-#   target_step_file: target_step_file,
-#   model_path: model_path,
-#   controller_path: controller_path,
-#   route_path: route_path
-# )
-
-puts 'done'