dugway 1.0.6 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b9aebab8254f2fde9e8d76861a518a9732344e71cf6cca8ee936e5aba942ea4
-  data.tar.gz: 21bb8d6c9afe28bb55c657611be93ffe022ef9f1ffb57ac8a588203b03b5df05
+  metadata.gz: 4c29856362aa6781513881924c2ffdab292d4a1a3a401c91d11e4ef1f7389a43
+  data.tar.gz: 8676516fc4b26c415f78e31558f1df5814dddb55c80221e0507f5793343f8d2e
 SHA512:
-  metadata.gz: 2a1b8d896e55523ac33f0bc89b79beaa7dc41cde66035d30e924df536fadd2126ec9a8f657032850fe05f580d7d5cf221cb61a3520b5c58d35fcb6046a543c33
-  data.tar.gz: 997bfb03509c4c315bc56d619a5deba8135e1e4e6a5cb68a75b7233f91f6c6061f1c86bb2230522a657d609240ca8810971f1a795b383924ae0a72d06ca8b8a2
+  metadata.gz: d7ffa6f534fcb3d51f14de4168906a2b7dbfab08689ac8d61136df08ffa848458d94fdbdacf17db43611d40c3ebf208759d3ca49a10781d58e02b53c740f295c
+  data.tar.gz: 32186c12dd6696cf6b41904c253a414cb25a7af2f19f0ff45e29c5dbc7212bb09703bac52b0ba9e9216bce4b645af30a62d77de9d96e3c0b5f075758425d5b45

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

@@ -0,0 +1,67 @@
+module Dugway
+  module Filters
+    module InstantCheckoutFilter
+      DIV_STYLES = [
+        "border-radius: 4px",
+        "font-size: 20px",
+        "font-weight: bold"
+      ].freeze
+
+      LINK_STYLES = [
+        "border-radius: 4px",
+        "height: 100%",
+        "display: flex",
+        "padding: 10px",
+        "align-items: center",
+        "justify-content: center"
+      ].freeze
+
+      def instant_checkout_button(account, a=nil, b=nil)
+        account = @context.registers[:account]
+        theme, height = sanitize_options(a, b)
+
+        return nil unless account.instant_checkout?
+
+        div_styles = generate_div_styles(theme, height)
+        link_styles = generate_link_styles(theme)
+
+        %(<div id="instant-checkout-button" style="#{ div_styles }"><a href="https://www.bigcartel.com/resources/help/article/apple-pay" style="#{ link_styles }">Instant Checkout</a></div>)
+      end
+
+      private
+
+      def sanitize_options(a, b)
+        theme = height = nil
+
+        [a, b].each do |value|
+          theme = value if /\A(dark|light(?:-outline)?)\z/.match(value)
+          height = value if /\A\d+(px|em|\%)\z/.match(value)
+        end
+
+        return theme, height
+      end
+
+      def generate_div_styles(theme, height)
+        styles = DIV_STYLES.dup
+        styles << "border: 1px solid black" if theme == "light-outline"
+        styles << "height: #{ height }" if height
+        styles << colors(theme)
+        styles.join("; ")
+      end
+
+      def generate_link_styles(theme)
+        styles = LINK_STYLES.dup
+        styles << colors(theme)
+        styles.join("; ")
+      end
+
+      def colors(theme)
+        if theme =~ /\Alight/
+          "background-color: white; color: black"
+        else
+          "background-color: black; color: white"
+        end
+      end
+    end
+  end
+end

data/lib/dugway/liquifier.rb

@@ -7,6 +7,7 @@ Liquid::Template.register_filter(Dugway::Filters::CoreFilters)
 Liquid::Template.register_filter(Dugway::Filters::DefaultPagination)
 Liquid::Template.register_filter(Dugway::Filters::UrlFilters)
 Liquid::Template.register_filter(Dugway::Filters::FontFilters)
+Liquid::Template.register_filter(Dugway::Filters::InstantCheckoutFilter)
 
 Liquid::Template.register_tag(:get, Dugway::Tags::Get)
 Liquid::Template.register_tag(:paginate, Dugway::Tags::Paginate)
@@ -28,6 +29,7 @@ module Dugway
       registers = shared_registers
       registers[:category] = variables[:category]
       registers[:artist] = variables[:artist]
+      registers[:account] = Dugway.store
 
       if errors = variables.delete(:errors)
         shared_context['errors'] << errors

data/lib/dugway/store.rb

@@ -127,6 +127,10 @@ module Dugway
       currency['locale']
     end
 
+    def instant_checkout?
+      Dugway.options.dig(:store, :instant_checkout) || false
+    end
+
     private
 
     def get(path)

data/lib/dugway/theme.rb

@@ -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.6"
+  VERSION = "1.0.8"
 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.6
+  version: 1.0.8
 platform: ruby
 authors:
 - Big Cartel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-12 00:00:00.000000000 Z
+date: 2024-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -482,6 +482,7 @@ files:
 - lib/dugway/liquid/filters/core_filters.rb
 - lib/dugway/liquid/filters/default_pagination.rb
 - lib/dugway/liquid/filters/font_filters.rb
+- lib/dugway/liquid/filters/instant_checkout_filter.rb
 - lib/dugway/liquid/filters/url_filters.rb
 - lib/dugway/liquid/filters/util_filters.rb
 - lib/dugway/liquid/tags/get.rb
@@ -577,7 +578,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Easily build and test Big Cartel themes.