tailwind_dsl 0.0.29 → 0.0.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a70be418386e67d6810404f966f97be9eff5cb76f29749f09720ce82a5ede862
-  data.tar.gz: 61177d4aa5b7739ad0f04f1e8dee210d176a166c0b51d71b4797075e320e23cb
+  metadata.gz: 3377172941fc6ad9c2db29fa772f5743714f73ac4b4ef69f911069cb00c4c9d8
+  data.tar.gz: e0204ff9d27587aedac8f33a84d1019eaffafdefb2a8793669d2cdf03f9ea9f8
 SHA512:
-  metadata.gz: 6a3597b9e27978d20c4fc6a55f087b8a1da50952028b09c97a5ce1bf286a7c4d5de42279bd4c719a328393df26c4734c1d13794513f5aa07f6ac8e5f4cf7d288
-  data.tar.gz: e252253ba7ff48a6b6ac604e6bd1122dfcc997d51708389218f27be0499ee14fa48a84de6a36e5c7c56481503d2151ffdb7ccd9797a45da7bd78f3d562d80370
+  metadata.gz: cd678c918f7b5de5a6bc91c25988f12e0de6da89a5212aeb9f363ffcaa4b0b79fb21a937c7d2d9bf8b49ecc76d43c673b0f150eca91d0907b029b25a1ed1738e
+  data.tar.gz: a0e1be62691f5aff54e4326658048968eb222b9c8002348e37950961fecba68e4aa424daeb01fd7c4ae6d1ccbb0a92338638b124325596d4235addefece8ad9b

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [0.0.29](https://github.com/klueless-io/tailwind_dsl/compare/v0.0.28...v0.0.29) (2022-10-26)
+
+
+### Bug Fixes
+
+* rename raw_component_query ([07b736e](https://github.com/klueless-io/tailwind_dsl/commit/07b736e1602f8be4507a4d1ec5da066c7673e797))
+
 ## [0.0.28](https://github.com/klueless-io/tailwind_dsl/compare/v0.0.27...v0.0.28) (2022-10-24)
 
 

data/lib/tailwind_dsl/etl/extractors/batch_extraction.rb

@@ -9,8 +9,7 @@ module TailwindDsl
         attr_reader :components
         attr_reader :target_root_path
         attr_reader :batch_size
-        attr_reader :use_prompt
-        attr_reader :filter_design_system # this should be renamed and reshaped to a complex filter object
+        attr_reader :filter
 
         # Create comment for this initialize method
 
@@ -18,56 +17,38 @@ module TailwindDsl
         # @param [String] target_root_path root directory where the extracted data will be written to, this is the root path for all design systems and groups
         # @param [Hash] args
         # @option args [Integer] :batch_size number of components to process, default is 1
-        # @option args [Boolean] :use_prompt console based prompt so the user can guide the extractor, default is false
-        # @option args [String] :filter_design_system name of the design system to filter on, default is nil meaning all
+        # @option args [Hash] :filter filter components before processing
+        #                             design_system: name of the design system to filter on, default is nil meaning all
         # @option args [Class] :extract_handler class that implements an extract method
         def initialize(components, target_root_path, **args)
           @components = components
           @target_root_path = target_root_path
           @batch_size = args[:batch_size] || 1
-          @use_prompt = args[:use_prompt] || false
-          @filter_design_system = args[:filter_design_system] || nil
+          @filter = args[:filter] || nil
           @extract_handler = args[:extract_handler]
         end
 
-        # Goal:       Extract the next (batch_size) component models using GPT3 and save them to target_root_path
-        #             Create a data file at: design_system.name -> group-hierarchy -> component-name.data.json
-        #             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
           raise "Batch size must be greater than 0, got: #{batch_size}" if batch_size <= 0
 
           remaining = batch_size
 
           filter_components.each do |component|
-            # puts "Processing: #{component.design_system.name} -> #{component.group.key} -> #{component.name} -> remaining#: #{remaining}"
-
             component_guard(component)
+
             extractor.component = component
 
             next if File.exist?(extractor.target_file)
 
-            # if use_prompt
-            #   puts "Input: #{component.cleansed_html_path}"
-            #   puts "Output: #{component_model_path}"
-            #   puts 'Process? (y/n)'
-            #   next unless STDIN.gets.chomp == 'y'
-            # end
-
+            component.debug
             extractor.extract
 
             remaining -= 1
             break if remaining.zero?
           end
         end
+        # rubocop:enable Metrics/AbcSize
 
         def extractor
           return @extractor if defined? @extractor
@@ -89,15 +70,19 @@ module TailwindDsl
           raise "Folder does not exist: '#{path}', make sure you run component structure generator first." unless File.exist?(path)
         end
 
+        # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
         def filter_components
-          return components unless filter_design_system
-
-          components.select { |component| component.design_system.name == filter_design_system }
+          return components unless filter
+
+          result = components
+          # inclusions
+          result = result.select { |component| component.design_system.name == filter[:design_system] }     if filter[:design_system]
+          result = result.select { |component| component.group.key == filter[:group_key] }                  if filter[:group_key]
+          # exclusions
+          result = result.reject { |component| component.group.key == filter[:exclude_group_key] }          if filter[:exclude_group_key]
+          result
         end
-
-        # def target_file(component)
-        #   raise NotImplementedError, 'target_file is not implemented'
-        # end
+        # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity
       end
     end
   end

data/lib/tailwind_dsl/version.rb

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

data/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "tailwind_dsl",
-  "version": "0.0.29",
+  "version": "0.0.30",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "tailwind_dsl",
-      "version": "0.0.29",
+      "version": "0.0.30",
       "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.29",
+  "version": "0.0.30",
   "description": "Tailwind DSL will build tailwind websites useing Domain Specific Language conventions",
   "scripts": {
     "release": "semantic-release"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tailwind_dsl
 version: !ruby/object:Gem::Version
-  version: 0.0.29
+  version: 0.0.30
 platform: ruby
 authors:
 - David Cruwys