locomotivecms 3.0.0.rc5 → 3.0.0.rc6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2a2386aa3db8dd77dc0413f8e0c24eb8710f2e1
-  data.tar.gz: 587e0c476cdc25aac793826eead3d5b81e1ae5ee
+  metadata.gz: a5f51bef4ee0791b87690640ed9bac3b70097adf
+  data.tar.gz: 2958657d00470ca1de733eb2bcc838cd86e78e68
 SHA512:
-  metadata.gz: 707774e1c999222c310e6443c70d0613eecd3ad41a059666e66f3f94169772b7785aa30b0e5d04cbebdd889cb59822c984746e755b79d162692138a4a2185f86
-  data.tar.gz: b2023115a565d4b551437631a636cb649e6b875cc73069de060e9e0d2d2f888b73e4750451be768e65c439fbe76e61277ec617e44b527e90dd5dea8a30d68b53
+  metadata.gz: 024727de5fc80100901abf5966edf2964d630edff1bf26162ac94ea30c46d95a4db8a1da23d6a2e6ffa0ad0846ae184ca508eed6d1d44c44316304500f1a8b79
+  data.tar.gz: bebf58fa7965d9528098ae44860dc168870079f1865f68bd3fb13c508919d1af1a2570ff66ddf8a55a56f36136bf8d16e71299a5893916a413d33d8207ed7713

data/Gemfile

@@ -22,7 +22,7 @@ group :development do
   # gem 'custom_fields', github: 'locomotivecms/custom_fields', ref: '279c6744eb6b7dd'
 
   # gem 'locomotivecms_steam', path: '../gems/steam', require: false
-  # gem 'locomotivecms_steam', github: 'locomotivecms/steam', ref: 'b4aa09a', require: false
+  # gem 'locomotivecms_steam', github: 'locomotivecms/steam', ref: '2e147df', require: false
 
   # gem 'locomotive_liquid', path: '../gems/liquid' # for Developers
   # gem 'locomotivecms_solid', path: '../gems/solid' # for Developers
@@ -64,7 +64,7 @@ group :test do
   gem 'factory_girl_rails'
   gem 'pickle'
   gem 'json_spec',            '~> 1.1.4'
-  gem 'database_cleaner',     git: 'https://github.com/DatabaseCleaner/database_cleaner.git'
+  gem 'database_cleaner',     github: 'DatabaseCleaner/database_cleaner'
   gem 'timecop',              '~> 0.7.1'
 
   gem 'email_spec'

data/app/api/locomotive/api/entities/site_entity.rb

@@ -5,7 +5,7 @@ module Locomotive
       class SiteEntity < BaseEntity
 
         expose    :name, :handle, :seo_title, :meta_keywords, :meta_description,
-                  :robots_txt, :cache_enabled
+                  :robots_txt, :cache_enabled, :private_access
 
         expose :locales, :domains
 

data/app/api/locomotive/api/forms/site_form.rb

@@ -4,7 +4,7 @@ module Locomotive
 
       class SiteForm < BaseForm
 
-        attrs :name, :handle, :robots_txt, :locales, :domains, :timezone, :picture, :cache_enabled
+        attrs :name, :handle, :robots_txt, :locales, :domains, :timezone, :picture, :cache_enabled, :private_access, :password
         attrs :seo_title, :meta_keywords, :meta_description, localized: true
 
         # Make sure locales and domains are in arrays.

data/app/api/locomotive/api/resources/content_entry_resource.rb

@@ -62,7 +62,7 @@ module Locomotive
             back_to_default_site_locale
 
             form = form_klass.new(content_type, content_entry_params)
-            @content_entry = service.create(form.serializable_hash)
+            @content_entry = service.create!(form.serializable_hash)
 
             present content_entry, with: entity_klass
           end
@@ -77,10 +77,10 @@ module Locomotive
 
             if @content_entry = content_type.entries.by_id_or_slug(params[:id]).first
               authorize @content_entry, :update?
-              @content_entry = service.update(@content_entry, form.serializable_hash)
+              @content_entry = service.update!(@content_entry, form.serializable_hash)
             else
               authorize ContentEntry, :create?
-              @content_entry = service.create(form.serializable_hash)
+              @content_entry = service.create!(form.serializable_hash)
             end
 
             present @content_entry, with: entity_klass

data/app/api/locomotive/api/resources/current_site_resource.rb

@@ -47,7 +47,7 @@ module Locomotive
             authorize current_site, :update?
 
             current_site_form = Forms::SiteForm.new(permitted_params_from_policy(current_site, :site, [:picture]))
-            service.update(current_site, current_site_form.serializable_hash)
+            service.update!(current_site, current_site_form.serializable_hash)
 
             present current_site, with: entity_klass
           end

data/app/api/locomotive/api/resources/my_account_resource.rb

@@ -39,7 +39,7 @@ module Locomotive
 
             my_account_form = Forms::MyAccountForm.new(permitted_params[:account])
             my_account.assign_attributes(my_account_form.serializable_hash)
-            my_account.save
+            my_account.save!
 
             present my_account, with: entity_klass
           end

data/app/api/locomotive/api/resources/site_resource.rb

@@ -66,6 +66,8 @@ module Locomotive
               optional :timezone
               optional :picture
               optional :cache_enabled
+              optional :private_access
+              optional :password
             end
           end
           post do
@@ -92,6 +94,8 @@ module Locomotive
               optional :timezone
               optional :picture
               optional :cache_enabled
+              optional :private_access
+              optional :password
             end
           end
           put ':id' do

data/app/api/locomotive/api/resources/translation_resource.rb

@@ -73,7 +73,6 @@ module Locomotive
             present translation, with: entity_klass
           end
 
-
           desc "Delete a translation"
           params do
             requires :id, type: String, desc: 'Translation ID or KEY'

data/app/assets/javascripts/locomotive/views/current_site/edit_view.js.coffee

@@ -5,3 +5,11 @@ Locomotive.Views.CurrentSite ||= {}
 class Locomotive.Views.CurrentSite.EditView extends Locomotive.Views.Shared.FormView
 
   el: '.main'
+
+  initialize: ->
+    @attach_events_on_private_access_attribute()
+
+  attach_events_on_private_access_attribute: ->
+    @$('#site_private_access').on 'switchChange.bootstrapSwitch', (event, state) ->
+      $inputs = $('.locomotive_site_password')
+      $inputs.toggleClass('hide')

data/app/assets/javascripts/locomotive/views/inputs/text_view.js.coffee

@@ -17,6 +17,8 @@ class Locomotive.Views.Inputs.TextView extends Backbone.View
       view:     @
       content:  @text_value($(event.target))
 
+    return true
+
   text_value: (textarea) ->
     textarea.val()
 

data/app/controllers/locomotive/base_controller.rb

@@ -1,19 +1,18 @@
 module Locomotive
   class BaseController < ApplicationController
 
-    include Locomotive::ActionController::Ssl
+    include Locomotive::Concerns::SslController
+    include Locomotive::Concerns::RedirectToMainHostController
     include Locomotive::Concerns::UrlHelpersController
-
     include Locomotive::Concerns::AccountController
     include Locomotive::Concerns::ExceptionController
     include Locomotive::Concerns::AuthorizationController
     include Locomotive::Concerns::StoreLocationController
     include Locomotive::Concerns::WithinSiteController
+    include Locomotive::Concerns::WithinSiteController
 
     layout '/locomotive/layouts/application'
 
-    before_filter :require_ssl
-
     helper Locomotive::BaseHelper, Locomotive::ErrorsHelper
 
     self.responder = Locomotive::ActionController::Responder # custom responder

data/app/controllers/locomotive/concerns/redirect_to_main_host_controller.rb

@@ -0,0 +1,28 @@
+module Locomotive
+  module Concerns
+    module RedirectToMainHostController
+
+      extend ActiveSupport::Concern
+
+      included do
+
+        before_filter :redirect_to_main_host
+
+      end
+
+      private
+
+      def redirect_to_main_host
+        return if Locomotive.config.host.blank?
+
+        if request.host != Locomotive.config.host
+          options = { host: Locomotive.config.host }
+          options[:port] = request.port if request.port != 80
+
+          redirect_to options
+        end
+      end
+
+    end
+  end
+end

data/{lib/locomotive/action_controller/ssl.rb → app/controllers/locomotive/concerns/ssl_controller.rb}

@@ -1,6 +1,16 @@
 module Locomotive
-  module ActionController
-    module Ssl
+  module Concerns
+    module SslController
+
+      extend ActiveSupport::Concern
+
+      included do
+
+        before_filter :require_ssl
+
+      end
+
+      private
 
       def require_ssl
         # already a ssl request or ssl disabled ?
@@ -12,4 +22,3 @@ module Locomotive
     end
   end
 end
-

data/app/controllers/locomotive/editable_elements_controller.rb

@@ -45,8 +45,10 @@ module Locomotive
     end
 
     def render_index
-      @editable_elements_by_block = parsing_service.group_and_sort_editable_elements(@editable_elements)
-      @blocks = parsing_service.blocks_from_grouped_editable_elements(@editable_elements_by_block)
+      if @editable_elements
+        @editable_elements_by_block = parsing_service.group_and_sort_editable_elements(@editable_elements)
+        @blocks = parsing_service.blocks_from_grouped_editable_elements(@editable_elements_by_block)
+      end
 
       @content_entry = @page.content_type.entries.find(params[:content_entry_id]) if params[:content_entry_id]
 

data/app/controllers/locomotive/passwords_controller.rb

@@ -1,6 +1,8 @@
 module Locomotive
   class PasswordsController < ::Devise::PasswordsController
 
+    include Locomotive::Concerns::SslController
+    include Locomotive::Concerns::RedirectToMainHostController
     include Locomotive::Concerns::WithinSiteController
 
     within_site_only_if_existing true

data/app/controllers/locomotive/registrations_controller.rb

@@ -1,6 +1,9 @@
 module Locomotive
   class RegistrationsController < ::Devise::RegistrationsController
 
+    include Locomotive::Concerns::SslController
+    include Locomotive::Concerns::RedirectToMainHostController
+
     layout '/locomotive/layouts/account'
 
     before_action :configure_permitted_parameters

data/app/controllers/locomotive/sessions_controller.rb

@@ -1,6 +1,8 @@
 module Locomotive
   class SessionsController < ::Devise::SessionsController
 
+    include Locomotive::Concerns::SslController
+    include Locomotive::Concerns::RedirectToMainHostController
     include Locomotive::Concerns::WithinSiteController
 
     within_site_only_if_existing true # Note: do not validate the membership

data/app/helpers/locomotive/base_helper.rb

@@ -230,13 +230,13 @@ module Locomotive
     def cache_key_for_sidebar_pages
       count          = current_site.pages.count
       max_updated_at = current_site.pages.max(:updated_at).try(:utc).try(:to_s, :number).to_i
-      "#{Locomotive::VERSION}/site/#{current_site._id}/sidebar/pages-#{count}-#{max_updated_at}/locale/#{::Mongoid::Fields::I18n.locale}"
+      "#{Locomotive::VERSION}/site/#{current_site._id}/#{current_site.handle}/sidebar/pages-#{count}-#{max_updated_at}/locale/#{::Mongoid::Fields::I18n.locale}"
     end
 
     def cache_key_for_sidebar_content_types
       count          = current_site.content_types.count
       max_updated_at = current_site.content_entries.max(:updated_at).try(:utc).try(:to_s, :number).to_i
-      "#{Locomotive::VERSION}/site/#{current_site._id}/sidebar/content_types-#{count}-#{max_updated_at}"
+      "#{Locomotive::VERSION}/site/#{current_site._id}/#{current_site.handle}/sidebar/content_types-#{count}-#{max_updated_at}"
     end
 
   end

data/app/models/locomotive/concerns/asset/vignette.rb

@@ -16,12 +16,8 @@ module Locomotive
         end
 
         def alternative_vignette_url
-          format = if self.image?
-            if self.width > self.height
-              '190x120>'
-            else
-              '190x120>'
-            end
+          format = if self.image? && self.width && self.height
+            '190x120>'
           elsif self.pdf?
             '190x120#'
           end

data/app/models/locomotive/concerns/site/private_access.rb

@@ -0,0 +1,19 @@
+module Locomotive
+  module Concerns
+    module Site
+      module PrivateAccess
+
+        extend ActiveSupport::Concern
+
+        included do
+
+          ## fields ##
+          field :private_access, type: Boolean, default: false
+          field :password
+
+        end
+
+      end
+    end
+  end
+end

data/app/models/locomotive/content_type.rb

@@ -31,8 +31,7 @@ module Locomotive
     field :display_settings,            type: Hash
 
     ## associations ##
-    # belongs_to  :site,      class_name: 'Locomotive::Site', validate: false
-    has_many    :entries,   class_name: 'Locomotive::ContentEntry', dependent: :destroy
+    has_many :entries,   class_name: 'Locomotive::ContentEntry', dependent: :destroy
 
     ## named scopes ##
     scope :ordered, -> { order_by(updated_at: :desc) }

data/app/models/locomotive/site.rb

@@ -10,6 +10,7 @@ module Locomotive
     include Concerns::Site::Timezone
     include Concerns::Site::Cache
     include Concerns::Site::UrlRedirections
+    include Concerns::Site::PrivateAccess
 
     ## fields ##
     field :name

data/app/policies/locomotive/site_policy.rb

@@ -46,7 +46,7 @@ module Locomotive
     end
 
     def permitted_attributes
-      plain = [:name, :handle, :picture, :remove_picture, :seo_title, :meta_keywords, :meta_description, :timezone_name, :robots_txt, :cache_enabled, :redirect_to_first_domain]
+      plain = [:name, :handle, :picture, :remove_picture, :seo_title, :meta_keywords, :meta_description, :timezone_name, :robots_txt, :cache_enabled, :redirect_to_first_domain, :private_access, :password]
       hash  = { domains: [], locales: [], url_redirections: [] }
 
       unless update_advanced?
@@ -56,7 +56,7 @@ module Locomotive
       end
 
       unless point?
-        plain -= [:handle, :redirect_to_first_domain]
+        plain -= [:handle, :redirect_to_first_domain, :private_access, :password]
         hash.delete(:domains)
       end
 

data/app/services/locomotive/content_entry_service.rb

@@ -55,6 +55,14 @@ module Locomotive
       end
     end
 
+    def create!(attributes)
+      if (entry = create(attributes)).errors.empty?
+        entry
+      else
+        entry.fail_due_to_validation!
+      end
+    end
+
     # Create a content entry from the attributes passed in parameter.
     # It does not set the created_by column since it's called
     # from the public side of the site with no logged in account.
@@ -99,6 +107,16 @@ module Locomotive
       end
     end
 
+    def update!(entry, attributes)
+      update(entry, attributes)
+
+      if entry.errors.empty?
+        entry
+      else
+        entry.fail_due_to_validation!
+      end
+    end
+
     def destroy(entry)
       entry.destroy.tap do
         track_activity 'content_entry.destroyed', parameters: activity_parameters(entry)

data/app/services/locomotive/page_parsing_service.rb

@@ -18,6 +18,9 @@ module Locomotive
           end
         end
       end
+    rescue Exception => e
+      Rails.logger.error "[PageParsing] " + e.message + "\n\t" + e.backtrace.join("\n\t")
+      nil
     end
 
     # Each element of the elements parameter is a couple: Page, EditableElement

data/app/services/locomotive/site_service.rb

@@ -45,19 +45,23 @@ module Locomotive
       create(attributes, true)
     end
 
-    def update(site, attributes)
+    def update(site, attributes, raise_if_not_valid = false)
       site.attributes = attributes
 
       new_locales = site.locales_changed? ? site.locales - site.locales_was : nil
       previous_default_locale = site.default_locale_was
 
-      site.save.tap do |success|
+      (raise_if_not_valid ? site.save! : site.save).tap do |success|
         if success
           localize_pages_and_content_entries(site, new_locales, previous_default_locale)
         end
       end
     end
 
+    def update!(site, attributes)
+      update(site, attributes, true)
+    end
+
     private
 
     def localize_pages_and_content_entries(site, new_locales, previous_default_locale)

data/app/views/locomotive/content_entries/index.html.slim

@@ -15,7 +15,6 @@
     |  
     = t('.new')
 
-
 - if @content_type.filter_fields.present?
   .row
     .col-md-6

data/app/views/locomotive/current_site/form/_access_points.html.slim

@@ -6,5 +6,9 @@
 
     = f.input :redirect_to_first_domain, as: :toggle
 
+  = f.inputs :private_access do
+    = f.input :private_access, as: :toggle
+    = f.input :password, as: :string, wrapper_html: { class: "#{'hide' unless f.object.private_access?}" }
+
   = f.actions do
     = f.action

data/app/views/locomotive/developers_documentation/_wagon.html.slim

@@ -39,4 +39,4 @@ h3 Deploy your modifications
 
 pre
   code.bash
-    | bundle exec wagon push production
+    | bundle exec wagon deploy production

data/app/views/locomotive/devise_mailer/reset_password_instructions.html.slim

@@ -1,7 +1,8 @@
 p
   == t('locomotive.devise_mailer.common.hello')
+  |  
   = @resource.email
-  | \!
+  |  !
 p
   == t('.reset_password_instruction')
 p

data/app/views/locomotive/editable_elements/_edit.html.slim

@@ -22,11 +22,17 @@
         .text-right
           - if current_site.localized?
             = locale_picker_link
-          - unless @editable_elements.empty?
+          - unless @editable_elements.blank?
             |  
             = f.action
 
-      - if @editable_elements.empty?
+      - if @editable_elements.nil?
+        .col-sm-12.col-xs-12
+            br
+            .alert.alert-warning.text-center role="alert"
+              == t('.parsing_error')
+
+      - elsif @editable_elements.empty?
         - if @content_entry.nil?
           .col-sm-12.col-xs-12
             br
@@ -42,7 +48,7 @@
               span.form-wrapper
                 = select_tag 'block', options_for_page_blocks(@blocks)
 
-  .scrollable class="#{'no-editable-elements' if @editable_elements.empty?}"
+  .scrollable class="#{'no-editable-elements' if @editable_elements.blank?}"
     .container-fluid
       .row
         .col-md-12
@@ -56,4 +62,4 @@
                 span.form_wrapper
                   = link_to t(:edit, scope: 'locomotive.editable_elements.form.model.buttons'), edit_content_entry_path(current_site, @content_entry.content_type.slug, @content_entry, _location: request.fullpath), class: 'btn btn-primary btn-sm'
 
-          = render 'form', f: f
+          = render 'form', f: f unless @editable_elements.blank?

data/app/views/locomotive/pages/form/_actions.html.slim

@@ -2,7 +2,7 @@
   .row
     .col-sm-6.text-left
       - if policy(@page).destroy?
-        = link_to t(:delete, scope: 'simple_form.buttons.locomotive.site'), page_path(current_site, @page), data: { confirm:  I18n.t('locomotive.messages.confirm') }, class:'btn btn-sm btn-danger', method: :delete
+        = link_to t(:delete, scope: 'simple_form.buttons.locomotive.page'), page_path(current_site, @page), data: { confirm:  I18n.t('locomotive.messages.confirm') }, class:'btn btn-sm btn-danger', method: :delete
 
     .col-sm-6.text-right
       = f.actions_with_back_button back_url: @page.default_response_type? ? editable_elements_path(current_site, @page) : nil, use_stored_location: @page.templatized?

data/app/views/locomotive/pages/form/_main.html.slim

@@ -23,7 +23,7 @@
 
     = f.input :listed, as: :toggle
 
-  - if current_site.cache_enabled?
+  - if current_site.cache_enabled? && !@page.redirect?
     = f.input :cache_enabled, as: :toggle
 
 = render 'locomotive/pages/form/actions', f: f

data/app/views/locomotive/pages/show.html.slim

@@ -1,2 +1,2 @@
 .embed-responsive.embed-page
-  iframe.embed-responsive-item src=preview_path(current_site) + '/' + current_site.localized_page_fullpath(@page)
+  iframe.embed-responsive-item src=preview_url(current_site) + '/' + current_site.localized_page_fullpath(@page)

data/config/locales/en.yml

@@ -214,6 +214,7 @@ en:
       edit:
         settings_link: 'Settings'
         no_editable_elements: 'No editable elements found'
+        parsing_error: "<b>We are sorry but we couldn't parse the template of your page.</b><br/>Please make sure your template first works with Wagon."
         blocks:
           all: All
           unknown: Unknown

data/config/locales/simple_form.en.yml

@@ -48,6 +48,8 @@ en:
           locales: Languages
           timezone_name: Timezone
           cache_enabled: Cache
+          private_access: "Enable password-protection"
+          password: "Site-Wide Password"
           new:
             locales: First language
         membership:
@@ -70,7 +72,6 @@ en:
           head: "Head row?"
           class_name: "CSS class"
 
-
     hints:
       locomotive:
         account:
@@ -99,6 +100,8 @@ en:
           cache_enabled: "When enabled, your pages will be cached as long as the content doesn't change. Disabling cache per page is allowed."
           redirect_to_first_domain: "When enabled, requests made to any domains listed above will be redirected to the first domain."
           url_redirections: "Redirect (301) legacy urls to pages you created in the back-office. The origin and the destination URLs are separated by a <u>space</u>."
+          private_access: You can hide your site behind a password.
+          password: The password public visitors will have to enter to see the content of your site.
           new:
             locales: "You can add other languages once your site will be created."
         translation:
@@ -155,5 +158,7 @@ en:
           loading_text: Resizing...
           submit: Resize
         site:
-          delete: Destroy this site
+          delete: Delete this site
+        page:
+          delete: Delete
 

data/lib/locomotive/action_controller.rb

@@ -1,3 +1,2 @@
 require 'locomotive/action_controller/responder'
-require 'locomotive/action_controller/ssl'
 

data/lib/locomotive/engine.rb

@@ -70,6 +70,7 @@ module Locomotive
       app.config.i18n.available_locales = Locomotive.config.locales
     end
 
+
     initializer 'steam' do |app|
       require 'locomotive/steam_adaptor'
     end

data/lib/locomotive/middlewares/site.rb

@@ -75,6 +75,8 @@ module Locomotive
 
         request.env['steam.live_editing']     = true
 
+        request.env['steam.private_access_disabled'] = request.env['warden'].try(:user).present?
+
         Locomotive::Site.where(handle: handle).first
       end
 

data/lib/locomotive/steam/middlewares/cache.rb

@@ -46,7 +46,8 @@ module Locomotive
           CACHEABLE_REQUEST_METHODS.include?(env['REQUEST_METHOD']) &&
           !env['steam.live_editing'] &&
           env['steam.site'].try(:cache_enabled) &&
-          env['steam.page'].try(:cache_enabled)
+          env['steam.page'].try(:cache_enabled) &&
+          env['steam.page'].try(:redirect_url).blank?
         end
 
         def cache_key(env)

data/lib/locomotive/version.rb

@@ -2,5 +2,5 @@
 # MAJOR.MINOR.PATCH format.
 # 1.0.0-alpha < 1.0.0-alpha.1 < 1.0.0-alpha.beta < 1.0.0-beta < 1.0.0-beta.2 < 1.0.0-beta.11 < 1.0.0-rc.1 < 1.0.0
 module Locomotive #:nodoc
-  VERSION = '3.0.0.rc5'
+  VERSION = '3.0.0.rc6'
 end

data/spec/requests/locomotive/steam/cache_spec.rb

@@ -5,7 +5,7 @@ describe Locomotive::Steam::Middlewares::Cache do
   let(:site_cache)  { false }
   let(:page_cache)  { false }
   let(:site)        { instance_double('CacheSite', _id: '0001', cache_enabled: site_cache, last_modified_at: DateTime.parse('2007/06/29 00:00:00')) }
-  let(:page)        { instance_double('CachedPage', _id: '0042', cache_enabled: page_cache) }
+  let(:page)        { instance_double('CachedPage', _id: '0042', cache_enabled: page_cache, redirect_url: nil) }
   let(:app)         { ->(env) { [200, env, 'app'] } }
   let(:middleware)  { described_class.new(app) }
   let(:steam_env)   { { 'REQUEST_METHOD' => 'GET', 'steam.site' => site, 'steam.page' => page, 'steam.live_editing' => false, 'PATH_INFO' => 'foo', 'QUERY_STRING' => 'a=1&c=3' } }
@@ -39,7 +39,7 @@ describe Locomotive::Steam::Middlewares::Cache do
 
     subject { middleware.send(:cache_key, steam_env) }
 
-    it { expect(subject).to eq '2dbc65c2496339c339fe4977f8301d57' }
+    it { expect(subject).to eq 'baf811bda8ae9dbeab661855d023de69' }
 
   end
 
@@ -72,6 +72,13 @@ describe Locomotive::Steam::Middlewares::Cache do
 
           end
 
+          context 'page is a redirection' do
+
+            let(:page) { instance_double('CachedPage', _id: '0042', cache_enabled: page_cache, redirect_url: 'http://locomotive.works') }
+            it { expect(subject).to eq false }
+
+          end
+
         end
 
       end

data/spec/support/database_cleaner.rb

@@ -0,0 +1,23 @@
+require 'database_cleaner'
+
+# https://github.com/DatabaseCleaner/database_cleaner/issues/409
+# https://docs.mongodb.org/v3.0/reference/command/listCollections/#dbcmd.listCollections
+module DatabaseCleaner
+  module Mongoid
+    class Truncation
+
+      private
+
+      def collections
+        if db != :default
+          database.use(db)
+        end
+
+        database.collections.collect { |c| c.namespace.split('.', 2)[1] }
+      end
+
+    end
+  end
+end
+
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc5
+  version: 3.0.0.rc6
 platform: ruby
 authors:
 - Didier Lafforgue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-04 00:00:00.000000000 Z
+date: 2015-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -150,20 +150,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 6.0.0
-- !ruby/object:Gem::Dependency
-  name: mime-types
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.5'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: custom_fields
   requirement: !ruby/object:Gem::Requirement
@@ -184,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc7
+        version: 1.0.0.rc9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc7
+        version: 1.0.0.rc9
 - !ruby/object:Gem::Dependency
   name: slim
   requirement: !ruby/object:Gem::Requirement
@@ -500,6 +486,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: mimetype-fu
   requirement: !ruby/object:Gem::Requirement
@@ -804,7 +804,9 @@ files:
 - app/controllers/locomotive/concerns/exception_controller.rb
 - app/controllers/locomotive/concerns/locale_helpers_controller.rb
 - app/controllers/locomotive/concerns/membership_controller.rb
+- app/controllers/locomotive/concerns/redirect_to_main_host_controller.rb
 - app/controllers/locomotive/concerns/site_dispatcher_controller.rb
+- app/controllers/locomotive/concerns/ssl_controller.rb
 - app/controllers/locomotive/concerns/store_location_controller.rb
 - app/controllers/locomotive/concerns/timezone_controller.rb
 - app/controllers/locomotive/concerns/token_authentication_controller.rb
@@ -893,6 +895,7 @@ files:
 - app/models/locomotive/concerns/site/access_points.rb
 - app/models/locomotive/concerns/site/cache.rb
 - app/models/locomotive/concerns/site/locales.rb
+- app/models/locomotive/concerns/site/private_access.rb
 - app/models/locomotive/concerns/site/timezone.rb
 - app/models/locomotive/concerns/site/url_redirections.rb
 - app/models/locomotive/concerns/theme_asset/plain_text.rb
@@ -1181,7 +1184,6 @@ files:
 - lib/locomotive.rb
 - lib/locomotive/action_controller.rb
 - lib/locomotive/action_controller/responder.rb
-- lib/locomotive/action_controller/ssl.rb
 - lib/locomotive/carrierwave.rb
 - lib/locomotive/carrierwave/asset.rb
 - lib/locomotive/carrierwave/base.rb
@@ -1302,12 +1304,12 @@ files:
 - spec/models/locomotive/snippet_spec.rb
 - spec/models/locomotive/theme_asset_spec.rb
 - spec/models/locomotive/translation_spec.rb
-- spec/requests/admin_ssl_spec.rb
 - spec/requests/locomotive/steam/cache_spec.rb
 - spec/requests/locomotive/steam/wysihtml_css_spec.rb
 - spec/requests/site_spec.rb
 - spec/support/capybara.rb
 - spec/support/carrierwave.rb
+- spec/support/database_cleaner.rb
 - spec/support/entity.rb
 - spec/support/factories.rb
 - spec/support/features/session_helpers.rb
@@ -1526,7 +1528,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A platform to create, publish and edit sites
@@ -1572,12 +1574,12 @@ test_files:
 - spec/models/locomotive/snippet_spec.rb
 - spec/models/locomotive/theme_asset_spec.rb
 - spec/models/locomotive/translation_spec.rb
-- spec/requests/admin_ssl_spec.rb
 - spec/requests/locomotive/steam/cache_spec.rb
 - spec/requests/locomotive/steam/wysihtml_css_spec.rb
 - spec/requests/site_spec.rb
 - spec/support/capybara.rb
 - spec/support/carrierwave.rb
+- spec/support/database_cleaner.rb
 - spec/support/entity.rb
 - spec/support/factories.rb
 - spec/support/features/session_helpers.rb

data/spec/requests/admin_ssl_spec.rb

@@ -1,51 +0,0 @@
-require 'spec_helper'
-
-describe 'Enable SSL admin' do
-
-  before :each do
-    FactoryGirl.create('existing site')
-    FactoryGirl.create(:account)
-    host!('models.example.com')
-    Locomotive.config.enable_admin_ssl = true
-  end
-
-  it 'should redirect to SSL on admin when enabled' do
-    get '/locomotive/pages'
-    expect(response.status).to eq(302)
-    expect(response.location).to match(/https/)
-  end
-
-  context 'admin ssl disabled' do
-
-    before do
-      Locomotive.config.enable_admin_ssl = false
-    end
-
-    it 'should not redirect to SSL on admin when disabled' do
-      get '/locomotive/pages'
-      expect(response.status).to eq(302)
-      expect(response.location).to match(/http/)
-    end
-
-  end
-
-  context 'request for the non main domain' do
-
-    before do
-
-      host!('myexample.com')
-    end
-
-    it 'should not redirect to SSL' do
-      get '/locomotive/pages'
-      expect(response.status).to eq(302)
-      expect(response.location).to match(/http/)
-    end
-
-  end
-
-  after(:all) do
-    Locomotive.config.enable_admin_ssl = false
-  end
-
-end