haml-edge 3.1.39 → 3.1.40
Sign up to get free protection for your applications and to get access to all the features.
- data/EDGE_GEM_VERSION +1 -1
- data/VERSION +1 -1
- data/lib/sass/plugin/rails.rb +20 -2
- metadata +2 -2
data/EDGE_GEM_VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
3.1.
|
1
|
+
3.1.40
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
3.1.
|
1
|
+
3.1.40
|
data/lib/sass/plugin/rails.rb
CHANGED
@@ -1,4 +1,13 @@
|
|
1
1
|
unless defined?(Sass::RAILS_LOADED)
|
2
|
+
if Haml::Util.ap_geq_3? && !Haml::Util.ap_geq?("3.0.0.beta4")
|
3
|
+
Haml::Util.haml_warn(<<WARNING)
|
4
|
+
DEPRECATION WARNING:
|
5
|
+
Haml/Sass support for Rails 3 versions before beta 4 is deprecated,
|
6
|
+
and will be removed in Haml/Sass 3.0.13.
|
7
|
+
Please upgrade to Rails 3.0.0.beta4 or later.
|
8
|
+
WARNING
|
9
|
+
end
|
10
|
+
|
2
11
|
Sass::RAILS_LOADED = true
|
3
12
|
|
4
13
|
# Reverse-merging (we're in Rails, anyway) so we dont' clobber what's already been defined further up-stream
|
@@ -12,8 +21,17 @@ unless defined?(Sass::RAILS_LOADED)
|
|
12
21
|
if defined?(ActionController::Metal)
|
13
22
|
# Rails >= 3.0
|
14
23
|
require 'sass/plugin/rack'
|
15
|
-
Rails.application.
|
16
|
-
|
24
|
+
if Rails.application.instance_variable_get('@app')
|
25
|
+
# The application has already been built,
|
26
|
+
# so we need to hack the middleware in
|
27
|
+
Rails.application.instance_variable_set('@app',
|
28
|
+
Sass::Plugin::Rack.new(Rails.application.app))
|
29
|
+
else
|
30
|
+
# The application hasn't been built yet,
|
31
|
+
# so we can just add Sass::Plugin::Rack
|
32
|
+
# to the pending middleware stack.
|
33
|
+
Rails.configuration.middleware.use(Sass::Plugin::Rack)
|
34
|
+
end
|
17
35
|
elsif defined?(ActionController::Dispatcher) &&
|
18
36
|
defined?(ActionController::Dispatcher.middleware)
|
19
37
|
# Rails >= 2.3
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: haml-edge
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 3.1.
|
4
|
+
version: 3.1.40
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Nathan Weizenbaum
|
@@ -11,7 +11,7 @@ autorequire:
|
|
11
11
|
bindir: bin
|
12
12
|
cert_chain: []
|
13
13
|
|
14
|
-
date: 2010-06-
|
14
|
+
date: 2010-06-10 00:00:00 -04:00
|
15
15
|
default_executable:
|
16
16
|
dependencies:
|
17
17
|
- !ruby/object:Gem::Dependency
|