easol-canvas 1.0.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8570c1c4d1a8f7097f621722730ca8c882b633b901c8d22fb13f7dcbcb2ac8df
-  data.tar.gz: d10b1319c6e1be3e0e43a77575fbf73f71f4a9f77582486d5b34d374d9c42105
+  metadata.gz: 4b413ee9262a5f7b363a8f53950da655c1c85aaf71474a331b412c62d5ae8f62
+  data.tar.gz: ecae8f840fffee09e161857beb61cb002d3006f63e00e7e52283342c228234a9
 SHA512:
-  metadata.gz: 2dbfd55872ab41728e9243392a02c64551379cf42b99f59e455ade832fc028aa154b78e93600ec8bba8ac4fdcc52001850f2fd9cead452d64b896e1a997a0c63
-  data.tar.gz: d6507b81b2fe0f72aad4407601606fa305b45e0d2142753eccc03cda5760277ceeaf54f83b6d8468274490e33afa4360da7174dd23599b4e5aa0a9fe484ab5d3
+  metadata.gz: 42fe4d0cdede7d029e2e4c6ced43c23defb19a109bf11df3a4933d9411d2c6c83173042f4f2fee148573042760e62645eeb44b2e3af53e28b9bc91588c23d0a1
+  data.tar.gz: 492e9fbeb71dfc80b56874d83e441ec799ae7ab04dedd668dc3e47c0cdfaabb0c9c9312fdeff2b792039ca44fb127af1eb1d876072c12d4c468567c6e20b6d6a

data/lib/canvas/check.rb

@@ -1,6 +1,9 @@
-require 'cli/ui'
+# frozen_string_literal: true
+
+require "cli/ui"
 
 module Canvas
+  # :documented:
   class Check
     attr_reader :offenses
 

data/lib/canvas/checks/required_files_check.rb

@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 module Canvas
+  # :documented:
   class RequiredFilesCheck < Check
     REQUIRED_FILES = [
       "templates/product/index.{html,liquid}",
@@ -11,11 +14,18 @@ module Canvas
 
     def run
       REQUIRED_FILES.each do |filename|
-        next unless Dir.glob(filename).empty?
+        file_paths = Dir.glob(filename)
+
 
-        @offenses << Offense.new(
-          message: "Missing file: #{filename}"
-        )
+        if file_paths.empty?
+          @offenses << Offense.new(
+            message: "Missing file: #{filename}"
+          )
+        elsif File.zero?(file_paths.first)
+          @offenses << Offense.new(
+            message: "Empty file: #{file_paths.first}"
+          )
+        end
       end
     end
   end

data/lib/canvas/checks/valid_custom_types_check.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Canvas
+  # :documented:
+  # This check will validate the JSON objects that represent the
+  # custom types that are defined in the /types directory.
+  class ValidCustomTypesCheck < Check
+    def run
+      custom_type_files.each do |filename|
+        schema = extract_json(filename)
+        validator = Validator::CustomType.new(schema: schema)
+
+        next if validator.validate
+
+        validator.errors.each do |message|
+          @offenses << Offense.new(
+            message: "Invalid Custom Type: #{filename} - \n#{message}"
+          )
+        end
+      end
+    end
+
+    private
+
+    def custom_type_files
+      Dir.glob("types/*.json")
+    end
+
+    def extract_json(filename)
+      file = File.read(filename)
+      JSON.parse(file)
+    rescue JSON::ParserError
+      nil
+    end
+  end
+end

data/lib/canvas/checks/valid_html_check.rb

@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 module Canvas
+  # :documented:
   class ValidHtmlCheck < Check
     def run
       html_files.each do |filename|

data/lib/canvas/checks/valid_json_check.rb

@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 module Canvas
+  # :documented:
   class ValidJsonCheck < Check
     def run
       json_files.each do |filename|

data/lib/canvas/checks/valid_liquid_check.rb

@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 module Canvas
+  # :documented:
   class ValidLiquidCheck < Check
     def run
       register_tags!

data/lib/canvas/checks/valid_sass_check.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Canvas
+  # :documented:
+  #
+  # This check will find all files ending in .css, .scss or .sass
+  # and run them through the sass validator - {Canvas::Validator::Sass}.
+  class ValidSassCheck < Check
+    def run
+      sass_files.each do |filename|
+        file = File.read(filename)
+        validator = Validator::Sass.new(file)
+
+        next if validator.validate
+
+        validator.errors.each do |message|
+          @offenses << Offense.new(
+            message: "Invalid Sass: #{filename} - \n#{message}"
+          )
+        end
+      end
+    end
+
+    private
+
+    def sass_files
+      Dir.glob("**/*.{css,scss,sass}")
+    end
+  end
+end

data/lib/canvas/checks.rb

@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 module Canvas
+  # :documented:
   class Checks
     class << self
       def registered
@@ -10,7 +13,7 @@ module Canvas
         return if @checks.include?(klass)
         @checks << klass
       end
-      
+
       def deregister_all!
         @checks = []
       end

data/lib/canvas/cli.rb

@@ -1,12 +1,21 @@
+# frozen_string_literal: true
+
 require "thor"
-require 'cli/ui'
+require "cli/ui"
 
 module Canvas
+  # :documented:
   class Cli < Thor
     desc "lint", "Prints a hello world message"
     def lint
       CLI::UI::StdoutRouter.enable
       Canvas::Lint.new.run
     end
+
+    map %w[--version -v] => :__print_version
+    desc "--version, -v", "print the version"
+    def __print_version
+      puts Canvas::VERSION
+    end
   end
 end

data/lib/canvas/constants.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+# :documented:
+# This file is used to define globally accessible constants.
 module Canvas
   module Constants
     COLOR_PALETTE_VALUES = %w[
@@ -8,5 +10,22 @@ module Canvas
       body-bg
       body-color
     ].freeze
+
+    PRIMITIVE_TYPES = %w[
+      image
+      product
+      post
+      page
+      link
+      text
+      string
+      boolean
+      number
+      color
+      select
+      range
+      radio
+      variant
+    ].freeze
   end
 end

data/lib/canvas/lint.rb

@@ -1,6 +1,9 @@
-require 'cli/ui'
+# frozen_string_literal: true
+
+require "cli/ui"
 
 module Canvas
+  #:documented:
   class Lint
     def run
       output_context = CLI::UI::SpinGroup.new(auto_debrief: false)
@@ -29,13 +32,13 @@ module Canvas
     end
 
     def debrief_message
-      CLI::UI::Frame.open('Failures', color: :red) do
+      CLI::UI::Frame.open("Failures", color: :red) do
         failed_checks = @checks.filter(&:failed?)
         failed_checks.map do |check|
           CLI::UI::Frame.open(check.class.name, color: :red) do
-            output = check.offenses.map do |offense|
+            output = check.offenses.map { |offense|
               CLI::UI.fmt "{{x}} #{offense.message}"
-            end
+            }
             puts output.join("\n")
           end
         end

data/lib/canvas/offense.rb

@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 module Canvas
+  # :documented:
   class Offense
     attr_reader :message
 

data/lib/canvas/services/front_matter_extractor.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Canvas
   # :documented:
   # This service can be used to extract front matter from a liquid string.

data/lib/canvas/validators/custom_type.rb

@@ -0,0 +1,141 @@
+# frozen_string_literal: true
+
+module Canvas
+  module Validator
+    # :documented:
+    # This class is used to validate the JSON defining a custom type.
+    #
+    # An example of a valid custom type:
+    # {
+    #   "key": "faq",
+    #   "name": "Faq",
+    #   "attributes": [
+    #     {
+    #       "name": "question",
+    #       "label": "Question",
+    #       "type": "string"
+    #     },
+    #     {
+    #       "name": "answer",
+    #       "label": "Answer",
+    #       "type": "text"
+    #     }
+    #   ]
+    # }
+    #
+    class CustomType
+      REQUIRED_KEYS = %w[key name attributes].freeze
+
+      attr_reader :schema, :errors
+
+      def initialize(schema:)
+        @schema = schema
+        @errors = []
+      end
+
+      def validate
+        ensure_valid_format &&
+          ensure_has_required_keys &&
+          ensure_no_unrecognized_keys &&
+          ensure_keys_are_correct_types &&
+          ensure_key_value_is_not_reserved &&
+          ensure_no_duplicate_attributes &&
+          ensure_attributes_are_valid &&
+          ensure_first_attribute_not_array
+
+        errors.empty?
+      end
+
+      private
+
+      def ensure_valid_format
+        return true if schema.is_a?(Hash)
+
+        @errors << "Schema is not in a valid format"
+        false
+      end
+
+      def ensure_has_required_keys
+        missing_keys = REQUIRED_KEYS - schema.keys
+        return true if missing_keys.empty?
+
+        @errors << "Missing required keys: #{missing_keys.join(', ')}"
+        false
+      end
+
+      def ensure_no_unrecognized_keys
+        unrecognized_keys = schema.keys - REQUIRED_KEYS
+        return true if unrecognized_keys.empty?
+
+        @errors << "Unrecognized keys: #{unrecognized_keys.join(', ')}"
+        false
+      end
+
+      def ensure_keys_are_correct_types
+        if !schema["key"].is_a?(String)
+          @errors << "\"key\" must be a string"
+          return false
+        end
+
+        if !schema["name"].is_a?(String)
+          @errors << "\"name\" must be a string"
+          return false
+        end
+
+        if !schema["attributes"].is_a?(Array) ||
+            schema["attributes"].empty? ||
+            schema["attributes"].any? { |a| !a.is_a?(Hash) }
+            @errors << "\"attributes\" must be an array of objects"
+          return false
+        end
+
+        true
+      end
+
+      # Ensuring the value for key doesn't clash with our primitive type keys.
+      # See {Canvas::Constants::PRIMITIVE_TYPES}
+      def ensure_key_value_is_not_reserved
+        if schema["key"] && Constants::PRIMITIVE_TYPES.include?(schema["key"].downcase)
+          @errors << "\"key\" can't be one of these reserved words: #{Constants::PRIMITIVE_TYPES.join(', ')}"
+          return false
+        end
+
+        true
+      end
+
+      def ensure_no_duplicate_attributes
+        attribute_names = schema["attributes"].map { |a| a["name"] }
+        duplicated_names = attribute_names.select { |a| attribute_names.count(a) > 1 }.uniq
+
+        return true if duplicated_names.empty?
+
+        @errors << "Some attributes are duplicated: #{duplicated_names.join(', ')}"
+        false
+      end
+
+      def ensure_attributes_are_valid
+        return true unless schema["attributes"]
+
+        schema["attributes"].each do |attribute_schema|
+          attr_validator = Validator::SchemaAttribute.new(
+            attribute: attribute_schema,
+            custom_types: []
+          )
+          next if attr_validator.validate
+
+          @errors << "Attribute \"#{attribute_schema['name']}\" is invalid "\
+                     "- #{attr_validator.errors.join(', ')}"
+        end
+      end
+
+      def ensure_first_attribute_not_array
+        first_attribute = schema.fetch("attributes").first
+
+        return true if first_attribute.nil? || first_attribute["array"] != true
+
+        @errors << "The first attribute cannot be an array"
+        false
+      end
+    end
+  end
+end

data/lib/canvas/validators/html.rb

@@ -1,8 +1,11 @@
+# frozen_string_literal: true
+
 require "nokogiri"
 require "liquid"
 
 module Canvas
   module Validator
+    # :documented:
     class Html
       LIQUID_TAG = /#{::Liquid::TagStart}.*?#{::Liquid::TagEnd}/om
       LIQUID_VARIABLE = /#{::Liquid::VariableStart}.*?#{::Liquid::VariableEnd}/om

data/lib/canvas/validators/json.rb

@@ -1,7 +1,10 @@
+# frozen_string_literal: true
+
 require "json"
 
 module Canvas
   module Validator
+    # :documented:
     class Json
       attr_reader :errors
 

data/lib/canvas/validators/liquid.rb

@@ -1,8 +1,11 @@
+# frozen_string_literal: true
+
 require "nokogiri"
 require "liquid"
 
 module Canvas
   module Validator
+    # :documented:
     class Liquid
       attr_reader :errors
 

data/lib/canvas/validators/sass.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require "sassc"
+
+module Canvas
+  module Validator
+    # :documented:
+    #
+    # This validator can be used to validate Sass.
+    class Sass
+      attr_reader :errors
+
+      def initialize(file)
+        @file = file
+      end
+
+      def validate
+        SassC::Engine.new(@file, style: :compressed).render
+        true
+      rescue SassC::SyntaxError => e
+        @errors = [e.message]
+        false
+      end
+    end
+  end
+end

data/lib/canvas/validators/schema_attribute.rb

@@ -34,7 +34,6 @@ module Canvas
         "radio" => SchemaAttribute::Radio,
         "variant" => SchemaAttribute::Variant,
       }.freeze
-      PRIMITIVE_TYPES = VALIDATORS.keys
       RESERVED_NAMES = %w[
         page
         company
@@ -71,7 +70,7 @@ module Canvas
       end
 
       def valid_types
-        PRIMITIVE_TYPES + custom_type_keys
+        Constants::PRIMITIVE_TYPES + custom_type_keys
       end
 
       def validator_for_type

data/lib/canvas/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Canvas
-  VERSION = "1.0.0"
+  VERSION = "1.3.0"
 end

data/lib/canvas.rb

@@ -1,28 +1,35 @@
-require_relative "canvas/version"
-require_relative "canvas/constants"
-require_relative "canvas/cli"
-require_relative "canvas/lint"
-require_relative "canvas/check"
-require_relative "canvas/offense"
-require_relative "canvas/checks"
+# frozen_string_literal: true
+
+module Canvas
+  autoload :Check, "canvas/check"
+  autoload :Checks, "canvas/checks"
+  autoload :Cli, "canvas/cli"
+  autoload :Constants, "canvas/constants"
+  autoload :Lint, "canvas/lint"
+  autoload :Offense, "canvas/offense"
+  autoload :Version, "canvas/version"
+end
 
 # We need to ensure Canvas::Validator::SchemaAttribute::Base is required first
 require_relative "canvas/validators/schema_attributes/base"
 
 # The attribute validators need to be required before Canvas::Validator::SchemaAttribute
 attribute_validators = Dir["#{__dir__}/canvas/validators/schema_attributes/*.rb"]
-attribute_validators.each { |file| require file }
+attribute_validators.each do |file|
+  require file
+end
 
 files = Dir["#{__dir__}/canvas/{checks,services,validators}/*.rb"]
-files.each { |file| require file }
+files.each do |file|
+  require file
+end
 
 Canvas::Checks.register(Canvas::RequiredFilesCheck)
 Canvas::Checks.register(Canvas::ValidHtmlCheck)
 Canvas::Checks.register(Canvas::ValidLiquidCheck)
+Canvas::Checks.register(Canvas::ValidJsonCheck)
+Canvas::Checks.register(Canvas::ValidSassCheck)
 Canvas::Checks.register(Canvas::ValidBlockSchemasCheck)
 Canvas::Checks.register(Canvas::ValidMenuSchemaCheck)
 Canvas::Checks.register(Canvas::ValidFooterSchemaCheck)
-Canvas::Checks.register(Canvas::ValidJsonCheck)
-
-module Canvas
-end
+Canvas::Checks.register(Canvas::ValidCustomTypesCheck)

data/lib/easol/canvas.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+# Enables using this gem "as is"
+require_relative "../canvas"

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: easol-canvas
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Kyle Byrne
 - Ian Mooney
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-27 00:00:00.000000000 Z
+date: 2022-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -67,6 +67,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.3'
+- !ruby/object:Gem::Dependency
+  name: sassc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
 description: |
   Canvas is a command line tool to help with building themes for Easol.
   It provides tooling to check theme directories for errors and to make sure
@@ -84,11 +98,13 @@ files:
 - lib/canvas/checks.rb
 - lib/canvas/checks/required_files_check.rb
 - lib/canvas/checks/valid_block_schemas_check.rb
+- lib/canvas/checks/valid_custom_types_check.rb
 - lib/canvas/checks/valid_footer_schema_check.rb
 - lib/canvas/checks/valid_html_check.rb
 - lib/canvas/checks/valid_json_check.rb
 - lib/canvas/checks/valid_liquid_check.rb
 - lib/canvas/checks/valid_menu_schema_check.rb
+- lib/canvas/checks/valid_sass_check.rb
 - lib/canvas/cli.rb
 - lib/canvas/constants.rb
 - lib/canvas/lint.rb
@@ -97,11 +113,13 @@ files:
 - lib/canvas/services/fetch_custom_types.rb
 - lib/canvas/services/front_matter_extractor.rb
 - lib/canvas/validators/block_schema.rb
+- lib/canvas/validators/custom_type.rb
 - lib/canvas/validators/footer_schema.rb
 - lib/canvas/validators/html.rb
 - lib/canvas/validators/json.rb
 - lib/canvas/validators/liquid.rb
 - lib/canvas/validators/menu_schema.rb
+- lib/canvas/validators/sass.rb
 - lib/canvas/validators/schema_attribute.rb
 - lib/canvas/validators/schema_attributes/base.rb
 - lib/canvas/validators/schema_attributes/color.rb
@@ -116,11 +134,12 @@ files:
 - lib/canvas/validators/schema_attributes/select.rb
 - lib/canvas/validators/schema_attributes/variant.rb
 - lib/canvas/version.rb
+- lib/easol/canvas.rb
 homepage: https://rubygems.org/gems/easol-canvas
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -135,8 +154,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: CLI to help with building themes for Easol
 test_files: []