easol-canvas 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5446d70b87d779a13b4a5b3f132b91a29722d84167fcc2ac9b61a142e7b5a45c
-  data.tar.gz: ccc2f5bc197c2f7ec72969289989742f3400f69e2a2eb468c001fd994237f2bc
+  metadata.gz: e3e459457eae0524f0281bb9ecf65bd3070bb1673d43f5db5c310312a2117df4
+  data.tar.gz: 1f50ab28d983d59c985295fa5899ea7b19e5d8d202a5595f0828aca562ad0830
 SHA512:
-  metadata.gz: a1b2ab985beac4aef8812c35fcda2707c52fc204c26435d7bf9dd7b33441dc9666739e4a9319e64e1fab31fab8f46d73e7af79c63b14ae21a084f517c0e7f9ea
-  data.tar.gz: f57a9566ebb142092e574dc0889a636c673342e5a71e5ccc1f111951c4ac1fa78995dbbe090cd2de7d5c3cd073dbecd3999aca06889a3beb5419d72616547090
+  metadata.gz: 8f9d688d4ac0f97731d8ec38e548dc5f69a6c29546a029ee9825e9e5e30f58c4dba0d1a8331846e2f8f5166f735ab3a88cb5063d8ae59a95fb1904886e27a85a
+  data.tar.gz: c0c3977a8d4ad41df4ed9b43e53e4699e555db5d4c0596605d990e722de927108a9ecfbccfce02d8aae0da58b0f9c10a7ed604a099b24db6f831be6116750814

data/lib/canvas/dartsass.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require "open3"
+
+module Canvas
+  # This is a thin wrapper around the dartsass binary as provided by
+  # dartsass-rails.
+  #
+  # It is compatible with SassC::Engine as much as we were using it, but 100%
+  # compatability is not a goal.
+  class DartSass
+    Error = Class.new(StandardError)
+
+    def initialize(css, config)
+      @css = css
+      @config = config
+    end
+
+    def render
+      stdout, stderr, status = Open3.capture3(*command, stdin_data: @css)
+
+      if status == 0
+        stdout
+      else
+        raise Error.new(stderr)
+      end
+    end
+
+    private
+
+    def command
+      [dartsass, "--stdin", style, *load_paths].compact
+    end
+
+    def dartsass
+      Gem.bin_path("dartsass-rails", "dartsass").shellescape
+    end
+
+    def style
+      (s = @config[:style]) && "--style=#{s.to_s.shellescape}"
+    end
+
+    def load_paths
+      Array(@config[:load_paths]).map { "--load-path=#{_1.shellescape}" }
+    end
+  end
+end

data/lib/canvas/validators/layout_schema.rb

@@ -57,6 +57,7 @@ module Canvas
           ensure_no_unrecognized_keys
           ensure_no_duplicate_keys
           ensure_accordion_toggles_are_valid
+          ensure_unique_tabs
         end
 
         @errors.empty?
@@ -66,6 +67,21 @@ module Canvas
 
       attr_reader :schema
 
+      def ensure_unique_tabs
+        tabs = fetch_elements_of_type("tab")
+        duplicates =
+          tabs
+          .map { |item| [item[0]["label"], item[1]] }
+          .group_by { |(key, _)| key }
+          .filter { |key, usage| usage.size > 1 }
+
+        unless duplicates.empty?
+          duplicates.each do |tab, usage|
+            @errors << "Duplicated tab label `#{tab}` found. Location: #{usage.map { |(_, location)| location }.join(", ")}"
+          end
+        end
+      end
+
       def ensure_no_duplicate_keys
         attributes = fetch_all_attribute_names
         duplicates =

data/lib/canvas/validators/sass.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "sassc"
+require "canvas/dartsass"
 
 module Canvas
   module Validator
@@ -15,9 +15,9 @@ module Canvas
       end
 
       def validate
-        SassC::Engine.new(@file, style: :compressed).render
+        DartSass.new(@file, style: :compressed).render
         true
-      rescue SassC::SyntaxError => e
+      rescue DartSass::Error => e
         @errors = [e.message]
         false
       end

data/lib/canvas/validators/schema_attributes/link.rb

@@ -6,9 +6,9 @@ module Canvas
       # :documented:
       # Attribute validations specific to link-type variables.
       class Link < Base
-        ALLOWED_DEFAULT_KEYS = %w[url page post product].freeze
+        ALLOWED_DEFAULT_KEYS = %w[url page post experience accommodation].freeze
         INVALID_DEFAULT_ERROR = "\"default\" for link-type variables must include "\
-                                "a single url, page, post or product value"
+                                "a single url, page, post, experience or accommodation value"
 
         def validate
           super &&

data/lib/canvas/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Canvas
-  VERSION = "2.0.0"
+  VERSION = "3.0.0"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: easol-canvas
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Kyle Byrne
 - Ian Mooney
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-27 00:00:00.000000000 Z
+date: 1980-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -68,19 +68,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.3'
 - !ruby/object:Gem::Dependency
-  name: sassc
+  name: dartsass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: json-schema
   requirement: !ruby/object:Gem::Requirement
@@ -121,6 +121,7 @@ files:
 - lib/canvas/checks/valid_sass_check.rb
 - lib/canvas/cli.rb
 - lib/canvas/constants.rb
+- lib/canvas/dartsass.rb
 - lib/canvas/lint.rb
 - lib/canvas/offense.rb
 - lib/canvas/services/expand_attributes.rb
@@ -155,7 +156,7 @@ homepage: https://rubygems.org/gems/easol-canvas
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -170,8 +171,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.2.26
+signing_key:
 specification_version: 4
 summary: CLI to help with building themes for Easol
 test_files: []