activerecord-dbt 0.3.0 → 0.4.0

data/lib/active_record/dbt/column/{column.rb → yml.rb}

@@ -3,30 +3,30 @@
 module ActiveRecord
   module Dbt
     module Column
-      class Column
+      class Yml
         include ActiveRecord::Dbt::DataType::Mapper
         include ActiveRecord::Dbt::I18nWrapper::Translate
 
-        attr_reader :table_name, :column, :column_test, :primary_keys
+        attr_reader :table_name, :column, :column_data_test, :primary_keys
 
         delegate :name, :comment, to: :column, prefix: true
         delegate :source_config, to: :@config
 
-        def initialize(table_name, column, column_test, primary_keys: [])
+        def initialize(table_name, column, column_data_test, primary_keys: [])
           @table_name = table_name
           @column = column
-          @column_test = column_test
+          @column_data_test = column_data_test
           @primary_keys = primary_keys
           @config = ActiveRecord::Dbt::Config.instance
         end
 
-        def config
+        def properties
           {
             'name' => column_name,
             'description' => description,
             'data_type' => data_type(column.type),
-            **column_overrides.except(:tests),
-            'tests' => column_test.config
+            **column_overrides.except(:data_tests),
+            'data_tests' => column_data_test.properties
           }.compact
         end
 

data/lib/active_record/dbt/configuration/i18n_configuration.rb

@@ -5,7 +5,7 @@ module ActiveRecord
     module Configuration
       module I18nConfiguration
         def locale=(locale = I18n.locale)
-          I18n.load_path += Dir[Rails.root.join('config/locales/**/*.{rb,yml}')]
+          I18n.load_path += Rails.root.glob('config/locales/**/*.{rb,yml}')
           I18n.locale = locale
         end
       end

data/lib/active_record/dbt/dbt_package/dbt_utils/table/{testable/unique_combination_of_columns_testable.rb → data_testable/unique_combination_of_columns_data_testable.rb}

@@ -5,8 +5,8 @@ module ActiveRecord
     module DbtPackage
       module DbtUtils
         module Table
-          module Testable
-            module UniqueCombinationOfColumnsTestable
+          module DataTestable
+            module UniqueCombinationOfColumnsDataTestable
               extend ActiveRecord::Dbt::RequiredMethods
 
               define_required_methods :table_name, :@config

data/lib/active_record/dbt/dbt_package/dbterd/column/{testable → data_testable}/relationships_meta_relationship_type.rb

@@ -5,7 +5,7 @@ module ActiveRecord
     module DbtPackage
       module Dbterd
         module Column
-          module Testable
+          module DataTestable
             module RelationshipsMetaRelationshipType
               extend ActiveRecord::Dbt::RequiredMethods
 
@@ -89,7 +89,7 @@ module ActiveRecord
               end
 
               def association_klass(association)
-                association.klass
+                association.class_name.constantize
               rescue NoMethodError
                 association.options.fetch(:through).to_s.classify.constantize
               end

data/lib/active_record/dbt/factory/columns/yml_factory.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module ActiveRecord
+  module Dbt
+    module Factory
+      module Columns
+        module YmlFactory
+          def self.build(
+            table_name,
+            primary_keys: ActiveRecord::Base.connection.primary_keys(table_name),
+            foreign_keys: ActiveRecord::Base.connection.foreign_keys(table_name)
+          )
+            ActiveRecord::Base.connection.columns(table_name).map do |column|
+              column_data_test = ActiveRecord::Dbt::Column::DataTest.new(
+                table_name,
+                column,
+                primary_keys: primary_keys,
+                foreign_keys: foreign_keys
+              )
+
+              ActiveRecord::Dbt::Column::Yml.new(
+                table_name,
+                column,
+                column_data_test,
+                primary_keys: primary_keys
+              )
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/active_record/dbt/factory/model/staging/yml_factory.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module ActiveRecord
+  module Dbt
+    module Factory
+      module Model
+        module Staging
+          module YmlFactory
+            def self.build(table_name)
+              table_factory = ActiveRecord::Dbt::Factory::Table::YmlFactory.build(table_name)
+              yml = ActiveRecord::Dbt::Model::Staging::Yml.new(table_factory)
+              struct = Struct.new(:export_path, :dump, keyword_init: true)
+
+              struct.new(
+                export_path: yml.export_path,
+                dump: yml.dump
+              )
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/active_record/dbt/factory/source/yml_factory.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module ActiveRecord
+  module Dbt
+    module Factory
+      module Source
+        module YmlFactory
+          def self.build
+            tables_factory = ActiveRecord::Dbt::Factory::Tables::YmlFactory.build
+
+            ActiveRecord::Dbt::Source::Yml.new(tables_factory)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/active_record/dbt/factory/table/yml_factory.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module ActiveRecord
+  module Dbt
+    module Factory
+      module Table
+        module YmlFactory
+          def self.build(table_name)
+            table_data_test = ActiveRecord::Dbt::Table::DataTest.new(table_name)
+            columns = ActiveRecord::Dbt::Factory::Columns::YmlFactory.build(table_name)
+
+            ActiveRecord::Dbt::Table::Yml.new(table_name, table_data_test, columns)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/active_record/dbt/factory/tables/yml_factory.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module ActiveRecord
+  module Dbt
+    module Factory
+      module Tables
+        module YmlFactory
+          def self.build
+            ActiveRecord::Base.connection.tables.sort.map do |table_name|
+              ActiveRecord::Dbt::Factory::Table::YmlFactory.build(table_name)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/active_record/dbt/model/staging/base.rb

@@ -36,7 +36,7 @@ module ActiveRecord
           private
 
           def basename
-            "#{export_directory_path}/#{model_name}"
+            "#{export_directory_path}/models/staging/#{source_name}/#{model_name}"
           end
 
           def model_name

data/lib/active_record/dbt/model/staging/yml.rb

@@ -22,18 +22,18 @@ module ActiveRecord
           end
 
           def dump
-            YAML.dump(model_config.deep_stringify_keys)
+            YAML.dump(properties.deep_stringify_keys)
           end
 
           private
 
-          def model_config
+          def properties
             {
               'version' => 2,
               'models' => [
                 {
                   'name' => model_name,
-                  **table.config.except('name', 'columns'),
+                  **table.properties.except('name', 'columns'),
                   'columns' => override_columns
                 }
               ]
@@ -41,7 +41,7 @@ module ActiveRecord
           end
 
           def columns
-            @columns ||= sort_columns(table.config['columns'])
+            @columns ||= sort_columns(table.properties['columns'])
           end
 
           def sort_columns(columns)
@@ -79,7 +79,7 @@ module ActiveRecord
           end
 
           def add_relationship_test(column)
-            column['tests'].push(relationships_test(column['name']))
+            column['data_tests'].push(relationships_test(column['name']))
           end
 
           def rename_primary_id_in_column(column)

data/lib/active_record/dbt/seed/enum/base.rb

@@ -19,7 +19,7 @@ module ActiveRecord
           private
 
           def basename
-            "#{export_directory_path}/#{seed_name}"
+            "#{export_directory_path}/seeds/#{source_name}/#{seed_name}"
           end
 
           def seed_name

data/lib/active_record/dbt/seed/enum/yml.rb

@@ -5,8 +5,8 @@ module ActiveRecord
     module Seed
       module Enum
         class Yml
-          include ActiveRecord::Dbt::Column::Testable::UniqueTestable
-          include ActiveRecord::Dbt::Column::Testable::NotNullTestable
+          include ActiveRecord::Dbt::Column::DataTestable::UniqueDataTestable
+          include ActiveRecord::Dbt::Column::DataTestable::NotNullDataTestable
           include ActiveRecord::Dbt::DataType::Mapper
           include ActiveRecord::Dbt::I18nWrapper::Translate
           include ActiveRecord::Dbt::Seed::Enum::Base
@@ -20,12 +20,12 @@ module ActiveRecord
           end
 
           def dump
-            YAML.dump(seed_config.deep_stringify_keys)
+            YAML.dump(properties.deep_stringify_keys)
           end
 
           private
 
-          def seed_config
+          def properties
             {
               'version' => 2,
               'seeds' => [
@@ -81,7 +81,7 @@ module ActiveRecord
             {
               'name' => "#{enum_column_name}_before_type_of_cast",
               'description' => translated_attribute_name,
-              'tests' => tests
+              'data_tests' => data_tests
             }.compact
           end
 
@@ -89,7 +89,7 @@ module ActiveRecord
             {
               'name' => "#{enum_column_name}_key",
               'description' => "#{translated_attribute_name}(key)",
-              'tests' => tests
+              'data_tests' => data_tests
             }.compact
           end
 
@@ -99,13 +99,13 @@ module ActiveRecord
                 {
                   'name' => "#{enum_column_name}_#{locale}",
                   'description' => "#{translated_attribute_name}(#{locale})",
-                  'tests' => tests
+                  'data_tests' => data_tests
                 }.compact
               )
             end
           end
 
-          def tests
+          def data_tests
             [
               unique_test,
               not_null_test

data/lib/active_record/dbt/source/yml.rb

@@ -6,20 +6,24 @@ module ActiveRecord
       class Yml
         attr_reader :tables
 
-        delegate :source_config, to: :@config
+        delegate :source_config, :export_directory_path, :source_name, to: :@config
 
         def initialize(tables)
           @tables = tables
           @config = ActiveRecord::Dbt::Config.instance
         end
 
+        def export_path
+          "#{export_directory_path}/models/sources/#{source_name}/src_#{source_name}.yml"
+        end
+
         def dump
-          YAML.dump(config.deep_stringify_keys)
+          YAML.dump(properties.deep_stringify_keys)
         end
 
         private
 
-        def config
+        def properties
           {
             'version' => 2,
             'sources' => [
@@ -33,7 +37,7 @@ module ActiveRecord
         end
 
         def tables_properties
-          tables.map(&:config)
+          tables.map(&:properties)
         end
       end
     end

data/lib/active_record/dbt/table/{test.rb → data_test.rb}

@@ -3,12 +3,12 @@
 module ActiveRecord
   module Dbt
     module Table
-      class Test
-        include ActiveRecord::Dbt::DbtPackage::DbtUtils::Table::Testable::UniqueCombinationOfColumnsTestable
+      class DataTest
+        include ActiveRecord::Dbt::DbtPackage::DbtUtils::Table::DataTestable::UniqueCombinationOfColumnsDataTestable
 
         include ActiveRecord::Dbt::Table::Base
 
-        def config
+        def properties
           [
             *unique_combination_of_columns_test
           ].compact.presence

data/lib/active_record/dbt/table/yml.rb

@@ -7,20 +7,20 @@ module ActiveRecord
         include ActiveRecord::Dbt::I18nWrapper::Translate
         include ActiveRecord::Dbt::Table::Base
 
-        attr_reader :table_test, :columns
+        attr_reader :table_data_test, :columns
 
         delegate :source_config, to: :@config
 
-        def initialize(table_name, table_test, columns)
+        def initialize(table_name, table_data_test, columns)
           super(table_name)
-          @table_test = table_test
+          @table_data_test = table_data_test
           @columns = columns
         end
 
-        def config
+        def properties
           {
             **table_properties,
-            'columns' => columns.map(&:config)
+            'columns' => columns.map(&:properties)
           }.compact
         end
 
@@ -31,7 +31,7 @@ module ActiveRecord
             'name' => table_name,
             'description' => description,
             **table_overrides.except(:columns),
-            'tests' => table_test.config
+            'data_tests' => table_data_test.properties
           }
         end
 

data/lib/active_record/dbt/version.rb

@@ -2,6 +2,6 @@
 
 module ActiveRecord
   module Dbt
-    VERSION = '0.3.0'
+    VERSION = '0.4.0'
   end
 end

data/lib/generators/active_record/dbt/config/templates/source_config.yml.tt

@@ -11,7 +11,7 @@ table_overrides:
     meta: {<dictionary>}
     identifier: <table_name>
     loaded_at_field: <column_name>
-    tests:
+    data_tests:
       - <test>
     tags: [<string>]
     freshness:
@@ -31,7 +31,7 @@ table_overrides:
       <column_name>:
         meta: {<dictionary>}
         quote: true | false
-        tests:
+        data_tests:
           - <test>
         tags: [<string>]
 

data/lib/generators/active_record/dbt/enum/USAGE

@@ -5,5 +5,5 @@ Example:
     bin/rails generate active_record:dbt:enum TABLE_NAME ENUM_COLUMN_NAME
 
     This will create:
-        #{export_directory_path}/seed_#{source_name}__#{table_name_singularize}_enum_#{enum_pluralized}.csv
-        #{export_directory_path}/seed_#{source_name}__#{table_name_singularize}_enum_#{enum_pluralized}.yml
+        #{export_directory_path}/seeds/#{source_name}/seed_#{source_name}__#{table_name_singularize}_enum_#{enum_pluralized}.csv
+        #{export_directory_path}/seeds/#{source_name}/seed_#{source_name}__#{table_name_singularize}_enum_#{enum_pluralized}.yml

data/lib/generators/active_record/dbt/initializer/templates/dbt.rb

@@ -1,11 +1,13 @@
 # frozen_string_literal: true
 
-require 'active_record/dbt'
+if Rails.env.development?
+  require 'active_record/dbt'
 
-ActiveRecord::Dbt.configure do |c|
-  c.config_directory_path = 'lib/dbt'
-  c.export_directory_path = 'doc/dbt'
-  c.dwh_platform = 'bigquery'
-  c.data_sync_delayed = false
-  c.used_dbt_package_names = []
+  ActiveRecord::Dbt.configure do |c|
+    c.config_directory_path = 'lib/dbt'
+    c.export_directory_path = 'doc/dbt'
+    c.dwh_platform = 'bigquery'
+    c.data_sync_delayed = false
+    c.used_dbt_package_names = []
+  end
 end

data/lib/generators/active_record/dbt/source/USAGE

@@ -5,4 +5,4 @@ Example:
     bin/rails generate active_record:dbt:source
 
     This will create:
-        #{export_directory_path}/src_#{source_name}.yml
+        #{export_directory_path}/models/sources/#{source_name}/src_#{source_name}.yml

data/lib/generators/active_record/dbt/source/source_generator.rb

@@ -7,14 +7,13 @@ module ActiveRecord
         source_root File.expand_path('templates', __dir__)
 
         def create_source_yml_file
-          create_file "#{config.export_directory_path}/src_#{config.source_name}.yml",
-                      ActiveRecord::Dbt::Factory::SourceFactory.build
+          create_file yml.export_path, yml.dump
         end
 
         private
 
-        def config
-          @config ||= ActiveRecord::Dbt::Config.instance
+        def yml
+          @yml ||= ActiveRecord::Dbt::Factory::Source::YmlFactory.build
         end
       end
     end

data/lib/generators/active_record/dbt/staging_model/USAGE

@@ -5,5 +5,5 @@ Example:
     bin/rails generate active_record:dbt:staging_model TABLE_NAME
 
     This will create:
-        #{export_directory_path}/stg_#{source_name}__#{table_name}.sql
-        #{export_directory_path}/stg_#{source_name}__#{table_name}.yml
+        #{export_directory_path}/models/staging/#{source_name}/stg_#{source_name}__#{table_name}.sql
+        #{export_directory_path}/models/staging/#{source_name}/stg_#{source_name}__#{table_name}.yml

data/lib/generators/active_record/dbt/staging_model/staging_model_generator.rb

@@ -21,7 +21,7 @@ module ActiveRecord
         end
 
         def yml
-          @yml ||= ActiveRecord::Dbt::Factory::Model::StagingFactory.build(name)
+          @yml ||= ActiveRecord::Dbt::Factory::Model::Staging::YmlFactory.build(name)
         end
 
         def source_paths

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-dbt
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - yamotech
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-14 00:00:00.000000000 Z
+date: 2024-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -64,12 +64,12 @@ files:
 - README.md
 - Rakefile
 - lib/active_record/dbt.rb
-- lib/active_record/dbt/column/column.rb
-- lib/active_record/dbt/column/test.rb
-- lib/active_record/dbt/column/testable/accepted_values_testable.rb
-- lib/active_record/dbt/column/testable/not_null_testable.rb
-- lib/active_record/dbt/column/testable/relationships_testable.rb
-- lib/active_record/dbt/column/testable/unique_testable.rb
+- lib/active_record/dbt/column/data_test.rb
+- lib/active_record/dbt/column/data_testable/accepted_values_data_testable.rb
+- lib/active_record/dbt/column/data_testable/not_null_data_testable.rb
+- lib/active_record/dbt/column/data_testable/relationships_data_testable.rb
+- lib/active_record/dbt/column/data_testable/unique_data_testable.rb
+- lib/active_record/dbt/column/yml.rb
 - lib/active_record/dbt/config.rb
 - lib/active_record/dbt/configuration/data_sync.rb
 - lib/active_record/dbt/configuration/dwh_platform.rb
@@ -79,13 +79,13 @@ files:
 - lib/active_record/dbt/configuration/source.rb
 - lib/active_record/dbt/configuration/used_dbt_package.rb
 - lib/active_record/dbt/data_type/mapper.rb
-- lib/active_record/dbt/dbt_package/dbt_utils/table/testable/unique_combination_of_columns_testable.rb
-- lib/active_record/dbt/dbt_package/dbterd/column/testable/relationships_meta_relationship_type.rb
-- lib/active_record/dbt/factory/columns_factory.rb
-- lib/active_record/dbt/factory/model/staging_factory.rb
-- lib/active_record/dbt/factory/source_factory.rb
-- lib/active_record/dbt/factory/table_factory.rb
-- lib/active_record/dbt/factory/tables_factory.rb
+- lib/active_record/dbt/dbt_package/dbt_utils/table/data_testable/unique_combination_of_columns_data_testable.rb
+- lib/active_record/dbt/dbt_package/dbterd/column/data_testable/relationships_meta_relationship_type.rb
+- lib/active_record/dbt/factory/columns/yml_factory.rb
+- lib/active_record/dbt/factory/model/staging/yml_factory.rb
+- lib/active_record/dbt/factory/source/yml_factory.rb
+- lib/active_record/dbt/factory/table/yml_factory.rb
+- lib/active_record/dbt/factory/tables/yml_factory.rb
 - lib/active_record/dbt/i18n_wrapper/translate.rb
 - lib/active_record/dbt/model/staging/base.rb
 - lib/active_record/dbt/model/staging/sql.rb
@@ -97,7 +97,7 @@ files:
 - lib/active_record/dbt/seed/enum/yml.rb
 - lib/active_record/dbt/source/yml.rb
 - lib/active_record/dbt/table/base.rb
-- lib/active_record/dbt/table/test.rb
+- lib/active_record/dbt/table/data_test.rb
 - lib/active_record/dbt/table/yml.rb
 - lib/active_record/dbt/version.rb
 - lib/generators/active_record/dbt/config/USAGE

data/lib/active_record/dbt/factory/columns_factory.rb

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-module ActiveRecord
-  module Dbt
-    module Factory
-      module ColumnsFactory
-        def self.build(
-          table_name,
-          primary_keys: ActiveRecord::Base.connection.primary_keys(table_name),
-          foreign_keys: ActiveRecord::Base.connection.foreign_keys(table_name)
-        )
-          ActiveRecord::Base.connection.columns(table_name).map do |column|
-            column_test = ActiveRecord::Dbt::Column::Test.new(
-              table_name,
-              column,
-              primary_keys: primary_keys,
-              foreign_keys: foreign_keys
-            )
-
-            ActiveRecord::Dbt::Column::Column.new(
-              table_name,
-              column,
-              column_test,
-              primary_keys: primary_keys
-            )
-          end
-        end
-      end
-    end
-  end
-end

data/lib/active_record/dbt/factory/model/staging_factory.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-module ActiveRecord
-  module Dbt
-    module Factory
-      module Model
-        module StagingFactory
-          def self.build(table_name)
-            table_factory = ActiveRecord::Dbt::Factory::TableFactory.build(table_name)
-            yml = ActiveRecord::Dbt::Model::Staging::Yml.new(table_factory)
-            struct = Struct.new(:export_path, :dump, keyword_init: true)
-
-            struct.new(
-              export_path: yml.export_path,
-              dump: yml.dump
-            )
-          end
-        end
-      end
-    end
-  end
-end

data/lib/active_record/dbt/factory/source_factory.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module ActiveRecord
-  module Dbt
-    module Factory
-      module SourceFactory
-        def self.build
-          tables_factory = ActiveRecord::Dbt::Factory::TablesFactory.build
-
-          ActiveRecord::Dbt::Source::Yml.new(tables_factory).dump
-        end
-      end
-    end
-  end
-end

data/lib/active_record/dbt/factory/table_factory.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-module ActiveRecord
-  module Dbt
-    module Factory
-      module TableFactory
-        def self.build(table_name)
-          table_test = ActiveRecord::Dbt::Table::Test.new(table_name)
-          columns = ActiveRecord::Dbt::Factory::ColumnsFactory.build(table_name)
-
-          ActiveRecord::Dbt::Table::Yml.new(table_name, table_test, columns)
-        end
-      end
-    end
-  end
-end