k_domain 0.0.2 → 0.0.5

data/lib/k_domain/raw_db_schema/dtos/index.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module KDomain
+  module RawDbSchema
+    class Index < Dry::Struct
+      attribute :name                 , Types::Strict::String
+      attribute :fields               , Types::Nominal::Any.optional.default('xxxxx1')
+      attribute :using                , Types::Nominal::String
+      attribute :order?               , Types::Nominal::Hash
+      attribute :where?               , Types::Nominal::Any.optional.default(nil)
+      attribute :unique? , Types::Nominal::Any.optional.default(nil)
+    end
+  end
+end

data/lib/k_domain/raw_db_schema/dtos/schema.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module KDomain
+  module RawDbSchema
+    class Schema < Dry::Struct
+      class Meta < Dry::Struct
+        attribute :rails                , Types::Strict::Integer
+        attribute :database             , KDomain::RawDbSchema::Database
+        attribute :unique_keys          , Types::Strict::Array.of(KDomain::RawDbSchema::UniqueKey)
+      end
+
+      attribute :tables               , Types::Strict::Array.of(KDomain::RawDbSchema::Table)
+      attribute :foreign_keys?        , Types::Strict::Array.of(KDomain::RawDbSchema::ForeignKey)
+      attribute :indexes?             , Types::Strict::Array.of(KDomain::RawDbSchema::Index)
+      attribute :meta                 , KDomain::RawDbSchema::Schema::Meta
+    end
+  end
+end

data/lib/k_domain/raw_db_schema/dtos/table.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module KDomain
+  module RawDbSchema
+    class Table < Dry::Struct
+      class Meta < Dry::Struct
+        attribute :primary_key          , Types::Nominal::Any.optional.default(nil)
+        attribute :id                   , Types::Nominal::Any.optional.default(nil)
+        attribute :force                , Types::Nominal::Any.optional.default(nil)
+      end
+
+      attribute :name                 , Types::Strict::String
+      attribute :primary_key          , Types::Strict::String.optional.default(nil)
+      attribute :primary_key_type     , Types::Strict::String.optional.default(nil)
+      attribute :id?                  , Types::Nominal::Any.optional.default(nil) # Types::Strict::String.optional.default(nil)
+      attribute :columns              , Types::Strict::Array.of(KDomain::RawDbSchema::Column)
+      attribute :indexes              , Types::Strict::Array.of(KDomain::RawDbSchema::Index)
+      attribute :rails_schema         , KDomain::RawDbSchema::Table::Meta
+    end
+  end
+end

data/lib/k_domain/raw_db_schema/dtos/unique_key.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module KDomain
+  module RawDbSchema
+    # Keep a track of unique keys that appear in the data structures
+    # so that we can track what new attributes to add to the models
+    class UniqueKey < Dry::Struct
+      attribute :type                 , Types::Strict::String
+      attribute :category             , Types::Strict::String.optional
+      attribute :key                  , Types::Strict::String
+      attribute :keys                 , Types::Strict::Array
+    end
+  end
+end

data/lib/k_domain/raw_db_schema/load.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+# Annotates the original schema with methods that implement existing method calls
+# that are already in the schema so that we can build a hash.
+#
+# Writes a new annotated schema.rb file with a public method called load that
+# builds the hash
+
+module KDomain
+  module RawDbSchema
+    class Load
+      include KLog::Logging
+
+      attr_reader :source_file
+      attr_reader :data
+
+      def initialize(source_file)
+        @source_file = source_file
+      end
+
+      def call
+        json = File.read(source_file)
+        data = KUtil.data.json_parse(json, as: :hash_symbolized)
+
+        @data = KDomain::RawDbSchema::Schema.new(data)
+      end
+    end
+  end
+end

data/lib/k_domain/{raw_schema → raw_db_schema}/transform.rb

@@ -1,24 +1,25 @@
+# frozen_string_literal: true
+
 # Annotates the original schema with methods that implement existing method calls
 # that are already in the schema so that we can build a hash.
 #
 # Writes a new annotated schema.rb file with a public method called load that
 # builds the hash
-# frozen_string_literal: true
-
 module KDomain
-  module RawSchema
+  module RawDbSchema
     class Transform
       include KLog::Logging
 
       attr_reader :source_file
       attr_reader :template_file
-      attr_reader :target_ruby_class
-    
-      def initialize(source_file)#, target_file)
+      attr_reader :schema_loader
+
+      # , target_file)
+      def initialize(source_file)
         @source_file = source_file
-        @template_file = 'lib/k_domain/raw_schema/template.rb'
+        @template_file = 'lib/k_domain/raw_db_schema/template.rb'
       end
- 
+
       def call
         # log.kv 'source_file', source_file
         # log.kv 'template_file', template_file
@@ -31,37 +32,52 @@ module KDomain
         content
           .gsub!(/ActiveRecord::Schema.define/, 'load')
 
-        lines = content.lines.map { |line| "    #{line}" }.join()
+        lines = content.lines.map { |line| "    #{line}" }.join
 
-        @target_ruby_class = File
-          .read(template_file)
-          .gsub('{{source_file}}', source_file)
-          .gsub('{{rails_schema}}', lines)
+        @schema_loader = File
+                         .read(template_file)
+                         .gsub('{{source_file}}', source_file)
+                         .gsub('{{rails_schema}}', lines)
       end
 
-      def write_target(target_file)
-        if target_ruby_class.nil?
+      # rename to target_ruby
+      # This is an internal ruby structure that is evaluated
+      # writing is only needed for debugging purposes
+      def write_schema_loader(target_file)
+        if schema_loader.nil?
           puts '.call method has not been executed'
           return
         end
 
         FileUtils.mkdir_p(File.dirname(target_file))
-        File.write(target_file, target_ruby_class)
+        File.write(target_file, schema_loader)
       end
 
-      def json
-        if target_ruby_class.nil?
+      def write_json(json_file)
+        if schema_loader.nil?
+          puts '.call method has not been executed'
+          return
+        end
+
+        FileUtils.mkdir_p(File.dirname(json_file))
+        File.write(json_file, JSON.pretty_generate(schema))
+      end
+
+      # rubocop:disable Security/Eval
+      def schema
+        if schema_loader.nil?
           puts '.call method has not been executed'
           return
         end
 
         # load target_file
-        eval target_ruby_class
-    
+        eval schema_loader
+
         loader = LoadSchema.new
-        loader.load_schema()
+        loader.load_schema
         loader.schema
       end
+      # rubocop:enable Security/Eval
     end
   end
 end

data/lib/k_domain/version.rb

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

data/lib/k_domain.rb

@@ -1,8 +1,21 @@
 # frozen_string_literal: true
 
+require 'active_support/core_ext/string'
+require 'dry-struct'
 require 'k_log'
 require 'k_domain/version'
-require 'k_domain/raw_schema/transform'
+require 'k_domain/raw_db_schema/dtos/_'
+require 'k_domain/raw_db_schema/transform'
+require 'k_domain/raw_db_schema/load'
+require 'k_domain/domain_model/dtos/_'
+require 'k_domain/domain_model/transform'
+require 'k_domain/domain_model/transform_steps/_'
+require 'k_domain/domain_model/load'
+
+# # This is useful if you want to initialize structures via Hash
+# class SymbolizeStruct < Dry::Struct
+#   transform_keys(&:to_sym)
+# end
 
 module KDomain
   # raise KDomain::Error, 'Sample message'

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: k_domain
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.5
 platform: ruby
 authors:
 - David Cruwys
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-26 00:00:00.000000000 Z
+date: 2021-09-28 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6'
+- !ruby/object:Gem::Dependency
+  name: dry-struct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: k_log
   requirement: !ruby/object:Gem::Requirement
@@ -53,8 +81,50 @@ files:
 - hooks/update-version
 - k_domain.gemspec
 - lib/k_domain.rb
-- lib/k_domain/raw_schema/template.rb
-- lib/k_domain/raw_schema/transform.rb
+- lib/k_domain/domain_model/dtos/_.rb
+- lib/k_domain/domain_model/dtos/belongs_to.rb
+- lib/k_domain/domain_model/dtos/column_old.rb
+- lib/k_domain/domain_model/dtos/dictionary/dictionary.rb
+- lib/k_domain/domain_model/dtos/domain.rb
+- lib/k_domain/domain_model/dtos/domain_statistics.rb
+- lib/k_domain/domain_model/dtos/entity.rb
+- lib/k_domain/domain_model/dtos/entity_statistics.rb
+- lib/k_domain/domain_model/dtos/foreign_key.rb
+- lib/k_domain/domain_model/dtos/has_and_belongs_to_many.rb
+- lib/k_domain/domain_model/dtos/has_many.rb
+- lib/k_domain/domain_model/dtos/has_one.rb
+- lib/k_domain/domain_model/dtos/investigate/investigate.rb
+- lib/k_domain/domain_model/dtos/investigate/issue.rb
+- lib/k_domain/domain_model/dtos/models/column.rb
+- lib/k_domain/domain_model/dtos/models/model.rb
+- lib/k_domain/domain_model/dtos/name_options.rb
+- lib/k_domain/domain_model/dtos/rails_controller.rb
+- lib/k_domain/domain_model/dtos/rails_model.rb
+- lib/k_domain/domain_model/dtos/related_entity.rb
+- lib/k_domain/domain_model/dtos/schema.rb
+- lib/k_domain/domain_model/dtos/statistics.rb
+- lib/k_domain/domain_model/dtos/validate.rb
+- lib/k_domain/domain_model/dtos/validates.rb
+- lib/k_domain/domain_model/load.rb
+- lib/k_domain/domain_model/transform.rb
+- lib/k_domain/domain_model/transform_steps/_.rb
+- lib/k_domain/domain_model/transform_steps/step.rb
+- lib/k_domain/domain_model/transform_steps/step1_attach_db_schema.rb
+- lib/k_domain/domain_model/transform_steps/step2_attach_models.rb
+- lib/k_domain/domain_model/transform_steps/step3_attach_columns.rb
+- lib/k_domain/domain_model/transform_steps/step4_attach_erd_files.rb
+- lib/k_domain/domain_model/transform_steps/step5_attach_dictionary.rb
+- lib/k_domain/raw_db_schema/dtos/_.rb
+- lib/k_domain/raw_db_schema/dtos/column.rb
+- lib/k_domain/raw_db_schema/dtos/database.rb
+- lib/k_domain/raw_db_schema/dtos/foreign_key.rb
+- lib/k_domain/raw_db_schema/dtos/index.rb
+- lib/k_domain/raw_db_schema/dtos/schema.rb
+- lib/k_domain/raw_db_schema/dtos/table.rb
+- lib/k_domain/raw_db_schema/dtos/unique_key.rb
+- lib/k_domain/raw_db_schema/load.rb
+- lib/k_domain/raw_db_schema/template.rb
+- lib/k_domain/raw_db_schema/transform.rb
 - lib/k_domain/version.rb
 homepage: http://appydave.com/gems/k-domain
 licenses: