sassc 1.12.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '04176064892f9e9a76a5817dbcee82dbe97ed15550fce3079221c86093103670'
-  data.tar.gz: 48a3cb002d56556c76e520d873ec276c9d69bdae858b0586c9cee3cf4d5acc8c
+  metadata.gz: 728b06267e365e493048b5367d344608392997c5beee20e7606d763b655514e7
+  data.tar.gz: c418fc06a5d8badec39fe2abf134c8297fa7d96679fa3af145f9718004b3e35b
 SHA512:
-  metadata.gz: d22d06995c99d8c72a7887a3c432689683a17987dbd60c682571be0f7f97ad7ca5cc6de83738a1c44e348da3fe98f87728594b633fc85a9d7907b31cf241e645
-  data.tar.gz: a61ebd11b851d986ac24bf9180cc3830082068da3b3e3096d12cc1ce8308ebf70d2f75a8224797e4c134576cdc67cd88824db97d39f4b30ef91c5bf3672a72c8
+  metadata.gz: 37937f49272650f5efc95eda412f8487050171a6fe31eae775cdf6ff03aa293458388a22a352a5dd59f3f4141d83a7f32f91b571513cdb14468a11f6176b69ea
+  data.tar.gz: e25e7d5a7b9049802c35e456cb35e22c801028ca93c5efceaea1e7cf80c14ba84ec3ceb7660d6323146cc5b09a9fb8e1843aa678bc3076d2231cf48d84bae197

data/.travis.yml

@@ -3,7 +3,7 @@ language: ruby
 bundler_args: "--binstubs --standalone --without documentation --path ../bundle"
 script: "bundle exec rake test"
 rvm:
-  - 2.3.3
+  - 2.3.7
   - 2.4.4
   - 2.5.1
 notifications:

data/CHANGELOG.md

@@ -0,0 +1,61 @@
+- **2.0.0**
+  - [Remove dependency on Ruby Sass](https://github.com/sass/sassc-ruby/pull/85)
+  - [frozen_string_literal all files](https://github.com/sass/sassc-ruby/pull/85)
+- **1.12.1**
+  - [Downgrade to libsass 3.5.2 to fix css imports](https://github.com/sass/sassc-ruby/pull/81)
+- **1.12.0**
+  - [Update Libsass to 3.5.4](https://github.com/sass/sassc-ruby/pull/78)
+  - [bundler is a development dependency](https://github.com/sass/sassc-ruby/pull/51)
+- **1.11.4**
+  - Fix `Value::List` related issue with sass 3.5.0
+- **1.11.3**
+  - [Require Sass::Deprecation module](https://github.com/sass/sassc-ruby/pull/68)
+- **1.11.2**
+  - [Update to libsass 3.4.3](https://github.com/sass/sassc-ruby/pull/65)
+- **1.11.1**
+  - [Update to libsass 3.4.1](https://github.com/sass/sassc-ruby/pull/61)
+- **1.11.0**
+  - [Add support for lists in functions](https://github.com/sass/sassc-ruby/pull/55)
+  - [Update to libsass 3.4.0](https://github.com/sass/sassc-ruby/pull/57)
+- **1.10.1**
+  - [Add sourcemap getter](https://github.com/sass/sassc-ruby/pull/48)
+- **1.10.0**
+  - [Improved error messages](https://github.com/sass/sassc-ruby/pull/34)
+  - Update to Libsass 3.3.6
+- **1.9.0**
+  - Support boolean script support
+- **1.8.5**
+  - Update to Libsass 3.3.4
+- **1.8.4**
+  - Update to Libsass 3.3.3
+- **1.8.3**
+  - [Passing empty string into engine does not raise error](https://github.com/sass/sassc-ruby/pull/31)
+- **1.8.2**
+  - Update to Libsass 3.3.2
+- **1.8.1**
+  - Update to Libsass 3.3.1
+- **1.8.0**
+  - Update to Libsass 3.3.0
+- **1.8.0.pre2**
+  - Fix bug with looking up gem_path
+- **1.8.0.pre1**
+  - [Update to Libsass 3.3.0-beta3](https://github.com/sass/sassc-ruby/pull/20)
+- **1.7.1**
+  - Some updates to `Engine` API.
+- **1.7.0**
+  - [Support Precision](https://github.com/sass/sassc-ruby/pull/19)
+- **1.6.0**
+  - [Support Sass Color types](https://github.com/bolandrm/sassc-ruby/pull/14)
+  - [Support quoted strings](https://github.com/bolandrm/sassc-ruby/pull/13)
+  - [Improve custom function error handling](https://github.com/bolandrm/sassc-ruby/pull/15)
+- **1.5.1**
+  - 2nd attempt at fixing compilation bug (issue [#12](https://github.com/bolandrm/sassc-ruby/issues/12))
+- **1.5.0**
+  - Add support for inline source maps
+  - Fix compilation bug (issue [#12](https://github.com/bolandrm/sassc-ruby/issues/12))
+- **1.4.0**
+  - Add support for line number comments
+- **1.3.0**
+  - Support Sass color custom function arguments
+  - Adds error handling for exceptions in custom functions
+  - Custom functions may have optional/default arguments

data/Gemfile

@@ -1,4 +1,2 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in sassc.gemspec
+source "https://rubygems.org"
 gemspec

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2015 Ryan Boland
+Copyright (c) Ryan Boland & Contributors
 
 MIT License
 

data/README.md

@@ -2,7 +2,7 @@
 
 Use `libsass` with Ruby!
 
-This gem combines the speed of `libsass`, the [Sass C implementation](https://github.com/sass/libsass), with the ease of use of the original [Ruby Sass](https://github.com/sass/sass) library.
+This gem combines the speed of `libsass`, the [Sass C implementation](https://github.com/sass/libsass), with the ease of use of the original [Ruby Sass](https://github.com/sass/ruby-sass) library.
 
 ### libsass Version
 
@@ -48,64 +48,8 @@ This gem is maintained by [Ryan Boland](https://ryanboland.com)
 and [awesome contributors](https://github.com/bolandrm/sassc-ruby/graphs/contributors).
 
 ## Changelog
-- **1.12.1**
-  - [Downgrade to libsass 3.5.2 to fix css imports](https://github.com/sass/sassc-ruby/pull/81)
-- **1.12.0**
-  - [Update Libsass to 3.5.4](https://github.com/sass/sassc-ruby/pull/78)
-  - [bundler is a development dependency](https://github.com/sass/sassc-ruby/pull/51)
-- **1.11.4**
-  - Fix `Value::List` related issue with sass 3.5.0
-- **1.11.3**
-  - [Require Sass::Deprecation module](https://github.com/sass/sassc-ruby/pull/68)
-- **1.11.2**
-  - [Update to libsass 3.4.3](https://github.com/sass/sassc-ruby/pull/65)
-- **1.11.1**
-  - [Update to libsass 3.4.1](https://github.com/sass/sassc-ruby/pull/61)
-- **1.11.0**
-  - [Add support for lists in functions](https://github.com/sass/sassc-ruby/pull/55)
-  - [Update to libsass 3.4.0](https://github.com/sass/sassc-ruby/pull/57)
-- **1.10.1**
-  - [Add sourcemap getter](https://github.com/sass/sassc-ruby/pull/48)
-- **1.10.0**
-  - [Improved error messages](https://github.com/sass/sassc-ruby/pull/34)
-  - Update to Libsass 3.3.6
-- **1.9.0**
-  - Support boolean script support
-- **1.8.5**
-  - Update to Libsass 3.3.4
-- **1.8.4**
-  - Update to Libsass 3.3.3
-- **1.8.3**
-  - [Passing empty string into engine does not raise error](https://github.com/sass/sassc-ruby/pull/31)
-- **1.8.2**
-  - Update to Libsass 3.3.2
-- **1.8.1**
-  - Update to Libsass 3.3.1
-- **1.8.0**
-  - Update to Libsass 3.3.0
-- **1.8.0.pre2**
-  - Fix bug with looking up gem_path
-- **1.8.0.pre1**
-  - [Update to Libsass 3.3.0-beta3](https://github.com/sass/sassc-ruby/pull/20)
-- **1.7.1**
-  - Some updates to `Engine` API.
-- **1.7.0**
-  - [Support Precision](https://github.com/sass/sassc-ruby/pull/19)
-- **1.6.0**
-  - [Support Sass Color types](https://github.com/bolandrm/sassc-ruby/pull/14)
-  - [Support quoted strings](https://github.com/bolandrm/sassc-ruby/pull/13)
-  - [Improve custom function error handling](https://github.com/bolandrm/sassc-ruby/pull/15)
-- **1.5.1**
-  - 2nd attempt at fixing compilation bug (issue [#12](https://github.com/bolandrm/sassc-ruby/issues/12))
-- **1.5.0**
-  - Add support for inline source maps
-  - Fix compilation bug (issue [#12](https://github.com/bolandrm/sassc-ruby/issues/12))
-- **1.4.0**
-  - Add support for line number comments
-- **1.3.0**
-  - Support Sass color custom function arguments
-  - Adds error handling for exceptions in custom functions
-  - Custom functions may have optional/default arguments
+
+See [CHANGELOG.md](CHANGELOG.md).
 
 ## Contributing
 

data/lib/sassc.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SassC
 end
 
@@ -5,9 +7,26 @@ require_relative "sassc/version"
 require_relative "sassc/native"
 require_relative "sassc/import_handler"
 require_relative "sassc/importer"
+require_relative "sassc/util"
+require_relative "sassc/util/normalized_map"
 require_relative "sassc/script"
+require_relative "sassc/script/value"
+require_relative "sassc/script/value/bool"
+require_relative "sassc/script/value/number"
+require_relative "sassc/script/value/color"
+require_relative "sassc/script/value/string"
+require_relative "sassc/script/value/list"
+require_relative "sassc/script/value/map"
+require_relative "sassc/script/functions"
+require_relative "sassc/script/value_conversion"
+require_relative "sassc/script/value_conversion/base"
+require_relative "sassc/script/value_conversion/string"
+require_relative "sassc/script/value_conversion/number"
+require_relative "sassc/script/value_conversion/color"
+require_relative "sassc/script/value_conversion/map"
+require_relative "sassc/script/value_conversion/list"
+require_relative "sassc/script/value_conversion/bool"
 require_relative "sassc/functions_handler"
-require_relative "sassc/cache_stores"
 require_relative "sassc/dependency"
 require_relative "sassc/error"
 require_relative "sassc/engine"

data/lib/sassc/dependency.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SassC
   class Dependency
     attr_reader :filename

data/lib/sassc/engine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative "error"
 
 module SassC

data/lib/sassc/error.rb

@@ -1,7 +1,9 @@
-require 'pathname'
-require 'sass/error'
+# frozen_string_literal: true
+
+require "pathname"
 
 module SassC
+
   class BaseError < StandardError; end
   class NotRenderedError < BaseError; end
   class InvalidStyleError < BaseError; end
@@ -9,8 +11,10 @@ module SassC
 
   # When dealing with SyntaxErrors,
   # it's important to provide filename and line number information.
-  # This will be used in various error reports to users, including backtraces;
+  # This will be used in various error reports to users, including backtraces.
+
   class SyntaxError < BaseError
+
     def initialize(message, filename: nil, line: nil)
       @filename = filename
       @line = line
@@ -27,5 +31,7 @@ module SassC
       return [] unless @filename && @line
       ["#{@filename}:#{@line}"]
     end
+
   end
+
 end

data/lib/sassc/functions_handler.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SassC
   class FunctionsHandler
     def initialize(options)
@@ -54,8 +56,7 @@ module SassC
     def to_native_value(sass_value)
       # if the custom function returns nil, we provide a "default" return
       # value of an empty string
-      sass_value ||= Script::String.new("")
-
+      sass_value ||= SassC::Script::Value::String.new("")
       sass_value.options = @options
       Script::ValueConversion.to_native(sass_value)
     end

data/lib/sassc/import_handler.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SassC
   class ImportHandler
     def initialize(options)

data/lib/sassc/importer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SassC
   class Importer
     attr_reader :options

data/lib/sassc/native.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "ffi"
 
 module SassC
@@ -48,8 +50,7 @@ module SassC
     end
 
     def self.native_string(string)
-      string = string.to_s
-      string << "\0"
+      string = "#{string}\0"
       data = Native::LibC.malloc(string.bytesize)
       data.write_string(string)
       data

data/lib/sassc/native/lib_c.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SassC
   module Native
     module LibC

data/lib/sassc/native/native_context_api.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SassC
   module Native
     attach_function :version, :libsass_version, [], :string

data/lib/sassc/native/native_functions_api.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SassC
   module Native
     # Creators for sass function list and function descriptors

data/lib/sassc/native/sass2scss_api.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SassC
   module Native
     # ADDAPI char* ADDCALL sass2scss (const char* sass, const int options);

data/lib/sassc/native/sass_input_style.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SassC
   module Native
     SassInputStyle = enum(

data/lib/sassc/native/sass_output_style.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SassC
   module Native
     SassOutputStyle = enum(

data/lib/sassc/native/sass_value.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SassC
   module Native
     class SassValue < FFI::Union; end

data/lib/sassc/native/string_list.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SassC
   module Native
     class StringList < FFI::Struct

data/lib/sassc/sass_2_scss.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SassC
   class Sass2Scss
     def self.convert(sass)

data/lib/sassc/script.rb

@@ -1,5 +1,8 @@
+# frozen_string_literal: true
+
 module SassC
   module Script
+
     def self.custom_functions
       Functions.instance_methods.select do |function|
         Functions.public_method_defined?(function)
@@ -8,42 +11,9 @@ module SassC
 
     def self.formatted_function_name(function_name)
       params = Functions.instance_method(function_name).parameters
-      params = params.map { |param_type, name| "$#{name}#{': null' if param_type == :opt}" }
-                     .join(", ")
-
-      "#{function_name}(#{params})"
-    end
-
-    module Value
+      params = params.map { |param_type, name| "$#{name}#{': null' if param_type == :opt}" }.join(", ")
+      return "#{function_name}(#{params})"
     end
-  end
-end
-
-require_relative "script/functions"
-require_relative "script/value_conversion"
 
-module Sass
-  module Script
   end
 end
-
-require 'sass/util'
-
-begin
-  require 'sass/deprecation'
-rescue LoadError
-end
-
-require 'sass/script/value/base'
-require 'sass/script/value/string'
-require 'sass/script/value/color'
-require 'sass/script/value/bool'
-
-SassC::Script::String = Sass::Script::Value::String
-SassC::Script::Value::String = Sass::Script::Value::String
-
-SassC::Script::Color = Sass::Script::Value::Color
-SassC::Script::Value::Color = Sass::Script::Value::Color
-
-SassC::Script::Bool = Sass::Script::Value::Bool
-SassC::Script::Value::Bool = Sass::Script::Value::Bool

data/lib/sassc/script/functions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SassC
   module Script
     module Functions

data/lib/sassc/script/value.rb

@@ -0,0 +1,137 @@
+# frozen_string_literal: true
+
+# The abstract superclass for SassScript objects.
+# Many of these methods, especially the ones that correspond to SassScript operations,
+# are designed to be overridden by subclasses which may change the semantics somewhat.
+# The operations listed here are just the defaults.
+
+class SassC::Script::Value
+
+  # Returns the pure Ruby value of the value.
+  # The type of this value varies based on the subclass.
+  attr_reader :value
+
+  # The source range in the document on which this node appeared.
+  attr_accessor :source_range
+
+  # Creates a new value.
+  def initialize(value = nil)
+    value.freeze unless value.nil? || value == true || value == false
+    @value = value
+    @options = nil
+  end
+
+  # Sets the options hash for this node,
+  # as well as for all child nodes.
+  # See the official Sass reference for options.
+  attr_writer :options
+
+  # Returns the options hash for this node.
+  # Raises SassC::SyntaxError if the value was created
+  # outside of the parser and \{#to\_s} was called on it
+  def options
+    return @options if @options
+    raise SassC::SyntaxError.new("The #options attribute is not set on this #{self.class}. This error is probably occurring because #to_s was called on this value within a custom Sass function without first setting the #options attribute.")
+  end
+
+  # Returns the hash code of this value. Two objects' hash codes should be
+  # equal if the objects are equal.
+  def hash
+    value.hash
+  end
+
+  # True if this Value is the same as `other`
+  def eql?(other)
+    self == other
+  end
+
+  # Returns a system inspect value for this object
+  def inspect
+    value.inspect
+  end
+
+  # Returns `true` (all Values are truthy)
+  def to_bool
+    true
+  end
+
+  # Compares this object to `other`
+  def ==(other)
+    self.class == other.class && value == other.value
+  end
+
+  # Returns the integer value of this value.
+  # Raises SassC::SyntaxError if this value doesn’t implment integer conversion.
+  def to_i
+    raise SassC::SyntaxError.new("#{inspect} is not an integer.")
+  end
+
+  # @raise [SassC::SyntaxError] if this value isn't an integer
+  def assert_int!; to_i; end
+
+  # Returns the separator for this value. For non-list-like values or the
+  # empty list, this will be `nil`. For lists or maps, it will be `:space` or `:comma`.
+  def separator
+    nil
+  end
+
+  # Whether the value is surrounded by square brackets. For non-list values,
+  # this will be `false`.
+  def bracketed
+    false
+  end
+
+  # Returns the value of this Value as an array.
+  # Single Values are considered the same as single-element arrays.
+  def to_a
+    [self]
+  end
+
+  # Returns the value of this value as a hash. Most values don't have hash
+  # representations, but [Map]s and empty [List]s do.
+  #
+  # @return [Hash<Value, Value>] This value as a hash
+  # @raise [SassC::SyntaxError] if this value doesn't have a hash representation
+  def to_h
+    raise SassC::SyntaxError.new("#{inspect} is not a map.")
+  end
+
+  # Returns the string representation of this value
+  # as it would be output to the CSS document.
+  #
+  # @options opts :quote [String]
+  #   The preferred quote style for quoted strings. If `:none`, strings are
+  #   always emitted unquoted.
+  # @return [String]
+  def to_s(opts = {})
+    SassC::Util.abstract(self)
+  end
+  alias_method :to_sass, :to_s
+
+  # Returns `false` (all Values are truthy)
+  def null?
+    false
+  end
+
+  # Creates a new list containing `contents` but with the same brackets and
+  # separators as this object, when interpreted as a list.
+  #
+  # @param contents [Array<Value>] The contents of the new list.
+  # @param separator [Symbol] The separator of the new list. Defaults to \{#separator}.
+  # @param bracketed [Boolean] Whether the new list is bracketed. Defaults to \{#bracketed}.
+  # @return [Sass::Script::Value::List]
+  def with_contents(contents, separator: self.separator, bracketed: self.bracketed)
+    SassC::Script::Value::List.new(contents, separator: separator, bracketed: bracketed)
+  end
+
+  protected
+
+  # Evaluates the value.
+  #
+  # @param environment [Sass::Environment] The environment in which to evaluate the SassScript
+  # @return [Value] This value
+  def _perform(environment)
+    self
+  end
+
+end