locomotivecms_mounter 1.0.0.alpha3 → 1.0.0.alpha4

data/lib/locomotive/mounter/extensions/tilt/haml.rb

@@ -16,7 +16,13 @@ module Tilt
         @data = $3
       end
       @data = @data.force_encoding('utf-8')
-      super
+      begin
+        super
+      rescue Haml::SyntaxError => e
+        # invalid haml so re-throw the exception but with keeping track of the attributes
+        e.attributes = @attributes
+        raise e
+      end
     end
 
   end
@@ -24,4 +30,8 @@ module Tilt
   Tilt.register 'haml', YamlFrontMattersHamlTemplate
   Tilt.prefer YamlFrontMattersHamlTemplate
 
+end
+
+class ::Haml::SyntaxError
+  attr_accessor :attributes
 end

data/lib/locomotive/mounter/models/page.rb

@@ -249,7 +249,7 @@ module Locomotive
         def set_default_template_for_each_locale(default_locale)
           default_template = self.template_translations[default_locale.to_sym]
 
-          return if default_template.nil? || default_template.data.strip.blank?
+          return if self.template_blank?(default_template)
 
           self.translated_in.each do |locale|
             next if locale.to_s == default_locale.to_s
@@ -258,8 +258,7 @@ module Locomotive
             _template = self.template_translations[locale]
 
             # is it blank ?
-            if _template.nil? || _template.data.strip.blank?
-              # puts "YOUPI #{self.fullpath} / #{locale} / #{default_template.data}"
+            if self.template_blank?(_template)
               self.template_translations[locale] = default_template
             end
           end
@@ -285,6 +284,10 @@ module Locomotive
           if @source[Locomotive::Mounter.locale]
             @source[Locomotive::Mounter.locale] # memoization
           elsif self.template
+            if self.template.is_a?(Exception) # comes from the parsing
+              # we do not know how to render the page so rethrow the exception
+              raise self.template
+            end
             source = self.template.need_for_prerendering? ? self.template.render : self.template.data
             @source[Locomotive::Mounter.locale] = source
           else
@@ -370,6 +373,20 @@ module Locomotive
           self.fullpath_or_default
         end
 
+        protected
+
+        # Tell if a template is strictly blank (nil or empty).
+        # If a template is invalid, it is not considered as a
+        # blank one.
+        #
+        # @param [ Object ] template The template to test (Tilt)
+        #
+        # @return [ Boolean ] True if the template is strictly blank
+        #
+        def template_blank?(template)
+          template.nil? || (!template.is_a?(Exception) && template.data.strip.blank?)
+        end
+
       end
 
     end

data/lib/locomotive/mounter/models/snippet.rb

@@ -20,9 +20,12 @@ module Locomotive
         def source
           @source ||= {}
 
-          source = if template.respond_to?(:need_for_prerendering?)
+          source = if self.template.respond_to?(:need_for_prerendering?)
             # must be a tilt template with or without prerendering
             self.template.need_for_prerendering? ? self.template.render : self.template.data
+          elsif self.template.is_a?(Exception) # comes from the parsing
+            # we do not know how to render the page so rethrow the exception
+            raise self.template
           else
             # simple string
             self.template

data/lib/locomotive/mounter/reader/file_system/pages_reader.rb

@@ -122,7 +122,12 @@ module Locomotive
           # @param [ String ] filepath The path of the template
           #
           def set_attributes_from_header(page, filepath)
-            template = Tilt.new(filepath)
+            begin
+              template = Tilt.new(filepath)
+            rescue Haml::SyntaxError => e
+              Locomotive::Mounter.logger.warn "Invalid page template (#{filepath}): #{e.message}"
+              template = e
+            end
 
             if template.respond_to?(:attributes)
               return if template.attributes.blank?

data/lib/locomotive/mounter/reader/file_system/snippets_reader.rb

@@ -12,6 +12,8 @@ module Locomotive
           def read
             self.fetch_from_filesystem
 
+            self.set_default_template_for_each_locale
+
             self.items
           end
 
@@ -25,7 +27,29 @@ module Locomotive
               snippet = self.add(filepath)
 
               Locomotive::Mounter.with_locale(self.filepath_locale(filepath)) do
-                snippet.template = Tilt.new(filepath)
+                snippet.template = self.fetch_template(filepath)
+              end
+            end
+          end
+
+          # Set a default template (coming from the default locale)
+          # for each snippet which does not have a translated version
+          # of the template in each locale.
+          #
+          def set_default_template_for_each_locale
+            self.items.values.each do |snippet|
+              default_template = snippet.template
+
+              next if !default_template.is_a?(Exception) && default_template.blank?
+
+              self.locales.map(&:to_sym).each do |locale|
+                next if locale == self.default_locale
+
+                _template = snippet.template_translations[locale]
+
+                if !_template.is_a?(Exception) && _template.blank?
+                  snippet.template_translations[locale] = default_template
+                end
               end
             end
           end
@@ -53,7 +77,7 @@ module Locomotive
               self.items[slug] = Locomotive::Mounter::Models::Snippet.new({
                 name:     slug.humanize,
                 slug:     slug,
-                template: Tilt.new(filepath)
+                template: self.fetch_template(filepath)
               })
             end
 
@@ -70,6 +94,23 @@ module Locomotive
             File.basename(filepath).split('.').first
           end
 
+          # From a filepath, parse the template inside.
+          # and return the related Tilt instance.
+          # It may return the exception if the template is invalid
+          # (only for HAML templates).
+          #
+          # @param [ String ] filepath The path to the file
+          #
+          # @return [ Object ] The Tilt template or the exception itself if the template is invalid
+          #
+          def fetch_template(filepath)
+            begin
+              Tilt.new(filepath)
+            rescue Haml::SyntaxError => e
+              e
+            end
+          end
+
         end
 
       end

data/lib/locomotive/mounter/version.rb

@@ -2,7 +2,7 @@
 module Locomotive
   module Mounter #:nodoc
 
-    VERSION = '1.0.0.alpha3'
+    VERSION = '1.0.0.alpha4'
 
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms_mounter
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha3
+  version: 1.0.0.alpha4
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-29 00:00:00.000000000 Z
+date: 2013-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -471,7 +471,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4474890488804116782
+      hash: -4090664391938544491
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: