sass-embedded 0.15.0 → 0.16.0

data/lib/sass/value/number.rb

@@ -0,0 +1,272 @@
+# frozen_string_literal: true
+
+module Sass
+  class Value
+    # Sass's number type.
+    class Number < Sass::Value
+      def initialize(value, numerator_units = [], denominator_units = []) # rubocop:disable Lint/MissingSuper
+        numerator_units = [numerator_units] if numerator_units.is_a?(::String)
+        denominator_units = [denominator_units] if denominator_units.is_a?(::String)
+
+        unless denominator_units.empty? && numerator_units.empty?
+          value = value.dup
+          numerator_units = numerator_units.dup
+          new_denominator_units = []
+
+          denominator_units.each do |denominator_unit|
+            index = numerator_units.find_index do |numerator_unit|
+              factor = Unit.conversion_factor(denominator_unit, numerator_unit)
+              if factor.nil?
+                false
+              else
+                value *= factor
+                true
+              end
+            end
+            if index.nil?
+              new_denominator_units.push(denominator_unit)
+            else
+              numerator_units.delete_at(index)
+            end
+          end
+
+          denominator_units = new_denominator_units
+        end
+
+        @value = value.freeze
+        @numerator_units = numerator_units.freeze
+        @denominator_units = denominator_units.freeze
+      end
+
+      attr_reader :value, :numerator_units, :denominator_units
+
+      def unitless?
+        numerator_units.empty? && denominator_units.empty?
+      end
+
+      def assert_unitless(name = nil)
+        raise error "Expected #{self} to have no units", name unless unitless?
+      end
+
+      def units?
+        !unitless?
+      end
+
+      def unit?(unit)
+        single_unit? && numerator_units.first == unit
+      end
+
+      def assert_unit(unit, name = nil)
+        raise error "Expected #{self} to have no unit \"#{unit}\"", name unless unit?(unit)
+      end
+
+      def integer?
+        FuzzyMath.integer?(value)
+      end
+
+      def assert_integer(name = nil)
+        raise error "#{self} is not an integer", name unless integer?
+
+        to_i
+      end
+
+      def to_i
+        FuzzyMath.to_i(value)
+      end
+
+      def assert_between(min, max, name = nil)
+        FuzzyMath.assert_between(value, min, max, name)
+      end
+
+      def compatible_with_unit?(unit)
+        single_unit? && !Unit.conversion_factor(numerator_units.first, unit).nil?
+      end
+
+      def convert(new_numerator_units, new_denominator_units, name = nil)
+        Number.new(convert_value(new_numerator_units, new_denominator_units, name), new_numerator_units,
+                   new_denominator_units)
+      end
+
+      def convert_value(new_numerator_units, new_denominator_units, name = nil)
+        coerce_or_convert_value(new_numerator_units, new_denominator_units,
+                                coerce_unitless: false,
+                                name: name)
+      end
+
+      def convert_to_match(other, name = nil, other_name = nil)
+        Number.new(convert_value_to_match(other, name, other_name), other.numerator_units, other.denominator_units)
+      end
+
+      def convert_value_to_match(other, name = nil, other_name = nil)
+        coerce_or_convert_value(other.numerator_units, other.denominator_units,
+                                coerce_unitless: false,
+                                name: name,
+                                other: other,
+                                other_name: other_name)
+      end
+
+      def coerce(new_numerator_units, new_denominator_units, name = nil)
+        Number.new(coerce_value(new_numerator_units, new_denominator_units, name), new_numerator_units,
+                   new_denominator_units)
+      end
+
+      def coerce_value(new_numerator_units, new_denominator_units, name = nil)
+        coerce_or_convert_value(new_numerator_units, new_denominator_units,
+                                coerce_unitless: true,
+                                name: name)
+      end
+
+      def coerce_value_to_unit(unit, name = nil)
+        coerce_value([unit], [], name)
+      end
+
+      def coerce_to_match(other, name = nil, other_name = nil)
+        Number.new(coerce_value_to_match(other, name, other_name), other.numerator_units, other.denominator_units)
+      end
+
+      def coerce_value_to_match(other, name = nil, other_name = nil)
+        coerce_or_convert_value(other.numerator_units, other.denominator_units,
+                                coerce_unitless: true,
+                                name: name,
+                                other: other,
+                                other_name: other_name)
+      end
+
+      def assert_number(_name = nil)
+        self
+      end
+
+      def ==(other)
+        return false unless other.is_a? Sass::Value::Number
+
+        return false if numerator_units.length != other.numerator_units.length ||
+                        denominator_units.length != other.denominator_units.length
+
+        return FuzzyMath.equals(value, other.value) if unitless?
+
+        if Unit.canonicalize_units(numerator_units) != Unit.canonicalize_units(other.numerator_units) &&
+           Unit.canonicalize_units(denominator_units) != Unit.canonicalize_units(other.denominator_units)
+          return false
+        end
+
+        FuzzyMath.equals(
+          (value *
+          Unit.canonical_multiplier(numerator_units) /
+          Unit.canonical_multiplier(denominator_units)),
+          (other.value *
+          Unit.canonical_multiplier(other.numerator_units) /
+          Unit.canonical_multiplier(other.denominator_units))
+        )
+      end
+
+      def hash
+        @hash ||= if unitless?
+                    FuzzyMath.hash(value)
+                  elsif single_unit?
+                    FuzzyMath.hash(
+                      value * Unit.canonical_multiplier_for_unit(numerator_units.first)
+                    )
+                  else
+                    FuzzyMath.hash(
+                      value * Unit.canonical_multiplier(numerator_units) / Unit.canonical_multiplier(denominator_units)
+                    )
+                  end
+      end
+
+      protected
+
+      def single_unit?
+        numerator_units.length == 1 && denominator_units.empty?
+      end
+
+      def coerce_or_convert_value(new_numerator_units, new_denominator_units,
+                                  coerce_unitless:,
+                                  name: nil,
+                                  other: nil,
+                                  other_name: nil)
+        if other && (other.numerator_units != new_denominator_units && other.denominator_units != new_denominator_units)
+          raise error "Expect #{other} to have units #{unit_string(new_numerator_units, new_denominator_units)}"
+        end
+
+        return value if numerator_units == new_numerator_units && denominator_units == new_denominator_units
+
+        return value if numerator_units == new_numerator_units && denominator_units == new_denominator_units
+
+        other_unitless = new_numerator_units.empty? && new_denominator_units.empty?
+
+        return value if coerce_unitless && (unitless? || other_unitless)
+
+        compatibility_error = lambda {
+          unless other.nil?
+            message = +"#{self} and"
+            message << " $#{other_name}:" unless other_name.nil?
+            message << " #{other} have incompatible units"
+            message << " (one has units and the other doesn't)" if unitless? || other_unitless
+            return error message, name
+          end
+
+          return error "Expected #{self} to have no units", name unless other_unitless
+
+          if new_numerator_units.length == 1 && new_denominator_units.empty?
+            type = Unit::TYPES_BY_UNIT[new_numerator_units.first]
+            return error "Expected #{self} to have a #{type} unit (#{Unit::UNITS_BY_TYPE[type].join(', ')})", name
+          end
+
+          unit_length = new_numerator_units.length + new_denominator_units.length
+          units = unit_string(new_numerator_units, new_denominator_units)
+          error "Expected #{self} to have unit#{unit_length > 1 ? 's' : ''} #{units}", name
+        }
+
+        result = value
+
+        old_numerator_units = numerator_units.dup
+        new_numerator_units.each do |new_numerator_unit|
+          index = old_numerator_units.find_index do |old_numerator_unit|
+            factor = Unit.conversion_factor(new_numerator_unit, old_numerator_unit)
+            if factor.nil?
+              false
+            else
+              result *= factor
+              true
+            end
+          end
+          raise compatibility_error.call if index.nil?
+
+          old_numerator_units.delete_at(index)
+        end
+
+        old_denominator_units = denominator_units.dup
+        new_denominator_units.each do |new_denominator_unit|
+          index = old_denominator_units.find_index do |old_denominator_unit|
+            factor = Unit.conversion_factor(new_denominator_unit, old_denominator_unit)
+            if factor.nil?
+              false
+            else
+              result /= factor
+              true
+            end
+          end
+          raise compatibility_error.call if index.nil?
+
+          old_denominator_units.delete_at(index)
+        end
+
+        raise compatibility_error.call unless old_numerator_units.empty? && old_denominator_units.empty?
+
+        result
+      end
+
+      def unit_string(numerator_units, denominator_units)
+        if numerator_units.empty?
+          return 'no units' if denominator_units.empty?
+
+          return denominator_units.length == 1 ? "#{denominator_units.first}^-1" : "(#{denominator_units.join('*')})^-1"
+        end
+
+        return numerator_units.join('*') if denominator_units.empty?
+
+        "#{numerator_units.join('*')}/#{denominator_units.join('*')}"
+      end
+    end
+  end
+end

data/lib/sass/value/string.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Sass
+  class Value
+    # Sass's string type.
+    class String < Sass::Value
+      def initialize(text = '', quoted: true) # rubocop:disable Lint/MissingSuper
+        @text = text.freeze
+        @quoted = quoted
+      end
+
+      attr_reader :text
+
+      def quoted?
+        @quoted
+      end
+
+      def sass_index_to_string_index(sass_index, name = nil)
+        index = sass_index.assert_number(name).assert_integer(name)
+        raise error('String index may not be 0', name) if index.zero?
+
+        if index.abs > text.length
+          raise error("Invalid index #{sass_index} for a string with #{text.length} characters",
+                      name)
+        end
+
+        index.negative? ? text.length + index : index - 1
+      end
+
+      def ==(other)
+        other.is_a?(Sass::Value::String) && other.text == text
+      end
+
+      def hash
+        @hash ||= text.hash
+      end
+
+      def assert_string(_name = nil)
+        self
+      end
+    end
+  end
+end

data/lib/sass/value.rb

@@ -0,0 +1,92 @@
+# frozen_string_literal: true
+
+module Sass
+  # The abstract base class of Sass's value types.
+  class Value
+    def to_a
+      [self]
+    end
+
+    def to_bool
+      true
+    end
+
+    def to_map
+      nil
+    end
+
+    def to_nil
+      self
+    end
+
+    def separator
+      nil
+    end
+
+    def bracketed?
+      false
+    end
+
+    def sass_index_to_list_index(sass_index, name = nil)
+      index = sass_index.assert_number(name).assert_integer(name)
+      raise error('List index may not be 0', name) if index.zero?
+
+      if index.abs > to_a_length
+        raise error("Invalid index #{sass_index} for a list with #{to_a_length} elements",
+                    name)
+      end
+
+      index.negative? ? to_a_length + index : index - 1
+    end
+
+    def at(index)
+      index < 1 && index >= -1 ? self : nil
+    end
+
+    def [](index)
+      at(index)
+    end
+
+    def assert_boolean(name = nil)
+      raise error("#{self} is not a boolean", name)
+    end
+
+    def assert_calculation(name = nil)
+      raise error("#{self} is not a calculation", name)
+    end
+
+    def assert_color(name = nil)
+      raise error("#{self} is not a color", name)
+    end
+
+    def assert_function(name = nil)
+      raise error("#{self} is not a function", name)
+    end
+
+    def assert_map(name = nil)
+      raise error("#{self} is not a map", name)
+    end
+
+    def assert_number(name = nil)
+      raise error("#{self} is not a number", name)
+    end
+
+    def assert_string(name = nil)
+      raise error("#{self} is not a string", name)
+    end
+
+    def eql?(other)
+      self == other
+    end
+
+    private
+
+    def to_a_length
+      1
+    end
+
+    def error(message, name = nil)
+      Sass::ScriptError.new name.nil? ? message : "$#{name}: #{message}"
+    end
+  end
+end

data/lib/sass.rb

@@ -1,83 +1,82 @@
 # frozen_string_literal: true
 
+require_relative 'sass/compile_error'
+require_relative 'sass/compile_result'
 require_relative 'sass/embedded'
+require_relative 'sass/embedded/channel'
+require_relative 'sass/embedded/observer'
+require_relative 'sass/embedded/compile_context'
+require_relative 'sass/embedded/compile_context/function_registry'
+require_relative 'sass/embedded/compile_context/importer_registry'
+require_relative 'sass/embedded/compiler'
+require_relative 'sass/embedded/compiler/path'
+require_relative 'sass/embedded_protocol'
+require_relative 'sass/embedded/legacy'
+require_relative 'sass/embedded/protocol_error'
+require_relative 'sass/embedded/protofier'
+require_relative 'sass/embedded/version'
+require_relative 'sass/embedded/version_context'
+require_relative 'sass/logger'
+require_relative 'sass/logger/source_location'
+require_relative 'sass/logger/source_span'
+require_relative 'sass/script_error'
+require_relative 'sass/value'
+require_relative 'sass/value/list'
+require_relative 'sass/value/argument_list'
+require_relative 'sass/value/boolean'
+require_relative 'sass/value/color'
+require_relative 'sass/value/function'
+require_relative 'sass/value/fuzzy_math'
+require_relative 'sass/value/map'
+require_relative 'sass/value/null'
+require_relative 'sass/value/number'
+require_relative 'sass/value/number/unit'
+require_relative 'sass/value/string'
 
-# The Sass module. This communicates with Embedded Dart Sass using
-# the Embedded Sass protocol.
+# The Sass module.
+#
+# This communicates with Embedded Dart Sass using the Embedded Sass protocol.
 module Sass
   class << self
-    # The global {.compile} method. This instantiates a global {Embedded} instance
-    # and calls {Embedded#compile}.
+    # The global {.compile} method.
     #
-    # See {Embedded#compile} for supported options.
+    # This instantiates a global {Embedded} instance and calls {Embedded#compile}.
+    #
+    # See {Embedded#compile} for keyword arguments.
     #
     # @example
     #   Sass.compile('style.scss')
     # @return [CompileResult]
     # @raise [CompileError]
-    # @raise [ProtocolError]
+    # @raise [Embedded::ProtocolError]
     def compile(path, **kwargs)
       instance.compile(path, **kwargs)
     end
 
-    # The global {.compile_string} method. This instantiates a global {Embedded} instance
-    # and calls {Embedded#compile_string}.
+    # The global {.compile_string} method.
+    #
+    # This instantiates a global {Embedded} instance and calls {Embedded#compile_string}.
     #
-    # See {Embedded#compile_string} for supported options.
+    # See {Embedded#compile_string} for keyword arguments.
     #
     # @example
     #   Sass.compile_string('h1 { font-size: 40px; }')
     # @return [CompileResult]
     # @raise [CompileError]
-    # @raise [ProtocolError]
+    # @raise [Embedded::ProtocolError]
     def compile_string(source, **kwargs)
       instance.compile_string(source, **kwargs)
     end
 
-    # @deprecated
-    # The global {.include_paths} for Sass files. This is meant for plugins and
-    # libraries to register the paths to their Sass stylesheets to that they may
-    # be included via `@import` or `@use`. This include path is used by every
-    # instance of {Sass::Embedded}. They are lower-precedence than any include
-    # paths passed in via the `include_paths` option.
-    #
-    # If the `SASS_PATH` environment variable is set,
-    # the initial value of `include_paths` will be initialized based on that.
-    # The variable should be a colon-separated list of path names
-    # (semicolon-separated on Windows).
+    # The global {.info} method.
     #
-    # @example
-    #   Sass.include_paths << File.dirname(__FILE__) + '/sass'
-    # @return [Array]
-    def include_paths
-      Embedded.include_paths
-    end
-
-    # The global {.info} method. This instantiates a global {Embedded} instance
-    # and calls {Embedded#info}.
+    # This instantiates a global {Embedded} instance and calls {Embedded#info}.
     #
-    # @raise [ProtocolError]
+    # @raise [Embedded::ProtocolError]
     def info
       instance.info
     end
 
-    # @deprecated
-    # The global {.render} method. This instantiates a global {Embedded} instance
-    # and calls {Embedded#render}.
-    #
-    # See {Embedded#render} for supported options.
-    #
-    # @example
-    #   Sass.render(data: 'h1 { font-size: 40px; }')
-    # @example
-    #   Sass.render(file: 'style.css')
-    # @return [Result]
-    # @raise [ProtocolError]
-    # @raise [RenderError]
-    def render(**kwargs)
-      instance.render(**kwargs)
-    end
-
     private
 
     def instance

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sass-embedded
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
 platform: ruby
 authors:
 - なつき
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-09 00:00:00.000000000 Z
+date: 2022-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -24,62 +24,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.19.0
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 5.15.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 5.15.0
-- !ruby/object:Gem::Dependency
-  name: minitest-around
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.5.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 13.0.6
+        version: 13.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 13.0.6
+        version: 13.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: 3.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: 3.11.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -94,20 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.25.0
-- !ruby/object:Gem::Dependency
-  name: rubocop-minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.17.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
@@ -171,24 +129,40 @@ files:
 - lib/sass/embedded.rb
 - lib/sass/embedded/channel.rb
 - lib/sass/embedded/compile_context.rb
+- lib/sass/embedded/compile_context/function_registry.rb
+- lib/sass/embedded/compile_context/importer_registry.rb
 - lib/sass/embedded/compiler.rb
 - lib/sass/embedded/compiler/path.rb
 - lib/sass/embedded/compiler/requirements.rb
+- lib/sass/embedded/legacy.rb
 - lib/sass/embedded/observer.rb
 - lib/sass/embedded/protocol_error.rb
-- lib/sass/embedded/render.rb
+- lib/sass/embedded/protofier.rb
 - lib/sass/embedded/version.rb
 - lib/sass/embedded/version_context.rb
 - lib/sass/embedded_protocol.rb
 - lib/sass/logger.rb
 - lib/sass/logger/source_location.rb
 - lib/sass/logger/source_span.rb
+- lib/sass/script_error.rb
+- lib/sass/value.rb
+- lib/sass/value/argument_list.rb
+- lib/sass/value/boolean.rb
+- lib/sass/value/color.rb
+- lib/sass/value/function.rb
+- lib/sass/value/fuzzy_math.rb
+- lib/sass/value/list.rb
+- lib/sass/value/map.rb
+- lib/sass/value/null.rb
+- lib/sass/value/number.rb
+- lib/sass/value/number/unit.rb
+- lib/sass/value/string.rb
 homepage: https://github.com/ntkme/sass-embedded-host-ruby
 licenses:
 - MIT
 metadata:
-  documentation_uri: https://www.rubydoc.info/gems/sass-embedded/0.15.0
-  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v0.15.0
+  documentation_uri: https://www.rubydoc.info/gems/sass-embedded/0.16.0
+  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v0.16.0
   funding_uri: https://github.com/sponsors/ntkme
 post_install_message: 
 rdoc_options: []
@@ -205,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Use dart-sass with Ruby!