locomotivecms 3.0.0.pre.alpha.3 → 3.0.0.pre.beta.1

data/app/models/locomotive/site.rb

@@ -17,18 +17,13 @@ module Locomotive
 
     ## associations ##
     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
-    has_many    :content_assets,  class_name: 'Locomotive::ContentAsset',   dependent: :destroy, validate: false,
-      autosave: false
-    has_many    :content_types,   class_name: 'Locomotive::ContentType',    dependent: :destroy, validate: false,
-      autosave: false
-    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    :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
+    has_many    :content_assets,  class_name: 'Locomotive::ContentAsset',   dependent: :destroy, validate: false, autosave: false
+    has_many    :content_types,   class_name: 'Locomotive::ContentType',    dependent: :destroy, validate: false, autosave: false
+    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 ##
@@ -57,6 +52,10 @@ module Locomotive
       Locomotive::Page.fetch_page_from_path self, path, logged_in
     end
 
+    def localized_content_types
+      self.content_types.localized
+    end
+
     def accounts
       Account.criteria.in(_id: self.memberships.map(&:account_id))
     end
@@ -88,7 +87,7 @@ module Locomotive
       %w{index 404}.each do |slug|
         page = nil
 
-        self.each_locale do |locale|
+        self.each_locale do |locale, _|
           page ||= self.pages.build(published: true) # first locale = default one
 
           page.attributes = {

data/app/models/locomotive/theme_asset.rb

@@ -115,10 +115,6 @@ module Locomotive
       end
     end
 
-    def to_liquid
-      { url: self.source.url }.merge(self.attributes).stringify_keys
-    end
-
     protected
 
     def safe_source_filename

data/app/models/locomotive/translation.rb

@@ -1,41 +1,56 @@
-class Locomotive::Translation
-
-  include Locomotive::Mongoid::Document
-
-  ## fields ##
-  field :key
-  field :values, type: Hash, default: {}
-
-  ## 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
-
-  ## named scopes ##
-  scope :ordered,       -> { order_by(key: :asc) }
-  scope :by_id_or_key,  ->(id_or_key) { all.or({ _id: id_or_key }, { key: id_or_key }) }
-
-  ## callbacks ##
-  before_validation :underscore_key
-  before_validation :remove_blanks
-
-  ## methods ##
+module Locomotive
+  class Translation
+
+    include Locomotive::Mongoid::Document
+    include Concerns::Shared::Userstamp
+
+    ## fields ##
+    field :key
+    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
+
+    ## named scopes ##
+    scope :ordered,       -> { order_by(key: :asc) }
+    scope :by_id_or_key,  ->(id_or_key) { all.or({ _id: id_or_key }, { key: id_or_key }) }
+
+    ## callbacks ##
+    before_validation :underscore_key
+    before_validation :set_completion
+    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 ##
+
+    protected
+
+    # Make sure the translation key is underscored
+    # since it is the unique way to use it in a liquid template.
+    #
+    def underscore_key
+      if self.key
+        self.key = self.key.permalink(true)
+      end
+    end
 
-  protected
+    def set_completion
+      self.completion = values.count { |_, v| v.present? }
+    end
 
-  # Make sure the translation key is underscored
-  # since it is the unique way to use it in a liquid template.
-  #
-  def underscore_key
-    if self.key
-      self.key = self.key.permalink(true)
+    def remove_blanks
+      self.values.delete_if { |_, v| v.is_a?(String) && v.empty? }
     end
-  end
 
-  def remove_blanks
-    self.values.delete_if { |k,v| v.blank? }
   end
-
 end

data/app/policies/locomotive/content_type_policy.rb

@@ -17,5 +17,9 @@ module Locomotive
       site_admin_or_designer?
     end
 
+    def show?
+      site_admin_or_designer? || !@resource.hidden?
+    end
+
   end
 end

data/app/policies/locomotive/site_policy.rb

@@ -41,6 +41,10 @@ module Locomotive
       super_admin? || site_admin?
     end
 
+    def show_developers_documentation?
+      super_admin? || site_admin?
+    end
+
     def permitted_attributes
       plain = [:name, :handle, :picture, :remove_picture, :seo_title, :meta_keywords, :meta_description, :timezone_name, :robots_txt]
       hash  = { domains: [], locales: [] }

data/app/services/locomotive/concerns/activity_service.rb

@@ -0,0 +1,27 @@
+module Locomotive
+  module Concerns
+    module ActivityService
+
+      def track_activity(key, options = {})
+        return if @activity_disabled
+
+        site = respond_to?(:site) ? self.site : options.delete(:site)
+
+        if options[:actor].blank? && respond_to?(:account)
+          options[:actor] = self.account
+        end
+
+        site.activities.create! options.merge(key: key)
+      end
+
+      def without_tracking_activity(&block)
+        @activity_disabled = true
+        yield.tap do
+          @activity_disabled = false
+        end
+      end
+
+    end
+
+  end
+end

data/app/services/locomotive/content_asset_service.rb

@@ -1,5 +1,7 @@
 module Locomotive
-  class ContentAssetService < Struct.new(:site)
+  class ContentAssetService < Struct.new(:site, :account)
+
+    include Locomotive::Concerns::ActivityService
 
     def list(options = {})
       options[:per_page] ||= Locomotive.config.ui[:per_page]
@@ -13,9 +15,21 @@ module Locomotive
 
     def bulk_create(list)
       list = list.values if list.is_a?(Hash)
-      list.map do |params|
+
+      assets = list.map do |params|
         site.content_assets.create(params)
       end
+
+      valid_assets = assets.map { |a| a.errors.empty? ? { name: a.source_filename, url: a.source.url, image: a.image? } : nil }.compact
+      track_activity 'content_asset.created_bulk', parameters: { assets: valid_assets } unless valid_assets.empty?
+
+      assets
+    end
+
+    def destroy(asset)
+      asset.destroy.tap do
+        track_activity 'content_asset.destroyed', parameters: { name: asset.source_filename }
+      end
     end
 
   end

data/app/services/locomotive/content_entry_service.rb

@@ -1,6 +1,8 @@
 module Locomotive
   class ContentEntryService < Struct.new(:content_type, :account)
 
+    include Locomotive::Concerns::ActivityService
+
     # List all the entries of a content type.
     #
     # If the content type allows the pagination, in other words, if the entries are not
@@ -28,6 +30,8 @@ module Locomotive
     def sort(ids)
       klass = self.content_type.klass_with_custom_fields(:entries)
       klass.sort_entries!(ids, self.content_type.sortable_column)
+
+      track_activity 'content_entry.sorted', parameters: activity_parameters
     end
 
     # Create a content entry from the attributes passed in parameter.
@@ -42,24 +46,33 @@ module Locomotive
 
       content_type.entries.build(attributes).tap do |entry|
         entry.created_by = account if account
-        entry.save
+
+        if entry.save
+          track_activity 'content_entry.created', parameters: activity_parameters(entry)
+        end
       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.
-    # The attributes are filtered through the corresponding presenter.
+    # The attributes are filtered through the Grape::Entity / Form.
+    # A notification email is sent to the selected members of the site.
     #
     # @param [ Hash ] attributes The attributes of new content entry.
     #
     # @return [ Object ] An instance of the content entry.
     #
     def public_create(attributes)
-      raise 'TODO'
-      content_type.entries.build.tap do |entry|
-        entry.from_presenter(attributes)
-        entry.save
+      form = Locomotive::API::Forms::ContentEntryForm.new(self.content_type, attributes)
+
+      without_tracking_activity { create(form.serializable_hash) }.tap do |entry|
+        if entry.errors.empty?
+          # send an email to selected local accounts
+          send_notifications(entry)
+
+          track_activity 'content_entry.created_public', parameters: activity_parameters(entry)
+        end
       end
     end
 
@@ -77,7 +90,38 @@ module Locomotive
       entry.tap do |entry|
         entry.attributes = attributes
         entry.updated_by = account
-        entry.save
+
+        if entry.save
+          track_activity 'content_entry.updated', parameters: activity_parameters(entry)
+        end
+      end
+    end
+
+    def destroy(entry)
+      entry.destroy.tap do
+        track_activity 'content_entry.destroyed', parameters: activity_parameters(entry)
+      end
+    end
+
+    # Make sure the content entries has a non-blank slug in the new locales.
+    # We take the slug in the default locale or the previous default locale (if provided)
+    # in the other locales.
+    #
+    def localize(new_locales, previous_default_locale)
+      default_locale = previous_default_locale || content_type.site.default_locale
+
+      content_type.entries.each_by(50) do |entry|
+        slug = entry._slug_translations[default_locale]
+
+        new_locales.each do |locale|
+          next if locale == default_locale
+
+          ::Mongoid::Fields::I18n.with_locale(locale) do
+            entry._slug ||= slug
+          end
+        end
+
+        entry.save if entry.changed?
       end
     end
 
@@ -88,6 +132,18 @@ module Locomotive
       content_type.entries.destroy_all
     end
 
+    def send_notifications(entry)
+      return unless self.content_type.public_submission_enabled?
+
+      account_ids = (self.content_type.public_submission_accounts || []).map(&:to_s)
+
+      self.content_type.site.accounts.each do |account|
+        next unless account_ids.include?(account._id.to_s)
+
+        Locomotive::Notifications.new_content_entry(account, entry).deliver
+      end
+    end
+
     # Give the list of permitted attributes for a content entry.
     # It includes:
     # - the default ones (_slug, seo, ...etc)
@@ -117,6 +173,10 @@ module Locomotive
       (default + dynamic + [referenced.empty? ? nil : referenced]).compact
     end
 
+    def site
+      self.content_type.site
+    end
+
     protected
 
     def sanitize_attributes!(attributes)
@@ -157,7 +217,7 @@ module Locomotive
     end
 
     def prepare_query_statement(query)
-      regexp  = /.*#{query.split.map { |q| Regexp.escape(q) }.join('.*')}.*/i
+      regexp = /.*#{query.split.map { |q| Regexp.escape(q) }.join('.*')}.*/i
 
       {}.tap do |where|
         if self.content_type.filter_fields.blank?
@@ -172,5 +232,14 @@ module Locomotive
       end
     end
 
+    def activity_parameters(entry = nil)
+      {
+        _id:                entry.try(:_id),
+        label:              entry.try(:_label),
+        content_type:       content_type.name,
+        content_type_slug:  content_type.slug
+      }
+    end
+
   end
 end

data/app/services/locomotive/content_type_service.rb

@@ -3,13 +3,17 @@ module Locomotive
 
     def list
       site.content_types
-        .only(:_id, :name, :slug, :number_of_entries)
-        .order_by(:name.asc).to_a
+        .only(:_id, :name, :slug, :number_of_entries, :display_settings)
+        .order_by(:'display_settings.position'.asc, :name.asc).to_a
     end
 
     def find_by_slug(slug)
       site.content_types.by_id_or_slug(slug)
     end
 
+    def update(content_type, attributes = {})
+      content_type.update_attributes(attributes)
+    end
+
   end
 end

data/app/services/locomotive/editable_element_service.rb

@@ -1,10 +1,11 @@
 module Locomotive
-
   class EditableElementService < Struct.new(:site, :account)
 
+    include Locomotive::Concerns::ActivityService
+
     def update_all(list_of_attributes)
       [].tap do |elements|
-        pages = {}
+        pages, modified_pages = {}, {}
 
         list_of_attributes.each do |attributes|
           page_id = attributes[:page_id]
@@ -12,14 +13,21 @@ module Locomotive
           if page = (pages[page_id] || Locomotive::Page.find(page_id))
             pages[page_id] = page
 
-            if element = page.editable_elements.find(attributes[:id])
+            if element = page.editable_elements.find(attributes[:_id])
               element.attributes = clean_attributes_for(element, attributes)
+
+              modified_pages[page_id] = page if element.changed?
+
               elements << [page, element]
             end
           end
         end
 
         save_all_pages(pages.values)
+
+        track_activity 'editable_element.updated_bulk', parameters: {
+          pages: modified_pages.values.map { |p| { title: p.title, _id: p._id } }
+        } unless modified_pages.empty?
       end
     end
 
@@ -43,5 +51,4 @@ module Locomotive
     end
 
   end
-
 end

data/app/services/locomotive/membership_service.rb

@@ -1,18 +1,30 @@
 module Locomotive
   class MembershipService < Struct.new(:site, :policy)
 
+    include Locomotive::Concerns::ActivityService
+
     # Create a new membership for the site assigned to that service.
     # In case, no account is found from the email passed in parameter,
     # this method will return nil.
     # By default, the author role will be set to the new membership.
     #
-    # @param [ String ] email The email
+    # @param [ Object ] email_or_account The email or the account ifself
     #
     # @return [ Object ] A new membership (with errors or not) or nil (no account found)
     #
-    def create(email)
-      if account = Locomotive::Account.find_by_email(email)
-        site.memberships.create(account: account, email: email)
+    def create(email_or_account)
+      _account = if email_or_account.respond_to?(:email)
+        email_or_account
+      else
+        Locomotive::Account.find_by_email(email_or_account)
+      end
+
+      if _account
+        site.memberships.create(account: _account, email: _account.email).tap do |success|
+          if success
+            track_activity 'membership.created', parameters: { name: _account.name, email: _account.email }
+          end
+        end
       else
         nil
       end
@@ -41,5 +53,9 @@ module Locomotive
       end
     end
 
+    def account
+      policy.account
+    end
+
   end
 end