sass-rails 5.1.0 → 6.0.0.beta1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA256:
3
- metadata.gz: 81b377677315439a968f5d8c1fe884680e40681853aa6ce0059fec8f81a7561e
4
- data.tar.gz: fce2dc70c42fd35b13dd1310c6e7f48825143497bb98fde3d4ded15efa5b72fe
2
+ SHA1:
3
+ metadata.gz: c1b04b0301fea537ecc93336d859d7014bd44547
4
+ data.tar.gz: a635205225e4fa734031611d03a2c1436af98184
5
5
  SHA512:
6
- metadata.gz: 561d100c511ed762dec416a081117bb949833e2ffde2ea8fa984cfae44f4f432e3cb52f3f213c8b4c37fe365c50a77b8fbe04e26f48a4a12b7cc5f8fd074ffce
7
- data.tar.gz: 20b336c399d4907f64c95112a95ab912ce04575f8e3f153476e1b10d5d70dba4038d220baadbf4d408f509fe2c58cdde26c5250383ad52b011394c46afe90f65
6
+ metadata.gz: 16f8ca2843e8e61ab0d94c7b795880b8952910c3613c0acc44516d07aa516d8e97bf1a2ec76dd7265dc181051666b0ecf509c783045cd9b7b5d5d309ffa6f459
7
+ data.tar.gz: bfdc2a2f767e1321b94ba6f46d3eb0d2fd7f89fd6a36a4be0603281de5da251f797de18ad0fcd987d0f751ca11d61f4f82acb1217761714d81780431c9daee29
@@ -1,4 +1,4 @@
1
- Copyright (c) 2011 Christopher Eppstein
1
+ Copyright (c) 2011-2016 Christopher Eppstein
2
2
 
3
3
  Permission is hereby granted, free of charge, to any person obtaining
4
4
  a copy of this software and associated documentation files (the
data/README.md CHANGED
@@ -6,7 +6,9 @@ This gem provides official integration for Ruby on Rails projects with the Sass
6
6
 
7
7
  Since Rails 3.1, new Rails projects will be already configured to use Sass. If you are upgrading to Rails 3.1 you will need to add the following to your Gemfile:
8
8
 
9
- gem 'sass-rails'
9
+ ```ruby
10
+ gem 'sass-rails'
11
+ ```
10
12
 
11
13
  ## Configuration
12
14
 
@@ -30,12 +32,13 @@ can be found on the Sass Website with the following caveats:
30
32
  - `:line` - This is provided by the template handler.
31
33
 
32
34
  ### Example
33
-
34
- MyProject::Application.configure do
35
- config.sass.preferred_syntax = :sass
36
- config.sass.line_comments = false
37
- config.sass.cache = false
38
- end
35
+ ```ruby
36
+ MyProject::Application.configure do
37
+ config.sass.preferred_syntax = :sass
38
+ config.sass.line_comments = false
39
+ config.sass.cache = false
40
+ end
41
+ ```
39
42
 
40
43
  ## Important Note
41
44
 
@@ -5,7 +5,5 @@ module Sass
5
5
  end
6
6
 
7
7
  require 'sass/rails/version'
8
- require 'sass/rails/helpers'
9
8
  require 'sass/rails/importer'
10
- require 'sass/rails/template'
11
9
  require 'sass/rails/railtie'
@@ -1,7 +1,8 @@
1
1
  require 'active_support/deprecation/reporting'
2
- require 'sass'
3
- require 'sprockets/sass_importer'
4
- require 'tilt'
2
+ require 'sass/importers'
3
+ require 'sprockets/file_reader'
4
+ require 'sprockets/erb_processor'
5
+ require 'sprockets/processor_utils'
5
6
 
6
7
  module Sass
7
8
  module Rails
@@ -86,10 +87,20 @@ module Sass
86
87
  private
87
88
  def process_erb_engine(engine)
88
89
  if engine && engine.options[:sprockets] && syntax = erb_extensions[engine.options[:syntax]]
89
- template = Tilt::ERBTemplate.new(engine.options[:filename])
90
- contents = template.render(engine.options[:sprockets][:context], {})
90
+ context = engine.options[:sprockets][:context]
91
91
 
92
- Sass::Engine.new(contents, engine.options.merge(:syntax => syntax))
92
+ input = {
93
+ filename: engine.options[:filename],
94
+ environment: context.environment,
95
+ content_type: "text/#{syntax}",
96
+ metadata: {}
97
+ }
98
+
99
+ processors = [Sprockets::ERBProcessor, Sprockets::FileReader]
100
+
101
+ result = Sprockets::ProcessorUtils.call_processors(processors, input)
102
+
103
+ Sass::Engine.new(result[:data], engine.options.merge(:syntax => syntax))
93
104
  else
94
105
  engine
95
106
  end
@@ -134,8 +145,8 @@ module Sass
134
145
  end
135
146
  end
136
147
 
137
- include Deprecated
138
148
  include ERB
149
+ include Deprecated
139
150
  include Globbing
140
151
 
141
152
  # Allow .css files to be @import'd
@@ -1,4 +1,3 @@
1
- require 'sass'
2
1
  require 'sass/logger'
3
2
 
4
3
  module Sass
@@ -1,6 +1,7 @@
1
1
  require 'sass'
2
2
  require 'active_support/core_ext/class/attribute'
3
3
  require 'sprockets/railtie'
4
+ require 'sprockets/sass_processor'
4
5
 
5
6
  module Sass::Rails
6
7
  class Railtie < ::Rails::Railtie
@@ -54,27 +55,10 @@ module Sass::Rails
54
55
  end
55
56
 
56
57
  config.assets.configure do |env|
57
- if env.respond_to?(:register_engine)
58
- args = ['.sass', Sass::Rails::SassTemplate]
59
- args << { silence_deprecation: true } if env.method(:register_engine).arity.abs > 2
60
- env.register_engine(*args)
61
-
62
- args = ['.scss', Sass::Rails::ScssTemplate]
63
- args << { silence_deprecation: true } if env.method(:register_engine).arity.abs > 2
64
- env.register_engine(*args)
65
- end
66
-
67
- if env.respond_to?(:register_transformer)
68
- env.register_transformer 'text/sass', 'text/css',
69
- Sprockets::SassProcessor.new(importer: SassImporter, sass_config: app.config.sass)
70
- env.register_transformer 'text/scss', 'text/css',
71
- Sprockets::ScssProcessor.new(importer: SassImporter, sass_config: app.config.sass)
72
- end
73
-
74
- env.context_class.class_eval do
75
- class_attribute :sass_config
76
- self.sass_config = app.config.sass
77
- end
58
+ env.register_transformer 'text/sass', 'text/css',
59
+ Sprockets::SassProcessor.new(importer: SassImporter, sass_config: app.config.sass)
60
+ env.register_transformer 'text/scss', 'text/css',
61
+ Sprockets::ScssProcessor.new(importer: SassImporter, sass_config: app.config.sass)
78
62
  end
79
63
 
80
64
  Sass.logger = app.config.sass.logger
@@ -1,5 +1,5 @@
1
1
  module Sass
2
2
  module Rails
3
- VERSION = "5.1.0"
3
+ VERSION = "6.0.0.beta1"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: sass-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 5.1.0
4
+ version: 6.0.0.beta1
5
5
  platform: ruby
6
6
  authors:
7
7
  - wycats
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2019-08-16 00:00:00.000000000 Z
12
+ date: 2016-02-23 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: railties
@@ -17,35 +17,38 @@ dependencies:
17
17
  requirements:
18
18
  - - ">="
19
19
  - !ruby/object:Gem::Version
20
- version: 5.2.0
20
+ version: 4.0.0
21
+ - - "<"
22
+ - !ruby/object:Gem::Version
23
+ version: '5.0'
21
24
  type: :runtime
22
25
  prerelease: false
23
26
  version_requirements: !ruby/object:Gem::Requirement
24
27
  requirements:
25
28
  - - ">="
26
29
  - !ruby/object:Gem::Version
27
- version: 5.2.0
30
+ version: 4.0.0
31
+ - - "<"
32
+ - !ruby/object:Gem::Version
33
+ version: '5.0'
28
34
  - !ruby/object:Gem::Dependency
29
35
  name: sass
30
36
  requirement: !ruby/object:Gem::Requirement
31
37
  requirements:
32
38
  - - "~>"
33
39
  - !ruby/object:Gem::Version
34
- version: '3.1'
40
+ version: '3.4'
35
41
  type: :runtime
36
42
  prerelease: false
37
43
  version_requirements: !ruby/object:Gem::Requirement
38
44
  requirements:
39
45
  - - "~>"
40
46
  - !ruby/object:Gem::Version
41
- version: '3.1'
47
+ version: '3.4'
42
48
  - !ruby/object:Gem::Dependency
43
49
  name: sprockets-rails
44
50
  requirement: !ruby/object:Gem::Requirement
45
51
  requirements:
46
- - - ">="
47
- - !ruby/object:Gem::Version
48
- version: '2.0'
49
52
  - - "<"
50
53
  - !ruby/object:Gem::Version
51
54
  version: '4.0'
@@ -53,9 +56,6 @@ dependencies:
53
56
  prerelease: false
54
57
  version_requirements: !ruby/object:Gem::Requirement
55
58
  requirements:
56
- - - ">="
57
- - !ruby/object:Gem::Version
58
- version: '2.0'
59
59
  - - "<"
60
60
  - !ruby/object:Gem::Version
61
61
  version: '4.0'
@@ -63,42 +63,16 @@ dependencies:
63
63
  name: sprockets
64
64
  requirement: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - ">="
67
- - !ruby/object:Gem::Version
68
- version: '2.8'
69
- - - "<"
70
- - !ruby/object:Gem::Version
71
- version: '4.0'
72
- type: :runtime
73
- prerelease: false
74
- version_requirements: !ruby/object:Gem::Requirement
75
- requirements:
76
- - - ">="
77
- - !ruby/object:Gem::Version
78
- version: '2.8'
79
- - - "<"
80
- - !ruby/object:Gem::Version
81
- version: '4.0'
82
- - !ruby/object:Gem::Dependency
83
- name: tilt
84
- requirement: !ruby/object:Gem::Requirement
85
- requirements:
86
- - - ">="
87
- - !ruby/object:Gem::Version
88
- version: '1.1'
89
- - - "<"
66
+ - - "~>"
90
67
  - !ruby/object:Gem::Version
91
- version: '3'
68
+ version: 4.x
92
69
  type: :runtime
93
70
  prerelease: false
94
71
  version_requirements: !ruby/object:Gem::Requirement
95
72
  requirements:
96
- - - ">="
97
- - !ruby/object:Gem::Version
98
- version: '1.1'
99
- - - "<"
73
+ - - "~>"
100
74
  - !ruby/object:Gem::Version
101
- version: '3'
75
+ version: 4.x
102
76
  - !ruby/object:Gem::Dependency
103
77
  name: sqlite3
104
78
  requirement: !ruby/object:Gem::Requirement
@@ -132,12 +106,9 @@ files:
132
106
  - lib/rails/generators/scss/scaffold/scaffold_generator.rb
133
107
  - lib/sass-rails.rb
134
108
  - lib/sass/rails.rb
135
- - lib/sass/rails/cache_store.rb
136
- - lib/sass/rails/helpers.rb
137
109
  - lib/sass/rails/importer.rb
138
110
  - lib/sass/rails/logger.rb
139
111
  - lib/sass/rails/railtie.rb
140
- - lib/sass/rails/template.rb
141
112
  - lib/sass/rails/version.rb
142
113
  homepage: https://github.com/rails/sass-rails
143
114
  licenses:
@@ -151,14 +122,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
151
122
  requirements:
152
123
  - - ">="
153
124
  - !ruby/object:Gem::Version
154
- version: 2.4.0
125
+ version: '0'
155
126
  required_rubygems_version: !ruby/object:Gem::Requirement
156
127
  requirements:
157
- - - ">="
128
+ - - ">"
158
129
  - !ruby/object:Gem::Version
159
- version: '0'
130
+ version: 1.3.1
160
131
  requirements: []
161
- rubygems_version: 3.0.1
132
+ rubyforge_project:
133
+ rubygems_version: 2.5.1
162
134
  signing_key:
163
135
  specification_version: 4
164
136
  summary: Sass adapter for the Rails asset pipeline.
@@ -1,31 +0,0 @@
1
- require 'sass'
2
-
3
- module Sass
4
- module Rails
5
- class CacheStore < ::Sass::CacheStores::Base
6
- attr_reader :environment
7
-
8
- def initialize(environment)
9
- @environment = environment
10
- end
11
-
12
- def _store(key, version, sha, contents)
13
- environment.cache_set("sass/#{key}", {:version => version, :sha => sha, :contents => contents})
14
- end
15
-
16
- def _retrieve(key, version, sha)
17
- if obj = environment.cache_get("sass/#{key}")
18
- return unless obj[:version] == version
19
- return unless obj[:sha] == sha
20
- obj[:contents]
21
- else
22
- nil
23
- end
24
- end
25
-
26
- def path_to(key)
27
- key
28
- end
29
- end
30
- end
31
- end
@@ -1,13 +0,0 @@
1
- require 'sass'
2
- require 'sprockets/sass_functions'
3
-
4
- module Sprockets
5
- module SassFunctions
6
- remove_method :asset_data_url if method_defined?(:asset_data_url)
7
- def asset_data_url(path)
8
- Sass::Script::String.new("url(" + sprockets_context.asset_data_uri(path.value) + ")")
9
- end
10
- end
11
- end
12
-
13
- ::Sass::Script::Functions.send :include, Sprockets::SassFunctions
@@ -1,72 +0,0 @@
1
- require 'sass'
2
- require 'sass/rails/cache_store'
3
- require 'sass/rails/helpers'
4
- require 'sprockets/sass_functions'
5
- require 'tilt'
6
-
7
- module Sass
8
- module Rails
9
- class SassTemplate < Tilt::Template
10
- def self.default_mime_type
11
- 'text/css'
12
- end
13
-
14
- def self.engine_initialized?
15
- true
16
- end
17
-
18
- def initialize_engine
19
- end
20
-
21
- def prepare
22
- end
23
-
24
- def syntax
25
- :sass
26
- end
27
-
28
- def evaluate(context, locals, &block)
29
- cache_store = CacheStore.new(context.environment)
30
-
31
- options = {
32
- :filename => eval_file,
33
- :line => line,
34
- :syntax => syntax,
35
- :cache_store => cache_store,
36
- :importer => importer_class.new(context.pathname.to_s),
37
- :load_paths => context.environment.paths.map { |path| importer_class.new(path.to_s) },
38
- :sprockets => {
39
- :context => context,
40
- :environment => context.environment
41
- }
42
- }
43
-
44
- sass_config = context.sass_config.merge(options)
45
-
46
- engine = ::Sass::Engine.new(data, sass_config)
47
- css = engine.render
48
-
49
- engine.dependencies.map do |dependency|
50
- context.depend_on(dependency.options[:filename])
51
- end
52
-
53
- css
54
- rescue ::Sass::SyntaxError => e
55
- context.__LINE__ = e.sass_backtrace.first[:line]
56
- raise e
57
- end
58
-
59
- private
60
-
61
- def importer_class
62
- SassImporter
63
- end
64
- end
65
-
66
- class ScssTemplate < SassTemplate
67
- def syntax
68
- :scss
69
- end
70
- end
71
- end
72
- end