smithycms 0.5.1 → 0.5.2

data/lib/smithy/liquid/rendering.rb

@@ -34,15 +34,17 @@ module Smithy
           'url'               => request.url,
           'now'               => Time.now.utc,
           'today'             => Date.today,
-          'site'              => @page.site
+          'site'              => Smithy::Site.instance
         }
       end
 
-      def smithy_default_registers
+      def smithy_default_registers(controller=nil)
+        controller = self.controller if self.respond_to?(:controller)
+        controller ||= self
         {
-          :controller => self,
+          :controller => controller,
           :page => @page,
-          :site => @page.site
+          :site => Smithy::Site.instance
         }
       end
     end

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

@@ -22,6 +22,10 @@ module Smithy
             tag.match(/\.#{ext}$/) ? tag : "#{tag}.#{ext}"
           end
 
+          def tag_without_ext(ext)
+            tag.sub(/\.#{ext}$/, '')
+          end
+
           def render(context)
             raise Error.new("please override Smithy::Liquid::Tag::Html::Base#render")
           end
@@ -42,13 +46,15 @@ module Smithy
         class SmithyJavascriptIncludeTag < Base
           def render(context)
             controller = context.registers[:controller]
-            controller.view_context.send(:javascript_include_tag, "/templates/javascripts/#{tag_with_ext('js')}")
+            javascript = Smithy::Template.javascripts.find_by(name: tag_without_ext('js'))
+            controller.view_context.send(:javascript_include_tag, "/templates/javascripts/#{tag_with_ext('js')}?#{javascript.updated_at.to_s(:number) if javascript.present?}")
           end
         end
         class SmithyStylesheetLinkTag < Base
           def render(context)
             controller = context.registers[:controller]
-            controller.view_context.send(:stylesheet_link_tag, "/templates/stylesheets/#{tag_with_ext('css')}")
+            stylesheet = Smithy::Template.stylesheets.find_by(name: tag_without_ext('css'))
+            controller.view_context.send(:stylesheet_link_tag, "/templates/stylesheets/#{tag_with_ext('css')}?#{stylesheet.updated_at.to_s(:number) if stylesheet.present?}")
           end
         end
       end

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

@@ -75,7 +75,7 @@ module Liquid
       end
 
       def read_template_from_file_system(context)
-        file_system = Liquid::Template.file_system
+        file_system = Liquid::LocalFileSystem.new(Rails.root.join('app', 'views'))
 
         # make read_template_file call backwards-compatible.
         case file_system.method(:read_template_file).arity

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

@@ -64,7 +64,8 @@ module Smithy
 
         def render_wrapper(list_items, id = nil)
           list_id = id.present? ? " id=\"#{id}\"" : ''
-          %Q{<ul#{list_id}>\n#{list_items}\n</ul>}
+          list_class = @options[:class].present? ? " class=\"#{@options[:class]}\"" : ''
+          %Q{<ul#{list_id}#{list_class}>\n#{list_items}\n</ul>}
         end
 
         def root_node
@@ -87,7 +88,7 @@ module Smithy
 
           def write_child_list_items?(parent, depth)
             return false unless parent.present? && !parent.leaf?
-            return true if @source == '`-section' && @page.self_and_ancestors.include?(parent)
+            return true if @source == 'site-section' && @page.self_and_ancestors.include?(parent)
             depth > @options[:depth] ? false : true
           end
 

data/lib/smithy/liquid.rb

@@ -1,6 +1,7 @@
 require 'smithy/liquid/database'
 require 'smithy/liquid/rendering'
 require 'smithy/liquid/filters/asset_tag'
+require 'smithy/liquid/filters/smithy_helpers'
 require 'smithy/liquid/filters/resize'
 require 'smithy/liquid/filters/uri'
 require 'smithy/liquid/tags/asset'

data/lib/smithy/version.rb

@@ -1,3 +1,3 @@
 module Smithy
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

data/lib/smithy.rb

@@ -9,13 +9,12 @@ require 'smithy/liquid'
 require 'smithy/formatter'
 #
 require 'smithy/content_blocks'
+require 'smithy/content_resources'
 
 module Smithy
-
   def self.log(*args)
     level   = args.size == 1 ? 'info' : args.first
     message = args.size == 1 ? args.first : args.last
     ::Smithy::Logger.send(level.to_sym, message)
   end
-
 end