sass 3.1.0.alpha.38 → 3.1.0.alpha.39

Sign up to get free protection for your applications and to get access to all the features.
@@ -1 +1 @@
1
- 3.1.0.alpha.38
1
+ 3.1.0.alpha.39
data/VERSION CHANGED
@@ -1 +1 @@
1
- 3.1.0.alpha.38
1
+ 3.1.0.alpha.39
@@ -10,7 +10,7 @@ unless defined?(Sass::RAILS_LOADED)
10
10
  }
11
11
 
12
12
  if Sass::Util.ap_geq?('3.1.0.beta')
13
- opts.merge!(:cache => false, :load_paths => [])
13
+ opts.merge!(:load_paths => [])
14
14
  else
15
15
  opts.merge!(
16
16
  :always_update => false,
@@ -43,6 +43,7 @@ unless defined?(Sass::RAILS_LOADED)
43
43
  rails_importer = Sass::Importers::Rails.new(view.lookup_context)
44
44
  engine = Sass::Engine.new(template.source,
45
45
  Sass::Plugin.engine_options.merge(
46
+ :cache => false,
46
47
  :syntax => @syntax,
47
48
  :filename => template.virtual_path,
48
49
  :importer => rails_importer,
@@ -84,19 +85,21 @@ begin
84
85
  end
85
86
  rescue Sass::SyntaxError => e
86
87
  Sass::Plugin::TemplateHandler.munge_exception e, lookup_context
87
- Sass::SyntaxError.exception_to_css(e, Sass::Plugin.options)
88
+ Sass::SyntaxError.exception_to_css(e, Sass::Plugin.engine_options)
88
89
  end
89
90
  RUBY
90
91
  end
91
92
 
92
93
  def self.dependencies_changed?(deps, since)
93
- deps.any? {|d, i| i.mtime(d, Sass::Plugin.options) > since}
94
+ opts = Sass::Plugin.engine_options.merge(:cache => false)
95
+ deps.any? {|d, i| i.mtime(d, opts) > since}
94
96
  end
95
97
 
96
98
  def self.munge_exception(e, lookup_context)
97
99
  importer = Sass::Importers::Rails.new(lookup_context)
100
+ opts = Sass::Plugin.engine_options.merge(:cache => false)
98
101
  e.sass_backtrace.each do |bt|
99
- next unless engine = importer.find(bt[:filename], Sass::Plugin.options)
102
+ next unless engine = importer.find(bt[:filename], opts)
100
103
  bt[:filename] = engine.options[:_rails_filename]
101
104
  end
102
105
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: sass
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.1.0.alpha.38
4
+ version: 3.1.0.alpha.39
5
5
  platform: ruby
6
6
  authors:
7
7
  - Nathan Weizenbaum