easol-canvas 2.2.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 988493985d369b518ca9bb2b802c8d2bc639e7a632090434b9c558e3fc5d6256
-  data.tar.gz: 3d9d3df30a6d5a6db096e570d3cba97fc9e4d26284d7b4596b535bf57080991f
+  metadata.gz: e63c9433580fb2f338b5b9ebdb7f86697e9ff5f9a9c57314463779330d81d8a0
+  data.tar.gz: 22b11a8f25bbf68a8c81431987008d34d1f6803eeef5737fb2dd014c742d4403
 SHA512:
-  metadata.gz: de8eb335498a0fd7dea007d77ac4cd25503ee85da121dfd9fa9c0eec96932294f532194abecbc57a40e1411449f14baecfda8006f3ce4a09aff6c52bc2afb03d
-  data.tar.gz: 55c0d63a5758238e008f9a88642c8e77df735192b67c0fa32d35f7e6562001d19dbd082fdada888f7fb679286f864275bc7c50aeb129bbc65ca16ae0e24e7f8d
+  metadata.gz: 31e7aaad1f6562f238917a9101629d89bc4f5da3bb5be9e006933bbeabb0315a75a652cc03d943460f8de4077895fa4deada5aa504a2068226d5e7a18ab6ed7d
+  data.tar.gz: bfc8b4002c79133a134f3a2ad073631f9d93595573e2b442d489f478e635c4519c267f0834c684eb7a6b05d4432d9337cb7c3ec3201f65694c29986f6d8a60c4

data/lib/canvas/checks/valid_liquid_check.rb

@@ -38,6 +38,7 @@ module Canvas
       register_tag("easol_badge", ::Liquid::Tag)
       register_tag("accommodation_availability", ::Liquid::Block)
       register_tag("cache", ::Liquid::Block)
+      register_tag("currency_switcher", ::Liquid::Tag)
     end
   end
 end

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/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/version.rb

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

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: easol-canvas
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Kyle Byrne
 - Ian Mooney
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-17 00:00:00.000000000 Z
+date: 2022-11-25 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.0.3.1
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: CLI to help with building themes for Easol
 test_files: []