radiant-layouts-extension 1.1.0 → 1.1.1

data/README.md

@@ -86,41 +86,28 @@ This would render the following if Page Layout was called
 
 ### Introduction
 
-Write your layouts and radius tags in haml, with support for nested layouts
+Write your layouts and radius tags in haml, with support for nested layouts and radius attributes
 
-    // Parent Layout
-    %div{:id=>"parent"}
+    // Parent Layout - with content/type set as 'haml'
+    %div{:id=>"parent",:title=>"<r:title />"}
       %r:content_for_layout
       
-    // Child Layout
+    // Child Layout - with content/type set as 'haml'
     %r:inside_layout{:name=>"Parent"}
       %h2
         %:title
+
+    <div id="parent" title="some title">
+      <h2>
+        some title
+      </h2>
+    </div>
         
-Note: Within Layouts you must set the name to end in `.haml`
-        
-Integrates the work of [SaturnFlyer](http://github.com/saturnflyer) creating a haml_filter on pages and snippets. Additional task involved
+Integrates the work of [SaturnFlyer](http://github.com/saturnflyer) creating a haml_filter on pages and snippets. Additional task involved.
+
 changing the order which objects with this type are renders. The content is turned into html before the 
 radius tags are passed.
 
-### Caveats 
-
-You can't yet put a radiant tag inside an attribute of a haml element. ie:
-
-    %div.product{:id=>"<r:id />"} // Will not work
-    
-    %div.product{:id=>"%r:id"} // Will not work
-    
-    %div.product{:id=><r:id />} // Will not work
-
-In the mean time use a plain filter whilst we come up with something awesome
-
-    %body
-      #primary
-        :plain
-          <div id="<r:id />" class="product">
-            <r:snippet name='product' />
-
 ### Acknowledgments
 
 * [SaturnFlyer](http://github.com/saturnflyer) [@SaturnFlyer](http://twitter.com/saturnflyer) (Jim Gay)  | Original idea http://github.com/saturnflyer/radiant-haml_filter-extension

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.1.1

data/lib/haml_layouts/models/layout.rb

@@ -8,7 +8,8 @@ module HamlLayouts
           # Will render html from haml if necessary
           def rendered_content
             if is_haml?
-              Haml::Engine.new(content).render 
+              # The gsub will replace all escaped radius tags with html
+              Haml::Engine.new(content).render.gsub(/&lt;(\/)?r:(.+?)\s*(\/|\\)*&gt;/m,"<\\1r:\\2\\3>")
             else
               content
             end

data/radiant-layouts-extension.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-layouts-extension}
-  s.version = "1.1.0"
+  s.version = "1.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Klett", "Jim Gay", "William Ross", "Tony Issakov", "Dirk Kelly"]
-  s.date = %q{2010-11-26}
+  s.date = %q{2010-12-01}
   s.description = %q{Extends Radiant Layouts to support nesting, sharing with Rails Controllers and rendering HAML}
   s.email = %q{dk@dirkkelly.com}
   s.extra_rdoc_files = [

data/spec/datasets/layouts_layouts.rb

@@ -19,7 +19,7 @@ CONTENT
       :name       => 'child',
       :content    => <<-CONTENT
 <r:inside_layout name='parent'>
-  <h1><r:layout /></h1>
+  <h1><r:layout/></h1>
 </r:inside_layout>
 CONTENT
 
@@ -28,7 +28,7 @@ CONTENT
       :content_type => 'haml',
       :content      => <<-CONTENT
 %r:inside_layout{:name=>"parent"}
-  %h1
+  %h1{:id=>"<r:layout />",:'data-layout'=>"<r:find url='find'><r:layout/></r:find>"}
     %r:layout
 CONTENT
   end

data/spec/lib/haml_layouts/models/layout_spec.rb

@@ -9,12 +9,12 @@ describe HamlLayouts::Models::Layout do
       it 'should return html rendered' do
         expected = <<-CONTENT
 <r:inside_layout name='parent'>
-  <h1>
+  <h1 data-layout="<r:find url='find'><r:layout/></r:find>" id='<r:layout/>'>
     <r:layout></r:layout>
   </h1>
 </r:inside_layout>
 CONTENT
-        layouts(:haml).content.should === expected
+        layouts(:haml).rendered_content.should === expected
       end
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-layouts-extension
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Michael Klett
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-26 00:00:00 +08:00
+date: 2010-12-01 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency