locomotive_cms 2.4.1 → 2.5.0.rc1

data/lib/locomotive/middlewares.rb

@@ -1,4 +1,5 @@
+require 'rack/cache'
+
 require 'locomotive/middlewares/seo_trailing_slash'
-require 'locomotive/middlewares/cache'
 require 'locomotive/middlewares/inline_editor'
 require 'locomotive/middlewares/permalink'

data/lib/locomotive/misc/api_documentation.rb

@@ -29,7 +29,7 @@ module Locomotive
       # @return [ Array ] The list of hashes (keys: name, getters, setters)
       #
       def self.embedded_resources
-        %w(editable_element editable_short_text editable_long_text editable_file editable_control content_field).map do |name|
+        %w(editable_element editable_text editable_file editable_control content_field).map do |name|
           klass = "Locomotive::#{name.camelize}Presenter".constantize
           {
             name:     name,
@@ -59,6 +59,8 @@ module Locomotive
             action      = route.defaults[:action].to_sym
             verb        = route.verb.inspect.gsub("\/^", '').gsub("$\/", '')
 
+            next if name == 'documentation'
+
             if resource.nil?
               resource = controller.description
               resource[:name] = name

data/lib/locomotive/render.rb

@@ -209,12 +209,13 @@ module Locomotive
     #
     def locomotive_default_registers
       {
-        controller:     self,
-        site:           current_site,
-        page:           @page,
-        inline_editor:  self.editing_page?,
-        logger:         Rails.logger,
-        current_locomotive_account: current_locomotive_account
+        controller:                 self,
+        site:                       current_site,
+        page:                       @page,
+        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 : {}
       }
     end
 

data/lib/locomotive/version.rb

@@ -1,3 +1,3 @@
 module Locomotive #:nodoc
-  VERSION = '2.4.1'
+  VERSION = '2.5.0.rc1'
 end

data/lib/tasks/development.rake

@@ -29,4 +29,25 @@ namespace :development do
     puts "and a sample.example.com site as well. (add them to your /etc/hosts)"
     puts "You can login with admin@locomotivecms.com and \"locomotive\" password."
   end
+
+  desc "Change the main domain of all the sites"
+  task change_main_domain: :environment do
+    new_domain_name = ENV['DOMAIN_NAME']
+
+    if new_domain_name.blank?
+      puts "You need to set the DOMAIN_NAME ENV variable"
+      exit
+    end
+
+    puts "Changing to *.#{new_domain_name}"
+
+    Locomotive::Site.all.each do |site|
+      puts "...#{site.name} (#{site.subdomain})"
+      site.domains.each do |domain|
+        domain << "#{site.subdomain}.#{new_domain_name}"
+      end
+      site.save!
+    end
+  end
+
 end

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

@@ -1,21 +1,24 @@
 require 'dragonfly'
 
-## initialize Dragonfly ##
+# Configure
+Dragonfly.app.configure do
+  plugin :imagemagick,
+    convert_command:  `which convert`.strip.presence || '/usr/local/bin/convert',
+    identify_command: `which identify`.strip.presence || '/usr/local/bin/identify'
 
-app = Dragonfly[:images]
-app.configure_with(:rails)
-app.configure_with(:imagemagick)
+  protect_from_dos_attacks true
 
-## configure it ##
+  secret 'a7d8613dc92256d0c0a3665a05d8af1b5efa5f66394ffca74da74eb41cc590e4'
 
-Dragonfly[:images].configure do |c|
-  # Convert absolute location needs to be specified
-  # to avoid issues with Phusion Passenger not using $PATH
-  c.convert_command  = `which convert`.strip.presence || "/usr/local/bin/convert"
-  c.identify_command = `which identify`.strip.presence || "/usr/local/bin/identify"
+  url_format '/images/dynamic/:job/:basename.:ext'
 
-  c.allow_fetch_url  = true
-  c.allow_fetch_file = true
+  fetch_file_whitelist /public/
 
-  c.url_format = '/images/dynamic/:job/:basename.:format'
+  fetch_url_whitelist /.+/
 end
+
+# Logger
+Dragonfly.logger = Rails.logger
+
+# Mount as middleware
+Rails.application.middleware.use Dragonfly::Middleware

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

@@ -8,9 +8,8 @@ Locomotive.configure do |config|
   config.multi_sites do |multi_sites|
     # each new website you add will have a default entry based on a subdomain
     # and the multi_site_domain value (ex: website_1.locomotivehosting.com).
-    # multi_sites.domain = 'engine.dev' #'myhostingplatform.com'
-    multi_sites.domain = 'example.com'
-    # multi_sites.domain = 'locomotivehosting.fr'
+    # multi_sites.domain = 'example.com'
+    multi_sites.domain = 'lvh.me'
 
     # define the reserved subdomains
     # Ex:
@@ -34,11 +33,11 @@ Locomotive.configure do |config|
     per_page:           10
   }
 
-  # default locale (for now, only en, de, fr, pl, pt-BR, it, nl, nb, ja, cs and bg are supported)
+  # default locale (for now, only en, de, fr, pl, pt-BR, it, nl, nb, ja, cs, bg and sk are supported)
   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 cs bg}
+  # config.site_locales = %w{en de fr pl pt-BR it nl nb es ru ja cs bg sk}
 
   # tell if logs are enabled. Useful for debug purpose.
   config.enable_logs = true
@@ -71,6 +70,11 @@ Locomotive.configure do |config|
   #
   # config.csrf_protection = true
 
+  # Add the checksum of a theme asset at the end of its path to allow public caching.
+  # By default, it's disabled.
+  #
+  # config.theme_assets_checksum = true
+
   # Rack-cache settings, mainly used for the inline resizing image module. Default options:
   # config.rack_cache = {
   #   verbose:     true,

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

@@ -19,37 +19,43 @@ describe Locomotive::Liquid::Filters::Html do
     ).strip
   end
 
-  it 'should return a url for a stylesheet file' do
+  it 'should return an url for a stylesheet file' do
     result = "/sites/000000000000000000000042/theme/stylesheets/main.css"
     stylesheet_url('main.css').should == result
     stylesheet_url('main').should == result
     stylesheet_url(nil).should == ''
   end
 
-  it 'should return a url for a stylesheet file with folder' do
+  it 'should returns an url with the checksum' do
+    @context.registers.merge!(theme_assets_checksum: { 'stylesheets/main.css' => 42 })
+    result = "/sites/000000000000000000000042/theme/stylesheets/main.css?42"
+    stylesheet_url('main.css').should == result
+  end
+
+  it 'should return an url for a stylesheet file with folder' do
     result = "/sites/000000000000000000000042/theme/stylesheets/trash/main.css"
     stylesheet_url('trash/main.css').should == result
   end
 
-  it 'should return a url for a stylesheet file without touching the url that starts with "/"' do
+  it 'should return an url for a stylesheet file without touching the url that starts with "/"' do
     result = "/trash/main.css"
     stylesheet_url('/trash/main.css').should == result
     stylesheet_url('/trash/main').should == result
   end
 
-  it 'should return a url for a stylesheet file without touching the url that starts with "http:"' do
+  it 'should return an url for a stylesheet file without touching the url that starts with "http:"' do
     result = "http://cdn.example.com/trash/main.css"
     stylesheet_url('http://cdn.example.com/trash/main.css').should == result
     stylesheet_url('http://cdn.example.com/trash/main').should == result
   end
 
-  it 'should return a url for a stylesheet file without touching the url that starts with "https:"' do
+  it 'should return an url for a stylesheet file without touching the url that starts with "https:"' do
     result = "https://cdn.example.com/trash/main.css"
     stylesheet_url('https://cdn.example.com/trash/main.css').should == result
     stylesheet_url('https://cdn.example.com/trash/main').should == result
   end
 
-  it 'should return a url for a stylesheet file with respect to URL-parameters' do
+  it 'should return an url for a stylesheet file with respect to URL-parameters' do
     result = "/sites/000000000000000000000042/theme/stylesheets/main.css?v=42"
     stylesheet_url('main.css?v=42').should == result
   end
@@ -121,38 +127,38 @@ describe Locomotive::Liquid::Filters::Html do
     stylesheet_tag('https://cdn.example.com/trash/main','print').should == result
   end
 
-  it 'should return a url for a javascript file' do
+  it 'should return an url for a javascript file' do
     result = "/sites/000000000000000000000042/theme/javascripts/main.js"
     javascript_url('main.js').should == result
     javascript_url('main').should == result
     javascript_url(nil).should == ''
   end
 
-  it 'should return a url for a javascript file with folder' do
+  it 'should return an url for a javascript file with folder' do
     result = "/sites/000000000000000000000042/theme/javascripts/trash/main.js"
     javascript_url('trash/main.js').should == result
     javascript_url('trash/main').should == result
   end
 
-  it 'should return a url for a javascript file without touching the url that starts with "/"' do
+  it 'should return an url for a javascript file without touching the url that starts with "/"' do
     result = "/trash/main.js"
     javascript_url('/trash/main.js').should == result
     javascript_url('/trash/main').should == result
   end
 
-  it 'should return a url for a javascript file without touching the url that starts with "http:"' do
+  it 'should return an url for a javascript file without touching the url that starts with "http:"' do
     result = "http://cdn.example.com/trash/main.js"
     javascript_url('http://cdn.example.com/trash/main.js').should == result
     javascript_url('http://cdn.example.com/trash/main').should == result
   end
 
-  it 'should return a url for a javascript file without touching the url that starts with "https:"' do
+  it 'should return an url for a javascript file without touching the url that starts with "https:"' do
     result = "https://cdn.example.com/trash/main.js"
     javascript_url('https://cdn.example.com/trash/main.js').should == result
     javascript_url('https://cdn.example.com/trash/main').should == result
   end
 
-  it 'should return a url for a javascript file with respect to URL-parameters' do
+  it 'should return an url for a javascript file with respect to URL-parameters' do
     result = "/sites/000000000000000000000042/theme/javascripts/main.js?v=42"
     javascript_url('main.js?v=42').should == result
   end
@@ -233,7 +239,10 @@ describe Locomotive::Liquid::Filters::Html do
     klass = Class.new
     klass.class_eval do
       def registers
-        { site: FactoryGirl.build(:site, id: fake_bson_id(42)) }
+        @registers ||= {
+          site: FactoryGirl.build(:site, id: fake_bson_id(42)),
+          theme_assets_checksum: {}
+        }
       end
 
       def fake_bson_id(id)

data/spec/models/locomotive/content_asset_spec.rb

@@ -43,4 +43,13 @@ describe Locomotive::ContentAsset do
 
   end
 
+  describe 'attaching a pdf' do
+
+    subject { FactoryGirl.build(:asset, source: FixturedAsset.open('specs.pdf')) }
+
+    its(:pdf?) { should be_true }
+    its(:vignette_url) { should =~ /^\/images\/dynamic\/.*\/specs.png/ }
+
+  end
+
 end

data/spec/models/locomotive/content_entry_spec.rb

@@ -11,6 +11,7 @@ describe Locomotive::ContentEntry do
     @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
@@ -132,7 +133,7 @@ describe Locomotive::ContentEntry do
 
         subject { build_content_entry.to_values(host: 'example.com') }
 
-        its(:size) { should eq(5) }
+        its(:size) { should eq(6) }
 
         its(:first) { should eq('Locomotive') }
 
@@ -161,9 +162,9 @@ describe Locomotive::ContentEntry do
 
       its(:size) { should eq(4) }
 
-      its(:first) { should eq("Title,Description,Visible ?,File,Created at") }
+      its(:first) { should eq("Title,Description,Visible ?,File,Published at,Created at") }
 
-      its(:last) { should match(/^Locomotive,Lorem ipsum....,false,http:\/\/example.com\/sites\/[0-9a-f]+\/content_entry[0-9a-f]+\/[0-9a-f]+\/files\/5k.png,\"July 05, 2013 00:00\"$/) }
+      its(:last) { should match(/^Locomotive,Lorem ipsum....,false,http:\/\/example.com\/sites\/[0-9a-f]+\/content_entry[0-9a-f]+\/[0-9a-f]+\/files\/5k.png,\"\",\"July 05, 2013 00:00\"$/) }
 
     end
 
@@ -172,11 +173,10 @@ describe Locomotive::ContentEntry do
   describe "#navigation" do
 
     before(:each) do
-      @content_type.order_by = '_position'
-      @content_type.save
+      @content_type.update_attribute :order_by, '_position'
 
       %w(first second third).each_with_index do |item, index|
-        content = build_content_entry(title: item.to_s, _position: index, visible: true)
+        content = build_content_entry(title: item.to_s, _position: index, published_at: (index + 1).days.ago, visible: true)
         content.save!
         instance_variable_set "@#{item}", content
       end
@@ -199,6 +199,57 @@ describe Locomotive::ContentEntry do
     it 'should return nil when fetching next item on last in list' do
       @third.next.should == nil
     end
+
+    context "ordered by published at" do
+
+      before do
+        @content_type.update_attributes order_by: 'published_at', order_direction: 'asc'
+
+        @very_first = build_content_entry(title: 'very first', _position: 4, published_at: Time.now, visible: true)
+        @very_first.save!
+      end
+
+      it "should find previous item" do
+        @second.previous.title.should == 'third'
+      end
+
+      it "should find next item" do
+        @first.next.title.should == 'very first'
+      end
+
+      it 'should return nil when fetching previous item on first in list' do
+        @third.previous.should == nil
+      end
+
+      it 'should return nil when fetching next item on last in list' do
+        @very_first.next.should == nil
+      end
+
+      context 'with desc direction' do
+
+        before do
+          @content_type.update_attribute :order_direction, 'desc'
+        end
+
+        it "should find previous item" do
+          @second.previous.title.should == 'first'
+        end
+
+        it "should find next item" do
+          @first.next.title.should == 'second'
+        end
+
+        it 'should return nil when fetching previous item on first in list' do
+          @very_first.previous.should == nil
+        end
+
+        it 'should return nil when fetching next item on last in list' do
+          @third.next.should == nil
+        end
+
+      end
+
+    end
   end
 
   describe '#permalink' do

data/spec/models/locomotive/extensions/content_entry/csv_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+module Locomotive
+  module Extensions
+    module ContentEntry
+      describe Csv do
+        before(:each) do
+          Locomotive::Site.any_instance.stubs(:create_default_pages!).returns(true)
+          @content_type = FactoryGirl.build(: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.valid?
+          @content_type.send(:set_label_field)
+          @content_type.save!
+        end
+
+        it 'should export nil fields as empty strings' do
+          @entry = @content_type.entries.create!({
+            title: 'Locomotive',
+            visible: true
+          })
+
+          values = @entry.to_values
+          expect(values).to eq(['Locomotive', '', true, I18n.l(@entry.created_at, format: :long)])
+        end
+      end
+    end
+  end
+end

data/spec/support/locomotive.rb

@@ -12,7 +12,6 @@
 #   end
 # end
 
-
 def Locomotive.configure_for_test(force = false)
   Locomotive.configure do |config|
     config.multi_sites do |multi_sites|
@@ -24,6 +23,8 @@ def Locomotive.configure_for_test(force = false)
 
     config.csrf_protection = true
 
+    config.theme_assets_checksum = true
+
     config.enable_admin_ssl = false
 
     if force

data/vendor/assets/javascripts/locomotive/ICanHandlebarz.js

@@ -23,7 +23,7 @@ function ICanHandlebarz() {
         self[name] = function (data, title, raw) {
             data = data || {};
             var result = self.templates[name](data);
-            return raw? result: $(result);
+            return raw? result: $(result.trim());
         };
     };
 

data/vendor/assets/javascripts/locomotive/backbone.sync.js

@@ -22,9 +22,22 @@
     var params = _.extend({
       type:         type,
       dataType:     'json',
-      beforeSend: function( xhr ) {
+      beforeSend:   function(xhr, settings) {
         var token = $('meta[name="csrf-token"]').prop('content');
         if (token) xhr.setRequestHeader('X-CSRF-Token', token);
+      },
+      xhr:          function() {
+        var xhr = new window.XMLHttpRequest();
+
+        xhr.upload.addEventListener('progress', function(evt){
+          if (evt.lengthComputable) {
+            if (options.progress) {
+              options.progress(event.loaded, event.total)
+            }
+          }
+         }, false);
+
+        return xhr;
       }
     }, options);