camaleon_cms 2.4.3.13 → 2.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60220e65572eba3df3e3307a97c423dda3a5c88b
-  data.tar.gz: 8fbafdb15258a5aec532b99f1f361f3f76a65d83
+  metadata.gz: c5662dad21ed6c8a702ccc39bb3a40fc16b2f671
+  data.tar.gz: 92695b22b00c34babc4fc4f3209a24883fed4f0a
 SHA512:
-  metadata.gz: 3f392f06e049b9fc300785f955cbca6e57efda0e30719e2cfa7f1271673578579a2e328b040ae27b977247a9a2b0633464a27af960dbf0fceadaa51642d9f7dc
-  data.tar.gz: 6bef7a0c8e4c174456cbf5b9daec32377199a69f6e4d3238b887e615964a35c8fa529a616a2cfd12c0cfe9c5f971b5521702ff8f41b13d34039848cd68b4c57c
+  metadata.gz: 93e0cc72c5d2afa6ea1bf24b987fe7207e364bcd361425a9c5a9441c14cee9fac28ea977d8d88914b18bbb9be6800033edb092a5e9babce07a0015eb9c927a98
+  data.tar.gz: db417f6d56f22fa86a692b9de0a1b8ae002b269231fc6c821169b28efd0b6b1a6743ece3f41216243b4f410642f50ef449d71140d9895e55dd8fa2cf16171770

data/README.md

@@ -62,16 +62,21 @@
   ```
   bundle install
   ```
-* Install the CMS (before this, you can change defaut configuration in config/system.json)
+* Camaleon CMS Installation
 
   ```
   rails generate camaleon_cms:install
   ```
+  In config/system.json you can customize your cms settings. [Here](config/system.json) you can see the full settings.
+* (Optional) If you want to manage CMS migrations manually, change config/system.json -> auto_include_migrations=false and generate it with: 
+  ```
+  rake camaleon_cms:generate_migrations
+  ```
 * Create database structure
-
   ```
   rake db:migrate
   ```
+  
 * Start your server
 
   ```
@@ -154,6 +159,8 @@ If you need support, need some extra functionality or need plugins, please conta
 * Site: http://camaleon.tuzitio.com/
 * Email: owenperedo@gmail.com
 * Skype: owen-2345
+* Slack: camaleoncms.slack.com
+
 
 ## Author
 Owen Peredo Diaz

data/app/apps/plugins/attack/attack_helper.rb

@@ -13,7 +13,7 @@ module Plugins::Attack::AttackHelper
   def attack_on_active(plugin)
     current_site.set_meta("attack_config", {get: {sec: 20, max: 10},
                                             post: {sec: 20, max: 5},
-                                            msg: "#{t('plugin.attack.form.request_limit_exceeded')}",
+                                            msg: "#{I18n.t('plugin.attack.form.request_limit_exceeded')}",
                                             ban: 5,
                                             cleared: Time.now
                                           })

data/app/controllers/camaleon_cms/camaleon_controller.rb

@@ -99,21 +99,29 @@ class CamaleonCms::CamaleonController < ApplicationController
     elsif (cama_current_user.present? && !cama_current_user.admin?) || !cama_current_user.present?
       # inactive page control
       if current_site.is_inactive?
-        p = current_site.posts.find(current_site.get_option('page_inactive')).decorate
         if request.original_url.to_s.match /\A#{current_site.the_url}admin(\/|\z)/
           if cama_current_user.present?
             cama_logout_user
             flash[:error] = ('Site is Inactive')
           end
         else
-          redirect_to(p.the_url) unless params == {"controller"=>"camaleon_cms/frontend", "action"=>"post", "slug"=>p.the_slug}
+          p = current_site.posts.find_by_id(current_site.get_option('page_inactive')).try(:decorate)
+          if p
+            redirect_to(p.the_url) unless params == {"controller"=>"camaleon_cms/frontend", "action"=>"post", "slug"=>p.the_slug}
+          else
+            render html: 'This site was inactivated. Please contact to administrator.'
+          end
         end
       end
 
       # maintenance page and IP's control
       if current_site.is_maintenance? && !current_site.get_option('maintenance_ips', '').split(',').include?(request.remote_ip)
-        p = current_site.posts.find(current_site.get_option('page_maintenance')).decorate
-        redirect_to(p.the_url) if params != {"controller"=>"camaleon_cms/frontend", "action"=>"post", "slug"=>p.the_slug}
+        p = current_site.posts.find_by_id(current_site.get_option('page_maintenance')).try(:decorate)
+        if p
+          redirect_to(p.the_url) if params != {"controller"=>"camaleon_cms/frontend", "action"=>"post", "slug"=>p.the_slug}
+        else
+          render html: 'This site is in maintenance mode. Please contact to administrator.'
+        end
       end
     end
   end

data/app/helpers/camaleon_cms/uploader_helper.rb

@@ -74,6 +74,8 @@ module CamaleonCms::UploaderHelper
     cama_uploader_generate_thumbnail(uploaded_io.path, res['key'], settings[:thumb_size]) if settings[:generate_thumb] && res['thumb'].present?
 
     FileUtils.rm_f(uploaded_io.path) if settings[:remove_source]
+
+    hooks_run('after_upload', settings)
     res
   end
 

data/app/uploaders/camaleon_cms_aws_uploader.rb

@@ -93,6 +93,8 @@ class CamaleonCmsAwsUploader < CamaleonCmsUploader
   def delete_file(key)
     key = "#{@aws_settings["inner_folder"]}/#{key}" if @aws_settings["inner_folder"].present?
     bucket.object(key.split('/').clean_empty.join('/')).delete rescue ''
+    @instance.hooks_run('after_delete', key)
+    
     reload
   end
 

data/app/uploaders/camaleon_cms_local_uploader.rb

@@ -96,6 +96,8 @@ class CamaleonCmsLocalUploader < CamaleonCmsUploader
   def delete_file(key)
     file = File.join(@root_folder, key)
     FileUtils.rm(file) if File.exist? file
+    @instance.hooks_run('after_delete', key)
+    
     reload
   end
 

data/config/system.json

@@ -11,7 +11,8 @@
   "relative_url_root": "", // URL prefix, for example to get http://localhost:3000/blog/, this should be "blog"
   "admin_path_name": "admin", // URL prefix for admin panel, for example to get http://localhost:3000/sekret/, this should be "sekret"
   "user_model": "", // class name for users (Permit to use custom logins by custom user models like devise)
-  "media_slug_folder": false // permit to use site slug for upload media folder instead of site-id
+  "media_slug_folder": false, // permit to use site slug for upload media folder instead of site-id
+  "auto_include_migrations": true // permit to auto include all migrations of camaleon cms and its related plugins, if false you can generate manually with: rake camaleon_cms:generate_migrations
 }
 
 // Note: after any change in this file, you need to restart your server to apply changes.

data/lib/camaleon_cms/engine.rb

@@ -58,18 +58,22 @@ module CamaleonCms
 
       # extra configuration for plugins
       app.config.eager_load_paths += %W(#{app.config.root}/app/apps/**/)
-      PluginRoutes.all_plugins.each{ |plugin|
-        app.config.paths["db/migrate"] << File.join(plugin["path"], "migrate") if Dir.exist?(File.join(plugin["path"], "migrate"));
-        app.config.paths["db/migrate"] << File.join(plugin["path"], "db", "migrate") if Dir.exist?(File.join(plugin["path"], "db", "migrate"));
-      }
+      if PluginRoutes.static_system_info['auto_include_migrations']
+        PluginRoutes.all_plugins.each{ |plugin|
+          app.config.paths["db/migrate"] << File.join(plugin["path"], "migrate") if Dir.exist?(File.join(plugin["path"], "migrate"));
+          app.config.paths["db/migrate"] << File.join(plugin["path"], "db", "migrate") if Dir.exist?(File.join(plugin["path"], "db", "migrate"));
+        }
+      end
 
       # Static files
       app.middleware.use ::ActionDispatch::Static, "#{root}/public"
 
       # migrations checking
-      unless app.root.to_s.match root.to_s
-        config.paths["db/migrate"].expanded.each do |expanded_path|
-          app.config.paths["db/migrate"] << expanded_path
+      if PluginRoutes.static_system_info['auto_include_migrations']
+        unless app.root.to_s.match root.to_s
+          config.paths["db/migrate"].expanded.each do |expanded_path|
+            app.config.paths["db/migrate"] << expanded_path
+          end
         end
       end
     end

data/lib/camaleon_cms/version.rb

@@ -1,3 +1,3 @@
 module CamaleonCms
-  VERSION = '2.4.3.13'
+  VERSION = '2.4.4'
 end

data/lib/tasks/camaleon_cms/camaleon_tasks.rake

@@ -15,4 +15,16 @@ namespace :camaleon_cms do
       cama_uploader_generate_thumbnail(file.key, file.key, "")
     end
   end
+
+  desc 'Copy Camaleon CMS and all plugins migrations to migration folder'
+  task generate_migrations: :environment do
+    PluginRoutes.all_plugins.each do |plugin|
+      ENV["FROM"] = plugin['KEY']
+      if Rake::Task.task_defined?("railties:install:migrations")
+        Rake::Task["railties:install:migrations"].invoke
+      else
+        Rake::Task["app:railties:install:migrations"].invoke
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: camaleon_cms
 version: !ruby/object:Gem::Version
-  version: 2.4.3.13
+  version: 2.4.4
 platform: ruby
 authors:
 - Owen Peredo Diaz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-18 00:00:00.000000000 Z
+date: 2017-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
@@ -24,34 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: cancancan
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: draper
   requirement: !ruby/object:Gem::Requirement