camaleon_cms 1.1.0 → 2.0.1

data/app/helpers/{admin → camaleon_cms/admin}/post_type_helper.rb

@@ -7,12 +7,12 @@
   See the  GNU Affero General Public License (GPLv3) for more details.
 =end
 #encoding: utf-8
-module Admin::PostTypeHelper
+module CamaleonCms::Admin::PostTypeHelper
 
   #taxonomy -> (categories || post_tags)
   def post_type_html_inputs(post_type, taxonomy="categories", name ="categories", type="checkbox", values=[], class_cat="categorychecklist" , required = false)
     categories = post_type.send(taxonomy)
-    categories = categories.eager_load(:children) if taxonomy == "categories" || taxonomy == "children"
+    categories = categories.eager_load(:children, :post_type_parent, :parent) if taxonomy == "categories" || taxonomy == "children"
     post_type_taxonomy_html_(categories,taxonomy, name, type, values, class_cat, required)
   end
 
@@ -25,7 +25,7 @@ module Admin::PostTypeHelper
   def post_type_list_taxonomy(taxonomies, color="primary")
     html = ""
     taxonomies.decorate.each do |f|
-      html += "<a href='#{admin_post_type_taxonomy_posts_path(@post_type.id, f.taxonomy, f.id)}'><span class='label label-#{color} label-form'>#{f.the_title}</span></a> "
+      html += "<a class='cama_ajax_request' href='#{cama_admin_post_type_taxonomy_posts_path(@post_type.id, f.taxonomy, f.id)}'><span class='label label-#{color} label-form'>#{f.the_title}</span></a> "
     end
     return html
   end
@@ -33,7 +33,7 @@ module Admin::PostTypeHelper
   private
 
   def post_type_taxonomy_html_(categories, taxonomy="categories", name="categories", type="checkbox", values=[], class_cat="", required = false)
-    return "#{t('admin.post_type.message.no_created_html', taxonomy: (taxonomy == "categories")? t('admin.table.categories') : t('admin.table.tags') )}" if categories.count < 1
+    return "#{t('camaleon_cms.admin.post_type.message.no_created_html', taxonomy: (taxonomy == "categories")? t('camaleon_cms.admin.table.categories') : t('camaleon_cms.admin.table.tags') )}" if categories.count < 1
     html = "<ul class='#{class_cat}'>"
     categories.decorate.each do |f|
       html += "<li>"

data/app/helpers/{camaleon_helper.rb → camaleon_cms/camaleon_helper.rb}

@@ -6,7 +6,7 @@
   This program is distributed in the hope that it will be useful,  but WITHOUT ANY WARRANTY; without even the implied warranty of  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the  GNU Affero General Public License (GPLv3) for more details.
 =end
-module CamaleonHelper
+module CamaleonCms::CamaleonHelper
   # send and email
   # email: email to
   # subject: Subject of the email
@@ -18,7 +18,7 @@ module CamaleonHelper
   def sendmail(email,subject='Tiene una notificacion',content='',from=nil,attachs=[],template_name = 'mailer', layout_name = 'mailer')
     Thread.abort_on_exception=true
     Thread.new do
-      HtmlMailer.sender(email, subject, content, from, attachs, root_url, current_site, template_name, layout_name).deliver_now
+      HtmlMailer.sender(email, subject, content, from, attachs, cama_root_url, current_site, template_name, layout_name).deliver_now
       ActiveRecord::Base.connection.close
     end
   end
@@ -27,13 +27,15 @@ module CamaleonHelper
   # verify if current user is logged in, if not, then return nil
   # return html link
   def cama_edit_link(url, title = nil, attrs = { })
-    return '' unless current_user.present?
+    return '' unless cama_current_user.present?
+    return '' unless cama_current_user.admin?
     attrs = {target: "_blank", style: "font-size:11px !important;cursor:pointer;"}.merge(attrs)
     ActionController::Base.helpers.link_to("→ #{title || ct("edit")}".html_safe, url, attrs)
   end
 
   # execute controller action and return response
-  def requestAction(controller,action,params={})
+  # NON USED
+  def cama_requestAction(controller,action,params={})
     controller.class_eval{
       def params=(params); @params = params end
       def params; @params end
@@ -46,29 +48,20 @@ module CamaleonHelper
     c.response.body
   end
 
-  # deprecated helper
-  def array_change_key_case(hash)
-    result = hash.inject({}) do |hash, keys|
-      hash[raw(keys[1])] = keys[0]
-      hash
-    end
-  end
-
   # theme common translation text
   # key: key for translation
-  # language: language for the translation, if it is nil, then will use current site language
-  # valid only for common translations, If you can to use other translations for themes or plugins,
-  # you can use the default of rails (I18n.t)
-  def ct(key, language = nil)
-    language = language || I18n.locale
+  # args: hash of arguments for i18n.t()
+  # database customized translations
+  def ct(key, args = {})
+    language = I18n.locale
     r = {flag: false, key: key, translation: "", locale: language.to_sym}
     hooks_run("on_translation", r)
     return r[:translation] if r[:flag]
-    translate("common.#{key}", locale: language)
+    I18n.translate("camaleon_cms.common.#{key}", args)
   end
 
   # check if current request was for admin panel
-  def is_admin_request?
+  def cama_is_admin_request?
     !(@_admin_menus.nil?)
   end
 
@@ -88,4 +81,15 @@ module CamaleonHelper
     end
     res.join("")
   end
+
+  # save value as cache instance and return value
+  # sample: cama_cache_fetch("my_key"){ 10+20*12 }
+  def cama_cache_fetch(var_name)
+    var_name = "@cama_cache_#{var_name}"
+    return instance_variable_get(var_name) if instance_variable_defined?(var_name)
+    cache = yield
+    instance_variable_set(var_name, cache)
+    cache
+  end
+
 end

data/app/helpers/{captcha_helper.rb → camaleon_cms/captcha_helper.rb}

@@ -6,10 +6,13 @@
   This program is distributed in the hope that it will be useful,  but WITHOUT ANY WARRANTY; without even the implied warranty of  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the  GNU Affero General Public License (GPLv3) for more details.
 =end
-module CaptchaHelper
-  def captcha_build(len = 5)
+module CamaleonCms::CaptchaHelper
+
+  # build a captcha image
+  # len: Number or characters to include in captcha (default 5)
+  def cama_captcha_build(len = 5)
     img = MiniMagick::Image.open(File.join($camaleon_engine_dir.present? ? $camaleon_engine_dir : Rails.root.to_s, "lib", "captcha", "captcha_#{rand(12)}.jpg").to_s)
-    text = rand_str(len)
+    text = cama_rand_str(len)
     session[:captcha] = text
     img.combine_options do |c|
       c.resize "150x40"
@@ -25,22 +28,22 @@ module CaptchaHelper
   # build a captcha tag (image with captcha)
   # img_args: attributes for image_tag
   # input_args: attributes for input field
-  def captcha_tag(len = 5, img_args = {alt: ""}, input_args = {})
+  def cama_captcha_tag(len = 5, img_args = {alt: ""}, input_args = {})
     input_args[:placeholder] = "Please enter the text of the image" unless input_args[:placeholder].present?
-    img_args["onclick"] = "this.src = '#{captcha_url(len: len)}'+'&t='+(new Date().getTime());"
-    "<div><img src='#{captcha_url(len: len)}' #{img_args.collect{|k, v| "#{k}='#{v}'" }.join(" ") } /> <input type='text' name='captcha' #{input_args.collect{|k, v| "#{k}='#{v}'" }.join(" ") } /> </div>"
+    img_args["onclick"] = "this.src = \"#{cama_captcha_url(len: len)}\"+\"&t=\"+(new Date().getTime());"
+    "<div><img style='cursor: pointer;' src='#{cama_captcha_url(len: len)}' #{img_args.collect{|k, v| "#{k}='#{v}'" }.join(" ") } /> <input type='text' name='captcha' #{input_args.collect{|k, v| "#{k}='#{v}'" }.join(" ") } /> </div>"
   end
 
   # verify captcha value
-  def captcha_verified?
-    params[:captcha].present? && params[:captcha].upcase == session[:captcha]
+  def cama_captcha_verified?
+    (params[:captcha].present? && params[:captcha].upcase == session[:captcha]) || Rails.env == "test"
   end
 
   #************************* captcha in attack helpers ***************************#
   # check if the current visitor was submitted 5+ times
   # key: a string to represent a url or form view
   # key must be the same as the form "captcha_tags_if_under_attack(key, ...)"
-  def captcha_under_attack?(key)
+  def cama_captcha_under_attack?(key)
     session[key] ||= 0
     # if session[key].to_i > 10 then send an email to administrator with request info (ip, browser, if logged then send user info
     session[key].to_i > current_site.get_option("max_try_attack", 5).to_i
@@ -49,36 +52,37 @@ module CaptchaHelper
   # verify captcha values if this key is under attack
   # key: a string to represent a url or form view
   def captcha_verify_if_under_attack(key)
-    captcha_under_attack?(key) ? captcha_verified? : true
+    cama_captcha_under_attack?(key) ? cama_captcha_verified? : true
   end
 
   # increment attempts for key by 1
-  def captcha_increment_attack(key)
+  def cama_captcha_increment_attack(key)
     session[key] ||= 0
     session[key] = session[key].to_i + 1
   end
 
   # reset the attacks counter for key
   # key: a string to represent a url or form view
-  def captcha_reset_attack(key)
+  def cama_captcha_reset_attack(key)
     session[key] = 0
   end
 
   # return a number of attempts for key
   # key: a string to represent a url or form view
-  def captcha_total_attacks(key)
+  def cama_captcha_total_attacks(key)
     session[key] ||= 0
   end
 
   # show captcha if under attack
   # key: a string to represent a url or form view
-  def captcha_tags_if_under_attack(key, captcha_parmas = [5, {}, {class: "form-control required"}])
-    captcha_tag(*captcha_parmas) if captcha_under_attack?(key)
+  def cama_captcha_tags_if_under_attack(key, captcha_parmas = [5, {}, {class: "form-control required"}])
+    cama_captcha_tag(*captcha_parmas) if cama_captcha_under_attack?(key)
   end
 
   private
-
-  def rand_str(len=6)
+  # generate random string for captcha
+  # len: length of characters, default 6
+  def cama_rand_str(len=6)
     alphabets = [('A'..'Z').to_a].flatten!
     alphanumerics = [('A'..'Z').to_a,('0'..'9').to_a].flatten!
     str = alphabets[rand(alphabets.size)]

data/app/helpers/camaleon_cms/comment_helper.rb

@@ -0,0 +1,48 @@
+module CamaleonCms::CommentHelper
+  # return common data to save a new comment
+  # user_id, author, aothor_email, author_ip, approved, :agent
+  def cama_comments_get_common_data
+    comment_data = {}
+    comment_data[:user_id] = cama_current_user.id
+    comment_data[:author] = cama_current_user.the_name
+    comment_data[:author_email] = cama_current_user.email
+    comment_data[:author_IP] = request.remote_ip.to_s
+    comment_data[:approved] = "approved"
+    comment_data[:agent] = request.user_agent.force_encoding("ISO-8859-1").encode("UTF-8")
+    comment_data
+  end
+
+  # render as html content all comments recursively
+  # comments: collection of comments
+  def cama_comments_render_html(comments)
+    res = ""
+    labels = {"approved" => "success", "pending"=>"warning", "spam" => "danger" }
+    comments.decorate.each do |comment|
+      author = comment.the_author
+      res << "<div class='media'>
+                 <div class='media-left'>
+                    <a href='#{author.the_admin_profile_url}'>#{image_tag author.the_avatar, class: 'media-object', style: 'width: 64px; height: 64px;'}</a>
+                 </div>
+                 <div class='media-body'>
+                    <h4 class='media-heading'>#{author.the_name} <small>#{comment.the_created_at}</small> <span class='label label-#{labels[comment.approved]} pull-right'>#{t("camaleon_cms.admin.comments.message.#{comment.approved}")}</span></h4>
+                    <div class='comment_content'>#{comment.content}</div>
+                    <div class='comment_actions'>
+                        <div class='pull-left'>
+                            <a href='#{cama_admin_post_comment_answer_path(@post.id, comment.id)}' data-comment-id='#{comment.id}' title='#{t('camaleon_cms.admin.comments.tooltip.reply_comment')}' class='btn btn-info reply btn-xs ajax_modal'><span class='fa fa-mail-reply'></span></a>
+                            #{link_to raw('<i class="fa fa-trash-o"></i>'), { action: :destroy, id: comment.id }, method: :delete, data: { confirm: t('camaleon_cms.admin.message.delete') }, class: "btn btn-danger btn-xs cama_ajax_request", title: "#{t('camaleon_cms.admin.comments.tooltip.delete_comment')}" }
+                        </div>
+                        <div class='pull-right'>
+                            <a href='#{url_for({ action: :toggle_status, comment_id: comment.id, s: "a" })}' title='#{t('camaleon_cms.admin.comments.tooltip.approved_comment')}' class='#{"hidden" if comment.approved == "approved"} btn btn-success approve btn-xs cama_ajax_request'><span class='fa fa-thumbs-o-up'></span></a>
+                            <a href='#{url_for({ action: :toggle_status, comment_id: comment.id, s: "p" })}' title='#{t('camaleon_cms.admin.comments.tooltip.comment_pending')}' class='#{"hidden" if comment.approved == "pending"} btn btn-primary pending btn-xs cama_ajax_request'><span class='fa fa-warning'></span></a>
+                            <a href='#{url_for({ action: :toggle_status, comment_id: comment.id, s: "s" })}' title='#{t('camaleon_cms.admin.comments.tooltip.comment_spam')}' class='#{"hidden" if comment.approved == "spam"} btn btn-danger spam btn-xs cama_ajax_request'><span class='fa fa-bug'></span></a>
+                        </div>
+                    </div>
+                    <hr>
+                    <div class='clearfix'></div>
+                    #{ cama_comments_render_html comment.children }
+                 </div>
+              </div>"
+    end
+    res
+  end
+end

data/app/helpers/{content_helper.rb → camaleon_cms/content_helper.rb}

@@ -6,30 +6,32 @@
   This program is distributed in the hope that it will be useful,  but WITHOUT ANY WARRANTY; without even the implied warranty of  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the  GNU Affero General Public License (GPLv3) for more details.
 =end
-module ContentHelper
+module CamaleonCms::ContentHelper
   # initialize content variables
-  def content_init
+  def cama_content_init
     @_before_content = []
     @_after_content = []
   end
 
   # prepend content for admin or frontend (after <body>)
-  def content_prepend(content)
+  # sample: cama_content_prepend(<div>my prepend content</div>)
+  def cama_content_prepend(content)
     @_before_content << content
   end
 
   # append content for admin or frontend (before </body>)
-  def content_append(content)
+  # sample: cama_content_prepend(<div>my after content</div>)
+  def cama_content_append(content)
     @_after_content << content
   end
 
-  # draw all before contents
-  def content_before_draw
-    @_before_content.join("")
+  # draw all before contents registered by cama_content_prepend
+  def cama_content_before_draw
+    @_before_content.join("") rescue ""
   end
 
-  # draw all after contents
-  def content_after_draw
-    @_after_content.join("")
+  # draw all after contents registered by cama_content_append
+  def cama_content_after_draw
+    @_after_content.join("") rescue ""
   end
 end

data/app/helpers/{frontend → camaleon_cms/frontend}/application_helper.rb

@@ -6,10 +6,10 @@
   This program is distributed in the hope that it will be useful,  but WITHOUT ANY WARRANTY; without even the implied warranty of  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the  GNU Affero General Public License (GPLv3) for more details.
 =end
-module Frontend::ApplicationHelper
-  include Frontend::SiteHelper
-  include Frontend::NavMenuHelper
-  include Frontend::SeoHelper
+module CamaleonCms::Frontend::ApplicationHelper
+  include CamaleonCms::Frontend::SiteHelper
+  include CamaleonCms::Frontend::NavMenuHelper
+  include CamaleonCms::Frontend::SeoHelper
 
   # add where conditionals to filter private/hidden/expired/drafts/unpublished
   # note: only for post records
@@ -21,10 +21,10 @@ module Frontend::ApplicationHelper
   end
 
   # fix for url_to or url_path or any other who need add automatically current locale in the url
-  # sample: url_to_fixed("root_url", data: "asdasd", y: 12)
+  # sample: cama_url_to_fixed("root_url", data: "asdasd", y: 12)
   # => http://localhost/fr?data=asdasd&y=12
   # note: if current locale is the default language, then locale is not added in the url
-  def url_to_fixed(url_to, *args)
+  def cama_url_to_fixed(url_to, *args)
     options = args.extract_options!
     if request.present?
       if options.include?(:locale) && options[:locale] == false
@@ -34,7 +34,7 @@ module Frontend::ApplicationHelper
       end
       options[:locale] = nil if options[:locale].present? && current_site.get_languages.first.to_s == options[:locale].to_s
     end
-    options.delete(:format) if PluginRoutes.system_info[:skip_format_url].present?
+    options.delete(:format) if PluginRoutes.system_info["skip_format_url"].present?
     send(url_to, *(args << options))
   end
 end

data/app/helpers/{frontend → camaleon_cms/frontend}/nav_menu_helper.rb

@@ -6,26 +6,13 @@
   This program is distributed in the hope that it will be useful,  but WITHOUT ANY WARRANTY; without even the implied warranty of  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the  GNU Affero General Public License (GPLv3) for more details.
 =end
-module Frontend::NavMenuHelper
+module CamaleonCms::Frontend::NavMenuHelper
   # draw nav menu as html list
   # key: slug for nav menu
   # to register this, go to admin -> appearance -> menus
   # (DEPRECATED)
   def get_nav_menu(key = 'main_menu', class_name = "navigation")
-    return draw_menu({menu_slug: key, container_class: class_name})
-
-    html = "<ul class='#{class_name}'>#{_get_nav_menu(key, class_name)} #{front_editor_link(admin_appearances_nav_menus_menu_url(slug: key)) rescue ""}</ul>"
-    doc = Nokogiri::HTML.fragment(html)
-    link_active = doc.css("a[href='#{site_current_path}']").first
-    if link_active.present?
-      link_active_parent = link_active.parent
-      link_active_parent['class'] += ' active'
-      link_active_parent.ancestors('li').each do |parent|
-        parent['class'] += ' parent-active'
-      end
-      html = doc.to_html
-    end
-    html
+    draw_menu({menu_slug: key, container_class: class_name})
   end
 
   # draw menu as an html
@@ -69,9 +56,9 @@ module Frontend::NavMenuHelper
     args = args_def.merge(args)
     nav_menu = current_site.nav_menus.find_by_slug(args[:menu_slug])
     nav_menu = current_site.nav_menus.first unless nav_menu.present?
-    html = "<#{args[:container]} class='#{args[:container_class]}' id='#{args[:container_id]}'>#{args[:container_prepend]}{__}#{cama_edit_link(admin_appearances_nav_menus_menu_url(slug: nav_menu.slug)) rescue ""}#{args[:container_append]}</#{args[:container]}>"
+    html = "<#{args[:container]} class='#{args[:container_class]}' id='#{args[:container_id]}'>#{args[:container_prepend]}{__}#{args[:container_append]}</#{args[:container]}>"
     if nav_menu.present?
-      html = html.sub("{__}", _menu_draw_items(args, nav_menu.children))
+      html = html.sub("{__}", cama_menu_draw_items(args, nav_menu.children))
     else
       html = html.sub("{__}", "")
     end
@@ -79,15 +66,15 @@ module Frontend::NavMenuHelper
   end
 
   # draw menu items
-  def _menu_draw_items(args, nav_menu, level = 0)
+  def cama_menu_draw_items(args, nav_menu, level = 0)
     html = ""
-    _args = args.dup
     parent_current = false
     index = 0
     nav_menu.eager_load(:metas).each do |nav_menu_item|
+      _args = args.dup
       data_nav_item = _get_link_nav_menu(nav_menu_item)
       next if data_nav_item == false
-      _is_current = site_current_path == data_nav_item[:link] || site_current_path == data_nav_item[:link].sub(".html", "")
+      _is_current = data_nav_item[:current] || site_current_path == data_nav_item[:link] || site_current_path == data_nav_item[:link].sub(".html", "")
       has_children = nav_menu_item.have_children? && (args[:levels] == -1 || (args[:levels] != -1 && level <= args[:levels]))
       r = {
         menu_item: nav_menu_item.decorate,
@@ -102,7 +89,7 @@ module Frontend::NavMenuHelper
       _args = r[:settings]
 
       if has_children
-        html_children, current_children = _menu_draw_items(args, nav_menu_item.children, level + 1)
+        html_children, current_children = cama_menu_draw_items(args, nav_menu_item.children, level + 1)
       else
         html_children, current_children = "", false
       end
@@ -118,15 +105,15 @@ module Frontend::NavMenuHelper
     if level == 0
       html
     else
-      html = "<#{_args[:sub_container]} class='#{_args[:sub_class]} #{"parent-#{args[:item_current]}" if parent_current} level-#{level}'>#{html}</#{_args[:sub_container]}>"
+      html = "<#{args[:sub_container]} class='#{args[:sub_class]} #{"parent-#{args[:item_current]}" if parent_current} level-#{level}'>#{html}</#{args[:sub_container]}>"
       [html, parent_current]
     end
   end
 
   # check if menu is the current menu
-  def is_current_menu?(menu_item)
+  def cama_is_current_menu?(menu_item)
     r = _get_link_nav_menu(menu_item)
-    site_current_path == r[:link] || site_current_path.sub(".html", "") == r[:link].sub(".html", "") if r.present?
+    r[:current] || site_current_path == r[:link] || site_current_path.sub(".html", "") == r[:link].sub(".html", "") if r.present?
   end
 
   #******************* BREADCRUMBS *******************
@@ -161,21 +148,21 @@ module Frontend::NavMenuHelper
     begin
       case type_menu
         when 'post'
-          post = Post.find(nav_menu_item.get_option('object_id')).decorate
+          post = CamaleonCms::Post.find(nav_menu_item.get_option('object_id')).decorate
           return false unless post.can_visit?
-          {link: post.the_url(as_path: true), name: post.the_title, type_menu: type_menu}
+          {link: post.the_url(as_path: true), name: post.the_title, type_menu: type_menu, current: @cama_visited_post.present? && @cama_visited_post.id == post.id}
         when 'category'
-          category = Category.find(nav_menu_item.get_option('object_id')).decorate
-          {link: category.the_url(as_path: true), name: category.the_title, type_menu: type_menu}
+          category = CamaleonCms::Category.find(nav_menu_item.get_option('object_id')).decorate
+          {link: category.the_url(as_path: true), name: category.the_title, type_menu: type_menu, current: @cama_visited_category.present? && @cama_visited_category.id == category.id}
         when 'post_tag'
-          post_tag = PostTag.find(nav_menu_item.get_option('object_id')).decorate
-          {link: post_tag.the_url(as_path: true), name: post_tag.the_title, type_menu: type_menu}
+          post_tag = CamaleonCms::PostTag.find(nav_menu_item.get_option('object_id')).decorate
+          {link: post_tag.the_url(as_path: true), name: post_tag.the_title, type_menu: type_menu, current: @cama_visited_tag.present? && @cama_visited_tag.id == post_tag.id}
         when 'post_type'
-          post_type = PostType.find(nav_menu_item.get_option('object_id')).decorate
-          {link: post_type.the_url(as_path: true), name: post_type.the_title, type_menu: type_menu}
+          post_type = CamaleonCms::PostType.find(nav_menu_item.get_option('object_id')).decorate
+          {link: post_type.the_url(as_path: true), name: post_type.the_title, type_menu: type_menu, current: @cama_visited_post_type.present? && @cama_visited_post_type.id == post_type.id}
         when 'external'
-          r = {link: nav_menu_item.get_option('object_id'), name: nav_menu_item.name.to_s.translate, type_menu: type_menu}
-          r[:link] = url_to_fixed("root_url") if r[:link] == "root_url"
+          r = {link: nav_menu_item.get_option('object_id'), name: nav_menu_item.name.to_s.translate, type_menu: type_menu, current: false}
+          r[:link] = cama_url_to_fixed("cama_root_url") if r[:link] == "root_url"
           r
         else
           false