radiant-layouts-extension 1.1.1 → 1.1.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. data/VERSION +1 -1
  2. data/app/models/haml_filter.rb +1 -1
  3. data/lib/haml_layouts/models/layout.rb +1 -1
  4. data/lib/nested_layouts/tags/core.rb +1 -1
  5. data/radiant-layouts-extension.gemspec +2 -2
  6. data/spec/lib/nested_layouts/tags/core_spec.rb +6 -6
  7. data/spec/lib/share_layouts/helpers/action_view_spec.rb +1 -1
  8. metadata +4 -4
data/VERSION CHANGED
@@ -1 +1 @@
1
- 1.1.1
1
+ 1.1.2
data/app/models/haml_filter.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  class HamlFilter < TextFilter
2
2
  def filter(text)
3
- Haml::Engine.new(text).render
3
+ Haml::Engine.new(text).render.gsub(/&lt;(\/)?r:(.+?)\s*(\/?\\?)&gt;/m,"<\\1r:\\2\\3>")
4
4
  end
5
5
  end
data/lib/haml_layouts/models/layout.rb CHANGED
@@ -9,7 +9,7 @@ module HamlLayouts
9
9
  def rendered_content
10
10
  if is_haml?
11
11
  # The gsub will replace all escaped radius tags with html
12
- Haml::Engine.new(content).render.gsub(/&lt;(\/)?r:(.+?)\s*(\/|\\)*&gt;/m,"<\\1r:\\2\\3>")
12
+ HamlFilter.filter(content)
13
13
  else
14
14
  content
15
15
  end
data/lib/nested_layouts/tags/core.rb CHANGED
@@ -119,7 +119,7 @@ module NestedLayouts
119
119
  end
120
120
 
121
121
  tag 'body' do |tag|
122
- %{<body id="#{tag.locals.page.slug}" class="#{current_layout_name(tag)}#{tag.attr['class'].present? ? " #{tag.attr['class']}" : nil}">#{tag.expand}</body>}
122
+ %{<body id="#{tag.locals.page.slug.gsub('/','')}" class="#{current_layout_name(tag)}#{tag.attr['class'].present? ? " #{tag.attr['class']}" : nil}">#{tag.expand}</body>}
123
123
  end
124
124
 
125
125
  protected
data/radiant-layouts-extension.gemspec CHANGED
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{radiant-layouts-extension}
8
- s.version = "1.1.1"
8
+ s.version = "1.1.2"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Michael Klett", "Jim Gay", "William Ross", "Tony Issakov", "Dirk Kelly"]
12
- s.date = %q{2010-12-01}
12
+ s.date = %q{2010-12-02}
13
13
  s.description = %q{Extends Radiant Layouts to support nesting, sharing with Rails Controllers and rendering HAML}
14
14
  s.email = %q{dk@dirkkelly.com}
15
15
  s.extra_rdoc_files = [
data/spec/lib/nested_layouts/tags/core_spec.rb CHANGED
@@ -14,7 +14,7 @@ describe NestedLayouts::Tags::Core do
14
14
  <head>
15
15
  <title>Title</title>
16
16
  </head>
17
- <body class="site parent">
17
+ <body id="" class="parent site">
18
18
  <h1>Hi</h1>
19
19
  </body>
20
20
  </html>
@@ -30,7 +30,7 @@ CONTENT
30
30
  <head>
31
31
  <title>Title</title>
32
32
  </head>
33
- <body class="site child">
33
+ <body id="child" class="child site">
34
34
  <h1>Hi</h1>
35
35
  </body>
36
36
  </html>
@@ -50,7 +50,7 @@ CONTENT
50
50
  <head>
51
51
  <title>Title</title>
52
52
  </head>
53
- <body class="site parent">
53
+ <body id="" class="parent site">
54
54
  <h1>Hi</h1>
55
55
  </body>
56
56
  </html>
@@ -66,7 +66,7 @@ CONTENT
66
66
  <head>
67
67
  <title>Title</title>
68
68
  </head>
69
- <body class="site parent">
69
+ <body id="" class="parent site">
70
70
 
71
71
  </body>
72
72
  </html>
@@ -86,7 +86,7 @@ CONTENT
86
86
  <head>
87
87
  <title>Title</title>
88
88
  </head>
89
- <body class="site parent">
89
+ <body id="" class="parent site">
90
90
 
91
91
  </body>
92
92
  </html>
@@ -102,7 +102,7 @@ CONTENT
102
102
  <head>
103
103
  <title>Title</title>
104
104
  </head>
105
- <body class="site parent">
105
+ <body id="" class="parent site">
106
106
  <h1>Hi</h1>
107
107
  </body>
108
108
  </html>
data/spec/lib/share_layouts/helpers/action_view_spec.rb CHANGED
@@ -13,7 +13,7 @@ describe ShareLayouts::Helpers::ActionView do
13
13
  <head>
14
14
  <title>Title</title>
15
15
  </head>
16
- <body class="site parent">
16
+ <body id="page" class="parent site">
17
17
  something
18
18
  </body>
19
19
  </html>
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: radiant-layouts-extension
3
3
  version: !ruby/object:Gem::Version
4
- hash: 17
4
+ hash: 23
5
5
  prerelease: false
6
6
  segments:
7
7
  - 1
8
8
  - 1
9
- - 1
10
- version: 1.1.1
9
+ - 2
10
+ version: 1.1.2
11
11
  platform: ruby
12
12
  authors:
13
13
  - Michael Klett
@@ -19,7 +19,7 @@ autorequire:
19
19
  bindir: bin
20
20
  cert_chain: []
21
21
 
22
- date: 2010-12-01 00:00:00 +08:00
22
+ date: 2010-12-02 00:00:00 +08:00
23
23
  default_executable:
24
24
  dependencies:
25
25
  - !ruby/object:Gem::Dependency