camaleon_cms 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aea3fc38c77542245b78e190c1fc36c308d93ac9
-  data.tar.gz: 4e853421eb68c3785366a6c7ea79e4d4861b0a0b
+  metadata.gz: a2f40510933459726d45c615dddb3a2aa08a521d
+  data.tar.gz: 06896255a7dcecc0039d86c00ab0114e5c1c5497
 SHA512:
-  metadata.gz: c1da62e588391c9d34a686b96a6540f2948f2cb1c18149a104166fd34f9252b828a16c810f3ed1ae827dbee6979334ad60c579ec3434d11f8485a492ece3bb42
-  data.tar.gz: 2b3bb4960bfb772e8568ce4737a04c7db629932a6e5099057d7b0139a47ca53531c4ed0117f24290826ca038f9102e273d80c594dea57c4a50917a5616f454e1
+  metadata.gz: 4ec69cc71b0c772c1e3d9446526c7c0b21aad890b54a661712a46acace58645d7a10897c30d07c4fc064517199e31bd5b8fc4c334f5f9aea599a46843b9c6ef4
+  data.tar.gz: 2c5d72957463034ea92ea4e976636589b1416cc88ff551328b94233f774678b9265f853f1a2274755d44cf32ac876ffcf9d3b155560358c910ec12a685a81640

data/README.md

@@ -28,7 +28,7 @@
 * Add the gem in your Gemfile
 
   ```
-  gem "camaleon_cms",  '>=2.3.0' # Stable versions 2.2.1, 2.1.2.0, 2.1.1.4, 2.1.1, 2.1.0
+  gem "camaleon_cms",  '>=2.3.1' # Stable versions 2.2.1, 2.1.1, 2.1.0
   # gem "camaleon_cms", github: 'owen2345/camaleon-cms' # current development version
   ```
 * Only Rails 5 support

data/app/controllers/camaleon_cms/admin/sessions_controller.rb

@@ -17,7 +17,7 @@ class CamaleonCms::Admin::SessionsController < CamaleonCms::CamaleonController
   end
 
   def login_post
-    data_user = params[:user]
+    data_user = user_permit_data
     cipher = Gibberish::AES::CBC.new(cama_get_session_id)
     data_user[:password] = cipher.decrypt(data_user[:password]) rescue nil
     @user = current_site.users.find_by_username(data_user[:username])
@@ -84,7 +84,7 @@ class CamaleonCms::Admin::SessionsController < CamaleonCms::CamaleonController
     # TODO: Move this out of the controller
     # send email reset password
     if params[:user].present?
-      data_user = params[:user]
+      data_user = user_permit_data
       @user = current_site.users.find_by_email(data_user[:email])
       if @user.present?
         send_password_reset_email(@user)
@@ -103,7 +103,7 @@ class CamaleonCms::Admin::SessionsController < CamaleonCms::CamaleonController
     if params[:user].present?
       params[:user][:role] = PluginRoutes.system_info["default_user_role"]
       params[:user][:is_valid_email] = false if current_site.need_validate_email?
-      user_data = params.require(:user).permit!
+      user_data = user_permit_data
       result = cama_register_user(user_data, params[:meta])
       if result[:result] == false && result[:type] == :captcha_error
         @user.errors[:captcha] = t('camaleon_cms.admin.users.message.error_captcha')
@@ -158,4 +158,8 @@ class CamaleonCms::Admin::SessionsController < CamaleonCms::CamaleonController
     end
   end
 
+  def user_permit_data
+    params.require(:user).permit!
+  end
+
 end

data/app/controllers/camaleon_cms/admin/settings_controller.rb

@@ -16,8 +16,8 @@ class CamaleonCms::Admin::SettingsController < CamaleonCms::AdminController
   def site_saved
     @site = current_site
     if @site.update(params.require(:site).permit!)
-      @site.set_options(params[:meta]) if params[:meta].present?
-      @site.set_multiple_options(params[:options])
+      @site.set_options(params[:options]) if params[:options].present?
+      @site.set_metas(params[:metas]) if params[:metas].present?
       @site.set_field_values(params[:field_options])
       flash[:notice] = t('camaleon_cms.admin.settings.message.site_updated')
       redirect_to action: :site

data/app/controllers/camaleon_cms/frontend_controller.rb

@@ -46,6 +46,7 @@ class CamaleonCms::FrontendController < CamaleonCms::CamaleonController
     rescue
       return page_not_found
     end
+    @object = @post_type
     @cama_visited_post_type = @post_type
     @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
@@ -68,6 +69,7 @@ class CamaleonCms::FrontendController < CamaleonCms::CamaleonController
     rescue
       return page_not_found
     end
+    @object = @post_tag
     @cama_visited_tag = @post_tag
     @posts = @post_tag.the_posts.paginate(:page => params[:page], :per_page => current_site.front_per_page).eager_load(:metas)
     r_file = lookup_context.template_exists?("post_types/#{@post_type.the_slug}/post_tag") ? "post_types/#{@post_type.the_slug}/post_tag" : 'post_tag'
@@ -119,6 +121,7 @@ class CamaleonCms::FrontendController < CamaleonCms::CamaleonController
     rescue
       return page_not_found
     end
+    @object = @user
     @cama_visited_profile = true
     layout_ = lookup_context.template_exists?("layouts/profile") ? "profile" : nil
     r = {user: @user, layout: layout_, render: "profile"};  hooks_run("on_render_profile", r)
@@ -129,6 +132,7 @@ class CamaleonCms::FrontendController < CamaleonCms::CamaleonController
   # render a post from draft
   def draft_render
     post_draft = current_site.posts.drafts.find(params[:draft_id])
+    @object = post_draft
     if can?(:update, post_draft)
       render_post(post_draft)
     else
@@ -156,6 +160,7 @@ class CamaleonCms::FrontendController < CamaleonCms::CamaleonController
       end
     else
       @post = @post.decorate
+      @object = @post
       @cama_visited_post = @post
       @post_type = @post.the_post_type
       @comments = @post.the_comments

data/app/helpers/camaleon_cms/frontend/application_helper.rb

@@ -2,6 +2,7 @@ module CamaleonCms::Frontend::ApplicationHelper
   include CamaleonCms::Frontend::SiteHelper
   include CamaleonCms::Frontend::NavMenuHelper
   include CamaleonCms::Frontend::SeoHelper
+  include CamaleonCms::Frontend::ContentSelectHelper
 
   # add where conditionals to filter private/hidden/expired/drafts/unpublished
   # note: only for post records

data/app/helpers/camaleon_cms/frontend/content_select_helper.rb

@@ -0,0 +1,161 @@
+=begin
+  Camaleon CMS is a content management system
+  Copyright (C) 2015 by Owen Peredo Diaz
+  Email: owenperedo@gmail.com
+  This program is free software: you can redistribute it and/or modify   it under the terms of the GNU Affero General Public License as  published by the Free Software Foundation, either version 3 of the  License, or (at your option) any later version.
+  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 CamaleonCms::Frontend::ContentSelectHelper
+
+  # select single post of post type
+  # the_post_type('post') do
+  #   the_post('first-blog-post')
+  # end 
+  def the_post(slug)
+    post = @object.the_post(slug)
+    process_in_block(post) do
+      yield(post) if block_given?
+    end
+    post
+  end
+
+  # select posts of post type
+  # the_post_type('post') do
+  #   the_posts
+  # end
+  #
+  # the_post_type('post') do
+  #   the_posts(limit: 10)
+  # end
+  def the_posts(options={})
+    @object.posts.visible_frontend.limit(options[:limit]).decorate
+  end
+
+  # select post type by just pass slug to parameter
+  # Example: 
+  # the_post_type('post')
+  # the_post_type('page')
+  #
+  # the_post_type('post') do
+  #   the_post('first-blog')
+  # end
+  def the_post_type(slug)
+    post_type = current_site.the_post_type(slug)
+    process_in_block(post_type) do
+      yield(post_type) if block_given?
+    end
+    post_type
+  end
+
+  # select comments of post
+  # the_post('blog')
+  #   the_comments
+  # end
+  def the_comments(options={})
+    @object.comments.limit(options[:limit]).decorate if @object.present?
+  end
+
+  # select title of post
+  # the_post('blog') do
+  #   the_title
+  # end
+  def the_title
+    @object.the_title if @object.present?
+  end
+
+  # select content of post
+  # the_post('blog') do
+  #   the_content
+  # end
+  def the_content
+    @object.the_content.html_safe if @object.present?
+  end
+
+  # select url of post
+  # the_post('blog') do
+  #   the_url
+  # end
+  def the_url
+    @object.the_url if @object.present?
+  end
+
+  # select thumbnail of post
+  # the_post('blog') do
+  #   the_thumbnail
+  # end
+  def the_thumbnail
+    @object.the_thumb_url if @object.present?
+  end
+
+  # select slug of post, post type ... (@object)
+  # the_post('blog') do
+  #   the_slug
+  # end
+  def the_slug
+    @object.the_slug if @object.present?
+  end
+
+  # select excerpt of post
+  # the_post('blog') do
+  #   the_excerpt
+  # end
+  def the_excerpt(chars=200)
+    @object.the_excerpt(chars) if @object.present?
+  end
+
+  # select custome field from object
+  # the_post('blog') do
+  #   the_field('extra-content')
+  # end
+  def the_field(slug)
+    @object.the_field(slug) if @object.present?
+  end
+
+  # loop through each post of post type
+  # each_post_of('post') do
+  #   the_title
+  # end
+  #
+  # each_post_of('post', limit: 10) do
+  #   the_title
+  # end
+  def each_post_of(post_type_slug, options={})
+    the_post_type(post_type_slug) do
+      the_posts(options).each do |post|
+        process_in_block(post) do
+          yield(post) if block_given?
+        end
+      end
+    end
+  end
+
+  # loop through each category of post type
+  # each_category_of('post') do
+  #   the_title
+  # end
+  #
+  # each_category_of('post', limit: 4) do
+  #   the_title
+  # end
+  def each_category_of(post_type_slug, options={})
+    the_post_type(post_type_slug) do
+      the_categories(options).each do |category|
+        process_in_block(category) do
+          yield(category) if block_given?
+        end
+      end
+    end
+  end
+
+  # allow object to be global varaible in block
+  # work_in_block_of(post) do
+  #   the_field('extra-content')
+  # end
+  def process_in_block(object)
+    temp_object = @object
+    @object     = object
+    yield
+    @object     = temp_object
+  end
+end

data/app/models/concerns/camaleon_cms/metas.rb

@@ -80,7 +80,7 @@ module CamaleonCms::Metas extend ActiveSupport::Concern
   def set_options(h = {}, meta_key = "_default")
     if h.present?
       data = options(meta_key)
-      (h.is_a?(ActionController::Parameters) ? h.to_h: h).to_sym.each do |key, value|
+      (h.is_a?(ActionController::Parameters) ? h.to_hash : h).to_sym.each do |key, value|
         data[key] = fix_meta_var(value)
       end
       set_meta(meta_key, data)

data/app/views/camaleon_cms/admin/posts/_sidebar.html.erb

@@ -4,7 +4,7 @@
         <div class="panel-body ">
             <div class="row">
                 <% if @post.draft? && !@post.parent.present?  %>
-                    <div class="col-md-12 input-submit"><%= f.submit "#{ (@post.new_record?) ? t('camaleon_cms.admin.page_title.create') : t('camaleon_cms.admin.button.update')}", class: "btn btn-success btn-lg btn-block", onclick: "$('#post_status').val('#{@post.get_option('draft_status')}')" %></div>
+                    <div class="col-md-12 input-submit"><%= f.submit "#{ (@post.new_record?) ? t('camaleon_cms.admin.page_title.create') : t('camaleon_cms.admin.button.update')}", class: "btn btn-success btn-lg btn-block" %></div>
                 <% elsif @post.draft? && @post.parent.present? %>
                     <div class="col-md-12 input-submit"><%= f.submit "#{ t('camaleon_cms.admin.button.recover') }", class: "btn btn-success btn-lg btn-block", onclick: "$('#post_status').val('#{@post.get_option('draft_status')}')" %></div>
                 <% else  %>
@@ -40,7 +40,7 @@
                 <label class=" control-label"><%= t('camaleon_cms.admin.post_type.published')%></label>
                 <select id="post_status" name="post[status]" class="form-control select">
                     <% if can? :publish_post, @post_type %>
-                        <option class="<%= 'hidden' if @post.draft? %>" value="published" <%= (@post[:status] == "published") ? "selected": "" %> ><%= t('camaleon_cms.admin.post_type.published')%></option>
+                        <option class="" value="published" <%= (@post[:status] == "published") ? "selected": "" %> ><%= t('camaleon_cms.admin.post_type.published')%></option>
                     <% end  %>
                     <option value="pending" <%= (@post[:status] == "pending") ? "selected": "" %>><%= t('camaleon_cms.admin.table.pending')%></option>
                     <option value="draft" <%= (@post[:status] == "draft") ? "selected": "" %>><%= t('camaleon_cms.admin.table.draft')%></option>

data/app/views/camaleon_cms/admin/settings/_configuration_settings.html.erb

@@ -46,7 +46,7 @@
     </div>
     <div class="form-group">
         <label for=""><%= t('camaleon_cms.admin.settings.allow_user_registration') %></label><br>
-        <%= check_box :meta, :permit_create_account, {checked: @site.get_option('permit_create_account', false), class: "icheckbox0"}, "true", "" %>
+        <%= check_box :options, :permit_create_account, {checked: @site.get_option('permit_create_account', false), class: "icheckbox0"}, "true", "" %>
     </div>
     <div class="form-group">
         <label for=""><%= t('camaleon_cms.admin.settings.security.captcha_user_register') %></label><br>

data/lib/camaleon_cms/version.rb

@@ -1,3 +1,3 @@
 module CamaleonCms
-  VERSION = '2.3.0'
+  VERSION = '2.3.1'
 end

data/lib/plugin_routes.rb

@@ -95,6 +95,14 @@ class PluginRoutes
       cache_variable("statis_system_info", settings)
     end
     alias_method :system_info, :static_system_info
+
+    def isRails4?
+      Rails.version.to_s[0].to_i == 4
+    end
+
+    def isRails5?
+      Rails.version.to_s[0].to_i == 5
+    end
   end
 
   # reload routes
@@ -339,3 +347,28 @@ class PluginRoutes
     Gem.available?(name)
   end
 end
+
+#********* fix missing helper method for breadcrumb on rails gem **********#
+if PluginRoutes.isRails5?
+  module BreadcrumbsOnRails
+    module ActionController extend ActiveSupport::Concern
+      def self.included(base = nil, &block)
+        if base.nil?
+          @_included_block = block
+        else
+          super
+        end
+      end
+
+      included do |base|
+        extend          ClassMethods
+        helper          HelperMethods if respond_to? :helper
+        helper_method   :add_breadcrumb, :breadcrumbs  if respond_to? :helper_method
+
+        unless base.respond_to?(:before_action)
+          base.alias_method :before_action, :before_filter
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: camaleon_cms
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Owen Peredo Diaz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-03 00:00:00.000000000 Z
+date: 2016-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
@@ -42,14 +42,14 @@ dependencies:
   name: draper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
@@ -498,6 +498,7 @@ files:
 - app/helpers/camaleon_cms/content_helper.rb
 - app/helpers/camaleon_cms/email_helper.rb
 - app/helpers/camaleon_cms/frontend/application_helper.rb
+- app/helpers/camaleon_cms/frontend/content_select_helper.rb
 - app/helpers/camaleon_cms/frontend/nav_menu_helper.rb
 - app/helpers/camaleon_cms/frontend/seo_helper.rb
 - app/helpers/camaleon_cms/frontend/site_helper.rb