locomotive_cms 2.0.0.rc2 → 2.0.0.rc4

data/lib/locomotive/liquid.rb

@@ -1,5 +1,6 @@
 require 'locomotive/liquid/drops/base'
 require 'locomotive/liquid/drops/proxy_collection'
+require 'locomotive/liquid/filters/base'
 
 %w{. tags drops filters}.each do |dir|
   Dir[File.join(File.dirname(__FILE__), 'liquid', dir, '*.rb')].each { |lib| require lib }

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

@@ -45,7 +45,7 @@ module Locomotive
           if not @@forbidden_attributes.include?(meth.to_s)
             value = self._source.send(meth)
 
-            if value.respond_to?(:all)
+            if value.respond_to?(:all) # check for an association
               filter_and_order_list(value)
             else
               value
@@ -70,7 +70,7 @@ module Locomotive
             end
           else
             list.ordered
-          end.all
+          end
         end
 
       end

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

@@ -6,7 +6,7 @@ module Locomotive
         delegate :seo_title, :meta_keywords, :meta_description, :to => '_source'
 
         def title
-          self._source.templatized? ? @context['content_entry']._label : self._source.title
+          self._source.templatized? ? @context['entry']._label : self._source.title
         end
 
         def slug

data/lib/locomotive/liquid/errors.rb

@@ -1,5 +1,7 @@
 module Locomotive
   module Liquid
     class PageNotFound < ::Liquid::Error; end
+
+    class PageNotTranslated < ::Liquid::Error; end
   end
 end

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

@@ -0,0 +1,47 @@
+module Locomotive
+  module Liquid
+    module Filters
+      module Base
+
+        protected
+
+        # Convert an array of properties ('key:value') into a hash
+        # Ex: ['width:50', 'height:100'] => { :width => '50', :height => '100' }
+        def args_to_options(*args)
+          options = {}
+          args.flatten.each do |a|
+            if (a =~ /^(.*):(.*)$/)
+              options[$1.to_sym] = $2
+            end
+          end
+          options
+        end
+
+        # Write options (Hash) into a string according to the following pattern:
+        # <key1>="<value1>", <key2>="<value2", ...etc
+        def inline_options(options = {})
+          return '' if options.empty?
+          (options.stringify_keys.sort.to_a.collect { |a, b| "#{a}=\"#{b}\"" }).join(' ') << ' '
+        end
+
+        # Get the url to be used in html tags such as image_tag, flash_tag, ...etc
+        # input: url (String) OR asset drop
+        def get_url_from_asset(input)
+          input.respond_to?(:url) ? input.url : input
+        end
+
+        def asset_url(path)
+          ThemeAssetUploader.url_for(@context.registers[:site], path)
+        end
+
+        def absolute_url(url)
+          url.starts_with?('/') ? url : "/#{url}"
+        end
+
+      end
+
+      ::Liquid::Template.register_filter(Base)
+
+    end
+  end
+end

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

@@ -3,7 +3,21 @@ module Locomotive
     module Filters
       module Html
 
-        # Write the url to a stylesheet resource
+        # Returns a link tag that browsers and news readers can use to auto-detect an RSS or ATOM feed.
+        # input: url of the feed
+        # example:
+        #   {{ '/foo/bar' | auto_discovery_link_tag: 'rel:alternate', 'type:application/atom+xml', 'title:A title' }}
+        def auto_discovery_link_tag(input, *args)
+          options = args_to_options(args)
+
+          rel   = options[:rel] || 'alternate'
+          type  = options[:type] || Mime::Type.lookup_by_extension('rss').to_s
+          title = options[:title] || 'RSS'
+
+          %{<link rel="#{rel}" type="#{type}" title="#{title}" href="#{input}" />}
+        end
+
+        # Write the url of a theme stylesheet
         # input: name of the css file
         def stylesheet_url(input)
           return '' if input.nil?
@@ -17,7 +31,7 @@ module Locomotive
           input
         end
 
-        # Write the link to a stylesheet resource
+        # Write the link tag of a theme stylesheet
         # input: url of the css file
         def stylesheet_tag(input, media = 'screen')
           return '' if input.nil?
@@ -92,80 +106,6 @@ module Locomotive
           }.gsub(/ >/, '>').strip
         end
 
-        # Render the navigation for a paginated collection
-        def default_pagination(paginate, *args)
-          return '' if paginate['parts'].empty?
-
-          options = args_to_options(args)
-
-          previous_label  = options[:previous_label] || I18n.t('pagination.previous')
-          next_label      = options[:next_label] || I18n.t('pagination.next')
-
-          previous_link = (if paginate['previous'].blank?
-            "<span class=\"disabled prev_page\">#{previous_label}</span>"
-          else
-            "<a href=\"#{absolute_url(paginate['previous']['url'])}\" class=\"prev_page\">#{previous_label}</a>"
-          end)
-
-          links = ""
-          paginate['parts'].each do |part|
-            links << (if part['is_link']
-              "<a href=\"#{absolute_url(part['url'])}\">#{part['title']}</a>"
-            elsif part['hellip_break']
-              "<span class=\"gap\">#{part['title']}</span>"
-            else
-              "<span class=\"current\">#{part['title']}</span>"
-            end)
-          end
-
-          next_link = (if paginate['next'].blank?
-            "<span class=\"disabled next_page\">#{next_label}</span>"
-          else
-            "<a href=\"#{absolute_url(paginate['next']['url'])}\" class=\"next_page\">#{next_label}</a>"
-          end)
-
-          %{<div class="pagination #{options[:css]}">
-              #{previous_link}
-              #{links}
-              #{next_link}
-            </div>}
-        end
-
-        protected
-
-        # Convert an array of properties ('key:value') into a hash
-        # Ex: ['width:50', 'height:100'] => { :width => '50', :height => '100' }
-        def args_to_options(*args)
-          options = {}
-          args.flatten.each do |a|
-            if (a =~ /^(.*):(.*)$/)
-              options[$1.to_sym] = $2
-            end
-          end
-          options
-        end
-
-        # Write options (Hash) into a string according to the following pattern:
-        # <key1>="<value1>", <key2>="<value2", ...etc
-        def inline_options(options = {})
-          return '' if options.empty?
-          (options.stringify_keys.sort.to_a.collect { |a, b| "#{a}=\"#{b}\"" }).join(' ') << ' '
-        end
-
-        # Get the url to be used in html tags such as image_tag, flash_tag, ...etc
-        # input: url (String) OR asset drop
-        def get_url_from_asset(input)
-          input.respond_to?(:url) ? input.url : input
-        end
-
-        def asset_url(path)
-          ThemeAssetUploader.url_for(@context.registers[:site], path)
-        end
-
-        def absolute_url(url)
-          url.starts_with?('/') ? url : "/#{url}"
-        end
-
       end
 
       ::Liquid::Template.register_filter(Html)

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

@@ -3,24 +3,6 @@ module Locomotive
     module Filters
       module Misc
 
-        def underscore(input)
-          input.to_s.gsub(' ', '_').gsub('/', '_').underscore
-        end
-
-        def dasherize(input)
-          input.to_s.gsub(' ', '-').gsub('/', '-').dasherize
-        end
-
-        def multi_line(input)
-          input.to_s.gsub("\n", '<br/>')
-        end
-
-        def concat(input, *args)
-          result = input.to_s
-          args.flatten.each { |a| result << a.to_s }
-          result
-        end
-
         def modulo(word, index, modulo)
           (index.to_i + 1) % modulo == 0 ? word : ''
         end
@@ -33,6 +15,49 @@ module Locomotive
           input.last
         end
 
+        def default(input, value)
+          input.blank? ? value : input
+        end
+
+        # Render the navigation for a paginated collection
+        def default_pagination(paginate, *args)
+          return '' if paginate['parts'].empty?
+
+          options = args_to_options(args)
+
+          previous_label  = options[:previous_label] || I18n.t('pagination.previous')
+          next_label      = options[:next_label] || I18n.t('pagination.next')
+
+          previous_link = (if paginate['previous'].blank?
+            "<span class=\"disabled prev_page\">#{previous_label}</span>"
+          else
+            "<a href=\"#{absolute_url(paginate['previous']['url'])}\" class=\"prev_page\">#{previous_label}</a>"
+          end)
+
+          links = ""
+          paginate['parts'].each do |part|
+            links << (if part['is_link']
+              "<a href=\"#{absolute_url(part['url'])}\">#{part['title']}</a>"
+            elsif part['hellip_break']
+              "<span class=\"gap\">#{part['title']}</span>"
+            else
+              "<span class=\"current\">#{part['title']}</span>"
+            end)
+          end
+
+          next_link = (if paginate['next'].blank?
+            "<span class=\"disabled next_page\">#{next_label}</span>"
+          else
+            "<a href=\"#{absolute_url(paginate['next']['url'])}\" class=\"next_page\">#{next_label}</a>"
+          end)
+
+          %{<div class="pagination #{options[:css]}">
+              #{previous_link}
+              #{links}
+              #{next_link}
+            </div>}
+        end
+
       end
 
       ::Liquid::Template.register_filter(Misc)

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

@@ -3,6 +3,24 @@ module Locomotive
     module Filters
       module Text
 
+        def underscore(input)
+          input.to_s.gsub(' ', '_').gsub('/', '_').underscore
+        end
+
+        def dasherize(input)
+          input.to_s.gsub(' ', '-').gsub('/', '-').dasherize
+        end
+
+        def multi_line(input)
+          input.to_s.gsub("\n", '<br/>')
+        end
+
+        def concat(input, *args)
+          result = input.to_s
+          args.flatten.each { |a| result << a.to_s }
+          result
+        end
+
         def textile(input)
           ::RedCloth.new(input).to_html
         end

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

@@ -2,4 +2,4 @@ require 'locomotive/liquid/tags/editable/base'
 require 'locomotive/liquid/tags/editable/short_text'
 require 'locomotive/liquid/tags/editable/long_text'
 require 'locomotive/liquid/tags/editable/file'
-require 'locomotive/liquid/tags/editable/content'
+require 'locomotive/liquid/tags/editable/control'

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

@@ -9,7 +9,7 @@ module Locomotive
           def initialize(tag_name, markup, tokens, context)
             if markup =~ Syntax
               @slug = $1.gsub('\'', '')
-              @options = { :assignable => true }
+              @options = { :fixed => false }
               markup.scan(::Liquid::TagAttributes) { |key, value| @options[key.to_sym] = value.gsub(/^'/, '').gsub(/'$/, '') }
             else
               raise ::Liquid::SyntaxError.new("Syntax Error in 'editable_xxx' - Valid syntax: editable_xxx <slug>(, <options>)")
@@ -22,18 +22,7 @@ module Locomotive
             super
 
             if @context[:page].present?
-              @context[:page].add_or_update_editable_element({
-                :block                => @context[:current_block].try(:name),
-                :slug                 => @slug,
-                :hint                 => @options[:hint],
-                :priority             => @options[:priority] || 0,
-                :default_attribute    => @options[:default],
-                :default_content      => default_content_option,
-                :assignable           => @options[:assignable],
-                :disabled             => false,
-                :from_parent          => false,
-                :_type                => self.document_type.to_s
-              }, document_type)
+              @context[:page].add_or_update_editable_element(default_element_attributes, document_type)
             end
           end
 
@@ -43,9 +32,6 @@ module Locomotive
             element = current_page.find_editable_element(context['block'].try(:name), @slug)
 
             if element.present?
-              unless element.default_content.present?
-                element.default_content = render_default_content(context)
-              end
               render_element(context, element)
             else
               Locomotive.log :error, "[editable element] missing element `#{context['block'].try(:name)}` / #{@slug} on #{current_page.fullpath}"
@@ -55,6 +41,19 @@ module Locomotive
 
           protected
 
+          def default_element_attributes
+            {
+              :block                => @options[:block] || @context[:current_block].try(:name),
+              :slug                 => @slug,
+              :hint                 => @options[:hint],
+              :priority             => @options[:priority] || 0,
+              :fixed                => !!@options[:fixed],
+              :disabled             => false,
+              :from_parent          => false,
+              :_type                => self.document_type.to_s
+            }
+          end
+
           def render_element(element)
             raise 'FIXME: has to be overidden'
           end
@@ -63,14 +62,6 @@ module Locomotive
             raise 'FIXME: has to be overidden'
           end
 
-          def default_content_option
-            result = nil
-            if @options[:default].present?
-              result = @context[:page].send(@options[:default])
-            end
-            result
-          end
-
           def render_default_content(context)
             render_all(@nodelist, context).join(' ')
           end

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

@@ -0,0 +1,31 @@
+module Locomotive
+  module Liquid
+    module Tags
+      module Editable
+        class Control < Base
+
+          protected
+
+          def default_element_attributes
+            if @nodelist.first.is_a?(String)
+              super.merge(:content => @nodelist.first.try(:to_s), :options => @options[:options])
+            else
+              super
+            end
+          end
+
+          def render_element(context, element)
+            element.content
+          end
+
+          def document_type
+            EditableControl
+          end
+
+        end
+
+        ::Liquid::Template.register_tag('editable_control', Control)
+      end
+    end
+  end
+end

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

@@ -6,8 +6,24 @@ module Locomotive
 
           protected
 
+          def default_element_attributes
+            if @nodelist.first.is_a?(String)
+              super.merge(:default_source_url => @nodelist.first.try(:to_s))
+            else
+              super
+            end
+          end
+
           def render_element(context, element)
-            element.source? ? element.source.url : element.default_content
+            if element.source?
+              element.source.url
+            else
+              if element.default_source_url.present?
+                element.default_source_url
+              else
+                render_default_content(context)
+              end
+            end
           end
 
           def document_type