dugway 1.0.12 → 1.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca53a46e63f06064d7d5ff72d37a4056f99cd0210bd2ee12a3680bfe693bd84c
-  data.tar.gz: 4b05f6b48ba91601c4a78c45d2f64a614f6792411fd60f980a732d5e22ea3bf3
+  metadata.gz: 7eae3c870ceda8207acc698d61c2aeb008b1f315e4e8bf4347578b90e10e365e
+  data.tar.gz: 0a2f33a7f2d6be0402e95c23385703ce8bef02f6b6825b0c2b17bc8e7d24198f
 SHA512:
-  metadata.gz: 589bd59aa78d9ffb203fd0d323f051d764b7e74a9182cbe9b70cbc6361a3d055ca4bf4258c83d4804a127a9c16c7d6f191bef9dfe532658f0e056f7188efb588
-  data.tar.gz: 1fdf871fdb967fc908937524d48e5b7a431704b6b977b84037424006d9b3848d2c1db98026f8f89b13f720b4ba109e50af6b118bc540d7a178b809d197607a67
+  metadata.gz: 14f7065a90a40eeff514d2816326af0cbc3341e0608a39e22c4059db4924557120b06de94ee11f1601a883707ef905b3ae26ae651490b6931a4c1f604d498d43
+  data.tar.gz: 1877a14d06d370d659a1c747f1d9f52642c6e6696942aa3d0a01d1fad9fa719d7bc373cf10538eb9b86a1a9aa37c27cad4cb26d462f2544084f99c43ddc07079

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/liquifier.rb

@@ -74,7 +74,7 @@ module Dugway
         'artists' => Drops::ArtistsDrop.new(store.artists.map { |a| Drops::ArtistDrop.new(a) }),
         'products' => Drops::ProductsDrop.new(store.products.map { |p| Drops::ProductDrop.new(p) }),
         'contact' => Drops::ContactDrop.new,
-        'head_content' => head_content,
+        'head_content' => [window_bigcartel_script, head_content].join,
         'bigcartel_credit' => bigcartel_credit,
         'powered_by_big_cartel' => powered_by_big_cartel,
       }
@@ -100,6 +100,15 @@ module Dugway
       content
     end
 
+    def window_bigcartel_script
+      product = @request.params[:product] ? store.product(@request.params[:product]) : nil
+
+      script = "window.bigcartel = window.bigcartel || {};"
+      script << "\nwindow.bigcartel.product = #{product.to_json};" if product
+
+      "<script>#{script}</script>"
+    end
+
     def bigcartel_credit
       '<a href="http://bigcartel.com/" title="Start your own store at Big Cartel now">Online Store by Big Cartel</a>'
     end

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.14"
 end

data/spec/units/dugway/theme_spec.rb

@@ -231,6 +231,68 @@ describe Dugway::Theme do
         theme.errors.size.should == 2
       end
     end
+
+    describe "when preset styles are invalid" do
+      let(:valid_settings) do
+        {
+          'fonts' => [{'variable' => 'font'}],
+          'colors' => [
+            {'variable' => 'background_color'},
+            {'variable' => 'primary_text_color'},
+            {'variable' => 'link_text_color'},
+            {'variable' => 'link_hover_color'},
+            {'variable' => 'button_background_color'},
+            {'variable' => 'button_text_color'},
+            {'variable' => 'button_hover_background_color'}
+          ],
+          'preset_styles' => {
+            'preview' => {
+              'title_font' => 'font',
+              'body_font' => 'font',
+              'text_color' => '#000000',
+              'background_color' => '#FFFFFF'
+            },
+            'presets' => [{
+              'group_name' => 'Classic',
+              'styles' => [{
+                'style_name' => 'Style 1',
+                'fonts' => {'font' => 'Arial'},
+                'colors' => {
+                  'background_color' => '#FFFFFF',
+                  'primary_text_color' => '#000000',
+                  'link_text_color' => '#000000',
+                  'link_hover_color' => '#000000',
+                  'button_background_color' => '#000000',
+                  'button_text_color' => '#FFFFFF',
+                  'button_hover_background_color' => '#000000'
+                }
+              }]
+            }]
+          }
+        }
+      end
+
+      before(:each) do
+        allow(theme).to receive(:name) { "Test Theme" }
+        allow(theme).to receive(:version) { "1.2.3" }
+      end
+
+      it "requires non-empty group_name" do
+        settings = valid_settings
+        settings['preset_styles']['presets'].first['group_name'] = ' '
+        theme.stub(:settings) { settings }
+        theme.valid?.should be(false)
+        theme.errors.should include('Preset is missing group_name')
+      end
+
+      it "requires non-empty style_name" do
+        settings = valid_settings
+        settings['preset_styles']['presets'].first['styles'].first['style_name'] = '  '
+        theme.stub(:settings) { settings }
+        theme.valid?.should be(false)
+        theme.errors.should include('Style in group \'Classic\' - Missing style_name')
+      end
+    end
   end
 
   def read_file(file_name)

metadata

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