locomotivecms 3.0.0.pre.beta.1 → 3.0.0.rc1

data/app/models/locomotive/content_type.rb

@@ -5,6 +5,7 @@ module Locomotive
 
     ## extensions ##
     include ::CustomFields::Source
+    include Concerns::Shared::SiteScope
     include Concerns::ContentType::Label
     include Concerns::ContentType::DefaultValues
     include Concerns::ContentType::EntryTemplate
@@ -22,14 +23,14 @@ module Locomotive
     field :group_by_field_id,           type: BSON::ObjectId
     field :order_by # either a BSON::ObjectId (field id) or a String (:_position, ...etc)
     field :order_direction,             default: 'asc'
-    field :public_submission_enabled,   type: Boolean, default: false
-    field :public_submission_accounts,  type: Array
+    field :public_submission_enabled,   type: Boolean,  default: false
+    field :public_submission_accounts,  type: Array,    default: []
     field :filter_fields,               type: Array
     field :number_of_entries
     field :display_settings,            type: Hash
 
     ## associations ##
-    belongs_to  :site,      class_name: 'Locomotive::Site', validate: false
+    # belongs_to  :site,      class_name: 'Locomotive::Site', validate: false
     has_many    :entries,   class_name: 'Locomotive::ContentEntry', dependent: :destroy
 
     ## named scopes ##
@@ -40,7 +41,7 @@ module Locomotive
     scope :localized, -> { elem_match(entries_custom_fields: { localized: true }) }
 
     ## indexes ##
-    index site_id: 1, slug: 1
+    # index site_id: 1, slug: 1
 
     ## callbacks ##
     before_validation   :normalize_slug
@@ -49,7 +50,8 @@ module Locomotive
     after_validation    :bubble_fields_errors_up
 
     ## validations ##
-    validates_presence_of   :site, :name, :slug
+    # validates_presence_of   :site, :name, :slug
+    validates_presence_of   :name, :slug
     validates_uniqueness_of :slug, scope: :site_id
     validates_size_of       :entries_custom_fields, minimum: 1, message: :too_few_custom_fields
 
@@ -78,7 +80,7 @@ module Locomotive
       _entries = self.entries.order_by([_order_by_definition]).where(options[:where] || {})
 
       # pagination or full list
-      !self.order_manually? && page ? _entries.page(page).per(per_page) : _entries
+      page ? _entries.page(page).per(per_page) : _entries
     end
 
     # Find a custom field describing an entry based on its id
@@ -104,6 +106,10 @@ module Locomotive
       (self.display_settings || {})['hidden']
     end
 
+    def touch_site_attribute
+      :content_version
+    end
+
     protected
 
     def normalize_slug

data/app/models/locomotive/page.rb

@@ -6,15 +6,16 @@ module Locomotive
     MINIMAL_ATTRIBUTES = %w(_id title slug fullpath position depth published templatized target_klass_name redirect listed response_type parent_id parent_ids site_id created_at updated_at raw_template is_layout)
 
     ## concerns ##
+    include Concerns::Shared::SiteScope
+    include Concerns::Shared::Userstamp
+    include Concerns::Shared::Slug
+    include Concerns::Shared::Seo
     include Concerns::Page::Tree
     include Concerns::Page::EditableElements
     include Concerns::Page::Layout
     include Concerns::Page::Templatized
     include Concerns::Page::Redirect
     include Concerns::Page::Listed
-    include Concerns::Shared::Slug
-    include Concerns::Shared::Seo
-    include Concerns::Shared::Userstamp
 
     ## fields ##
     field :title,               localize: true
@@ -24,17 +25,14 @@ module Locomotive
     field :raw_template,        localize: true
     field :locales,             type: Array
     field :published,           type: Boolean, default: false
-    field :cache_strategy,      default: 'none'
+    field :cache_enabled,       type: Boolean, default: true
     field :response_type,       default: 'text/html'
 
-    ## associations ##
-    belongs_to :site, class_name: 'Locomotive::Site', validate: false, autosave: false
-
     ## indexes ##
-    index site_id: 1
-    index site_id: 1, handle: 1
     index parent_id: 1
+    index site_id: 1, handle: 1
     index site_id: 1, fullpath: 1
+    index site_id: 1, updated_at: 1
 
     ## behaviours ##
     slugify_from        :title
@@ -48,7 +46,7 @@ module Locomotive
     after_save          :update_children, unless: :skip_callbacks_on_update
 
     ## validations ##
-    validates_presence_of     :site,    :title, :slug
+    validates_presence_of     :title, :slug
     validates_uniqueness_of   :slug,    scope: [:site_id, :parent_id], allow_blank: true
     validates_uniqueness_of   :handle,  scope: :site_id, allow_blank: true
     validates_exclusion_of    :slug,    in: Locomotive.config.reserved_slugs, if: Proc.new { |p| p.depth <= 1 }
@@ -86,10 +84,6 @@ module Locomotive
       self.index? || self.not_found?
     end
 
-    def with_cache?
-      self.cache_strategy != 'none'
-    end
-
     def default_response_type?
       self.response_type == 'text/html'
     end
@@ -108,6 +102,10 @@ module Locomotive
       self.updating_descendants = false
     end
 
+    def touch_site_attribute
+      self.raw_template_changed? ? :template_version : :content_version
+    end
+
     protected
 
     def do_not_remove_index_and_404_pages

data/app/models/locomotive/site.rb

@@ -8,6 +8,7 @@ module Locomotive
     include Concerns::Site::AccessPoints
     include Concerns::Site::Locales
     include Concerns::Site::Timezone
+    include Concerns::Site::Cache
 
     ## fields ##
     field :name
@@ -16,6 +17,8 @@ module Locomotive
     mount_uploader :picture, PictureUploader, validate_integrity: true
 
     ## associations ##
+    belongs_to  :created_by,      class_name: 'Locomotive::Account'
+    embeds_many :memberships,     class_name: 'Locomotive::Membership'
     has_many    :pages,           class_name: 'Locomotive::Page',           validate: false, autosave: false
     has_many    :snippets,        class_name: 'Locomotive::Snippet',        dependent: :destroy, validate: false, autosave: false
     has_many    :theme_assets,    class_name: 'Locomotive::ThemeAsset',     dependent: :destroy, validate: false, autosave: false
@@ -24,7 +27,6 @@ module Locomotive
     has_many    :content_entries, class_name: 'Locomotive::ContentEntry',   dependent: :destroy, validate: false, autosave: false
     has_many    :translations,    class_name: 'Locomotive::Translation',    dependent: :destroy, validate: false, autosave: false
     has_many    :activities,      class_name: 'Locomotive::Activity',       dependent: :destroy, validate: false, autosave: false
-    embeds_many :memberships,     class_name: 'Locomotive::Membership'
 
     ## validations ##
     validates_presence_of :name
@@ -72,9 +74,13 @@ module Locomotive
       self.memberships.detect { |m| m.admin? && m.account_id == account._id }
     end
 
-    def to_liquid
+    def to_steam
       repository = Locomotive::Steam::Services.build_instance.repositories.site
-      repository.build(self.attributes).to_liquid
+      repository.build(self.attributes.dup)
+    end
+
+    def to_liquid
+      to_steam.to_liquid
     end
 
     protected

data/app/models/locomotive/snippet.rb

@@ -2,6 +2,7 @@ module Locomotive
   class Snippet
 
     include Locomotive::Mongoid::Document
+    include Concerns::Shared::SiteScope
     include Concerns::Shared::Slug
 
     ## fields ##
@@ -9,11 +10,8 @@ module Locomotive
     field :slug
     field :template, localize: true
 
-    ## associations ##
-    belongs_to :site, class_name: 'Locomotive::Site', validate: false, autosave: false
-
     ## validations ##
-    validates_presence_of   :site, :name, :slug, :template
+    validates_presence_of   :name, :slug, :template
     validates_uniqueness_of :slug, scope: :site_id
 
     ## named scopes ##
@@ -24,5 +22,9 @@ module Locomotive
 
     ## methods ##
 
+    def touch_site_attribute
+      :template_version
+    end
+
   end
 end

data/app/models/locomotive/theme_asset.rb

@@ -4,8 +4,10 @@ module Locomotive
     include Locomotive::Mongoid::Document
 
     ## extensions ##
+    include Concerns::Shared::SiteScope
     include Concerns::Asset::Types
     include Concerns::Asset::Checksum
+    include Concerns::ThemeAsset::PlainText
 
     ## fields ##
     field :local_path
@@ -17,34 +19,27 @@ module Locomotive
 
     mount_uploader :source, ThemeAssetUploader, mount_on: :source_filename, validate_integrity: true
 
-    ## associations ##
-    belongs_to :site, class_name: 'Locomotive::Site', validate: false, autosave: false
-
-    ## indexes ##
-    index site_id:  1
-    index site_id:  1, local_path: 1
+    # indexes
+    index site_id: 1, local_path: 1
 
     ## callbacks ##
     before_validation :check_for_folder_changes
-    before_validation :store_plain_text
     before_validation :sanitize_folder
     before_validation :build_local_path
 
     ## validations ##
-    validates_presence_of   :site
     validates_presence_of   :source, on: :create
-    validates_presence_of   :plain_text_name, if: Proc.new { |a| a.performing_plain_text? }
     validates_uniqueness_of :local_path, scope: :site_id
     validate                :content_type_can_not_change
 
     ## named scopes ##
 
-    ## accessors ##
-    attr_accessor   :plain_text_name, :plain_text, :plain_text_type, :performing_plain_text
-    # attr_accessible :folder, :source, :plain_text_type, :performing_plain_text, :plain_text_name, :plain_text
-
     ## methods ##
 
+    def touch_site_attribute
+      :template_version
+    end
+
     def stylesheet_or_javascript?
       self.stylesheet? || self.javascript?
     end
@@ -58,50 +53,6 @@ module Locomotive
       end
     end
 
-    def plain_text_name
-      if not @plain_text_name_changed
-        @plain_text_name ||= self.safe_source_filename
-      end
-      @plain_text_name.gsub(/(\.[a-z0-9A-Z]+)$/, '') rescue nil
-    end
-
-    def plain_text_name=(name)
-      @plain_text_name_changed = true
-      @plain_text_name = name
-    end
-
-    def plain_text
-      # only for ruby >= 1.9.x. Forget about ruby 1.8
-      @plain_text ||= (self.source.read.force_encoding('UTF-8') rescue nil)
-    end
-
-    def plain_text_type
-      @plain_text_type || (stylesheet_or_javascript? ? self.content_type : nil)
-    end
-
-    def performing_plain_text?
-      Boolean.set(self.performing_plain_text) || false
-    end
-
-    def store_plain_text
-      return if self.persisted? && !self.stylesheet_or_javascript?
-
-      self.content_type ||= @plain_text_type if self.performing_plain_text?
-
-      data = self.performing_plain_text? ? self.plain_text : self.source.read
-
-      return if !self.stylesheet_or_javascript? || self.plain_text_name.blank? || data.blank?
-
-      sanitized_source = self.escape_shortcut_urls(data)
-
-      self.source = ::CarrierWave::SanitizedFile.new({
-        tempfile: StringIO.new(sanitized_source),
-        filename: "#{self.plain_text_name}.#{self.stylesheet? ? 'css' : 'js'}"
-      })
-
-      @plain_text = sanitized_source # no need to reset the plain_text instance variable to have the last version
-    end
-
     def self.all_grouped_by_folder(site)
       assets = site.theme_assets.order_by(:slug.asc)
       assets.group_by { |a| a.folder.split('/').first.to_sym }
@@ -141,22 +92,6 @@ module Locomotive
       end
     end
 
-    def escape_shortcut_urls(text)
-      return if text.blank?
-
-      text.gsub(/[("'](\/(stylesheets|javascripts|images|media|fonts|pdfs|others)\/(([^;.]+)\/)*([a-zA-Z_\-0-9]+)\.[a-z]{2,4})(\?[0-9]+)?[)"']/) do |path|
-
-        sanitized_path = path.gsub(/[("')]/, '').gsub(/^\//, '').gsub(/\?[0-9]+$/, '')
-
-        if asset = self.site.theme_assets.where(local_path: sanitized_path).first
-          timestamp = self.updated_at.to_i
-          "#{path.first}#{asset.source.url}?#{timestamp}#{path.last}"
-        else
-          path
-        end
-      end
-    end
-
     def check_for_folder_changes
       # https://github.com/jnicklas/carrierwave/issues/330
       # https://github.com/jnicklas/carrierwave-mongoid/issues/23

data/app/models/locomotive/translation.rb

@@ -2,6 +2,7 @@ module Locomotive
   class Translation
 
     include Locomotive::Mongoid::Document
+    include Concerns::Shared::SiteScope
     include Concerns::Shared::Userstamp
 
     ## fields ##
@@ -9,12 +10,9 @@ module Locomotive
     field :values,      type: Hash,     default: {}
     field :completion,  type: Integer,  default: 0
 
-    ## associations ##
-    belongs_to :site, class_name: 'Locomotive::Site', validate: false, autosave: false
-
     ## validations ##
     validates_uniqueness_of :key, scope: :site_id
-    validates_presence_of   :site, :key
+    validates_presence_of   :key
 
     ## named scopes ##
     scope :ordered,       -> { order_by(key: :asc) }
@@ -26,13 +24,16 @@ module Locomotive
     before_validation :remove_blanks
 
     ## indexes ##
-    index site_id: 1
     index site_id: 1, key: 1
     index site_id: 1, completion: 1
     index site_id: 1, key: 1, completion: 1
 
     ## methods ##
 
+    def touch_site_attribute
+      :content_version
+    end
+
     protected
 
     # Make sure the translation key is underscored

data/app/policies/locomotive/site_policy.rb

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

data/app/services/locomotive/content_entry_service.rb

@@ -13,6 +13,8 @@ module Locomotive
     #
     # For a more powerful search, you can use the "where" key which accepts a JSON string or a Hash.
     #
+    # The no_pagination option is used to skip the pagination of the content entries
+    #
     # @param [ Hash ] options The options for the pagination and the filtering
     #
     # @return [ Object ] a paginated list of content entries
@@ -191,13 +193,12 @@ module Locomotive
     end
 
     def prepare_options_for_all(options)
-      where = prepare_where_statement(options)
+      { where: prepare_where_statement(options) }.tap do |_options|
+        unless options[:no_pagination]
+          _options[:page]     = options[:page] || 1
+          _options[:per_page] = options[:per_page] || Locomotive.config.ui[:per_page]
+        end
 
-      {
-        page:           options[:page] || 1,
-        per_page:       options[:per_page] || Locomotive.config.ui[:per_page],
-        where:          where
-      }.tap do |_options|
         _options[:order_by] = options[:order_by] if options[:order_by]
       end
     end

data/app/services/locomotive/site_service.rb

@@ -30,6 +30,7 @@ module Locomotive
       end
 
       Site.new(attributes).tap do |site|
+        site.created_by = account
         site.memberships.build account: account, role: 'admin'
 
         success = raise_if_not_valid ? site.save! : site.save

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

@@ -18,5 +18,6 @@
 
     .buttons
       = link_to t(:edit, scope: 'locomotive.shared.form.array_input'), edit_content_entry_path(current_site, slug, item, _location: false), class: 'choose btn btn-primary btn-sm'
+      |  
       = link_to '#', class: 'delete' do
         i.fa.fa-trash-o

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

@@ -12,7 +12,7 @@
   = hidden_field_tag :active_tab, ''
   = hidden_field_tag :_location,  params[:_location]
 
-  = f.action 'hide'
+  = f.action class: 'hide'
 
   = render 'locomotive/content_entries/form/tabs', f: f
 

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

@@ -7,7 +7,7 @@
   = hidden_field_tag :active_tab, ''
   = hidden_field_tag :_location,  params[:_location]
 
-  = f.action 'hide'
+  = f.action class: 'hide'
 
   = render 'locomotive/content_entries/form/tabs', f: f