camaleon_cms 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d114547f428656d17fdf58ce3a7d1096a01e413
-  data.tar.gz: 3b994b5712f74b98f58942d1fa7de814a042c8ab
+  metadata.gz: 418b31e8a9007f20ed7e54b748b16b7edd8b0c6d
+  data.tar.gz: a7f16254d383c954d350d7f23b6f1d56bc16e0ae
 SHA512:
-  metadata.gz: 1a8b1bad326b7d06e0051a93b2962c98f0e0ee8e0ac0b7d41950c580891e11948f0cb94e09d6adbcab52c4024a604f1d951b7f9d89208fb73cfe613e436fa969
-  data.tar.gz: ad8f732b2820f70fc2e994eb8499d2502243c014d7eee187874166954b1b04d7d693449f8ba57e6a8f7751c16b0d8e5327ab2b1f35a701eb17483db32b6d86b7
+  metadata.gz: 6b550adda1b21074dd7118693739e0a87c72ed76edafe9ac7fc7ab361882c035bbfd61eab6c545eff7311a016d13ca1317e17d898abbf05c135d5e6ecef09b7b
+  data.tar.gz: 9f89b6a54b89da1e76db22ea6d45a425304cdfacb859f6be332c78d2a3f2feb4bf1903b5fd13b367d23107df96c63c85657bc3721ae0555a3e0cdeff73f6825d

data/app/assets/stylesheets/admin/core.scss

@@ -342,4 +342,8 @@ margin-right: 0;
 }
 .item-custom-field{
   margin-bottom: 15px;
+}
+i.fa {
+  font-size: 15px;
+  &.large{ font-size: 20px; }
 }

data/app/controllers/admin/plugins_controller.rb

@@ -27,6 +27,14 @@ class Admin::PluginsController < AdminController
     redirect_to action: :index
   end
 
+  # permit to upgrade a plugin for a new version
+  def upgrade
+    plugin = plugin_upgrade(params[:plugin_id])
+    flash[:notice] = "Plugin \"#{plugin.title}\" #{t('admin.message.was_upgraded')}"
+    PluginRoutes.reload
+    redirect_to action: :index
+  end
+
   def destroy
     plugin = plugin_destroy(params[:id])
     if plugin.error

data/app/decorators/post_decorator.rb

@@ -72,6 +72,14 @@ class PostDecorator < ApplicationDecorator
     h.edit_admin_post_type_post_url(object.post_type.id, object)
   end
 
+  # create the html link with edit link
+  # return html link
+  # attrs: Hash of link tag attributes, sample: {id: "myid", class: "sss" }
+  def the_edit_link(title = nil, attrs = { })
+    attrs = {target: "_blank", style: "font-size:11px !important;cursor:pointer;"}.merge(attrs)
+    h.link_to("&rarr; #{title || h.ct("edit")}", the_edit_url, *attrs)
+  end
+
   # show thumbnail image as html
   def the_thumb(img_args = {})
     r = {image: h.image_tag(the_thumb_url, img_args), post: object}

data/app/decorators/term_taxonomy_decorator.rb

@@ -77,6 +77,14 @@ class TermTaxonomyDecorator < ApplicationDecorator
     link
   end
 
+  # create the html link with edit link
+  # return html link
+  # attrs: Hash of link tag attributes, sample: {id: "myid", class: "sss" }
+  def the_edit_link(title = nil, attrs = { })
+    attrs = {target: "_blank", style: "font-size:11px !important;cursor:pointer;"}.merge(attrs)
+    h.link_to("&rarr; #{title || h.ct("edit")}", the_edit_url, *attrs)
+  end
+
   # cache identifier, the format is: [current-site-prefix]/[object-id]-[object-last_updated]/[current locale]
   # key: additional key for the model
   def cache_prefix(key = "")

data/app/helpers/plugins_helper.rb

@@ -21,11 +21,23 @@ module PluginsHelper
     (klass || self).send :extend, mod
   end
 
+  # upgrade installed plugin in current site for a new version
+  # plugin_key: key of the plugin
+  # trigger hook "on_upgrade"
+  # return model of the plugin
+  def plugin_upgrade(plugin_key)
+    plugin_model = current_site.plugins.where(slug: plugin_key).first!
+    hook_run(plugin_model.settings, "on_upgrade", plugin_model)
+    plugin_model.installed_version= plugin_model.settings["version"]
+    plugin_model
+  end
+
   # install a plugin for current site
   # plugin_key: key of the plugin
   # return model of the plugin
   def plugin_install(plugin_key)
     plugin_model = current_site.plugins.where(slug: plugin_key).first_or_create!
+    plugin_model.installed_version= plugin_model.settings["version"]
     return plugin_model if plugin_model.active?
     plugin_model.active
     PluginRoutes.reload
@@ -51,6 +63,7 @@ module PluginsHelper
   # plugin_key: key of the plugin
   # return model of the plugin removed
   def plugin_destroy(plugin_key)
+    # return
     plugin_model = current_site.plugins.where(slug: plugin_key).first_or_create
     if !plugin_can_be_deleted?(params[:id]) || true
       plugin_model.error = false

data/app/models/plugin.rb

@@ -41,6 +41,27 @@ class Plugin < TermTaxonomy
     PluginRoutes.plugin_info(self.slug)
   end
 
+  # check if current installation version is older
+  # return boolean
+  def old_version?
+    self.installed_version.to_s != self.settings["version"].to_s
+  end
+
+  # set a new installation version for this plugin
+  def installed_version=(version)
+    self.set_option("version_installed", version)
+  end
+
+  # return gem installed version
+  def installed_version
+    res = self.get_option("version_installed")
+    unless res.present? # fix for old installations
+      res = self.settings["version"]
+      self.installed_version= res
+    end
+    res
+  end
+
   def title
     PluginRoutes.plugin_info(self.slug)["title"]
   end

data/app/views/admin/plugins/_plugins_list.html.erb

@@ -13,12 +13,12 @@
             </tr>
             </thead>
             <tbody>
-            <% plugins.each do |plugin| status = enabled_plugins.include?(plugin); r = {links: []}; %>
+            <% plugins.each do |plugin| status = enabled_plugins.include?(plugin); r = {links: ["Version: #{plugin["version"]}"]}; %>
                 <tr>
                     <td>
-                        <%= plugin["title"] %>
+                        <b><%= plugin["title"] %></b>
                         <br>
-                        <% r[:links] << (link_to("#{t('admin.sidebar.information')}", "http://camaleon.tuzitio.com/store/plugins/info/#{plugin["key"]}", target: "_blank",  title: "#{plugin["title"]}")) %>
+                        <% r[:links] << (link_to("#{t('admin.sidebar.information')}", "http://camaleon.tuzitio.com/store/plugins/info/#{plugin["key"]}", target: "_blank",  title: "Plugin #{t('admin.sidebar.information')}")) %>
                         <% hook_run(plugin, "plugin_options", r) if status %>
                         <%= raw r[:links].join(" | ") %>
                     </td>
@@ -26,7 +26,8 @@
                     <td><%= plugin["version"] %></td>
                     <td><%= t("admin.plugins.status_#{status}") %></td>
                     <td>
-                        <%= link_to raw("<i class='fa fa-#{status ? "check-square" : "square"}'></i>"), {action: :toggle, id: plugin["key"], status: status }, class: "btn btn-default btn-xs", title: "#{status ? t('admin.button.disable_plugin') : t('admin.button.activate_plugin') }" %>
+                        <%= link_to raw("<i class='fa fa-#{status ? "check-square" : "square"}'></i>"), {action: :toggle, id: plugin["key"], status: status }, class: "btn btn-default btn-xs", title: "#{status ? t('admin.button.disable_plugin') : t('admin.button.activate_plugin') }", data: { confirm: "#{"#{status ? t('admin.button.disable_plugin') : t('admin.button.activate_plugin') }"}?" } %>
+                        <%= link_to("<i class='fa fa-arrow-circle-o-up'></i>".html_safe, admin_plugin_upgrade_path(plugin["key"]), class: "btn btn-info btn-xs", title: "#{t("admin.plugins.upgrade_to")} #{plugin["version"]}") if status && current_site.get_plugin(plugin["key"]).old_version? %>
                     </td>
                 </tr>
             <% end %>

data/app/views/admin/plugins/index.html.erb

@@ -32,6 +32,8 @@
 </div>
 <script>
     jQuery(function(){
-        $("#table-plugins-list table").sieve();
+        var table = $("#table-plugins-list table")
+        table.sieve();
+        table.find("a[title!='']").tooltip();
     })
 </script>

data/config/initializers/rufus_cron.rb

@@ -19,18 +19,15 @@ if loaded_rufus
     system("rake camaleon_cms:sitemap")
   end
 
-  # run all custom cron jobs
-  begin
-    Site.all.each do |site|
-      # hooks
-      c = CamaleonController.new
-      c.instance_eval do
-        @current_site = site
-        @_hooks_skip = []
-      end
-      r = {site: site, eval: nil}; c.hooks_run("cron", r)
-      r[:eval].call(r) if r[:eval].present? # evaluate the cron job created by plugin or theme
+  sites = Site.all rescue []
+  sites.each do |site|
+    # triggering cron hooks
+    c = CamaleonController.new
+    c.instance_eval do
+      @current_site = site
+      @_hooks_skip = []
     end
-  rescue  #ActiveRecord::RecordNotFound # skipping pending migrations
+    r = {site: site, eval: nil}; c.hooks_run("cron", r)
+    r[:eval].call(r) if r[:eval].present? # evaluate the cron job created by plugin or theme
   end
 end

data/config/locales/admin/en.yml

@@ -177,6 +177,7 @@ en:
       quick_info: 'Some quick info about this user'
       was_inactivated: 'was inactivated.'
       was_activated: 'was activated.'
+      was_upgraded: 'was updated.'
       can_not_be_removed: 'can not be removed.'
       was_removed: 'was removed.'
       processing: 'Procesando...'
@@ -273,6 +274,7 @@ en:
       status_false: 'Inactive'
       status_true: 'Active'
       type_contents: 'Type Contents'
+      upgrade_to: "Upgrade to"
     settings:
       activate_create_account: 'Activate Create Account'
       activate_login_social_networks: 'Activate Login Social Networks'

data/config/locales/admin/es.yml

@@ -177,6 +177,7 @@ es:
       quick_info: 'Algo de información rápida acerca de este usuario'
       was_inactivated: 'fue desactivado.'
       was_activated: 'fue activado.'
+      was_upgraded: 'fue actualizado.'
       can_not_be_removed: 'no puede ser eliminado.'
       was_removed.: 'fue eliminado.'
       processing: 'Processing...'
@@ -273,6 +274,7 @@ es:
       status_false: 'Inactivo'
       status_true: 'Activo'
       type_contents: 'Tipo de Contenidos'
+      upgrade_to: "Actualizar a"
     settings:
       activate_create_account: 'Activar Crear Cuenta'
       activate_login_social_networks: 'Activar Iniciar sesión con Redes Sociales'

data/config/locales/admin/it.yml

@@ -178,6 +178,7 @@ it:
       quick_info: "Informazioni veloci sull'utente"
       was_inactivated: 'è stato disattivato.'
       was_activated: 'è stato attivato.'
+      was_upgraded: "E 'stato aggiornato."
       can_not_be_removed: 'Non può essere rimosso.'
       was_removed: 'è stato rimosso.'
       processing: 'Caricamento...'
@@ -274,6 +275,7 @@ it:
       status_false: 'Inattivo'
       status_true: 'Attivo'
       type_contents: 'Type Contents'
+      upgrade_to: "Aggiornamento a"
     settings:
       activate_create_account: 'Attiva account creato'
       activate_login_social_networks: 'Attiva i Login con i Social Network'

data/config/locales/common.yml

@@ -20,6 +20,7 @@ en:
     comment_saved: "Your comment was saved"
     comment_error: "An error was occurred on save comment"
     comment_reply: "Reply"
+    edit: "Edit"
 
     recent_posts: "Recent Posts"
 
@@ -81,6 +82,7 @@ es:
     comment_saved: "Su comentario se a guardado"
     comment_error: "Ocurrió un error al enviar su comentario"
     comment_reply: "Respuesta"
+    edit: "Editar"
 
     recent_posts: "Artículos Recientes"
 
@@ -142,6 +144,7 @@ it:
     comment_saved: "Il tuo commento è stato salvato"
     comment_error: "C'è stato un errore durante il salvataggio del commento"
     comment_reply: "Rispondi"
+    edit: "Modifica"
 
     recent_posts: "Articoli recenti"
 

data/config/routes/admin.rb

@@ -102,6 +102,7 @@ Rails.application.routes.draw do
 
     resources :plugins, only: [:index, :destroy] do
       get "toggle", on: :collection
+      get "upgrade"
     end
 
     # installer

data/lib/camaleon_cms/engine.rb

@@ -1,4 +1,5 @@
 $camaleon_engine_dir = File.expand_path("../../../", __FILE__)
+require File.join($camaleon_engine_dir, "lib", "plugin_routes").to_s
 Dir[File.join($camaleon_engine_dir, "lib", "ext", "**", "*.rb")].each{ |f| require f }
 module CamaleonCms
   class Engine < ::Rails::Engine
@@ -6,43 +7,38 @@ module CamaleonCms
       if app.respond_to?(:console)
         app.console do
           puts "******** Camaleon CMS: To use custom models and helpers of installed plugins, write this: ********"
-          puts "include SiteHelper; site_console_switch(Site.first.decorate);"
-          puts "*********** To change current site, use: site_console_switch(site) *************"
+          puts "- include SiteHelper"
+          puts "- site_console_switch(Site.first.decorate)"
         end
       end
     end
 
     initializer :append_migrations do |app|
-      unless defined?(PluginRoutes)
-        require File.join($camaleon_engine_dir, "lib", "generators", "camaleon_cms", "install_template", "plugin_routes").to_s
-        Rails.logger.info "Please copy plugin_routes.rb file in lib/"
-      else
-        engine_dir = File.expand_path("../../../", __FILE__)
-        app.config.i18n.load_path += Dir[File.join($camaleon_engine_dir, 'config', 'locales', '**', '*.{rb,yml}')]
-        app.config.i18n.enforce_available_locales = false
-        PluginRoutes.all_apps.each{ |info| app.config.i18n.load_path += Dir[File.join(info["path"], "config", "locales", '*.{rb,yml}')] }
+      engine_dir = File.expand_path("../../../", __FILE__)
+      app.config.i18n.load_path += Dir[File.join($camaleon_engine_dir, 'config', 'locales', '**', '*.{rb,yml}')]
+      app.config.i18n.enforce_available_locales = false
+      PluginRoutes.all_apps.each{ |info| app.config.i18n.load_path += Dir[File.join(info["path"], "config", "locales", '*.{rb,yml}')] }
 
-        # assets
-        app.config.assets.paths << Rails.root.join("app", "apps")
-        app.config.assets.paths << Rails.root.join('app', 'assets', 'fonts')
-        app.config.assets.paths << File.join($camaleon_engine_dir, "app", "apps")
-        app.config.assets.paths << File.join($camaleon_engine_dir, 'app', 'assets', 'fonts')
-        app.config.encoding = "utf-8"
+      # assets
+      app.config.assets.paths << Rails.root.join("app", "apps")
+      app.config.assets.paths << Rails.root.join('app', 'assets', 'fonts')
+      app.config.assets.paths << File.join($camaleon_engine_dir, "app", "apps")
+      app.config.assets.paths << File.join($camaleon_engine_dir, 'app', 'assets', 'fonts')
+      app.config.encoding = "utf-8"
 
-        #multiple route files
-        app.routes_reloader.paths.push(File.join(engine_dir, "config", "routes", "admin.rb"))
-        app.routes_reloader.paths.push(File.join(engine_dir, "config", "routes", "frontend.rb"))
-        # Dir[File.join(engine_dir, "config", "routes", "*.rb")].each{|r| app.routes_reloader.paths.unshift(r) }
+      #multiple route files
+      app.routes_reloader.paths.push(File.join(engine_dir, "config", "routes", "admin.rb"))
+      app.routes_reloader.paths.push(File.join(engine_dir, "config", "routes", "frontend.rb"))
+      # Dir[File.join(engine_dir, "config", "routes", "*.rb")].each{|r| app.routes_reloader.paths.unshift(r) }
 
-        # extra configuration for plugins
-        app.config.autoload_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")) }
+      # extra configuration for plugins
+      app.config.autoload_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")) }
 
-        # 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
-          end
+      # 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
         end
       end
     end

data/lib/camaleon_cms/version.rb

@@ -1,3 +1,3 @@
 module CamaleonCms
-  VERSION = "0.1.9"
+  VERSION = "0.2.0"
 end

data/lib/ext/string.rb

@@ -16,6 +16,10 @@ class String
     return /^[a-zA-Z][\w\.-]*[a-zA-Z0-9]@[a-zA-Z0-9][\w\.-]*[a-zA-Z0-9]\.[a-zA-Z][a-zA-Z\.]*[a-zA-Z]$/.match(self).present?
   end
 
+  def is_float?
+    self.to_f.to_s == self.to_s
+  end
+
   def is_number?
     self.to_f.to_s == self.to_s || self.to_i.to_s == self.to_s
   end
@@ -25,7 +29,9 @@ class String
   end
 
   def to_var
-    if is_number?
+    if is_float?
+      self.to_f
+    elsif is_number?
       self.to_i
     elsif is_bool?
       self.to_bool

data/lib/generators/camaleon_cms/install_template/plugin_routes.rb

@@ -1,239 +1,23 @@
 require 'json'
 class PluginRoutes
-  @@_vars = []
-  # load plugin routes if it is enabled
-  def self.load(env = "admin")
-    plugins = all_enabled_plugins
-    res = ""
-    if env == "front"
-      res << "namespace :plugins do \n"
-      plugins.each do |plugin|
-        res << "namespace '#{plugin["key"]}' do \n"
-        res << "#{File.open(File.join(plugin["path"], "config", "routes_#{env}.txt")).read}\n" rescue ""
-        res << "end\n"
-      end
-      res << "end\n"
-
-    elsif env == "admin" # admin
-      res << "scope 'admin', as: 'admin' do \n"
-      res << "namespace :plugins do \n"
-      plugins.each do |plugin|
-        res << "namespace '#{plugin["key"]}' do \n"
-        res << "#{File.open(File.join(plugin["path"], "config", "routes_#{env}.txt")).read}\n" rescue ""
-        res << "end\n"
-      end
-      res << "end\n"
-      res << "end\n"
-    else # main
-      plugins.each do |plugin|
-        res << "#{File.open(File.join(plugin["path"], "config", "routes_#{env}.txt")).read}\n" rescue ""
-      end
-    end
-    res + load_themes(env)
-  end
-
-  def self.load_themes(env = "admin")
-    plugins = all_enabled_themes
-    res = ""
-    if env == "front"
-      res << "namespace :themes do \n"
-      plugins.each do |plugin|
-        res << "namespace '#{plugin["key"]}' do \n"
-        res << "#{File.open(File.join(plugin["path"], "config", "routes_#{env}.txt")).read}\n" rescue ""
-        res << "end\n"
-      end
-      res << "end\n"
-
-    elsif env == "admin" # admin
-      res << "scope 'admin', as: 'admin' do \n"
-      res << "namespace :themes do \n"
-      plugins.each do |plugin|
-        res << "namespace '#{plugin["key"]}' do \n"
-        res << "#{File.open(File.join(plugin["path"], "config", "routes_#{env}.txt")).read}\n" rescue ""
-        res << "end\n"
-      end
-      res << "end\n"
-      res << "end\n"
-    else # main
-      plugins.each do |plugin|
-        res << "#{File.open(File.join(plugin["path"], "config", "routes_#{env}.txt")).read}\n" rescue ""
-      end
-    end
-    res
-  end
-
-  # return plugin information
-  def self.plugin_info(plugin_key)
-    self.all_plugins.each{|p| return p if p["key"] == plugin_key }
-    nil
-  end
-
-  # return theme information
-  # if theme_name is nil, the use current site theme
-  def self.theme_info(theme_name)
-    self.all_themes.each{|p| return p if p["key"] == theme_name }
-    nil
-  end
-
-  # return system information
-  def self.system_info
-    camaleon_gem = get_gem('camaleon_cms')
-    return {} if !camaleon_gem
-    r = cache_variable("system_info");  return r unless r.nil?
-    res = JSON.parse(File.read(File.join(camaleon_gem.gem_dir, "config", "system.json")))
-    res = res.with_indifferent_access rescue res
-    return cache_variable("system_info", res) unless File.exist?(system_file = File.join(apps_dir, "..", '..', "config", "system.json"))
-    res = res.merge(JSON.parse(File.read(system_file)).with_indifferent_access).with_indifferent_access
-    res["key"] = "system"
-    res["path"] = ''
-    res["kind"] = "system"
-    res["hooks"] = {} unless res["hooks"].present?
-    res["hooks"]["on_notification"] = (res["hooks"]["on_notification"] || []) + ["admin_system_notifications"]
-    cache_variable("system_info", res)
-  end
-
-  # update a system value
-  # key: attribute name
-  # value: new value for attribute
-  def self.system_info_set(key, val)
-    ff = File.read(File.join(apps_dir, "..", '..', "config", "system.json"))
-    File.open(File.join(apps_dir, "..", '..', "config", "system.json"), "w") do |f|
-      f.write(ff.sub(/"#{key}": ?\"(.*)\"/, "\"#{key}\": \"#{val}\""))
-    end
-    self.reload
-  end
-
-  # reload routes
-  def self.reload
-    @@_vars.each {|v| class_variable_set("@@cache_#{v}", nil) }
-    # WPRails::Application.routes_reloader.reload!
-    Rails.application.reload_routes!
-  end
-
-  # return all enabled plugins []
-  def self.enabled_plugins(site)
-    r = cache_variable("enable_plugins_site_#{site.id}"); return r unless r.nil?
-    res = []
-    enabled_ps = site.plugins.active.pluck(:slug)
-    all_plugins.each do |plugin|
-      res << plugin if enabled_ps.include?(plugin["key"])
-    end
-    res = res.sort_by{|e| e["position"] || 10 }
-    cache_variable("enable_plugins_site_#{site.id}", res)
-  end
-
-  # return all enabled apps for site (themes + system + plugins) []
-  # theme_slug: current theme slug
-  def self.enabled_apps(site, theme_slug = nil)
-    theme_slug = theme_slug || site.get_theme_slug
-    r = cache_variable("enabled_apps_#{site.id}_#{theme_slug}"); return r unless r.nil?
-    res = [system_info()] + enabled_plugins(site) + [theme_info(theme_slug)]
-    cache_variable("enabled_apps_#{site.id}_#{theme_slug}", res)
-  end
-
-  # return all enabled apps as []: system, themes, plugins
-  def self.all_enabled_apps
-    [system_info()] + all_enabled_themes + all_enabled_plugins
-  end
-
-  # return all enabled themes (a theme is enabled if at least one site is assigned)
-  def self.all_enabled_themes
-    r = cache_variable("all_enabled_themes"); return r unless r.nil?
-    res = []
-    get_sites.each do |site|
-      i = theme_info(site.get_theme_slug)
-      res << i if i.present?
-    end
-    cache_variable("all_enabled_themes", res)
-  end
-
-  # return all enabled plugins (a theme is enabled if at least one site has installed)
-  def self.all_enabled_plugins
-    r = cache_variable("all_enabled_plugins"); return r unless r.nil?
-    res, enabled_ps = [], []
-    get_sites.each { |site|  enabled_ps += site.plugins.active.pluck(:slug) }
-    all_plugins.each do |plugin|
-      if enabled_ps.include?(plugin["key"])
-        res << plugin
-      end
-    end
-    cache_variable("all_enabled_plugins", res)
-  end
-
-  # all helpers of enabled plugins for site
-  def self.site_plugin_helpers(site)
-    r = cache_variable("site_plugin_helpers"); return r unless r.nil?
-    res = []
-    enabled_apps(site).each do |settings|
-      res += settings["helpers"] if settings["helpers"].present?
-    end
-    cache_variable("site_plugin_helpers", res)
-  end
-
-  # all helpers of enabled plugins
-  def self.plugin_helpers
-    r = cache_variable("plugins_helper"); return r unless r.nil?
-    res = []
-    all_enabled_apps.each do |settings|
-      res += settings["helpers"] if settings["helpers"].present?
-    end
-    cache_variable("plugins_helper", res)
-  end
-
-  # destroy plugin
-  def self.destroy_plugin(plugin_key)
-    FileUtils.rm_r(Rails.root.join("app", "apps", "plugins", plugin_key)) rescue ""
-    PluginRoutes.reload
-  end
-
-  # destroy theme
-  def self.destroy_theme(theme_key)
-    FileUtils.rm_r(Rails.root.join("app", "apps", "themes", theme_key)) rescue ""
-    PluginRoutes.reload
-  end
-
-  def self.cache_variable(var_name, value=nil)
-    @@_vars.push(var_name).uniq
-    cache = class_variable_get("@@cache_#{var_name}") rescue nil
-    return cache if value.nil?
-    class_variable_set("@@cache_#{var_name}", value)
-    value
-  end
-
-  # return all sites registered for Plugin routes
-  def self.get_sites
-    r = cache_variable("site_get_sites"); return r unless r.nil?
-    res = {}
-    begin
-      res = Site.eager_load(:metas).order(term_group: :desc).all
-    rescue
-    end
-    cache_variable("site_get_sites", res)
-  end
-
-  # return all locales for all sites joined by |
-  def self.all_locales
-    r = cache_variable("site_all_locales"); return r unless r.nil?
-    res = []
-    get_sites.each do |s|
-      res += s.get_languages
-    end
-    cache_variable("site_all_locales", res.uniq.join("|"))
-  end
-
   # draw "all" gems registered for the plugins or themes and camaleon gems
   def self.draw_gems
     res = []
+    dirs = [] + Dir["#{apps_dir}/plugins/*"] + Dir["#{apps_dir}/themes/*"]
     # recovering gem dependencies
     if camaleon_gem = get_gem('camaleon_cms')
-      res << File.read(File.join(camaleon_gem.gem_dir, "lib", "Gemfile")).gsub("source 'https://rubygems.org'", "")
+      gem_file = File.join(camaleon_gem.gem_dir, "lib", "Gemfile")
+      res << File.read(gem_file).gsub("source 'https://rubygems.org'", "") if File.exist?(gem_file)
     else
-      puts "******** Warning: You need to install camaleon_cms gem. *********"
-      return ""
+      # recover cached gemfile
+      gem_file = File.join(apps_dir, "..", "..", "lib", "Gemfile_camaleon")
+      res << File.read(gem_file).gsub("source 'https://rubygems.org'", "") if File.exist?(gem_file)
     end
-    (self.all_themes + self.all_plugins).each do |item|
-      f = File.join(item["path"], "config", "Gemfile")
-      res << File.read(f) if File.exist?(f)
+
+    dirs.each do |path|
+      next if [".", ".."].include?(path)
+      g = File.join(path, "config", "Gemfile")
+      res << File.read(g) if File.exist?(g)
     end
     res.join("\n")
   end
@@ -245,56 +29,6 @@ class PluginRoutes
     dir.join("/")+ '/app/apps'
   end
 
-  # return all plugins located in cms and in this project
-  def self.all_plugins
-    camaleon_gem = get_gem('camaleon_cms')
-    return [] if !camaleon_gem
-    r = cache_variable("all_plugins"); return r unless (r.nil? || r == [])
-    res = []
-    entries = [".", ".."]
-    (Dir["#{apps_dir}/plugins/*"] + Dir["#{camaleon_gem.gem_dir}/app/apps/plugins/*"]).each do |path|
-      entry = path.split("/").last
-      config = File.join(path, "config", "config.json")
-      next if entries.include?(entry) || !File.directory?(path) || !File.exist?(config)
-      p = JSON.parse(File.read(config))
-      p = p.with_indifferent_access rescue p
-      p["key"] = entry
-      p["path"] = path
-      p["kind"] = "plugin"
-      res << p
-      entries << entry
-    end
-    cache_variable("all_plugins", res)
-  end
-
-  # return an array of all themes installed for all sites
-  def self.all_themes
-    camaleon_gem = get_gem('camaleon_cms')
-    return [] if !camaleon_gem
-    r = cache_variable("all_themes"); return r unless (r.nil? || r == [])
-    res = []
-    entries = [".", ".."]
-    (Dir["#{apps_dir}/themes/*"] + Dir["#{camaleon_gem.gem_dir}/app/apps/themes/*"]).each do |path|
-      entry = path.split("/").last
-      config = File.join(path, "config", "config.json")
-      next if entries.include?(entry) || !File.directory?(path) || !File.exist?(config)
-      p = JSON.parse(File.read(config))
-      p = p.with_indifferent_access rescue p
-      p["key"] = entry
-      p["path"] = path
-      p["kind"] = "theme"
-      p["title"] = p["name"]
-      res << p
-      entries << entry
-    end
-    cache_variable("all_themes", res)
-  end
-
-  # return all apps loaded
-  def self.all_apps
-    all_plugins+all_themes
-  end
-
   # check if a gem is available or not
   # Arguemnts:
   # name: name of the gem

data/lib/generators/cplugin_template/app/apps/plugins/my_plugin/config/config.json

@@ -12,6 +12,9 @@
     ],
     "on_inactive": [
       "pluginKey_on_inactive"
+    ],
+    "on_upgrade": [
+      "pluginKey_on_upgrade"
     ]
     //here you can add all your hooks (read documentation)
   }

data/lib/generators/cplugin_template/app/apps/plugins/my_plugin/main_helper.rb

@@ -14,4 +14,9 @@ module Plugins::PluginClass::MainHelper
   # plugin: plugin model
   def pluginKey_on_inactive(plugin)
   end
+
+  # here all actions to upgrade for a new version
+  # plugin: plugin model
+  def pluginKey_on_upgrade(plugin)
+  end
 end

data/lib/plugin_routes.rb

@@ -0,0 +1,290 @@
+require 'json'
+class PluginRoutes
+  @@_vars = []
+  # load plugin routes if it is enabled
+  def self.load(env = "admin")
+    plugins = all_enabled_plugins
+    res = ""
+    if env == "front"
+      res << "namespace :plugins do \n"
+      plugins.each do |plugin|
+        res << "namespace '#{plugin["key"]}' do \n"
+        res << "#{File.open(File.join(plugin["path"], "config", "routes_#{env}.txt")).read}\n" rescue ""
+        res << "end\n"
+      end
+      res << "end\n"
+
+    elsif env == "admin" # admin
+      res << "scope 'admin', as: 'admin' do \n"
+      res << "namespace :plugins do \n"
+      plugins.each do |plugin|
+        res << "namespace '#{plugin["key"]}' do \n"
+        res << "#{File.open(File.join(plugin["path"], "config", "routes_#{env}.txt")).read}\n" rescue ""
+        res << "end\n"
+      end
+      res << "end\n"
+      res << "end\n"
+    else # main
+      plugins.each do |plugin|
+        res << "#{File.open(File.join(plugin["path"], "config", "routes_#{env}.txt")).read}\n" rescue ""
+      end
+    end
+    res + load_themes(env)
+  end
+
+  def self.load_themes(env = "admin")
+    plugins = all_enabled_themes
+    res = ""
+    if env == "front"
+      res << "namespace :themes do \n"
+      plugins.each do |plugin|
+        res << "namespace '#{plugin["key"]}' do \n"
+        res << "#{File.open(File.join(plugin["path"], "config", "routes_#{env}.txt")).read}\n" rescue ""
+        res << "end\n"
+      end
+      res << "end\n"
+
+    elsif env == "admin" # admin
+      res << "scope 'admin', as: 'admin' do \n"
+      res << "namespace :themes do \n"
+      plugins.each do |plugin|
+        res << "namespace '#{plugin["key"]}' do \n"
+        res << "#{File.open(File.join(plugin["path"], "config", "routes_#{env}.txt")).read}\n" rescue ""
+        res << "end\n"
+      end
+      res << "end\n"
+      res << "end\n"
+    else # main
+      plugins.each do |plugin|
+        res << "#{File.open(File.join(plugin["path"], "config", "routes_#{env}.txt")).read}\n" rescue ""
+      end
+    end
+    res
+  end
+
+  # return plugin information
+  def self.plugin_info(plugin_key)
+    self.all_plugins.each{|p| return p if p["key"] == plugin_key }
+    nil
+  end
+
+  # return theme information
+  # if theme_name is nil, the use current site theme
+  def self.theme_info(theme_name)
+    self.all_themes.each{|p| return p if p["key"] == theme_name }
+    nil
+  end
+
+  # return system information
+  def self.system_info
+    camaleon_gem = get_gem('camaleon_cms')
+    return {} if !camaleon_gem
+    r = cache_variable("system_info");  return r unless r.nil?
+    res = JSON.parse(File.read(File.join(camaleon_gem.gem_dir, "config", "system.json")))
+    res = res.with_indifferent_access rescue res
+    return cache_variable("system_info", res) unless File.exist?(system_file = File.join(apps_dir, "..", '..', "config", "system.json"))
+    res = res.merge(JSON.parse(File.read(system_file)).with_indifferent_access).with_indifferent_access
+    res["key"] = "system"
+    res["path"] = ''
+    res["kind"] = "system"
+    res["hooks"] = {} unless res["hooks"].present?
+    res["hooks"]["on_notification"] = (res["hooks"]["on_notification"] || []) + ["admin_system_notifications"]
+    cache_variable("system_info", res)
+  end
+
+  # update a system value
+  # key: attribute name
+  # value: new value for attribute
+  def self.system_info_set(key, val)
+    ff = File.read(File.join(apps_dir, "..", '..', "config", "system.json"))
+    File.open(File.join(apps_dir, "..", '..', "config", "system.json"), "w") do |f|
+      f.write(ff.sub(/"#{key}": ?\"(.*)\"/, "\"#{key}\": \"#{val}\""))
+    end
+    self.reload
+  end
+
+  # reload routes
+  def self.reload
+    @@_vars.each {|v| class_variable_set("@@cache_#{v}", nil) }
+    # WPRails::Application.routes_reloader.reload!
+    Rails.application.reload_routes!
+  end
+
+  # return all enabled plugins []
+  def self.enabled_plugins(site)
+    r = cache_variable("enable_plugins_site_#{site.id}"); return r unless r.nil?
+    res = []
+    enabled_ps = site.plugins.active.pluck(:slug)
+    all_plugins.each do |plugin|
+      res << plugin if enabled_ps.include?(plugin["key"])
+    end
+    res = res.sort_by{|e| e["position"] || 10 }
+    cache_variable("enable_plugins_site_#{site.id}", res)
+  end
+
+  # return all enabled apps for site (themes + system + plugins) []
+  # theme_slug: current theme slug
+  def self.enabled_apps(site, theme_slug = nil)
+    theme_slug = theme_slug || site.get_theme_slug
+    r = cache_variable("enabled_apps_#{site.id}_#{theme_slug}"); return r unless r.nil?
+    res = [system_info()] + enabled_plugins(site) + [theme_info(theme_slug)]
+    cache_variable("enabled_apps_#{site.id}_#{theme_slug}", res)
+  end
+
+  # return all enabled apps as []: system, themes, plugins
+  def self.all_enabled_apps
+    [system_info()] + all_enabled_themes + all_enabled_plugins
+  end
+
+  # return all enabled themes (a theme is enabled if at least one site is assigned)
+  def self.all_enabled_themes
+    r = cache_variable("all_enabled_themes"); return r unless r.nil?
+    res = []
+    get_sites.each do |site|
+      i = theme_info(site.get_theme_slug)
+      res << i if i.present?
+    end
+    cache_variable("all_enabled_themes", res)
+  end
+
+  # return all enabled plugins (a theme is enabled if at least one site has installed)
+  def self.all_enabled_plugins
+    r = cache_variable("all_enabled_plugins"); return r unless r.nil?
+    res, enabled_ps = [], []
+    get_sites.each { |site|  enabled_ps += site.plugins.active.pluck(:slug) }
+    all_plugins.each do |plugin|
+      if enabled_ps.include?(plugin["key"])
+        res << plugin
+      end
+    end
+    cache_variable("all_enabled_plugins", res)
+  end
+
+  # all helpers of enabled plugins for site
+  def self.site_plugin_helpers(site)
+    r = cache_variable("site_plugin_helpers"); return r unless r.nil?
+    res = []
+    enabled_apps(site).each do |settings|
+      res += settings["helpers"] if settings["helpers"].present?
+    end
+    cache_variable("site_plugin_helpers", res)
+  end
+
+  # all helpers of enabled plugins
+  def self.plugin_helpers
+    r = cache_variable("plugins_helper"); return r unless r.nil?
+    res = []
+    all_enabled_apps.each do |settings|
+      res += settings["helpers"] if settings["helpers"].present?
+    end
+    cache_variable("plugins_helper", res)
+  end
+
+  # destroy plugin
+  def self.destroy_plugin(plugin_key)
+    FileUtils.rm_r(Rails.root.join("app", "apps", "plugins", plugin_key)) rescue ""
+    PluginRoutes.reload
+  end
+
+  # destroy theme
+  def self.destroy_theme(theme_key)
+    FileUtils.rm_r(Rails.root.join("app", "apps", "themes", theme_key)) rescue ""
+    PluginRoutes.reload
+  end
+
+  def self.cache_variable(var_name, value=nil)
+    @@_vars.push(var_name).uniq
+    cache = class_variable_get("@@cache_#{var_name}") rescue nil
+    return cache if value.nil?
+    class_variable_set("@@cache_#{var_name}", value)
+    value
+  end
+
+  # return all sites registered for Plugin routes
+  def self.get_sites
+    r = cache_variable("site_get_sites"); return r unless r.nil?
+    res = {}
+    begin
+      res = Site.eager_load(:metas).order(term_group: :desc).all
+    rescue
+    end
+    cache_variable("site_get_sites", res)
+  end
+
+  # return all locales for all sites joined by |
+  def self.all_locales
+    r = cache_variable("site_all_locales"); return r unless r.nil?
+    res = []
+    get_sites.each do |s|
+      res += s.get_languages
+    end
+    cache_variable("site_all_locales", res.uniq.join("|"))
+  end
+
+  # return apps directory path
+  def self.apps_dir
+    Rails.root.join("app", "apps").to_s
+  end
+
+  # return all plugins located in cms and in this project
+  def self.all_plugins
+    camaleon_gem = get_gem('camaleon_cms')
+    return [] if !camaleon_gem
+    r = cache_variable("all_plugins"); return r unless (r.nil? || r == [])
+    res = []
+    entries = [".", ".."]
+    (Dir["#{apps_dir}/plugins/*"] + Dir["#{camaleon_gem.gem_dir}/app/apps/plugins/*"]).each do |path|
+      entry = path.split("/").last
+      config = File.join(path, "config", "config.json")
+      next if entries.include?(entry) || !File.directory?(path) || !File.exist?(config)
+      p = JSON.parse(File.read(config))
+      p = p.with_indifferent_access rescue p
+      p["key"] = entry
+      p["path"] = path
+      p["kind"] = "plugin"
+      res << p
+      entries << entry
+    end
+    cache_variable("all_plugins", res)
+  end
+
+  # return an array of all themes installed for all sites
+  def self.all_themes
+    camaleon_gem = get_gem('camaleon_cms')
+    return [] if !camaleon_gem
+    r = cache_variable("all_themes"); return r unless (r.nil? || r == [])
+    res = []
+    entries = [".", ".."]
+    (Dir["#{apps_dir}/themes/*"] + Dir["#{camaleon_gem.gem_dir}/app/apps/themes/*"]).each do |path|
+      entry = path.split("/").last
+      config = File.join(path, "config", "config.json")
+      next if entries.include?(entry) || !File.directory?(path) || !File.exist?(config)
+      p = JSON.parse(File.read(config))
+      p = p.with_indifferent_access rescue p
+      p["key"] = entry
+      p["path"] = path
+      p["kind"] = "theme"
+      p["title"] = p["name"]
+      res << p
+      entries << entry
+    end
+    cache_variable("all_themes", res)
+  end
+
+  # return all apps loaded
+  def self.all_apps
+    all_plugins+all_themes
+  end
+
+  # check if a gem is available or not
+  # Arguemnts:
+  # name: name of the gem
+  # return (Boolean) true/false
+  def self.get_gem(name)
+    Gem::Specification.find_by_name(name)
+  rescue Gem::LoadError
+    false
+  rescue
+    Gem.available?(name)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: camaleon_cms
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - Owen Peredo Diaz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-03 00:00:00.000000000 Z
+date: 2015-09-05 00:00:00.000000000 Z
 dependencies: []
 description: Camaleon CMS is a dynamic and advanced content management system based
   on Ruby on Rails 4 as an alternative to Wordpress.
@@ -653,6 +653,7 @@ files:
 - lib/generators/ctheme_template/app/apps/themes/my_theme/views/index.html.erb
 - lib/generators/ctheme_template/app/apps/themes/my_theme/views/layouts/index.html.erb
 - lib/generators/ctheme_template/app/apps/themes/my_theme/views/partials/readme.txt
+- lib/plugin_routes.rb
 - lib/tasks/camaleon_cms_tasks.rake
 - test/camaleon_cms_test.rb
 - test/integration/navigation_test.rb
@@ -669,13 +670,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-requirements: []
+requirements:
+- rails >= 4.1
+- ruby >= 1.9.3
+- imagemagick
 rubyforge_project: 
 rubygems_version: 2.4.8
 signing_key: