dugway 1.1.0 → 1.3.0

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

@@ -40,21 +40,89 @@ module Dugway
         when 'sign' then money_with_sign(amount)
         when 'code' then money_with_code(amount)
         when 'sign_and_code' then money_with_sign_and_code(amount)
-        else number_to_currency(amount, :unit => '').strip
+        when 'rounded' then
+          begin
+            number_to_currency(amount.ceil, { :unit => '', :format => '%n', :precision => 0 }).to_s.strip
+          rescue FrozenError => e
+            sprintf('%.0f', amount.ceil.to_f)
+          end
+        when 'sign_rounded' then money_with_sign(amount.ceil, 0)
+        when 'code_rounded' then money_with_code(amount.ceil, 0)
+        else
+          begin
+            number_to_currency(amount, { :unit => '', :format => '%n' }).to_s.strip
+          rescue FrozenError => e
+            # Fallback for frozen hash issues in newer Ruby versions
+            sprintf('%.2f', amount.to_f)
+          end
+        end
+      end
+
+      def product_price(product, money_format = nil, range_format = nil)
+        return unless product
+
+        if product['variable_pricing']
+          case range_format
+          when 'min_only'
+            money(product['min_price'], money_format)
+          when 'max_only'
+            money(product['max_price'], money_format)
+          else # default, nil, or any other value
+            format_price_range(product['min_price'], product['max_price'], money_format)
+          end
+        else
+          money(product['default_price'] || product['price'], money_format)
         end
       end
 
-      def money_with_sign(amount)
-        unit = I18n.translate('number.currency.format.unit')
-        number_to_currency(amount).gsub(unit, %{<span class="currency_sign">#{ HTMLEntities.new.encode(unit, :named) }</span>})
+      def money_with_sign(amount, precision = nil)
+        begin
+          unit = I18n.translate('number.currency.format.unit')
+          options = { :unit => "<span class=\"currency_sign\">#{HTMLEntities.new.encode(unit, :named)}</span>" }
+          options[:precision] = precision if precision
+          number_to_currency(amount, options)
+        rescue FrozenError => e
+          # Fallback for frozen hash issues
+          format_string = precision == 0 ? '%.0f' : '%.2f'
+          "<span class=\"currency_sign\">$</span>#{sprintf(format_string, amount.to_f)}"
+        end
       end
 
-      def money_with_code(amount)
-        %{#{ money(amount) } <span class="currency_code">#{ currency['code'] }</span>}
+      def money_with_code(amount, precision = nil)
+        begin
+          # Format number without currency unit, respecting locale's number formatting rules
+          number_locale = normalize_currency_locale_for_formatting(currency['locale'])
+          options = { :unit => '', :format => '%n', :locale => number_locale }
+          options[:precision] = precision if precision
+          formatted_number = number_to_currency(amount, options).to_s.strip
+          
+          # Use locale-specific format string to ensure proper currency code placement
+          # Keep original locale for bigcartel-currency-locales gem compatibility
+          format_string = I18n.translate('number.currency.format.format', 
+                                       :locale => currency['locale'], 
+                                       :default => '%u%n')
+          
+          code_span = "<span class=\"currency_code\">#{currency['code']}</span>"
+          format_string.gsub('%n', formatted_number).gsub('%u', code_span)
+        rescue => e
+          # Fallback for frozen hash or I18n issues
+          format_string = precision == 0 ? '%.0f' : '%.2f'
+          "<span class=\"currency_code\">#{currency['code']}</span>#{sprintf(format_string, amount.to_f)}"
+        end
       end
 
       def money_with_sign_and_code(amount)
-        %{#{ money_with_sign(amount) } <span class="currency_code">#{ currency['code'] }</span>}
+        %{#{ money_with_sign(amount).to_s } <span class="currency_code">#{ currency['code'] }</span>}
+      end
+
+      # Liquid 5.x compatibility: ensure proper JSON output
+      def to_json(input)
+        # Handle Liquid Drops specially - use as_json for serialization
+        if input.respond_to?(:as_json)
+          JSON.generate(input.as_json)
+        else
+          JSON.generate(input)
+        end
       end
 
       # Shipping Filters
@@ -137,10 +205,104 @@ module Dugway
 
       private
 
+      def currency
+        @context.registers[:currency]
+      end
+
       def contact_tab_index
         @contact_tab_index ||= 0
         @contact_tab_index += 1
       end
+
+      def format_price_range(min_price, max_price, money_format)
+        case money_format
+        when "sign"
+          format_range_with_sign(min_price, max_price)
+        when "code"
+          format_range_with_code(min_price, max_price)
+        when "sign_rounded"
+          format_range_with_sign(min_price.ceil, max_price.ceil, 0)
+        when "code_rounded"
+          format_range_with_code(min_price.ceil, max_price.ceil, 0)
+        when "rounded"
+          format_range_plain(min_price.ceil, max_price.ceil, 0)
+        else
+          format_range_plain(min_price, max_price)
+        end
+      end
+
+      def format_range_with_sign(min_price, max_price, precision = nil)
+        # Sign on both prices for clarity
+        # US: $10.00 - $20.00  |  FR: 10,00 € - 20,00 €
+        min_formatted = money_with_sign(min_price, precision)
+        max_formatted = money_with_sign(max_price, precision)
+        "#{min_formatted} - #{max_formatted}"
+      end
+
+      def format_range_with_code(min_price, max_price, precision = nil)
+        # Single code in locale-appropriate position
+        # US: $10.00 - 20.00 USD  |  FR: 10,00 - 20,00 EUR
+        code_span = "<span class=\"currency_code\">#{currency['code']}</span>"
+        range_string = build_number_range(min_price, max_price, precision)
+        apply_currency_format(range_string, code_span)
+      end
+
+      def format_range_plain(min_price, max_price, precision = nil)
+        # No currency indicators
+        begin
+          options = { :unit => '', :format => '%n' }
+          options[:precision] = precision if precision
+          min_formatted = number_to_currency(min_price, options).to_s.strip
+          max_formatted = number_to_currency(max_price, options).to_s.strip
+          "#{min_formatted} - #{max_formatted}"
+        rescue FrozenError => e
+          # Fallback for frozen hash issues
+          format_string = precision == 0 ? '%.0f' : '%.2f'
+          "#{sprintf(format_string, min_price.to_f)} - #{sprintf(format_string, max_price.to_f)}"
+        end
+      end
+
+      def build_number_range(min_price, max_price, precision = nil)
+        min_formatted = format_number_plain(min_price, precision)
+        max_formatted = format_number_plain(max_price, precision)
+        "#{min_formatted} - #{max_formatted}"
+      end
+
+      def format_number_plain(amount, precision = nil)
+        begin
+          number_locale = normalize_currency_locale_for_formatting(currency['locale'])
+          options = { :unit => '', :format => '%n', :locale => number_locale }
+          options[:precision] = precision if precision
+          number_to_currency(amount, options).to_s.strip
+        rescue FrozenError => e
+          format_string = precision == 0 ? '%.0f' : '%.2f'
+          sprintf(format_string, amount.to_f)
+        end
+      end
+
+      def apply_currency_format(range_string, currency_span)
+        # Use I18n to get locale-specific format like storefront does
+        begin
+          # Keep original locale for bigcartel-currency-locales gem compatibility
+          format_string = I18n.translate('number.currency.format.format', 
+                                       locale: currency['locale'], 
+                                       default: '%u%n')
+          format_string.gsub('%n', range_string).gsub('%u', currency_span)
+        rescue
+          # Fallback if I18n fails
+          "#{range_string} #{currency_span}"
+        end
+      end
+
+      def normalize_currency_locale_for_formatting(locale)
+        # Handle invalid 'eu' locale from production system for number formatting only
+        case locale
+        when 'eu'
+          'de-DE'  # Use German locale for EUR number formatting (1.200,99 style)
+        else
+          locale
+        end
+      end
     end
   end
 end

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

@@ -2,6 +2,7 @@ module Dugway
   module Filters
     module FontFilters
       def font_family(font_name)
+        return '' if font_name.nil? || font_name.to_s.strip.empty?
         ThemeFont.find_family_by_name(font_name)
       end
     end

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

@@ -16,6 +16,7 @@ module Dugway
   class Liquifier
     def initialize(request)
       @request = request
+      load_theme_locales
     end
 
     def render(content, variables={})
@@ -41,7 +42,7 @@ module Dugway
 
     def self.render_styles(css)
       Liquid::Template.parse(css).render!(
-        { 'theme' => Drops::ThemeDrop.new(Dugway.theme.customization) },
+        { 'theme' => Drops::ThemeDrop.new(Dugway.theme.customization, Dugway.theme.settings) },
         :registers => { :settings => Dugway.theme.settings }
       )
     end
@@ -68,7 +69,8 @@ module Dugway
       {
         'store' => Drops::AccountDrop.new(store.account),
         'cart' => Drops::CartDrop.new(cart),
-        'theme' => Drops::ThemeDrop.new(theme.customization),
+        # Pass both customization and definitions to ThemeDrop
+        'theme' => Drops::ThemeDrop.new(theme.customization, theme.settings),
         'pages' => Drops::PagesDrop.new(store.pages.map { |p| Drops::PageDrop.new(p) }),
         'categories' => Drops::CategoriesDrop.new(store.categories.map { |c| Drops::CategoryDrop.new(c) }),
         'artists' => Drops::ArtistsDrop.new(store.artists.map { |a| Drops::ArtistDrop.new(a) }),
@@ -77,6 +79,10 @@ module Dugway
         'head_content' => [window_bigcartel_script, head_content].join,
         'bigcartel_credit' => bigcartel_credit,
         'powered_by_big_cartel' => powered_by_big_cartel,
+        'big_cartel_credit_logo' => big_cartel_credit_logo,
+        # Pass both customization and definitions to TranslationsDrop
+        'translations' => Drops::TranslationsDrop.new(theme.customization, theme.settings),
+        't' => Drops::TranslationsDrop.new(theme.customization, theme.settings),
       }
     end
 
@@ -109,17 +115,47 @@ module Dugway
       "<script>#{script}</script>"
     end
 
+    def read_svg_asset(filename)
+      File.read(File.join(File.dirname(__FILE__), 'assets', filename))
+    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
 
     def powered_by_big_cartel
-      %(<a class="bigcartel-credit" href="https://www.bigcartel.com/?utm_source=bigcartel&utm_medium=storefront&utm_campaign=123" title="Powered by Big Cartel">
-        <span class="bigcartel-credit__text" aria-hidden="true">Powered by</span>
-        <svg aria-hidden="true" class="bigcartel-credit__lockup" xmlns="http://www.w3.org/2000/svg" viewBox="1.99 2.05 124.96 24.95">
-          <path d="M46.18 4A1.91 1.91 0 1 1 50 4a1.91 1.91 0 1 1-3.81 0Zm78.76 14.35a.81.81 0 0 1-.25-.69V2.23h-4.52v2.68h1.58V18c0 2.14 1.11 3.28 3.2 3.28a6.56 6.56 0 0 0 2-.42v-2.78c-1.28.51-1.8.38-2.01.23Zm-75.27.05h1.43V21h-5.79v-2.64h1.43v-8h-1.61V7.7h4.54Zm-11.09-11a5.81 5.81 0 0 0-4.36 1.87V2.23H29.7v2.68h1.62v12.71a.81.81 0 0 1-.25.69c-.43.33-1.5 0-2.06-.23v2.76a6.59 6.59 0 0 0 2.05.42 2.92 2.92 0 0 0 2.74-1.32 6.86 6.86 0 0 0 4.27 1.34 6.66 6.66 0 0 0 6.86-7c-.01-4.06-2.68-6.97-6.35-6.97ZM38 18.57c-2.15 0-3.72-1.75-3.72-4.17s1.55-4.32 3.78-4.32a3.75 3.75 0 0 1 3.75 4.1c.02 2.55-1.58 4.39-3.81 4.39Zm68.86-.49v2.76a7.52 7.52 0 0 1-2 .42c-2.09 0-3.2-1.14-3.2-3.28V5.36l2.93-1.92V7.7h3.81l-1.91 2.68h-1.9v7.24a.77.77 0 0 0 .26.69c.53.4 2.03-.23 2.03-.23ZM58 7.31c-3.88 0-6.69 3-6.69 7.11s2.66 6.87 6.33 6.87A6.14 6.14 0 0 0 62 19.45v1.42c0 2.72-2.4 3.45-3.83 3.45a5.22 5.22 0 0 1-3.12-1.06l-2.36 1.83A7.78 7.78 0 0 0 58 27c3.21 0 6.95-1.63 6.95-6.21v-6.38A6.84 6.84 0 0 0 58 7.31Zm.12 11.29c-2.19 0-3.72-1.74-3.72-4.23s1.6-4.21 3.8-4.21a3.94 3.94 0 0 1 3.8 4.21 4 4 0 0 1-3.85 4.23ZM120.6 15c0-5.05-3.45-7.69-6.85-7.69a6.76 6.76 0 0 0-6.58 7.06 7.13 7.13 0 0 0 12.69 4.39l-2.22-1.71a4.24 4.24 0 0 1-3.44 1.69 3.86 3.86 0 0 1-3.94-3.11h10.28a3.09 3.09 0 0 0 .06-.63Zm-10.35-2.08a3.65 3.65 0 0 1 3.56-3.11 3.77 3.77 0 0 1 3.77 3.11ZM94.92 10V7.7h-4v2.68h1.62v8h-2.35a.83.83 0 0 1-.61-.19.91.91 0 0 1-.19-.64v-5.77c0-1.31-.65-4.47-5.52-4.47a7.85 7.85 0 0 0-4.14 1.18l1.17 2.23a5 5 0 0 1 3-.78 3.26 3.26 0 0 1 1.76.49 2.08 2.08 0 0 1 .81 1.78v1.25a6.58 6.58 0 0 0-3.21-.92c-2.58 0-3.91 1.62-5.19 3.2s-2.51 3-5 2.92c-2.27-.11-3.63-1.86-3.63-4.43 0-2.39 1.45-4 3.54-4a3.75 3.75 0 0 1 3.7 3.18l2.45-1.9a6.3 6.3 0 0 0-6.3-4.18 6.72 6.72 0 0 0-6.48 7c0 3.43 2.1 7.16 6.62 7.16a7.45 7.45 0 0 0 5.87-2.73 4.38 4.38 0 0 0 4.08 2.57 5.91 5.91 0 0 0 3.93-1.66 2.87 2.87 0 0 0 2.8 1.33h7.42v-2.64h-1.61v-3.21c0-3.3 1.09-4.77 3.56-4.77a3.68 3.68 0 0 1 1.45.31V8a4.81 4.81 0 0 0-1.74-.25A4.21 4.21 0 0 0 94.92 10Zm-8.47 7.48a4.93 4.93 0 0 1-3.16 1.41 1.9 1.9 0 0 1-2.05-1.91 2 2 0 0 1 2.18-2 5 5 0 0 1 3 1.18ZM11 14.52v-.89a1.78 1.78 0 0 1 .83-1.51l7.35-4.7A1.79 1.79 0 0 0 20 5.91V2.05L11 7.8 2 2.05V14.2a8.69 8.69 0 0 0 3.88 7.58L11 25.05l5.12-3.27A8.69 8.69 0 0 0 20 14.2V8.77Z" class="a"></path>
-        </svg>
-      </a>)
+      build_powered_by_link(include_text: true)
+    end
+
+    def big_cartel_credit_logo
+      build_powered_by_link(include_text: false)
+    end
+
+    def build_powered_by_link(include_text: true)
+      svg_content = read_svg_asset('big_cartel_logo.svg')
+      
+      text_span = include_text ? '      <span class="bigcartel-credit__text" aria-hidden="true">Powered by</span>' : ''
+      <<~HTML
+        <a class="bigcartel-credit" href="https://www.bigcartel.com/?utm_source=bigcartel&utm_medium=storefront&utm_campaign=123}" title="Powered by Big Cartel" data-bc-hook="attribution">
+        #{text_span}
+          #{svg_content}
+        </a>
+      HTML
+    end
+
+    # Load theme-specific override locales
+    def load_theme_locales
+      return unless Dugway.source_dir && Dir.exist?(File.dirname(Dugway.source_dir))
+      
+      parent_dir = File.dirname(Dugway.source_dir)
+      theme_locales_dir = File.join(parent_dir, 'locales')
+      
+      if Dir.exist?(theme_locales_dir)
+        theme_locales_path = File.expand_path(theme_locales_dir)
+        # Ensure theme locales are loaded *after* defaults to allow overrides
+        I18n.load_path |= Dir[File.join(theme_locales_path, 'storefront.*.yml')]
+        I18n.backend.reload!
+      end
     end
   end
 end

data/lib/dugway/store.rb

@@ -8,8 +8,9 @@ module Dugway
     default_timeout 5
     headers 'User-Agent' => "Dugway #{ Dugway::VERSION }"
 
-    def initialize(subdomain)
+    def initialize(subdomain, store_options = {})
       self.class.base_uri "https://api.bigcartel.com/#{ subdomain }"
+      @store_options = store_options || {}
     end
 
     def account
@@ -35,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)
@@ -124,13 +125,55 @@ module Dugway
     end
 
     def locale
-      currency['locale']
+      @store_options[:locale] || currency['locale']
+    end
+
+    def website
+      @store_options[:website] || account['website']
     end
 
     def instant_checkout?
       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)