dugway 1.0.5 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6ca983943ee8afe7ba688da15820a8523976fd12a11d2e21bea7ae4ce894e60
-  data.tar.gz: d38a64fa74907af55c4e65e3b66e4549be39ceaf242bd9c64d5908ff7e0f0a62
+  metadata.gz: 8390ef193bc160dedfcd4745df7b5b96e2bb702b10bd3cd9794cd7f951edc03d
+  data.tar.gz: bbba535b7d2c34823c50bdac3f83418ad74091063fc3cd6957fe1f70a36a0145
 SHA512:
-  metadata.gz: 31f99a38d7c4334838c1c5d294dab362cbdbe224668c32dbcb205492441bd25165e3ad1c816947feaa244f9a2d1e4346b2df89c454d0de07c59933ed6217c5ad
-  data.tar.gz: 3ba085450d4fb399e6c10c15a4ea433188b8f228e67013d334f0b7216fd9d8a7a0d3fb54dfdf1b43223a50563421db5e7ae8f3875817de7955db5b77695c67dc
+  metadata.gz: ecc5b434330a537eba7f403815975fbff7fbec5d1ab3256fc324392fdde90bd8228cd741897517ba92464a0a2023cf870d579ddd2fd192a27667b5d3d4098c9a
+  data.tar.gz: 2557195c107df99b5ae72cfd027d6a4c43463b4d2c39b8a2d5022ddf4bdeab5d2c3fe34efdba8fff6bb5b5777fcdc39cf0ba5f14ff7c9f0c31dda507d081ab01

data/dugway.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
   s.add_dependency('htmlentities', '~> 4.3.1')
   s.add_dependency('thor', '~> 0.20.3')
   s.add_dependency('rubyzip', '~> 0.9.9')
-  s.add_dependency('uglifier', '~> 4.1')
+  s.add_dependency('terser', '~> 1.1')
   s.add_dependency('thin', '~> 1.8.0')
   s.add_dependency('bigcartel-theme-fonts', '>= 1.0.0')
   s.add_dependency('bigcartel-currency-locales', '>= 1.0.0')

data/lib/dugway/theme.rb

@@ -3,7 +3,7 @@ require 'sass'
 require 'sprockets'
 require 'sprockets-sass'
 require 'compass'
-require 'uglifier'
+require 'terser'
 
 module Dugway
   class Theme
@@ -57,7 +57,7 @@ module Dugway
       case name
       when 'theme.js'
         if @building
-          Uglifier.new(harmony: true).compile(sprockets[name].to_s)
+          Terser.new.compile(sprockets[name].to_s)
         else
           sprockets[name].to_s
         end
@@ -98,13 +98,82 @@ module Dugway
 
       @errors << 'Missing theme name in source/settings.json' if name.blank?
       @errors << 'Invalid theme version in source/settings.json (ex: 1.0.3)' unless !!(version =~ /\d+\.\d+\.\d+/)
-      @errors << 'Missing images in source/images' if image_files.empty?
+
+      if settings['preset_styles']
+        validate_preview
+        if settings['preset_styles']['presets']
+          settings['preset_styles']['presets'].each do |preset|
+            validate_preset_styles(preset)
+            validate_style_references(preset)
+          end
+        else
+          @errors << "Missing presets"
+        end
+      end
 
       @errors.empty?
     end
 
     private
 
+    def validate_preview
+      preview = settings['preset_styles']['preview']
+      if preview
+        %w[title_font body_font text_color background_color].each do |key|
+          @errors << "Missing #{key} in preview" unless preview[key]
+        end
+      else
+        @errors << "Missing preview in preset_styles"
+      end
+    end
+
+    def validate_preset_styles(preset)
+      @errors << 'Preset is missing group_name' unless preset['group_name'].is_a?(String)
+      @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)
+
+        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)
+          end
+        else
+          @errors << 'Style is 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}$/
+          end
+        else
+          @errors << 'Style is missing colors'
+        end
+      end
+
+      @errors << 'Style names should be unique' unless preset['styles'].map { |style| style['style_name'] }.uniq.length == preset['styles'].length
+    end
+
+    def validate_style_references(preset)
+      ['fonts', 'colors'].each do |key_type|
+        validate_keys(preset, settings[key_type], key_type)
+      end
+    end
+
+    def validate_keys(preset, settings, key_type)
+      variables = settings.map { |item| item['variable'] }
+
+      preset['styles'].each do |style|
+        style_keys = style[key_type].keys
+
+        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?
+      end
+    end
+
     def source_dir
       Dugway.source_dir
     end

data/lib/dugway/version.rb

@@ -1,3 +1,3 @@
 module Dugway
-  VERSION = "1.0.5"
+  VERSION = "1.0.7"
 end

data/spec/fixtures/theme/settings.json

@@ -38,13 +38,50 @@
       "variable": "header_font",
       "label": "Header Font",
       "default": "Helvetica"
-    },  
+    },
     {
       "variable": "font",
       "label": "Font",
       "default": "Georgia"
     }
   ],
+  "preset_styles": {
+    "preview": {
+      "title_font": "header_font",
+      "body_font": "font",
+      "text_color": "link_color",
+      "background_color": "background_color"
+    },
+    "presets": [
+      {
+        "group_name": "Classic",
+        "styles": [
+          {
+            "style_name": "Classic #1",
+            "fonts": {
+              "header_font": "DM Sans",
+              "font": "DM Sans"
+            },
+            "colors": {
+              "background_color": "#FFFFFF",
+              "link_color": "#111111"
+            }
+          },
+          {
+            "style_name": "Classic #2",
+            "fonts": {
+              "header_font": "Lora",
+              "font": "Roboto"
+            },
+            "colors": {
+              "background_color": "#F7F7F7",
+              "link_color": "#222222"
+            }
+          }
+        ]
+      }
+    ]
+  },
   "colors": [
     {
       "variable": "background_color",

data/spec/units/dugway/theme_spec.rb

@@ -151,7 +151,7 @@ describe Dugway::Theme do
   end
 
   describe "#font_files" do
-    it "shoud return an array of all font files" do
+    it "should return an array of all font files" do
       theme.font_files.should include("fonts/icons.ttf", "fonts/icons.woff")
     end
   end
@@ -210,28 +210,15 @@ describe Dugway::Theme do
       end
     end
 
-    describe "when missing at least one image" do
-      before(:each) do
-        theme.stub(:image_files) { [] }
-      end
-
-      it "should not be valid" do
-        theme.valid?.should be(false)
-        theme.errors.size.should == 1
-        theme.errors.first.should == 'Missing images in source/images'
-      end
-    end
-
     describe "when there are several errors" do
       before(:each) do
         theme.stub(:name) { nil }
         theme.stub(:version) { nil }
-        theme.stub(:image_files) { [] }
       end
 
       it "should return all of them" do
         theme.valid?.should be(false)
-        theme.errors.size.should == 3
+        theme.errors.size.should == 2
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dugway
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.7
 platform: ruby
 authors:
 - Big Cartel
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-23 00:00:00.000000000 Z
+date: 2024-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -263,19 +263,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.9.9
 - !ruby/object:Gem::Dependency
-  name: uglifier
+  name: terser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
@@ -559,7 +559,7 @@ homepage: https://github.com/bigcartel/dugway
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -577,8 +577,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
-signing_key:
+rubygems_version: 3.2.3
+signing_key: 
 specification_version: 4
 summary: Easily build and test Big Cartel themes.
 test_files: