camaleon_cms 2.3.3 → 2.3.4

data/config/locales/camaleon_cms/common.yml

@@ -452,3 +452,69 @@ pt-BR:
   will_paginate:
     previous_label: 'Anterior'
     next_label: 'Próximo'
+
+fr:
+  camaleon_cms:
+    common:
+      profile: "Profil"
+      dashboard: "Tableau de bord"
+      read_more: "En savoir plus"
+      submit: "Soumettre"
+      send: "Envoyer"
+      login: "Connexion"
+      logout: "Déconnexion"
+      confirm: "Êtes-vous sûr?"
+      register: "Enregistrer"
+      proceted_article: 'Article protégé'
+
+      comment_msg: "Vous devez être connecté pour publier un commentaire"
+      comment: "Commentaire"
+      comments: "Commentaires"
+      message: "Message"
+      leave_comment: "Laisser un commentaire"
+      comment_new: "Nouveau commentaire"
+      comment_saved: "Votre commentaire est enregistré"
+      comment_error: "Une erreur est survenue lors de l'enregistrement du commentaire"
+      comment_reply: "Répondre"
+      edit: "Editer"
+
+      recent_posts: "Posts récents"
+
+
+      search_msg: "Chercher des résultats pour:"
+      search_not_found: "Aucun résultat ne correspond aux critères de recherche."
+      category_list: "Liste des catégories"
+      post_tag_list: "Liste des tags"
+      sub_category_list: "Liste des sous-catégories"
+      content_list: "Liste de contenu : %s"
+      visit: "Visite"
+      no_contents_found: "Aucun contenu trouvé"
+      no_results_found: "Aucun résultat trouvé"
+
+      author: "Auteur"
+      site: "Site"
+      categories: "Catégories"
+      next: "Suivant"
+      prev: "Précédent"
+      current: "Courant"
+      search: "Rechercher"
+      file_format_error: "Format de fichier invalide"
+      file_size_exceeded: "Taille du fichier excessive"
+
+      notice: "Nouvelles "
+      share: "Partager sur"
+      share_facebook: "Partage sur Facebook"
+      share_twitter: "Partager sur Twitter"
+      share_google_plus: "Partager sur Google Plus"
+      back_top: "Retour en haut"
+      total_followers_social: "Total de followers sur les réseaux sociaux"
+      latest_articles: "Derniers articles"
+      photo_gallery: "Galerie photo"
+      home_galleries: "Aller à l'accueil des galeries"
+      addition: "Addition"
+      view_all_news: "Voir toutes les nouvelles"
+      extra_attributes: "Attributs extras"
+
+  will_paginate:
+    previous_label: 'Précédent'
+    next_label: 'Suivant'

data/config/routes/frontend.rb

@@ -10,7 +10,7 @@ Rails.application.routes.draw do
   # frontend camaleon cms
   scope PluginRoutes.system_info["relative_url_root"], as: "cama" do
     scope "(:locale)", locale: /#{PluginRoutes.all_locales}/, :defaults => {  } do
-      root 'camaleon_cms/frontend#index'
+      root 'camaleon_cms/frontend#index', as: 'root'
 
       controller "camaleon_cms/frontend" do
         PluginRoutes.all_locales.split("|").each do |_l|

data/config/system.json

@@ -4,13 +4,13 @@
   "skip_format_url": true, // enable or disable .html extension in the urls.
   "default_plugins": ["front_cache", "cama_contact_form", "attack"], // Default plugins installed for each new site
   "available_languages": ["es", "en", "fr", "zh", "de", "it", "pt-BR", "nl"], // Available languages for frontend panel, here all locales: https://github.com/svenfuchs/rails-i18n
-  "admin_available_languages": ["en", "es", "it", "pt-BR" , "nl"], //Available languages for the admin panel
+  "admin_available_languages": ["en", "es", "it", "pt-BR" , "nl", "fr"], //Available languages for the admin panel
   "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.
   "db_prefix": "", // prefix name for database tables
   "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
 }
 

data/db/migrate/20150611161134_post_table_into_utf8.rb

@@ -1,11 +1,12 @@
 class PostTableIntoUtf8 < ActiveRecord::Migration
   def change
     if table_exists? CamaleonCms::User.table_name
-      add_column CamaleonCms::User.table_name, :email, :integer rescue nil
-      add_column CamaleonCms::User.table_name, :username, :integer rescue nil
-      add_column CamaleonCms::User.table_name, :role, :string, default: 'client', index: true rescue nil
-      add_column CamaleonCms::User.table_name, :parent_id, :integer rescue nil
-      add_column CamaleonCms::User.table_name, :site_id, :integer, index: true rescue nil
+      add_column(CamaleonCms::User.table_name, :email, :string) unless column_exists?(CamaleonCms::User.table_name, :email)
+      add_column(CamaleonCms::User.table_name, :username, :string) unless column_exists?(CamaleonCms::User.table_name, :username)
+      add_column(CamaleonCms::User.table_name, :role, :string, default: 'client', index: true) unless column_exists?(CamaleonCms::User.table_name, :role)
+      add_column(CamaleonCms::User.table_name, :parent_id, :integer) unless column_exists?(CamaleonCms::User.table_name, :parent_id)
+      add_column(CamaleonCms::User.table_name, :site_id, :integer, index: true, default: -1) unless column_exists?(CamaleonCms::User.table_name, :site_id)
+      add_column(CamaleonCms::User.table_name, :auth_token, :string) unless column_exists?(CamaleonCms::User.table_name, :auth_token)
     else
       create_table CamaleonCms::User.table_name do |t|
         t.string   "username", index: true

data/lib/camaleon_cms/engine.rb

@@ -11,6 +11,9 @@ require 'breadcrumbs_on_rails'
 require 'aws-sdk'
 require 'font-awesome-rails'
 require 'tinymce-rails'
+require 'jquery-rails'
+require 'coffee-rails'
+require 'sass-rails'
 require 'cama_contact_form'
 
 $camaleon_engine_dir = File.expand_path("../../../", __FILE__)

data/lib/camaleon_cms/version.rb

@@ -1,3 +1,3 @@
 module CamaleonCms
-  VERSION = '2.3.3'
+  VERSION = '2.3.4'
 end

data/lib/ext/string.rb

@@ -9,11 +9,6 @@ class String
     ActionController::Base.helpers.strip_tags(self)
   end
 
-  def is_email
-    return false if self.blank?
-    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
@@ -46,42 +41,6 @@ class String
     end
   end
 
-  def split_bar
-    self.split(',').map{|us_id| us_id.gsub('__','')}.uniq
-  end
-
-  def include_bar?(uid)
-    self.include?("__#{uid}__")
-  end
-
-  # slice string respect to correct word for read more
-  def slice_read_more(quantity = 100, start_from = 0)
-    return self if self.length <= quantity
-    tmp = self.slice(start_from, self.length)
-    if tmp.slice(quantity) == " " || tmp.index(" ").nil?
-      return tmp.slice(0, quantity)
-    end
-    quantity += tmp.slice(quantity, tmp.length).index(" ").nil? ? tmp.length : tmp.slice(quantity, tmp.length).index(" ")
-    tmp.slice(0, quantity)
-  end
-
-  # slice string respect to correct word for read more
-  def truncate_text(string, quantity = 100, quantity_before_text = 20)
-    string = string.gsub("+", "").gsub("*", "").gsub("-", "").downcase
-    self.strip_tags
-    return self if self.length <= quantity
-    start_from = self.downcase.index("#{string}")
-    start_from = self.index(/#{string.split(" ").join("|")}/i) unless start_from.present?
-    start_from -= quantity_before_text  if start_from.present? && start_from > 0
-    start_from = 0 if start_from.nil? || start_from < 0
-    tmp = self.slice(start_from, self.length)
-    if tmp.slice(quantity) == " " || tmp.index(" ").nil?
-      return tmp.slice(0, quantity)
-    end
-    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
-
   # parse string into slug format
   def slug
     #strip the string
@@ -105,18 +64,6 @@ class String
     ret
   end
 
-  # from a string path, this function get the filename
-  def get_file_name
-    self.split("/").last.split(".").delete_last.join(".")
-  end
-
-  def hex_to_binary
-    temp = gsub("\s", "");
-    ret = []
-    (0...temp.size()/2).each{|index| ret[index] = [temp[index*2, 2]].pack("H2")}
-    return ret
-  end
-
   # parse string into domain
   # http://owem.tuzitio.com into owem.tuzitio.com
   def parse_domain
@@ -164,7 +111,7 @@ class String
   #     if this is empty, this will return the image version for thumb of the image, sample: 'http://localhost/my_image.png'.cama_parse_image_version('') => http://localhost/thumb/my_image.png
   #     if this is present, this will return the image version generated, sample: , sample: 'http://localhost/my_image.png'.cama_parse_image_version('200x200') => http://localhost/thumb/my_image_200x200.png
   #   default: default image if post image does not exist
-  def cama_parse_image_version(version_name: '')
+  def cama_parse_image_version(version_name = '')
     res = File.join(File.dirname(self), 'thumb', "#{File.basename(self).parameterize}#{File.extname(self)}")
     res = res.cama_add_postfix_file_name("_#{version_name}") if version_name.present?
     res

data/lib/plugin_routes.rb

@@ -221,6 +221,11 @@ class PluginRoutes
     end
   end
 
+  # check if db migrate already done
+  def self.db_installed?
+    @@is_db_installed ||= ActiveRecord::Base.connection.table_exists?(CamaleonCms::Site.table_name)
+  end
+
   # return all locales for all sites joined by |
   def self.all_locales
     r = cache_variable("site_all_locales"); return r unless r.nil?

data/spec/decorators/post_type_spec.rb

@@ -0,0 +1,13 @@
+require "rails_helper"
+
+RSpec.describe "PostTypeDecorator", :type => :routing do
+  it "group url" do
+    post_type = create_test_post_type(slug: 'test-post-type')
+    expect(post_type.decorate.the_group_url).to include("/group/#{post_type.id}")
+  end
+
+  it "public url" do
+    post_type = create_test_post_type(slug: 'test-post-type')
+    expect(post_type.decorate.the_url).to include("/#{post_type.slug}")
+  end
+end

data/spec/dummy/README.rdoc

@@ -0,0 +1,28 @@
+== README
+
+This README would normally document whatever steps are necessary to get the
+application up and running.
+
+Things you may want to cover:
+
+* Ruby version
+
+* System dependencies
+
+* Configuration
+
+* Database creation
+
+* Database initialization
+
+* How to run the test suite
+
+* Services (job queues, cache servers, search engines, etc.)
+
+* Deployment instructions
+
+* ...
+
+
+Please feel free to use a different markup language if you do not plan to run
+<tt>rake doc:app</tt>.

data/spec/dummy/Rakefile

@@ -0,0 +1,6 @@
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require File.expand_path('../config/application', __FILE__)
+
+Rails.application.load_tasks

data/spec/dummy/app/assets/javascripts/application.js

@@ -0,0 +1,13 @@
+// This is a manifest file that'll be compiled into application.js, which will include all the files
+// listed below.
+//
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
+// or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path.
+//
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// compiled file.
+//
+// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
+// about supported directives.
+//
+//= require_tree .

data/spec/dummy/app/assets/stylesheets/application.css

@@ -0,0 +1,15 @@
+/*
+ * This is a manifest file that'll be compiled into application.css, which will include all the files
+ * listed below.
+ *
+ * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
+ * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
+ *
+ * You're free to add application-wide styles to this file and they'll appear at the bottom of the
+ * compiled file so the styles you add here take precedence over styles defined in any styles
+ * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
+ * file per style scope.
+ *
+ *= require_tree .
+ *= require_self
+ */

data/spec/dummy/app/controllers/application_controller.rb

@@ -0,0 +1,5 @@
+class ApplicationController < ActionController::Base
+  # Prevent CSRF attacks by raising an exception.
+  # For APIs, you may want to use :null_session instead.
+  protect_from_forgery with: :exception
+end

data/spec/dummy/app/helpers/application_helper.rb

@@ -0,0 +1,2 @@
+module ApplicationHelper
+end

data/spec/dummy/app/views/layouts/application.html.erb

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Dummy</title>
+  <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true %>
+  <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
+  <%= csrf_meta_tags %>
+</head>
+<body>
+
+<%= yield %>
+
+</body>
+</html>

data/spec/dummy/bin/bundle

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+load Gem.bin_path('bundler', 'bundle')

data/spec/dummy/bin/rails

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+APP_PATH = File.expand_path('../../config/application', __FILE__)
+require_relative '../config/boot'
+require 'rails/commands'

data/spec/dummy/bin/rake

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+require_relative '../config/boot'
+require 'rake'
+Rake.application.run

data/spec/dummy/bin/setup

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+require 'pathname'
+
+# path to your application root.
+APP_ROOT = Pathname.new File.expand_path('../../',  __FILE__)
+
+Dir.chdir APP_ROOT do
+  # This script is a starting point to setup your application.
+  # Add necessary setup steps to this file:
+
+  puts "== Installing dependencies =="
+  system "gem install bundler --conservative"
+  system "bundle check || bundle install"
+
+  # puts "\n== Copying sample files =="
+  # unless File.exist?("config/database.yml")
+  #   system "cp config/database.yml.sample config/database.yml"
+  # end
+
+  puts "\n== Preparing database =="
+  system "bin/rake db:setup"
+
+  puts "\n== Removing old logs and tempfiles =="
+  system "rm -f log/*"
+  system "rm -rf tmp/cache"
+
+  puts "\n== Restarting application server =="
+  system "touch tmp/restart.txt"
+end

data/spec/dummy/config.ru

@@ -0,0 +1,4 @@
+# This file is used by Rack-based servers to start the application.
+
+require ::File.expand_path('../config/environment', __FILE__)
+run Rails.application

data/spec/dummy/config/application.rb

@@ -0,0 +1,26 @@
+require File.expand_path('../boot', __FILE__)
+
+require 'rails/all'
+
+Bundler.require(*Rails.groups)
+require "camaleon_cms"
+
+module Dummy
+  class Application < Rails::Application
+    # Settings in config/environments/* take precedence over those specified here.
+    # Application configuration should go into files in config/initializers
+    # -- all .rb files in that directory are automatically loaded.
+
+    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
+    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
+    # config.time_zone = 'Central Time (US & Canada)'
+
+    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
+    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
+    # config.i18n.default_locale = :de
+
+    # Do not swallow errors in after_commit/after_rollback callbacks.
+    config.active_record.raise_in_transactional_callbacks = true
+  end
+end
+

data/spec/dummy/config/boot.rb

@@ -0,0 +1,5 @@
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)
+
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
+$LOAD_PATH.unshift File.expand_path('../../../../lib', __FILE__)

data/spec/dummy/config/database.yml

@@ -0,0 +1,25 @@
+# SQLite version 3.x
+#   gem install sqlite3
+#
+#   Ensure the SQLite 3 gem is defined in your Gemfile
+#   gem 'sqlite3'
+#
+default: &default
+  adapter: postgresql
+  pool: 5
+  timeout: 5000
+
+development:
+  <<: *default
+  database: camaleon_cms_development
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test:
+  <<: *default
+  database: camaleon_cms_test
+
+production:
+  <<: *default
+  database: db/production.sqlite3