Skip to content

Commit 61a02d1

Browse files
authored
Merge pull request #85 from csuhta/jettison-ruby-sass
2.0.0: Remove dependency on Ruby Sass
2 parents 93de190 + 236a1cc commit 61a02d1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+1510
-192
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ bundler_args: "--binstubs --standalone --without documentation --path ../bundle"
44
script: "bundle exec rake test"
55
rvm:
66
- 2.3.3
7+
- 2.3.7
78
- 2.4.4
89
- 2.5.1
910
notifications:

Gemfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
1-
source 'https://rubygems.org'
2-
3-
# Specify your gem's dependencies in sassc.gemspec
1+
source "https://rubygems.org"
42
gemspec

LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2015 Ryan Boland
1+
Copyright (c) Ryan Boland & Contributors
22

33
MIT License
44

lib/sassc.rb

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,32 @@
1+
# frozen_string_literal: true
2+
13
module SassC
24
end
35

46
require_relative "sassc/version"
57
require_relative "sassc/native"
68
require_relative "sassc/import_handler"
79
require_relative "sassc/importer"
10+
require_relative "sassc/util"
11+
require_relative "sassc/util/normalized_map"
812
require_relative "sassc/script"
13+
require_relative "sassc/script/value"
14+
require_relative "sassc/script/value/bool"
15+
require_relative "sassc/script/value/number"
16+
require_relative "sassc/script/value/color"
17+
require_relative "sassc/script/value/string"
18+
require_relative "sassc/script/value/list"
19+
require_relative "sassc/script/value/map"
20+
require_relative "sassc/script/functions"
21+
require_relative "sassc/script/value_conversion"
22+
require_relative "sassc/script/value_conversion/base"
23+
require_relative "sassc/script/value_conversion/string"
24+
require_relative "sassc/script/value_conversion/number"
25+
require_relative "sassc/script/value_conversion/color"
26+
require_relative "sassc/script/value_conversion/map"
27+
require_relative "sassc/script/value_conversion/list"
28+
require_relative "sassc/script/value_conversion/bool"
929
require_relative "sassc/functions_handler"
10-
require_relative "sassc/cache_stores"
1130
require_relative "sassc/dependency"
1231
require_relative "sassc/error"
1332
require_relative "sassc/engine"

lib/sassc/cache_stores.rb

Lines changed: 0 additions & 6 deletions
This file was deleted.

lib/sassc/cache_stores/base.rb

Lines changed: 0 additions & 8 deletions
This file was deleted.

lib/sassc/dependency.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
module SassC
24
class Dependency
35
attr_reader :filename

lib/sassc/engine.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
require_relative "error"
24

35
module SassC

lib/sassc/error.rb

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,20 @@
1-
require 'pathname'
2-
require 'sass/error'
1+
# frozen_string_literal: true
2+
3+
require "pathname"
34

45
module SassC
6+
57
class BaseError < StandardError; end
68
class NotRenderedError < BaseError; end
79
class InvalidStyleError < BaseError; end
810
class UnsupportedValue < BaseError; end
911

1012
# When dealing with SyntaxErrors,
1113
# it's important to provide filename and line number information.
12-
# This will be used in various error reports to users, including backtraces;
14+
# This will be used in various error reports to users, including backtraces.
15+
1316
class SyntaxError < BaseError
17+
1418
def initialize(message, filename: nil, line: nil)
1519
@filename = filename
1620
@line = line
@@ -27,5 +31,7 @@ def sass_backtrace
2731
return [] unless @filename && @line
2832
["#{@filename}:#{@line}"]
2933
end
34+
3035
end
36+
3137
end

lib/sassc/functions_handler.rb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
module SassC
24
class FunctionsHandler
35
def initialize(options)
@@ -54,8 +56,7 @@ def arguments_from_native_list(native_argument_list)
5456
def to_native_value(sass_value)
5557
# if the custom function returns nil, we provide a "default" return
5658
# value of an empty string
57-
sass_value ||= Script::String.new("")
58-
59+
sass_value ||= SassC::Script::Value::String.new("")
5960
sass_value.options = @options
6061
Script::ValueConversion.to_native(sass_value)
6162
end

0 commit comments

Comments
 (0)