radiant-layouts-extension 0.9.1 → 1.0.0

data/lib/share_layouts/controllers/action_controller.rb

@@ -0,0 +1,25 @@
+module ShareLayouts
+  module Controllers
+    module ActionController
+      
+      def self.included(base)
+        base.extend ClassMethods
+      end
+      
+      module ClassMethods
+        def radiant_layout(name=nil, options={}, &block)
+          raise ArgumentError, "A layout name or block is required!" unless name || block
+          write_inheritable_attribute 'radiant_layout', name || block
+          before_filter :set_radiant_layout
+          layout 'radiant', options
+        end
+      end
+      
+      def set_radiant_layout
+        @radiant_layout = self.class.read_inheritable_attribute 'radiant_layout'
+        @radiant_layout = @radiant_layout.call(self) if @radiant_layout.is_a? Proc
+      end
+      
+    end
+  end
+end

data/lib/share_layouts/helpers/action_view.rb

@@ -0,0 +1,50 @@
+module ShareLayouts
+  module Helpers
+    module ActionView
+  
+        def self.included(base)
+          base.class_eval do
+            
+            def radiant_layout(name = @radiant_layout)
+              page = find_page
+              assign_attributes!(page, name)
+              page.build_parts_from_hash!(extract_captures) 
+              page.render
+            end
+            
+            def assign_attributes!(page, name = @radiant_layout)
+              page.layout = Layout.find_by_name(name) || page.layout
+              page.title = @title || @content_for_title || page.title || ''
+              page.breadcrumb = @breadcrumb || @content_for_breadcrumb || page.breadcrumb || page.title
+              page.breadcrumbs = @breadcrumbs || @content_for_breadcrumbs || nil
+              page.url = request.path
+              page.slug = page.url.split("/").last
+              page.published_at ||= Time.now 
+              page.request = request
+              page.response = response
+            end
+            
+            def extract_captures
+              variables = instance_variables.grep(/@content_for_/)
+              variables.inject({}) do |h, var|
+                var =~ /^@content_for_(.*)$/
+                key = $1.intern
+                key = :body if key == :layout
+                unless key == :title || key == :breadcrumbs
+                  h[key] = instance_variable_get(var)
+                end
+                h
+              end
+            end
+            
+            def find_page
+              page = Page.find_by_url(request.path) rescue nil
+              page.is_a?(RailsPage) ? page : RailsPage.new(:class_name => "RailsPage")
+            end
+            
+          end
+        end
+      
+    end
+  end
+end

data/lib/tasks/layouts_extension_tasks.rake

@@ -2,15 +2,37 @@ namespace :radiant do
   namespace :extensions do
     namespace :layouts do
       
-      desc "Runs the migration of the Shop Products extension and its dependancies"
+      desc "Runs the migration of the Layouts extension"
       task :migrate => :environment do
-        puts "radiant:layouts:migrate - Nohing to do"
+        require 'radiant/extension_migrator'
+        if ENV["VERSION"]
+          LayoutsExtension.migrator.migrate(ENV["VERSION"].to_i)
+          Rake::Task['db:schema:dump'].invoke
+        else
+          LayoutsExtension.migrator.migrate
+          Rake::Task['db:schema:dump'].invoke
+        end
       end
       
-      desc "Copies public assets of the Shop Products to the instance public/ directory."
+      desc "Copies public assets of the Layouts to the instance public/ directory."
       task :update => :environment do
-        puts "radiant:layouts:update - Nohing to do"
-      end
+        is_svn_or_dir = proc {|path| path =~ /\.svn/ || File.directory?(path) }
+        puts "Copying assets from LayoutsExtension"
+        Dir[LayoutsExtension.root + "/public/**/*"].reject(&is_svn_or_dir).each do |file|
+          path = file.sub(LayoutsExtension.root, '')
+          directory = File.dirname(path)
+          mkdir_p RAILS_ROOT + directory, :verbose => false
+          cp file, RAILS_ROOT + path, :verbose => false
+        end
+        unless LayoutsExtension.root.starts_with? RAILS_ROOT # don't need to copy vendored tasks
+          puts "Copying rake tasks from LayoutsExtension"
+          local_tasks_path = File.join(RAILS_ROOT, %w(lib tasks))
+          mkdir_p local_tasks_path, :verbose => false
+          Dir[File.join LayoutsExtension.root, %w(lib tasks *.rake)].each do |file|
+            cp file, local_tasks_path, :verbose => false
+          end
+        end
+      end  
       
       desc "Syncs all available translations for this ext to the English ext master"
       task :sync => :environment do
@@ -28,7 +50,6 @@ namespace :radiant do
           TranslationSupport.write_file(filename, basename, comments, other)
         end
       end
-      
     end
   end
 end

data/radiant-layouts-extension.gemspec

@@ -5,13 +5,13 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-layouts-extension}
-  s.version = "0.9.1"
+  s.version = "1.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Dirk Kelly"]
-  s.date = %q{2010-08-30}
-  s.description = %q{Provides extensions to standard layouts, including nesting of layouts within each other and sharing radiant layouts with rails controllers}
-  s.email = %q{dk@squaretalent.com}
+  s.authors = ["Michael Klett", "Jim Gay", "William Ross", "Tony Issakov", "Dirk Kelly"]
+  s.date = %q{2010-10-20}
+  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 = [
     "README.md"
   ]
@@ -21,25 +21,31 @@ Gem::Specification.new do |s|
      "README.md",
      "Rakefile",
      "VERSION",
+     "app/models/haml_filter.rb",
      "app/models/rails_page.rb",
      "app/views/layouts/radiant.html.haml",
+     "config/routes.rb",
      "layouts_extension.rb",
-     "lib/nested_layouts.rb",
-     "lib/nested_layouts/tags.rb",
-     "lib/share_layouts.rb",
-     "lib/share_layouts/helper.rb",
-     "lib/share_layouts/radiant_layouts.rb",
+     "lib/haml_layouts/models/layout.rb",
+     "lib/haml_layouts/models/page.rb",
+     "lib/nested_layouts/tags/core.rb",
+     "lib/share_layouts/controllers/action_controller.rb",
+     "lib/share_layouts/helpers/action_view.rb",
      "lib/tasks/layouts_extension_tasks.rake",
      "radiant-layouts-extension.gemspec",
-     "spec/controllers/nested_layouts_spec.rb",
-     "spec/controllers/share_layouts_spec.rb",
-     "spec/datasets/nested_layouts_dataset.rb",
-     "spec/datasets/share_layouts_dataset.rb",
-     "spec/helpers/share_layouts_helper_spec.rb",
-     "spec/lib/nested_layouts/tags_spec.rb",
-     "spec/lib/share_layouts_extension_spec.rb",
+     "spec/controllers/share_controller_spec.rb",
+     "spec/datasets/layouts_layouts.rb",
+     "spec/datasets/layouts_pages.rb",
+     "spec/lib/haml_layouts/haml_layouts_extension_spec.rb",
+     "spec/lib/haml_layouts/models/layout_spec.rb",
+     "spec/lib/haml_layouts/models/page_spec.rb",
+     "spec/lib/nested_layouts/nested_layouts_extension_spec.rb",
+     "spec/lib/nested_layouts/tags/core_spec.rb",
+     "spec/lib/share_layouts/controllers/action_controller_spec.rb",
+     "spec/lib/share_layouts/helpers/action_view_spec.rb",
+     "spec/lib/share_layouts/share_layouts_extension_spec.rb",
+     "spec/models/haml_filter_spec.rb",
      "spec/models/rails_page_spec.rb",
-     "spec/rcov.opts",
      "spec/spec.opts",
      "spec/spec_helper.rb"
   ]
@@ -47,15 +53,20 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Provides extensions to standard layouts, including nesting and sharing}
+  s.summary = %q{Extends Radiant Layouts to support nesting, sharing with Rails Controllers and rendering HAML}
   s.test_files = [
-    "spec/controllers/nested_layouts_spec.rb",
-     "spec/controllers/share_layouts_spec.rb",
-     "spec/datasets/nested_layouts_dataset.rb",
-     "spec/datasets/share_layouts_dataset.rb",
-     "spec/helpers/share_layouts_helper_spec.rb",
-     "spec/lib/nested_layouts/tags_spec.rb",
-     "spec/lib/share_layouts_extension_spec.rb",
+    "spec/controllers/share_controller_spec.rb",
+     "spec/datasets/layouts_layouts.rb",
+     "spec/datasets/layouts_pages.rb",
+     "spec/lib/haml_layouts/haml_layouts_extension_spec.rb",
+     "spec/lib/haml_layouts/models/layout_spec.rb",
+     "spec/lib/haml_layouts/models/page_spec.rb",
+     "spec/lib/nested_layouts/nested_layouts_extension_spec.rb",
+     "spec/lib/nested_layouts/tags/core_spec.rb",
+     "spec/lib/share_layouts/controllers/action_controller_spec.rb",
+     "spec/lib/share_layouts/helpers/action_view_spec.rb",
+     "spec/lib/share_layouts/share_layouts_extension_spec.rb",
+     "spec/models/haml_filter_spec.rb",
      "spec/models/rails_page_spec.rb",
      "spec/spec_helper.rb"
   ]

data/spec/datasets/layouts_layouts.rb

@@ -0,0 +1,36 @@
+class LayoutsLayoutsDataset < Dataset::Base
+  
+  def load
+    create_record :layout, :parent, 
+      :name         => 'parent',
+      :content_type => 'haml',
+      :content      => <<-CONTENT
+!!! 5
+%html
+  %head
+    %title Title
+  :plain
+    <r:body class="site">
+      <r:content_for_layout />
+    </r:body>
+CONTENT
+
+    create_record :layout, :child,
+      :name       => 'child',
+      :content    => <<-CONTENT
+<r:inside_layout name='parent'>
+  <h1><r:layout /></h1>
+</r:inside_layout>
+CONTENT
+
+    create_record :layout, :haml, 
+      :name         => 'haml',
+      :content_type => 'haml',
+      :content      => <<-CONTENT
+%r:inside_layout{:name=>"parent"}
+  %h1
+    %r:layout
+CONTENT
+  end
+  
+end

data/spec/datasets/layouts_pages.rb

@@ -0,0 +1,43 @@
+class LayoutsPagesDataset < Dataset::Base
+
+  uses :layouts_layouts
+  
+  def load
+    create_record :page, :parent,
+      :title        => 'Parent',
+      :layout_id    => layouts(:parent).id,
+      :breadcrumb   => 'parent',
+      :slug         => '/',
+      :status_id    => 100
+    
+    create_record :page, :child,
+      :title        => 'Child',
+      :layout_id    => layouts(:child).id,
+      :parent_id    => pages(:parent).id,
+      :breadcrumb   => 'child',
+      :slug         => '/child',
+      :status_id    => 100
+      
+    create_record :page, :rails,
+      :title        => 'App page',
+      :breadcrumb   => 'App page',
+      :slug         => 'app',
+      :class_name   => 'RailsPage',
+      :status_id    => 100,
+      :parent_id    => pages(:parent).id
+
+    create_record :page, :rails_child,
+      :title        => 'Child',
+      :breadcrumb   => 'Child',
+      :slug         => 'child-page',
+      :status_id    => 100,
+      :parent_id    => pages(:rails).id
+
+    create_record :page, :other,
+      :title        => 'Other',
+      :breadcrumb   => 'Other',
+      :slug         => 'other',
+      :status_id    => 100,
+      :parent_id    => pages(:parent).id
+  end
+end

data/spec/lib/haml_layouts/haml_layouts_extension_spec.rb

@@ -0,0 +1,22 @@
+require 'spec/spec_helper'
+
+# Ensures that the Extension initializes correctly
+describe LayoutsExtension do
+  
+  context 'activate' do
+    
+    describe 'haml layouts' do
+      it 'should have a HamlFilter class to call' do
+        HamlFilter.should_not be_nil
+      end
+      it 'should extend Layout base methods' do
+        Layout.included_modules.include?(HamlLayouts::Models::Layout).should be_true
+      end
+      it 'should extend Page base methods' do
+        Page.included_modules.include?(HamlLayouts::Models::Page).should be_true
+      end
+    end
+    
+  end
+
+end

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

@@ -0,0 +1,36 @@
+require 'spec/spec_helper'
+
+describe HamlLayouts::Models::Layout do
+  
+  dataset :layouts_layouts, :layouts_pages
+  
+  describe 'content' do
+    context 'a haml layout' do
+      it 'should return html rendered' do
+        expected = <<-CONTENT
+<r:inside_layout name='parent'>
+  <h1>
+    <r:layout></r:layout>
+  </h1>
+</r:inside_layout>
+CONTENT
+        layouts(:haml).content.should === expected
+      end
+    end
+  end
+  
+  describe 'is_haml?' do
+    context 'layout has a content type of haml' do
+      it 'should return true' do
+        layouts(:haml).is_haml?.should be_true
+      end
+    end
+    
+    context 'layout does not have a content type of haml' do
+      it 'should return false' do
+        layouts(:child).is_haml?.should be_false
+      end
+    end
+  end
+  
+end

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

@@ -0,0 +1,40 @@
+require 'spec/spec_helper'
+
+describe HamlLayouts::Models::Page do
+  
+  dataset :layouts_layouts, :layouts_pages
+  
+  describe 'parse_object' do
+    context 'haml filter type' do
+      it 'should render haml radius tags' do
+        @part = PagePart.new({
+          :content   => '%r:title',
+          :filter_id => 'Haml'
+        })
+        @page = pages(:parent)
+        
+        @page.parse_object(@part).should === "#{@page.title}\n"
+      end
+      
+      it 'should render textile radius tags' do
+        @part = PagePart.new({
+          :content   => 'h1. <r:title />',
+          :filter_id => 'Textile'
+        })
+        @page = pages(:parent)
+        
+        @page.parse_object(@part).should === "<h1>#{@page.title}</h1>"
+      end
+      
+      it 'should render non filtered tags' do
+        @part = PagePart.new({
+          :content   => '<r:title />'
+        })
+        @page = pages(:parent)
+        
+        @page.parse_object(@part).should === @page.title
+      end
+    end
+  end
+  
+end

data/spec/lib/nested_layouts/nested_layouts_extension_spec.rb

@@ -0,0 +1,16 @@
+require 'spec/spec_helper'
+
+# Ensures that the Extension initializes correctly
+describe LayoutsExtension do
+  
+  context 'activate' do
+    
+    describe 'nested layouts' do
+      it 'should extend Page base methods' do
+        Page.included_modules.include?(NestedLayouts::Tags::Core).should be_true
+      end
+    end
+    
+  end
+
+end

data/spec/lib/nested_layouts/{tags_spec.rb → tags/core_spec.rb}

@@ -1,33 +1,41 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec/spec_helper'
 
-describe NestedLayouts::Tags do
-  dataset :pages
-  dataset :nested_layouts
+describe NestedLayouts::Tags::Core do
   
-  describe '<r:inside_layout>, <r:layout> and <r:content_for_layout>' do
+  dataset :layouts_pages, :layouts_layouts
+  
+  describe '<r:inside_layout>, <r:layout>, <r:body /> and <r:content_for_layout>' do
 
     it 'should output tag within the body of class name for parent layout' do
       tag = %{<r:inside_layout name='parent'><h1>Hi</h1></r:inside_layout>}
       expected = <<-CONTENT
+<!DOCTYPE html>
 <html>
-  <body class="parent">
+  <head>
+    <title>Title</title>
+  </head>
+  <body class="site parent">
     <h1>Hi</h1>
   </body>
 </html>
 CONTENT
-      pages(:parent_layout).should render(tag).as(expected)
+      pages(:parent).should render(tag).as(expected)
     end
     
     it 'should output tag within the body of class name for a child_layout' do
       tag = %{<r:inside_layout name='parent'><h1>Hi</h1></r:inside_layout>}
       expected = <<-CONTENT
+<!DOCTYPE html>
 <html>
-  <body class="child">
+  <head>
+    <title>Title</title>
+  </head>
+  <body class="site child">
     <h1>Hi</h1>
   </body>
 </html>
 CONTENT
-      pages(:child_layout).should render(tag).as(expected)
+      pages(:child).should render(tag).as(expected)
     end
     
   end
@@ -37,25 +45,33 @@ CONTENT
     it 'it should render the contents if true' do
       tag = %{<r:inside_layout name='parent'><r:if_layout name='parent'><h1>Hi</h1></r:if_layout></r:inside_layout>}
       expected = <<-CONTENT
+<!DOCTYPE html>
 <html>
-  <body class="parent">
+  <head>
+    <title>Title</title>
+  </head>
+  <body class="site parent">
     <h1>Hi</h1>
   </body>
 </html>
 CONTENT
-      pages(:parent_layout).should render(tag).as(expected)
+      pages(:parent).should render(tag).as(expected)
     end
     
     it 'it should not render the contents if false' do
       tag = %{<r:inside_layout name='parent'><r:if_layout name='not parent'><h1>Hi</h1></r:if_layout></r:inside_layout>}
       expected = <<-CONTENT
+<!DOCTYPE html>
 <html>
-  <body class="parent">
+  <head>
+    <title>Title</title>
+  </head>
+  <body class="site parent">
     
   </body>
 </html>
 CONTENT
-      pages(:parent_layout).should render(tag).as(expected)
+      pages(:parent).should render(tag).as(expected)
     end
     
   end
@@ -65,25 +81,33 @@ CONTENT
     it 'it should not render the contents if true' do
       tag = %{<r:inside_layout name='parent'><r:unless_layout name='parent'><h1>Hi</h1></r:unless_layout></r:inside_layout>}
       expected = <<-CONTENT
+<!DOCTYPE html>
 <html>
-  <body class="parent">
+  <head>
+    <title>Title</title>
+  </head>
+  <body class="site parent">
     
   </body>
 </html>
 CONTENT
-      pages(:parent_layout).should render(tag).as(expected)
+      pages(:parent).should render(tag).as(expected)
     end
 
     it 'it should not render the contents if false' do
       tag = %{<r:inside_layout name='parent'><r:unless_layout name='not parent'><h1>Hi</h1></r:unless_layout></r:inside_layout>}
       expected = <<-CONTENT
+<!DOCTYPE html>
 <html>
-  <body class="parent">
+  <head>
+    <title>Title</title>
+  </head>
+  <body class="site parent">
     <h1>Hi</h1>
   </body>
 </html>
 CONTENT
-      pages(:parent_layout).should render(tag).as(expected)
+      pages(:parent).should render(tag).as(expected)
     end
 
   end