locomotivecms_mounter 1.2.7 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7821d05f00c3bf1b11108d55d65465df1226a4e0
-  data.tar.gz: e4c71a13f4c029c35ec539c12a487c4a693c96b7
+  metadata.gz: a544f668acb9f469e36dbbc2481f94ca5be4e6b2
+  data.tar.gz: 2435a7ca2b750f20afbcafe77b5238b31090dbcf
 SHA512:
-  metadata.gz: e45de803e79045ad5b23d0656d55005b45ae10ff5deddd974cdc9e0f8c3962a65be612621e3b9faf275bcd6840123f5ad004d756cc9a9ac563d6dd754af77641
-  data.tar.gz: 6cdf03153e9c1094c064bd9289d4b2cbdfe70ad1d05efdc0dd222a13365ef81d75d9ba3d60a35edad55e91118a3272296035a122dbd15b2db60ce3f6421e069c
+  metadata.gz: 5e24cb2022d27e11b981eb7e3b7c2c62786f562fb16fe71a8a5707e4d51e22b02b5c821f048c899727ef91919d495035eea36b55c3ba08b924aa61ab89ca16d7
+  data.tar.gz: 0f86671a344ac51f294eae9db59a04fabe5a6d2a0947dde51cb20be3b602dfe1f76d0948ff95dfb5eb24e8faa2b89273ec518c849f68391e1a9cd27b83a8504a

data/lib/locomotive/mounter/fields.rb

@@ -88,7 +88,7 @@ module Locomotive
 
               value = value.values.first if value.size == 1
 
-              value = nil if value.empty?
+              value = nil if value.respond_to?(:empty?) && value.empty?
 
               _attributes[name] = value
             else

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

@@ -334,16 +334,16 @@ module Locomotive
             field = self.content_type.find_field(field)
           end
 
+          return nil if field.nil?
+
           value = (self.dynamic_attributes || {})[field.name.to_sym]
 
-          # puts "[#{field.name.inspect}] #{value.inspect} / #{field.localized.inspect} / #{value.is_a?(Hash).inspect}"
+          # DEBUG puts "[#{field.name.inspect}] #{value.inspect} / #{field.localized.inspect} / #{value.is_a?(Hash).inspect}"
 
           if !field.is_relationship? && field.localized && value.is_a?(Hash)
             # get the localized value for the current locale
             _value = value[Locomotive::Mounter.locale]
 
-            # puts "[#{field.name}] _value = #{value.inspect} / current #{Locomotive::Mounter.locale.inspect} / main #{self.main_locale.inspect}"
-
             # no value for the current locale, give a try to the main one
             if _value.nil? && Locomotive::Mounter.locale != self.main_locale
               _value = value[self.main_locale]
@@ -352,7 +352,7 @@ module Locomotive
             value = _value
           end
 
-          value #.tap { |v| puts "[#{field.name}] returning #{v.inspect}" }
+          value # DEBUG .tap { |v| puts "[#{field.name}] returning #{v.inspect}" }
         end
 
       end

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

@@ -53,6 +53,25 @@ module Locomotive
           %w(belongs_to has_many many_to_many).include?(self.type.to_s)
         end
 
+        # Tell if the id, the name of the field or other property based on
+        # its name (like formatted_<date field>) matches the parameter.
+        #
+        # @param [ String / Symbol] name_or_id Name or Id of the field
+        #
+        # @return [ Boolean ] True if the current field matches the parameter
+        #
+        def matches?(id_or_name)
+          default = [self._id, self.name]
+
+          list = default + (case self.type.to_sym
+          when :date, :date_time then ["formatted_#{self.name}"]
+          else
+            []
+          end)
+
+          list.include?(id_or_name.to_s)
+        end
+
         # Return the content type matching the class_name / target attribute
         #
         # @return [ Object ] The matching Content Type

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

@@ -49,6 +49,14 @@ module Locomotive
           self.find_field(self.group_by_field_name)
         end
 
+        # Return the order_by field
+        #
+        # @return [ Object ] The order_by field
+        #
+        def order_by_field
+          self.find_field(self.order_by)
+        end
+
         # Build a content entry and add it to the list of entries of the content type.
         # The content type will be referenced into the newly built entry .
         #
@@ -68,8 +76,10 @@ module Locomotive
 
                 if field.nil? && v.is_a?(Hash) # not a dynamic field but localized (permalink ?)
                   entry.send(:"#{k}_translations=", v)
-                else
+                elsif field.nil?
                   entry.send(:"#{k}=", v)
+                else
+                  entry.send(:"#{field.name}=", v)
                 end
               rescue NoMethodError => e
                 Mounter.logger.error e.backtrace
@@ -117,7 +127,7 @@ module Locomotive
         # @return [ Object ] The field if it exists or nil
         #
         def find_field(name_or_id)
-          self.fields.detect { |field| field.name.to_s == name_or_id.to_s || field._id == name_or_id }
+          self.fields.detect { |field| field.matches?(name_or_id) }
         end
 
         # Find a content entry by its ids (ie: _permalink or _label)
@@ -192,6 +202,10 @@ module Locomotive
           # group by
           _attributes['group_by'] = self.group_by_field.name if self.group_by_field
 
+          # order by
+          _attributes['order_by'] = self.order_by_field.name if self.order_by_field
+          _attributes['order_by'] = 'manually' if self.order_by == '_position'
+
           # custom fields
           _attributes['fields'] = self.fields
 

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

@@ -31,6 +31,9 @@ module Locomotive
         ## other accessors ##
         attr_accessor :content_type_id, :content_entry, :parent_id, :children, :templatized_from_parent
 
+        ## path to the file of the template (if mounted from a FS) ##
+        attr_accessor :filepath
+
         ## aliases ##
         alias :listed?      :listed
         alias :published?   :published
@@ -150,7 +153,7 @@ module Locomotive
           self.depth * 100 + (self.position || 100)
         end
 
-        # A layout is a page which the template does
+        # A layout is a page whose the template does
         # not include the extend keyword.
         # If the template is blank then, it is not considered as a layout
         #
@@ -317,12 +320,7 @@ 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
+            @source[Locomotive::Mounter.locale] = self.template.source
           else
             nil
           end
@@ -421,12 +419,12 @@ module Locomotive
         # If a template is invalid, it is not considered as a
         # blank one.
         #
-        # @param [ Object ] template The template to test (Tilt)
+        # @param [ PageTemplate ] template The template to test
         #
         # @return [ Boolean ] True if the template is strictly blank
         #
         def template_blank?(template)
-          template.nil? || (!template.is_a?(Exception) && template.data.strip.blank?)
+          template.nil? || template.raw_source.strip.blank?
         end
 
       end

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

@@ -13,19 +13,16 @@ module Locomotive
         ## methods ##
 
         # Return the Liquid template based on the template_filepath property
-        # of the snippet. If the template is HAML or SLIM, then a pre-rendering to Liquid is done.
+        # of the snippet. If the template is HAML, then a pre-rendering to Liquid is done.
         #
         # @return [ String ] The liquid template
         #
         def source
           @source ||= {}
 
-          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
+          source = if self.template.respond_to?(:source)
+            # liquid or haml file
+            self.template.source
           else
             # simple string
             self.template

data/lib/locomotive/mounter/reader/api/site_reader.rb

@@ -24,6 +24,9 @@ module Locomotive
                   end
                 end
               end
+
+              # set the time zone for the next Time operations (UTC by default)
+              Time.zone = ActiveSupport::TimeZone.new(site.timezone || 'UTC')
             end
           end
 

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

@@ -28,7 +28,7 @@ module Locomotive
               page.translated_in.each do |locale|
                 Locomotive::Mounter.with_locale(locale) do
                   unless page.template.blank?
-                    self.add_assets_from_string(page.source)
+                    self.add_assets_from_string(page.template.raw_source)
                   end
                 end
               end

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

@@ -69,16 +69,12 @@ module Locomotive
 
           # Record pages found in file system
           def fetch
-            folders = []
-
             Dir.glob(File.join(self.root_dir, '**/*')).each do |filepath|
-              fullpath = self.filepath_to_fullpath(filepath)
-
-              folders.push(fullpath) && next if File.directory?(filepath)
+              next unless File.directory?(filepath) || filepath =~ /\.(#{Locomotive::Mounter::TEMPLATE_EXTENSIONS.join('|')})$/
 
-              next unless filepath =~ /\.(#{Locomotive::Mounter::TEMPLATE_EXTENSIONS.join('|')})$/
+              page = self.add(filepath)
 
-              page = self.add(fullpath)
+              next if File.directory?(filepath) || page.nil?
 
               if locale = self.filepath_locale(filepath)
                 Locomotive::Mounter.with_locale(locale) do
@@ -88,28 +84,26 @@ module Locomotive
                 Locomotive::Mounter.logger.warn "Unknown locale in the '#{File.basename(filepath)}' file."
               end
             end
-
-            folders.each do |fullpath|
-              next if self.pages.key?(fullpath)
-              self.add(fullpath)
-            end
           end
 
           # Add a new page in the global hash of pages.
-          # If the page exists, then do nothing.
+          # If the page exists, override it.
           #
-          # @param [ String ] fullpath The fullpath used as the key for the hash
+          # @param [ String ] filepath The path of the template
           # @param [ Hash ] attributes The attributes of the new page
           #
           # @return [ Object ] A newly created page or the existing one
           #
-          def add(fullpath, attributes = {})
+          def add(filepath, attributes = {})
+            fullpath = self.filepath_to_fullpath(filepath)
+
             unless self.pages.key?(fullpath)
               attributes[:title]    = File.basename(fullpath).humanize
               attributes[:fullpath] = fullpath
 
               page = Locomotive::Mounter::Models::Page.new(attributes)
               page.mounting_point = self.mounting_point
+              page.filepath       = File.expand_path(filepath)
 
               self.pages[fullpath] = page
             end
@@ -125,16 +119,9 @@ module Locomotive
           # @param [ String ] filepath The path of the template
           #
           def set_attributes_from_header(page, 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?
+            template = Locomotive::Mounter::Utils::YAMLFrontMattersTemplate.new(filepath)
 
+            if template.attributes
               attributes = template.attributes.clone
 
               # set the editable elements
@@ -201,7 +188,7 @@ module Locomotive
           def to_s(page = nil)
             page ||= self.pages['index']
 
-            puts "#{"  " * (page.try(:depth) + 1)} #{page.fullpath.inspect} (#{page.title}, position=#{page.position})"
+            puts "#{"  " * (page.try(:depth) + 1)} #{page.fullpath.inspect} (#{page.title}, position=#{page.position}, template=#{page.template_translations.keys.inspect})"
 
             (page.children || []).each { |child| self.to_s(child) }
           end

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

@@ -13,7 +13,10 @@ module Locomotive
            # set the default locale first
            Locomotive::Mounter.locale = site['locales'].first.to_sym rescue Locomotive::Mounter.locale
 
-           Locomotive::Mounter::Models::Site.new(site)
+           Locomotive::Mounter::Models::Site.new(site).tap do |_site|
+            # set the time zone for the next Time operations (UTC by default)
+            Time.zone = ActiveSupport::TimeZone.new(_site.timezone || 'UTC')
+           end
          end
 
         end

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

@@ -40,7 +40,7 @@ module Locomotive
             self.items.values.each do |snippet|
               default_template = snippet.template
 
-              next if !default_template.is_a?(Exception) && default_template.blank?
+              next if default_template.blank?
 
               self.locales.map(&:to_sym).each do |locale|
                 next if locale == self.default_locale
@@ -104,11 +104,7 @@ module Locomotive
           # @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
+            Locomotive::Mounter::Utils::YAMLFrontMattersTemplate.new(filepath)
           end
 
         end

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

@@ -39,8 +39,11 @@ module Locomotive
         def list
           return @list unless @list.nil?
 
+          # Follows symlinks and makes sure subdirectories are handled
+          glob_pattern = '**/*/**/*'
+
           @list = [].tap do |list|
-            Dir.glob(File.join(self.root_dir, '**/*')).each do |file|
+            Dir.glob(File.join(self.root_dir, glob_pattern)).each do |file|
               next if self.exclude?(file)
 
               folder = File.dirname(file.gsub("#{self.root_dir}/", ''))

data/lib/locomotive/mounter/utils/yaml_front_matters_template.rb

@@ -0,0 +1,45 @@
+module Locomotive
+  module Mounter
+    module Utils
+
+      # YAML Front-matters for HAML/Liquid templates
+      class YAMLFrontMattersTemplate
+
+        attr_accessor :filepath, :attributes, :raw_source, :line_offset
+
+        def initialize(filepath)
+          self.filepath     = filepath
+          self.line_offset  = 0
+
+          self.fetch_attributes_and_raw_source(File.read(self.filepath))
+        end
+
+        def source
+          return @source if @source
+
+          @source = if self.filepath.ends_with?('.haml')
+            Haml::Engine.new(self.raw_source).render
+          else
+            self.raw_source
+          end
+        end
+
+        protected
+
+        def fetch_attributes_and_raw_source(data)
+          if data =~ /^(---\s*\n.*?\n?)^(---\s*$\n?)(.*)/m
+            self.line_offset  = $1.count("\n") + 1
+            self.attributes   = YAML.load($1)
+            self.raw_source   = $3
+          else
+            self.attributes = nil
+            self.raw_source = data
+          end
+
+          self.raw_source = self.raw_source.force_encoding('utf-8')
+        end
+
+      end
+    end
+  end
+end

data/lib/locomotive/mounter/version.rb

@@ -2,7 +2,7 @@
 module Locomotive
   module Mounter #:nodoc
 
-    VERSION = '1.2.7'
+    VERSION = '1.3.0'
 
   end
 end

data/lib/locomotive/mounter.rb

@@ -27,6 +27,7 @@ require 'locomotive/mounter/utils/hash'
 require 'locomotive/mounter/utils/yaml'
 require 'locomotive/mounter/utils/string'
 require 'locomotive/mounter/utils/output'
+require 'locomotive/mounter/utils/yaml_front_matters_template'
 
 # Main
 require 'locomotive/mounter/version'
@@ -40,10 +41,7 @@ require 'locomotive/mounter/engine_api'
 require 'locomotive/mounter/extensions/httmultiparty'
 require 'locomotive/mounter/extensions/sprockets'
 require 'locomotive/mounter/extensions/compass'
-require 'locomotive/mounter/extensions/tilt/template'
 require 'locomotive/mounter/extensions/tilt/css'
-require 'locomotive/mounter/extensions/tilt/haml'
-require 'locomotive/mounter/extensions/tilt/liquid'
 
 # Models
 require 'locomotive/mounter/models/base'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms_mounter
 version: !ruby/object:Gem::Version
-  version: 1.2.7
+  version: 1.3.0
 platform: ruby
 authors:
 - Didier Lafforgue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-17 00:00:00.000000000 Z
+date: 2013-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -136,6 +136,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 4.2.3
+- !ruby/object:Gem::Dependency
+  name: tzinfo
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: chronic
   requirement: !ruby/object:Gem::Requirement
@@ -417,9 +431,6 @@ files:
 - lib/locomotive/mounter/extensions/httmultiparty.rb
 - lib/locomotive/mounter/extensions/sprockets.rb
 - lib/locomotive/mounter/extensions/tilt/css.rb
-- lib/locomotive/mounter/extensions/tilt/haml.rb
-- lib/locomotive/mounter/extensions/tilt/liquid.rb
-- lib/locomotive/mounter/extensions/tilt/template.rb
 - lib/locomotive/mounter/fields.rb
 - lib/locomotive/mounter/models/base.rb
 - lib/locomotive/mounter/models/content_asset.rb
@@ -459,6 +470,7 @@ files:
 - lib/locomotive/mounter/utils/output.rb
 - lib/locomotive/mounter/utils/string.rb
 - lib/locomotive/mounter/utils/yaml.rb
+- lib/locomotive/mounter/utils/yaml_front_matters_template.rb
 - lib/locomotive/mounter/version.rb
 - lib/locomotive/mounter/writer/api/base.rb
 - lib/locomotive/mounter/writer/api/content_assets_writer.rb

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

@@ -1,37 +0,0 @@
-module Tilt
-
-  # YAML Front-matters for HAML templates
-  class YamlFrontMattersHamlTemplate < HamlTemplate
-
-    # Attributes from YAML Front-matters header
-    attr_reader :attributes
-
-    def need_for_prerendering?
-      true
-    end
-
-    def prepare
-      if data =~ /^(---\s*\n.*?\n?)^(---\s*$\n?)(.*)/m
-        @attributes = YAML.load($1)
-        @data = $3
-      end
-      @data = @data.force_encoding('utf-8')
-      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
-
-  Tilt.register 'haml', YamlFrontMattersHamlTemplate
-  Tilt.prefer YamlFrontMattersHamlTemplate
-
-end
-
-class ::Haml::SyntaxError
-  attr_accessor :attributes
-end

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

@@ -1,23 +0,0 @@
-module Tilt
-
-  # YAML Front-matters for Liquid templates
-  class YamlFrontMattersLiquidTemplate < Template
-
-    # Attributes from YAML Front-matters header
-    attr_reader :attributes
-
-    def prepare
-      if data =~ /^(---\s*\n.*?\n?)^(---\s*$\n?)(.*)/m
-        @attributes = YAML.load($1)
-        @data = $3
-      end
-      @data = @data.force_encoding('utf-8')
-      # Note: do not call 'super' because we are going to use a different parse mechanism
-    end
-
-  end
-
-  Tilt.register 'liquid', YamlFrontMattersLiquidTemplate
-  Tilt.prefer YamlFrontMattersLiquidTemplate
-
-end

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

@@ -1,11 +0,0 @@
-module Tilt
-
-  class Template
-
-    def need_for_prerendering?
-      false
-    end
-
-  end
-
-end