smithycms 0.4.5 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79918fd91d87d994cd44391609c4f02dea58d75b
-  data.tar.gz: 4520429f79396782b010ad85a8401635b649001c
+  metadata.gz: 46b442d24b777496f47746a02f495814b346f10d
+  data.tar.gz: d014278bc16f0b3daae221689e885479e19ed70d
 SHA512:
-  metadata.gz: 644afd46f79eee07ebc4de65ad74e19ff7aa06446450d23520e0a5e99363fdb354f57a4014ced7045de2771164f18a83e07469b55596ab27f55c34eeb4b5fdec
-  data.tar.gz: f8c68c89b49651488a3a85dc5ba8ac18713ec9499267dfa05e23588ee1047496f6939de27c6bf108da02dce7d31aa3a706117a37abc0b08215091a9ff29ff1d8
+  metadata.gz: 0ca4425f6d1c9ba4ff1980dc5edf468757c68d8b1641922a740ee5608d77993c98e4983fb27c0d1b187bce79b4aaeb6daacb5166b315bbae02c4b2475d5674ab
+  data.tar.gz: d303d9d7a72f098f2d45a0b87851089cf3b055124db87ec38369a518e8e4bd1822ac7380d2f8492188c32cff9f450490477949d4e9e55dd99729c680f8d55435

data/README.md

@@ -1,7 +1,7 @@
 # Smithy CMS
 
 [![Gem Version](https://badge.fury.io/rb/smithycms.png)](http://badge.fury.io/rb/smithycms)
-[![Code Climate](https://codeclimate.com/github/sterrym/smithy.png)](https://codeclimate.com/github/sterrym/smithy)
+[![Code Climate](https://codeclimate.com/github/sterrym/smithycms.png)](https://codeclimate.com/github/sterrym/smithycms)
 [![Build Status](https://travis-ci.org/sterrym/smithycms.png?branch=master)](https://travis-ci.org/sterrym/smithycms)
 [![Coverage Status](https://coveralls.io/repos/sterrym/smithycms/badge.png)](https://coveralls.io/r/sterrym/smithycms)
 [![Dependency Status](https://gemnasium.com/sterrym/smithycms.png)](https://gemnasium.com/sterrym/smithycms)

data/app/assets/stylesheets/smithy/bootstrap_and_overrides.css.scss

@@ -1,12 +1,3 @@
 @import "bootstrap";
 @import "bootstrap-responsive";
 @import "font-awesome";
-.icon-white,
-.nav > .active > a > [class^="icon-"],
-.nav > .active > a > [class*=" icon-"],
-.dropdown-menu > li > a:hover > [class^="icon-"],
-.dropdown-menu > li > a:hover > [class*=" icon-"],
-.dropdown-menu > .active > a > [class^="icon-"],
-.dropdown-menu > .active > a > [class*=" icon-"] {
-  background-image: none;
-}

data/app/assets/stylesheets/smithy/pages.css.scss

@@ -7,7 +7,7 @@
   .back { background:#444; }
   .back > a { border-top:1px solid #444; }
   .add-page a { color:#888; text-align:right; padding-right:45px; }
-
+  .attenuate { color:#666; }
 }
 
 #side .page-list > li {
@@ -32,4 +32,3 @@
     padding-left:6px;
   }
 }
-

data/app/controllers/smithy/pages_controller.rb

@@ -72,16 +72,16 @@ module Smithy
       end
 
       def load_page
-        @page = Page.find(params[:id])
+        @page = Page.includes(:contents).find(params[:id])
         @root = @page if Page.root == @page
         set_publish
       end
 
       def load_page_from_path
         if smithy_current_user
-          @page = Page.friendly.find(page_path)
+          @page = Page.includes(:contents).friendly.find(page_path)
         else
-          @page = Page.published.friendly.find(page_path)
+          @page = Page.includes(:contents).published.friendly.find(page_path)
         end
         redirect_to @page.external_link and return false if @page.external_link?
       end

data/app/helpers/smithy/assets_helper.rb

@@ -5,5 +5,26 @@ module Smithy
       return unless asset
       image_tag(asset.file.url(:host => "#{request.protocol}#{request.host_with_port}"), :alt => asset.name)
     end
+
+    def file_type_icon(asset)
+      case asset.file_type
+      when :image
+        nil
+      when :pdf
+        'smithy/icons/pdf.png'
+      when :word
+        'smithy/icons/doc.png'
+      when :excel
+        'smithy/icons/xls.png'
+      when :powerpoint
+        'smithy/icons/ppt.png'
+      when :text
+        'smithy/icons/txt.png'
+      when :document
+        'smithy/icons/_page.png'
+      when :default
+        'smithy/icons/_blank.png'
+      end
+    end
   end
 end

data/app/models/smithy/asset.rb

@@ -24,6 +24,28 @@ module Smithy
       dragonfly_attachments[:file].to_value
     end
 
+    def file_type
+      ext = File.extname(file.name).sub(/^\./, '')
+      case ext
+      when 'jpg', 'jpeg', 'gif', 'png'
+        :image
+      when 'pdf'
+        :pdf
+      when 'doc', 'docx'
+        :word
+      when 'xls', 'xlsx'
+        :excel
+      when 'ppt', 'pps', 'pptx', 'ppsx'
+        :powerpoint
+      when 'txt'
+        :text
+      when 'rtf'
+        :document
+      else
+        :default
+      end
+    end
+
     def to_liquid
       {
         'id' => self.id,

data/app/models/smithy/page.rb

@@ -21,6 +21,7 @@ module Smithy
     scope :published, -> { where('published_at <= ?', Time.now) }
 
     attr_accessor :publish
+    attr_reader :liquid_context
 
     def container?(container_name)
       containers.where(:name => container_name).count > 0
@@ -44,10 +45,15 @@ module Smithy
       self.published_at?
     end
 
+    def render(liquid_context)
+      @liquid_context = liquid_context
+      self.template.liquid_template.render(liquid_context)
+    end
+
     def render_container(container_name)
       return '' unless container?(container_name)
       Rails.cache.fetch(self.container_cache_key(container_name)) do
-        self.contents_for_container_name(container_name).map(&:render).join("\n\n")
+        self.contents_for_container_name(container_name).map{|c| c.render(liquid_context) }.join("\n\n")
       end
     end
 
@@ -67,7 +73,7 @@ module Smithy
       def container_cache_key(container_name)
         # fetch the most recently adjusted content and add the updated_at timestamp to the cache_key
         content_last_updated = if self.contents_for_container_name(container_name).count > 0
-          self.contents_for_container_name(container_name).order(nil).order('created_at DESC').first.updated_at
+          self.contents_for_container_name(container_name).order(nil).order('updated_at DESC').first.updated_at
         else
           self.updated_at
         end

data/app/models/smithy/page_content.rb

@@ -25,14 +25,20 @@ module Smithy
       return unless attributes.present?
       klass = content_block_type.safe_constantize || "Smithy::#{content_block_type}".safe_constantize
       if klass
-        self.content_block = klass.find_or_initialize_by_id(attributes.delete(:id))
+        self.content_block = klass.find_or_initialize_by(id: attributes.delete(:id))
         self.content_block.attributes = attributes
         self.content_block
       end
     end
 
-    def render
-      content_block_template.liquid_template.render(self.to_liquid)
+    def render(liquid_context)
+      liquid_context.stack do
+        # push the default assigns into a smithy namespace. They'll still be in the
+        # scopes as the original values as well, but this ensures they don't get clobbered
+        liquid_context.merge('smithy' => liquid_context.scopes.last)
+        liquid_context.merge(self.to_liquid)
+        content_block_template.liquid_template.render(liquid_context)
+      end
     end
 
     def to_liquid

data/app/views/layouts/smithy/shared/_nav.html.erb

@@ -3,31 +3,30 @@
 </header>
 <div id="main-nav" class="navbar navbar-inverse">
   <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-    <span class="icon-bar"></span>
-    <span class="icon-bar"></span>
-    <span class="icon-bar"></span>
+    <span class="fa fa-bars"></span>
   </a>
   <div class="navbar-inner">
     <div class="container">
       <div class="nav-collapse clearfix">
         <%- if smithy_current_user -%>
         <ul class="nav">
-          <li><%= link_to "<i class=\"icon-sitemap\"></i> Manage Content".html_safe, pages_path %></li>
-          <li><%= link_to "<i class=\"icon-file\"></i> Images &amp; Files".html_safe, assets_path %></li>
+          <li><%= link_to "<i class=\"fa fa-sitemap\"></i> Manage Content".html_safe, pages_path %></li>
+          <li><%= link_to "<i class=\"fa fa-file\"></i> Images &amp; Files".html_safe, assets_path %></li>
         </ul>
         <ul class="nav pull-right">
-          <li><%= link_to "<i class=\"icon-arrow-right\"></i> View Site".html_safe, root_path %></li>
+          <li><%= link_to "<i class=\"fa fa-arrow-right\"></i> View Site".html_safe, root_path %></li>
           <li class="dropdown">
-            <a class="dropdown-toggle" data-toggle="dropdown" href="#"><i class="icon-cogs"></i> Admin<b class="caret"></b></a>
+            <a class="dropdown-toggle" data-toggle="dropdown" href="#"><i class="fa fa-cogs"></i> Admin<b class="caret"></b></a>
             <ul class="dropdown-menu">
-              <li><%= link_to "<i class=\"icon-book\"></i> Templates".html_safe, templates_path %></li>
-              <li><%= link_to "<i class=\"icon-list-alt\"></i> Content Blocks".html_safe, content_blocks_path %></li>
-              <li><%= link_to users_path do %><i class="icon-user"></i> Users<% end %></li>
-              <li><%= link_to "<i class=\"icon-cog\"></i> Settings".html_safe, settings_path %></li>
+              <li><%= link_to "<i class=\"fa fa-book\"></i> Templates".html_safe, templates_path %></li>
+              <li><%= link_to "<i class=\"fa fa-list-alt\"></i> Content Blocks".html_safe, content_blocks_path %></li>
+              <li><%= link_to users_path do %><i class="fa fa-user"></i> Users<% end %></li>
+              <li><%= link_to "<i class=\"fa fa-cog\"></i> Settings".html_safe, settings_path %></li>
+              <li><%= link_to "<i class=\"fa fa-refresh\"></i> Site Cache".html_safe, cache_path %></li>
             </ul>
           </li>
           <% if respond_to?(:logout_path) %>
-          <li><%= link_to "<i class=\"icon-signout\"></i> Logout".html_safe, logout_path, :method => :delete %></li>
+          <li><%= link_to "<i class=\"fa fa-signout\"></i> Logout".html_safe, logout_path, :method => :delete %></li>
           <% end %>
         </ul>
         <% end %>

data/app/views/smithy/assets/_asset.html.erb

@@ -1,6 +1,12 @@
 <li>
   <div class="thumbnail clearfix">
-    <%= link_to "<img src=\"#{asset.file.thumb("170x114#").url}\" width=\"170\" height=\"114\" alt=\"\">".html_safe, asset.file.url %>
+    <%= link_to asset.file.remote_url do %>
+      <% if asset.file_type == :image %>
+        <%= image_tag asset.file.thumb("170x114#").url, width: 170, height: 114, alt: '' %>
+      <% else %>
+        <div style="width:170px;height:78px;padding-top:36px;text-align:center;"><%= image_tag file_type_icon(asset), alt: '' %></div>
+      <% end %>
+    <% end %>
     <p class="name"><strong><%= asset.name %></strong></p>
     <div class="pull-right">
       <%= link_to "Edit", [:edit, asset], class: "btn btn-mini" %>

data/app/views/smithy/assets/_form.html.erb

@@ -4,8 +4,15 @@
     <%= f.input :file, :as => :file %>
     <%= f.input :retained_file, :as => :hidden %>
     <% if @asset.file %>
-    <div><img src="<%= @asset.file.thumb("300x300").url %>" alt=""></div>
-    <div><%= link_to @asset.file.remote_url, @asset.file.remote_url %></div>
+    <div>
+      <%= link_to asset.file.remote_url do %>
+      <% if asset.file_type == :image %>
+        <img src="<%= @asset.file.thumb("300x300").url %>" alt="">
+      <% else %>
+        <%= image_tag file_type_icon(asset), alt: '' %>
+      <% end %>
+      <% end %>
+    </div>
     <% end %>
   <% end %>
   <%= f.actions :submit %>

data/app/views/smithy/content_blocks/_content_block.html.erb

@@ -1 +1 @@
-  <li<%= raw ' class="active"' if action_name == "edit" && @content_block == content_block %>><%= link_to content_block.name, [:edit, content_block] %></li>
+  <li<%= raw ' class="active"' if action_name == "edit" && @content_block == content_block %>><%= link_to content_block.name.titleize, [:edit, content_block] %></li>

data/app/views/smithy/content_blocks/_secondary_nav.html.erb

@@ -4,9 +4,9 @@
     <%= render @content_blocks %>
   </ul>
 
-  <!--
   <div class="btn-group actions pull-right">
-    <%= link_to "<i class=\"icon-plus\"></i> Add Template <span class=\"caret\"></span>".html_safe, new_template_path, :class => 'dropdown-toggle btn btn-inverse', 'data-toggle' => 'dropdown', 'data-target' => '#', :role => 'button' %>
+    <%= link_to [:new, :content_block], :class => 'btn btn-inverse', :role => 'button' do %>
+      <i class="fa fa-plus"></i> Add Content Block
+    <% end %>
   </div>
-  -->
 <% end %>

data/app/views/smithy/content_pieces/new.html.erb

@@ -1 +1,8 @@
 <% content_for :title, "New #{klass_name}" %>
+
+<%= semantic_form_for @record do |f| %>
+  <%= f.inputs do %>
+    <%= f.inputs *accessible_attributes %>
+  <% end %>
+  <%= f.actions :submit %>
+<% end %>

data/app/views/smithy/page_contents/new.html.erb

@@ -18,7 +18,7 @@
     <tbody>
     <% @content_blocks.each do |content_block| %>
       <tr>
-        <td><button class="btn btn-small page_content_block" type="button" data-content_block="<%= content_block.name %>"><%= content_block.name.capitalize %></button></td>
+        <td style="white-space:nowrap"><button class="btn btn-small page_content_block" type="button" data-content_block="<%= content_block.name %>"><%= content_block.name.titleize %></button></td>
         <td><%= content_block.description %></td>
       </tr>
     <% end %>

data/app/views/smithy/pages/_container.html.erb

@@ -4,7 +4,7 @@
   <% @page.contents.for_container(container.name).each do |page_content| %>
     <%= content_tag_for :tr, page_content do %>
       <td>
-        <i class="icon-reorder handle"></i>
+        <i class="fa fa-reorder handle"></i>
         <%= link_to "edit", edit_page_content_path(@page.id, page_content), class: "btn btn-small btn-primary" %>
       </td>
       <td><strong><%= page_content.label %></strong></td>
@@ -13,7 +13,7 @@
       <td>
         <div class="pull-right">
           <%= link_to "preview", preview_page_content_path(@page.id, page_content), class: "btn btn-small", data: { previewtoggle: "modal" } %>
-          <%= link_to "<i class=\"icon-trash\"></i> delete".html_safe, page_content_path(@page.id, page_content), method: :delete, data: { confirm: "Do you really want to delete this content?" }, class: "btn btn-small btn-danger" %>
+          <%= link_to "<i class=\"fa fa-trash\"></i> delete".html_safe, page_content_path(@page.id, page_content), method: :delete, data: { confirm: "Do you really want to delete this content?" }, class: "btn btn-small btn-danger" %>
         </div>
       </td>
     <% end %>

data/app/views/smithy/pages/_form.html.erb

@@ -20,6 +20,7 @@
     <%= f.input :parent, :include_blank => false, :collection => tree_for_select unless !@page.parent_id? %>
     <%= f.input :show_in_navigation, :label => "Show page in site navigation" %>
     <%= f.input :template, :collection => Smithy::Template.templates, :include_blank => false %>
+    <%= render :partial => "smithy/pages/page_fields", :locals => { :f => f } if File.exists?(Rails.root.join('app', 'views', 'smithy', 'pages', '_page_fields.html.erb')) %>
   <% end %>
   <% if @page.persisted? && @page.external_link.blank? %>
     <h3>Content</h3>
@@ -29,14 +30,15 @@
       <%= f.input :external_link, :hint => "This page is currently being redirected to #{link_to @page.external_link, @page.external_link}".html_safe %>
     <% end %>
   <% end %>
-  <h3 data-toggle="collapse" data-target="#page-meta">Meta <i class="icon-caret-down"></i></h3>
+  <h3 data-toggle="collapse" data-target="#page-meta">Meta <i class="fa fa-caret-down"></i></h3>
   <%= content_tag :div, :id => "page-meta", :class => "collapse" do %>
     <%= f.inputs do %>
       <%= f.input(:external_link) unless @page.external_link? %>
       <%= f.input :cache_length, :hint => "In seconds (eg. 600 is 10 minutes)" %>
+      <%= render :partial => "smithy/pages/meta_fields", :locals => { :f => f } if File.exists?(Rails.root.join('app', 'views', 'smithy', 'pages', '_meta_fields.html.erb')) %>
     <% end %>
   <% end %>
-  <h3 data-toggle="collapse" data-target="#page-seo">SEO <i class="icon-caret-down"></i></h3>
+  <h3 data-toggle="collapse" data-target="#page-seo">SEO <i class="fa fa-caret-down"></i></h3>
   <%= content_tag :div, :id => "page-seo", :class => "collapse" do %>
     <%= f.inputs do %>
       <%= f.input :browser_title %>

data/app/views/smithy/pages/_page.html.erb

@@ -1,6 +1,12 @@
+<%
+icon = nil
+icon ||= 'folder' unless page.leaf?
+icon ||= 'edit' unless page.published?
+icon ||= 'file'
+icon = "#{icon} attenuate" unless page.show_in_navigation?
+-%>
 <%= content_tag :li, :id => dom_id(page), :class => ["clearfix child", (params[:id].to_i == page.id ? "active" : nil)].compact.join(' ') do %>
-  <%= link_to "<i class=\"icon-#{ page.leaf? ? (page.published? ? 'file' : 'edit') : 'folder-close'}\"></i><span>#{page.title}</span>".html_safe, edit_page_path(page.id), :class => "edit-page" %>
-  <%#= raw '<i class="icon-caret-right pull-right"></i>' unless page.leaf? %>
-  <%= link_to "<i class=\"icon-plus\"></i>".html_safe, new_page_path(:page => {:parent_id => page.id}), :class => "add-page" %>
-  <i class="icon-reorder handle"></i>
+  <%= link_to "<i class=\"fa fa-#{ icon }\"></i><span> #{page.title}</span>".html_safe, edit_page_path(page.id), :class => "edit-page" %>
+  <%= link_to "<i class=\"fa fa-plus\"></i>".html_safe, new_page_path(:page => {:parent_id => page.id}), :class => "add-page" %>
+  <i class="fa fa-reorder handle"></i>
 <% end %>

data/app/views/smithy/pages/_page_related.html.erb

@@ -3,9 +3,9 @@
 <div class="well well-small">
   <dl>
     <dt>Status</dt>
-    <dd><%= raw @page.published_at? ? '<i class="icon-check"></i>' : '<i class="icon-check-empty"></i>' %> Published</dd>
+    <dd><%= raw @page.published_at? ? '<i class="fa fa-check"></i>' : '<i class="fa fa-square"></i>' %> Published</dd>
     <dt>Navigation</dt>
-    <dd><%= raw @page.show_in_navigation? ? '<i class="icon-check"></i>' : '<i class="icon-check-empty"></i>' %> Show in Navigation</dd>
+    <dd><%= raw @page.show_in_navigation? ? '<i class="fa fa-check"></i>' : '<i class="fa fa-square"></i>' %> Show in Navigation</dd>
     <dt>Template</dt>
     <dd><%= @page.template.name %></dd>
     <dt>Creator</dt>

data/app/views/smithy/pages/_parent.html.erb

@@ -1,10 +1,10 @@
-<li class="back"><%= link_to "<span class=\"btn btn-mini btn-inverse\"><i class=\"icon-caret-left\"></i> Back to #{@parent.title}</span>".html_safe, edit_page_path(@parent.id) %></li>
+<li class="back"><%= link_to "<span class=\"btn btn-mini btn-inverse\"><i class=\"fa fa-caret-left\"></i> Back to #{@parent.title}</span>".html_safe, edit_page_path(@parent.id) %></li>
 <%- if !@page.persisted? || @page.leaf? -%>
   <%= render @parent.children %>
 <% elsif @page.persisted? %>
-  <li<%= ' class="active"'.html_safe if params[:id].to_i == @page.id %>><%= link_to "<i class=\"icon-folder-close\"></i> #{@page.title}".html_safe, edit_page_path(@page.id) %></li>
+  <li<%= ' class="active"'.html_safe if params[:id].to_i == @page.id %>><%= link_to "<i class=\"fa fa-folder\"></i> #{@page.title}".html_safe, edit_page_path(@page.id) %></li>
   <%= render @page.children %>
 <% end %>
 <% if @page.persisted? %>
-  <li class="add-page"><%= link_to "<i class=\"icon-plus\"></i> Add Page".html_safe, new_page_path(:page => { :parent_id => @parent.id }) %></li>
+  <li class="add-page"><%= link_to "<i class=\"fa fa-plus\"></i> Add Page".html_safe, new_page_path(:page => { :parent_id => @parent.id }) %></li>
 <% end %>

data/app/views/smithy/pages/_root.html.erb

@@ -1,5 +1,5 @@
 <%= content_tag :li, :id => dom_id(@root), :class => ['home', "clearfix", (params[:id].to_i == @root.id ? "active" : nil)].join(' ') do %>
-  <%= link_to "<i class=\"icon-home\"></i> #{@root.title}".html_safe, edit_page_path(@root.id) %>
+  <%= link_to "<i class=\"fa fa-home\"></i> #{@root.title}".html_safe, edit_page_path(@root.id) %>
 <% end %>
 <%= render @root.children %>
-<li class="add-page"><%= link_to "<i class=\"icon-plus\"></i> Add Page".html_safe, new_page_path(:page => { :parent_id => @root.id }) %></li>
+<li class="add-page"><%= link_to "<i class=\"fa fa-plus\"></i> Add Page".html_safe, new_page_path(:page => { :parent_id => @root.id }) %></li>

data/app/views/smithy/templates/_secondary_nav.html.erb

@@ -11,7 +11,7 @@
   </ul>
 
   <div class="btn-group actions pull-right">
-    <%= link_to "<i class=\"icon-plus\"></i> Add Template <span class=\"caret\"></span>".html_safe, new_template_path, :class => 'dropdown-toggle btn btn-inverse', 'data-toggle' => 'dropdown', 'data-target' => '#', :role => 'button' %>
+    <%= link_to "<i class=\"fa fa-plus\"></i> Add Template <span class=\"caret\"></span>".html_safe, new_template_path, :class => 'dropdown-toggle btn btn-inverse', 'data-toggle' => 'dropdown', 'data-target' => '#', :role => 'button' %>
     <ul class="dropdown-menu" role="menu">
     <% Smithy::Template.types.each do |tt| %>
       <li><%= link_to tt.capitalize, new_template_path(:template => { :template_type => tt }) %></li>

data/config/initializers/dragonfly.rb

@@ -4,7 +4,7 @@ require 'dragonfly'
 Dragonfly.app.configure do
   plugin :imagemagick
 
-  protect_from_dos_attacks true
+  verify_urls true
   secret "7fb765cbc9f1d92d5d1a56a43193d34d4f9b54dced3e62cb4e42f25d2500dd0f"
 
   convert_command  = `which convert`.strip.presence || "/usr/local/bin/convert"

data/lib/smithy/liquid/drops/page.rb

@@ -99,8 +99,8 @@ module Smithy
 
         private
           def generated_browser_titles
-            titles = _source.self_and_ancestors.map(&:title)
-            titles.shift unless _source.root? # keep all except the first element unless root
+            titles = _source.self_and_ancestors.map(&:title).reverse
+            titles.pop unless _source.root? # keep all except the last element unless root
             titles << site.title if site.title.present?
             titles
           end

data/lib/smithy/liquid/filters/uri.rb

@@ -0,0 +1,15 @@
+module Smithy
+  module Liquid
+    module Filters
+      module Uri
+        def urlescape(input)
+          ::CGI::escape(input.to_s)
+        end
+        def urlunescape(input)
+          ::CGI.unescape(input.to_s)
+        end
+      end
+      ::Liquid::Template.register_filter(Uri)
+    end
+  end
+end

data/lib/smithy/liquid/rendering.rb

@@ -6,10 +6,10 @@ module Smithy
 
       def render_smithy_page
         if smithy_current_user
-          output = @page.template.liquid_template.render(liquid_context)
+          output = @page.render(liquid_context)
         else
           output = Rails.cache.fetch("#{@page.cache_key}-render_smithy_page") do
-            @page.template.liquid_template.render(liquid_context)
+            @page.render(liquid_context)
           end
         end
         render :text => output, :layout => false
@@ -21,7 +21,7 @@ module Smithy
       end
 
       def liquid_context
-        ::Liquid::Context.new({}, smithy_default_assigns, smithy_default_registers, false)
+        ::Liquid::Context.new({}, smithy_default_assigns, smithy_default_registers, !Rails.env.production?)
       end
 
       def smithy_default_assigns

data/lib/smithy/liquid/tags/include_file.rb

@@ -0,0 +1,93 @@
+module Liquid
+
+  # IncludeFile allows templates to relate with other templates
+  #
+  # Simply include another template:
+  #
+  #   {% include_file 'product' %}
+  #
+  # IncludeFile a template with a local variable:
+  #
+  #   {% include_file 'product' with products[0] %}
+  #
+  # IncludeFile a template for a collection:
+  #
+  #   {% include_file 'product' for products %}
+  #
+  class IncludeFile < Tag
+    Syntax = /(#{QuotedFragment}+)(\s+(?:with|for)\s+(#{QuotedFragment}+))?/o
+
+    def initialize(tag_name, markup, tokens)
+      if markup =~ Syntax
+
+        @template_name = $1
+        @variable_name = $3
+        @attributes    = {}
+
+        markup.scan(TagAttributes) do |key, value|
+          @attributes[key] = value
+        end
+
+      else
+        raise SyntaxError.new("Error in tag 'include_file' - Valid syntax: include_file '[template]' (with|for) [object|collection]")
+      end
+
+      super
+    end
+
+    def parse(tokens)
+    end
+
+    def render(context)
+      partial = load_cached_partial(context)
+      variable = context[@variable_name || @template_name[1..-2]]
+
+      context.stack do
+        @attributes.each do |key, value|
+          context[key] = context[value]
+        end
+
+        if variable.is_a?(Array)
+          variable.collect do |var|
+            context[@template_name[1..-2]] = var
+            partial.render(context)
+          end
+        else
+          context[@template_name[1..-2]] = variable
+          partial.render(context)
+        end
+      end
+    end
+
+    private
+      def load_cached_partial(context)
+        cached_partials = context.registers[:cached_partials] || {}
+        template_name = context[@template_name]
+
+        if cached = cached_partials[template_name]
+          return cached
+        end
+        source = read_template_from_file_system(context)
+        partial = Liquid::Template.parse(source)
+        cached_partials[template_name] = partial
+        context.registers[:cached_partials] = cached_partials
+        partial
+      end
+
+      def read_template_from_file_system(context)
+        file_system = Liquid::Template.file_system
+
+        # make read_template_file call backwards-compatible.
+        case file_system.method(:read_template_file).arity
+        when 1
+          file_system.read_template_file(context[@template_name])
+        when 2
+          file_system.read_template_file(context[@template_name], context)
+        else
+          raise ArgumentError, "file_system.read_template_file expects two parameters: (template_name, context)"
+        end
+      end
+  end
+
+  Template.register_tag('include_file', IncludeFile)
+end

data/lib/smithy/liquid/tags/link.rb

@@ -0,0 +1,32 @@
+module Smithy
+  module Liquid
+    module Tags
+      class LinkTo < ::Liquid::Block
+        SyntaxHelp = "Syntax Error in tag 'link_to' - Valid syntax: link_to [url]"
+        Syntax = /(#{::Liquid::QuotedFragment})\s*([=!<>a-z_]+)?\s*(#{::Liquid::QuotedFragment})?/o
+
+        def initialize(tag_name, markup, tokens)
+          @tokens = tokens
+          @url = markup.strip
+          @url = :back if @url == ':back'
+          super
+        end
+
+        def render(context)
+          controller = context.registers[:controller]
+          context.stack do
+            controller.view_context.link_to(@url) do
+              render_all(nodes, context)
+            end
+          end
+        end
+
+        private
+          def nodes
+            @nodelist.map{|n| n.is_a?(String) ? n.strip : n }
+          end
+      end
+      ::Liquid::Template.register_tag('link_to', Smithy::Liquid::Tags::LinkTo)
+    end
+  end
+end

data/lib/smithy/liquid/tags/nav.rb

@@ -19,6 +19,7 @@ module Smithy
             @options[:depth] = 100 if @options[:depth] == 0
             @options[:wrapper] = @options[:wrapper] == "false" ? false : true
             @options[:include_root] = @options[:include_root] == "true" ? true : false
+            @options[:root] = @options[:root_id].present? ? Smithy::Page.find(@options[:root_id]) : Smithy::Page.root
           else
             raise ::Liquid::SyntaxError.new("Syntax Error in 'nav' - Valid syntax: nav <site|page|section> <options>")
           end
@@ -69,18 +70,24 @@ module Smithy
         def root_node
           case @source
           when 'site', 'site-section'
-            Smithy::Page.root
+            @options[:root]
           when 'page'
             @page
           when 'section'
-            @page == Smithy::Page.root ? @page : @page.self_and_ancestors.second
+            @page == @options[:root] ? @page : section_page
           end
         end
 
         private
+          def section_page
+            ancestors = @page.self_and_ancestors
+            idx = ancestors.index(@options[:root])
+            ancestors[idx+1].present? ? ancestors[idx+1] : ancestors.second
+          end
+
           def write_child_list_items?(parent, depth)
             return false unless parent.present? && !parent.leaf?
-            return true if @source == 'site-section' && @page.self_and_ancestors.include?(parent)
+            return true if @source == '`-section' && @page.self_and_ancestors.include?(parent)
             depth > @options[:depth] ? false : true
           end
 

data/lib/smithy/liquid.rb

@@ -2,7 +2,10 @@ require 'smithy/liquid/database'
 require 'smithy/liquid/rendering'
 require 'smithy/liquid/filters/asset_tag'
 require 'smithy/liquid/filters/resize'
+require 'smithy/liquid/filters/uri'
 require 'smithy/liquid/tags/asset'
 require 'smithy/liquid/tags/csrf'
 require 'smithy/liquid/tags/html'
+require 'smithy/liquid/tags/include_file'
+require 'smithy/liquid/tags/link'
 require 'smithy/liquid/tags/nav'

data/lib/smithy/version.rb

@@ -1,3 +1,3 @@
 module Smithy
-  VERSION = "0.4.5"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smithycms
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.5.0
 platform: ruby
 authors:
 - Tim Glen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-05 00:00:00.000000000 Z
+date: 2014-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.4
+        version: 4.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.4
+        version: 4.1.6
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -44,56 +44,56 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0rc
+        version: 3.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0rc
+        version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.2.1
+        version: 2.3.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.2.1
+        version: 2.3.2.2
 - !ruby/object:Gem::Dependency
   name: dragonfly
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.7
 - !ruby/object:Gem::Dependency
   name: dragonfly-s3_data_store
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.0.4
 - !ruby/object:Gem::Dependency
   name: font-awesome-sass-rails
   requirement: !ruby/object:Gem::Requirement
@@ -128,56 +128,56 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.rc
+        version: 2.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.rc
+        version: 2.3.1
 - !ruby/object:Gem::Dependency
   name: formtastic-bootstrap
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 2.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 2.1.3
 - !ruby/object:Gem::Dependency
   name: friendly_id
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 5.0.3
+        version: 5.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 5.0.3
+        version: 5.0.4
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.13.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.13.1
 - !ruby/object:Gem::Dependency
   name: jquery-fileupload-rails
   requirement: !ruby/object:Gem::Requirement
@@ -212,14 +212,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: 0.16.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: 0.16.1
 - !ruby/object:Gem::Dependency
   name: liquid
   requirement: !ruby/object:Gem::Requirement
@@ -280,16 +280,16 @@ dependencies:
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -322,16 +322,16 @@ dependencies:
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 4.4.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 4.4.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
@@ -378,16 +378,16 @@ dependencies:
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.5.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.5.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-livereload
   requirement: !ruby/object:Gem::Requirement
@@ -492,14 +492,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
@@ -582,6 +582,14 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- app/assets/images/smithy/icons/_blank.png
+- app/assets/images/smithy/icons/_page.png
+- app/assets/images/smithy/icons/doc.png
+- app/assets/images/smithy/icons/pdf.png
+- app/assets/images/smithy/icons/ppt.png
+- app/assets/images/smithy/icons/txt.png
+- app/assets/images/smithy/icons/xls.png
+- app/assets/images/smithy/icons/xlsx.png
 - app/assets/images/smithy/logo.png
 - app/assets/images/smithy/logo2.png
 - app/assets/javascripts/smithy/application.js
@@ -738,10 +746,13 @@ files:
 - lib/smithy/liquid/drops/page.rb
 - lib/smithy/liquid/filters/asset_tag.rb
 - lib/smithy/liquid/filters/resize.rb
+- lib/smithy/liquid/filters/uri.rb
 - lib/smithy/liquid/rendering.rb
 - lib/smithy/liquid/tags/asset.rb
 - lib/smithy/liquid/tags/csrf.rb
 - lib/smithy/liquid/tags/html.rb
+- lib/smithy/liquid/tags/include_file.rb
+- lib/smithy/liquid/tags/link.rb
 - lib/smithy/liquid/tags/nav.rb
 - lib/smithy/logger.rb
 - lib/smithy/version.rb