camaleon_cms 2.4.5.7 → 2.4.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c40d70430d7edd9132d9ed5529735b8421054db1
-  data.tar.gz: f34b54e713ca8a1d88a8de55e1cd3b5d048cc08b
+  metadata.gz: a8976824a5f6bd62eb80d61020ac7beb62be9c42
+  data.tar.gz: 4703e813d777c89caa0b00fd6ae1b72677de7288
 SHA512:
-  metadata.gz: 4bdd8d1ce6f4a4ceaddd893c5ca4cf4d478ca3f5ede911b4cf86935ab39fcf6637abd300073a69dd194666366c90e2919bf65fabdba7fe21771e3b159bb68eb9
-  data.tar.gz: f6c8551c32f86b304a0b328b725b5bb0efcd9546784b56151ebe70aaaaaaf5e2ec62b1d0f2b7183f48e4593504bac472be12418796f2c940f162a4e6a67833f7
+  metadata.gz: efaf8c70638bcc23e864e88341519a6065667d8c85ba324b2a23d8b8a9c2cd319256254d974a133993bffc9914006e63dfa6eaa92cf749273ff45135f1e44b8d
+  data.tar.gz: 62d294f76ddaf5cd089296e0be55db5eaa8eaecb0463ab7335705e82702e0eefc38fc131020b6c0673381790df991929c60915102124f290568703aba2b4fdc3

data/README.md

@@ -1,11 +1,12 @@
-![](https://img.shields.io/badge/Rails-4%2B-green.svg)
-![](https://img.shields.io/badge/Ruby-1.9.3%2B-green.svg)
+![](https://img.shields.io/badge/Rails-4.2%2B-green.svg)
+![](https://img.shields.io/badge/Ruby-2.2%2B-green.svg)
 ![](https://img.shields.io/badge/SQLITE-100%25-green.svg)
 ![](https://img.shields.io/badge/Mysql-100%25-green.svg)
 ![](https://img.shields.io/badge/Postgres-100%25-green.svg)
 ![](https://img.shields.io/badge/TDD-70%25-yellowgreen.svg)
 ![](https://img.shields.io/badge/DOCS-60%25-yellow.svg)
 ![](https://img.shields.io/badge/Support-Inmediate-green.svg)
+[![Build Status](https://travis-ci.org/owen2345/camaleon-cms.svg?branch=master)](https://travis-ci.org/owen2345/camaleon-cms)
 
 ![](http://camaleon.tuzitio.com/media/132/logo2.png)
 
@@ -14,22 +15,19 @@
 
 [Demonstration](http://camaleon.tuzitio.com/plugins/demo_manage/)
 
-  
-# Sponsor
-
-[ButterCMS](https://buttercms.com/?utm_source=github&utm_medium=sponsorship-link&utm_campaign=camaleon) is an API-based CMS and blogging platform built for developers:
 
-[![Foo](https://dl.dropboxusercontent.com/u/598519/buttercms-banners/b-on-y.png)](https://buttercms.com/?utm_source=github&utm_medium=sponsorship-banner&utm_campaign=camaleon)
+# Sponsor
 
+[ButterCMS](https://buttercms.com/?utm_source=github&utm_medium=sponsorship-link&utm_campaign=camaleon) is an API-based CMS and blogging platform built for developers.
 
 # Requirements
-* Rails 4.1+
+* Rails 4.2+
 * MySQL 5+ or SQlite or PostgreSQL
-* Ruby 1.9.3+
+* Ruby 2.2+
 * Imagemagick
 
 # Installation
-* Install Ruby on Rails 4.1+
+* Install Ruby on Rails 4.2+
   [Visit here.](http://railsapps.github.io/installing-rails.html)
 * Create your rails project
 
@@ -55,14 +53,14 @@
   ```
   rails generate camaleon_cms:install
   ```
-* (Optional) Before continue you can configure your cms settings in (my_app/config/system.json), [here](config/system.json) you can see the full settings.  
+* (Optional) Before continue you can configure your CMS settings in (my_app/config/system.json), [here](config/system.json) you can see the full settings.  
 * Create database structure
   ```
   rake camaleon_cms:generate_migrations
-  # before run migrations you can customize copied migration files
+  # before running migrations you can customize copied migration files
   rake db:migrate
   ```
-  
+
 * Start your server
 
   ```
@@ -73,7 +71,7 @@
 
 # Camaleon CMS (It adapts to your needs)
 
-Camaleon CMS is a dynamic and advanced content management system based on Ruby on Rails 4+ and Ruby 1.9.3+. This CMS is an alternative to wordpress for Ruby on Rails developers to manage advanced contents easily.
+Camaleon CMS is a dynamic and advanced content management system based on Ruby on Rails 4.2+ and Ruby 2.2+. This CMS is an alternative to Wordpress for Ruby on Rails developers to manage advanced contents easily.
 Camaleon CMS is a flexible manager where you can build your custom content structure without coding anything by custom fields and custom contents type.
 
 To download or publish themes go to themes store:
@@ -83,13 +81,13 @@ To download or publish plugins go to plugins store:
 http://camaleon.tuzitio.com/store/plugins
 
 ## Camaleon CMS is FREE and Open source
-It was released on July, 2015 and tested previously with more than 20 projects by 6 months and on august 22, 2015 was published as a gem.
+It was released on July, 2015 and tested previously with more than 20 projects by 6 months and on August 22, 2015 was published as a gem.
 
 ![](screenshot.png)
 
 ## With Camaleon you can do:
 * Multiples sites in the same installation
-* Multilanguage sites
+* Multi-language sites
 * Design and create the architecture of your project without programming by dynamic contents and fields
 * Extend or customize the functionalities by plugins
 * Manage your content visualization by themes
@@ -100,12 +98,12 @@ It was released on July, 2015 and tested previously with more than 20 projects b
   - Widgets
   - Drag and Drop / Sortable / Multi level menus
   - Templates/Layouts for pages
-  - Easy migration from wordpress
+  - Easy migration from Wordpress
 
 ## Some features are:
 * Integrate into existent Ruby on Rails Projects
 * Easy administration
-  Camaleon CMS permit you to adapt the CMS to all your needs and not you adapt to the CMS.
+  Camaleon CMS permits you to adapt the CMS to all your needs and not you adapt to the CMS.
 I.E. you can create your custom architecture with all attributes that you need for each kind of content.
 * Security
   - Remote code execution
@@ -122,16 +120,16 @@ I.E. you can create your custom architecture with all attributes that you need f
     - Customize your content visualization for Desktop, Mobile and Tablet
 * SEO & HTML5
   - Sitemap generations
-  - Seo Configuration
+  - Seo configuration
   - Seo for social media
-  - All generated content is compatible with HTML5 and bootstrap 3
+  - All generated content is compatible with HTML5 and Bootstrap 3
 
 ## Camaleon CMS come with basic and important plugins like:
-* Ecommerce
-* Visibility content
+* E-commerce
+* Visibility of content
 * Web attack control
 * Contact forms
-* Cache content
+* Content cache
 * Content reorder
 * many others [here.](https://github.com/owen2345/Camaleon-CMS-Sample)
 
@@ -146,7 +144,7 @@ If you need support, need some extra functionality or need plugins, please conta
 * Email: owenperedo@gmail.com
 * Skype: owen-2345
 * Stack Overflow: Use "camaleon" as tag to ask questions related to this CMS (don't forget to include cms version + rails version).  
-* Guitter: https://gitter.im/camaleoncms/Lobby
+* Gitter: https://gitter.im/camaleoncms/Lobby
 
 
 ## Author
@@ -170,7 +168,7 @@ RAILS_ENV=test bundle exec rake app:db:test:prepare
 
 * Run testing
 ```
-rspec
+bundle exec rspec
 ```
 
 ## Contributing
@@ -178,7 +176,7 @@ rspec
 * Create a branch (git checkout -b my_feature_branch)
 * Commit your changes (git commit -am "Added a sweet feature")
 * Push to the branch (git push origin my_feature_branch)
-* Create a pull request from your branch into master (Please be sure to provide enough detail for us to cipher what this change is doing)
+* Create a pull request from your branch into master (Please be sure to provide enough detail for us to understand what this change is doing)
 
 Visit the web site for more information: http://camaleon.tuzitio.com/
 

data/app/apps/plugins/visibility_post/visibility_post_helper.rb

@@ -29,7 +29,7 @@ module Plugins::VisibilityPost::VisibilityPostHelper
     post = args[:post]
     return args[:flag] = false if post.published_at.present? && post.published_at > Time.now
     return if post.visibility != 'private'
-    args[:flag] = false unless signin? && post.visibility_value.split(",").include?(cama_current_user.get_role(current_site).id)
+    args[:flag] = false unless signin? && post.visibility_value.split(",").include?(current_site.visitor_role)
   end
 
   def plugin_visibility_extra_columns(args)

data/app/assets/javascripts/camaleon_cms/admin/_post.js

@@ -236,6 +236,20 @@ function cama_init_post(obj) {
             return false;
         });
 
+        $form.on("change", ".list-categories input", function () {
+          showLoading();
+          $.get(
+            $form.find("#post_add_new_category").data('fields-reload-url'), {
+              categories: $form.find("#post_right_bar .list-categories input[name='categories[]']:checked").map(function(i, el){ return $(this).val(); }).get(),
+              post_id: post_id
+            },
+            function (res) {
+              $form.find('.c-field-group').remove();
+              $form.find('.panel .panel-default').after(res);
+              hideLoading();
+            });
+        });
+
         // sidebar toggle
         //$("#admin_content #post_right_bar-toggle").on("click", function () {
         //    $("#post_right_bar").is(":visible") ? $("#post_right_bar").hide() : $("#post_right_bar").show();

data/app/assets/javascripts/camaleon_cms/admin/custom_fields_form.js

@@ -1,71 +1,94 @@
 // add actions to assign custom fields to any model selected
 jQuery(function($){
-    var panel = $("#cama_custom_field_form");
-    var group_class_name = panel.attr("data-group_class_name");
-    var $content_fields = $( "#sortable-fields", panel);
-    $content_fields.sortable({
-        handle: ".panel-sortable"
-    });
-    var slugger_count = $content_fields.children().length;
-    cama_custom_field_set_slug();
+  var panel = $("#cama_custom_field_form");
+  var group_class_name = panel.attr("data-group_class_name");
+  var $content_fields = $( "#sortable-fields", panel);
+  $content_fields.sortable({
+    handle: ".panel-sortable"
+  });
+  var slugger_count = $content_fields.children().length;
+  cama_custom_field_set_slug();
 
-    $("#content-items-default > a", panel).click(function(){
-        var href = $(this).attr('href');
-        showLoading();
-        $.post(href, function(html){
-            hideLoading();
-            var li = $('<li class="item">' + html + '</li>');
-            $content_fields.append(li);
-            cama_custom_field_set_slug(li);
-            var title_field = li.find("input.text-title");
-            title_field.val(title_field.val() + '-' + (slugger_count ++));
-            title_field.trigger("keyup");
-            $('[data-toggle="tooltip"], a[title!=""]', $content_fields).tooltip();
-        });
-        return false;
+  $("#content-items-default > a", panel).click(function(){
+    var href = $(this).attr('href');
+    showLoading();
+    $.post(href, function(html){
+      hideLoading();
+      var li = $('<li class="item">' + html + '</li>');
+      $content_fields.append(li);
+      cama_custom_field_set_slug(li);
+      var title_field = li.find("input.text-title");
+      title_field.val(title_field.val() + '-' + (slugger_count ++));
+      title_field.trigger("keyup");
+      $('[data-toggle="tooltip"], a[title!=""]', $content_fields).tooltip();
     });
+    return false;
+  });
 
-    panel.on("click", ".panel-delete", function(){
-        var parent = $(this).parents(".item:first");
-        if(confirm(I18n("msg.delete_item"))){
-            parent.remove()
-        }
-        return false;
-    });
+  panel.on("click", ".panel-delete", function(){
+    var parent = $(this).parents(".item:first");
+    if(confirm(I18n("msg.delete_item"))){
+      parent.remove()
+    }
+    return false;
+  });
 
-    $('#select_assign_group', panel).change(function(){
-        var option = $(this).find('option:checked');
-        if(option.attr('value') == '_post_simple'){
-            $('#select_post_simple', panel).show().removeAttr('disabled');
-        }else{
-            $('#select_post_simple', panel).hide().attr('disabled','disabled');
-        }
-        var txt_help = option.data('help');
-        if(txt_help) txt_help = '<div class="alert alert-info"><i class="fa fa-info-circle"></i>&nbsp; ' + txt_help + ' </div>';
-        $('#select_assign_group_help', panel).html(txt_help);
-        $('#select_assign_group_caption', panel).val(option.parent('optgroup').attr("label") + ' ' + option.text());
-    }).val((group_class_name.search("Post,") == 0) ? '_post_simple':  group_class_name).trigger('change');
+  $('#select_assign_group', panel).change(function(){
+    var option = $(this).find('option:checked');
+    _change_additional_select(option);
+    var txt_help = option.data('help');
+    if(txt_help) txt_help = '<div class="alert alert-info"><i class="fa fa-info-circle"></i>&nbsp; ' + txt_help + ' </div>';
+    $('#select_assign_group_help', panel).html(txt_help);
+    $('#select_assign_group_caption', panel).val(option.parent('optgroup').attr("label") + ' ' + option.text());
+  }).val(_search_group_class_name(group_class_name)).trigger('change');
+
+  $('#select_post_simple', panel).change(function(){
+    var option = $(this).find('option:checked');
+    var txt_help = option.data('help');
+    if(txt_help) txt_help = '<div class="alert alert-info"><i class="fa fa-info-circle"></i>&nbsp; ' + txt_help + ' </div>';
+    $('#select_assign_group_help', panel).html(txt_help);
+    $('#select_assign_group_caption', panel).val(option.parent('optgroup').attr("label") + ': ' + option.text());
+  }).val(group_class_name).trigger('change');
 
-    $('#select_post_simple', panel).change(function(){
-        var option = $(this).find('option:checked');
-        var txt_help = option.data('help');
-        if(txt_help) txt_help = '<div class="alert alert-info"><i class="fa fa-info-circle"></i>&nbsp; ' + txt_help + ' </div>';
-        $('#select_assign_group_help', panel).html(txt_help);
-        $('#select_assign_group_caption', panel).val(option.parent('optgroup').attr("label") + ': ' + option.text());
-    }).val(group_class_name).trigger('change');
+  $('#select_category_simple', panel).change(function(){
+    var option = $(this).find('option:checked');
+    var txt_help = option.data('help');
+    if(txt_help) txt_help = '<div class="alert alert-info"><i class="fa fa-info-circle"></i>&nbsp; ' + txt_help + ' </div>';
+    $('#select_assign_group_help', panel).html(txt_help);
+    $('#select_assign_group_caption', panel).val(option.parent('optgroup').attr("label") + ': ' + option.text());
+  }).val(group_class_name).trigger('change');
 
-    function cama_custom_field_set_slug(_panel){
-        $('.text-slug:not(.runned)', _panel || panel).each(function(){
-            var $parent = $(this).parents('.panel-item');
-            var $label = $parent.find('.span-title');
-            $(this).slugify($parent.find('.text-title'), {
-                    slugFunc: function(str, originalFunc) {
-                        $label.html(str);
-                        return originalFunc(str);
-                    }
-                }
-            );
-            $(this).addClass('runned')
-        });
+  function _change_additional_select(option){
+    var option_value = option.attr('value'),
+      additional_options = ['_post_simple', '_category_simple'];
+
+    for (key in additional_options) {
+      if (option_value === additional_options[key]){
+        $('#select'+additional_options[key], panel).show().removeAttr('disabled');
+      }else{
+        $('#select'+additional_options[key], panel).hide().attr('disabled','disabled');
+      }
     }
+  }
+
+  function _search_group_class_name(group_class_name) {
+    if (group_class_name.search("Post,") == 0) group_class_name = '_post_simple';
+    if (group_class_name.search("Category_Post,") == 0) group_class_name = '_category_simple';
+    return group_class_name;
+  }
+
+  function cama_custom_field_set_slug(_panel){
+    $('.text-slug:not(.runned)', _panel || panel).each(function(){
+      var $parent = $(this).parents('.panel-item');
+      var $label = $parent.find('.span-title');
+      $(this).slugify($parent.find('.text-title'), {
+          slugFunc: function(str, originalFunc) {
+            $label.html(str);
+            return originalFunc(str);
+          }
+        }
+      );
+      $(this).addClass('runned')
+    });
+  }
 });

data/app/assets/javascripts/camaleon_cms/admin/uploader/_media_manager.js.coffee

@@ -5,6 +5,11 @@ window["cama_init_media"] = (media_panel) ->
   media_link_tab_upload = media_panel.find(".media_file_info_col .nav-tabs .link_media_upload")
 
   ################ visualize item
+  # loading last opened folder on current page
+  media_panel.ready ->
+    f = $('body').data('last-folder')
+    media_panel.trigger('navigate_to', {folder: f})
+
   # return the data of this file
   file_data = (item)->
     data = item.data('eval-data') || eval("("+item.find(".data_value").val()+")")
@@ -128,7 +133,9 @@ window["cama_init_media"] = (media_panel) ->
     f = media_panel.attr("data-folder")+"/"+$(this).attr("data-key")
     if $(this).attr("data-key").search('/') >= 0
       f = $(this).attr("data-key")
-    media_panel.trigger("navigate_to", {folder: f.replace(/\/{2,}/g, '/')})
+    f = f.replace(/\/{2,}/g, '/')
+    media_panel.trigger("navigate_to", {folder: f})
+    $('body').attr('data-last-folder', f) # remembers last opened folder on current page
   )
   media_panel.bind("update_breadcrumb", ->
     folder = media_panel.attr("data-folder").replace("//", "/")

data/app/controllers/camaleon_cms/admin/settings/custom_fields_controller.rb

@@ -63,6 +63,20 @@ class CamaleonCms::Admin::Settings::CustomFieldsController < CamaleonCms::Admin:
     render json: json
   end
 
+  def list
+    p = params.permit(:post_type, :post_id, :categories => [])
+    args = {}
+    if p[:post_id].present?
+      post = @current_site.the_post(p[:post_id].to_i)
+      post.update_categories(p[:categories])
+    else
+      post = CamaleonCms::Post.new
+      post.taxonomy_id = p[:post_type].to_i
+      args[:cat_ids] = p[:categories]
+    end
+    render partial: 'camaleon_cms/admin/settings/custom_fields/render', :locals => {record: post, field_groups: post.get_field_groups(args), show_shortcode: true}
+  end
+
   private
 
   def set_post_data

data/app/controllers/camaleon_cms/frontend_controller.rb

@@ -162,21 +162,21 @@ class CamaleonCms::FrontendController < CamaleonCms::CamaleonController
       @post = post_or_slug_or_id
     end
 
-    unless @post.present?
+    @post = @post.try(:decorate)
+    if !@post.present? || !@post.can_visit?
       if params[:format] == 'html' || !params[:format].present?
         page_not_found()
       else
         head 404
       end
     else
-      @post = @post.decorate
       @object = @post
       @cama_visited_post = @post
       @post_type = @post.the_post_type
       @comments = @post.the_comments
       @categories = @post.the_categories
       @post.increment_visits!
-      # todo: can_visit? if not redirect home page
+      
       home_page = @_site_options[:home_page] rescue nil
       if lookup_context.template_exists?("page_#{@post.id}")
         r_file = "page_#{@post.id}"

data/app/decorators/camaleon_cms/site_decorator.rb

@@ -112,17 +112,18 @@ class CamaleonCms::SiteDecorator < CamaleonCms::TermTaxonomyDecorator
   # draw languages configured for this site
   # list_class: (String) Custom css classes for ul list
   # current_page: (boolean) true: link with translation to current url, false: link with translation to root url
-  def draw_languages(list_class = "language_list list-inline pull-right", current_page = false, current_class = "current_l")
+  # block permit to render custom link label, default: flag icon
+  def draw_languages(list_class = "language_list list-inline pull-right", current_page = false, current_class = "current_l", &block)
     lan = object.get_languages
     return  if  lan.size < 2
     res = ["<ul class='#{list_class}'>"]
     lan.each do |lang|
       path = lang.to_s+'.png'
-      img = "<img src='#{h.asset_path("camaleon_cms/language/#{path}")}'/>"
-      res << "<li class='#{ current_class if I18n.locale.to_s == lang.to_s}'> <a href='#{h.cama_url_to_fixed(current_page ? "url_for" : "cama_root_url", {locale: lang, cama_set_language: lang})}'>#{img}</a> </li>"
+      label = (block ? h.capture(lang, I18n.locale.to_s == lang.to_s, &block) : "<img src='#{h.asset_path("camaleon_cms/language/#{path}")}'/>")
+      res << "<li class='#{ current_class if I18n.locale.to_s == lang.to_s}'> <a href='#{h.cama_url_to_fixed(current_page ? "url_for" : "cama_root_url", {locale: lang, cama_set_language: lang})}'>#{label}</a> </li>"
     end
     res << "</ul>"
-    res.join("")
+    res.join("").html_safe
   end
 
   # return Array of frontend languages configured for this site

data/app/helpers/camaleon_cms/plugins_helper.rb

@@ -1,4 +1,5 @@
 module CamaleonCms::PluginsHelper
+  include CamaleonCms::SiteHelper
   # load all plugins + theme installed for current site
   # METHOD IGNORED (is a partial solution to avoid load helpers and cache it for all sites)
   # this method try to load helpers for each request without caching

data/app/models/camaleon_cms/media.rb

@@ -42,7 +42,7 @@ class CamaleonCms::Media < ActiveRecord::Base
     _p = []
     folder_path.split('/').each do |f_name|
       _path = ('/'+_p.join('/')).cama_fix_media_key
-      coll.only_folder.where(name: f_name, folder_path: _path).first_or_create!() if "#{_path}/#{f_name}".cama_fix_media_key != '/'
+      coll.only_folder.where(name: f_name, folder_path: _path).first_or_create() if "#{_path}/#{f_name}".cama_fix_media_key != '/'
       _p.push(f_name)
     end
   end

data/app/models/camaleon_cms/post.rb

@@ -43,7 +43,7 @@ class CamaleonCms::Post < CamaleonCms::PostDefault
   has_many :drafts, ->{where(status: 'draft_child')}, class_name: "CamaleonCms::Post", foreign_key: :post_parent, dependent: :destroy
   has_many :children, class_name: "CamaleonCms::Post", foreign_key: :post_parent, dependent: :destroy, primary_key: :id
 
-  belongs_to :owner, class_name: PluginRoutes.static_system_info['user_model'].presence || 'CamaleonCms::User', foreign_key: :user_id
+  belongs_to :owner, class_name: CamaManager.get_user_class_name, foreign_key: :user_id
   belongs_to :parent, class_name: "CamaleonCms::Post", foreign_key: :post_parent
   belongs_to :post_type, class_name: "CamaleonCms::PostType", foreign_key: :taxonomy_id, inverse_of: :posts
 
@@ -245,7 +245,7 @@ class CamaleonCms::Post < CamaleonCms::PostDefault
   end
 
   # return the quantity of comments for this post
-  # TODO comments count
+  # TODO comments count to move into cache counter
   def total_comments
     self.get_meta("comments_count", 0).to_i
   end

data/app/models/camaleon_cms/post_comment.rb

@@ -11,7 +11,7 @@ class CamaleonCms::PostComment < ActiveRecord::Base
   has_many :children, class_name: "CamaleonCms::PostComment", foreign_key: :comment_parent, dependent: :destroy
   belongs_to :post, class_name: "CamaleonCms::Post", foreign_key: :post_id
   belongs_to :parent, class_name: "CamaleonCms::PostComment", foreign_key: :comment_parent
-  belongs_to :user, class_name: PluginRoutes.static_system_info['user_model'].presence || 'CamaleonCms::User', foreign_key: :user_id
+  belongs_to :user, class_name: CamaManager.get_user_class_name, foreign_key: :user_id
 
   default_scope {order("#{CamaleonCms::PostComment.table_name}.created_at DESC")}
 

data/app/models/camaleon_cms/post_tag.rb

@@ -3,5 +3,5 @@ class CamaleonCms::PostTag < CamaleonCms::TermTaxonomy
   cama_define_common_relationships('PostTag')
   has_many :posts, foreign_key: :objectid, through: :term_relationships, :source => :objects
   belongs_to :post_type, class_name: "CamaleonCms::PostType", foreign_key: :parent_id, inverse_of: :post_tags
-  belongs_to :owner, class_name: PluginRoutes.static_system_info['user_model'].presence || 'CamaleonCms::User', foreign_key: :user_id
+  belongs_to :owner, class_name: CamaManager.get_user_class_name, foreign_key: :user_id
 end

data/app/models/camaleon_cms/post_type.rb

@@ -10,7 +10,7 @@ class CamaleonCms::PostType < CamaleonCms::TermTaxonomy
   has_many :posts_draft, class_name: "CamaleonCms::Post", foreign_key: :taxonomy_id, dependent: :destroy, source: :drafts, inverse_of: :post_type
   has_many :field_group_taxonomy, -> {where("object_class LIKE ?","PostType_%")}, :class_name => "CamaleonCms::CustomField", foreign_key: :objectid, dependent: :destroy
 
-  belongs_to :owner, class_name: PluginRoutes.static_system_info['user_model'].presence || 'CamaleonCms::User', foreign_key: :user_id
+  belongs_to :owner, class_name: CamaManager.get_user_class_name, foreign_key: :user_id
   belongs_to :site, :class_name => "CamaleonCms::Site", foreign_key: :parent_id
 
   scope :visible_menu, -> {where(term_group: nil)}

data/app/models/camaleon_cms/term_taxonomy.rb

@@ -25,7 +25,7 @@ class CamaleonCms::TermTaxonomy < ActiveRecord::Base
   has_many :term_relationships, :class_name => "CamaleonCms::TermRelationship", :foreign_key => :term_taxonomy_id, dependent: :destroy
   # has_many :posts, foreign_key: :objectid, through: :term_relationships, :source => :objects
   belongs_to :parent, class_name: "CamaleonCms::TermTaxonomy", foreign_key: :parent_id
-  belongs_to :owner, class_name: PluginRoutes.static_system_info['user_model'].presence || 'CamaleonCms::User', foreign_key: :user_id
+  belongs_to :owner, class_name: CamaManager.get_user_class_name, foreign_key: :user_id
 
   # return all children taxonomy
   # sample: sub categories of a category

data/app/models/camaleon_cms/widget/main.rb

@@ -9,7 +9,7 @@ class CamaleonCms::Widget::Main < CamaleonCms::TermTaxonomy
   # renderer: string (path to the template for render this widget)
 
   has_many :metas, ->{ where(object_class: 'Widget::Main')}, :class_name => "CamaleonCms::Meta", foreign_key: :objectid, dependent: :destroy
-  belongs_to :owner, class_name: PluginRoutes.static_system_info['user_model'].presence || 'CamaleonCms::User', foreign_key: :user_id
+  belongs_to :owner, class_name: CamaManager.get_user_class_name, foreign_key: :user_id
   belongs_to :site, :class_name => "CamaleonCms::Site", foreign_key: :parent_id
 
   has_many :assigned, class_name: "CamaleonCms::Widget::Assigned", foreign_key: :visibility, dependent: :destroy

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

@@ -33,7 +33,19 @@ module CamaleonCms::CustomFieldsRead extend ActiveSupport::Concern
       when 'Category','PostTag'
         self.post_type.get_field_groups(class_name)
       when 'Post'
-        CamaleonCms::CustomFieldGroup.where("(objectid = ? AND object_class = ?) OR (objectid = ? AND object_class = ?)", self.id || -1, class_name, self.post_type.id, "PostType_#{class_name}")
+        if self.term_relationships.size.zero? && args[:cat_ids].nil?
+          CamaleonCms::CustomFieldGroup.where("(objectid = ? AND object_class = ?) OR (objectid = ? AND object_class = ?)", self.id || -1, class_name, self.post_type.id, "PostType_#{class_name}")
+        else
+          cat_ids = self.categories.map(&:id)
+          cat_ids += args[:cat_ids] unless args[:cat_ids].nil?
+          cat_ids += CamaleonCms::Category.find(cat_ids).map {|category| _category_parents_ids(category)}.flatten.uniq
+          CamaleonCms::CustomFieldGroup.where("(objectid = ? AND object_class = ?) OR
+                                               (objectid = ? AND object_class = ?) OR
+                                               (objectid IN (?) AND object_class = ?)",
+                                              self.id || -1, class_name,
+                                              self.post_type.id, "PostType_#{class_name}",
+                                              cat_ids, "Category_#{class_name}")
+        end
       when 'NavMenuItem'
         self.main_menu.custom_field_groups
       when 'PostType'
@@ -285,4 +297,14 @@ module CamaleonCms::CustomFieldsRead extend ActiveSupport::Concern
         self.site
     end
   end
+
+  def _category_parents_ids(category)
+    @parents ||= []
+    if category.parent.nil?
+      return @parents
+    else
+      @parents << category.parent.id
+      _category_parents_ids(category.parent)
+    end
+  end
 end

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

@@ -15,7 +15,8 @@ module CamaleonCms::UserMethods extend ActiveSupport::Concern
     # relations
     cama_define_common_relationships('User')
     has_many :all_posts, class_name: "CamaleonCms::Post", foreign_key: :user_id
-    has_many :all_comments, class_name: "CamaleonCms::PostComment"
+    has_many :all_comments, class_name: 'CamaleonCms::PostComment'
+    belongs_to :site, class_name: 'CamaleonCms::Site'
 
     #scopes
     scope :admin_scope, -> { where(:role => 'admin') }

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

@@ -90,7 +90,12 @@
             <div class="panel-heading">
                 <h3 class="panel-title"><%= t('camaleon_cms.admin.post_type.categories')%> <em class="text-danger">*</em></h3>
                 <ul class="panel-controls">
-                    <li><a id="post_add_new_category" data-reload-url="<%= list_cama_admin_post_type_categories_path(@post_type.id) %>" href="<%= cama_admin_post_type_categories_path(@post_type.id, cama_body_class: true) %>" title="<%= t("camaleon_cms.admin.post.create_category", default: 'Create New Category') %>" class="panel-add-category"><span class="fa fa-plus"></span></a></li>
+                    <li><a id="post_add_new_category"
+                           data-reload-url="<%= list_cama_admin_post_type_categories_path(@post_type.id) %>"
+                           data-fields-reload-url="<%= list_cama_admin_settings_custom_fields_path(post_type: @post_type.id) %>"
+                           href="<%= cama_admin_post_type_categories_path(@post_type.id, cama_body_class: true) %>"
+                           title="<%= t("camaleon_cms.admin.post.create_category", default: 'Create New Category') %>"
+                           class="panel-add-category"><span class="fa fa-plus"></span></a></li>
                     <li><a href="#" class="panel-collapse"><span class="fa fa-angle-down"></span></a></li>
                 </ul>
             </div>

data/app/views/camaleon_cms/admin/settings/custom_fields/_get_items.html.erb

@@ -4,10 +4,11 @@
    @item_id = @item_value[:id] || ''
    @index = "#{@item_id}_#{Time.now.to_i}_#{rand(999...99999)}"
    @field_config = cama_custom_field_elements[@key.to_sym]
+   @panel_id = "panel-field#{@index}"
    colors = ['primary','success','warning','colorful','info','danger']
    unless @field_config.nil?
 %>
-    <div id="panel-field<%= @index %>" class="panel panel-default panel-<%= colors.sample %> panel-item <%= 'panel-toggled' if @item_options_value[:panel_hidden].to_s.to_bool  %>">
+    <div id="<%= @panel_id %>" class="panel panel-default panel-<%= colors.sample %> panel-item <%= 'panel-toggled' if @item_options_value[:panel_hidden].to_s.to_bool  %>">
       <div class="panel-heading">
         <h3 class="panel-title"><span class="span-title"><%= @item_value[:name]? @item_value[:name] : "#{t('camaleon_cms.admin.settings.untitled')}
         #{@field_config[:label]}" %>
@@ -155,7 +156,7 @@
         <% if @field_config[:options].key?(:default_value) %>
             <div class="form-group input-group-sm">
               <label><%= t('camaleon_cms.admin.table.default_value')%></label>
-            <%= text_field(:field_options, 'default_value', index: @index, value: @item_options_value[:default_value] || @field_config[:options][:default_value], class: 'form-control') %>
+            <%= text_field(:field_options, 'default_value', index: @index, value: @item_options_value[:default_value] || @field_config[:options][:default_value], class: "form-control #{'translatable' if @field_config[:options][:translate]}") %>
             </div>
         <% end %>
 
@@ -176,4 +177,9 @@
         <% end %>
       </div>
     </div>
-<% end %>
+<% end %>
+<script>
+  jQuery(function () {
+    $('#<%= @panel_id %>').find('.translatable').Translatable();
+  })
+</script>

data/app/views/camaleon_cms/admin/settings/custom_fields/_render_category_simple.html.erb

@@ -0,0 +1,25 @@
+<%
+def _render_category_option_html(item, pos = 0)
+  category = item.decorate
+  value = "Category_Post,#{category.id}" %>
+  <option value="<%= value %>" data-help="<%= "#{t('camaleon_cms.admin.settings.tooltip.add_custom_field_posts')}"+ category.the_title %>"><%=  "#{('—' * pos)} #{category.the_title}" %></option>
+<% end
+
+   def _render_categories(categories, _level = 0)
+     categories.each do |term|
+       _render_category_option_html(term, _level)
+        children = term.children
+       _render_categories(children, _level + 1) if children.size > 0
+     end
+   end
+%>
+
+
+  <select id="select_category_simple" name="custom_field_group[assign_group]" class="form-control required" style="display: none" disabled>
+    <% current_site.post_types.each do |pt| pt = pt.decorate
+        next unless pt.manage_categories?   %>
+        <optgroup label="<%= pt.the_title %>">
+          <% _render_categories(pt.categories) %>
+        </optgroup>
+    <% end %>
+  </select>

data/app/views/camaleon_cms/admin/settings/custom_fields/form.html.erb

@@ -91,7 +91,10 @@
                                     <%# end %>
                                 </optgroup -->
                                 <option value="_post_simple" >Select Post Simple</option>
+                                <option value="_category_simple" >Select Category Posts Simple</option>
                             </select>
+
+                          <!-- select post -->
                             <select id="select_post_simple" name="custom_field_group[assign_group]" class="form-control required" style="display: none" disabled>
                                 <% current_site.post_types.each do |pt| pt = pt.decorate %>
                                     <optgroup label="<%= pt.the_title %>">
@@ -101,6 +104,10 @@
                                     </optgroup>
                                 <% end %>
                             </select>
+
+                          <!-- select categories-->
+                            <%= render partial: 'render_category_simple' %>
+
                             <input id="select_assign_group_caption" type="hidden" name="custom_field_group[caption]"/>
                             <div id="select_assign_group_help"></div>
                         </div>

data/app/views/layouts/camaleon_cms/admin.html.erb

@@ -16,7 +16,6 @@
         var tinymce_global_settings = {language_url: "<%= asset_path("camaleon_cms/admin/tinymce/langs/#{current_locale}.js") %>", custom_css: [], custom_toolbar: [], post_render: [], init: [], setups: [], settings: []};
         var I18n_data = <%= I18n.backend.respond_to?(:translations) ? I18n.backend.send(:translations)[current_locale.to_sym][:camaleon_cms][:admin][:js].to_json.html_safe : !!(I18n.backend.backends[1] && I18n.backend.backends[1].backends[1]) ? I18n.backend.backends[1].backends[1].send(:translations)[current_locale.to_sym][:camaleon_cms][:admin][:js].to_json.html_safe : "{}" rescue "{}" %>
     </script>
-    <%= render file: Rails.root.join('..', '..', 'spec/support/custom_admin') if Rails.env.test? %>
     <%= javascript_include_tag "camaleon_cms/admin/admin-manifest" %>
 
     <%= javascript_include_tag "camaleon_cms/admin/jquery_validate/#{current_locale}.js" if current_locale != 'en' %>

data/config/routes/admin.rb

@@ -53,6 +53,7 @@ Rails.application.routes.draw do
             collection do
               post 'get_items/:key', action: :get_items, as: :get_items
               post "reorder"
+              get "list"
             end
           end
           get 'site'

data/lib/camaleon_cms/version.rb

@@ -1,3 +1,3 @@
 module CamaleonCms
-  VERSION = '2.4.5.7'
+  VERSION = '2.4.5.8'
 end

data/lib/plugin_routes.rb

@@ -135,6 +135,11 @@ class PluginRoutes
     def remove_anonymous_hook(hook_key, hook_id)
       (@@anonymous_hooks[hook_key.to_s] || []).delete_if{|item| item[:id] == hook_id }
     end
+    
+    # return the class name for user model
+    def get_user_class_name
+      static_system_info['user_model'].presence || 'CamaleonCms::User'
+    end
   end
 
   # reload routes

data/spec/dummy/config/application.rb

@@ -21,6 +21,6 @@ module Dummy
 
     # Do not swallow errors in after_commit/after_rollback callbacks.
     # config.active_record.raise_in_transactional_callbacks = true
-    config.active_record.sqlite3.represent_boolean_as_integer = true
+    config.active_record.sqlite3.represent_boolean_as_integer = true if Rails.version.to_f >= 5.2
   end
-end
+end

data/spec/factories/post.rb

@@ -0,0 +1,44 @@
+FactoryBot.define do
+  factory :post, class: CamaleonCms::Post do
+    title Faker::Name.title
+    sequence(:slug) { |n| "post#{n}" }
+    content Faker::Lorem.sentence
+    published_at { Time.current }
+
+    transient do
+      site nil
+    end
+    
+    post_type { association :post_type, site: site || create(:site) }
+    owner { association :user, site: site }
+    
+    factory :pending_post do
+      status 'pending'
+    end
+
+    factory :draft_post do
+      status 'draft'
+    end
+    
+    factory :children_post do
+      parent { post }
+    end
+    
+    factory :private_post do
+      visibility 'private'
+      visibility_value { owner.role }
+    end
+    
+    factory :password_post do
+      visibility 'password'
+      visibility_value '12345'
+    end
+
+    factory :featured_post do
+      is_feature true
+    end
+
+    # data_options {} # all attrs in Post#set_setting()
+    # data_metas {thumb: <String thumb full url>, layout: <String layout name>, template: <String template name>, summary: <Text summary>, has_comments: <0|1>}
+  end
+end

data/spec/factories/post_type.rb

@@ -1,17 +1,9 @@
-include CamaleonCms::SiteHelper
-include CamaleonCms::HooksHelper
 FactoryBot.define do
-  factory :site, class: CamaleonCms::Site do
+  factory :post_type, class: CamaleonCms::PostType do
     name { Faker::Name.unique.name }
-    slug { Capybara.current_session.server ? "#{Capybara.current_session.server.host}:#{Capybara.current_session.server.port}" : 'key' }
+    sequence(:slug) { |n| "posttyp#{n}" }
     description Faker::Lorem.sentence
-    transient do
-      theme PluginRoutes.all_themes.first['key']
-      skip_intro true
-    end
-    after(:create) do |site, evaluator|
-      site_after_install(site, evaluator.theme)
-      site.set_option('save_intro', true) if evaluator.skip_intro
-    end
+    data_options {}
+    site
   end
 end

data/spec/factories/site.rb

@@ -1,8 +1,18 @@
+include CamaleonCms::SiteHelper
+include CamaleonCms::HooksHelper
 FactoryBot.define do
-  factory :post_type, class: CamaleonCms::PostType do
+  factory :site, class: CamaleonCms::Site do
     name { Faker::Name.unique.name }
+    slug { Capybara.current_session.server ? "#{Capybara.current_session.server.host}:#{Capybara.current_session.server.port}" : 'key' }
+    # sequence(:slug) { |n| Capybara.current_session.server ? "#{Capybara.current_session.server.host}:#{Capybara.current_session.server.port}" : "site#{n}" }
     description Faker::Lorem.sentence
-    data_options {}
-    site
+    transient do
+      theme PluginRoutes.all_themes.first['key']
+      skip_intro true
+    end
+    after(:create) do |site, evaluator|
+      site_after_install(site, evaluator.theme)
+      site.set_option('save_intro', true) if evaluator.skip_intro
+    end
   end
 end

data/spec/factories/user.rb

@@ -0,0 +1,19 @@
+FactoryBot.define do
+  factory :user, class: CamaManager.get_user_class_name do
+    first_name Faker::Name.first_name
+    last_name Faker::Name.last_name
+    email { Faker::Internet.unique.email }
+    username { Faker::Internet.unique.user_name }
+    password '12345678'
+    password_confirmation '12345678'
+    site
+    
+    factory :user_admin do
+      role 'admin'
+    end
+
+    factory :user_shared do
+      site_id nil
+    end
+  end
+end

data/spec/features/admin/custom_fields_spec.rb

@@ -15,6 +15,7 @@ describe "the Custom Fields", js: true do
       fill_in "custom_field_group_description", with: 'Test name description'
       page.execute_script('$("#select_assign_group").val("PostType_Post,2")')
 
+      wait 2
       all('#content-items-default a').each do |link|
         link.click
       end

data/spec/features/frontend/pages_spec.rb

@@ -1,9 +1,7 @@
 require 'rails_helper'
+include CamaleonCms::PluginsHelper
 describe "Post frontend", js: true do
-  before(:each) do
-    @site = create(:site).decorate
-    @post = @site.the_post('sample-post').decorate
-  end
+  init_site
 
   it 'visit post' do
     visit @post.the_url(as_path: true)
@@ -11,13 +9,13 @@ describe "Post frontend", js: true do
   end
   
   describe 'comments' do
-    
+
     describe 'anonymous' do
       before(:each) do
         @post.set_meta('has_comments', '1') # enable comments for this post
         @site.set_option('permit_anonimos_comment', true) # enable anonymous comment
       end
-      
+
       it 'anonymous comment' do
         visit @post.the_url(as_path: true)
         expect(page).to have_text('New Comment')
@@ -83,4 +81,56 @@ describe "Post frontend", js: true do
       expect(page).not_to have_text('New Comment')
     end
   end
+  
+  describe 'post visibility' do
+    before(:each) do
+      current_site(@site)
+      plugin_install('visibility_post')
+    end
+    
+    it 'public post' do
+      custom_post = create(:post, site: @site).decorate
+      visit custom_post.the_url(as_path: true)
+      expect(page).to have_http_status(:success)
+    end
+
+    it 'public future post with login' do
+      custom_post = create(:post, site: @site, published_at: 1.day.from_now).decorate
+      admin_sign_in(custom_post.owner.username, '12345678')
+      visit custom_post.the_url(as_path: true)
+      expect(page).to have_http_status(:not_found)
+    end
+
+    it 'public future post without login' do
+      custom_post = create(:post, site: @site, published_at: 1.day.from_now).decorate
+      visit custom_post.the_url(as_path: true)
+      expect(page).to have_http_status(:not_found)
+    end
+
+    it 'private post without login ' do
+      custom_post = create(:private_post, site: @site).decorate
+      visit custom_post.the_url(as_path: true)
+      expect(page).to have_http_status(:not_found)
+    end
+
+    it 'private post with login' do
+      user = create(:user, password: '12345678', password_confirmation: '12345678', site: @site)
+      custom_post = create(:private_post, site: @site, owner: user).decorate
+      admin_sign_in(user.username, '12345678')
+      visit custom_post.the_url(as_path: true)
+      expect(page).to have_http_status(:success)
+    end
+
+    it 'password post without password ' do
+      custom_post = create(:password_post, site: @site).decorate
+      visit custom_post.the_url(as_path: true)
+      expect(page).to have_text('Enter the password:')
+    end
+
+    it 'password post with password ' do
+      custom_post = create(:password_post, site: @site).decorate
+      visit custom_post.the_url(as_path: true, post_password: custom_post.visibility_value)
+      expect(page).to have_http_status(:success)
+    end
+  end
 end

data/spec/models/post_spec.rb

@@ -1,13 +1,14 @@
 require 'rails_helper'
 include CamaleonCms::Frontend::ApplicationHelper
 RSpec.describe 'PostDecorator' do
+  init_site
   it "next and previous post related to post type" do
-    post_type = create_test_post_type(slug: 'test-post-type')
-    post3 = create_test_post(post_type, slug: 'test3', post_order: 3).decorate
-    post1 = create_test_post(post_type, slug: 'test1', post_order: 1).decorate
-    post2 = create_test_post(post_type, slug: 'test2', post_order: 2).decorate
-    post2_1 = create_test_post(post_type, slug: 'test2_1', post_order: 2).decorate
-    post4 = create_test_post(post_type, slug: 'test4', post_order: 4).decorate
+    post_type = create(:post_type, slug: 'test-post-type', site: @site)
+    post3 = create(:post, post_type: post_type, slug: 'test3', post_order: 3).decorate
+    post1 = create(:post, post_type: post_type, slug: 'test1', post_order: 1).decorate
+    post2 = create(:post, post_type: post_type, slug: 'test2', post_order: 2).decorate
+    post2_1 = create(:post, post_type: post_type, slug: 'test2_1', post_order: 2).decorate
+    post4 = create(:post, post_type: post_type, slug: 'test4', post_order: 4).decorate
 
     expect(post3.the_next_post.slug).to eq('test4')
     expect(post3.the_prev_post.slug).to eq('test2_1')
@@ -24,4 +25,26 @@ RSpec.describe 'PostDecorator' do
     expect(post4.the_prev_post.slug).to eq('test3')
     expect(post4.the_next_post).to eq(nil)
   end
+  
+  it 'featured post' do
+    ptype = @site.post_types.last
+    bk = ptype.posts.featured.count
+    create(:featured_post, post_type: ptype)
+    expect(ptype.posts.reload.featured.count).to eql(bk + 1)
+  end
+  
+  it 'post with extra data' do
+    ptype = @site.post_types.last
+    ptype.set_option('has_comments', true)
+    data = {
+        thumb: 'http://camaleon.tuzitio.com/media/132/slider/slider-camaleon.jpg',
+        summary: 'This is summary',
+        has_comments: 0
+    }
+    post = create(:post, post_type: ptype, data_metas: data).decorate
+    expect(post.get_meta("summary").present?).to eql(true)  
+    expect(post.the_thumb_url).to include('slider-camaleon.jpg')  
+    expect(post.has_thumb?).to eql(true)  
+    expect(post.manage_comments?).to eql(true)  
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: camaleon_cms
 version: !ruby/object:Gem::Version
-  version: 2.4.5.7
+  version: 2.4.5.8
 platform: ruby
 authors:
 - Owen Peredo Diaz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-15 00:00:00.000000000 Z
+date: 2018-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
@@ -366,8 +366,22 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Camaleon CMS is a dynamic and advanced content management system based
-  on Ruby on Rails 4 as an alternative to Wordpress.
+  on Ruby on Rails 4+ as an alternative to Wordpress.
 email:
 - owenperedo@gmail.com
 executables: []
@@ -799,6 +813,7 @@ files:
 - app/views/camaleon_cms/admin/settings/custom_fields/_get_items.html.erb
 - app/views/camaleon_cms/admin/settings/custom_fields/_meta_data.html.erb
 - app/views/camaleon_cms/admin/settings/custom_fields/_render.html.erb
+- app/views/camaleon_cms/admin/settings/custom_fields/_render_category_simple.html.erb
 - app/views/camaleon_cms/admin/settings/custom_fields/fields/_audio.html.erb
 - app/views/camaleon_cms/admin/settings/custom_fields/fields/_categories.html.erb
 - app/views/camaleon_cms/admin/settings/custom_fields/fields/_checkbox.html.erb
@@ -1045,10 +1060,10 @@ files:
 - spec/dummy/config/routes.rb
 - spec/dummy/config/secrets.yml
 - spec/dummy/db/schema.rb
-- spec/dummy/db/test.sqlite3
-- spec/dummy/public/favicon.ico
+- spec/factories/post.rb
 - spec/factories/post_type.rb
 - spec/factories/site.rb
+- spec/factories/user.rb
 - spec/features/admin/categories_spec.rb
 - spec/features/admin/comments_spec.rb
 - spec/features/admin/contact_form_spec.rb
@@ -1081,7 +1096,6 @@ files:
 - spec/routing/post_type_routes_spec.rb
 - spec/spec_helper.rb
 - spec/support/common.rb
-- spec/support/custom_admin.html.erb
 - spec/support/fixtures/rails.png
 - spec/support/fixtures/rails_tmp.png
 - spec/support/wait_for_ajax.rb
@@ -1097,21 +1111,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- rails >= 4.1
-- ruby >= 1.9.3
+- rails >= 4.2
+- ruby >= 2.2
 - imagemagick
 rubyforge_project: 
 rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
-summary: Camaleon is a cms for Ruby on Rails 4 as an alternative to wordpress.
+summary: Camaleon is a CMS for Ruby on Rails 4+ as an alternative to Wordpress.
 test_files:
 - spec/spec_helper.rb
 - spec/dummy/app/controllers/application_controller.rb
@@ -1143,9 +1157,7 @@ test_files:
 - spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config.ru
 - spec/dummy/Rakefile
-- spec/dummy/public/favicon.ico
 - spec/dummy/db/schema.rb
-- spec/dummy/db/test.sqlite3
 - spec/dummy/README.rdoc
 - spec/mailers/send_mail_spec.rb
 - spec/features/frontend/post_type_spec.rb
@@ -1176,9 +1188,10 @@ test_files:
 - spec/support/wait_for_ajax.rb
 - spec/support/fixtures/rails_tmp.png
 - spec/support/fixtures/rails.png
-- spec/support/custom_admin.html.erb
 - spec/factories/post_type.rb
 - spec/factories/site.rb
+- spec/factories/post.rb
+- spec/factories/user.rb
 - spec/routing/post_type_routes_spec.rb
 - spec/rails_helper.rb
 - spec/helpers/uploader_helper_spec.rb

data/spec/support/custom_admin.html.erb

@@ -1,2 +0,0 @@
-<!--<style>.fa::before{ content: "i" !important; } </style>-->
-<script>window['URL'] = '';</script> <!--FIX for undefined URL on tinymce-->