camaleon_cms 2.3.6 → 2.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af1af7b67e70d26c3020d77aed3d468e8d8c27a1
-  data.tar.gz: 9dbb8a86e09a60fbdc8e4cdc74e9f48fb8c373fc
+  metadata.gz: cfed75a2566366b7f1a85a7433f78d0646a6e640
+  data.tar.gz: ffa4ae9995d2242059e08180706ec090c585c67e
 SHA512:
-  metadata.gz: ec69dfae57a3f430ca5df628bcc0d6e7f4ad15b916a579de233c92874987506dace7c4464c2d2e96a3bd87c41513b1274cfe67679c5431bdb6e138389aa05c25
-  data.tar.gz: 38b58bfb8d7001edab29f52ba3cf22f2a4f04d3fd9b1df8123d70a9127034db1e1ed93cbf3acf122f7cddde48106bc918f57392b14f0e2a4d2f9d72fcc427d82
+  metadata.gz: ab090dddb7f579b9c32c4e0a375eef05bbf3414c92eaf3db769419679fb5ac489630d9bc2211794393fda8a4c7a3155be7a0e56d5614b11813be6ff50be81c8a
+  data.tar.gz: b6876c49e5bbf4dc75a576c454e2884f584bcdbbf56786fa81f21cbb5ffa31f5a6384ea879c5abe1e479f382b251af2474c4e9005495b4c116abb72d82306d38

data/README.md

@@ -1,16 +1,27 @@
 ![](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/Mysql-100%-green.svg)
-![](https://img.shields.io/badge/Sqlite-100%-green.svg)
-![](https://img.shields.io/badge/Postgres-100%-green.svg)
-![](https://img.shields.io/badge/Tests-In_Progress-red.svg)
-![](https://img.shields.io/badge/Docs-90%-orange.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)
 
-[![Deploy](https://www.herokucdn.com/deploy/button.png)](https://heroku.com/deploy?template=https://github.com/owen2345/Camaleon-CMS-Sample)
-# CAMALEON CMS V2
 ![](http://camaleon.tuzitio.com/media/132/logo2.png)
 
+# CAMALEON CMS V2
+[Website](http://camaleon.tuzitio.com/)
+
+[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)
+
+
 # Requirements
 * Rails 4.1+
 * MySQL 5+ or SQlite or PostgreSQL
@@ -28,7 +39,7 @@
 * Add the gem in your Gemfile
 
   ```
-  gem "camaleon_cms",  '>=2.3.3' # Stable versions 2.2.1, 2.1.1, 2.1.0
+  gem "camaleon_cms",  '>=2.3.6' # 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
@@ -36,6 +47,7 @@
   Add in your Gemfile
   ```
   gem 'activemodel-serializers-xml', git: 'https://github.com/rails/activemodel-serializers-xml'
+  gem 'draper', github: 'audionerd/draper', branch: 'rails5'
   ```
   Create a file "lib/rails/test_unit/sub_test_task.rb" in your project (draper patch)
   ```
@@ -152,6 +164,18 @@ http://camaleon.tuzitio.com/license.html
 * Create/Update Manuals
 * TDD (rspec)
 
+## Testing
+* Init DB
+```
+RAILS_ENV=test bundle exec rake app:db:migrate
+RAILS_ENV=test bundle exec rake app:db:test:prepare
+```
+* Configure/Install Poltergaist and change your phanthomjs path in spec/spec_helper.rb
+
+* Run testing
+```
+rspec
+```
 
 ## Contributing
 * Fork it.
@@ -163,4 +187,4 @@ http://camaleon.tuzitio.com/license.html
 Visit the web site for more information: http://camaleon.tuzitio.com/
 
 ## Version History
-http://camaleon.tuzitio.com/version-history.html
+http://camaleon.tuzitio.com/version-history.html

data/app/apps/plugins/attack/config/locales/translation.yml

@@ -109,3 +109,21 @@ it:
       messages:
         settings_saved: 'Impostazioni salvate!'
       settings: 'Impostazioni'
+
+zh-CN:
+  plugin:
+    attack:
+      title: '攻击'
+      attack_security: '安全攻击'
+      form:
+        in: '期间'
+        seconds: '秒'
+        minutes: '分钟'
+        type_max_requests_time: '最大. %{type} 请求'
+        type_time_requests_seconds: '%{type} 每秒次数'
+        ban_time_minutes: '禁止时间'
+        ban_messages: '禁止消息'
+        request_limit_exceeded: '请求超过限制!'
+      messages:
+        settings_saved: '设置已保存!'
+      settings: '设置'

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

@@ -6,7 +6,7 @@ class Plugins::FrontCache::AdminController < CamaleonCms::Apps::PluginsAdminCont
   end
 
   def save_settings
-    current_site.set_meta("front_cache_elements", {paths: (params[:cache][:paths].delete_if{|a| !a.present?  } ||[]),
+    current_site.set_meta("front_cache_elements", {paths: ((params[:cache][:paths] || []).delete_if{|a| !a.present?  } ||[]),
                                                    posts: (params[:cache][:posts]||[]),
                                                    post_types: (params[:cache][:post_type]||[]),
                                                    skip_posts: (params[:cache][:skip_posts]||[]),

data/app/apps/plugins/front_cache/config/locales/translation.yml

@@ -5,6 +5,7 @@ en:
       button:
         add_new_path: 'Add new path'
       custom_url_paths: 'Custom url paths'
+      custom_url_samples: 'Enter paths/urls like /contact or /my_section?p=a&... or /static-pages/(.*) or /test-([0-9]+)/?\?owen=true&var2=([a-z]+) or http://static.mydomain.com/(.*)'
       clean_cache: 'Clean cache'
       title: 'Frontend cache pages'
       home_page: 'Home Page'
@@ -113,3 +114,23 @@ it:
         settings_saved: 'Impostazioni salvate!'
         cache_destroyed: 'Cache distrutta!'
       settings: 'Impostazioni'
+
+zh-CN:
+  plugin:
+    front_cache:
+      button:
+        add_new_path: '添加新路径'
+      custom_url_paths: '自定义链接路径'
+      clean_cache: '清除缓存'
+      title: '字体缓存页面'
+      home_page: '主页'
+      pages: '页面'
+      pages_of: '页'
+      skip_cache_pages: '跳过缓存页面'
+      message:
+        please_checkpost_need_cache: '请检查您需要缓存位内容.'
+        enabled_cache_inner_content_logged_users: '为已登录的用户启用内部内容的缓存'
+        settings_saved: '设置已保存!'
+        cache_destroyed: '缓存已清楚!'
+      settings: '设置'
+

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

@@ -8,40 +8,47 @@ module Plugins::FrontCache::FrontCacheHelper
     end
 
     return if signin? || Rails.env == "development" || Rails.env == "test" || !request.get? # avoid cache if current visitor is logged in or development environment
-    # return if signin? # avoid cache if current visitor is logged in or development environment
 
-    cache_key = front_cache_get_key
+    cache_key = request.fullpath.parameterize
     if !flash.keys.present? && front_cache_exist?(cache_key) # recover cache file
-      Rails.logger.info "============================================== readed cache: #{cache_key}"
-      render text: front_cache_get(cache_key).gsub("{{form_authenticity_token}}", form_authenticity_token)
+      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]
       return
     end
 
     @caches = current_site.get_meta("front_cache_elements")
     @_plugin_do_cache = false
-    if match_path_patterns? || (params[:action] == "index" && @caches[:home].present?) # cache paths and home page
+    if @caches[:paths].include?(request.original_url) || @caches[:paths].include?(request.path_info) || front_cache_plugin_match_path_patterns?(request.original_url, request.path_info) || (params[:action] == 'index' && params[:controller] == 'camaleon_cms/frontend' && @caches[:home].present?) # cache paths and home page
       @_plugin_do_cache = true
-    elsif params[:action] == "post" && !params[:draft_id].present?
+    elsif params[:action] == "post" && params[:controller] == 'camaleon_cms/frontend' && !params[:draft_id].present?
       begin
         post = current_site.the_posts.find_by_slug(params[:slug]).decorate
-        if post.can_visit?
-          @post = post
-          @post_type = post.the_post_type
-          @_plugin_do_cache = true if can_cache_page?
+        if post.can_visit? && post.visibility != "private"
+          post = post
+          if (@caches[:skip_posts] || []).include?(post.id.to_s)
+            @_plugin_do_cache = false
+          else
+            @_plugin_do_cache = true  if (@caches[:post_types] || []).include?(post.post_type_id.to_s) || (@caches[:posts] || []).include?(post.id.to_s)
+          end
         end
       rescue # skip post not found
       end
     end
+    response.headers['PLUGIN_FRONT_CACHE'] = 'TRUE' if @_plugin_do_cache
   end
 
 
   def front_cache_front_after_load
-    cache_key = front_cache_get_key
+    cache_key = request.fullpath.parameterize
     if @_plugin_do_cache && !flash.keys.present?
-      front_cache_create(cache_key, response.body
-                     .gsub(/csrf-token" content="(.*?)"/, 'csrf-token" content="{{form_authenticity_token}}"')
-                     .gsub(/name="authenticity_token" value="(.*?)"/, 'name="authenticity_token" value="{{form_authenticity_token}}"'))
-      Rails.logger.info "============================================== cache saved as: #{cache_key}"
+      args = {data: response.body
+                        .gsub(/csrf-token" content="(.*?)"/, 'csrf-token" content="{{form_authenticity_token}}"')
+                        .gsub(/name="authenticity_token" value="(.*?)"/, 'name="authenticity_token" value="{{form_authenticity_token}}"')}
+      hooks_run('front_cache_writing_cache', args)
+      front_cache_plugin_cache_create(cache_key, args[:data])
+      Rails.logger.info "Camaleon CMS - cache saved as: #{front_cache_plugin_get_path(cache_key)}"
     end
   end
 
@@ -62,35 +69,6 @@ module Plugins::FrontCache::FrontCacheHelper
 
   # cache actions (for logged users)
   def front_cache_on_render(args)
-    return nil
-    return if args[:options].include?(:skip_cache_action) || !signin? # avoid recursive calling
-    if params[:controller] == "frontend"
-      do_cache = false
-      @caches = current_site.get_meta("front_cache_elements")
-      return unless @caches[:cache_login]
-      if @caches[:paths].include?(front_request_key) || (params[:action] == "index" && @caches[:home].present?) # cache paths and home page
-        do_cache = true
-      elsif params[:action] == "post" && !params[:draft_id].present?
-        do_cache = true if can_cache_page?
-      end
-
-      cache_key = front_cache_get_key("___")
-      if do_cache # save or recovery cache
-        if args[:context].controller.page_cache_exist?(cache_key) # recover cache file
-          args[:options][:skip_cache_action] = true
-          args[:options][:text] = File.read(args[:context].controller.page_cache_get(cache_key))
-          args[:options].delete(:file)
-          return
-        end
-        Thread.abort_on_exception=true
-        Thread.new do
-          options = args[:options].dup
-          options[:layout] = false
-          options[:skip_cache_action] = true
-          args[:context].controller.cache_page(args[:context].controller.render_to_string(options), cache_key, false)
-        end
-      end
-    end
   end
 
   # expire cache for a page after comment registered or updated
@@ -111,47 +89,41 @@ module Plugins::FrontCache::FrontCacheHelper
 
   # clear all frontend cache files
   def front_cache_clean
-    FileUtils.rm_rf(Rails.root.join("tmp", "cache", "pages", current_site.id.to_s)) # clear site pages cache
+    FileUtils.rm_rf(front_cache_plugin_get_path) # clear site pages cache
   end
 
   private
 
   def front_cache_exist?(key)
-    File.exist?(Rails.root.join("tmp", "cache", "pages", current_site.id.to_s, "#{key}.html").to_s)
+    File.exist?(front_cache_plugin_get_path(key))
   end
 
   def front_cache_get(key)
-    File.read(Rails.root.join("tmp", "cache", "pages", current_site.id.to_s, "#{key}.html").to_s)
+    File.read(front_cache_plugin_get_path(key))
   end
 
   def front_cache_destroy(key)
-    FileUtils.rm_f(Rails.root.join("tmp", "cache", "pages", current_site.id.to_s, "#{key}.html").to_s) # clear site pages cache
+    FileUtils.rm_f(front_cache_plugin_get_path(key)) # clear site pages cache
   end
 
-  def front_cache_create(key, content)
-    dir = Rails.root.join("tmp", "cache", "pages", current_site.id.to_s).to_s
-    FileUtils.mkdir_p(dir) unless Dir.exist?(dir)
-    path = File.join(dir, "#{key}.html").to_s
-    File.open(path, 'wb'){ |fo| fo.write(content) }
+  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
   end
 
-  def front_cache_get_key(prefix = "")
-    request.fullpath.parameterize
-  end
-
-  # check if current post can be cached (skip private pages)
-  def can_cache_page?
-    !@caches[:skip_posts].include?(@post.id.to_s) && (@post.can_visit? && @post.visibility != "private") && (@caches[:post_types].include?(@post_type.id.to_s) || @caches[:posts].include?(@post.id.to_s)) rescue false
-  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
+    else
+      Rails.root.join("tmp", "cache", "pages", current_site.id.to_s).to_s
+    end
 
-  def front_request_key
-    request.path_info.split("?").first
   end
 
-  def match_path_patterns?
-    @caches[:paths].any? do |path_pattern|
-      front_request_key =~ Regexp.new(path_pattern)
-    end
+  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/apps/plugins/front_cache/views/admin/settings.html.erb

@@ -1,7 +1,6 @@
 <script>
     jQuery(function($){
         var form = $("#cache_front_form");
-//        form.find(".select").selectpicker();
         form.find("#btn-add-path").click(function(){
             var a = '<div class="input-group"> <input name="cache[paths][]" type="text" class="form-control" value=""> <span class="input-group-addon border_trans"><i class="round_icon fa fa-times text-danger del_path "></i></span> </div>';
             form.find("#paths").append(a);
@@ -33,16 +32,11 @@
 
         <div class="form-group">
             <label><%= t('plugin.front_cache.pages') %></label>
-            <%= select_tag("cache[posts]", options_from_collection_for_select(current_site.posts.public_posts.decorate, "id", "the_title", @caches[:posts]), "class"=> "form-control select", multiple: true, "data-live-search" => "true") %>
-        </div>
-
-        <div class="form-group">
-            <label><%= t('plugin.front_cache.skip_cache_pages') %></label>
-            <%= select_tag("cache[skip_posts]", options_from_collection_for_select(current_site.posts.public_posts.decorate, "id", "the_title", @caches[:skip_posts]), "class"=> "form-control select", multiple: true, "data-live-search" => "true") %>
+            <%= select_tag("cache[posts]", option_groups_from_collection_for_select(current_site.the_post_types.decorate, :the_posts, :the_title, :id, lambda{|o| o.decorate.the_title }, @caches[:posts]), "class"=> "form-control select", multiple: true, "data-live-search" => "true") %>
         </div>
 
         <div class="form-group" id="custom_paths">
-            <label><%= t('plugin.front_cache.custom_url_paths') %>: <span title="Enter paths like /contact <br>  or /my_section?p=a&...">[?]</span></label>
+            <label><%= t('plugin.front_cache.custom_url_paths') %>: <%= raw cama_html_tooltip(cama_t('plugin.front_cache.custom_url_samples'), 'right') %></label>
             <div id="paths">
                 <% @caches[:paths].each do |c| %>
                     <div class="input-group">
@@ -57,6 +51,11 @@
             </div>
         </div>
 
+        <div class="form-group">
+            <label><%= t('plugin.front_cache.skip_cache_pages') %></label>
+            <%= select_tag("cache[skip_posts]", option_groups_from_collection_for_select(current_site.the_post_types.decorate, :the_posts, 'the_title', "id", lambda{|o| o.decorate.the_title }, @caches[:skip_posts]), "class"=> "form-control select", multiple: true, "data-live-search" => "true") %>
+        </div>
+
         <!--<div class="form-group">-->
             <!--<label><%#= t('plugin.front_cache.message.enabled_cache_inner_content_logged_users') %></label><br>-->
             <!--<%#= check_box_tag("cache[cache_login]", 1, @caches[:cache_login]) %>-->

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

@@ -61,23 +61,35 @@ function cama_build_custom_field(panel, field_data, values){
             field.prepend(field_actions);
             if(field_counter == 0) field.children('.actions').find('.fa-times').remove();
         }
-        if(!$field.find('.group-input-fields-content').hasClass('cama_skip_cf_rename_multiple')) field.find('input, textarea, select').each(function(){ $(this).attr('name', $(this).attr('name').replace('[]', '['+field_counter+']')) });
+        if(!$field.find('.group-input-fields-content').hasClass('cama_skip_cf_rename_multiple')) {
+            field.find('input, textarea, select').each(function(){ $(this).attr('name', $(this).attr('name').replace('[]', '['+field_counter+']')) });
+        }
         if(field_data.disabled){
             field.find('input, textarea, select').prop('readonly', true).filter('select').click(function(){ return false; }).focus(function(){ $(this).blur(); });
             field.find('.btn').addClass('disabled').unbind().click(function(){ return false; });
         }
 
-        if(value) field.find('.input-value').val(value);
+        if (field_data.kind == 'checkbox') {
+            field.find('input')[0].checked = value;
+        } else if (value) {
+            field.find('.input-value').val(value).trigger('change', {field_rendered: true});
+        }
         $sortable.append(field);
         if(callback) eval(callback + "(field, value);");
         field_counter ++;
     }
-    if(values.length <= 0) values = [field_data.default_value];
+    if(field_data.kind != 'checkbox' && values.length <= 0) {
+        values = [field_data.default_value];
+    }
     if(field_data.kind != 'checkboxes') {
         if (!field_data.multiple && values.length > 1) values = [values[0]];
-        $.each(values, function (i, value) {
-            add_field(value);
-        });
+        if (field_data.kind == 'checkbox') {
+            add_field(values[0]);
+        } else {
+            $.each(values, function (i, value) {
+                add_field(value);
+            });
+        }
     } else add_field(values);
 
     if(field_data.multiple){ // sortable actions
@@ -220,10 +232,17 @@ function load_upload_image_field($input) {
         versions: $input.attr("data-versions") || '',
         thumb_size: $input.attr("data-thumb_size") || '',
         selected: function (file, response) {
-            $input.val(file.url);
+            $input.val(file.url).trigger('change');
         }
     });
 }
+
+// permit to show preview image of image custom fields
+function cama_custom_field_image_changed(field){
+    if(field.val()) field.closest('.input-group').append('<span class="input-group-addon custom_field_image_preview"><a href="'+field.val()+'" target="_blank"><img src="'+field.val()+'" style="width: 50px; height: 20px;"></a></span>')
+    else field.closest('.input-group').find('.custom_field_image_preview').remove();
+}
+
 function load_upload_video_field(thiss) {
     var $input = $(thiss).prev();
     $.fn.upload_filemanager({
@@ -232,4 +251,4 @@ function load_upload_video_field(thiss) {
             $input.val(file.url);
         }
     });
-}
+}

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

@@ -3,17 +3,25 @@
 // <script> var I18n_data = <%= I18n.backend.send(:translations)[current_locale.to_sym][:admin][:js].to_json.html_safe %> </script>
 
 // return translation of a key
-// sample: I18n('button.edit')  ==> Edit
+// sample: I18n('button.edit', 'Editar %{title}', {title: 'Articulo'})  ==> Edit
 // return String with the translation
 // default_val: (String) this value is returned if there is no exist translation for key
 // if default_val is empty, will be returned the last key titleized
-var I18n = function(key, default_val){
+// data: (hash) replacement values in the value, sample: {title: 'my title'}
+var I18n = function(key, default_val, data){
     try {
         var res = eval("I18n_data." + key);
         if (!res) res = default_val ? default_val : ("" + key.split(".").pop()).titleize();
     }catch(e){
         var res = (""+key.split(".").pop()).titleize();
     }
+
+    // replacements
+    data = data || {}
+    for(key in data){
+        console.log(key, data[key])
+        res = res.replace("%{"+key+"}", data[key])
+    }
     return res;
 }