tailwind_dsl 0.0.17 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 932f3c5eab101600bca4bda271cff007b4bee1145fc248c3f2fa06d7ad2152f9
-  data.tar.gz: fb033d87faeb2e2b56888de2f02bd75ac4214a01bb1d4ff955ab163a8feb8cc5
+  metadata.gz: b8465b256d515f8ecb6c81cb2e0c499a5ca3b0a3ab3e5d2ba614c55ef12049ec
+  data.tar.gz: a9f9bbbad156fefd8f7d04e43ab7cc4ac2b4634912ac7ef34cbd27a64236e4f1
 SHA512:
-  metadata.gz: 6246a2e48781d1a59407231d46340429cf46ea42fa854e16378acb89f7fc1f69b4ae69113417752006eafcd5655d762a890df058ea64132f3bddf3f4f887dd0a
-  data.tar.gz: bc9da3edcaf0e1e297f0fe89b62b5434d5252b3c80e1dc4790bb69b5d0a853fdcd832da19f24edddbfdff9818db8ea7352c5fbc71d9d7666588dcde6db48db61
+  metadata.gz: bba87ff679f1dde5650731005021e5c7061a6146eb47c4e0370325f330cbefb264604a6d320c3b34d9b8d2030a5011796d6d3e46330b1528189f94dc591a873d
+  data.tar.gz: b5379fe421463db2fea7672bf570e7fedf100c39e6259e98ad3d67099fe0873fe831d3700dad4dfdb68f16a0099f432ff5c25e8aeff033cc691f3ffa554d8eea

data/.builders/generators/domain-model.rb

@@ -216,6 +216,7 @@ KManager.action :domain_model do
             .field(:tailwind_config_file  , type: :string)
             .field(:settings_file         , type: :string)
             .field(:data_file             , type: :string)
+            .field(:model_file            , type: :string)
             .field(:astro_file            , type: :string)
         end
 

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+## [0.0.18](https://github.com/klueless-io/tailwind_dsl/compare/v0.0.17...v0.0.18) (2022-10-20)
+
+
+### Bug Fixes
+
+* minor refactor on long extensions ([70615ad](https://github.com/klueless-io/tailwind_dsl/commit/70615adc3bb37267e930ac36b92472f8b054f2d7))
+* resetting root path will remove transient files and empty directories, but not custom files ([07ef5ae](https://github.com/klueless-io/tailwind_dsl/commit/07ef5ae71fda4a92b9a9312f3f4de2bca7151505))
+* resetting root path will remove transient files and empty directories, but not custom files ([e546bed](https://github.com/klueless-io/tailwind_dsl/commit/e546bed751f4e996802340a6573b68663224d555))
+
+## [0.0.17](https://github.com/klueless-io/tailwind_dsl/compare/v0.0.16...v0.0.17) (2022-10-19)
+
+
+### Bug Fixes
+
+* refactor component record shape ([8d9bd9a](https://github.com/klueless-io/tailwind_dsl/commit/8d9bd9ab7ab8a47db30f1916f289dba24040c988))
+
 ## [0.0.16](https://github.com/klueless-io/tailwind_dsl/compare/v0.0.15...v0.0.16) (2022-10-19)
 
 

data/lib/tailwind_dsl/etl/component_models/extractor.rb

@@ -3,6 +3,16 @@
 module TailwindDsl
   module Etl
     module ComponentModels
+      class Gpt3Extractor
+        def extract_data(component)
+          puts "extract data for #{component} using GPT3"
+        end
+
+        def extract_model(component)
+          puts "extract model for #{component} using GPT3"
+        end
+      end
+
       # Extract component models by reading the cleansed component HTML and then using GPT3 to infer both the data/model structure.
       class Extractor
         attr_reader :components
@@ -11,7 +21,7 @@ module TailwindDsl
         attr_reader :batch_left
         attr_reader :use_prompt
         attr_reader :filter_design_system
-        attr_reader :dry_run
+        attr_reader :extract_handler
 
         def initialize(components, target_root_path, **args)
           @components = components
@@ -20,7 +30,7 @@ module TailwindDsl
           @batch_left = batch_size
           @use_prompt = args[:use_prompt] || false
           @filter_design_system = args[:filter_design_system] || nil
-          @dry_run = args[:dry_run] || false
+          @extract_handler = (args[:extract_handler] || Gpt3Extractor).new
         end
 
         # Goal:       Extract the next (batch_size) component models using GPT3 and save them to target_root_path
@@ -28,14 +38,21 @@ module TailwindDsl
         #             Create a model file at: design_system.name -> group-hierarchy -> component-name.model.rb
 
         # Process:    Collect all components and optionally filter them by design system name.
+        #             Also filter by other keys (to be determined)
+        #             Only process files that have not been processed before.
         #             Look for the next component to be processed, if it does not exist in the target folder then process it.
         #             decrement the batch_left counter and continue until batch_left is 0.
         #             if :use_prompt is true then display the input/output files and ask if you wish to process the component or skip.
         #             process the component by calling the GPT3 API and save the results to the target folder.
 
+        # rubocop:disable Metrics/AbcSize
         def extract
+          guards
+
           filter_components.each do |component|
             puts "Processing: #{component.design_system.name} -> #{component.group.key} -> #{component.name} -> remaining#: #{batch_left}"
+
+            component.debug
             # component_model_path = File.join(target_root_path, component.design_system.name, component.group_hierarchy, "#{component.name}.model.rb")
             # next if File.exist?(component_model_path)
 
@@ -47,15 +64,29 @@ module TailwindDsl
             # end
 
             # puts "Processing: #{component_model_path}"
-            @batch_left -= 1
-            break if batch_left.zero?
 
-            next if dry_run
+            # next if extract_handler
 
             # model = Gpt3::ComponentModel.new(component.cleansed_html_path)
             # model.save(component_model_path)
+
+            extract_handler.extract_data(component)
+            extract_handler.extract_model(component)
+
+            @batch_left -= 1
+            break if batch_left.zero?
           end
         end
+        # rubocop:enable Metrics/AbcSize
+
+        private
+
+        def guards
+          raise "Batch size must be greater than 0, got: #{batch_size}" if batch_size <= 0
+          raise 'Extract handler is required' unless extract_handler
+          raise 'Extract handler must implement extract_data method' unless extract_handler.respond_to?(:extract_data)
+          raise 'Extract handler must implement extract_model method' unless extract_handler.respond_to?(:extract_model)
+        end
 
         def filter_components
           return components unless filter_design_system

data/lib/tailwind_dsl/etl/component_structures/generator.rb

@@ -18,7 +18,8 @@ module TailwindDsl
         BLANK_LINE_REGEX = /(\n\s*\n)+/.freeze
         TAILWIND_CONFIG_REGEX = /```(?<tailwind>\n[\s\S]+?)```/.freeze
 
-        # .gsub(/(\n\s*\n)+/, "\n")
+        TRANSIENT_FILE_EXTENSIONS = %w[.clean.html .html .settings.json .tailwind.config.js].freeze
+
         attr_reader :uikit
         attr_reader :components
         # Location for raw components
@@ -37,7 +38,7 @@ module TailwindDsl
         def generate
           assert_target_root_path_exists
 
-          delete_target_root_path if reset_root_path
+          clear_root_path if reset_root_path
 
           @components = query_components
 
@@ -50,10 +51,6 @@ module TailwindDsl
           raise 'Target path does not exist' unless Dir.exist?(target_root_path)
         end
 
-        def delete_target_root_path
-          FileUtils.rm_rf(Dir.glob("#{target_root_path}/*"))
-        end
-
         def query_components
           RawComponentQuery.query(uikit,
                                   source_root_path: source_root_path,
@@ -201,6 +198,24 @@ module TailwindDsl
             }
           }
         end
+
+        def clear_root_path
+          Dir.glob("#{target_root_path}/**/*")
+             .select { |path| transient_file?(path) }
+             .each { |path| File.delete(path) }
+
+          Dir.glob("#{target_root_path}/**/")
+             .reverse_each { |d| Dir.rmdir d if Dir.entries(d).size == 2 }
+        end
+
+        def transient_file?(path)
+          return false if File.directory?(path)
+
+          ext = File.basename(path).split('.', 2)[1]
+          ext = ext.nil? ? '' : ".#{ext}"
+
+          TRANSIENT_FILE_EXTENSIONS.include?(ext)
+        end
       end
     end
   end

data/lib/tailwind_dsl/etl/component_structures/raw_component_query.rb

@@ -7,22 +7,29 @@ module TailwindDsl
       #
       # This is a two pass process:
       #  1. Query the raw component folder for all files that match the pattern and build up a graph with required information
+
+      # puts '%-20s %s' % ['name', name]
+      # puts '%-20s %s' % ['source_path', source_path]
+      # puts '%-20s %s' % ['target_path', target_path]
       #  2. Flatten the graph into a list of rows
       class RawComponentQuery
-        DesignSystem = Struct.new(
-          :name,
-          :source_path,
-          :target_path,
-          keyword_init: true
-        )
+        DesignSystem = Struct.new(:name, :source_path, :target_path, keyword_init: true) do
+          def debug
+            puts format('%-30<key>s : %<value>s', key: 'Design system', value: name)
+            puts format('%-30<key>s : %<value>s', key: 'Source path', value: source_path)
+            puts format('%-30<key>s : %<value>s', key: 'Target path', value: target_path)
+          end
+        end
+
+        Group = Struct.new(:key, :type, :sub_keys, :folder, keyword_init: true) do
+          def debug
+            puts format('%-30<key>s : %<value>s', key: 'Group key', value: key)
+            puts format('%-30<key>s : %<value>s', key: 'Group type', value: type)
+            puts format('%-30<key>s : %<value>s', key: 'Group sub keys', value: sub_keys)
+            puts format('%-30<key>s : %<value>s', key: 'Group folder', value: folder)
+          end
+        end
 
-        Group = Struct.new(
-          :key,
-          :type,
-          :sub_keys,
-          :folder,
-          keyword_init: true
-        )
         FilePath = Struct.new(
           :source_file,
           :target_html_file,
@@ -30,8 +37,23 @@ module TailwindDsl
           :target_tailwind_config_file,
           :target_settings_file,
           :target_data_file,
-          :target_astro_file, keyword_init: true
-        )
+          :target_model_file,
+          :target_astro_file,
+          keyword_init: true
+        ) do
+          # rubocop:disable Metrics/AbcSize
+          def debug
+            puts format('%-30<key>s : %<value>s', key: 'Source file', value: source_file)
+            puts format('%-30<key>s : %<value>s', key: 'Target html file', value: target_html_file)
+            puts format('%-30<key>s : %<value>s', key: 'Target clean html file', value: target_clean_html_file)
+            puts format('%-30<key>s : %<value>s', key: 'Target tailwind config file', value: target_tailwind_config_file)
+            puts format('%-30<key>s : %<value>s', key: 'Target settings file', value: target_settings_file)
+            puts format('%-30<key>s : %<value>s', key: 'Target data file', value: target_data_file)
+            puts format('%-30<key>s : %<value>s', key: 'Target model file', value: target_model_file)
+            puts format('%-30<key>s : %<value>s', key: 'Target astro file', value: target_astro_file)
+          end
+          # rubocop:enable Metrics/AbcSize
+        end
 
         class Component
           attr_reader :name
@@ -62,6 +84,16 @@ module TailwindDsl
               relative: relative.to_h
             }
           end
+
+          def debug
+            puts format('%-30<key>s : %<value>s', key: 'Component', value: name)
+            design_system.debug
+            group.debug
+            puts ':: Absolute paths'
+            absolute.debug
+            puts '::Relative paths'
+            relative.debug
+          end
         end
 
         attr_reader :uikit
@@ -155,6 +187,7 @@ module TailwindDsl
             target_tailwind_config_file: file.target.tailwind_config_file,
             target_settings_file: file.target.settings_file,
             target_data_file: file.target.data_file,
+            target_model_file: file.target.model_file,
             target_astro_file: file.target.astro_file
           }
         end
@@ -168,6 +201,7 @@ module TailwindDsl
             target_tailwind_config_file: File.join(target_path, file.target.tailwind_config_file),
             target_settings_file: File.join(target_path, file.target.settings_file),
             target_data_file: File.join(target_path, file.target.data_file),
+            target_model_file: File.join(target_path, file.target.model_file),
             target_astro_file: File.join(target_path, file.target.astro_file)
           }
         end

data/lib/tailwind_dsl/etl/raw_components/schema/target_file.rb

@@ -12,6 +12,7 @@ module TailwindDsl
         attr_accessor :tailwind_config_file
         attr_accessor :settings_file
         attr_accessor :data_file
+        attr_accessor :model_file
         attr_accessor :astro_file
 
         def initialize(**args)
@@ -20,6 +21,7 @@ module TailwindDsl
           @tailwind_config_file = grab_arg(args, :tailwind_config_file, guard: 'Missing tailwind_config_file')
           @settings_file = grab_arg(args, :settings_file, guard: 'Missing settings_file')
           @data_file = grab_arg(args, :data_file, guard: 'Missing data_file')
+          @model_file = grab_arg(args, :model_file) # , guard: 'Missing model_file')
           @astro_file = grab_arg(args, :astro_file, guard: 'Missing astro_file')
         end
 
@@ -30,6 +32,7 @@ module TailwindDsl
             tailwind_config_file: tailwind_config_file,
             settings_file: settings_file,
             data_file: data_file,
+            model_file: model_file,
             astro_file: astro_file
           }
         end

data/lib/tailwind_dsl/etl/raw_components/transformer.rb

@@ -108,6 +108,7 @@ module TailwindDsl
             tailwind_config_file: "#{key}.tailwind.config.js",
             settings_file: "#{key}.settings.json",
             data_file: "#{key}.data.json",
+            model_file: "#{key}.model.rb",
             astro_file: "#{key}.astro"
           )
         end

data/lib/tailwind_dsl/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TailwindDsl
-  VERSION = '0.0.17'
+  VERSION = '0.0.19'
 end

data/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "tailwind_dsl",
-  "version": "0.0.17",
+  "version": "0.0.19",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "tailwind_dsl",
-      "version": "0.0.17",
+      "version": "0.0.19",
       "devDependencies": {
         "@klueless-js/semantic-release-rubygem": "github:klueless-js/semantic-release-rubygem",
         "@semantic-release/changelog": "^6.0.1",

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tailwind_dsl",
-  "version": "0.0.17",
+  "version": "0.0.19",
   "description": "Tailwind DSL will build tailwind websites useing Domain Specific Language conventions",
   "scripts": {
     "release": "semantic-release"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tailwind_dsl
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.19
 platform: ruby
 authors:
 - David Cruwys
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-19 00:00:00.000000000 Z
+date: 2022-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cmdlet