camaleon_cms 1.1.0 → 2.0.1

data/config/routes/frontend.rb

@@ -1,35 +1,47 @@
 Rails.application.routes.draw do
-  scope "(:locale)", locale: /#{PluginRoutes.all_locales}/, :defaults => {  } do
-    root 'frontend#index'
-
-    controller :frontend do
-      PluginRoutes.all_locales.split("|").each do |_l|
-        get "#{I18n.t("routes.group", default: "group", locale: _l)}/:post_type_id-:title" => :post_type, as: "post_type_#{_l}", constraints: {post_type_id: /[0-9]+/}
-        get "#{I18n.t("routes.category", default: "category", locale: _l)}/:category_id-:title" => :category, as: "category_#{_l}", constraints: {category_id: /[0-9]+/}
-        get "#{I18n.t("routes.tag", default: "tag", locale: _l)}/:post_tag_id-:title" => :post_tag, as: "post_tag_#{_l}", constraints: {post_tag_id: /[0-9]+/}
-        get "#{I18n.t("routes.profile", default: "profile", locale: _l)}/:user_id-:user_name" => :profile, constraints: {user_id: /[0-9]+/}, as: "profile_#{_l}"
-        get "#{I18n.t("routes.search", default: "search", locale: _l)}" => :search, as: "search_#{_l}"
-      end
+  scope PluginRoutes.system_info["relative_url_root"], as: "cama" do
+    scope "(:locale)", locale: /#{PluginRoutes.all_locales}/, :defaults => {  } do
+      root 'camaleon_cms/frontend#index'
 
-      get 'group/:post_type_id-:title' => :post_type, as: :post_type, constraints: {post_type_id: /[0-9]+/}
-      get 'category/:category_id-:title' => :category, as: :category, constraints: {category_id: /[0-9]+/}
-      get 'post_tag/:post_tag_id-:title' => :post_tag, as: :post_tag, constraints: {post_tag_id: /[0-9]+/}
+      controller "camaleon_cms/frontend" do
+        PluginRoutes.all_locales.split("|").each do |_l|
+          get "#{I18n.t("routes.group", default: "group", locale: _l)}/:post_type_id-:title" => :post_type, as: "post_type_#{_l}", constraints: {post_type_id: /[0-9]+/}
+          get "#{I18n.t("routes.group", default: "group", locale: _l)}/:post_type_id-:title/:slug" => :post, as: "post_of_post_type_#{_l}", constraints: {post_type_id: /[0-9]+/}
 
-      get "profile/:user_id-:user_name" => :profile, as: :profile, constraints: {user_id: /[0-9]+/}
-      get 'search' => :search, as: :search
-      post 'save_comment/:post_id' => :save_comment, as: :save_comment
-      post 'save_form' => :save_form, as: :save_form
+          get "#{I18n.t("routes.category", default: "category", locale: _l)}/:category_id-:title" => :category, as: "category_#{_l}", constraints: {category_id: /[0-9]+/}
+          get "#{I18n.t("routes.category", default: "category", locale: _l)}/:category_id-:title/:slug" => :post, as: "post_of_category_#{_l}", constraints: {category_id: /[0-9]+/}
+          get ":post_type_title/#{I18n.t("routes.category", default: "category", locale: _l)}/:category_id-:title/:slug" => :post, as: "post_of_category_post_type_#{_l}", constraints:{ post_type_title: /(?!(#{PluginRoutes.all_locales}))[\w]+/, category_id: /[0-9]+/ }
 
-      # sitemap
-      get "sitemap" => :sitemap, as: :sitemap, defaults: { format: :xml }
-      get "robots" => :robots, as: :robots, defaults: { format: :txt }
-      get "rss", defaults: { format: "rss" }
-      get "ajax"
-    end
+          get "#{I18n.t("routes.tag", default: "tag", locale: _l)}/:post_tag_id-:title" => :post_tag, as: "post_tag_#{_l}", constraints: {post_tag_id: /[0-9]+/}
+          get "#{I18n.t("routes.tag", default: "tag", locale: _l)}/:post_tag_id-:title/:slug" => :post, as: "post_of_tag_#{_l}", constraints: {post_tag_id: /[0-9]+/}
+
+          get "#{I18n.t("routes.profile", default: "profile", locale: _l)}/:user_id-:user_name" => :profile, constraints: {user_id: /[0-9]+/}, as: "profile_#{_l}"
+          get "#{I18n.t("routes.search", default: "search", locale: _l)}" => :search, as: "search_#{_l}"
+        end
 
-    instance_eval(PluginRoutes.load("front"))
+        get "profile/:user_id-:user_name" => :profile, as: :profile, constraints: {user_id: /[0-9]+/}
+        get 'search' => :search, as: :search
+        get ':post_type_title/:slug' => :post, as: :post_of_posttype, constraints:{ post_type_title: /(?!(#{PluginRoutes.all_locales}))[\w]+/ }
+
+        post 'save_comment/:post_id' => :save_comment, as: :save_comment
+        post 'save_form' => :save_form, as: :save_form
+
+        # sitemap
+        get "sitemap" => :sitemap, as: :sitemap, defaults: { format: :xml }
+        get "robots" => :robots, as: :robots, defaults: { format: :txt }
+        get "rss", defaults: { format: "rss" }
+        get "ajax"
+      end
 
-    get "*slug" => 'frontend#post', format: true, :as => :post1, defaults: { format: :html }, constraints: { slug: /(?!admin)[a-zA-Z0-9\._=\s\-\/]+/}
-    get "*slug" => 'frontend#post', :as => :post, constraints: { slug: /(?!admin)[a-zA-Z0-9\._=\s\-\/]+/}
+      get ":slug" => 'camaleon_cms/frontend#post', format: true, :as => :post1, defaults: { format: :html }, constraints: { slug: /(?!admin)[a-zA-Z0-9\._=\s\-]+/}
+      get ":slug" => 'camaleon_cms/frontend#post', :as => :post, constraints: { slug: /(?!admin)[a-zA-Z0-9\._=\s\-]+/}
+    end
   end
+
+  scope PluginRoutes.system_info["relative_url_root"] do
+    scope "(:locale)", locale: /#{PluginRoutes.all_locales}/, :defaults => {  } do
+      instance_eval(PluginRoutes.load("front"))
+    end
+  end
+
 end

data/config/system.json

@@ -3,11 +3,13 @@
   "hooks": { }, // system hooks
   //"skip_format_url": true, // enable or disable .html extension in the urls.
   "default_plugins": ["front_cache", "contact_form", "attack"], // Default plugins installed for each new site
-  "available_languages": ["es", "en", "fr", "zh", "de", "it", "pt"], // Available languages for frontend panel, here all locales: https://github.com/svenfuchs/rails-i18n
-  "admin_available_languages": ["en", "es", "it"], //Available languages for the admin panel
+  "available_languages": ["es", "en", "fr", "zh", "de", "it", "pt_br"], // Available languages for frontend panel, here all locales: https://github.com/svenfuchs/rails-i18n
+  "admin_available_languages": ["en", "es", "it", "pt_br"], //Available languages for the admin panel
   "base_domain": "localhost:3000", // primary domain
   "default_user_role": "client", // default user role for all new users
-  "users_share_sites": true //(boolean) true: permit to share users between sites, false: All users are assigned for an unique site.
+  "users_share_sites": true, //(boolean) true: permit to share users between sites, false: All users are assigned for an unique site.
+  "db_prefix": "", // prefix name for database tables
+  "relative_url_root": "" // URL prefix, for example to get http://localhost:3000/blog/, this should be "blog"
 }
 
 // Note: after any change in this file, you need to restart your server to apply changes.

data/db/migrate/20150611161134_post_table_into_utf8.rb

@@ -1,6 +1,6 @@
 class PostTableIntoUtf8 < ActiveRecord::Migration
   def change
-    create_table "users" do |t|
+    create_table "#{PluginRoutes.static_system_info["db_prefix"]}users" do |t|
       t.string   "username", index: true
       t.string   "role", default: "client", index: true
       t.string   "email", index: true
@@ -13,11 +13,11 @@ class PostTableIntoUtf8 < ActiveRecord::Migration
       t.datetime "last_login_at"
 
       # t.integer  "site_id",   default: -1, index: true
-      t.timestamps
+      t.timestamps null: false
       t.belongs_to :site, index: true, default: -1#, foreign_key: true
     end
 
-    create_table "term_taxonomy" do |t|
+    create_table "#{PluginRoutes.static_system_info["db_prefix"]}term_taxonomy" do |t|
       t.string   "taxonomy", index: true
       t.text     "description", limit: 1073741823
       t.integer  "parent_id", index: true
@@ -28,11 +28,11 @@ class PostTableIntoUtf8 < ActiveRecord::Migration
       t.integer  "term_order", index: true
       t.string   "status"
 
-      t.timestamps
+      t.timestamps null: false
       t.belongs_to :user, index: true#, foreign_key: true
     end
 
-    create_table "posts" do |t|
+    create_table "#{PluginRoutes.static_system_info["db_prefix"]}posts" do |t|
       t.string   "title"
       t.string   "slug", index: true
       t.text     "content",          limit: 1073741823
@@ -45,17 +45,17 @@ class PostTableIntoUtf8 < ActiveRecord::Migration
       t.text     "visibility_value"
       t.string   "post_class", default: "Post", index: true
 
-      t.timestamps
+      t.timestamps null: false
       t.belongs_to :user, index: true#, foreign_key: true
     end
 
-    create_table "term_relationships" do |t|
+    create_table "#{PluginRoutes.static_system_info["db_prefix"]}term_relationships" do |t|
       t.integer "objectid", index: true
       t.integer "term_order", index: true
       t.belongs_to :term_taxonomy, index: true
     end
 
-    create_table "user_relationships" do |t|
+    create_table "#{PluginRoutes.static_system_info["db_prefix"]}user_relationships" do |t|
       t.integer "term_order"
       t.integer "active", default: 1
 
@@ -63,7 +63,7 @@ class PostTableIntoUtf8 < ActiveRecord::Migration
       t.belongs_to :user, index: true
     end
 
-    create_table "comments" do |t|
+    create_table "#{PluginRoutes.static_system_info["db_prefix"]}comments" do |t|
       t.string   "author"
       t.string   "author_email"
       t.string   "author_url"
@@ -75,10 +75,10 @@ class PostTableIntoUtf8 < ActiveRecord::Migration
       t.integer  "comment_parent", index: true
       t.belongs_to :post, index: true#, foreign_key: true
       t.belongs_to :user, index: true#, foreign_key: true
-      t.timestamps
+      t.timestamps null: false
     end
 
-    create_table "custom_fields" do |t|
+    create_table "#{PluginRoutes.static_system_info["db_prefix"]}custom_fields" do |t|
       t.string  "object_class", index: true
       t.string  "name"
       t.string  "slug", index: true
@@ -91,7 +91,7 @@ class PostTableIntoUtf8 < ActiveRecord::Migration
       t.string  "status"
     end
 
-    create_table "custom_fields_relationships" do |t|
+    create_table "#{PluginRoutes.static_system_info["db_prefix"]}custom_fields_relationships" do |t|
       t.integer "objectid", index: true
       t.integer "custom_field_id", index: true
       t.integer "term_order"
@@ -100,7 +100,7 @@ class PostTableIntoUtf8 < ActiveRecord::Migration
       t.string  "custom_field_slug", index: true
     end
 
-    create_table "metas" do |t|
+    create_table "#{PluginRoutes.static_system_info["db_prefix"]}metas" do |t|
       t.string  "key", index: true
       t.text    "value", limit: 1073741823
       t.integer "objectid", index: true
@@ -108,8 +108,8 @@ class PostTableIntoUtf8 < ActiveRecord::Migration
     end
 
     if ActiveRecord::Base.connection.adapter_name.downcase.include?("mysql")
-      ActiveRecord::Base.connection.execute "ALTER TABLE posts CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;" rescue nil
-      ActiveRecord::Base.connection.execute "ALTER TABLE custom_fields_relationships CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;" rescue nil
+      ActiveRecord::Base.connection.execute "ALTER TABLE #{PluginRoutes.static_system_info["db_prefix"]}posts CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;" rescue nil
+      ActiveRecord::Base.connection.execute "ALTER TABLE #{PluginRoutes.static_system_info["db_prefix"]}custom_fields_relationships CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;" rescue nil
     end
   end
 end

data/db/migrate/20150926095310_rename_column_posts.rb

@@ -1,10 +1,10 @@
 # change post structure to optimize query speed
 class RenameColumnPosts < ActiveRecord::Migration
   def change
-    remove_column :posts, :comment_count
-    add_column :posts, :post_order, :integer, default: 0
-    add_column :posts, :taxonomy_id, :integer, default: nil, index: true
-    Post.all.each do |post|
+    remove_column "#{PluginRoutes.static_system_info["db_prefix"]}posts", :comment_count
+    add_column "#{PluginRoutes.static_system_info["db_prefix"]}posts", :post_order, :integer, default: 0
+    add_column "#{PluginRoutes.static_system_info["db_prefix"]}posts", :taxonomy_id, :integer, default: nil, index: true
+    CamaleonCms::Post.all.each do |post|
       begin
         post_id = post.get_post_type_depre.id
         post.update_column("taxonomy_id", post_id)

data/lib/camaleon_cms/engine.rb

@@ -1,21 +1,15 @@
 require 'rubygems'
-require 'actionpack/page_caching'
 require 'bcrypt'
 require 'cancancan'
 require 'draper'
-require 'dynamic_sitemaps'
-require 'el_finder'
 require 'meta-tags'
 require 'mini_magick'
 require 'mobu'
 require 'protected_attributes'
-require 'rufus-scheduler'
 require 'will_paginate'
 require 'will_paginate-bootstrap'
-require 'doorkeeper'
-require 'responders'
-require 'swagger/docs'
-require 'active_model_serializers'
+require 'breadcrumbs_on_rails'
+require 'fog'
 
 $camaleon_engine_dir = File.expand_path("../../../", __FILE__)
 require File.join($camaleon_engine_dir, "lib", "plugin_routes").to_s
@@ -27,7 +21,7 @@ module CamaleonCms
         app.console do
           puts "******** Camaleon CMS: To use custom models and helpers of installed plugins, write this: ********"
           puts "- include SiteHelper"
-          puts "- site_console_switch(Site.first.decorate)"
+          puts "- site_console_switch(CamaleonCms::Site.first.decorate)"
         end
       end
     end
@@ -45,6 +39,9 @@ module CamaleonCms
       app.config.assets.paths << File.join($camaleon_engine_dir, 'app', 'assets', 'fonts')
       app.config.encoding = "utf-8"
 
+      # add prefix url, like: http://localhost.com/blog/
+      # config.action_controller.relative_url_root = PluginRoutes.system_info["relative_url_root"] if PluginRoutes.system_info["relative_url_root"].present?
+
       #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"))

data/lib/camaleon_cms/version.rb

@@ -1,3 +1,3 @@
 module CamaleonCms
-  VERSION = "1.1.0"
+  VERSION = "2.0.1"
 end

data/lib/ext/string.rb

@@ -1,6 +1,4 @@
 class String
-
-
   def to_bool
     return true if self == true || self =~ (/(true|t|yes|y|1)$/i)
     return false if self == false || self.blank? || self =~ (/(false|f|no|n|0)$/i)
@@ -43,6 +41,7 @@ class String
   def split_bar
     self.split(',').map{|us_id| us_id.gsub('__','')}.uniq
   end
+
   def include_bar?(uid)
     self.include?("__#{uid}__")
   end
@@ -74,33 +73,8 @@ class String
     quantity += tmp.slice(quantity, tmp.length).to_s.index(" ").nil? ? tmp.length : tmp.slice(quantity, tmp.length).to_s.index(" ")
     tmp.slice(0, quantity)
   end
-  
-  def strip_stopwords(language = "es")
-    if language == "en"
-      words = ["a", "about", "above", "above", "across", "after", "afterwards", "again", "against", "all", "almost", "alone", "along", "already", "also","although","always","am","among", "amongst", "amoungst", "amount",  "an", "and", "another", "any","anyhow","anyone","anything","anyway", "anywhere", "are", "around", "as",  "at", "back","be","became", "because","become","becomes", "becoming", "been", "before", "beforehand", "behind", "being", "below", "beside", "besides", "between", "beyond", "bill", "both", "bottom","but", "by", "call", "can", "cannot", "cant", "co", "con", "could", "couldnt", "cry", "de", "describe", "detail", "do", "done", "down", "due", "during", "each", "eg", "eight", "either", "eleven","else", "elsewhere", "empty", "enough", "etc", "even", "ever", "every", "everyone", "everything", "everywhere", "except", "few", "fifteen", "fify", "fill", "find", "fire", "first", "five", "for", "former", "formerly", "forty", "found", "four", "from", "front", "full", "further", "get", "give", "go", "had", "has", "hasnt", "have", "he", "hence", "her", "here", "hereafter", "hereby", "herein", "hereupon", "hers", "herself", "him", "himself", "his", "how", "however", "hundred", "ie", "if", "in", "inc", "indeed", "interest", "into", "is", "it", "its", "itself", "keep", "last", "latter", "latterly", "least", "less", "ltd", "made", "many", "may", "me", "meanwhile", "might", "mill", "mine", "more", "moreover", "most", "mostly", "move", "much", "must", "my", "myself", "name", "namely", "neither", "never", "nevertheless", "next", "nine", "no", "nobody", "none", "noone", "nor", "not", "nothing", "now", "nowhere", "of", "off", "often", "on", "once", "one", "only", "onto", "or", "other", "others", "otherwise", "our", "ours", "ourselves", "out", "over", "own","part", "per", "perhaps", "please", "put", "rather", "re", "same", "see", "seem", "seemed", "seeming", "seems", "serious", "several", "she", "should", "show", "side", "since", "sincere", "six", "sixty", "so", "some", "somehow", "someone", "something", "sometime", "sometimes", "somewhere", "still", "such", "system", "take", "ten", "than", "that", "the", "their", "them", "themselves", "then", "thence", "there", "thereafter", "thereby", "therefore", "therein", "thereupon", "these", "they", "thickv", "thin", "third", "this", "those", "though", "three", "through", "throughout", "thru", "thus", "to", "together", "too", "top", "toward", "towards", "twelve", "twenty", "two", "un", "under", "until", "up", "upon", "us", "very", "via", "was", "we", "well", "were", "what", "whatever", "when", "whence", "whenever", "where", "whereafter", "whereas", "whereby", "wherein", "whereupon", "wherever", "whether", "which", "while", "whither", "who", "whoever", "whole", "whom", "whose", "why", "will", "with", "within", "without", "would", "yet", "you", "your", "yours", "yourself", "yourselves", "the"]
-    else
-      words = ["un", "una", "unas", "unos", "uno", "sobre", "todo", "tambien", "tras", "otro", "algun", "alguno", "alguna", "algunos", "algunas", "ser", "es", "soy", "eres", "somos", "sois", "estoy", "esta", "estamos", "estais", "estan", "como", "en", "para", "atras", "porque", "por", "que", "estado", "estaba", "ante", "antes", "siendo", "ambos", "pero", "por", "poder", "puede", "puedo", "podemos", "podeis", "pueden", "fui", "fue", "fuimos", "fueron", "hacer", "hago", "hace", "hacemos", "haceis", "hacen", "cada", "fin", "incluso", "primero", "desde", "conseguir", "consigo", "consigue", "consigues", "conseguimos", "consiguen", "ir", "voy", "va", "vamos", "vais", "van", "vaya", "gueno", "ha", "tener", "tengo", "tiene", "tenemos", "teneis", "tienen", "el", "la", "lo", "las", "los", "su", "aqui", "mio", "tuyo", "ellos", "ellas", "nos", "nosotros", "vosotros", "vosotras", "si", "dentro", "solo", "solamente", "saber", "sabes", "sabe", "sabemos", "sabeis", "saben", "ultimo", "largo", "bastante", "haces", "muchos", "aquellos", "aquellas", "sus", "entonces", "tiempo", "verdad", "verdadero", "verdadera", "cierto", "ciertos", "cierta", "ciertas", "intentar", "intento", "intenta", "intentas", "intentamos", "intentais", "intentan", "dos", "bajo", "arriba", "encima", "usar", "uso", "usas", "usa", "usamos", "usais", "usan", "emplear", "empleo", "empleas", "emplean", "ampleamos", "empleais", "valor", "muy", "era", "eras", "eramos", "eran", "modo", "bien", "cual", "cuando", "donde", "mientras", "quien", "con", "entre", "sin", "trabajo", "trabajar", "trabajas", "trabaja", "trabajamos", "trabajais", "trabajan", "podria", "podrias", "podriamos", "podrian", "podriais", "yo", "aquel"]
-    end
-
-    tmp_self = self.strip
-    res = tmp_self.split(" ").delete_if { |s| words.include?(s) }
-    return tmp_self if res.blank?
-    return res.uniq.join(" ")
-  end
-  def strip_stopwords2(language = "es")
-    if language == "en"
-      words = ["a", "about", "above", "above", "across", "after", "afterwards", "again", "against", "all", "almost", "alone", "along", "already", "also","although","always","am","among", "amongst", "amoungst", "amount",  "an", "and", "another", "any","anyhow","anyone","anything","anyway", "anywhere", "are", "around", "as",  "at", "back","be","became", "because","become","becomes", "becoming", "been", "before", "beforehand", "behind", "being", "below", "beside", "besides", "between", "beyond", "bill", "both", "bottom","but", "by", "call", "can", "cannot", "cant", "co", "con", "could", "couldnt", "cry", "de", "describe", "detail", "do", "done", "down", "due", "during", "each", "eg", "eight", "either", "eleven","else", "elsewhere", "empty", "enough", "etc", "even", "ever", "every", "everyone", "everything", "everywhere", "except", "few", "fifteen", "fify", "fill", "find", "fire", "first", "five", "for", "former", "formerly", "forty", "found", "four", "from", "front", "full", "further", "get", "give", "go", "had", "has", "hasnt", "have", "he", "hence", "her", "here", "hereafter", "hereby", "herein", "hereupon", "hers", "herself", "him", "himself", "his", "how", "however", "hundred", "ie", "if", "in", "inc", "indeed", "interest", "into", "is", "it", "its", "itself", "keep", "last", "latter", "latterly", "least", "less", "ltd", "made", "many", "may", "me", "meanwhile", "might", "mill", "mine", "more", "moreover", "most", "mostly", "move", "much", "must", "my", "myself", "name", "namely", "neither", "never", "nevertheless", "next", "nine", "no", "nobody", "none", "noone", "nor", "not", "nothing", "now", "nowhere", "of", "off", "often", "on", "once", "one", "only", "onto", "or", "other", "others", "otherwise", "our", "ours", "ourselves", "out", "over", "own","part", "per", "perhaps", "please", "put", "rather", "re", "same", "see", "seem", "seemed", "seeming", "seems", "serious", "several", "she", "should", "show", "side", "since", "sincere", "six", "sixty", "so", "some", "somehow", "someone", "something", "sometime", "sometimes", "somewhere", "still", "such", "system", "take", "ten", "than", "that", "the", "their", "them", "themselves", "then", "thence", "there", "thereafter", "thereby", "therefore", "therein", "thereupon", "these", "they", "thickv", "thin", "third", "this", "those", "though", "three", "through", "throughout", "thru", "thus", "to", "together", "too", "top", "toward", "towards", "twelve", "twenty", "two", "un", "under", "until", "up", "upon", "us", "very", "via", "was", "we", "well", "were", "what", "whatever", "when", "whence", "whenever", "where", "whereafter", "whereas", "whereby", "wherein", "whereupon", "wherever", "whether", "which", "while", "whither", "who", "whoever", "whole", "whom", "whose", "why", "will", "with", "within", "without", "would", "yet", "you", "your", "yours", "yourself", "yourselves", "the"]
-    else
-      words = ["de","la","lo","del","un", "una", "unas", "unos", "uno", "sobre", "todo", "tambien", "tras", "otro", "algun", "alguno", "alguna", "algunos", "algunas", "ser", "es", "soy", "eres", "somos", "sois", "estoy", "esta", "estamos", "estais", "estan", "como", "en", "para", "atras", "porque", "por", "que", "estado", "estaba", "ante", "antes", "siendo", "ambos", "pero", "por", "poder", "puede", "puedo", "podemos", "podeis", "pueden", "fui", "fue", "fuimos", "fueron", "hacer", "hago", "hace", "hacemos", "haceis", "hacen", "cada", "fin", "incluso", "primero", "desde", "conseguir", "consigo", "consigue", "consigues", "conseguimos", "consiguen", "ir", "voy", "va", "vamos", "vais", "van", "vaya", "gueno", "ha", "tener", "tengo", "tiene", "tenemos", "teneis", "tienen", "el", "la", "lo", "las", "los", "su", "aqui", "mio", "tuyo", "ellos", "ellas", "nos", "nosotros", "vosotros", "vosotras", "si", "dentro", "solo", "solamente", "saber", "sabes", "sabe", "sabemos", "sabeis", "saben", "ultimo", "largo", "bastante", "haces", "muchos", "aquellos", "aquellas", "sus", "entonces", "tiempo", "verdad", "verdadero", "verdadera", "cierto", "ciertos", "cierta", "ciertas", "intentar", "intento", "intenta", "intentas", "intentamos", "intentais", "intentan", "dos", "bajo", "arriba", "encima", "usar", "uso", "usas", "usa", "usamos", "usais", "usan", "emplear", "empleo", "empleas", "emplean", "ampleamos", "empleais", "valor", "muy", "era", "eras", "eramos", "eran", "modo", "bien", "cual", "cuando", "donde", "mientras", "quien", "con", "entre", "sin", "trabajo", "trabajar", "trabajas", "trabaja", "trabajamos", "trabajais", "trabajan", "podria", "podrias", "podriamos", "podrian", "podriais", "yo", "aquel"]
-    end
-
-    tmp_self = self.strip
-    res = tmp_self.split(" ").delete_if { |s| words.include?(s) }
-    return tmp_self if res.blank?
-    return res.uniq.join(" ")
-  end
-
 
+  # parse string into slug format
   def slug
     #strip the string
     ret = self.strip
@@ -120,23 +94,7 @@ class String
 
     #strip off leading/trailing underscore
     ret.gsub! /\A[_\.]+|[_\.]+\z/,""
-
-    return ret
-  end
-
-  # generate combinations
-  # generate alternative queries
-  def to_alt_query(qty_combination = 2, min_length = 2)
-    s = self.strip_stopwords("es").gsub(/\*|\+|-|~/, " ")
-    r = s.split(" ").clean_empty.uniq
-    r = r.delete_if {|s| s.size < 3 }
-    return s if r.size < min_length
-
-    res = []
-    r.combination(qty_combination).to_a.each do |i|
-      res << "(\"+#{i.join("+")}\")"
-    end
-    res.join(" ")
+    ret
   end
 
   # from a string path, this function get the filename
@@ -162,4 +120,11 @@ class String
     "#{h}#{":#{uri.port}" unless [80, 443].include?(uri.port)}"
   end
 
+  # return cleaned model class name
+  # remove decorate
+  # remove Cama prefix
+  def parseCamaClass
+    self.gsub("Decorator","").gsub("CamaleonCms::","")
+  end
+
 end

data/lib/ext/translator.rb

@@ -50,8 +50,9 @@ class String
     return translations_per_locale if !self.squish.starts_with?("<!--") or self.blank?
 
     self.split('<!--:-->').each do |t|
-      t.match(/^<!--:([\w]{2})/) do |lang|
-        translations_per_locale[lang[1].to_sym] = t.gsub(/<!--:#{lang[1]}-->(.*)/, '\1')
+      t.match(/^<!--:([\w]{2,5})/) do |lang|
+        lt = lang[1].sub("--", "")
+        translations_per_locale[lt.to_sym] = t.gsub(/<!--:#{lt}-->(.*)/, '\1')
       end
     end
     translations_per_locale

data/lib/generators/camaleon_cms/gem_plugin_generator.rb

@@ -8,93 +8,100 @@ module CamaleonCms
       desc "This generator create all basic gem plugin structure."
 
       def create_initializer_file
-
-        plugin_dir = Rails.root.join("apps", get_plugin_name).to_s
-        plugin_app = File.join($camaleon_engine_dir, "lib", "generators", "camaleon_cms", "gem_plugin_#{get_plugin_name}")
-        FileUtils.rm_r(plugin_app) if Dir.exist?(plugin_app)
-
-        FileUtils.mkdir_p(plugin_dir)
-        system("cd #{Rails.root}; rails plugin new plugins/#{get_plugin_name} --full")
-
-        FileUtils.cp_r(File.join($camaleon_engine_dir, "lib", "generators", "camaleon_cms", "gem_plugin_template"), plugin_app)
-
-        # tmp copy
-        helper_path = File.join(plugin_app, "app", "helpers", "plugins", get_plugin_name)
-        model_path = File.join(plugin_app, "app", "models", "plugins", get_plugin_name)
-        views_path = File.join(plugin_app, "app", "views", "plugins", get_plugin_name)
-        controller_path = File.join(plugin_app, "app", "controllers", "plugins", get_plugin_name)
-        FileUtils.mv(File.join(plugin_app, "app", "controllers", "plugins", "my_plugin"), controller_path) rescue nil
-        FileUtils.mv(File.join(plugin_app, "app", "helpers", "plugins", "my_plugin"), helper_path) rescue nil
-        FileUtils.mv(File.join(plugin_app, "app", "models", "plugins", "my_plugin"), model_path) rescue nil
-        FileUtils.mv(File.join(plugin_app, "app", "views", "plugins", "my_plugin"), views_path) rescue nil
-        FileUtils.mv(File.join(plugin_app, "app", "assets", "images", "plugins", "my_plugin"), File.join(plugin_app, "app", "assets", "images", "plugins", get_plugin_name)) rescue nil
-        FileUtils.mv(File.join(plugin_app, "app", "assets", "javascripts", "plugins", "my_plugin"), File.join(plugin_app, "app", "assets", "javascripts", "plugins", get_plugin_name)) rescue nil
-        FileUtils.mv(File.join(plugin_app, "app", "assets", "stylesheets", "plugins", "my_plugin"), File.join(plugin_app, "app", "assets", "stylesheets", "plugins", get_plugin_name)) rescue nil
-
-        # configuration
-        t = fix_text(File.read(File.join(plugin_app, "config", "camaleon_plugin.json")))
-        File.open(File.join(plugin_app, "config", "camaleon_plugin.json"), "w"){|f| f << t }
-
-        # helper
-        t = fix_text(File.read(File.join(helper_path, "main_helper.rb")))
-        File.open(File.join(helper_path, "main_helper.rb"), "w"){|f|  f << t }
-
-        # controllers
-        t = fix_text(File.read(File.join(controller_path, "admin_controller.rb")))
-        File.open(File.join(controller_path, "admin_controller.rb"), "w"){|f| f << t }
-        t = fix_text(File.read(File.join(controller_path, "front_controller.rb")))
-        File.open(File.join(controller_path, "front_controller.rb"), "w"){|f| f << t }
-
-        # models
-        model_file = File.join(model_path, "my_plugin.rb")
-        t = fix_text(File.read(model_file))
-        File.open(model_file, "w"){|f| f << t }
-        FileUtils.mv(model_file, File.join(File.dirname(model_file), "#{get_plugin_name}.rb")) rescue nil
-
-
-        directory(plugin_app, plugin_dir)
-        gsub_file File.join(plugin_dir, "config", "routes.rb"), "end" do
-          "
-            scope '(:locale)', locale: /\#{PluginRoutes.all_locales}/, :defaults => {  } do
-              # frontend
-              namespace :plugins do
-                namespace '#{get_plugin_name}' do
-                  get 'index' => 'front#index'
-                end
-              end
-            end
-
-            #Admin Panel
-            scope 'admin', as: 'admin' do
-              namespace 'plugins' do
-                namespace '#{get_plugin_name}' do
-                  get 'index' => 'admin#index'
-                end
-              end
-            end
-
-            # main routes
-            #scope '#{get_plugin_name}', module: 'plugins/#{get_plugin_name}/', as: '#{get_plugin_name}' do
-            #  Here my routes for main routes
-            #end
-          end"
+        plugin_dir = Rails.root.join("apps", "plugins", get_plugin_name).to_s
+        if behavior == :revoke
+          FileUtils.rm_r(plugin_dir)
+          append_to_file Rails.root.join("Gemfile") do
+            "\n\ngem '#{get_plugin_name}', path:  '#{plugin_dir}/'"
+          end
+        else
+          plugin_app = File.join($camaleon_engine_dir, "lib", "generators", "camaleon_cms", "gem_plugin_#{get_plugin_name}")
+          FileUtils.rm_r(plugin_app) if Dir.exist?(plugin_app)
+
+          FileUtils.mkdir_p(plugin_dir)
+          system("cd #{Rails.root}; rails plugin new apps/plugins/#{get_plugin_name} --full")
+
+          FileUtils.cp_r(File.join($camaleon_engine_dir, "lib", "generators", "camaleon_cms", "gem_plugin_template"), plugin_app)
+
+          # tmp copy
+          helper_path = File.join(plugin_app, "app", "helpers", "plugins", get_plugin_name)
+          model_path = File.join(plugin_app, "app", "models", "plugins", get_plugin_name)
+          views_path = File.join(plugin_app, "app", "views", "plugins", get_plugin_name)
+          controller_path = File.join(plugin_app, "app", "controllers", "plugins", get_plugin_name)
+          FileUtils.mv(File.join(plugin_app, "app", "controllers", "plugins", "my_plugin"), controller_path) rescue nil
+          FileUtils.mv(File.join(plugin_app, "app", "helpers", "plugins", "my_plugin"), helper_path) rescue nil
+          FileUtils.mv(File.join(plugin_app, "app", "models", "plugins", "my_plugin"), model_path) rescue nil
+          FileUtils.mv(File.join(plugin_app, "app", "views", "plugins", "my_plugin"), views_path) rescue nil
+          FileUtils.mv(File.join(plugin_app, "app", "assets", "images", "plugins", "my_plugin"), File.join(plugin_app, "app", "assets", "images", "plugins", get_plugin_name)) rescue nil
+          FileUtils.mv(File.join(plugin_app, "app", "assets", "javascripts", "plugins", "my_plugin"), File.join(plugin_app, "app", "assets", "javascripts", "plugins", get_plugin_name)) rescue nil
+          FileUtils.mv(File.join(plugin_app, "app", "assets", "stylesheets", "plugins", "my_plugin"), File.join(plugin_app, "app", "assets", "stylesheets", "plugins", get_plugin_name)) rescue nil
+
+          # configuration
+          t = fix_text(File.read(File.join(plugin_app, "config", "camaleon_plugin.json")))
+          File.open(File.join(plugin_app, "config", "camaleon_plugin.json"), "w"){|f| f << t }
+
+          # helper
+          t = fix_text(File.read(File.join(helper_path, "main_helper.rb")))
+          File.open(File.join(helper_path, "main_helper.rb"), "w"){|f|  f << t }
+
+          # controllers
+          t = fix_text(File.read(File.join(controller_path, "admin_controller.rb")))
+          File.open(File.join(controller_path, "admin_controller.rb"), "w"){|f| f << t }
+          t = fix_text(File.read(File.join(controller_path, "front_controller.rb")))
+          File.open(File.join(controller_path, "front_controller.rb"), "w"){|f| f << t }
+
+          # models
+          model_file = File.join(model_path, "my_plugin.rb")
+          t = fix_text(File.read(model_file))
+          File.open(model_file, "w"){|f| f << t }
+          FileUtils.mv(model_file, File.join(File.dirname(model_file), "#{get_plugin_name}.rb")) rescue nil
+
+
+          directory(plugin_app, plugin_dir)
+          gsub_file File.join(plugin_dir, "config", "routes.rb"), "end" do
+            "
+    scope PluginRoutes.system_info[\"relative_url_root\"] do
+      scope '(:locale)', locale: /\#{PluginRoutes.all_locales}/, :defaults => {  } do
+        # frontend
+        namespace :plugins do
+          namespace '#{get_plugin_name}' do
+            get 'index' => 'front#index'
+          end
         end
+      end
 
-        append_to_file Rails.root.join("Gemfile") do
-          "\n\ngem '#{get_plugin_name}', path:  '#{plugin_dir}/'"
+      #Admin Panel
+      scope 'admin', as: 'admin' do
+        namespace 'plugins' do
+          namespace '#{get_plugin_name}' do
+            get 'index' => 'admin#index'
+          end
         end
+      end
 
-        # destroy non used files
-        FileUtils.rm_r(plugin_app)
-        FileUtils.rm_r(File.join(plugin_dir, "app", "assets", "images", get_plugin_name))
-        FileUtils.rm_r(File.join(plugin_dir, "app", "assets", "javascripts", get_plugin_name))
-        FileUtils.rm_r(File.join(plugin_dir, "app", "assets", "stylesheets", get_plugin_name))
-
-        # remove TODO text from gem
-        gemspec_file = File.join(plugin_dir, "#{get_plugin_name}.gemspec")
-        t = File.read(gemspec_file).gsub("TODO", "")
-        File.open(gemspec_file, "w"){|f| f << t }
-
+      # main routes
+      #scope '#{get_plugin_name}', module: 'plugins/#{get_plugin_name}/', as: '#{get_plugin_name}' do
+      #  Here my routes for main routes
+      #end
+    end
+  end"
+          end
+
+          append_to_file Rails.root.join("Gemfile") do
+            "\n\ngem '#{get_plugin_name}', path:  '#{plugin_dir}/'"
+          end
+
+          # destroy non used files
+          FileUtils.rm_r(plugin_app)
+          FileUtils.rm_r(File.join(plugin_dir, "app", "assets", "images", get_plugin_name))
+          FileUtils.rm_r(File.join(plugin_dir, "app", "assets", "javascripts", get_plugin_name))
+          FileUtils.rm_r(File.join(plugin_dir, "app", "assets", "stylesheets", get_plugin_name))
+
+          # remove TODO text from gem
+          gemspec_file = File.join(plugin_dir, "#{get_plugin_name}.gemspec")
+          t = File.read(gemspec_file).gsub("TODO", "")
+          File.open(gemspec_file, "w"){|f| f << t }
+        end
       end
 
       def fix_text(text = "")