dugway 1.1.0 → 1.3.0

data/spec/units/dugway/store_spec.rb

@@ -189,4 +189,59 @@ describe Dugway::Store do
       store.locale.should == 'en-US'
     end
   end
+
+  describe "#website" do
+    context "when website is provided in store_options" do
+      let(:store_options) { { website: 'https://my-custom-override.com' } }
+      let(:store) { Dugway::Store.new('dugway', store_options) }
+
+      it "returns the website from store_options" do
+        store.website.should == 'https://my-custom-override.com'
+      end
+    end
+
+    context "when website is not in store_options but in account data" do
+      let(:store) { Dugway::Store.new('dugway', {}) } # No override
+
+      before do
+        # Mock the account data to include a website
+        allow(store).to receive(:account).and_return({ 'website' => 'https://api-provided-site.com' })
+      end
+
+      it "returns the website from account data" do
+        store.website.should == 'https://api-provided-site.com'
+      end
+    end
+
+    context "when website is in neither store_options nor account data" do
+      let(:store) { Dugway::Store.new('dugway', {}) } # No override
+
+      before do
+        # Mock the account data to NOT include a website
+        allow(store).to receive(:account).and_return({})
+      end
+
+      it "returns nil" do
+        store.website.should be_nil
+      end
+    end
+  end
+
+  describe "#price_suffix" do
+    context "when price_suffix is in store_options" do
+      let(:store) { Dugway::Store.new('dugway', { price_suffix: '+ HI' }) }
+
+      it "returns the price_suffix from store_options" do
+        store.price_suffix.should == '+ HI'
+      end
+    end
+
+    context "when price_suffix is not in store_options" do
+      let(:store) { Dugway::Store.new('dugway', {}) }
+
+      it "returns nil" do
+        store.price_suffix.should be_nil
+      end
+    end
+  end
 end

data/spec/units/dugway/theme_spec.rb

@@ -387,7 +387,7 @@ describe Dugway::Theme do
             {'variable' => 'button_text_color'},
             {'variable' => 'button_hover_background_color'}
           ],
-          'options' => [{ 'variable' => 'show_search', 'label' => 'Show search' }]
+          'options' => [{ 'variable' => 'show_search', 'section' => 'global_navigation', 'label' => 'Show search' }]
         } }
       end
 
@@ -417,6 +417,7 @@ describe Dugway::Theme do
         settings = theme.settings.merge({
           'options' => [{
             'variable' => 'show_search',
+            'section' => 'global_navigation',
             'label' => 'Show search',
             'description' => 'Show search in header'
           }]
@@ -452,7 +453,548 @@ describe Dugway::Theme do
         theme.valid?.should be(false)
         theme.errors.first.should match(/Missing required color settings:/)
       end
+
+      it "validates feature flag format and values" do
+        settings = theme.settings.merge({
+          'options' => [{
+            'variable' => 'show_foo',
+            'section' => 'general',
+            'description' => 'Show foo thing',
+            'requires' => [
+              'feature:', # invalid: empty
+              'feature:foo_flag gt visible', # invalid operator
+              'feature:foo_flag eq invalid_value', # invalid value
+              'feature:foo_flag neq visible', # valid
+              'feature:foo_flag eq visible' # valid
+            ]
+          }]
+        })
+        allow(theme).to receive(:settings).and_return(settings)
+
+        theme.valid?.should be(false)
+        theme.errors.should include("Option 'show_foo' has invalid feature flag format")
+        theme.errors.should include("Option 'show_foo' has invalid operator 'gt'. Feature flags can only use `eq` or `neq`.")
+        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
+      let(:valid_sections_string) { Dugway::Theme::VALID_SECTIONS.join(', ') }
+      let(:base_settings) do
+        {
+          'name' => 'Test Theme',
+          'version' => '1.2.3',
+          'colors' => required_colors.map { |color| {'variable' => color} },
+          'options' => []
+        }
+       end
+
+      # Define required_colors here if not already available in this scope
+      let(:required_colors) {[
+        'background_color',
+        'primary_text_color',
+        'link_text_color',
+        'link_hover_color',
+        'button_background_color',
+        'button_text_color',
+        'button_hover_background_color'
+      ]}
+
+      # Fix for the failing tests - define constant if needed
+      before(:each) do
+        unless defined?(Dugway::Theme::REQUIRED_FILES)
+          stub_const("Dugway::Theme::REQUIRED_FILES", [
+            "cart.html", "contact.html", "home.html", "layout.html", "maintenance.html",
+            "product.html", "products.html", "screenshot.jpg", "settings.json", "theme.css", "theme.js"
+          ])
+        end
+      end
+
+      it "passes with a valid section" do
+        settings = base_settings.merge({
+          'options' => [{
+            'variable' => 'valid_option',
+            'description' => 'Valid option',
+            'section' => 'homepage'
+          }]
+        })
+        # Stub settings
+        allow(theme).to receive(:settings).and_return(settings)
+
+        # Stub ALL required files first
+        Dugway::Theme::REQUIRED_FILES.each do |file|
+          allow(theme).to receive(:read_source_file).with(file).and_return("some content")
+        end
+
+        # Then override the specific stub for layout.html
+        allow(theme).to receive(:read_source_file).with('layout.html')
+          .and_return('<body data-bc-page-type="home"><div data-bc-hook="header"></div><div data-bc-hook="footer"></div></body>')
+
+        # Stub color validation
+        allow(theme).to receive(:validate_required_color_settings).and_return(true)
+
+        expect(Kernel).not_to receive(:warn)
+        theme.valid?.should be(true)
+      end
+
+      it "warns appropriately for multiple options with missing or invalid sections" do
+        settings = base_settings.merge({
+          'options' => [
+            { 'variable' => 'option_1_valid', 'description' => 'Valid', 'section' => 'homepage' },
+            { 'variable' => 'option_2_missing', 'description' => 'Missing section' }, # Missing section
+            { 'variable' => 'option_3_invalid', 'description' => 'Invalid section', 'section' => 'bad_section' }, # Invalid section
+            { 'variable' => 'option_4_valid', 'description' => 'Valid again', 'section' => 'general' },
+            { 'variable' => 'option_5_missing', 'description' => 'Missing section again' }, # Missing section again
+            { 'description' => 'Option 6 missing variable and section' }, # Missing variable and section
+            { 'variable' => 'option_7_invalid', 'description' => 'Invalid section again', 'section' => 'another_bad_one' } # Invalid section again
+          ]
+        })
+        # Stub settings
+        allow(theme).to receive(:settings).and_return(settings)
+
+        # Stub ALL required files first
+        Dugway::Theme::REQUIRED_FILES.each do |file|
+          allow(theme).to receive(:read_source_file).with(file).and_return("some content")
+        end
+
+        # Then override the specific stub for layout.html
+        allow(theme).to receive(:read_source_file).with('layout.html')
+          .and_return('<body data-bc-page-type="home"><div data-bc-hook="header"></div><div data-bc-hook="footer"></div></body>')
+
+        # Stub color validation
+        allow(theme).to receive(:validate_required_color_settings).and_return(true)
+
+        # Allow warn to be called so we can spy on it
+        allow(Kernel).to receive(:warn)
+
+        # Call valid? and assert true (since warnings don't invalidate)
+        theme.valid?.should be(true)
+
+        # Verify calls
+        expect(Kernel).to have_received(:warn).with("Warning: Theme setting 'option_2_missing' is missing the 'section' property.")
+        expect(Kernel).to have_received(:warn).with("Warning: Theme setting 'option_3_invalid' has an invalid 'section' value: 'bad_section'. Allowed values are: #{valid_sections_string}.")
+        expect(Kernel).to have_received(:warn).with("Warning: Theme setting 'option_5_missing' is missing the 'section' property.")
+        expect(Kernel).to have_received(:warn).with("Warning: Theme setting 'unknown' is missing the 'section' property.")
+        expect(Kernel).to have_received(:warn).with("Warning: Theme setting 'option_7_invalid' has an invalid 'section' value: 'another_bad_one'. Allowed values are: #{valid_sections_string}.")
+      end
+
+      it "handles options without a variable name gracefully when section is invalid" do
+        settings = base_settings.merge({
+          'options' => [{
+            # 'variable' key is missing
+            'description' => 'Option without variable',
+            'section' => 'invalid_area' # Invalid section to trigger warning
+          }]
+        })
+
+        # Stub all necessary methods
+        allow(theme).to receive(:settings).and_return(settings)
+        allow(theme).to receive(:validate_required_color_settings).and_return(true)
+        allow(theme).to receive(:validate_required_layout_attributes).and_return(true)
+        allow(theme).to receive(:validate_options_requires).and_return(true)
+        allow(theme).to receive(:validate_options_descriptions).and_return(true)
+        allow(theme).to receive(:validate_option_defaults).and_return(true)
+
+        # Stub file checks - this is crucial
+        Dugway::Theme::REQUIRED_FILES.each do |file|
+          allow(theme).to receive(:read_source_file).with(file).and_return("some content")
+        end
+
+        # Allow warn to be called
+        allow(Kernel).to receive(:warn)
+
+        # Run the validation
+        theme.valid?.should be(true)
+
+        # Check that the warning was issued
+        expect(Kernel).to have_received(:warn).with("Warning: Theme setting 'unknown' has an invalid 'section' value: 'invalid_area'. Allowed values are: #{valid_sections_string}.")
+      end
+
+      it "handles options without a variable name gracefully when section is missing" do
+        settings = base_settings.merge({
+          'options' => [{
+            # 'variable' key is missing
+            'description' => 'Option without variable or section'
+            # 'section' key is missing
+          }]
+        })
+
+        # Stub all necessary methods
+        allow(theme).to receive(:settings).and_return(settings)
+        allow(theme).to receive(:validate_required_color_settings).and_return(true)
+        allow(theme).to receive(:validate_required_layout_attributes).and_return(true)
+        allow(theme).to receive(:validate_options_requires).and_return(true)
+        allow(theme).to receive(:validate_options_descriptions).and_return(true)
+        allow(theme).to receive(:validate_option_defaults).and_return(true)
+
+        # Stub file checks
+        Dugway::Theme::REQUIRED_FILES.each do |file|
+          allow(theme).to receive(:read_source_file).with(file).and_return("some content")
+        end
+
+        # Allow warn to be called
+        allow(Kernel).to receive(:warn)
+
+        # Run the validation
+        theme.valid?.should be(true)
+
+        # Check that the warning was issued
+        expect(Kernel).to have_received(:warn).with("Warning: Theme setting 'unknown' is missing the 'section' property.")
+      end
+    end
+
+  end
+
+  shared_examples "option value validation" do |value_type|
+    context "when type is 'select' with explicit options" do
+      let(:options) do
+        [{
+          'type' => 'select',
+          'variable' => 'hero_overlay_opacity',
+          'options' => [['Bright', 'bright'], ['Dark', 'dark']],
+          value_type => 'bright'
+        }]
+      end
+
+      it "passes when #{value_type} matches a valid option" do
+        theme.instance_variable_set(:@errors, [])
+        theme.send(:validate_option_defaults)
+        expect(theme.errors).to be_empty
+      end
+
+      it "flags invalid #{value_type} values" do
+        options.first[value_type] = 'invalid'
+        theme.instance_variable_set(:@errors, [])
+        theme.send(:validate_option_defaults)
+        expect(theme.errors).to include("#{value_type.capitalize} 'invalid' is not a valid option for hero_overlay_opacity")
+      end
     end
+
+    context "when type is 'select' with numeric range" do
+      let(:options) do
+        [{
+          'type' => 'select',
+          'variable' => 'featured_products',
+          'options' => '0..100',
+          value_type => 50
+        }]
+      end
+
+      it "passes when #{value_type} is within range" do
+        theme.instance_variable_set(:@errors, [])
+        theme.send(:validate_option_defaults)
+        expect(theme.errors).to be_empty
+      end
+
+      it "flags #{value_type} outside the range" do
+        options.first[value_type] = 101
+        theme.instance_variable_set(:@errors, [])
+        theme.send(:validate_option_defaults)
+        expect(theme.errors).to include("#{value_type.capitalize} '101' is out of range for featured_products")
+      end
+    end
+
+    context "when type is 'boolean'" do
+      let(:options) do
+        [{
+          'type' => 'boolean',
+          'variable' => 'show_home_page_categories',
+          value_type => true
+        }]
+      end
+
+      it "passes when #{value_type} is a valid boolean" do
+        theme.instance_variable_set(:@errors, [])
+        theme.send(:validate_option_defaults)
+        expect(theme.errors).to be_empty
+      end
+
+      it "flags non-boolean #{value_type}" do
+        options.first[value_type] = 'true'
+        theme.instance_variable_set(:@errors, [])
+        theme.send(:validate_option_defaults)
+        expect(theme.errors).to include("#{value_type.capitalize} 'true' is not a boolean for show_home_page_categories")
+      end
+    end
+
+    context "when type is 'select' with product_orders" do
+      let(:options) do
+        [{
+          'type' => 'select',
+          'variable' => 'related_products_order',
+          'options' => 'product_orders',
+          value_type => 'top-selling'
+        }]
+      end
+
+      it "passes when #{value_type} matches a valid product_orders value" do
+        theme.instance_variable_set(:@errors, [])
+        theme.send(:validate_option_defaults)
+        expect(theme.errors).to be_empty
+      end
+
+      it "flags invalid #{value_type} values" do
+        options.first[value_type] = 'invalid'
+        theme.instance_variable_set(:@errors, [])
+        theme.send(:validate_option_defaults)
+        expect(theme.errors).to include("#{value_type.capitalize} 'invalid' is not a valid option for related_products_order")
+      end
+    end
+  end
+
+  describe "#validate_option_defaults" do
+    let(:settings) { { 'options' => options } }
+    before { allow(theme).to receive(:settings).and_return(settings) }
+
+    it_behaves_like "option value validation", 'default'
+    it_behaves_like "option value validation", 'upgrade_default'
   end
 
   def read_file(file_name)