locomotive_cms 2.5.4 → 2.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac131be58bf45b6af0f0ed0671fd79d88ea8fc7d
-  data.tar.gz: 5763ccd2ca60d999473562a462cf74e44ef5baf2
+  metadata.gz: 934e34a25d00b8c0c55c81d20e17346b7a75f105
+  data.tar.gz: dd086d5f1ef9307fd1b6f4deb59c0581840b45c7
 SHA512:
-  metadata.gz: 61a5b8f297196a3f412224f516938a741fc6145b24a92001ec9f781caf5d3897018ec6b07c2aa31cfc3bed6d7c30b94af160717157860ca9c0f0fec90c951baf
-  data.tar.gz: 0c7da809d610b648f04c5dfb7386f687cb80d1a2087558e08553682de8969f2ca91e6b8630240b535494d1b3a8cd0be81663d4e2c5e647167384543295d8f1f6
+  metadata.gz: 3dd291b6d7e877f9187ec006a9d66300b176d7cecba047cf94a842f9d29f72d614f13e67a41006f0a1ac97537eac170134f8d31f468b99a1c2a3ca00b47c1c7a
+  data.tar.gz: 249b2e6f9b65fc55e13ff4aa31e40853d7f163a8c9e846fedeba3619ca456dd81e6610f5858b719fd8f8966f0e558e924772ab985bb5e840056120fe006d7df7

data/app/assets/javascripts/locomotive/views/sites/memberships_view.js.coffee

@@ -4,6 +4,8 @@ class Locomotive.Views.Sites.MembershipsView extends Backbone.View
 
   tagName: 'div'
 
+  id: 'site_memberships'
+
   className: 'list'
 
   _entry_views = []
@@ -13,6 +15,8 @@ class Locomotive.Views.Sites.MembershipsView extends Backbone.View
 
     @enable_ui_effects()
 
+    $(@el).append('<span class="error-anchor"></span>')
+
     return @
 
   change_entry: (membership, value) ->

data/app/controllers/locomotive/api/content_entries_controller.rb

@@ -38,7 +38,7 @@ module Locomotive
       protected
 
       def get_content_type
-        @content_type ||= current_site.content_types.where(slug: params[:slug]).first
+        @content_type ||= current_site.content_types.by_id_or_slug(params[:slug]).first
       end
 
     end

data/app/controllers/locomotive/content_entries_controller.rb

@@ -77,7 +77,7 @@ module Locomotive
     protected
 
     def set_content_type
-      @content_type ||= current_site.content_types.where(slug: params[:slug]).first
+      @content_type ||= current_site.content_types.by_id_or_slug(params[:slug]).first
     end
 
     def authorize_content

data/app/controllers/locomotive/public/sitemaps_controller.rb

@@ -2,6 +2,8 @@ module Locomotive
   module Public
     class SitemapsController < Public::BaseController
 
+      before_filter :set_locale
+
       respond_to :xml
 
       def show
@@ -9,6 +11,13 @@ module Locomotive
         respond_with @pages
       end
 
+      protected
+
+      def set_locale
+        ::Mongoid::Fields::I18n.locale = params[:locale] || current_site.default_locale
+        ::I18n.locale = ::Mongoid::Fields::I18n.locale
+      end
+
     end
   end
 end

data/app/helpers/locomotive/base_helper.rb

@@ -200,5 +200,18 @@ module Locomotive
     end
     alias :l :localize
 
+    # other helpers
+
+    # MongoDB crashes when performing a query on a big collection
+    # where there is a sort without an index on the fields to sort.
+    def empty_collection?(collection)
+      # criteria ?
+      if collection.respond_to?(:without_sorting)
+        collection.without_sorting.empty?
+      else
+        collection.empty?
+      end
+    end
+
   end
 end

data/app/helpers/locomotive/content_types_helper.rb

@@ -61,7 +61,8 @@ module Locomotive
         registers = {
           controller:     self,
           site:           current_site,
-          current_locomotive_account:  current_locomotive_account
+          current_locomotive_account:  current_locomotive_account,
+          asset_host:     Locomotive::Liquid::AssetHost.new(request, current_site, Locomotive.config.asset_host)
         }
 
         preserve(content_type.item_template.render(::Liquid::Context.new({}, assigns, registers)))

data/app/models/locomotive/content_entry.rb

@@ -36,6 +36,19 @@ module Locomotive
     scope :latest_updated, order_by(updated_at: :desc).limit(Locomotive.config.ui[:latest_entries_nb])
     scope :next_or_previous, ->(condition, order_by) { where({ _visible: true }.merge(condition)).limit(1).order_by(order_by) }
 
+    ## indexes ##
+    index site_id: 1
+    index _type: 1
+    index content_type_id: 1
+    Locomotive.config.site_locales.each do |locale|
+      index _type: 1, "_slug.#{locale}" => 1
+      index content_type_id: 1, "_slug.#{locale}" => 1
+    end
+    index content_type_id: 1, created_at: 1
+    index content_type_id: 1, _type: 1, created_at: 1
+    index _type: 1, _position: 1
+    index content_type_id: 1, _position: 1
+
     ## methods ##
 
     alias :visible? :_visible?
@@ -153,7 +166,7 @@ module Locomotive
       if self._slug.present?
         self._slug.permalink!
 
-        self._slug = self.next_unique_slug if self.slug_already_taken?
+        self.find_next_unique_slug if self.slug_already_taken?
       end
 
       # all the site locales share the same slug ONLY IF the entry is not localized.
@@ -174,12 +187,36 @@ module Locomotive
       end
     end
 
-    # Return the next available unique slug as a string
-    def next_unique_slug
-      slug        = self._slug.gsub(/-\d+$/, '')
-      similar_slugs   = self.class.where(:_id.ne => self._id, _slug: /^#{slug}-?\d*$/i)
-      next_number = similar_slugs.map {|s| s._slug.scan(/-(\d+)$/).flatten.last.to_i }.max + 1
-      [slug, next_number].join('-')
+    # Find the next available unique slug as a string
+    # and replace the current _slug.
+    def find_next_unique_slug
+      _index  = 0
+      _base   = self._slug.gsub(/-\d+$/, '')
+
+      if _similar = similar_slug(_base)
+        _index = _similar.scan(/-(\d+)$/).flatten.last.to_i
+      end
+
+      loop do
+        _index += 1
+        self._slug = [_base, _index].join('-')
+        break unless self.slug_already_taken?
+      end
+    end
+
+    def similar_slug(slug)
+      _last = self.class.where(:_id.ne => self._id, _slug: /^#{slug}-?\d*$/i)
+                .only(:_slug)
+                .order_by(:_id.desc)
+                .context
+                .query
+                .first
+
+      if _last
+        _last['_slug'][::Mongoid::Fields::I18n.locale.to_s]
+      else
+        nil
+      end
     end
 
     def slug_already_taken?
@@ -203,9 +240,8 @@ module Locomotive
     end
 
     def add_to_list_bottom
-      unless self.class.empty?
-        self._position = self.class.max(:_position).to_i + 1
-      end
+      max = self.class.indexed_max(:_position)
+      self._position = max + 1 if max
     end
 
     def send_notifications

data/app/models/locomotive/content_type.rb

@@ -40,6 +40,9 @@ module Locomotive
 
     ## named scopes ##
     scope :ordered, order_by(updated_at: :desc)
+    scope :by_id_or_slug, ->(id_or_slug) {
+      any_of({ _id: id_or_slug }, { slug: id_or_slug })
+    }
 
     ## indexes ##
     index site_id: 1, slug: 1

data/app/models/locomotive/extensions/content_entry/csv.rb

@@ -37,7 +37,7 @@ module Locomotive
           when :file
             value.blank? ? '' : value.guess_url(options[:host])
           when :belongs_to
-            value.try(:_label)
+            value.try(:_label) || ''
           when :has_many, :many_to_many
             value.map(&:_label).join(', ')
           when :tags
@@ -68,7 +68,7 @@ module Locomotive
               # header
               csv << labels
               # body
-              all.each do |entry|
+              all.each_by(100) do |entry|
                 csv << entry.to_values(options)
               end
             end

data/app/models/locomotive/theme_asset.rb

@@ -155,7 +155,8 @@ module Locomotive
         sanitized_path = path.gsub(/[("')]/, '').gsub(/^\//, '').gsub(/\?[0-9]+$/, '')
 
         if asset = self.site.theme_assets.where(local_path: sanitized_path).first
-          "#{path.first}#{asset.source.url}#{path.last}"
+          timestamp = self.updated_at.to_i
+          "#{path.first}#{asset.source.url}?#{timestamp}#{path.last}"
         else
           path
         end

data/app/views/locomotive/content_entries/_list.html.haml

@@ -1,4 +1,4 @@
-- if entries.empty?
+- if empty_collection?(entries)
   %p.no-items!= t('.no_items', url: new_content_entry_path(content_type.slug))
 - else
   %ul{ id: 'entries-list', class: "#{content_type.groupable? ? 'grouped' : 'list'} #{'sortable' if content_type.order_manually?}", :'data-url' => sort_content_entries_path(content_type.slug, :json) }

data/app/views/locomotive/public/sitemaps/show.xml.builder

@@ -10,10 +10,12 @@ xml.urlset "xmlns" => "http://www.sitemaps.org/schemas/sitemap/0.9" do
     if not page.index_or_not_found?
       if page.templatized?
         page.fetch_target_entries(_visible: true).each do |c|
-          xml.url do
-            xml.loc public_page_url(page, { content: c })
-            xml.lastmod c.updated_at.to_date.to_s('%Y-%m-%d')
-            xml.priority 0.9
+          if c._slug.present?
+            xml.url do
+              xml.loc public_page_url(page, { content: c })
+              xml.lastmod c.updated_at.to_date.to_s('%Y-%m-%d')
+              xml.priority 0.9
+            end
           end
         end
       else

data/config/locales/admin_ui.es.yml

@@ -60,11 +60,16 @@ es:
         disable_with: "locomotive.disable_with.form_actions"
       footer:
         who_is_behind: "Servicio desarrollado por %{development} y diseñado por <a href=\"http://www.sachagreif.com\">Sacha Greif</a>"
+      form:
+        change_file: cambiar
+        delete_file: eliminar
+        cancel: cancelar
       form_actions:
         back: Volver sin guardar
         create: Crear
         update: Actualizar
         send: Enviar
+        disable_with: Pendiente...
 
     notifications:
       new_content_entry:
@@ -86,6 +91,8 @@ es:
       index:
         is_required: requerido
         default_label: Nombre del campo
+      form:
+        default_label: Nombre del campo
 
     sessions:
       new:

data/features/public/content_entries.feature

@@ -54,7 +54,7 @@ Scenario: Filter by a date
     """
     Lorem ipsum, Yadi Yada
     """
-    
+
 Scenario: Filter with regexp
   Given a page named "my-articles" with the template:
     """

data/lib/generators/locomotive/install/templates/locomotive.rb

@@ -65,6 +65,10 @@ Locomotive.configure do |config|
   #
   # config.theme_assets_checksum = true
 
+  # Enable serving of images, stylesheets, and JavaScripts from an asset server
+  # config.asset_host = 'http://assets.example.com'
+  # config.asset_host = -> (request, site) { ... }
+
   # Rack-cache settings, mainly used for the inline resizing image module. Default options:
   # config.rack_cache = {
   #   verbose:     true,

data/lib/locomotive/configuration.rb

@@ -31,7 +31,8 @@ module Locomotive
       context_assign_extensions:  { },
       models_for_templatization:  [],
       csrf_protection:            false,
-      theme_assets_checksum:      false
+      theme_assets_checksum:      false,
+      asset_host:                 nil
     }
 
     cattr_accessor :settings

data/lib/locomotive/liquid/asset_host.rb

@@ -0,0 +1,51 @@
+module Locomotive
+  module Liquid
+
+    class AssetHost
+
+      IsHTTP = /^https?\/\//o
+
+      attr_reader :request, :site, :host
+
+      def initialize(request, site, host)
+        @request, @site = request, site
+
+        @host = build_host(host, request, site)
+      end
+
+      def compute(source, timestamp = nil)
+        return source if source.nil?
+
+        return add_timestamp_suffix(source, timestamp) if source =~ IsHTTP
+
+        url = self.host ? URI.join(host, source).to_s : source
+
+        add_timestamp_suffix(url, timestamp)
+      end
+
+      private
+
+      def build_host(host, request, site)
+        if host
+          if host.respond_to?(:call)
+            host.call(request, site)
+          else
+            host
+          end
+        else
+          nil
+        end
+      end
+
+      def add_timestamp_suffix(source, timestamp)
+        if timestamp.nil? || timestamp == 0 || source.include?('?')
+          source
+        else
+          "#{source}?#{timestamp}"
+        end
+      end
+
+    end
+
+  end
+end

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

@@ -3,7 +3,13 @@ module Locomotive
     module Drops
       class Uploader < Base
 
-        delegate :url, :size, to: :@_source
+        delegate :size, to: :@_source
+
+        def url
+          url, timestamp = @_source.url, @_source.model.updated_at.to_i
+
+          @context.registers[:asset_host].compute(url, timestamp)
+        end
 
         def filename
           File.basename(@_source.url)

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

@@ -35,11 +35,15 @@ module Locomotive
           path.gsub!(/(\?+.+)$/, '')
           query_string = $1
 
-          url = ThemeAssetUploader.url_for(@context.registers[:site], path)
+          # build the url of the theme asset based on the site and without loading
+          # the whole theme asset from database
+          _url = ThemeAssetUploader.url_for(@context.registers[:site], path)
 
-          if checksum = @context.registers[:theme_assets_checksum][path]
-            query_string = "?#{checksum}" if query_string.blank?
-          end
+          # get a timestamp only the source url does not include a query string
+          timestamp = query_string.blank? ? @context.registers[:theme_assets_checksum][path] : nil
+
+          # prefix by a asset host if given
+          url = @context.registers[:asset_host].compute(_url, timestamp)
 
           query_string ? "#{url}#{query_string}" : url
         end

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

@@ -15,15 +15,19 @@ module Locomotive
           end
 
           def render_element(context, element)
-            if element.source?
-              element.source.url
+            default_timestamp = context.registers[:page].updated_at.to_i
+
+            url, timestamp = (if element.source?
+              [element.source.url, default_timestamp]
             else
               if element.default_source_url.present?
-                element.default_source_url
+                [element.default_source_url, default_timestamp]
               else
-                render_default_content(context)
+                [render_default_content(context), nil]
               end
-            end
+            end)
+
+            context.registers[:asset_host].compute(url, timestamp)
           end
 
           def document_type

data/lib/locomotive/mongoid/patches.rb

@@ -22,9 +22,53 @@ module Mongoid#:nodoc:
   end
 
   class Criteria
+    def without_sorting
+      clone.tap { |crit| crit.options.delete(:sort) }
+    end
+
+    # http://code.dblock.org/paging-and-iterating-over-large-mongo-collections
+    def each_by(by, &block)
+      idx = total = 0
+      set_limit = options[:limit]
+      while ((results = ordered_clone.limit(by).skip(idx)) && results.any?)
+        results.each do |result|
+          return self if set_limit and set_limit >= total
+          total += 1
+          yield result
+        end
+        idx += by
+      end
+      self
+    end
+
+    # Optimized version of the max aggregate method.
+    # It works efficiently only if the field is part of a MongoDB index.
+    # more here: http://stackoverflow.com/questions/4762980/getting-the-highest-value-of-a-column-in-mongodb
+    def indexed_max(field)
+      _criteria = criteria.order_by(field.to_sym.desc).only(field.to_sym)
+      selector  = _criteria.send(:selector_with_type_selection)
+      fields    = _criteria.options[:fields]
+      sort      = _criteria.options[:sort]
+
+      document = collection.find(selector).select(fields).sort(sort).limit(1).first
+      document ? document[field.to_s].to_i : nil
+    end
+
     def to_liquid
       Locomotive::Liquid::Drops::ProxyCollection.new(self)
     end
+
+    private
+
+    def ordered_clone
+      options[:sort] ? clone : clone.asc(:_id)
+    end
+  end
+
+  module Finders
+    def indexed_max(field)
+      with_default_scope.indexed_max(field)
+    end
   end
 
   module Criterion

data/lib/locomotive/render.rb

@@ -222,7 +222,8 @@ module Locomotive
         inline_editor:              self.editing_page?,
         logger:                     Rails.logger,
         current_locomotive_account: current_locomotive_account,
-        theme_assets_checksum:      Locomotive.config.theme_assets_checksum ? current_site.theme_assets.checksums : {}
+        theme_assets_checksum:      Locomotive.config.theme_assets_checksum ? current_site.theme_assets.checksums : {},
+        asset_host:                 Locomotive::Liquid::AssetHost.new(request, current_site, Locomotive.config.asset_host)
       }
     end
 

data/lib/locomotive/version.rb

@@ -1,3 +1,3 @@
 module Locomotive #:nodoc
-  VERSION = '2.5.4'
+  VERSION = '2.5.5'
 end

data/spec/lib/locomotive/liquid/asset_host_spec.rb

@@ -0,0 +1,79 @@
+require 'spec_helper'
+
+describe Locomotive::Liquid::AssetHost do
+
+  let(:request)     { nil }
+  let(:site)        { nil }
+  let(:host)        { nil }
+  let(:timestamp)   { nil }
+  let(:asset_host)  { Locomotive::Liquid::AssetHost.new(request, site, host) }
+  let(:source)      { '/sites/42/assets/1/banner.png' }
+
+  subject { asset_host.compute(source, timestamp) }
+
+  describe 'no host provided' do
+
+    it { should eq '/sites/42/assets/1/banner.png' }
+
+  end
+
+  describe 'with a timestamp' do
+
+    let(:timestamp) { '42' }
+    it { should eq '/sites/42/assets/1/banner.png?42' }
+
+    context 'the source already includes a query string' do
+
+      let(:source) { '/sites/42/assets/1/banner.png?foo' }
+      it { should eq '/sites/42/assets/1/banner.png?foo' }
+
+    end
+
+  end
+
+  describe 'the source is already a full url' do
+
+    let(:source) { 'http://somewhere.net/sites/42/assets/1/banner.png' }
+    it { should eq 'http://somewhere.net/sites/42/assets/1/banner.png' }
+
+    describe 'also with https' do
+
+      let(:source) { 'https://somewhere.net/sites/42/assets/1/banner.png' }
+      it { should eq 'https://somewhere.net/sites/42/assets/1/banner.png' }
+
+    end
+
+  end
+
+  describe 'the host is a string' do
+
+    let(:host) { 'http://assets.locomotivecms.com' }
+    it { should eq 'http://assets.locomotivecms.com/sites/42/assets/1/banner.png' }
+
+  end
+
+  describe 'the host is a block' do
+
+    let(:request)     { stub(ssl: true) }
+    let(:site)        { stub(cdn: true) }
+    let(:host) { ->(request, site) { site.cdn ? "http#{request.ssl ? 's' : ''}://assets.locomotivecms.com" : nil } }
+
+    it { should eq 'https://assets.locomotivecms.com/sites/42/assets/1/banner.png' }
+
+    context 'with a different request var' do
+
+      let(:request) { stub(ssl: false) }
+      it { should eq 'http://assets.locomotivecms.com/sites/42/assets/1/banner.png' }
+
+    end
+
+    context 'with a different site var' do
+
+      let(:site) { stub(cdn: false) }
+      it { should eq '/sites/42/assets/1/banner.png' }
+
+    end
+
+  end
+
+end

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

@@ -2,45 +2,81 @@ require 'spec_helper'
 
 describe Locomotive::Liquid::Drops::ContentEntry do
 
-  before(:each) do
-    @list = mock('list')
-    @list.stubs(:all).returns(true)
-    @category = Locomotive::Liquid::Drops::ContentEntry.new(mock('category', projects: @list))
-  end
+  describe 'with a file' do
+
+    before { Locomotive::Site.any_instance.stubs(:create_default_pages!).returns(true) }
 
-  context '#accessing a has_many relationship' do
+    let(:content_type) { build_content_type }
+    let(:content_entry) { content_type.entries.build(title: 'Locomotive', description: 'Lorem ipsum....', _label_field_name: 'title', created_at: Time.zone.parse('2013-07-05 00:00:00'), file: FixturedAsset.open('5k.png'), updated_at: DateTime.parse('2007-06-29 21:00:00')) }
+    let(:content_entry_drop) { Locomotive::Liquid::Drops::ContentEntry.new(content_entry) }
 
-    it 'loops through the list' do
-      template = %({% for project in category.projects %}{{ project }},{% endfor %})
+    describe 'displaying the timestamp' do
 
-      @list.expects(:ordered).returns(%w(a b))
+      subject { render('{{ article.file.url }}', { 'article' => content_entry_drop }) }
+
+      it { should include '5k.png?1183150800' }
 
-      render(template, { 'category' => @category }).should == 'a,b,'
     end
 
-    it 'filters the list' do
-      template = %({% with_scope order_by: 'name ASC', active: true %}{% for project in category.projects %}{{ project }},{% endfor %}{% endwith_scope %})
+  end
 
-      @list.expects(:filtered).with({ 'active' => true }, ['name', 'ASC']).returns(%w(a b))
+  describe 'a list of entries' do
 
-      render(template, { 'category' => @category }).should == 'a,b,'
+    before(:each) do
+      @list = mock('list')
+      @list.stubs(:all).returns(true)
+      @category = Locomotive::Liquid::Drops::ContentEntry.new(mock('category', projects: @list))
     end
 
-    it 'filters the list and uses the default order' do
-      template = %({% with_scope active: true %}{% for project in category.projects %}{{ project }},{% endfor %}{% endwith_scope %})
+    context '#accessing a has_many relationship' do
+
+      it 'loops through the list' do
+        template = %({% for project in category.projects %}{{ project }},{% endfor %})
+
+        @list.expects(:ordered).returns(%w(a b))
+
+        render(template, { 'category' => @category }).should == 'a,b,'
+      end
+
+      it 'filters the list' do
+        template = %({% with_scope order_by: 'name ASC', active: true %}{% for project in category.projects %}{{ project }},{% endfor %}{% endwith_scope %})
 
-      @list.expects(:filtered).with({ 'active' => true }, nil).returns(%w(a b))
+        @list.expects(:filtered).with({ 'active' => true }, ['name', 'ASC']).returns(%w(a b))
+
+        render(template, { 'category' => @category }).should == 'a,b,'
+      end
+
+      it 'filters the list and uses the default order' do
+        template = %({% with_scope active: true %}{% for project in category.projects %}{{ project }},{% endfor %}{% endwith_scope %})
+
+        @list.expects(:filtered).with({ 'active' => true }, nil).returns(%w(a b))
+
+        render(template, { 'category' => @category }).should == 'a,b,'
+      end
 
-      render(template, { 'category' => @category }).should == 'a,b,'
     end
 
   end
 
   def render(template, assigns = {})
-    liquid_context = ::Liquid::Context.new(assigns, {}, {})
+    liquid_context = ::Liquid::Context.new(assigns, {}, {
+      asset_host: TimestampAssetHost.new
+    })
 
     output = ::Liquid::Template.parse(template).render(liquid_context)
     output.gsub(/\n\s{0,}/, '')
   end
 
+  def build_content_type
+    FactoryGirl.build(:content_type).tap do |content_type|
+      content_type.entries_custom_fields.build label: 'Title', type: 'string'
+      content_type.entries_custom_fields.build label: 'Description', type: 'text'
+      content_type.entries_custom_fields.build label: 'Visible ?', type: 'boolean', name: 'visible'
+      content_type.entries_custom_fields.build label: 'File', type: 'file'
+      content_type.entries_custom_fields.build label: 'Published at', type: 'date'
+      content_type.valid?
+      content_type.send(:set_label_field)
+    end
+  end
+
 end

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

@@ -236,12 +236,14 @@ describe Locomotive::Liquid::Filters::Html do
   end
 
   def build_context
+
     klass = Class.new
     klass.class_eval do
       def registers
         @registers ||= {
           site: FactoryGirl.build(:site, id: fake_bson_id(42)),
-          theme_assets_checksum: {}
+          theme_assets_checksum: {},
+          asset_host: TimestampAssetHost.new
         }
       end
 

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

@@ -0,0 +1,72 @@
+require 'spec_helper'
+
+describe Locomotive::Liquid::Tags::Editable::File do
+
+  before { Locomotive::Site.any_instance.stubs(:create_default_pages!).returns(true) }
+
+  let(:asset_host) { CdnAssetHost.new }
+  let(:page) { Locomotive::Page.new(updated_at: DateTime.parse('2007-06-29 21:00:00')) }
+
+  subject { render("{% editable_file banner %}http://www.placehold.it/500x500{% endeditable_file %}") }
+
+  describe 'no uploaded file' do
+
+    let(:asset_host) { IsoAssetHost.new }
+    before { add_editable_file({}) }
+    it { should eq 'http://www.placehold.it/500x500' }
+
+    context 'a timestamp is not applicable' do
+
+      let(:asset_host) { TimestampAssetHost.new }
+      it { should eq 'http://www.placehold.it/500x500' }
+
+    end
+
+  end
+
+  describe 'with a default source url' do
+
+    before { add_editable_file(default_source_url: '/assets/42/assets/1/foo.png') }
+    it { should eq 'http://cdn.locomotivecms.com/assets/42/assets/1/foo.png' }
+
+    context 'has a timestamp' do
+
+      let(:asset_host) { TimestampAssetHost.new }
+      it { should eq '/assets/42/assets/1/foo.png?1183150800' }
+
+    end
+
+  end
+
+  describe 'with an uploaded file' do
+
+    before { add_editable_file }
+    it { should match /^http:\/\/cdn\.locomotivecms\.com\/spec\/(.*)\/5k.png$/ }
+
+    context 'has a timestamp' do
+
+      let(:asset_host) { TimestampAssetHost.new }
+      it { should match /^\/spec\/(.*)\/5k.png\?1183150800$/ }
+
+    end
+
+  end
+
+  def render(template, assigns = {})
+    liquid_context = ::Liquid::Context.new(assigns, {}, {
+      asset_host: asset_host,
+      page:       page
+    }, true)
+
+    output = ::Liquid::Template.parse(template).render(liquid_context)
+    output.gsub(/\n\s{0,}/, '')
+  end
+
+  def add_editable_file(attributes = nil)
+    attributes ||= { source: FixturedAsset.open('5k.png') }
+
+    editable_file = Locomotive::EditableFile.new({ slug: 'banner' }.merge(attributes))
+    page.editable_elements << editable_file
+  end
+
+end

data/spec/models/locomotive/content_type_spec.rb

@@ -348,6 +348,37 @@ describe Locomotive::ContentType do
 
   end
 
+  describe 'finding by id or slug' do
+
+    let(:content_type) { build_content_type }
+    let(:id_or_slug) { 'unknown' }
+
+    subject { Locomotive::ContentType.by_id_or_slug(id_or_slug).first }
+
+    before { content_type.save }
+
+    describe 'unknown id' do
+
+      it { should eq nil }
+
+    end
+
+    describe 'existing id' do
+
+      let(:id_or_slug) { content_type._id.to_s }
+      its(:name) { should eq 'My project' }
+
+    end
+
+    describe 'existing slug' do
+
+      let(:id_or_slug) { 'my_project' }
+      its(:name) { should eq 'My project' }
+
+    end
+
+  end
+
   def build_content_type(options = {}, &block)
     FactoryGirl.build(:content_type, options).tap do |content_type|
       content_type.entries_custom_fields.build label: 'Name',        type: 'string'

data/spec/models/locomotive/theme_asset_spec.rb

@@ -6,7 +6,7 @@ describe Locomotive::ThemeAsset do
 
   let(:site) { FactoryGirl.build(:site, domains: %w{www.acme.com}) }
 
-  let(:asset) { FactoryGirl.build(:theme_asset, site: site) }
+  let(:asset) { FactoryGirl.build(:theme_asset, site: site, updated_at: DateTime.parse('2007/06/29 21:10:00')) }
 
   describe 'attaching a file' do
 
@@ -145,21 +145,21 @@ describe Locomotive::ThemeAsset do
     context 'simple url' do
 
       let(:text) { "background: url(/images/banner.png) no-repeat 0 0" }
-      it { should == "background: url(http://engine.dev/images/banner.png) no-repeat 0 0" }
+      it { should == "background: url(http://engine.dev/images/banner.png?1183151400) no-repeat 0 0" }
 
     end
 
     context 'url with quotes' do
 
       let(:text) { "background: url(\"/images/banner.png\") no-repeat 0 0" }
-      it { should == "background: url(\"http://engine.dev/images/banner.png\") no-repeat 0 0" }
+      it { should == "background: url(\"http://engine.dev/images/banner.png?1183151400\") no-repeat 0 0" }
 
     end
 
     context 'url with quotes and timestamps' do
 
       let(:text) { "background: url(\"/images/banner.png?123456\") no-repeat 0 0" }
-      it { should == "background: url(\"http://engine.dev/images/banner.png\") no-repeat 0 0" }
+      it { should == "background: url(\"http://engine.dev/images/banner.png?1183151400\") no-repeat 0 0" }
 
     end
 

data/spec/support/asset_host_stubs.rb

@@ -0,0 +1,17 @@
+class IsoAssetHost
+  def compute(source, timestamp = nil)
+    source
+  end
+end
+
+class CdnAssetHost
+  def compute(source, timestamp = nil)
+    "http://cdn.locomotivecms.com#{source}"
+  end
+end
+
+class TimestampAssetHost
+  def compute(source, timestamp = nil)
+    timestamp ? "#{source}?#{timestamp}" : source
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: locomotive_cms
 version: !ruby/object:Gem::Version
-  version: 2.5.4
+  version: 2.5.5
 platform: ruby
 authors:
 - Didier Lafforgue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-19 00:00:00.000000000 Z
+date: 2014-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -545,6 +545,7 @@ files:
 - app/assets/images/locomotive/datepicker/ui-widget-content-top.png
 - app/assets/images/locomotive/form/error-arrow.png
 - app/assets/images/locomotive/form/input-sep.png
+- app/assets/images/locomotive/icons/flags/bf.png
 - app/assets/images/locomotive/icons/flags/bg.png
 - app/assets/images/locomotive/icons/flags/cs.png
 - app/assets/images/locomotive/icons/flags/de.png
@@ -554,6 +555,7 @@ files:
 - app/assets/images/locomotive/icons/flags/fr.png
 - app/assets/images/locomotive/icons/flags/it.png
 - app/assets/images/locomotive/icons/flags/ja.png
+- app/assets/images/locomotive/icons/flags/mg.png
 - app/assets/images/locomotive/icons/flags/nb.png
 - app/assets/images/locomotive/icons/flags/nl.png
 - app/assets/images/locomotive/icons/flags/pl.png
@@ -1172,6 +1174,7 @@ files:
 - lib/locomotive/httparty/webservice.rb
 - lib/locomotive/kaminari.rb
 - lib/locomotive/liquid.rb
+- lib/locomotive/liquid/asset_host.rb
 - lib/locomotive/liquid/drops/base.rb
 - lib/locomotive/liquid/drops/content_entry.rb
 - lib/locomotive/liquid/drops/content_types.rb
@@ -1299,6 +1302,7 @@ files:
 - spec/lib/core_ext_spec.rb
 - spec/lib/locomotive/configuration_spec.rb
 - spec/lib/locomotive/httparty/webservice_spec.rb
+- spec/lib/locomotive/liquid/asset_host_spec.rb
 - spec/lib/locomotive/liquid/drops/content_entry_spec.rb
 - spec/lib/locomotive/liquid/drops/current_user.rb
 - spec/lib/locomotive/liquid/drops/page_spec.rb
@@ -1311,6 +1315,7 @@ files:
 - spec/lib/locomotive/liquid/filters/translate_spec.rb
 - spec/lib/locomotive/liquid/tags/consume_spec.rb
 - spec/lib/locomotive/liquid/tags/csrf_spec.rb
+- spec/lib/locomotive/liquid/tags/editable/file_spec.rb
 - spec/lib/locomotive/liquid/tags/editable/text_spec.rb
 - spec/lib/locomotive/liquid/tags/extends_spec.rb
 - spec/lib/locomotive/liquid/tags/javascript_spec.rb
@@ -1346,6 +1351,7 @@ files:
 - spec/models/locomotive/theme_asset_spec.rb
 - spec/requests/admin_ssl_spec.rb
 - spec/requests/seo_trailing_slash_spec.rb
+- spec/support/asset_host_stubs.rb
 - spec/support/carrierwave.rb
 - spec/support/cells.rb
 - spec/support/controller.rb
@@ -1532,6 +1538,7 @@ test_files:
 - spec/lib/core_ext_spec.rb
 - spec/lib/locomotive/configuration_spec.rb
 - spec/lib/locomotive/httparty/webservice_spec.rb
+- spec/lib/locomotive/liquid/asset_host_spec.rb
 - spec/lib/locomotive/liquid/drops/content_entry_spec.rb
 - spec/lib/locomotive/liquid/drops/current_user.rb
 - spec/lib/locomotive/liquid/drops/page_spec.rb
@@ -1544,6 +1551,7 @@ test_files:
 - spec/lib/locomotive/liquid/filters/translate_spec.rb
 - spec/lib/locomotive/liquid/tags/consume_spec.rb
 - spec/lib/locomotive/liquid/tags/csrf_spec.rb
+- spec/lib/locomotive/liquid/tags/editable/file_spec.rb
 - spec/lib/locomotive/liquid/tags/editable/text_spec.rb
 - spec/lib/locomotive/liquid/tags/extends_spec.rb
 - spec/lib/locomotive/liquid/tags/javascript_spec.rb
@@ -1579,6 +1587,7 @@ test_files:
 - spec/models/locomotive/theme_asset_spec.rb
 - spec/requests/admin_ssl_spec.rb
 - spec/requests/seo_trailing_slash_spec.rb
+- spec/support/asset_host_stubs.rb
 - spec/support/carrierwave.rb
 - spec/support/cells.rb
 - spec/support/controller.rb