haml-edge 2.3.236 → 2.3.237

Sign up to get free protection for your applications and to get access to all the features.
data/EDGE_GEM_VERSION CHANGED
@@ -1 +1 @@
1
- 2.3.236
1
+ 2.3.237
data/VERSION CHANGED
@@ -1 +1 @@
1
- 2.3.236
1
+ 2.3.237
data/lib/haml/railtie.rb CHANGED
@@ -5,5 +5,6 @@
5
5
 
6
6
  # Rails 3.0.0.beta.2+
7
7
  if defined?(ActiveSupport) && Haml::Util.has?(:public_method, ActiveSupport, :on_load)
8
+ require 'haml/template/options'
8
9
  ActiveSupport.on_load(:action_view) {Haml.init_rails(binding)}
9
10
  end
@@ -0,0 +1,16 @@
1
+ # We keep options in its own self-contained file
2
+ # so that we can load it independently in Rails 3,
3
+ # where the full template stuff is lazy-loaded.
4
+
5
+ module Haml
6
+ module Template
7
+ extend self
8
+
9
+ @options = {}
10
+ # The options hash for Haml when used within Rails.
11
+ # See {file:HAML_REFERENCE.md#haml_options the Haml options documentation}.
12
+ #
13
+ # @return [{Symbol => Object}]
14
+ attr_accessor :options
15
+ end
16
+ end
data/lib/haml/template.rb CHANGED
@@ -1,3 +1,4 @@
1
+ require 'haml/template/options'
1
2
  require 'haml/engine'
2
3
  require 'haml/helpers/action_view_mods'
3
4
  require 'haml/helpers/action_view_extensions'
@@ -5,15 +6,6 @@ require 'haml/helpers/action_view_extensions'
5
6
  module Haml
6
7
  # The class that keeps track of the global options for Haml within Rails.
7
8
  module Template
8
- extend self
9
-
10
- @options = {}
11
- # The options hash for Haml when used within Rails.
12
- # See {file:HAML_REFERENCE.md#haml_options the Haml options documentation}.
13
- #
14
- # @return [{Symbol => Object}]
15
- attr_accessor :options
16
-
17
9
  # Enables integration with the Rails 2.2.5+ XSS protection,
18
10
  # if it's available and enabled.
19
11
  #
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: 2.3.236
4
+ version: 2.3.237
5
5
  platform: ruby
6
6
  authors:
7
7
  - Nathan Weizenbaum
@@ -10,7 +10,7 @@ autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
12
 
13
- date: 2010-04-30 00:00:00 -04:00
13
+ date: 2010-05-01 00:00:00 -04:00
14
14
  default_executable:
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
@@ -71,6 +71,7 @@ files:
71
71
  - lib/haml/util.rb
72
72
  - lib/haml/template/patch.rb
73
73
  - lib/haml/template/plugin.rb
74
+ - lib/haml/template/options.rb
74
75
  - lib/haml/version.rb
75
76
  - lib/haml/html/erb.rb
76
77
  - lib/haml/root.rb