locomotive_cms 2.0.3 → 2.1.0

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

@@ -11,7 +11,7 @@ module Locomotive
           def initialize(tag_name, markup, tokens, context)
             if markup =~ Syntax
               @slug = $1.gsub(/[\"\']/, '')
-              @options = { :fixed => false }
+              @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>)")
@@ -45,14 +45,14 @@ module Locomotive
 
           def default_element_attributes
             {
-              :block         => self.current_block_name,
-              :slug          => @slug,
-              :hint          => @options[:hint],
-              :priority      => @options[:priority] || 0,
-              :fixed         => !!@options[:fixed],
-              :disabled      => false,
-              :from_parent   => false,
-              :_type         => self.document_type.to_s
+              block:         self.current_block_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
 

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

@@ -8,7 +8,7 @@ module Locomotive
 
           def default_element_attributes
             if @nodelist.first.is_a?(String)
-              super.merge(:content => @nodelist.first.try(:to_s), :options => @options[:options])
+              super.merge(content: @nodelist.first.try(:to_s), options: @options[:options])
             else
               super
             end

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

@@ -8,7 +8,7 @@ module Locomotive
 
           def default_element_attributes
             if @nodelist.first.is_a?(String)
-              super.merge(:default_source_url => @nodelist.first.try(:to_s))
+              super.merge(default_source_url: @nodelist.first.try(:to_s))
             else
               super
             end

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

@@ -29,7 +29,7 @@ module Locomotive
           end
 
           def default_element_attributes
-            super.merge(:content_from_default => self.render_default_content(nil))
+            super.merge(content_from_default: self.render_default_content(nil))
           end
 
         end

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

@@ -0,0 +1,28 @@
+module Locomotive
+  module Liquid
+    module Tags
+      class FetchPage < ::Liquid::Tag
+        
+        Syntax = /(#{::Liquid::VariableSignature}+)\s+as\s+(#{::Liquid::VariableSignature}+)/
+        
+        def initialize(tag_name, markup, tokens, context)
+          if markup =~ Syntax
+            @handle = $1
+            @var = $2
+          else
+            raise SyntaxError.new("Syntax Error in 'fetch_page' - Valid syntax: fetch_page page_handle as variable")
+          end
+          
+          super
+        end 
+        
+        def render(context)
+          context.scopes.last[@var] = context.registers[:site].pages.where(handle: @handle).first
+          ''
+        end
+      end
+      
+      ::Liquid::Template.register_tag('fetch_page', FetchPage)
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+module Locomotive
+  module Liquid
+    module Tags
+      class Hybrid < ::Liquid::Block
+        def parse(tokens)
+          nesting = 0
+          tokens.each do |token|
+            next unless token =~ IsTag
+            if token =~ FullToken
+              if nesting == 0 && $1 == block_delimiter
+                @render_as_block = true
+                super
+                return
+              elsif $1 == block_name
+                nesting += 1
+              elsif $1 == block_delimiter
+                nesting -= 1
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -5,7 +5,7 @@ module Locomotive
 
         def end_tag
           super
-          
+
           if !self.contains_super?(@nodelist) # then disable all editable_elements coming from the parent block too and not used
             @context[:page].disable_parent_editable_elements(@name) unless @context[:page].nil?
           end
@@ -17,7 +17,7 @@ module Locomotive
           nodelist.any? do |node|
             if node.is_a?(::Liquid::Variable) && node.name == 'block.super'
               true
-            elsif node.respond_to?(:nodelist) && !node.nodelist.nil? && !node.is_a?(Locomotive::Liquid::Tags::InheritedBlock) 
+            elsif node.respond_to?(:nodelist) && !node.nodelist.nil? && !node.is_a?(Locomotive::Liquid::Tags::InheritedBlock)
               contains_super?(node.nodelist)
             end
           end

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

@@ -15,19 +15,19 @@ module Liquid
             page['lang'] = context['locale']
 
             html = <<-HTML
-              %meta{ :content => true, :name => 'inline-editor' }
+              %meta{ content: true, name: 'inline-editor' }
 
               = stylesheet_link_tag 'aloha/css/aloha.css'
               = javascript_include_tag 'locomotive/aloha', :'data-aloha-plugins' => @plugins
 
-              %script{ :type => 'text/javascript' }
+              %script{ type: 'text/javascript' }
                 :plain
                   Aloha.ready(function() \{
-                    window.parent.application_view.set_page(#{controller.view_context.j page.to_json.html_safe});
+                    window.parent.application_view.set_page(#{controller.view_context.escape_json page.to_json.html_safe});
                   \});
             HTML
 
-            Haml::Engine.new(html.gsub(/\n+/, "\n").gsub(/^\s{14}/, ''), :escape_html => true).render(controller.view_context)
+            Haml::Engine.new(html.gsub(/\n+/, "\n").gsub(/^\s{14}/, ''), escape_html: true).render(controller.view_context)
           else
             ''
           end

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

@@ -0,0 +1,16 @@
+module Locomotive
+  module Liquid
+    module Tags
+      class Javascript < ::Liquid::Block
+        
+        include ActionView::Helpers::JavaScriptHelper
+        include ActionView::Helpers::TagHelper
+        
+        def render(context)
+          javascript_tag super
+        end
+      end
+      ::Liquid::Template.register_tag('javascript', Javascript)
+    end
+  end
+end

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

@@ -0,0 +1,42 @@
+module Locomotive
+  module Liquid
+    module Tags
+      class LinkTo < Hybrid
+        Syntax = /(#{::Liquid::Expression}+)(#{::Liquid::TagAttributes}?)/
+        
+        include ActionView::Helpers::UrlHelper
+        
+        def initialize(tag_name, markup, tokens, context)
+          if markup =~ Syntax
+            @handle = $1
+            @options = {}
+            markup.scan(::Liquid::TagAttributes) do |key, value|
+              @options[key] = value
+            end
+          else
+            raise SyntaxError.new("Syntax Error in 'link_to' - Valid syntax: link_to page_handle, locale es (locale is optional)")
+          end
+          
+          super
+        end
+        
+        def render(context)
+          site = context.registers[:site]
+          if page = site.pages.where(handle: @handle).first
+            path = "/#{site.localized_page_fullpath(page, @options['locale'])}"
+            ::Mongoid::Fields::I18n.with_locale(@options['locale']) do
+              if @render_as_block
+                context.scopes.last['target'] = page
+                link_to super.html_safe, path
+              else
+                link_to page.title, path
+              end
+            end
+          end
+        end
+      end
+
+      ::Liquid::Template.register_tag('link_to', LinkTo)
+    end
+  end
+end

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

@@ -22,7 +22,7 @@ module Locomotive
         Syntax = /(#{::Liquid::Expression}+)?/
 
         def initialize(tag_name, markup, tokens, context)
-          @options = { :label => 'iso', :sep => ' | ' }
+          @options = { label: 'iso', sep: ' | ' }
 
           if markup =~ Syntax
             markup.scan(::Liquid::TagAttributes) { |key, value| @options[key.to_sym] = value.gsub(/"|'/, '') }

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

@@ -19,14 +19,14 @@ module Locomotive
         def initialize(tag_name, markup, tokens, context)
           if markup =~ Syntax
             @source = ($1 || 'page').gsub(/"|'/, '')
-            @options = { :id => 'nav', :depth => 1, :class => '', :active_class => 'on', :bootstrap => false }
+            @options = { id: 'nav', depth: 1, class: '', active_class: 'on', bootstrap: false }
             markup.scan(::Liquid::TagAttributes) { |key, value| @options[key.to_sym] = value.gsub(/"|'/, '') }
 
             @options[:exclude] = Regexp.new(@options[:exclude]) if @options[:exclude]
 
             @options[:add_attributes] = []
             if @options[:snippet]
-              template = @options[:snippet].include?('{') ? @options[:snippet] : context[:site].snippets.where(:slug => @options[:snippet] ).try(:first).try(:template)
+              template = @options[:snippet].include?('{') ? @options[:snippet] : context[:site].snippets.where(slug: @options[:snippet] ).try(:first).try(:template)
               unless template.blank?
                 @options[:liquid_render] = ::Liquid::Template.parse(template)
                 @options[:add_attributes] = ['editable_elements']

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

@@ -43,8 +43,8 @@ module Locomotive
               pagination = Kaminari.paginate_array(collection).page(context['current_page']).per(@per_page).to_liquid.stringify_keys
             else
               pagination = collection.send(:paginate, {
-                :page       => context['current_page'],
-                :per_page   => @per_page
+                page:       context['current_page'],
+                per_page:   @per_page
               }).to_liquid.stringify_keys
             end
             page_count, current_page = pagination['total_pages'], pagination['current_page']

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

@@ -0,0 +1,39 @@
+module Locomotive
+  module Liquid
+    module Tags
+
+      # Assign sets a variable in your session.
+      #
+      #   {% session_assign foo = 'monkey' %}
+      #
+      # You can then use the variable later in the page.
+      #
+      #   {{ session.foo }}
+      #
+      class SessionAssign < ::Liquid::Tag
+        Syntax = /(#{::Liquid::VariableSignature}+)\s*=\s*(#{::Liquid::QuotedFragment}+)/
+
+        def initialize(tag_name, markup, tokens, context)
+          if markup =~ Syntax
+            @to = $1
+            @from = $2
+          else
+            raise ::Liquid::SyntaxError.new("Syntax Error in 'session_assign' - Valid syntax: assign [var] = [source]")
+          end
+
+          super
+        end
+
+        def render(context)
+          controller = context.registers[:controller]
+
+          controller.session[@to.to_sym] = context[@from]
+          ''
+        end
+
+      end
+
+      ::Liquid::Template.register_tag('session_assign', SessionAssign)
+    end
+  end
+end

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

@@ -19,7 +19,7 @@ module Locomotive
           end
 
           if @context[:site].present?
-            snippet = @context[:site].snippets.where(:slug => @slug).first
+            snippet = @context[:site].snippets.where(slug: @slug).first
             self.refresh(snippet) if snippet
           end
         end

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

@@ -20,7 +20,7 @@ module Locomotive
         def initialize(tag_name, markup, tokens, context)
           @attributes = HashWithIndifferentAccess.new
           markup.scan(TagAttributes) do |key, value|
-            key = key_to_h4s_symbol(key)
+            key = prepare_key(key)
             @attributes[key] = value
           end
           super
@@ -41,9 +41,13 @@ module Locomotive
           end
         end
 
-        def key_to_h4s_symbol(key)
+        def prepare_key(key)
           _key, _operator = key.split('.')
 
+          # _slug instead of _permalink
+          _key = '_slug' if _key == '_permalink'
+
+          # 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

data/lib/locomotive/logger.rb

@@ -8,4 +8,4 @@ module Locomotive
     end
 
   end
-end
+end

data/lib/locomotive/middlewares/cache.rb

@@ -24,4 +24,4 @@ module Locomotive
     end
 
   end
-end
+end

data/lib/locomotive/middlewares/fonts.rb

@@ -39,4 +39,4 @@ module Locomotive
       end
     end
   end
-end
+end

data/lib/locomotive/middlewares/inline_editor.rb

@@ -33,4 +33,4 @@ module Locomotive
 
     end
   end
-end
+end

data/lib/locomotive/middlewares/permalink.rb

@@ -19,4 +19,4 @@ module Locomotive
       end
     end
   end
-end
+end

data/lib/locomotive/middlewares/seo_trailing_slash.rb

@@ -42,4 +42,4 @@ module Locomotive
 
     end
   end
-end
+end

data/lib/locomotive/mongoid/patches.rb

@@ -2,6 +2,16 @@
 
 require 'mongoid'
 
+class RawArray < ::Array
+  def resizable?; false; end
+end
+
+# FIXME: we have serialiez templates which have references to the old BSON::ObjectId class.
+module BSON
+  class ObjectId < Moped::BSON::ObjectId; end
+  # class Binary < Moped::BSON::Binary; end
+end
+
 module Mongoid#:nodoc:
 
   module Document #:nodoc:
@@ -12,16 +22,6 @@ module Mongoid#:nodoc:
     end
   end
 
-  module Fields #:nodoc:
-    module Internal #:nodoc:
-      class RawArray < Mongoid::Fields::Internal::Array
-        def resizable?; false; end
-      end
-    end
-
-    class RawArray < ::Array; end
-  end
-
   class Criteria
     def to_liquid
       Locomotive::Liquid::Drops::ProxyCollection.new(self)
@@ -53,20 +53,20 @@ module Mongoid#:nodoc:
       include Localizable
     end
 
-    class UniquenessValidator < ActiveModel::EachValidator
+    # class UniquenessValidator < ActiveModel::EachValidator
 
-      def to_validate_with_localization(document, attribute, value)
-        field = document.fields[attribute.to_s]
-        if field.try(:localized?)
-          # no need of the translations, just the current value
-          value = document.send(attribute.to_sym)
-        end
-        to_validate_without_localization(document, attribute, value)
-      end
+    #   def to_validate_with_localization(document, attribute, value)
+    #     field = document.fields[attribute.to_s]
+    #     if field.try(:localized?)
+    #       # no need of the translations, just the current value
+    #       value = document.send(attribute.to_sym)
+    #     end
+    #     to_validate_without_localization(document, attribute, value)
+    #   end
 
-      alias_method_chain :to_validate, :localization
+    #   alias_method_chain :to_validate, :localization
 
-    end
+    # end
 
     module ClassMethods
       def validates_exclusion_of(*args)