dugway 1.0.12 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca53a46e63f06064d7d5ff72d37a4056f99cd0210bd2ee12a3680bfe693bd84c
-  data.tar.gz: 4b05f6b48ba91601c4a78c45d2f64a614f6792411fd60f980a732d5e22ea3bf3
+  metadata.gz: c3efe750c07138767b6b491f5fd375df42560fa0dd77fd18e3f0bd10578667f5
+  data.tar.gz: 90ab41b88afa8995d7890612ecdd262f0cb2146dfea7c7b1eced3d99bd78744d
 SHA512:
-  metadata.gz: 589bd59aa78d9ffb203fd0d323f051d764b7e74a9182cbe9b70cbc6361a3d055ca4bf4258c83d4804a127a9c16c7d6f191bef9dfe532658f0e056f7188efb588
-  data.tar.gz: 1fdf871fdb967fc908937524d48e5b7a431704b6b977b84037424006d9b3848d2c1db98026f8f89b13f720b4ba109e50af6b118bc540d7a178b809d197607a67
+  metadata.gz: 922ee155123b7f98a421bdf5039b707b48defa71a55296ecad5ac96185c587775885b78e4d3534462a52a35f86af23d69094e65df2bbbf58e217f06cbcfd00d6
+  data.tar.gz: 419a042a3b9fffb5d8951b27c06b300d996a95407bf634d988fced33eb3bb8af380eee29e2f157d87d19c045a60e13d3037f196980fb9b0a5c2be535cf14f230

data/lib/dugway/cli/templates/source/stylesheets/cart.css.sass

@@ -34,7 +34,7 @@ body#cart
 
       a.remove
         display: inline-block
-        background: #ddd + 20
+        background: lighten(#ddd, 20%)
         border-radius: 20px
         height: 20px
         line-height: 18px

data/lib/dugway/theme.rb

@@ -143,7 +143,7 @@ module Dugway
     def validate_required_layout_attributes
       layout_content = read_source_file('layout.html')
 
-      unless layout_content =~ /<body[^>]*data-bc-page-type[^>]*>/
+      unless layout_content =~ /<body.*?\bdata-bc-page-type\b/
         @errors << "layout.html missing `data-bc-page-type` attribute on body tag"
       end
 
@@ -168,30 +168,32 @@ module Dugway
     end
 
     def validate_preset_styles(preset)
-      @errors << 'Preset is missing group_name' unless preset['group_name'].is_a?(String)
+      @errors << 'Preset is missing group_name' if preset['group_name'].to_s.strip.empty?
       @errors << 'Preset is missing styles' unless preset['styles'].is_a?(Array)
 
       preset['styles'].each do |style|
-        @errors << 'Style is missing style_name' unless style['style_name'].is_a?(String)
+        @errors << "Style in group '#{preset['group_name']}' - Missing style_name" if style['style_name'].to_s.strip.empty?
 
         if style['fonts'].is_a?(Hash) && !style['fonts'].empty?
           style['fonts'].each_value do |font|
-            @errors << 'Font value should be a string' unless font.is_a?(String)
+            @errors << "Style '#{style['style_name']} - Contains an invalid font name" if font.to_s.strip.empty?
           end
         else
-          @errors << 'Style is missing fonts'
+          @errors << "Style '#{style['style_name']}' - Missing fonts"
         end
 
         if style['colors'].is_a?(Hash) && !style['colors'].empty?
           style['colors'].each do |key, color|
-            @errors << 'Invalid color format' unless color =~ /^#[0-9A-Fa-f]{6}$/
+            unless color =~ /^#[0-9A-Fa-f]{6}$/
+              @errors << "Style '#{style['style_name']}' - Invalid color value '#{color}' for color '#{key}''"
+            end
           end
         else
-          @errors << 'Style is missing colors'
+          @errors << "Style '#{style['style_name']}' - Missing required color settings"
         end
       end
 
-      @errors << 'Style names should be unique' unless preset['styles'].map { |style| style['style_name'] }.uniq.length == preset['styles'].length
+      validate_style_name_uniqueness(preset['styles'])
     end
 
     def validate_style_references(preset)
@@ -209,11 +211,20 @@ module Dugway
         extra_keys = style_keys - variables
         missing_keys = variables - style_keys
 
-        @errors << "Extra #{key_type} keys: #{extra_keys.join(', ')}" unless extra_keys.empty?
-        @errors << "Missing #{key_type} keys: #{missing_keys.join(', ')}" unless missing_keys.empty?
+        @errors << "Style '#{style['style_name']}' - Extra #{key_type} keys: #{extra_keys.join(', ')}" unless extra_keys.empty?
+        @errors << "Style '#{style['style_name']}' - Missing #{key_type} keys: #{missing_keys.join(', ')}" unless missing_keys.empty?
       end
     end
 
+    def validate_style_name_uniqueness(styles)
+      duplicates = styles
+        .group_by { |s| s['style_name'] }
+        .select { |_, group| group.size > 1 }
+        .keys
+
+      @errors << "Duplicate style names found: #{duplicates.join(', ')}" if duplicates.any?
+    end
+
     def source_dir
       Dugway.source_dir
     end

data/lib/dugway/version.rb

@@ -1,3 +1,3 @@
 module Dugway
-  VERSION = "1.0.12"
+  VERSION = "1.0.13"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dugway
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.0.13
 platform: ruby
 authors:
 - Big Cartel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-12-10 00:00:00.000000000 Z
+date: 2024-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler