camaleon_cms 0.2.1 → 1.0

data/app/controllers/admin/users_controller.rb

@@ -9,7 +9,6 @@
 class Admin::UsersController < AdminController
   before_action :validate_role, except: [:profile, :profile_edit]
   before_action :set_user, only: ['show','edit','update','destroy']
-  #http_basic_authenticate_with name: "dhh", password: "secret", except: [:index, :show]
 
   def index
     @users = current_site.users.paginate(:page => params[:page], :per_page => current_site.admin_per_page)
@@ -104,17 +103,17 @@ class Admin::UsersController < AdminController
   end
 
   private
+
   def validate_role
     authorize! :manager, :users
   end
-  def set_user
-      begin
-        @user = current_site.users.find(params[:id])
-      rescue
-        flash[:error] = t('admin.users.message.error')
-        redirect_to admin_path
-      end
 
+  def set_user
+    begin
+      @user = current_site.users.find(params[:id])
+    rescue
+      flash[:error] = t('admin.users.message.error')
+      redirect_to admin_path
+    end
   end
-
 end

data/app/controllers/admin_controller.rb

@@ -19,15 +19,15 @@ class AdminController < CamaleonController
   before_action :admin_logged_actions
   before_action :admin_before_hooks
   after_action :admin_after_hooks
+  # layout Proc.new { |controller| request.headers["X-XHR-Referer"] ? "admin/_ajax" : 'admin' }
 
-  # render admin dashabord
+  # render admin dashboard
   def index
-
   end
 
   # render admin dashboard
   def dashboard
-     render "admin/dashboard/index"
+    render "admin/dashboard/index"
   end
 
   private
@@ -53,5 +53,4 @@ class AdminController < CamaleonController
   def admin_logged_actions
     admin_menus_add_commons unless request.xhr?
   end
-
-end
+end

data/app/controllers/apps/plugins_admin_controller.rb

@@ -10,11 +10,11 @@ class Apps::PluginsAdminController < AdminController
   before_action :init_plugin
 
   private
+
   def init_plugin
     plugin_name = params[:controller].split("/")[1]
     @plugin = current_site.plugins.where(slug: plugin_name).first
     return render_error(404) unless @plugin.active?
-    lookup_context.prefixes.prepend(params[:controller].sub("plugins/#{plugin_name}", "#{plugin_name}/views"))
+    lookup_context.prefixes.prepend(params[:controller].sub("plugins/#{plugin_name}", "#{plugin_name}/views")) if !@plugin.settings["gem_mode"].present?
   end
-
-end
+end

data/app/controllers/apps/plugins_front_controller.rb

@@ -10,11 +10,11 @@ class Apps::PluginsFrontController < FrontendController
   before_action :init_plugin
 
   private
+
   def init_plugin
     plugin_name = params[:controller].split("/")[1]
     @plugin = current_site.plugins.where(slug: plugin_name).first
     return render_error(404) unless @plugin.active?
     lookup_context.prefixes.prepend(params[:controller].sub("plugins/#{plugin_name}", "#{plugin_name}/views"))
   end
-
-end
+end

data/app/controllers/apps/themes_admin_controller.rb

@@ -10,11 +10,11 @@ class Apps::ThemesAdminController < AdminController
   before_action :init_theme
 
   private
+
   def init_theme
     theme_name = params[:controller].split("/")[1]
     @theme = current_theme
     return render_error(404) unless current_theme.slug == theme_name
     lookup_context.prefixes.prepend(params[:controller].sub("themes/#{theme_name}", "#{theme_name}/views"))
   end
-
-end
+end

data/app/controllers/apps/themes_front_controller.rb

@@ -10,11 +10,11 @@ class Apps::ThemesFrontController < FrontendController
   before_action :init_theme
 
   private
+
   def init_theme
     theme_name = params[:controller].split("/")[1]
     @theme = current_theme
     return render_error(404) unless current_theme.slug == theme_name
     lookup_context.prefixes.prepend(params[:controller].sub("themes/#{theme_name}", "#{theme_name}/views"))
   end
-
-end
+end

data/app/controllers/camaleon_controller.rb

@@ -106,5 +106,4 @@ class CamaleonController < ApplicationController
       end
     end
   end
-
 end

data/app/controllers/concerns/frontend_concern.rb

@@ -58,5 +58,4 @@ module FrontendConcern extend ActiveSupport::Concern
       redirect_to :back
     end
   end
-
-end
+end

data/app/controllers/frontend_controller.rb

@@ -41,7 +41,12 @@ class FrontendController < CamaleonController
     init_seo(@category)
     @children = @category.children.no_empty.decorate
     @posts = @category.the_posts.paginate(:page => params[:page], :per_page => current_site.front_per_page).eager_load(:metas)
-    r = {category: @category, layout: (self.send :_layout), render: "category"}; hooks_run("on_render_category", r)
+    if lookup_context.template_exists?(@category.the_slug, "categories")
+      r_file = "categories/#{@category.the_slug}"
+    else
+      r_file = "category"
+    end
+    r = {category: @category, layout: (self.send :_layout), render: r_file}; hooks_run("on_render_category", r)
     render r[:render], layout: r[:layout]
   end
 
@@ -56,7 +61,12 @@ class FrontendController < CamaleonController
     @posts = @post_type.the_posts.paginate(:page => params[:page], :per_page => current_site.front_per_page).eager_load(:metas)
     @categories = @post_type.categories.no_empty.eager_load(:metas).decorate
     @post_tags = @post_type.post_tags.eager_load(:metas)
-    r = {post_type: @post_type, layout: (self.send :_layout), render: "post_type"};  hooks_run("on_render_post_type", r)
+    if lookup_context.template_exists?(@post_type.the_slug, "post_types")
+      r_file = "post_types/#{@post_type.the_slug}"
+    else
+      r_file = "post_type"
+    end
+    r = {post_type: @post_type, layout: (self.send :_layout), render: r_file};  hooks_run("on_render_post_type", r)
     render r[:render], layout: r[:layout]
   end
 
@@ -70,7 +80,12 @@ class FrontendController < CamaleonController
     end
     init_seo(@post_tag)
     @posts = @post_tag.the_posts.paginate(:page => params[:page], :per_page => current_site.front_per_page).eager_load(:metas)
-    r = {post_tag: @post_tag, layout: (self.send :_layout), render: "post_tag"}; hooks_run("on_render_post_tag", r)
+    if lookup_context.template_exists?(@post_tag.the_slug, "post_tags")
+      r_file = "post_tags/#{@post_tag.the_slug}"
+    else
+      r_file = "post_tag"
+    end
+    r = {post_tag: @post_tag, layout: (self.send :_layout), render: r_file}; hooks_run("on_render_post_tag", r)
     render r[:render], layout: r[:layout]
   end
 
@@ -148,6 +163,7 @@ class FrontendController < CamaleonController
       @post_type = @post.the_post_type
       @comments = @post.the_comments
       @categories = @post.the_categories
+      @post.increment_visits!
       home_page = @_site_options[:home_page] rescue nil
       r_file = ""
       if lookup_context.template_exists?("page_#{@post.id}")
@@ -158,13 +174,14 @@ class FrontendController < CamaleonController
         r_file = "index"
       elsif lookup_context.template_exists?("#{@post_type.slug}")
         r_file = "#{@post_type.slug}"
-      elsif lookup_context.template_exists?("single")
-        r_file = "single"
       else
-        r_file = "post"
+        r_file = "single"
       end
 
-      r = {post: @post, post_type: @post_type, layout: (self.send :_layout), render: r_file}
+      layout_ = self.send :_layout
+      meta_layout = @post.get_meta("layout")
+      layout_ = meta_layout if meta_layout.present? && lookup_context.template_exists?("layouts/#{meta_layout}")
+      r = {post: @post, post_type: @post_type, layout: layout_, render: r_file}
       hooks_run("on_render_post", r) if from_url
       render r[:render], layout: r[:layout]
     end
@@ -228,5 +245,4 @@ class FrontendController < CamaleonController
       options
     end
   end
-
-end
+end

data/app/decorators/category_decorator.rb

@@ -57,5 +57,4 @@ class CategoryDecorator < TermTaxonomyDecorator
   def the_post_type
     object.post_type.decorate
   end
-
 end

data/app/decorators/custom_field_decorator.rb

@@ -27,5 +27,4 @@ class CustomFieldDecorator < Draper::Decorator
   def cache_prefix(key = "")
     "#{h.current_site.cache_prefix}/cfield#{object.id}#{"/#{key}" if key.present?}"
   end
-
 end

data/app/decorators/custom_fields_concern.rb

@@ -16,8 +16,14 @@ module CustomFieldsConcern
 
   # return custom field content with key field_key
   # translated and short codes evaluated like the content
-  def the_field(field_key)
-    h.do_shortcode(object.get_field_value(field_key).to_s.translate(@_deco_locale), object)
+  # default_val: default value returned when this field was not registered
+  def the_field(field_key, default_val = '')
+    h.do_shortcode(object.get_field(field_key, default_val).to_s.translate(@_deco_locale), object)
+  end
+
+  # the same as the_field(..), but this return default value if there is not present
+  def the_field!(field_key, default_val = '')
+    h.do_shortcode(object.get_field!(field_key, default_val).to_s.translate(@_deco_locale), object)
   end
 
   # return custom field contents with key field_key
@@ -25,7 +31,7 @@ module CustomFieldsConcern
   # this is for multiple values
   def the_fields(field_key)
     r = []
-    object.get_field_values(field_key).each do |text|
+    object.get_fields(field_key).each do |text|
       r << h.do_shortcode(text.to_s.translate(@_deco_locale), object)
     end
     r

data/app/decorators/post_comment_decorator.rb

@@ -22,5 +22,4 @@ class PostCommentDecorator < Draper::Decorator
   def the_content
     object.content
   end
-
 end

data/app/decorators/post_decorator.rb

@@ -20,7 +20,8 @@ class PostDecorator < ApplicationDecorator
   # return the excerpt of this post
   def the_excerpt(qty_chars = 200)
     excerpt = object.meta[:summary].to_s.translate(get_locale)
-    r = {content: (excerpt.present? ? excerpt : object.content.to_s.translate(get_locale).strip_tags.gsub(/&#13;|\n/, " ").truncate(qty_chars)), post: object}
+    # r = {content: (excerpt.present? ? excerpt : object.content_filtered.to_s.translate(get_locale).strip_tags.gsub(/&#13;|\n/, " ").truncate(qty_chars)), post: object}
+    r = {content: (excerpt.present? ? excerpt : h.cama_strip_shortcodes(object.content_filtered.to_s.translate(get_locale).strip_tags.gsub(/&#13;|\n/, " ").truncate(qty_chars))), post: object}
     h.hooks_run("post_the_excerpt", r)
     r[:content]
   end
@@ -76,8 +77,9 @@ class PostDecorator < ApplicationDecorator
   # return html link
   # attrs: Hash of link tag attributes, sample: {id: "myid", class: "sss" }
   def the_edit_link(title = nil, attrs = { })
+    return '' unless h.current_user.present?
     attrs = {target: "_blank", style: "font-size:11px !important;cursor:pointer;"}.merge(attrs)
-    h.link_to("&rarr; #{title || h.ct("edit")}", the_edit_url, *attrs)
+    h.link_to("&rarr; #{title || h.ct("edit")}".html_safe, the_edit_url, attrs)
   end
 
   # show thumbnail image as html
@@ -115,6 +117,11 @@ class PostDecorator < ApplicationDecorator
     "<span class='label label-#{color} label-form'>#{status.titleize}</span>"
   end
 
+  # return the user object who created this post
+  def the_author
+    object.author.decorate
+  end
+
   # return all categories assigned for this post filtered by permissions + hidden posts + roles + etc...
   def the_categories
     object.categories
@@ -139,7 +146,7 @@ class PostDecorator < ApplicationDecorator
 
   # check if the post can be commented
   def can_commented?
-    object.meta[:has_comments].to_s.to_bool rescue false
+    object.manage_comments?
   end
 
 
@@ -166,5 +173,4 @@ class PostDecorator < ApplicationDecorator
   def cache_prefix(key = "")
     "#{h.current_site.cache_prefix}/post#{object.id}#{"/#{key}" if key.present?}"
   end
-
 end

data/app/decorators/post_tag_decorator.rb

@@ -32,5 +32,4 @@ class PostTagDecorator < TermTaxonomyDecorator
     object.post_type.decorate.generate_breadcrumb(add_post_type, true)
     h.breadcrumb_add(self.the_title)
   end
-
 end

data/app/decorators/post_type_decorator.rb

@@ -52,5 +52,4 @@ class PostTypeDecorator < TermTaxonomyDecorator
     th = object.get_option("thumb")
     th.present? ? th : (default || h.asset_url("image-not-found.png"))
   end
-
 end

data/app/decorators/site_decorator.rb

@@ -24,7 +24,7 @@ class SiteDecorator < TermTaxonomyDecorator
   end
 
   # return all contents from this site registered for post_type = slug (filter visibility, hidden, expired, ...)
-  # slug_or_id: slug or id of the post_type or array of slugs, default 'post'
+  # slug_or_id: slug or id of the post_type or array of slugs of post_types, default 'post'
   def the_contents(slug_or_id = "post")
     return h.verify_front_visibility(object.posts.where("term_taxonomy.id = ?", slug_or_id)) if slug_or_id.is_a?(Integer)
     return h.verify_front_visibility(object.posts.where("term_taxonomy.slug = ?", slug_or_id)) if slug_or_id.is_a?(String)
@@ -42,12 +42,31 @@ class SiteDecorator < TermTaxonomyDecorator
     end
   end
 
-  # return all main_categories for ths site
-  def the_categories
-    object.categories
+  # return the post with id or slug equal to slug_or_id
+  # slug_or_id: (String) for post slug
+  # slug_or_id: (Integer) for post id
+  # slug_or_id: (Array) array of post ids, return multiple posts
+  # return post model or nil
+  def the_post(slug_or_id)
+    post = self.the_posts.find(slug_or_id) rescue nil if slug_or_id.is_a?(Integer) # id
+    post = self.the_posts.find(slug_or_id) rescue nil if slug_or_id.is_a?(Array) # id
+    post = self.the_posts.find_by_slug(slug_or_id) if slug_or_id.is_a?(String) # id
+    post.present? ? post.decorate : nil
   end
 
-  # return the category with id or slug from this site
+  # return a collection of categories
+  # Arguments:
+  #   slug_or_id: string or integer
+  # return:
+    # slug_or_id: nil => return all main_categories for this site
+    # slug_or_id: integer => return all main categories of the post_type with id = slug_or_id
+    # slug_or_id: string => return all main categories of the post_type with slug = slug_or_id
+  def the_categories(slug_or_id = nil)
+    return the_post_type(slug_or_id).the_categories if slug_or_id.present?
+    return object.categories unless slug_or_id.present?
+  end
+
+  # return the category object with id or slug = slug_or_id from this site
   def the_category(slug_or_id)
     return the_full_categories.where(id: slug_or_id).first if slug_or_id.is_a?(Integer)
     return the_full_categories.find_by_slug(slug_or_id) if slug_or_id.is_a?(String)
@@ -63,14 +82,21 @@ class SiteDecorator < TermTaxonomyDecorator
     object.post_tags
   end
 
-  # return all post types for ths site
+  # return all post types for this site
   def the_post_types
     object.post_types.eager_load(:metas)
   end
 
-  # return the post type with slug = slug
-  def the_post_type(slug)
-    object.post_types.find_by_slug(slug).decorate rescue nil
+  # return a post_type object with id or slug = slug_or_id
+  # Arguments:
+  #   slug_or_id: string or integer
+  # return:
+  # slug_or_id: nil => return all main_categories for this site
+  # slug_or_id: integer => return all main categories of the post_type with id = slug_or_id
+  # slug_or_id: string => return all main categories of the post_type with slug = slug_or_id
+  def the_post_type(slug_or_id)
+    return object.post_types.find_by_slug(slug_or_id).decorate rescue nil if slug_or_id.is_a?(String)
+    return object.post_types.find(slug_or_id).decorate rescue nil if slug_or_id.is_a?(Integer)
   end
 
   # draw languages configured for this site
@@ -132,6 +158,4 @@ class SiteDecorator < TermTaxonomyDecorator
   def manage_sites?
     self.main_site? && h.current_user.admin?
   end
-
-
 end

data/app/decorators/term_taxonomy_decorator.rb

@@ -22,7 +22,6 @@ class TermTaxonomyDecorator < ApplicationDecorator
     object.slug.translate(get_locale)
   end
 
-
   # return the content for current locale + shortcodes executed
   def the_content
     r = {content: object.description.to_s.translate(get_locale), object: object}
@@ -82,7 +81,7 @@ class TermTaxonomyDecorator < ApplicationDecorator
   # attrs: Hash of link tag attributes, sample: {id: "myid", class: "sss" }
   def the_edit_link(title = nil, attrs = { })
     attrs = {target: "_blank", style: "font-size:11px !important;cursor:pointer;"}.merge(attrs)
-    h.link_to("&rarr; #{title || h.ct("edit")}", the_edit_url, *attrs)
+    h.link_to("&rarr; #{title || h.ct("edit")}".html_safe, the_edit_url, attrs)
   end
 
   # cache identifier, the format is: [current-site-prefix]/[object-id]-[object-last_updated]/[current locale]
@@ -101,5 +100,4 @@ class TermTaxonomyDecorator < ApplicationDecorator
     end
     res
   end
-
 end

data/app/decorators/theme_decorator.rb

@@ -12,5 +12,4 @@ class ThemeDecorator < TermTaxonomyDecorator
   def the_id
     object.id
   end
-
 end

data/app/decorators/user_decorator.rb

@@ -12,10 +12,9 @@ class UserDecorator < ApplicationDecorator
 
   # return the identifier
   def the_username
-    "#{object.username}"
+    object.username
   end
 
-
   # return the fullname
   def the_name
     object.fullname
@@ -28,7 +27,12 @@ class UserDecorator < ApplicationDecorator
 
   # return the avatar for this user, default: assets/admin/img/no_image.jpg
   def the_avatar
-     object.meta[:avatar].present? ? object.meta[:avatar] : h.asset_url("admin/img/no_image.jpg")
+    avatar_exists = File.exist? h.url_to_file_path(object.meta[:avatar])
+    if object.meta[:avatar].present? && avatar_exists
+      object.meta[:avatar]
+    else
+      h.asset_url("admin/img/no_image.jpg")
+    end
   end
 
   # return the slogan for this user, default: Hello World
@@ -62,6 +66,4 @@ class UserDecorator < ApplicationDecorator
   def cache_prefix(key = "")
     "#{h.current_site.cache_prefix}/user#{object.id}#{"/#{key}" if key.present?}"
   end
-
-
 end