locomotive_cms 2.2.3 → 2.3.0

data/lib/locomotive/liquid/drops/proxy_collection.rb

@@ -27,7 +27,7 @@ module Locomotive
         def count
           @count ||= self.collection.count
         end
-        
+
         def all
           self.collection
         end
@@ -43,6 +43,10 @@ module Locomotive
           self.collection.any?
         end
 
+        def content_type
+
+        end
+
         protected
 
         def paginate(options = {})

data/lib/locomotive/liquid/drops/site.rb

@@ -3,23 +3,27 @@ module Locomotive
     module Drops
       class Site < Base
 
-        delegate :name, :seo_title, :meta_keywords, :meta_description, to: '_source'
+        delegate :name, :seo_title, :meta_keywords, :meta_description, to: :@_source
 
         def index
-          @index ||= self._source.pages.root.first
+          @index ||= @_source.pages.root.first
         end
 
         def pages
-          @pages ||= liquify(*self.scoped_pages)
+          liquify(*self.scoped_pages)
+        end
+
+        def domains
+          @_source.domains
         end
 
         protected
 
         def scoped_pages
-          if @context["with_scope"]
-            self._source.pages.where(@context["with_scope"])
+          if @context['with_scope']
+            @_source.pages.where(@context['with_scope'])
           else
-            self._source.pages
+            @_source.pages
           end
         end
 

data/lib/locomotive/liquid/drops/uploader.rb

@@ -3,10 +3,10 @@ module Locomotive
     module Drops
       class Uploader < Base
 
-        delegate :url, :size, to: '_source'
+        delegate :url, :size, to: :@_source
 
         def filename
-          File.basename(self._source.url)
+          File.basename(@_source.url)
         end
 
       end

data/lib/locomotive/liquid/filters/date.rb

@@ -3,12 +3,38 @@ module Locomotive
     module Filters
       module Date
 
-        def distance_of_time_in_words(input, from_time = Time.now)
+        def parse_date_time(input, format = nil)
+          return '' if input.blank?
+
+          format    ||= I18n.t('time.formats.default')
+          date_time = ::DateTime._strptime(input, format)
+
+          if date_time
+            ::Time.zone.local(date_time[:year], date_time[:mon], date_time[:mday], date_time[:hour], date_time[:min], date_time[:sec] || 0)
+          else
+            ::Time.zone.parse(input) rescue ''
+          end
+        end
+
+        def parse_date(input, format)
+          return '' if input.blank?
+
+          format  ||= I18n.t('date.formats.default')
+          date    = ::Date._strptime(input, format)
+
+          if date
+            ::Date.new(date[:year], date[:mon], date[:mday])
+          else
+            ::Date.parse(value) rescue ''
+          end
+        end
+
+        def distance_of_time_in_words(input, from_time = Time.zone.now, include_seconds = false)
           # make sure we deals with instances of Time
           input     = to_time(input)
           from_time = to_time(from_time)
 
-          ::ActionController::Base.helpers.distance_of_time_in_words(input, from_time)
+          ::ActionController::Base.helpers.distance_of_time_in_words(input, from_time, { include_seconds: include_seconds })
         end
 
         def localized_date(input, *args)
@@ -42,7 +68,7 @@ module Locomotive
         def to_time(input)
           case input
           when Date   then input.to_time
-          when String then Time.parse(input)
+          when String then Time.zone.parse(input)
           else
             input
           end

data/lib/locomotive/liquid/filters/resize.rb

@@ -4,7 +4,9 @@ module Locomotive
       module Resize
 
         def resize(input, resize_string)
-          Locomotive::Dragonfly.resize_url(input, resize_string)
+          source = input.instance_variable_get(:@_source) || input
+
+          Locomotive::Dragonfly.resize_url(source, resize_string)
         end
 
       end

data/lib/locomotive/liquid/filters/text.rb

@@ -40,6 +40,10 @@ module Locomotive
           ::RedCloth.new(input).to_html
         end
 
+        def markdown(input)
+          Locomotive::Markdown.render(input)
+        end
+
       end
 
       ::Liquid::Template.register_filter(Text)

data/lib/locomotive/liquid/tags/editable/control.rb

@@ -8,7 +8,9 @@ module Locomotive
 
           def default_element_attributes
             if @nodelist.first.is_a?(String)
-              super.merge(content: @nodelist.first.try(:to_s), options: @options[:options])
+              content = self.render_default_content(@nodelist.first)
+
+              super.merge(content: content, options: @options[:options])
             else
               super
             end
@@ -22,6 +24,14 @@ module Locomotive
             EditableControl
           end
 
+          def render_default_content(node)
+            if node
+              node.to_s.strip
+            else
+              nil
+            end
+          end
+
         end
 
         ::Liquid::Template.register_tag('editable_control', Control)

data/lib/locomotive/liquid/tags/link_to.rb

@@ -46,9 +46,11 @@ module Locomotive
             handle = scope[@handle] || @handle
 
             page = case handle
-            when Locomotive::Page         then handle
-            when String                   then fetch_page(site, handle)
-            when Locomotive::ContentEntry then fetch_page(site, handle, true)
+            when Locomotive::Page                         then handle
+            when Locomotive::Liquid::Drops::Page          then handle.instance_variable_get(:@_source)
+            when String                                   then fetch_page(site, handle)
+            when Locomotive::ContentEntry                 then fetch_page(site, handle, true)
+            when Locomotive::Liquid::Drops::ContentEntry  then fetch_page(site, handle.instance_variable_get(:@_source), true)
             else
               nil
             end

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

@@ -50,7 +50,7 @@ module Locomotive
             css << 'first' if index == 0
             css << 'last' if index == entries.size - 1
 
-            children_output << render_entry_link(p, css.join(' '), 1)
+            children_output << render_entry_link(context, p, css.join(' '), 1)
           end
 
           output = children_output.join("\n")
@@ -81,13 +81,11 @@ module Locomotive
         end
 
         # Returns a list element, a link to the page and its children
-        def render_entry_link(page, css, depth)
-          selected = @page.fullpath =~ /^#{page.fullpath}/ ? " #{@options[:active_class]}" : ''
-
-          icon = @options[:icon] ? '<span></span>' : ''
-
-          title = @options[:liquid_render] ? @options[:liquid_render].render('page' => page) : page.title
+        def render_entry_link(context, page, css, depth)
+          selected = @page.fullpath =~ /^#{page.fullpath}(\/.*)?$/ ? " #{@options[:active_class]}" : ''
 
+          icon  = @options[:icon] ? '<span></span>' : ''
+          title = render_title(context, page)
           label = %{#{icon if @options[:icon] != 'after' }#{title}#{icon if @options[:icon] == 'after' }}
 
           link_options = caret = ''
@@ -102,7 +100,7 @@ module Locomotive
 
           output  = %{<li id="#{page.slug.to_s.dasherize}-link" class="link#{selected} #{css}">}
           output << %{<a href="#{href}"#{link_options}>#{label}#{caret}</a>}
-          output << render_entry_children(page, depth.succ) if (depth.succ <= @options[:depth].to_i)
+          output << render_entry_children(context, page, depth.succ) if (depth.succ <= @options[:depth].to_i)
           output << %{</li>}
 
           output.strip
@@ -113,7 +111,7 @@ module Locomotive
         end
 
         # Recursively creates a nested unordered list for the depth specified
-        def render_entry_children(page, depth)
+        def render_entry_children(context, page, depth)
           output = %{}
 
           children = page.children_with_minimal_attributes(@options[:add_attributes]).reject { |c| !include_page?(c) }
@@ -124,7 +122,7 @@ module Locomotive
               css << 'first' if children.first == c
               css << 'last'  if children.last  == c
 
-              output << render_entry_link(c, css.join(' '), depth)
+              output << render_entry_link(context, c, css.join(' '), depth)
             end
             output << %{</ul>}
           end
@@ -132,6 +130,17 @@ module Locomotive
           output
         end
 
+        def render_title(context, page)
+          if @options[:liquid_render]
+            context.stack do
+              context['page'] = page
+              @options[:liquid_render].render(context)
+            end
+          else
+            page.title
+          end
+        end
+
         # Determines whether or not a page should be a part of the menu
         def include_page?(page)
           if !page.listed? || page.templatized? || !page.published?

data/lib/locomotive/liquid/tags/with_scope.rb

@@ -6,57 +6,55 @@ module Locomotive
       #
       # Usage:
       #
-      # {% with_scope main_developer: 'John Doe', active: true %}
+      # {% with_scope main_developer: 'John Doe', providers.in: ['acme'], started_at.le: today, active: true %}
       #   {% for project in contents.projects %}
       #     {{ project.name }}
       #   {% endfor %}
       # {% endwith_scope %}
       #
 
-      class WithScope < ::Liquid::Block
-        SlashedString = /\/[^\/]*\//
-        TagAttributes = /(\w+|\w+\.\w+)\s*\:\s*(#{SlashedString}|#{::Liquid::QuotedFragment})/
+      class WithScope < Solid::Block
 
-        def initialize(tag_name, markup, tokens, context)
-          @attributes = HashWithIndifferentAccess.new
-          markup.scan(TagAttributes) do |key, value|
-            key = prepare_key(key)
-            @attributes[key] = value
-          end
-          super
+        OPERATORS = %w(all exists gt gte in lt lte ne nin size near within)
+
+        SYMBOL_OPERATORS_REGEXP = /(\w+\.(#{OPERATORS.join('|')})){1}\s*\:/
+
+        # register the tag
+        tag_name :with_scope
+
+        def initialize(tag_name, arguments_string, tokens, context = {})
+          # convert symbol operators into valid ruby code
+          arguments_string.gsub!(SYMBOL_OPERATORS_REGEXP, ':"\1" =>')
+
+          super(tag_name, arguments_string, tokens, context)
         end
 
-        def render(context)
-          context.stack do
-            context['with_scope'] = decode(@attributes.clone, context)
-            render_all(@nodelist, context)
+        def display(options = {}, &block)
+          current_context.stack do
+            current_context['with_scope'] = self.decode(options)
+            yield
           end
         end
 
-        private
+        protected
 
-        def decode(attributes, context)
-          attributes.each_pair do |key, value|
-            attributes[key] = value.match(SlashedString) ? Regexp.new(value[1..-2]) : context[value]
-          end
-        end
+        def decode(options)
+          HashWithIndifferentAccess.new.tap do |hash|
+            options.each do |key, value|
+              _key, _operator = key.to_s.split('.')
 
-        def prepare_key(key)
-          _key, _operator = key.split('.')
+              # _slug instead of _permalink
+              _key = '_slug' if _key == '_permalink'
 
-          # _slug instead of _permalink
-          _key = '_slug' if _key == '_permalink'
+              # key to h4s symbol
+              _key = _key.to_s.to_sym.send(_operator.to_sym) if _operator
 
-          # key to h4s symbol
-          if %w(all exists gt gte in lt lte ne nin size near within).include?(_operator)
-            _key.to_s.to_sym.send(_operator.to_sym)
-          else
-            _key
+              hash[_key] = value
+            end
           end
         end
       end
 
-      ::Liquid::Template.register_tag('with_scope', WithScope)
     end
   end
 end

data/lib/locomotive/markdown.rb

@@ -0,0 +1,23 @@
+module Locomotive
+  module Markdown
+
+    def self.render(text)
+      self.parser.render(text)
+    end
+
+    def self.parser
+      @@markdown ||= Redcarpet::Markdown.new Redcarpet::Render::HTML, {
+        autolink:         true,
+        fenced_code:      true,
+        generate_toc:     true,
+        gh_blockcode:     true,
+        hard_wrap:        true,
+        no_intraemphasis: true,
+        strikethrough:    true,
+        tables:           true,
+        xhtml:            true
+      }
+    end
+
+  end
+end

data/lib/locomotive/render.rb

@@ -150,7 +150,7 @@ module Locomotive
       end
 
       # Tip: switch from false to true to enable the re-thrown exception flag
-      ::Liquid::Context.new({}, assigns, self.locomotive_default_registers, false)
+      ::Liquid::Context.new({}, assigns, self.locomotive_default_registers, true)
     end
 
     # Get the assigns from the flash object (session). For instance, once
@@ -189,13 +189,16 @@ module Locomotive
         'fullpath'          => request.fullpath,
         'url'               => request.url,
         'ip_address'        => request.remote_ip,
+        'post?'             => request.post?,
+        'host'              => request.host_with_port,
         'now'               => Time.now.in_time_zone(current_site.timezone),
         'today'             => Date.today,
         'locale'            => I18n.locale.to_s,
         'default_locale'    => current_site.default_locale.to_s,
         'locales'           => current_site.locales,
         'current_user'      => Locomotive::Liquid::Drops::CurrentUser.new(current_locomotive_account),
-        'session'           => Locomotive::Liquid::Drops::SessionProxy.new
+        'session'           => Locomotive::Liquid::Drops::SessionProxy.new,
+        'wagon'             => false
       }
     end
 
@@ -209,6 +212,7 @@ module Locomotive
         site:           current_site,
         page:           @page,
         inline_editor:  self.editing_page?,
+        logger:         Rails.logger,
         current_locomotive_account: current_locomotive_account
       }
     end

data/lib/locomotive/version.rb

@@ -1,3 +1,3 @@
 module Locomotive #:nodoc
-  VERSION = '2.2.3'
+  VERSION = '2.3.0'
 end

data/lib/tasks/locomotive.rake

@@ -14,19 +14,22 @@ namespace :locomotive do
     Locomotive::Site.all.each do |site|
       default_locale = site.default_locale
 
-      ([default_locale] + (site.locales - [default_locale])). each do |locale|
+      ([default_locale] + (site.locales - [default_locale])).each do |locale|
         Mongoid::Fields::I18n.with_locale(locale) do
           pages = site.pages.to_a
           while !pages.empty? do
             page = pages.pop
             begin
               page.send :_parse_and_serialize_template
+              page.instance_variable_set :@template_changed, true
               page.save
-              puts "[#{site.name}][#{locale}] processing...#{page.title}"
+              puts "[#{site.name}][#{locale}] processing...#{page.title} [saved]"
             rescue TypeError
               pages.insert(0, page)
             rescue ::Liquid::Error => e
               puts "\tLiquid error: #{e.message} (#{page._id})"
+            rescue Exception => e
+              puts "\tUnknown error: #{e.message} (#{page._id})"
             end
           end
         end

data/mongodb/migrate/20130511121956_generate_checksum_for_theme_assets.rb

@@ -5,7 +5,11 @@ class GenerateChecksumForThemeAssets < MongoidMigration::Migration
 
       puts "[#{asset.send(:safe_source_filename)}] #{asset.checksum}"
 
-      asset.save!
+      begin
+        asset.save!
+      rescue Exception => e
+        puts "\tfailed (#{e.message})"
+      end
     end
   end
 

data/mongodb/migrate/20130903145451_localize_redirect_urls_of_pages.rb

@@ -0,0 +1,42 @@
+class LocalizeRedirectUrlsOfPages < MongoidMigration::Migration
+  def self.up
+    Locomotive::Site.all.each do |site|
+      puts "[#{site.name}] - #{site.default_locale} / #{site.locales}"
+
+      site.pages.each do |page|
+        next if page.attributes['redirect_url'].is_a?(Hash) # already translated
+
+        puts "\tPage #{page.id} is not translated"
+
+        self.update_page(site, page)
+      end
+    end
+  end
+
+  def self.down
+    Locomotive::Page.all.each do |page|
+      selector      = { '_id' => page._id }
+      modifications = page.attributes['redirect_url'].values.first
+
+      Locomotive::Page.collection.find(selector).update({ '$set' => { 'redirect_url' => modifications } })
+    end
+  end
+
+  # 2 cases:
+  # - not translated, set the redirect_url for all the locales of the site
+  # - already translated copy the SAME redirect_url for all the locales of the page
+  #
+  def self.update_page(site, page)
+    selector      = { '_id' => page._id }
+    modifications = {}
+    redirect_url  = Mongoid::Fields::I18n.with_locale(site.default_locale) { page.redirect_url }
+
+    locales = page.translated? ? page.translated_in : site.locales
+
+    locales.each do |locale|
+      modifications[locale.to_s] = redirect_url
+    end
+
+    Locomotive::Page.collection.find(selector).update({ '$set' => { 'redirect_url' => modifications } })
+  end
+end