locomotive_cms 2.1.4 → 2.2.0

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

@@ -0,0 +1,79 @@
+module Locomotive
+  module Liquid
+    module Tags
+      module Editable
+        class Text < Base
+
+          protected
+
+          def render_element(context, element)
+            content = element.default_content? ? render_default_content(context) : element.content
+
+            if self.editable?(context, element)
+              self.render_editable_element(element, content)
+            else
+              content
+            end
+          end
+
+          def render_editable_element(element, content)
+            tag_name  = 'div'
+            css       = 'editable-text'
+
+            unless element.line_break?
+              tag_name  = 'span'
+              css       += ' editable-single-text'
+            end
+
+            %{
+              <#{tag_name} class='#{css}' data-element-id='#{element.id}' data-element-index='#{element._index}'>
+                #{content}
+              </#{tag_name}>
+            }
+          end
+
+          def document_type
+            EditableText
+          end
+
+          def editable?(context, element)
+            context.registers[:inline_editor] &&
+            %(raw html).include?(element.format) &&
+            (!element.fixed? || (element.fixed? && !element.from_parent?))
+          end
+
+          def default_element_attributes
+            super.merge(
+              content_from_default: self.render_default_content(nil),
+              format:               @options[:format] || 'html',
+              rows:                 @options[:rows] || 10,
+              line_break:           @options[:line_break].blank? ? true : @options[:line_break]
+            )
+          end
+
+        end
+
+        ::Liquid::Template.register_tag('editable_text', Text)
+
+        class ShortText < Text
+          def initialize(tag_name, markup, tokens, context)
+            Rails.logger.warn %(The "editable_<short|long>_text" liquid tags are deprecated. Use "editable_text" instead.)
+            super
+          end
+          def default_element_attributes
+            super.merge(format: 'raw', rows: 2, line_break: false)
+          end
+        end
+        ::Liquid::Template.register_tag('editable_short_text', ShortText)
+
+        class LongText < ShortText
+          def default_element_attributes
+            super.merge(format: 'html', rows: 15, line_break: true)
+          end
+        end
+        ::Liquid::Template.register_tag('editable_long_text', LongText)
+
+      end
+    end
+  end
+end

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

@@ -6,7 +6,7 @@ module Liquid
         def render(context)
           if context.registers[:current_locomotive_account] && context.registers[:inline_editor]
 
-            plugins = 'common/ui,common/format,common/table,common/list,common/link,common/highlighteditables,common/block,common/undo,common/contenthandler,common/paste,common/commands,common/abbr,common/align,common/horizontalruler,common/image,custom/locomotive_media'
+            plugins = 'common/ui,common/format,common/table,common/list,common/link,common/highlighteditables,common/block,common/undo,common/contenthandler,common/paste,common/commands,common/abbr,common/align,common/horizontalruler,common/image,custom/locomotive_media,custom/inputcontrol'
 
             controller = context.registers[:controller]
             controller.instance_variable_set(:@plugins, plugins)

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

@@ -2,10 +2,11 @@ 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
@@ -16,24 +17,82 @@ module Locomotive
           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
+          site  = context.registers[:site]
+
+          if page = self.retrieve_page_from_handle(site, context)
+            label = self.label_from_page(page)
+            path  = self.public_page_url(site, page)
+
+            if @render_as_block
+              context.scopes.last['target'] = page
+              label = super.html_safe
+            end
+
+            link_to label, path
+          else
+            '' # no page found
+          end
+        end
+
+        protected
+
+        def retrieve_page_from_handle(site, context)
+          context.scopes.reverse_each do |scope|
+            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)
+            else
+              nil
+            end
+
+            return page unless page.nil?
+          end
+
+          nil
+        end
+
+        def fetch_page(site, handle, templatized = false)
+          ::Mongoid::Fields::I18n.with_locale(@options['locale']) do
+            if templatized
+              criteria = site.pages.where(target_klass_name: handle.class.to_s, templatized: true)
+              criteria = criteria.where(handle: @options['with']) if @options['with']
+              criteria.first.tap do |page|
+                page.content_entry = handle if page
               end
+            else
+              site.pages.where(handle: handle).first
             end
           end
         end
+
+        def label_from_page(page)
+          ::Mongoid::Fields::I18n.with_locale(@options['locale']) do
+            if page.templatized?
+              page.content_entry._label
+            else
+              page.title
+            end
+          end
+        end
+
+        def public_page_url(site, page)
+          fullpath = site.localized_page_fullpath(page, @options['locale'])
+
+          if page.templatized?
+            fullpath.gsub!('content_type_template', page.content_entry._slug)
+          end
+
+          File.join('/', fullpath)
+        end
+
       end
 
       ::Liquid::Template.register_tag('link_to', LinkTo)

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

@@ -14,8 +14,8 @@ module Locomotive
       #
 
       class WithScope < ::Liquid::Block
-
-        TagAttributes = /(\w+|\w+\.\w+)\s*\:\s*(#{::Liquid::QuotedFragment})/
+        SlashedString = /\/[^\/]*\//
+        TagAttributes = /(\w+|\w+\.\w+)\s*\:\s*(#{SlashedString}|#{::Liquid::QuotedFragment})/
 
         def initialize(tag_name, markup, tokens, context)
           @attributes = HashWithIndifferentAccess.new
@@ -37,7 +37,7 @@ module Locomotive
 
         def decode(attributes, context)
           attributes.each_pair do |key, value|
-            attributes[key] = context[value]
+            attributes[key] = value.match(SlashedString) ? Regexp.new(value[1..-2]) : context[value]
           end
         end
 

data/lib/locomotive/middlewares.rb

@@ -1,4 +1,3 @@
-require 'locomotive/middlewares/fonts'
 require 'locomotive/middlewares/seo_trailing_slash'
 require 'locomotive/middlewares/cache'
 require 'locomotive/middlewares/inline_editor'

data/lib/locomotive/mongoid/patches.rb

@@ -9,7 +9,6 @@ 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:
@@ -53,21 +52,6 @@ module Mongoid#:nodoc:
       include Localizable
     end
 
-    # 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
-
-    #   alias_method_chain :to_validate, :localization
-
-    # end
-
     module ClassMethods
       def validates_exclusion_of(*args)
         validates_with(ExclusionValidator, _merge_attributes(args))

data/lib/locomotive/render.rb

@@ -189,7 +189,7 @@ module Locomotive
         'fullpath'          => request.fullpath,
         'url'               => request.url,
         'ip_address'        => request.remote_ip,
-        'now'               => Time.now.utc,
+        '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,

data/lib/locomotive/version.rb

@@ -1,3 +1,3 @@
 module Locomotive #:nodoc
-  VERSION = '2.1.4'
+  VERSION = '2.2.0'
 end

data/lib/tasks/locomotive.rake

@@ -12,15 +12,21 @@ namespace :locomotive do
   desc 'Rebuild the serialized template of all the site pages'
   task rebuild_serialized_page_templates: :environment do
     Locomotive::Site.all.each do |site|
-      pages = site.pages.to_a
-      while !pages.empty? do
-        page = pages.pop
-        begin
-          page.send :_parse_and_serialize_template
-          page.save
-          puts "[#{site.name}] processing...#{page.title}"
-        rescue TypeError => e
-          pages.insert(0, page)
+      default_locale = site.default_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.save
+              puts "[#{site.name}][#{locale}] processing...#{page.title}"
+            rescue TypeError => e
+              pages.insert(0, page)
+            end
+          end
         end
       end
     end

data/mongodb/migrate/20130326201349_rename_entry_to_content_entry.rb

@@ -74,7 +74,7 @@ class RenameEntryToContentEntry < MongoidMigration::Migration
 
   def self.fetch_rows(klass, &block)
     per_page    = 100
-    collection  = klass.collection #.driver
+    collection  = klass.collection
     count       = collection.find.count
     num_pages   = (count.to_f / per_page).floor
 

data/mongodb/migrate/20130621135025_create_editable_texts.rb

@@ -0,0 +1,42 @@
+class CreateEditableTexts < MongoidMigration::Migration
+  def self.up
+    self.pages.each do |page|
+      attributes = {}
+
+      page['editable_elements'].each_with_index do |element, index|
+        next unless element['_type'] =~ /Text$/
+        attributes.merge!(new_attributes_for(element['_type'], index))
+      end
+
+      self.update_page(page['_id'], attributes)
+    end
+  end
+
+  def self.down
+
+  end
+
+  protected
+
+  def self.new_attributes_for(type, index)
+    {
+      "editable_elements.#{index}._type"       => 'Locomotive::EditableText',
+      "editable_elements.#{index}.format"      => type.ends_with?('LongText') ? 'html' : 'raw',
+      "editable_elements.#{index}.rows"        => type.ends_with?('LongText') ? 15 : 2,
+      "editable_elements.#{index}.line_break"  => type.ends_with?('LongText') ? true : false
+    }
+  end
+
+  def self.pages
+    Locomotive::Page.collection.find('editable_elements._type' => {
+      '$in' => ['Locomotive::EditableShortText', 'Locomotive::EditableLongText']
+    })
+  end
+
+  def self.update_page(id, attributes)
+    selector      = { '_id' => id }
+    modifications = { '$set' => attributes }
+    Locomotive::Page.collection.find(selector).update(modifications)
+  end
+
+end

data/mongodb/migrate/20130627101548_localize_slugs_of_content_entries.rb

@@ -0,0 +1,43 @@
+class LocalizeSlugsOfContentEntries < MongoidMigration::Migration
+  def self.up
+    Locomotive::Site.all.each do |site|
+      puts "[#{site.name}] - #{site.default_locale} / #{site.locales}"
+
+      site.content_entries.each do |entry|
+        next if entry.attributes['_slug'].is_a?(Hash) # already translated
+
+        puts "\t#{entry._label} is not translated"
+
+        self.update_entry(site, entry)
+      end
+    end
+  end
+
+  def self.down
+    Locomotive::ContentEntry.all.each do |entry|
+      selector      = { '_id' => entry._id }
+      modifications = entry.attributes['_slug'].values.first
+
+      Locomotive::ContentEntry.collection.find(selector).update({ '$set' => { '_slug' => modifications } })
+    end
+  end
+
+  # 2 cases:
+  # - not translated, set the slug for all the locales of the site
+  # - already translated copy the SAME slug for all the locales of the entry
+  #
+  def self.update_entry(site, entry)
+    selector      = { '_id' => entry._id }
+    modifications = {}
+    slug          = Mongoid::Fields::I18n.with_locale(site.default_locale) { entry._slug }
+
+    locales = entry.localized? ? entry.translated_in : site.locales
+
+    locales.each do |locale|
+      modifications[locale.to_s] = slug
+    end
+
+    Locomotive::ContentEntry.collection.find(selector).update({ '$set' => { '_slug' => modifications } })
+  end
+
+end

data/spec/dummy/config/initializers/locomotive.rb

@@ -38,7 +38,7 @@ Locomotive.configure do |config|
   config.default_locale = :en
 
   # available locales suggested to "localize" a site. You will have to pick up at least one among that list.
-  config.site_locales = %w{en de fr pl pt-BR it nl nb es ru ja}
+  # config.site_locales = %w{en de fr pl pt-BR it nl nb es ru ja}
 
   # tell if logs are enabled. Useful for debug purpose.
   config.enable_logs = true

data/spec/dummy/config/initializers/session_store.rb

@@ -1,6 +1,6 @@
 # Be sure to restart your server when you modify this file.
 
-Dummy::Application.config.session_store :cookie_store, key: '_dummy_session', :domain => :all
+# Dummy::Application.config.session_store :mongoid_store, key: '_dummy_session', :domain => :all
 
 # Use the database for sessions instead of the cookie-based default,
 # which shouldn't be used to store highly confidential information

data/spec/lib/locomotive/liquid/drops/page_spec.rb

@@ -186,7 +186,7 @@ describe Locomotive::Liquid::Drops::Page do
       'home' => @home
     }.merge(assigns)
 
-    Liquid::Template.parse(template).render assigns
+    Liquid::Template.parse(template).render!(assigns)
   end
 
 end

data/spec/lib/locomotive/liquid/filters/misc_spec.rb

@@ -20,6 +20,32 @@ describe Locomotive::Liquid::Filters::Misc do
     default(nil, 42).should == 42
   end
 
+  describe 'random' do
+
+    context 'from an integer' do
+
+      subject { random(4) }
+      it { should be_a_kind_of(Fixnum) }
+      it { should satisfy { |n| n >=0 && n < 4 } }
+
+    end
+
+    context 'from a string' do
+
+      subject { random('4') }
+      it { should be_a_kind_of(Fixnum) }
+      it { should satisfy { |n| n >=0 && n < 4 } }
+
+    end
+
+  end
+
+  it 'returns a random number' do
+    random_number = random(4)
+    random_number.class.should == Fixnum
+
+  end
+
   it 'should return a navigation block for the pagination' do
     pagination = {
       "previous"   => nil,