dugway 1.2.0 → 1.3.0

data/lib/dugway/liquid/filters/util_filters.rb

@@ -1,15 +1,6 @@
 module Dugway
   module Filters
     module UtilFilters
-      private
-
-      # Registered Vars
-
-      def currency
-        @context.registers[:currency]
-      end
-
-      # Mimics
 
       DEFAULT_CURRENCY_VALUES = { :format => "%u%n", :negative_format => "-%u%n", :unit => "$", :separator => ".", :delimiter => ",", :precision => 2, :significant => false, :strip_insignificant_zeros => false }
 
@@ -126,7 +117,7 @@ module Dugway
 
       def content_tag(type, content, options = {})
         result  = tag(type, options, true)
-        result += content
+        result += content.to_s
         result += "</#{type}>"
       end
 

data/lib/dugway/liquid/tags/get.rb

@@ -5,16 +5,16 @@ module Dugway
 
       def initialize(tag_name, markup, tokens)
         if markup =~ Syntax
-          @number_to_get = $1.present? ? $2 : nil
-          @variable_name = $3
-          @collection_name = $4
+          @number_to_get = Regexp.last_match(1).present? ? Regexp.last_match(2) : nil
+          @variable_name = Regexp.last_match(3)
+          @collection_name = Regexp.last_match(4)
 
           @attributes = {}
           markup.scan(Liquid::TagAttributes) { |key, value|
             @attributes[key] = value
           }
         else
-          raise SyntaxError.new("Syntax Error in tag 'get' - Valid syntax: get [number] [items] from [collection] order:[order]")
+          raise SyntaxError, "Syntax Error in tag 'get' - Valid syntax: get [number] [items] from [collection] order:[order]"
         end
 
         super
@@ -48,9 +48,9 @@ module Dugway
 
           context[@variable_name] = context[@collection_name]
 
-          raise ArgumentError.new("Cannot get array '#{ @collection_name }'. Not found.")  if context[@variable_name].total_entries.nil?
+          raise ArgumentError, "Cannot get array '#{@collection_name}'. Not found." if context[@variable_name].total_entries.nil?
 
-          render_all @nodelist, context
+          super(context)
         end
       end
     end

data/lib/dugway/liquid/tags/paginate.rb

@@ -5,9 +5,9 @@ module Dugway
 
       def initialize(tag_name, markup, tokens)
         if markup =~ Syntax
-          @variable_name = $1
-          @collection_name = $2
-          @per_page = $3.present? ? $4 : nil
+          @variable_name = Regexp.last_match(1)
+          @collection_name = Regexp.last_match(2)
+          @per_page = Regexp.last_match(3).present? ? Regexp.last_match(4) : nil
 
           @attributes = { 'inner_window' => 3, 'outer_window' => 1 }
 
@@ -17,7 +17,7 @@ module Dugway
 
           @limit = @attributes['limit']
         else
-          raise SyntaxError.new("Syntax Error in tag 'paginate' - Valid syntax: paginate [variable] from [collection] by [number]")
+          raise SyntaxError, "Syntax Error in tag 'paginate' - Valid syntax: paginate [variable] from [collection] by [number]"
         end
 
         super
@@ -29,6 +29,7 @@ module Dugway
         @per_page = context[@per_page].present? ? context[@per_page] : (@per_page.present? ? @per_page.to_i : nil)
         @order = context[@attributes['order']].present? ? context[@attributes['order']] : @attributes['order']
 
+
         context.stack do
           context['internal'] = {
             'per_page' => @per_page,
@@ -37,21 +38,45 @@ module Dugway
             'limit' => @limit
           }
 
-          collection = context[@collection_name]
+          # Handle nested property access like "products.current"
+          collection = resolve_collection_path(context, @collection_name)
+          
           context[@variable_name] = collection
-          current_page = collection.current_page
+          
+          begin
+            current_page = collection.current_page
+          rescue StandardError => e
+            puts "Warning: Failed to get current_page: #{e.message}" if ENV['DEBUG']
+            current_page = 1
+          end
+
+          begin
+            page_size = collection.per_page
+            offset = collection.offset
+          rescue StandardError => e
+            puts "Warning: Failed to get pagination info: #{e.message}" if ENV['DEBUG']
+            page_size = 10
+            offset = 0
+          end
 
           pagination = {
-            'page_size' => collection.per_page,
+            'page_size' => page_size,
             'current_page' => current_page,
-            'current_offset' => collection.offset
+            'current_offset' => offset
           }
 
           context['paginate'] = pagination
 
-          collection_size = collection.total_entries
+          begin
+            collection_size = collection.total_entries
+          rescue StandardError => e
+            puts "Warning: Failed to get total_entries: #{e.message}" if ENV['DEBUG']
+            collection_size = collection.respond_to?(:size) ? collection.size : 0
+          end
 
-          raise ArgumentError.new("Cannot paginate array '#{ @collection_name }'. Not found.")  if collection_size.nil?
+          if collection_size.nil? || collection_size == 0
+            return ""
+          end
 
           page_count = collection.total_pages
 
@@ -103,12 +128,37 @@ module Dugway
             }
           end
 
-          render_all @nodelist, context
+          super(context)
         end
       end
 
       private
 
+      def resolve_collection_path(context, path)
+        return context[path] unless path.include?('.')
+        
+        parts = path.split('.')
+        collection = context[parts.shift]
+        
+        parts.each do |part|
+          break unless collection
+          
+          if collection.respond_to?(part)
+            collection = collection.public_send(part)
+          elsif collection.respond_to?(:liquid_method_missing)
+            collection = collection.liquid_method_missing(part)
+          else
+            collection = nil
+            break
+          end
+        end
+        
+        collection || []
+      rescue StandardError => e
+        puts "Warning: Failed to resolve collection '#{path}': #{e.message}" if ENV['DEBUG']
+        []
+      end
+
       def no_link(title)
         { 'title' => title.to_s, 'is_link' => false }
       end

data/lib/dugway/store.rb

@@ -36,7 +36,7 @@ module Dugway
     end
 
     def pages
-      @pages ||= theme_pages + custom_pages
+      @pages ||= theme_pages + custom_pages + external_pages + required_pages
     end
 
     def page(permalink)
@@ -136,6 +136,44 @@ module Dugway
       Dugway.options.dig(:store, :instant_checkout) || false
     end
 
+    def subscribe_url
+      @store_options[:subscribe_url] || account['subscribe_url']
+    end
+
+    def price_suffix
+      @store_options[:price_suffix]
+    end
+
+    def external_pages
+      @external_pages ||= begin
+        pages = []
+        if subscribe_url && !subscribe_url.empty?
+          pages << {
+            'name' => 'Subscribe',
+            'permalink' => 'subscribe',
+            'url' => subscribe_url,
+            'category' => 'external'
+          }
+        end
+        pages
+      end
+    end
+
+    def required_pages
+      @required_pages ||= begin
+        required_pages_config = @store_options[:required_pages] || account['required_pages'] || []
+        required_pages_config.map do |page_config|
+          {
+            'name' => page_config['name'],
+            'permalink' => page_config['permalink'],
+            'url' => page_config['url'],
+            'category' => page_config['category'] || 'custom',
+            'required' => true
+          }
+        end
+      end
+    end
+
     private
 
     def get(path)

data/lib/dugway/theme.rb

@@ -294,7 +294,10 @@ module Dugway
     def validate_options_requires
       return unless settings['options']
       all_variables = settings['options'].map { |o| o['variable'] }
-      valid_operators = %w(eq neq gt lt gte lte present)
+      
+      # Include variables from images and image_sets settings
+      all_variables.concat(settings['images'].map { |i| i['variable'] }) if settings['images']
+      all_variables.concat(settings['image_sets'].map { |i| i['variable'] }) if settings['image_sets']
 
       settings['options'].each do |option|
         next unless option['requires']
@@ -316,45 +319,81 @@ module Dugway
 
         # Process each rule in the array
         option['requires'].each do |rule|
-          next if rule == 'inventory'
-
-          # Extract setting name and optional operator/value
-          parts = rule.split(/\s+/)
-          setting_name = parts[0]
-          operator = parts[1]
-          value = parts[2]
-
-          if setting_name.start_with?('feature:')
-            # Validate feature flag format
-            unless setting_name =~ /^feature:[a-z_]+$/
-              @errors << "Option '#{option['variable']}' has invalid feature flag format"
-              next
-            end
+          validate_requires_rule(rule, option['variable'], all_variables)
+        end
+      end
+    end
+
+    # Validates individual requires rule - handles both string rules and object rules (like 'any')
+    def validate_requires_rule(rule, option_variable, all_variables)
+      # Handle object-based rules (like {"any": [...]})
+      if rule.is_a?(Hash)
+        if rule.has_key?('any')
+          validate_any_condition(rule['any'], option_variable, all_variables)
+        else
+          @errors << "Option '#{option_variable}' has unsupported requires object. Only 'any' is currently supported."
+        end
+        return
+      end
 
-            # Only validate operator/value if they exist
-            if operator
-              is_valid_operator = ['eq', 'neq'].include?(operator)
+      # Handle string-based rules (existing logic)
+      return if rule == 'inventory'
 
-              @errors << "Option '#{option['variable']}' has invalid operator '#{operator}'. Feature flags can only use `eq` or `neq`." unless is_valid_operator
+      valid_operators = %w(eq neq gt lt gte lte present)
 
-              is_valid_value = ['visible'].include?(value)
+      # Extract setting name and optional operator/value
+      parts = rule.split(/\s+/)
+      setting_name = parts[0]
+      operator = parts[1]
+      value = parts[2]
+
+      if setting_name.start_with?('feature:')
+        # Validate feature flag format
+        unless setting_name =~ /^feature:[a-z_]+$/
+          @errors << "Option '#{option_variable}' has invalid feature flag format"
+          return
+        end
 
-              @errors << "Option '#{option['variable']}' has invalid comparison value '#{value}'. Feature flags can only check for `visible`." unless is_valid_value
-            end
-            next
-          end
+        # Only validate operator/value if they exist
+        if operator
+          is_valid_operator = ['eq', 'neq'].include?(operator)
 
-          # --- Non-feature rule validation ---
-          unless all_variables.include?(setting_name)
-            @errors << "Option '#{option['variable']}' requires unknown setting '#{setting_name}'"
-            next # Skip further checks for this rule if setting is unknown
-          end
+          @errors << "Option '#{option_variable}' has invalid operator '#{operator}'. Feature flags can only use `eq` or `neq`." unless is_valid_operator
 
-          # Validate operator if present
-          if operator && !valid_operators.include?(operator)
-            @errors << "Option '#{option['variable']}' has invalid operator '#{operator}'. Allowed operators are: #{valid_operators.join(', ')}."
-          end
+          is_valid_value = ['visible'].include?(value)
+
+          @errors << "Option '#{option_variable}' has invalid comparison value '#{value}'. Feature flags can only check for `visible`." unless is_valid_value
         end
+        return
+      end
+
+      # --- Non-feature rule validation ---
+      unless all_variables.include?(setting_name)
+        @errors << "Option '#{option_variable}' requires unknown setting '#{setting_name}'"
+        return # Skip further checks for this rule if setting is unknown
+      end
+
+      # Validate operator if present
+      if operator && !valid_operators.include?(operator)
+        @errors << "Option '#{option_variable}' has invalid operator '#{operator}'. Allowed operators are: #{valid_operators.join(', ')}."
+      end
+    end
+
+    # Validates 'any' condition - ensures it's an array and validates each nested rule
+    def validate_any_condition(any_rules, option_variable, all_variables)
+      unless any_rules.is_a?(Array)
+        @errors << "Option '#{option_variable}' has invalid 'any' condition - must be an array of rules"
+        return
+      end
+
+      if any_rules.empty?
+        @errors << "Option '#{option_variable}' has empty 'any' condition - must contain at least one rule"
+        return
+      end
+
+      # Validate each rule within the 'any' condition
+      any_rules.each do |nested_rule|
+        validate_requires_rule(nested_rule, option_variable, all_variables)
       end
     end
 

data/lib/dugway/version.rb

@@ -1,3 +1,3 @@
 module Dugway
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

data/lib/dugway.rb

@@ -11,6 +11,7 @@ end
 
 require 'active_support/all'
 require 'i18n'
+require 'i18n/backend/fallbacks'
 require 'bigcartel-currency-locales'
 require 'bigcartel/theme/fonts'
 
@@ -38,6 +39,14 @@ end
 # Set available locales. Provide a default if no locale files are found (e.g., during initial setup or in case of an error).
 I18n.config.available_locales = available_locales.empty? ? [:'en-US', :en] : available_locales
 
+# Enable fallbacks for I18n
+# This allows sv-SE to fallback to sv, en-GB to en, etc.
+I18n::Backend::Simple.include(I18n::Backend::Fallbacks)
+
+# Disable enforce_available_locales to allow invalid locales like 'eu'
+# We'll handle them gracefully with fallbacks
+I18n.enforce_available_locales = false
+
 # Reload I18n to apply changes and load the translations from the files.
 I18n.backend.reload!
 
@@ -63,7 +72,21 @@ module Dugway
 
       BigCartel::CurrencyLocales.insert
       I18n.default_locale = 'en-US'
-      I18n.locale = Dugway.store.locale
+      
+      # Set locale with fallback handling for invalid or missing locales
+      begin
+        requested_locale = Dugway.store.locale
+        if requested_locale
+          # Try to set the locale - if it's completely invalid (like 'eu'), 
+          # this will fall back to default_locale due to enforce_available_locales = false
+          I18n.locale = requested_locale
+        else
+          I18n.locale = I18n.default_locale
+        end
+      rescue I18n::InvalidLocale
+        # If somehow we still get an invalid locale error, fall back to default
+        I18n.locale = I18n.default_locale
+      end
 
       Rack::Builder.app do
         use Rack::Session::Cookie, :secret => 'stopwarningmeaboutnothavingasecret'

data/locales/storefront.de.yml

@@ -59,6 +59,8 @@ de:
       select: "Wählen"
       select_variant: "Option wählen"
       sold_out: "Ausverkauft"
+      variant: "Option"
+      variants: "Optionen"
     cart:
       checkout: "Zur Kasse"
       continue_shopping: "Weiter einkaufen"

data/locales/storefront.en-CA.yml

@@ -59,6 +59,8 @@ en-CA:
       select: "Select"
       select_variant: "Select option"
       sold_out: "Sold out"
+      variant: "Option"
+      variants: "Options"
     cart:
       checkout: "Checkout"
       continue_shopping: "Continue shopping"

data/locales/storefront.en-GB.yml

@@ -59,6 +59,8 @@ en-GB:
       select: "Select"
       select_variant: "Select option"
       sold_out: "Sold out"
+      variant: "Option"
+      variants: "Options"
     cart:
       checkout: "Checkout"
       continue_shopping: "Continue shopping"

data/locales/storefront.en-US.yml

@@ -59,6 +59,8 @@ en-US:
       select: "Select"
       select_variant: "Select option"
       sold_out: "Sold out"
+      variant: "Option"
+      variants: "Options"
     cart:
       checkout: "Checkout"
       continue_shopping: "Continue shopping"

data/locales/storefront.es-ES.yml

@@ -59,6 +59,8 @@ es-ES:
       select: "Selecciona"
       select_variant: "Seleccionar opción"
       sold_out: "Agotado"
+      variant: "Opción"
+      variants: "Opciones"
     cart:
       checkout: "Comprar"
       continue_shopping: "Continuar comprando"

data/locales/storefront.es-MX.yml

@@ -59,6 +59,8 @@ es-MX:
       select: "Selecciona"
       select_variant: "Seleccionar opción"
       sold_out: "Agotado"
+      variant: "Opción"
+      variants: "Opciones"
     cart:
       checkout: "Pagar"
       continue_shopping: "Continuar comprando"

data/locales/storefront.fr-CA.yml

@@ -59,6 +59,8 @@ fr-CA:
       select: "Sélectionner"
       select_variant: "Choisir une option"
       sold_out: "Épuisé"
+      variant: "Option"
+      variants: "Options"
     cart:
       checkout: "Commander"
       continue_shopping: "Continuer à magasiner"

data/locales/storefront.fr-FR.yml

@@ -59,6 +59,8 @@ fr-FR:
       select: "Sélectionner"
       select_variant: "Choisir une option"
       sold_out: "Épuisé"
+      variant: "Option"
+      variants: "Options"
     cart:
       checkout: "Commander"
       continue_shopping: "Continuer les achats"

data/locales/storefront.id.yml

@@ -59,6 +59,8 @@ id:
       select: "Pilih"
       select_variant: "Pilih varian"
       sold_out: "Habis terjual"
+      variant: "Varian"
+      variants: "Varian"
     cart:
       checkout: "Pembayaran"
       continue_shopping: "Lanjutkan belanja"

data/locales/storefront.it.yml

@@ -59,6 +59,8 @@ it:
       select: "Seleziona"
       select_variant: "Seleziona opzione"
       sold_out: "Esaurito"
+      variant: "Opzione"
+      variants: "Opzioni"
     cart:
       checkout: "Cassa"
       continue_shopping: "Continua lo shopping"

data/locales/storefront.ja.yml

@@ -59,6 +59,8 @@ ja:
       select: "選択"
       select_variant: "詳細を選択"
       sold_out: "売り切れ"
+      variant: "詳細"
+      variants: "詳細"
     cart:
       checkout: "レジに進む"
       continue_shopping: "買い物を続ける"

data/locales/storefront.ko.yml

@@ -59,6 +59,8 @@ ko:
       select: "선택"
       select_variant: "옵션 선택"
       sold_out: "품절"
+      variant: "옵션"
+      variants: "옵션"
     cart:
       checkout: "결제하기"
       continue_shopping: "계속 쇼핑하기"

data/locales/storefront.nl.yml

@@ -59,6 +59,8 @@ nl:
       select: "Selecteren"
       select_variant: "Kies optie"
       sold_out: "Uitverkocht"
+      variant: "Optie"
+      variants: "Opties"
     cart:
       checkout: "Afrekenen"
       continue_shopping: "Verder winkelen"

data/locales/storefront.pl.yml

@@ -59,6 +59,8 @@ pl:
       select: "Wybierz"
       select_variant: "Wybierz opcję"
       sold_out: "Wyprzedane"
+      variant: "Opcja"
+      variants: "Opcje"
     cart:
       checkout: "Do kasy"
       continue_shopping: "Kontynuuj zakupy"

data/locales/storefront.pt-BR.yml

@@ -59,6 +59,8 @@ pt-BR:
       select: "Selecione"
       select_variant: "Selecionar opção"
       sold_out: "Esgotado"
+      variant: "Opção"
+      variants: "Opções"
     cart:
       checkout: "Comprar"
       continue_shopping: "Continuar comprando"

data/locales/storefront.pt-PT.yml

@@ -59,6 +59,8 @@ pt-PT:
       select: "Selecione"
       select_variant: "Selecionar opção"
       sold_out: "Esgotado"
+      variant: "Opção"
+      variants: "Opções"
     cart:
       checkout: "Comprar"
       continue_shopping: "Continuar a comprar"

data/locales/storefront.ro.yml

@@ -59,6 +59,8 @@ ro:
       select: "Selectează"
       select_variant: "Alege opțiunea"
       sold_out: "Epuizat"
+      variant: "Opțiune"
+      variants: "Opțiuni"
     cart:
       checkout: "Comandă"
       continue_shopping: "Continuă cumpărăturile"

data/locales/storefront.sv.yml

@@ -59,6 +59,8 @@ sv:
       select: "Välj"
       select_variant: "Välj alternativ"
       sold_out: "Slutsåld"
+      variant: "Alternativ"
+      variants: "Alternativ"
     cart:
       checkout: "Till kassan"
       continue_shopping: "Fortsätt handla"

data/locales/storefront.tr.yml

@@ -59,6 +59,8 @@ tr:
       select: "Seç"
       select_variant: "Seçenek seç"
       sold_out: "Tükendi"
+      variant: "Seçenek"
+      variants: "Seçenekler"
     cart:
       checkout: "Ödeme"
       continue_shopping: "Alışverişe devam et"

data/locales/storefront.zh-CN.yml

@@ -59,6 +59,8 @@ zh-CN:
       select: "选择"
       select_variant: "选择规格"
       sold_out: "已售罄"
+      variant: "规格"
+      variants: "规格"
     cart:
       checkout: "结账"
       continue_shopping: "继续购物"

data/locales/storefront.zh-TW.yml

@@ -59,6 +59,8 @@ zh-TW:
       select: "選擇"
       select_variant: "選擇規格"
       sold_out: "已售罄"
+      variant: "規格"
+      variants: "規格"
     cart:
       checkout: "結帳"
       continue_shopping: "繼續購物"

data/mise.toml

@@ -0,0 +1,2 @@
+[tools]
+ruby = "2.7.8"

data/spec/spec_helper.rb

@@ -10,6 +10,9 @@ RSpec.configure do |config|
   fixture_path = File.join(Dir.pwd, 'spec', 'fixtures')
 
   config.before(:each) do
+    # Reset cart state between tests
+    Dugway.instance_variable_set(:@cart, nil)
+    
     # Stub Dugway.logger to write to /dev/null before each test
     # This prevents log file creation/modification by the test suite.
     allow(Dugway).to receive(:logger).and_return(Logger.new(File::NULL))