radiant-layouts-extension 1.0.4 → 1.1.0

data/VERSION

@@ -1 +1 @@
-1.0.4
+1.1.0

data/lib/haml_layouts/models/layout.rb

@@ -5,26 +5,23 @@ module HamlLayouts
       def self.included(base)
         base.class_eval do
           
-          def content
+          # Will render html from haml if necessary
+          def rendered_content
             if is_haml?
-              Haml::Engine.new(self[:content]).render 
+              Haml::Engine.new(content).render 
             else
-              self[:content]
+              content
             end
           end
           
+          # Returns 'text/html' to the browser (if haml)           
+          def content_type
+            self[:content_type] == 'haml' ? 'text/html' : self[:content_type]
+          end
+
           # Overwrites the standard Radiant Render and pumps out haml if necessary
           def is_haml?
-            result = false
-            
-            if File.extname(name) == '.haml'
-              result = true
-            elsif content_type == 'haml'
-              warn 'DEPRECATED: Set HAML layout filename to end in `.haml`. Content/Type support to be removed in 1.1.0'
-              result = true
-            end
-            
-            result
+            self[:content_type] == 'haml'
           end
           
         end

data/lib/haml_layouts/models/page.rb

@@ -6,9 +6,11 @@ module HamlLayouts
         base.class_eval do
           
           def parse_object(object)
-            text = object.content
+            # We don't want to return the haml on a layout by default
+            text =  object.is_a?(Layout) ? object.rendered_content : object.content
+                        
             if object.respond_to? :filter_id
-              if object.filter_id === 'Haml'
+              if object.filter_id == 'Haml'
                 # We want to render the tags as html/radius before passing them
                 text = object.filter.filter(text)
                 text = parse(text)

data/radiant-layouts-extension.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-layouts-extension}
-  s.version = "1.0.4"
+  s.version = "1.1.0"
 
   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-23}
+  s.date = %q{2010-11-26}
   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 = [

metadata

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