dugway 1.2.0 → 1.3.0

data/spec/units/dugway/theme_spec.rb

@@ -477,6 +477,252 @@ describe Dugway::Theme do
         theme.errors.should include("Option 'show_foo' has invalid comparison value 'invalid_value'. Feature flags can only check for `visible`.")
 
       end
+
+      it "allows options that require image settings" do
+        settings = theme.settings.merge({
+          'options' => [{
+            'variable' => 'show_header_text',
+            'section' => 'general', 
+            'description' => 'Show header text when logo is not present',
+            'requires' => 'logo'
+          }],
+          'images' => [{
+            'variable' => 'logo',
+            'section' => 'general',
+            'description' => 'Site logo'
+          }]
+        })
+        allow(theme).to receive(:settings).and_return(settings)
+
+        theme.valid?.should be(true)
+        theme.errors.should be_empty
+      end
+
+      it "allows options that require image_sets settings" do
+        settings = theme.settings.merge({
+          'options' => [{
+            'variable' => 'show_gallery',
+            'section' => 'homepage',
+            'description' => 'Show image gallery',
+            'requires' => 'gallery_images'
+          }],
+          'image_sets' => [{
+            'variable' => 'gallery_images',
+            'section' => 'homepage',
+            'description' => 'Gallery images'
+          }]
+        })
+        allow(theme).to receive(:settings).and_return(settings)
+
+        theme.valid?.should be(true)
+        theme.errors.should be_empty
+      end
+
+      it "fails when requires references unknown image setting" do
+        settings = theme.settings.merge({
+          'options' => [{
+            'variable' => 'show_banner',
+            'section' => 'general',
+            'description' => 'Show banner image',
+            'requires' => 'unknown_image'
+          }]
+        })
+        allow(theme).to receive(:settings).and_return(settings)
+
+        theme.valid?.should be(false)
+        theme.errors.should include("Option 'show_banner' requires unknown setting 'unknown_image'")
+      end
+
+      describe "when validating object-based requires" do
+        let(:base_settings) do
+          {
+            'name' => 'Test Theme',
+            'version' => '1.2.3',
+            'colors' => required_colors.map { |color| {'variable' => color} },
+            'options' => [],
+            'images' => [{'variable' => 'slideshow_image', 'section' => 'homepage'}],
+            'image_sets' => [{'variable' => 'hero_images', 'section' => 'homepage'}]
+          }
+        end
+
+        before(:each) do
+          allow(theme).to receive(:validate_required_color_settings) { true }
+        end
+
+        it "validates 'any' condition with valid settings" do
+          settings = base_settings.merge({
+            'options' => [{
+              'variable' => 'show_hero',
+              'section' => 'homepage',
+              'description' => 'Show hero section',
+              'requires' => [
+                {
+                  'any' => [
+                    'slideshow_image present',
+                    'hero_images present'
+                  ]
+                }
+              ]
+            }]
+          })
+          allow(theme).to receive(:settings).and_return(settings)
+
+          theme.valid?.should be(true)
+          theme.errors.should be_empty
+        end
+
+        it "validates mixed array with both objects and strings" do
+          settings = base_settings.merge({
+            'options' => [{
+              'variable' => 'show_advanced_hero',
+              'section' => 'homepage', 
+              'description' => 'Show advanced hero',
+              'requires' => [
+                {
+                  'any' => ['slideshow_image present', 'hero_images present']
+                },
+                'inventory'
+              ]
+            }]
+          })
+          allow(theme).to receive(:settings).and_return(settings)
+
+          theme.valid?.should be(true)
+          theme.errors.should be_empty
+        end
+
+        it "fails when 'any' condition references unknown settings" do
+          settings = base_settings.merge({
+            'options' => [{
+              'variable' => 'show_gallery',
+              'section' => 'homepage',
+              'description' => 'Show image gallery',
+              'requires' => [
+                {
+                  'any' => [
+                    'unknown_image present',
+                    'slideshow_image present'
+                  ]
+                }
+              ]
+            }]
+          })
+          allow(theme).to receive(:settings).and_return(settings)
+
+          theme.valid?.should be(false)
+          theme.errors.should include("Option 'show_gallery' requires unknown setting 'unknown_image'")
+        end
+
+        it "fails when 'any' condition is not an array" do
+          settings = base_settings.merge({
+            'options' => [{
+              'variable' => 'show_content',
+              'section' => 'homepage',
+              'description' => 'Show content',
+              'requires' => [
+                {
+                  'any' => 'slideshow_image present'
+                }
+              ]
+            }]
+          })
+          allow(theme).to receive(:settings).and_return(settings)
+
+          theme.valid?.should be(false)
+          theme.errors.should include("Option 'show_content' has invalid 'any' condition - must be an array of rules")
+        end
+
+        it "fails when 'any' condition is empty" do
+          settings = base_settings.merge({
+            'options' => [{
+              'variable' => 'show_empty_any',
+              'section' => 'homepage',
+              'description' => 'Show with empty any',
+              'requires' => [
+                {
+                  'any' => []
+                }
+              ]
+            }]
+          })
+          allow(theme).to receive(:settings).and_return(settings)
+
+          theme.valid?.should be(false)
+          theme.errors.should include("Option 'show_empty_any' has empty 'any' condition - must contain at least one rule")
+        end
+
+        it "fails when object has unsupported operator" do
+          settings = base_settings.merge({
+            'options' => [{
+              'variable' => 'show_unsupported',
+              'section' => 'homepage',
+              'description' => 'Show with unsupported operator',
+              'requires' => [
+                {
+                  'all' => ['slideshow_image present']
+                }
+              ]
+            }]
+          })
+          allow(theme).to receive(:settings).and_return(settings)
+
+          theme.valid?.should be(false)
+          theme.errors.should include("Option 'show_unsupported' has unsupported requires object. Only 'any' is currently supported.")
+        end
+
+        it "validates nested operators and values within 'any'" do
+          settings = base_settings.merge({
+            'options' => [
+              {
+                'variable' => 'enable_slideshow',
+                'section' => 'homepage',
+                'description' => 'Enable slideshow',
+                'type' => 'boolean',
+                'default' => true
+              },
+              {
+                'variable' => 'show_conditional_hero',
+                'section' => 'homepage',
+                'description' => 'Show conditional hero',
+                'requires' => [
+                  {
+                    'any' => [
+                      'enable_slideshow eq true',
+                      'slideshow_image present'
+                    ]
+                  }
+                ]
+              }
+            ]
+          })
+          allow(theme).to receive(:settings).and_return(settings)
+
+          theme.valid?.should be(true)
+          theme.errors.should be_empty
+        end
+
+        it "validates feature flags within 'any' condition" do
+          settings = base_settings.merge({
+            'options' => [{
+              'variable' => 'show_feature_dependent',
+              'section' => 'homepage',
+              'description' => 'Show feature dependent content',
+              'requires' => [
+                {
+                  'any' => [
+                    'feature:advanced_hero eq visible',
+                    'slideshow_image present'
+                  ]
+                }
+              ]
+            }]
+          })
+          allow(theme).to receive(:settings).and_return(settings)
+
+          theme.valid?.should be(true)
+          theme.errors.should be_empty
+        end
+      end
     end
 
     describe "when validating option sections" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dugway
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Big Cartel
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-10 00:00:00.000000000 Z
+date: 2025-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: 5.2.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: 5.2.8
 - !ruby/object:Gem::Dependency
   name: liquid
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.6
+        version: 5.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.6
+        version: 5.5.1
 - !ruby/object:Gem::Dependency
   name: bigdecimal
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.12'
 - !ruby/object:Gem::Dependency
   name: sprockets-sass
   requirement: !ruby/object:Gem::Requirement
@@ -164,20 +164,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.3
+- !ruby/object:Gem::Dependency
+  name: sassc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: better_errors
   requirement: !ruby/object:Gem::Requirement
@@ -210,16 +224,16 @@ dependencies:
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.12'
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
@@ -240,28 +254,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.3
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.3
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -282,14 +296,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
@@ -332,6 +346,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.15.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.15.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -538,6 +566,7 @@ files:
 - locales/storefront.zh-CN.yml
 - locales/storefront.zh-TW.yml
 - log/dugway.log
+- mise.toml
 - spec/features/contact_form_spec.rb
 - spec/features/page_rendering_spec.rb
 - spec/features/shopping_spec.rb
@@ -606,7 +635,7 @@ homepage: https://github.com/bigcartel/dugway
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -614,7 +643,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.7'
   - - "<"
     - !ruby/object:Gem::Version
       version: '3'
@@ -624,8 +653,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Easily build and test Big Cartel themes.
 test_files: