camaleon_cms 2.4.3.8 → 2.4.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b79883d5335e039b18f0570c4e829539f0b2bca5
-  data.tar.gz: 7f9b0a0b664412e525b0293a1f6eea93b17f7ddd
+  metadata.gz: ae2c10e79b6faabdbaf3235dc51b6854b3fd49dd
+  data.tar.gz: 56c221c85dcbceab2b16b5e528bd2abf881a526e
 SHA512:
-  metadata.gz: 150bd1933a7a64b73247d6e2ec4c4fd4f8e3e1701a0c295e2537eaed317f75406a88345089f0784821e030bb56aef9f058b46dc4dc0b8eeca9b9152e263a1fb1
-  data.tar.gz: f81aa404c9eb74a1a7294c61f316b985e6a5e398b3738c71cbebdeaeaeb0ffb235f2bb89e6105a1efa969134e777bb6d2b93e4d7f96ae3acf1624164b4241ea1
+  metadata.gz: b3c0731429a016c1c1ab6ce37ac2ee7b58051174fcfe0ec811806340c2d06c5fb821492c480bc905902a21e0ed447ed92aa7c7874a45c558f36b39ff0ccd8a19
+  data.tar.gz: 29e40477cad1ce684f3aaec989e3e0209500319140177788932eb371fd42759e2aa675a8c4a6ebe6d8084d8f4c79758674327b63476f2851c4ff38d5993a9188

data/app/apps/plugins/front_cache/admin_controller.rb

@@ -11,7 +11,8 @@ class Plugins::FrontCache::AdminController < CamaleonCms::Apps::PluginsAdminCont
                                                    post_types: (params[:cache][:post_type]||[]),
                                                    skip_posts: (params[:cache][:skip_posts]||[]),
                                                    cache_login: params[:cache][:cache_login],
-                                                   home: params[:cache][:home]
+                                                   home: params[:cache][:home],
+                                                   preserve_cache_on_restart: params[:cache][:preserve_cache_on_restart]
                                                   })
     flash[:notice] = "#{t('plugin.front_cache.message.settings_saved')}"
     redirect_to action: :settings
@@ -20,7 +21,7 @@ class Plugins::FrontCache::AdminController < CamaleonCms::Apps::PluginsAdminCont
   def clean_cache
     flash[:notice] = "#{t('plugin.front_cache.message.cache_destroyed')}"
     front_cache_clean()
-    if Rails.version.to_s[0].to_i < 5
+    if Rails.version.to_i < 5
       redirect_to :back
     else
       redirect_back(fallback_location: '/admin/plugins')

data/app/apps/plugins/front_cache/config/config.json

@@ -1,7 +1,7 @@
 {
   "title": "Front Cache",
   "descr": "Please check documentation <a href='http://camaleon.tuzitio.com/store/plugins/3'>here.</a>",
-  "version": "0.1",
+  "version": "0.2",
   "key": "front_cache",
   "position": 1,
   "helpers": [
@@ -18,4 +18,4 @@
     "front_after_load": ["front_cache_front_after_load"]
     //here you can add all your hooks (read documentation)
   }
-}
+}

data/app/apps/plugins/front_cache/front_cache_helper.rb

@@ -2,15 +2,15 @@ module Plugins::FrontCache::FrontCacheHelper
 
   # save as cache all pages configured on settings of this plugin for public users
   def front_cache_front_before_load
-    if current_site.get_option("refresh_cache") # clear cache every restart server
-      front_cache_clean
+    if current_site.get_option("refresh_cache") # clear cache every restart server unless option checked in settings
+      front_cache_clean unless current_site.get_meta("front_cache_elements")[:preserve_cache_on_restart]
       current_site.set_option("refresh_cache", false)
     end
 
     return if signin? || Rails.env == "development" || Rails.env == "test" || !request.get? # avoid cache if current visitor is logged in or development environment
 
     cache_key = request.fullpath.parameterize
-    if !flash.keys.present? && front_cache_exist?(cache_key) # recover cache file
+    if !flash.keys.present? && front_cache_exist?(cache_key) # recover cache item
       Rails.logger.info "Camaleon CMS - readed cache: #{front_cache_plugin_get_path(cache_key)}"
       response.headers['PLUGIN_FRONT_CACHE'] = 'TRUE'
       args = {data: front_cache_get(cache_key).gsub("{{form_authenticity_token}}", form_authenticity_token)}; hooks_run('front_cache_reading_cache', args)
@@ -87,38 +87,32 @@ module Plugins::FrontCache::FrontCacheHelper
     end
   end
 
-  # clear all frontend cache files
+  # clear all frontend cache items
   def front_cache_clean
-    FileUtils.rm_rf(front_cache_plugin_get_path) # clear site pages cache
+    Rails.cache.clear
   end
 
   private
 
   def front_cache_exist?(key)
-    File.exist?(front_cache_plugin_get_path(key))
+    !(Rails.cache.read(key).nil?)
   end
 
   def front_cache_get(key)
-    File.read(front_cache_plugin_get_path(key))
-  end
-
-  def front_cache_destroy(key)
-    FileUtils.rm_f(front_cache_plugin_get_path(key)) # clear site pages cache
+    Rails.cache.read(key)
   end
 
   def front_cache_plugin_cache_create(key, content)
-    FileUtils.mkdir_p(front_cache_plugin_get_path) unless Dir.exist?(front_cache_plugin_get_path)
-    File.open(front_cache_plugin_get_path(key), 'wb'){ |fo| fo.write(content) }
-    content
+    Rails.cache.write(front_cache_plugin_get_path(key), content)
   end
 
   # return the physical path of cache directory
   # key: (string, optional) the key of the cached page
   def front_cache_plugin_get_path(key = nil)
     unless key.nil?
-      Rails.root.join("tmp", "cache", "pages", current_site.id.to_s, "#{key}.html").to_s
+      "pages/#{current_site.id.to_s}/#{key}"
     else
-      Rails.root.join("tmp", "cache", "pages", current_site.id.to_s).to_s
+      "pages/#{current_site.id.to_s}"
     end
 
   end

data/app/apps/plugins/front_cache/views/admin/settings.html.erb

@@ -20,6 +20,11 @@
     </div>
     <div class="panel-body">
         <div class="alert alert-info"><%= t('plugin.front_cache.message.please_checkpost_need_cache') %></div>
+        <div class="form-group">
+            <label>Preserve cache on restart</label><br>
+            <%= check_box_tag("cache[preserve_cache_on_restart]", 1, @caches[:preserve_cache_on_restart]) %>
+        </div>
+
         <div class="form-group">
             <label><%= t('plugin.front_cache.home_page') %></label><br>
             <%= check_box_tag("cache[home]", 1, @caches[:home]) %>

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

@@ -44,9 +44,9 @@ class CamaleonCms::Admin::PostsController < CamaleonCms::AdminController
     end
 
     @btns = {published: "#{t('camaleon_cms.admin.post_type.published')} (#{posts_all.published.size})", all: "#{t('camaleon_cms.admin.post_type.all')} (#{posts_all.no_trash.size})", pending: "#{t('camaleon_cms.admin.post_type.pending')} (#{posts_all.pending.size})", draft: "#{t('camaleon_cms.admin.post_type.draft')} (#{posts_all.drafts.size})", trash: "#{t('camaleon_cms.admin.post_type.trash')} (#{posts_all.trash.size})"}
+    per_page = 9999999 if @post_type.manage_hierarchy?
     r = {posts: @posts, post_type: @post_type, btns: @btns, all_posts: posts_all, render: 'index', per_page: per_page }
     hooks_run("list_post", r)
-    per_page = 9999999 if @post_type.manage_hierarchy?
     @posts = r[:posts].paginate(:page => params[:page], :per_page => r[:per_page])
     render r[:render]
   end

data/app/controllers/camaleon_cms/frontend_controller.rb

@@ -42,7 +42,7 @@ class CamaleonCms::FrontendController < CamaleonCms::CamaleonController
   # render contents from post type
   def post_type
     begin
-      @post_type = current_site.post_types.find(params[:post_type_id]).decorate
+      @post_type = current_site.post_types.find_by_slug(params[:post_type_slug]).decorate
     rescue
       return page_not_found
     end

data/app/models/camaleon_cms/custom_field_group.rb

@@ -52,7 +52,7 @@ class CamaleonCms::CustomFieldGroup < CamaleonCms::CustomField
   # only used by form on admin panel (protected)
   # return array of failed_fields and full_fields [[failed fields], [all fields]]
   def add_fields(items, item_options)
-    self.fields.where.not(id: items.map { |_k, obj| obj['id'] }.uniq).destroy_all
+    self.fields.where.not(id: items.to_h.map { |_k, obj| obj['id'] }.uniq).destroy_all
     cache_fields = []
     order_index = 0
     errors_saved = []
@@ -120,7 +120,6 @@ class CamaleonCms::CustomFieldGroup < CamaleonCms::CustomField
 
   # auto save the default field values
   def auto_save_default_values(field, options)
-    options = options.with_indifferent_access
     class_name = object_class.split("_").first
     if %w(Post Category Plugin Theme).include?(class_name) && objectid && (options[:default_value].present? || options[:default_values].present?)
       if class_name == 'Theme'

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

@@ -14,7 +14,7 @@ module CamaleonCms::UserMethods extend ActiveSupport::Concern
 
     # relations
     has_many :metas, ->{ where(object_class: 'User')}, :class_name => "CamaleonCms::Meta", foreign_key: :objectid, dependent: :destroy
-    has_many :all_posts, class_name: "CamaleonCms::Post"
+    has_many :all_posts, class_name: "CamaleonCms::Post", foreign_key: :user_id
     has_many :all_comments, class_name: "CamaleonCms::PostComment"
 
     #scopes

data/lib/camaleon_cms/version.rb

@@ -1,3 +1,3 @@
 module CamaleonCms
-  VERSION = '2.4.3.8'
+  VERSION = '2.4.3.9'
 end

data/lib/plugin_routes.rb

@@ -210,7 +210,7 @@ class PluginRoutes
   end
 
   def self.cache_variable(var_name, value=nil)
-    @@_vars.push(var_name).uniq
+    @@_vars.push(var_name).uniq!
     #if Rails.env != "development" # disable cache plugin routes for develoment mode
       cache = class_variable_get("@@cache_#{var_name}") rescue nil
       return cache if value.nil?

data/spec/dummy/db/schema.rb

@@ -78,17 +78,6 @@ ActiveRecord::Schema.define(version: 20161215202255) do
   add_index "metas", ["object_class"], name: "index_metas_on_object_class"
   add_index "metas", ["objectid"], name: "index_metas_on_objectid"
 
-  create_table "plugins_attacks", force: :cascade do |t|
-    t.string   "path"
-    t.string   "browser_key"
-    t.integer  "site_id"
-    t.datetime "created_at"
-  end
-
-  add_index "plugins_attacks", ["browser_key"], name: "index_plugins_attacks_on_browser_key"
-  add_index "plugins_attacks", ["path"], name: "index_plugins_attacks_on_path"
-  add_index "plugins_attacks", ["site_id"], name: "index_plugins_attacks_on_site_id"
-
   create_table "plugins_contact_forms", force: :cascade do |t|
     t.integer  "site_id"
     t.integer  "count"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: camaleon_cms
 version: !ruby/object:Gem::Version
-  version: 2.4.3.8
+  version: 2.4.3.9
 platform: ruby
 authors:
 - Owen Peredo Diaz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-11 00:00:00.000000000 Z
+date: 2017-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
@@ -510,6 +510,7 @@ files:
 - app/assets/images/camaleon_cms/language/pt-BR.png
 - app/assets/images/camaleon_cms/language/pt.png
 - app/assets/images/camaleon_cms/language/ru.png
+- app/assets/images/camaleon_cms/language/ua.png
 - app/assets/images/camaleon_cms/language/zh-CN.png
 - app/assets/images/camaleon_cms/loader.gif
 - app/assets/images/camaleon_cms/users/no-image.jpg