dugway 1.0.10 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35b25d6267e8587b0d523fd8edf159a89b2f06990e9dd65d6997ff03588b208e
-  data.tar.gz: f389c8591877e2c149a09457d0b6706c1ba09379e6e99551891b7de4a636b2c9
+  metadata.gz: c3efe750c07138767b6b491f5fd375df42560fa0dd77fd18e3f0bd10578667f5
+  data.tar.gz: 90ab41b88afa8995d7890612ecdd262f0cb2146dfea7c7b1eced3d99bd78744d
 SHA512:
-  metadata.gz: 1f8838351d64308b7c4faa1b8532f736b7f12a8eb901473d4497350177b065d09dbe7fc31f64a08fa03cc96ffb3248d3046c93204e3fc6dedc6cc09d1771ed97
-  data.tar.gz: 26c85d0eb999c2b7478f1c44ffb0b52900e06e5bad03f4846f82e27308af51d91ba5cfbfb47426ae695b81336da873dbd3619fc1d61282e5b7b67447e2094a3d
+  metadata.gz: 922ee155123b7f98a421bdf5039b707b48defa71a55296ecad5ac96185c587775885b78e4d3534462a52a35f86af23d69094e65df2bbbf58e217f06cbcfd00d6
+  data.tar.gz: 419a042a3b9fffb5d8951b27c06b300d996a95407bf634d988fced33eb3bb8af380eee29e2f157d87d19c045a60e13d3037f196980fb9b0a5c2be535cf14f230

data/README.md

@@ -238,6 +238,6 @@ we use the **default** values from your **settings.json** file.
   },
   "background_color": "#CCCCCC",
   "show_search": true,
-  "twitter_username": "bigcartel"
+  "instagram_username": "https://instagram.com/bigcartel"
 }
 ```

data/lib/dugway/cli/build.rb

@@ -5,6 +5,16 @@ module Dugway
     class Build < Thor::Group
       include Thor::Actions
 
+      class_option 'skip-color-validation',
+        type: :boolean,
+        default: false,
+        desc: "Skip color settings validation"
+
+      class_option 'skip-layout-attribute-validation',
+        type: :boolean,
+        default: false,
+        desc: "Skip layout file data attribute validation"
+
       def self.source_root
         File.join(Dir.pwd, 'source')
       end
@@ -14,9 +24,10 @@ module Dugway
       end
 
       def validate
-        unless theme.valid?
+        unless theme.valid?(validate_colors: !options['skip-color-validation'], validate_layout_attributes: !options['skip-layout-attribute-validation'])
           theme.errors.each { |error| say(error, :red) }
-          raise "Theme is invalid"
+          say("\nTheme is invalid", :red)
+          exit(1)
         end
       end
 

data/lib/dugway/cli/templates/dugway.tt

@@ -22,6 +22,6 @@
   //   },
   //   "background_color": "#CCCCCC",
   //   "show_search": true,
-  //   "twitter_username": "bigcartel"
+  //   "instagram_url": "https://instagram.com/bigcartel"
   // }
 }

data/lib/dugway/cli/templates/source/layout.html

@@ -94,8 +94,8 @@
     </div>
 
     <footer>
-      {% if theme.twitter_username != blank %}
-      <p><a href="http://twitter/{{ theme.twitter_username }}">Follow @{{ theme.twitter_username }}</a></p>
+      {% if theme.instagram_url != blank %}
+      <p><a href="{{ theme.instagram_url }}">Follow us on Instagram</a></p>
       {% endif %}
     </footer>
   </body>

data/lib/dugway/cli/templates/source/settings.json

@@ -37,6 +37,53 @@
       "default": "Helvetica"
     }
   ],
+  "preset_styles": {
+    "preview": {
+      "title_font": "header_font",
+      "body_font": "text_font",
+      "text_color": "primary_text_color",
+      "background_color": "background_color"
+    },
+    "presets": [
+      {
+        "group_name": "Classic",
+        "styles": [
+          {
+            "style_name": "Classic #1",
+            "fonts": {
+              "header_font": "DM Sans",
+              "text_font": "DM Sans"
+            },
+            "colors": {
+              "background_color": "#FFFFFF",
+              "primary_text_color": "#000000",
+              "link_text_color": "#000000",
+              "link_hover_color": "#BF0101",
+              "button_background_color": "#000000",
+              "button_text_color": "#FFFFFF",
+              "button_hover_background_color": "#BF0101"
+            }
+          },
+          {
+            "style_name": "Classic #2",
+            "fonts": {
+              "header_font": "Lora",
+              "text_font": "Roboto"
+            },
+            "colors": {
+              "background_color": "#F7F7F7",
+              "primary_text_color": "#222222",
+              "link_text_color": "#222222",
+              "link_hover_color": "#014ABF",
+              "button_background_color": "#222222",
+              "button_text_color": "#FFFFFF",
+              "button_hover_background_color": "#014ABF"
+            }
+          }
+        ]
+      }
+    ]
+  },
   "colors": [
     {
       "variable": "background_color",
@@ -44,9 +91,34 @@
       "default": "#FAFAFA"
     },
     {
-      "variable": "text_color",
+      "variable": "primary_text_color",
+      "label": "Text Color",
+      "default": "#222222"
+    },
+    {
+      "variable": "link_text_color",
+      "label": "Text Color",
+      "default": "#222222"
+    },
+    {
+      "variable": "link_hover_color",
+      "label": "Text Color",
+      "default": "#014ABF"
+    },
+    {
+      "variable": "button_background_color",
       "label": "Text Color",
       "default": "#222222"
+    },
+    {
+      "variable": "button_text_color",
+      "label": "Text Color",
+      "default": "#FFFFFF"
+    },
+    {
+      "variable": "button_hover_background_color",
+      "label": "Text Color",
+      "default": "#014ABF"
     }
   ],
   "options": [
@@ -74,10 +146,10 @@
       "description": "The number of products shown per page"
     },
     {
-      "variable": "twitter_username",
-      "label": "Twitter username",
+      "variable": "instagram_url",
+      "label": "Instagram URL",
       "type": "text",
-      "description": "Ex: @bigcartel"
+      "description": "Ex: https://instagram.com/bigcartel"
     }
   ]
 }

data/lib/dugway/cli/templates/source/stylesheets/_config.css.sass

@@ -1,2 +1,13 @@
-$marginSize: 30px
+$margin-size: 30px
 $border: dashed 1px #ddd
+
+$text-font: #{"{{ theme.text_font | font_family }}"}
+$header-font: #{"{{ theme.header_font | font_family }}"}
+
+$background-color: #{"{{ theme.background_color }}"}
+$primary-text-color: #{"{{ theme.primary_text_color }}"}
+$link-text-color: #{"{{ theme.link_text_color }}"}
+$link-hover-color: #{"{{ theme.link_hover_color }}"}
+$button-background-color: #{"{{ theme.button_background_color }}"}
+$button-text-color: #{"{{ theme.button_text_color }}"}
+$button-hover-background-color: #{"{{ theme.button_hover_background_color }}"}

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/cli/templates/source/stylesheets/layout.css.sass

@@ -1,17 +1,17 @@
 @import 'config'
 
 body
-  background: #{"{{ theme.background_color }}"}
-  color: #{"{{ theme.text_color }}"}
-  font: 14px/1.4 normal #{"{{ theme.text_font | font_family }}"}
+  background: $background-color
+  color: $primary-text-color
+  font: 14px/1.4 normal $text-font
   margin: 100px
 
 a
-  color: #72C29B
+  color: $link-text-color
   text-decoration: none
 
   &:hover
-    color: #60AA85
+    color: $link-hover-color
 
 ul
   list-style-type: disc
@@ -20,7 +20,7 @@ ol
   list-style-type: decimal
 
 ul, ol
-  margin-left: $marginSize
+  margin-left: $margin-size
 
 ul.unstyled,
 ol.unstyled
@@ -30,20 +30,20 @@ ol.unstyled
 
 header
   border-bottom: $border
-  font-family: #{"{{ theme.header_font | font_family }}"}
-  margin-bottom: $marginSize
-  padding-bottom: $marginSize
+  font-family: $header-font
+  margin-bottom: $margin-size
+  padding-bottom: $margin-size
   text-align: center
 
   a
-    color: #666
+    color: $link-text-color
     font-size: 2.5em
 
     &:hover
-      color: #333
+      color: $link-hover-color
 
 h1, h2, h3, h4, h5
-  font-family: #{"{{ theme.header_font | font_family }}"}
+  font-family: $header-font
 
 div.wrap
   display: table
@@ -52,7 +52,7 @@ div.wrap
 aside
   border-right: $border
   display: table-cell
-  padding-right: $marginSize
+  padding-right: $margin-size
   width: 20%
 
   section
@@ -66,15 +66,15 @@ aside
       margin-bottom: .3em
 
       a
-        color: #999
+        color: $link-text-color
         font-size: .9em
 
         &:hover
-          color: #333
+          color: $link-hover-color
 
 section.content
   display: table-cell
-  padding-left: $marginSize
+  padding-left: $margin-size
   width: 80%
 
 form

data/lib/dugway/cli/templates/source/stylesheets/products.css.sass

@@ -9,8 +9,8 @@ body#home, body#products
     li.product
       box-sizing: border-box
       float: left
-      padding-bottom: $marginSize
-      padding-right: $marginSize
+      padding-bottom: $margin-size
+      padding-right: $margin-size
       max-width: 30%
 
       &:nth-child(3n+1)
@@ -18,7 +18,7 @@ body#home, body#products
 
     img
       display: block
-      margin-bottom: $marginSize / 2
+      margin-bottom: $margin-size / 2
       max-width: 100%
 
     div.pagination

data/lib/dugway/cli/validate.rb

@@ -0,0 +1,32 @@
+module Dugway
+  module Cli
+    class Validate < Thor::Group
+      include Thor::Actions
+
+      class_option 'skip-color-validation',
+        type: :boolean,
+        default: false,
+        desc: "Skip color settings validation"
+
+      class_option 'skip-layout-attribute-validation',
+        type: :boolean,
+        default: false,
+        desc: "Skip layout file data attribute validation"
+
+      def validate
+        unless theme.valid?(validate_colors: !options['skip-color-validation'], validate_layout_attributes: !options['skip-layout-attribute-validation'])
+          theme.errors.each { |error| say(error, :red) }
+          say("\nTheme is invalid", :red)
+          exit(1)
+        end
+        say("Theme is valid!", :green)
+      end
+
+      private
+
+      def theme
+        @theme ||= Dugway.theme
+      end
+    end
+  end
+end

data/lib/dugway/cli.rb

@@ -5,6 +5,7 @@ require 'dugway'
 require 'dugway/cli/build'
 require 'dugway/cli/create'
 require 'dugway/cli/server'
+require 'dugway/cli/validate'
 
 module Dugway
   module Cli
@@ -12,7 +13,8 @@ module Dugway
       register Create, 'create', 'create', 'Create a new Big Cartel theme'
       register Build, 'build', 'build', 'Build your Big Cartel theme for use'
       register Server, 'server', 'server', 'Run your Big Cartel theme in the browser'
-      
+      register Validate, 'validate', 'validate', 'Validate your Big Cartel theme'
+
       desc 'version', 'Show version of Dugway'
       def version
         say "Dugway #{ Dugway::VERSION }"

data/lib/dugway/config/theme_color_attribute_mappings.yml

@@ -0,0 +1,98 @@
+# Color attributes we require for each theme, which is important for the ThemeColorDrop in 
+# Storefront repo which we expose to sellers and 3rd party developers
+required_color_attributes:
+  - background_color
+  - primary_text_color
+  - link_text_color
+  - link_hover_color
+  - button_background_color
+  - button_text_color
+  - button_hover_background_color
+
+# Specify overrides when a theme does not use the standard color attributes
+# Indicate when an attribute is not used by setting it to ~
+Cosmos:
+  primary_text_color: text_color
+
+Foundry:
+  link_text_color: primary_text_color
+
+Good Vibes:
+  link_text_color: primary_text_color
+  link_hover_color: secondary_text_color
+  button_background_color: background_color
+  button_text_color: primary_text_color
+  button_hover_background_color: background_color
+
+Hopscotch:
+  primary_text_color: text_color
+  link_text_color: text_color
+  link_hover_color: secondary_text_color
+  button_background_color: background_color
+  button_text_color: text_color
+  button_hover_background_color: ~
+
+Luna:
+  link_text_color: primary_text_color
+  link_hover_color: link_rollover_color
+  button_hover_background_color: button_rollover_color
+
+Lunch Break:
+  primary_text_color: text_color
+  link_text_color: text_color
+  button_hover_background_color: button_background_hover_color
+
+Netizen:
+  primary_text_color: text_color
+  link_text_color: text_color
+  link_hover_color: ~
+  button_text_color: text_color
+  button_hover_background_color: ~
+
+Nova:
+  button_background_color: background_color
+  button_text_color: primary_text_color
+  button_hover_background_color: background_color
+
+PickleJuice:
+  primary_text_color: text_color
+  link_text_color: link_color
+
+Ranger:
+  link_text_color: primary_text_color
+  button_hover_background_color: ~
+
+Roadie:
+  primary_text_color: text_color
+  link_text_color: primary_text_color
+
+Sidecar:
+  primary_text_color: body_text_color
+  link_text_color: link_color
+  button_hover_background_color: button_background_hover_color
+
+Snacks:
+  primary_text_color: text_color
+  link_text_color: text_color
+  link_hover_color: ~
+  button_background_color: accent_background_color
+  button_text_color: accent_text_color
+  button_hover_background_color: ~
+
+Snakebite:
+  primary_text_color: primary_color
+  link_text_color: primary_color
+  link_hover_color: primary_color
+  button_background_color: primary_color
+  button_text_color: primary_color
+  button_hover_background_color: primary_color
+
+Sunscreen:
+  link_text_color: primary_text_color
+
+Trace:
+  link_text_color: primary_text_color
+  link_hover_color: secondary_text_color
+  button_background_color: primary_text_color
+  button_text_color: background_color
+  button_hover_background_color: primary_text_color

data/lib/dugway/theme.rb

@@ -9,6 +9,10 @@ module Dugway
   class Theme
     REQUIRED_FILES = %w( cart.html contact.html home.html layout.html maintenance.html product.html products.html screenshot.jpg settings.json theme.css theme.js )
 
+    THEME_COLOR_ATTRIBUTE_MAPPINGS = YAML.load_file(
+      File.join(__dir__, 'config', 'theme_color_attribute_mappings.yml')
+    ).freeze
+
     attr_reader :errors
 
     def initialize(overridden_customization={})
@@ -89,7 +93,7 @@ module Dugway
       end
     end
 
-    def valid?
+    def valid?(validate_colors: true, validate_layout_attributes: true)
       @errors = []
 
       REQUIRED_FILES.each do |file|
@@ -111,9 +115,45 @@ module Dugway
         end
       end
 
+      validate_required_color_settings if validate_colors
+      validate_required_layout_attributes if validate_layout_attributes
+
       @errors.empty?
     end
 
+    def validate_required_color_settings
+      required_colors_attribute_names = THEME_COLOR_ATTRIBUTE_MAPPINGS['required_color_attributes']
+
+      theme_colors = settings['colors'].map { |c| c['variable'] }
+      mappings = THEME_COLOR_ATTRIBUTE_MAPPINGS[name] || {}
+
+      missing_colors = required_colors_attribute_names.reject do |color|
+        theme_colors.include?(color) ||
+        (mappings.key?(color) && (mappings[color].nil? || theme_colors.include?(mappings[color])))
+      end
+
+      unless missing_colors.empty?
+        @errors << "Missing required color settings: #{missing_colors.join(', ')}"
+      end
+    end
+
+    # Validate that the Layout file has expected attributes for:
+    # - data-bc-page-type on the body tag
+    # - one data-bc-hook="header" and one data-bc-hook="footer" somewhere
+    def validate_required_layout_attributes
+      layout_content = read_source_file('layout.html')
+
+      unless layout_content =~ /<body.*?\bdata-bc-page-type\b/
+        @errors << "layout.html missing `data-bc-page-type` attribute on body tag"
+      end
+
+      header_hooks = layout_content.scan(/data-bc-hook=(?:"|')header(?:"|')/).size
+      footer_hooks = layout_content.scan(/data-bc-hook=(?:"|')footer(?:"|')/).size
+
+      @errors << "layout.html must have exactly one `data-bc-hook=\"header\"`" if header_hooks != 1
+      @errors << "layout.html must have exactly one `data-bc-hook=\"footer\"`" if footer_hooks != 1
+    end
+
     private
 
     def validate_preview
@@ -128,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)
@@ -169,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.10"
+  VERSION = "1.0.13"
 end

data/spec/fixtures/theme/layout.html

@@ -11,8 +11,8 @@
     {{ head_content }}
   </head>
 
-  <body id="{{ page.permalink }}" class="{{ page.category }}">
-    <header>
+  <body id="{{ page.permalink }}" class="{{ page.category }}"  data-bc-page-type="{% if page.category == 'custom' %}custom{% else %}{{ page.permalink }}{% endif %}">
+    <header data-bc-hook="header">
       <a href="/" title="{{ store.name | escape }}">{{ store.name }}</a>
     </header>
 
@@ -78,7 +78,7 @@
     {% endif %}
     </section>
 
-    <footer>
+    <footer data-bc-hook="footer">
       <div>{{ powered_by_big_cartel }}</div>
     </footer>
   </body>

data/spec/fixtures/theme/settings.json

@@ -40,7 +40,7 @@
       "default": "Helvetica"
     },
     {
-      "variable": "font",
+      "variable": "text_font",
       "label": "Font",
       "default": "Georgia"
     }
@@ -48,8 +48,8 @@
   "preset_styles": {
     "preview": {
       "title_font": "header_font",
-      "body_font": "font",
-      "text_color": "link_color",
+      "body_font": "text_font",
+      "text_color": "primary_text_color",
       "background_color": "background_color"
     },
     "presets": [
@@ -60,22 +60,32 @@
             "style_name": "Classic #1",
             "fonts": {
               "header_font": "DM Sans",
-              "font": "DM Sans"
+              "text_font": "DM Sans"
             },
             "colors": {
               "background_color": "#FFFFFF",
-              "link_color": "#111111"
+              "primary_text_color": "#000000",
+              "link_text_color": "#000000",
+              "link_hover_color": "#BF0101",
+              "button_background_color": "#000000",
+              "button_text_color": "#FFFFFF",
+              "button_hover_background_color": "#BF0101"
             }
           },
           {
             "style_name": "Classic #2",
             "fonts": {
               "header_font": "Lora",
-              "font": "Roboto"
+              "text_font": "Roboto"
             },
             "colors": {
               "background_color": "#F7F7F7",
-              "link_color": "#222222"
+              "primary_text_color": "#222222",
+              "link_text_color": "#222222",
+              "link_hover_color": "#014ABF",
+              "button_background_color": "#222222",
+              "button_text_color": "#FFFFFF",
+              "button_hover_background_color": "#014ABF"
             }
           }
         ]
@@ -86,11 +96,36 @@
     {
       "variable": "background_color",
       "label": "Background",
-      "default": "#222222"
+      "default": "white"
     },
     {
-      "variable": "link_color",
-      "label": "Link Color",
+      "variable": "primary_text_color",
+      "label": "Text",
+      "default": "black"
+    },
+    {
+      "variable": "link_text_color",
+      "label": "Link text",
+      "default": "red"
+    },
+    {
+      "variable": "link_hover_color",
+      "label": "Link hover",
+      "default": "black"
+    },
+    {
+      "variable": "button_background_color",
+      "label": "Button background",
+      "default": "black"
+    },
+    {
+      "variable": "button_text_color",
+      "label": "Button text",
+      "default": "white"
+    },
+    {
+      "variable": "button_hover_background_color",
+      "label": "Button hover background",
       "default": "red"
     }
   ],

data/spec/fixtures/theme/stylesheets/_partial.css

@@ -1 +1 @@
-$color: #0f0;
+$background_color: #0f0;

data/spec/fixtures/theme/stylesheets/one.css

@@ -1,3 +1,3 @@
 html, body {
   height: 100%;
-  }
+}

data/spec/fixtures/theme/stylesheets/two.css.sass

@@ -1,7 +1,7 @@
 @import 'partial'
 
-$link_color: #{"{{ theme.link_color }}"}
+$link_text_color: #{"{{ theme.link_text_color }}"}
 
 a
-  background: $color
-  color: $link_color
+  background: $background_color
+  color: $link_text_color

data/spec/units/dugway/liquid/drops/theme_drop_spec.rb

@@ -73,19 +73,25 @@ describe Dugway::Drops::ThemeDrop do
 
   describe "#font" do
     it "should return the theme's font" do
-      theme.font.should == 'Georgia'
+      theme.text_font.should == 'Georgia'
     end
   end
 
   describe "#background_color" do
     it "should return the theme's background_color" do
-      theme.background_color.should == '#222222'
+      theme.background_color.should == 'white'
     end
   end
 
-  describe "#link_color" do
-    it "should return the theme's link_color" do
-      theme.link_color.should == 'red'
+  describe "#link_text_color" do
+    it "should return the theme's link_text_color" do
+      theme.link_text_color.should == 'red'
+    end
+  end
+
+  describe "#link_hover_color" do
+    it "should return the theme's link_hover_color" do
+      theme.link_hover_color.should == 'black'
     end
   end
 

data/spec/units/dugway/theme_spec.rb

@@ -18,7 +18,7 @@ describe Dugway::Theme do
   describe "#fonts" do
     it "should return a hash of font settings values" do
       theme.fonts.should == {
-        'font' => 'Georgia',
+        'text_font' => 'Georgia',
         'header_font' => 'Helvetica'
       }
     end
@@ -49,11 +49,16 @@ describe Dugway::Theme do
   describe "#customization" do
     it "should return a hash of font, color, option, images and image sets settings values" do
       theme.customization.should == {
-        'background_color' => '#222222',
+        'background_color' => 'white',
         'fixed_sidebar' => true,
-        'font' => 'Georgia',
+        'text_font' => 'Georgia',
         'header_font' => 'Helvetica',
-        'link_color' => 'red',
+        'primary_text_color' => 'black',
+        'link_text_color' => 'red',
+        'link_hover_color' => 'black',
+        'button_background_color' => 'black',
+        'button_text_color' => 'white',
+        'button_hover_background_color' => 'red',
         'show_search' => false,
         'logo' => { :url => 'images/logo_bc.png', :width => 1, :height => 1 },
         'slideshow_images' => [
@@ -69,17 +74,22 @@ describe Dugway::Theme do
     describe "when there are overridden customization" do
       before(:each) do
         Dugway.stub(:theme) {
-          Dugway::Theme.new(:fixed_sidebar => false, :link_color => 'blue')
+          Dugway::Theme.new(:fixed_sidebar => false, :link_text_color => 'blue')
         }
       end
 
       it "should merge those values into the defaults" do
         theme.customization.should == {
-          'background_color' => '#222222',
+          'background_color' => 'white',
           'fixed_sidebar' => false,
-          'font' => 'Georgia',
+          'text_font' => 'Georgia',
           'header_font' => 'Helvetica',
-          'link_color' => 'blue',
+          'primary_text_color' => 'black',
+          'link_text_color' => 'blue',
+          'link_hover_color' => 'black',
+          'button_background_color' => 'black',
+          'button_text_color' => 'white',
+          'button_hover_background_color' => 'red',
           'show_search' => false,
           'logo' => { :url => 'images/logo_bc.png', :width => 1, :height => 1 },
           'slideshow_images' => [
@@ -134,7 +144,7 @@ describe Dugway::Theme do
     end
 
     it "should sprocketize and not liquify theme.css" do
-      theme.build_file('theme.css').gsub(/\s+/, '').should == %{html,body{height:100%;}a{background:#0f0;color:{{theme.link_color}};}/**/}
+      theme.build_file('theme.css').gsub(/\s+/, '').should == %{html,body{height:100%;}a{background:#0f0;color:{{theme.link_text_color}};}/**/}
     end
   end
 
@@ -227,4 +237,3 @@ describe Dugway::Theme do
     File.read(File.join(Dugway.source_dir, file_name))
   end
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dugway
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.13
 platform: ruby
 authors:
 - Big Cartel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-11-18 00:00:00.000000000 Z
+date: 2024-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -466,6 +466,8 @@ files:
 - lib/dugway/cli/templates/source/stylesheets/vendor/normalize.css
 - lib/dugway/cli/templates/source/theme.css
 - lib/dugway/cli/templates/source/theme.js
+- lib/dugway/cli/validate.rb
+- lib/dugway/config/theme_color_attribute_mappings.yml
 - lib/dugway/contact_form_validator.rb
 - lib/dugway/controller.rb
 - lib/dugway/extensions/time.rb