camaleon_cms 2.4.3.6 → 2.4.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b264403b317f1fc7b159a14442421358ab80d98
-  data.tar.gz: bd2ddf3797fc12138f8d0080767ae8517af75e36
+  metadata.gz: 7211d3c4b0a45a1e8c6e20353c5b4a3e6b20c932
+  data.tar.gz: 31360da64495b452335257449ba260957653e490
 SHA512:
-  metadata.gz: 7e739c3983fb4c3cb399f1c53ac56505821fb810468af2e014c8e413d0be7f9362a8b0a18c02d73a2691ba8fd75522b1dd45909fb5dda600a1f3e6cfc87d75fc
-  data.tar.gz: b668dba2056ce6b4daa25b149a876316f0143e8c15a98730ab6b255b966d9488cea61d09629b1436378896e65a317cd4e1c23c071152ed5e6eb3e350fb862479
+  metadata.gz: 5c5b33713850f460ceb5b5f21746c824428e9c98077f10d7c7bc9f2e79c192f5de988aaa5b1e51787b8996141cfa59d9aba5a382b22db7cbf50a71d6eedcfabc
+  data.tar.gz: 88e17d34d9454683c2e5c2e3e63b37fe0fab01effad9eb8b01499a938333e00b751c1f1dc219a490624e686d4aef6b64d8f7931392f093d0888bd8d7318a9f59

data/README.md

@@ -39,7 +39,7 @@
 * Add the gem in your Gemfile
 
   ```
-  gem "camaleon_cms",  '>= 2.4.3.5' # Stable versions 2.4.3.2, 2.3.6, 2.2.1, 2.1.1, 2.1.0
+  gem "camaleon_cms",  '>= 2.4.3.6' # Stable versions 2.4.3.5, 2.4.3.2, 2.3.6, 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/apps/plugins/attack/attack_helper.rb

@@ -40,7 +40,7 @@ module Plugins::Attack::AttackHelper
   def attack_app_before_load()
     cache_ban = Rails.cache.read(cama_get_session_id)
     if cache_ban.present? # render banned message if it was banned
-      render text: cache_ban, layout: false
+      render html: cache_ban.html_safe, layout: false
       return
     end
 
@@ -67,7 +67,7 @@ module Plugins::Attack::AttackHelper
       if r.count > config[:post][:max].to_i
         Rails.cache.write(cama_get_session_id, config[:msg], expires_in: config[:ban].to_i.minutes)
         # send an email to administrator with request info (ip, browser, if logged then send user info
-        render text: config[:msg]
+        render html: config[:msg].html_safe
         return
       end
 
@@ -76,7 +76,7 @@ module Plugins::Attack::AttackHelper
       r = q.where(created_at: config[:get][:sec].to_i.seconds.ago..Time.now)
       if r.count > config[:get][:max].to_i
         Rails.cache.write(cama_get_session_id, config[:msg], expires_in: config[:ban].to_i.minutes)
-        render text: config[:msg]
+        render html: config[:msg].html_safe
         return
       end
     end

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

@@ -20,7 +20,11 @@ class Plugins::FrontCache::AdminController < CamaleonCms::Apps::PluginsAdminCont
   def clean_cache
     flash[:notice] = "#{t('plugin.front_cache.message.cache_destroyed')}"
     front_cache_clean()
-    redirect_to :back
+    if Rails.version.to_s[0].to_i < 5
+      redirect_to :back
+    else
+      redirect_back(fallback_location: '/admin/plugins')
+    end
   end
 
 end

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

@@ -14,7 +14,7 @@ module Plugins::FrontCache::FrontCacheHelper
       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)
-      render text: args[:data]
+      render html: args[:data].html_safe
       return
     end
 
@@ -126,4 +126,4 @@ module Plugins::FrontCache::FrontCacheHelper
   def front_cache_plugin_match_path_patterns?(key, key2)
     @caches[:paths].any?{|path_pattern| key =~ Regexp.new(path_pattern) || key2 =~ Regexp.new(path_pattern) }
   end
-end
+end

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

@@ -19,7 +19,7 @@ class CamaleonCms::Admin::MediaController < CamaleonCms::AdminController
     crop_path = cama_crop_image(path_image, params[:ic_w], params[:ic_h], params[:ic_x], params[:ic_y])
     res = upload_file(crop_path, {remove_source: true})
     CamaleonCms::User.find(params[:saved_avatar]).set_meta('avatar', res["url"]) if params[:saved_avatar].present? # save current crop image as avatar
-    render text: res["url"]
+    render html: res["url"].html_safe
   end
 
   # download private files

data/app/helpers/camaleon_cms/uploader_helper.rb

@@ -264,14 +264,17 @@ module CamaleonCms::UploaderHelper
           cloud_front: current_site.get_option("filesystem_s3_cloudfront"),
           aws_file_upload_settings: lambda{|settings| settings }, # permit to add your custom attributes for file_upload http://docs.aws.amazon.com/sdkforruby/api/Aws/S3/Object.html#upload_file-instance_method
           aws_file_read_settings: lambda{|data, s3_file| data } # permit to read custom attributes from aws file and add to file parsed object
-        }
+        },
+        custom_uploader: nil # posibility to use custom file uploader
       }
       hooks_run("on_uploader", args)
+      return args[:custom_uploader] if args[:custom_uploader].present?
+      
       case args[:server]
         when 's3', 'aws'
-          CamaleonCmsAwsUploader.new({current_site: current_site, thumb: args[:thumb], aws_settings: args[:aws_settings]})
+          CamaleonCmsAwsUploader.new({current_site: current_site, thumb: args[:thumb], aws_settings: args[:aws_settings]}, self)
         else
-          CamaleonCmsLocalUploader.new({current_site: current_site, thumb: args[:thumb]})
+          CamaleonCmsLocalUploader.new({current_site: current_site, thumb: args[:thumb]}, self)
       end
     }.call
   end

data/app/uploaders/camaleon_cms_aws_uploader.rb

@@ -61,6 +61,12 @@ class CamaleonCmsAwsUploader < CamaleonCmsUploader
     args, res = {same_name: false, is_thumb: false}.merge(args), nil
     key = "#{@aws_settings["inner_folder"]}/#{key}" if @aws_settings["inner_folder"].present? && !args[:is_thumb]
     key = search_new_key(key) unless args[:same_name]
+    
+    if @instance # private hook to upload files by different way, add file data into result_data
+      _args={result_data: nil, file: uploaded_io_or_file_path, key: key, args: args, klass: self}; @instance.hooks_run('uploader_aws_before_upload', _args)
+      return _args[:result_data] if _args[:result_data].present?
+    end
+    
     s3_file = bucket.object(key.split('/').clean_empty.join('/'))
     s3_file.upload_file(uploaded_io_or_file_path.is_a?(String) ? uploaded_io_or_file_path : uploaded_io_or_file_path.path, @aws_settings[:aws_file_upload_settings].call({acl: 'public-read'}))
     res = cache_item(file_parse(s3_file)) unless args[:is_thumb]

data/app/uploaders/camaleon_cms_local_uploader.rb

@@ -63,6 +63,12 @@ class CamaleonCmsLocalUploader < CamaleonCmsUploader
   def add_file(uploaded_io_or_file_path, key, args = {})
     args, res = {same_name: false, is_thumb: false}.merge(args), nil
     key = search_new_key(key) unless args[:same_name]
+    
+    if @instance # private hook to upload files by different way, add file data into result_data
+      _args={result_data: nil, file: uploaded_io_or_file_path, key: key, args: args, klass: self}; @instance.hooks_run('uploader_local_before_upload', _args)
+      return _args[:result_data] if _args[:result_data].present?
+    end
+    
     add_folder(File.dirname(key)) if File.dirname(key).present?
     upload_io = uploaded_io_or_file_path.is_a?(String) ? File.open(uploaded_io_or_file_path) : uploaded_io_or_file_path
     File.open(File.join(@root_folder, key), 'wb'){|file|       file.write(upload_io.read) }

data/app/uploaders/camaleon_cms_uploader.rb

@@ -2,12 +2,13 @@ class CamaleonCmsUploader
   attr_accessor :thumb
   # root_folder= '/var/www/my_public_foler/', current_site= CamaSite.first.decorate, thumb = {w: 100, h: 75},
   # aws_settings: {region, access_key, secret_key, bucket}
-  def initialize(args = {})
+  def initialize(args = {}, instance = nil)
     @current_site = args[:current_site]
     t_w, t_h = @current_site.get_option('filesystem_thumb_size', '100x100').split('x')
     @thumb = args[:thumb] || {w: t_w, h: t_h}
     @aws_settings = args[:aws_settings] || {}
     @args = args
+    @instance = instance
     after_initialize
   end
 
@@ -20,9 +21,18 @@ class CamaleonCmsUploader
   # {files: {'file_name': {'name'=> 'a.jpg', key: '/test/a.jpg', url: '', url: '', size: '', format: '', thumb: 'thumb_url', type: '', created_at: '', dimension: '120x120'}}, folders: {'folder name' => {name: 'folder name', key: '/folder name', ...}}}
   # sort: (String, default 'created_at'), accept for: created_at | name | size | type | format
   def objects(prefix = '/', sort = 'created_at')
+    prefix = prefix.cama_fix_slash
     prefix = "/#{prefix}" unless prefix.starts_with?('/')
     db = @current_site.get_meta(cache_key, nil) || browser_files
-    res = db[prefix.gsub('//', '/')] || {files: {}, folders: {}}
+    res = db[prefix] || {files: {}, folders: {}}
+    
+    # Private hook to recover custom files to include in current list where data can be modified to add custom{files, folders}
+    # Note: this hooks doesn't have access to public vars like params. requests, ...
+    if @instance
+      args={data: res, prefix: prefix}; @instance.hooks_run('uploader_list_objects', args)
+      res = args[:data]
+    end
+    
     res[:files] = res[:files].sort_by{|k, v| v[sort] }.reverse.to_h
     res[:folders] = res[:folders].sort_by{|k, v| v['name'] }.reverse.to_h
     res
@@ -54,8 +64,9 @@ class CamaleonCmsUploader
   # save file_parsed as a cache into DB
   # file_parsed: (HASH) File parsed object
   # objects_db: HASH Object where to add the current object (optional)
-  def cache_item(file_parsed, _objects_db = nil)
-    objects_db = _objects_db || @current_site.get_meta(cache_key, {}) || {}
+  def cache_item(file_parsed, _objects_db = nil, custom_cache_key = nil)
+    _cache_key = custom_cache_key || cache_key
+    objects_db = _objects_db || @current_site.get_meta(_cache_key, {}) || {}
     prefix = File.dirname(file_parsed['key'])
 
     s = prefix.split('/').clean_empty
@@ -68,7 +79,7 @@ class CamaleonCmsUploader
     else
       objects_db[prefix][:files][file_parsed['name']] = file_parsed
     end
-    @current_site.set_meta(cache_key, objects_db) if _objects_db.nil?
+    @current_site.set_meta(_cache_key, objects_db) if _objects_db.nil?
     file_parsed
   end
 

data/lib/camaleon_cms/version.rb

@@ -1,3 +1,3 @@
 module CamaleonCms
-  VERSION = '2.4.3.6'
+  VERSION = '2.4.3.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: camaleon_cms
 version: !ruby/object:Gem::Version
-  version: 2.4.3.6
+  version: 2.4.3.7
 platform: ruby
 authors:
 - Owen Peredo Diaz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-06 00:00:00.000000000 Z
+date: 2017-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt