camaleon_cms 2.4.5.5 → 2.4.5.7

data/lib/generators/camaleon_cms/gem_plugin_generator.rb

@@ -59,39 +59,41 @@ module CamaleonCms
 
 
           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
+          gsub_file File.join(plugin_dir, "config", "routes.rb"), /.+/ do
+"require 'plugin_routes'
+require 'camaleon_cms/engine'
+Rails.application.routes.draw 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
 
-      #Admin Panel
-      scope :admin, as: 'admin', path: PluginRoutes.system_info['admin_path_name'] do
-        namespace 'plugins' do
-          namespace '#{get_plugin_name}' do
-            controller :admin do
-              get :index
-              get :settings
-              post :save_settings
-            end
+    #Admin Panel
+    scope :admin, as: 'admin', path: PluginRoutes.system_info['admin_path_name'] do
+      namespace 'plugins' do
+        namespace '#{get_plugin_name}' do
+          controller :admin do
+            get :index
+            get :settings
+            post :save_settings
           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
-  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
+end"
           end
-          
+
           if PluginRoutes.isRails4?
             append_to_file Rails.root.join("Gemfile") do
               "\n\ngem '#{get_plugin_name}', path:  '#{plugin_dir_path}'"
@@ -107,6 +109,8 @@ module CamaleonCms
           # remove TODO text from gem
           gemspec_file = File.join(plugin_dir, "#{get_plugin_name}.gemspec")
           t = File.read(gemspec_file).gsub("TODO", "")
+          # add Camaleon as plugin dependency
+          t.sub!(/s\.add_dependency "rails".*\n/, "s.add_dependency \"camaleon_cms\", \"~> 2.0\"\n")
           File.open(gemspec_file, "w"){|f| f << t }
         end
       end

data/lib/plugin_routes.rb

@@ -2,6 +2,7 @@ require 'json'
 class PluginRoutes
   @@_vars = []
   @@_after_reload = []
+  @@anonymous_hooks = {}
   # load plugin routes if it is enabled
   def self.load(env = "admin")
     plugins = all_enabled_plugins
@@ -108,6 +109,32 @@ class PluginRoutes
     def fixActionParameter(h)
       (h.is_a?(ActionController::Parameters) ? (h.permit!.to_h rescue h.to_hash) : h)
     end
+    
+    # add a new anonymous hook
+    # sample: PluginRoutes.add_anonymous_hook('before_admin', lambda{|params| puts params })
+    # @param hook_key [String], key of hook
+    # @param hook_id [String], identifier for the anonymous hook
+    # @param callback [Lambda], anonymous function to be called when the hook was called
+    # @return nil
+    def add_anonymous_hook(hook_key, callback, hook_id = '')
+      @@anonymous_hooks[hook_key] ||= []
+      @@anonymous_hooks[hook_key] << {id: hook_id, callback: callback}
+    end
+
+    # return all registered anonymous hooks for hook_key
+    # @param hook_key [String] name of the hook
+    # @return [Array] array of hooks for hook_key
+    def get_anonymous_hooks(hook_key)
+      (@@anonymous_hooks[hook_key.to_s] || []).map{|item| item[:callback] }
+    end
+    
+    # return all registered anonymous hooks for hook_key
+    # @param hook_key [String] name of the hook
+    # @param hook_id [String] identifier of the anonymous hooks
+    # @return [Array] array of hooks for hook_key
+    def remove_anonymous_hook(hook_key, hook_id)
+      (@@anonymous_hooks[hook_key.to_s] || []).delete_if{|item| item[:id] == hook_id }
+    end
   end
 
   # reload routes

data/spec/dummy/config/application.rb

@@ -21,5 +21,6 @@ module Dummy
 
     # Do not swallow errors in after_commit/after_rollback callbacks.
     # config.active_record.raise_in_transactional_callbacks = true
+    config.active_record.sqlite3.represent_boolean_as_integer = true
   end
 end

data/spec/dummy/config/environments/test.rb

@@ -39,4 +39,6 @@ Rails.application.configure do
 
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true
+
+  config.middleware.use RackSessionAccess::Middleware
 end

data/spec/dummy/db/schema.rb

@@ -10,68 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20161215202255) do
-
-  create_table "comments", force: :cascade do |t|
-    t.string "author"
-    t.string "author_email"
-    t.string "author_url"
-    t.string "author_IP"
-    t.text "content"
-    t.string "approved", default: "pending"
-    t.string "agent"
-    t.string "typee"
-    t.integer "comment_parent"
-    t.integer "post_id"
-    t.integer "user_id"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["approved"], name: "index_comments_on_approved"
-    t.index ["comment_parent"], name: "index_comments_on_comment_parent"
-    t.index ["post_id"], name: "index_comments_on_post_id"
-    t.index ["user_id"], name: "index_comments_on_user_id"
-  end
-
-  create_table "custom_fields", force: :cascade do |t|
-    t.string "object_class"
-    t.string "name"
-    t.string "slug"
-    t.integer "objectid"
-    t.integer "parent_id"
-    t.integer "field_order"
-    t.integer "count", default: 0
-    t.boolean "is_repeat", default: false
-    t.text "description"
-    t.string "status"
-    t.index ["object_class"], name: "index_custom_fields_on_object_class"
-    t.index ["objectid"], name: "index_custom_fields_on_objectid"
-    t.index ["parent_id"], name: "index_custom_fields_on_parent_id"
-    t.index ["slug"], name: "index_custom_fields_on_slug"
-  end
-
-  create_table "custom_fields_relationships", force: :cascade do |t|
-    t.integer "objectid"
-    t.integer "custom_field_id"
-    t.integer "term_order"
-    t.string "object_class"
-    t.text "value", limit: 1073741823
-    t.string "custom_field_slug"
-    t.integer "group_number", default: 0
-    t.index ["custom_field_id"], name: "index_custom_fields_relationships_on_custom_field_id"
-    t.index ["custom_field_slug"], name: "index_custom_fields_relationships_on_custom_field_slug"
-    t.index ["object_class"], name: "index_custom_fields_relationships_on_object_class"
-    t.index ["objectid"], name: "index_custom_fields_relationships_on_objectid"
-  end
-
-  create_table "metas", force: :cascade do |t|
-    t.string "key"
-    t.text "value", limit: 1073741823
-    t.integer "objectid"
-    t.string "object_class"
-    t.index ["key"], name: "index_metas_on_key"
-    t.index ["object_class"], name: "index_metas_on_object_class"
-    t.index ["objectid"], name: "index_metas_on_objectid"
-  end
+ActiveRecord::Schema.define(version: 2016_05_17_143441) do
 
   create_table "plugins_contact_forms", force: :cascade do |t|
     t.integer "site_id"
@@ -86,82 +25,4 @@ ActiveRecord::Schema.define(version: 20161215202255) do
     t.datetime "updated_at"
   end
 
-  create_table "posts", force: :cascade do |t|
-    t.string "title"
-    t.string "slug"
-    t.text "content", limit: 1073741823
-    t.text "content_filtered", limit: 1073741823
-    t.string "status", default: "published"
-    t.datetime "published_at"
-    t.integer "post_parent"
-    t.string "visibility", default: "public"
-    t.text "visibility_value"
-    t.string "post_class", default: "Post"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.integer "user_id"
-    t.integer "post_order", default: 0
-    t.integer "taxonomy_id"
-    t.boolean "is_feature", default: false
-    t.index ["post_class"], name: "index_posts_on_post_class"
-    t.index ["post_parent"], name: "index_posts_on_post_parent"
-    t.index ["slug"], name: "index_posts_on_slug"
-    t.index ["status"], name: "index_posts_on_status"
-    t.index ["user_id"], name: "index_posts_on_user_id"
-  end
-
-  create_table "term_relationships", force: :cascade do |t|
-    t.integer "objectid"
-    t.integer "term_order"
-    t.integer "term_taxonomy_id"
-    t.index ["objectid"], name: "index_term_relationships_on_objectid"
-    t.index ["term_order"], name: "index_term_relationships_on_term_order"
-    t.index ["term_taxonomy_id"], name: "index_term_relationships_on_term_taxonomy_id"
-  end
-
-  create_table "term_taxonomy", force: :cascade do |t|
-    t.string "taxonomy"
-    t.text "description", limit: 1073741823
-    t.integer "parent_id"
-    t.integer "count"
-    t.string "name"
-    t.string "slug"
-    t.integer "term_group"
-    t.integer "term_order"
-    t.string "status"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.integer "user_id"
-    t.index ["parent_id"], name: "index_term_taxonomy_on_parent_id"
-    t.index ["slug"], name: "index_term_taxonomy_on_slug"
-    t.index ["taxonomy"], name: "index_term_taxonomy_on_taxonomy"
-    t.index ["term_order"], name: "index_term_taxonomy_on_term_order"
-    t.index ["user_id"], name: "index_term_taxonomy_on_user_id"
-  end
-
-  create_table "users", force: :cascade do |t|
-    t.string "username"
-    t.string "role", default: "client"
-    t.string "email"
-    t.string "slug"
-    t.string "password_digest"
-    t.string "auth_token"
-    t.string "password_reset_token"
-    t.integer "parent_id"
-    t.datetime "password_reset_sent_at"
-    t.datetime "last_login_at"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.integer "site_id", default: -1
-    t.string "confirm_email_token"
-    t.datetime "confirm_email_sent_at"
-    t.boolean "is_valid_email", default: true
-    t.string "first_name"
-    t.string "last_name"
-    t.index ["email"], name: "index_users_on_email"
-    t.index ["role"], name: "index_users_on_role"
-    t.index ["site_id"], name: "index_users_on_site_id"
-    t.index ["username"], name: "index_users_on_username"
-  end
-
 end

data/spec/factories/post_type.rb

@@ -0,0 +1,17 @@
+include CamaleonCms::SiteHelper
+include CamaleonCms::HooksHelper
+FactoryBot.define do
+  factory :site, class: CamaleonCms::Site do
+    name { Faker::Name.unique.name }
+    slug { Capybara.current_session.server ? "#{Capybara.current_session.server.host}:#{Capybara.current_session.server.port}" : 'key' }
+    description Faker::Lorem.sentence
+    transient do
+      theme PluginRoutes.all_themes.first['key']
+      skip_intro true
+    end
+    after(:create) do |site, evaluator|
+      site_after_install(site, evaluator.theme)
+      site.set_option('save_intro', true) if evaluator.skip_intro
+    end
+  end
+end

data/spec/factories/site.rb

@@ -0,0 +1,8 @@
+FactoryBot.define do
+  factory :post_type, class: CamaleonCms::PostType do
+    name { Faker::Name.unique.name }
+    description Faker::Lorem.sentence
+    data_options {}
+    site
+  end
+end

data/spec/features/{categories_spec.rb → admin/categories_spec.rb}

@@ -1,6 +1,6 @@
 require "rails_helper"
 describe "the signin process", js: true do
-  login_success
+  init_site
 
   it "create new category" do
     admin_sign_in

data/spec/features/{comments_spec.rb → admin/comments_spec.rb}

@@ -1,22 +1,29 @@
 require "rails_helper"
+
+# add a new comment for a post
+def add_new_comment
+  visit "#{cama_root_relative_path}/admin/posts/#{get_content_attr("post", "id", "last")}/comments"
+  page.execute_script('$("#comments_answer_list .panel-heading .btn-primary").click()')
+  wait_for_ajax
+  within 'form#new_comment' do
+    fill_in "comment_content", with: "Test comment"
+    find('button[type="submit"]').click
+  end
+end
+
 describe "the Comments", js: true do
-  login_success
+  init_site
 
   it "Add Comment" do
     admin_sign_in
-    visit "#{cama_root_relative_path}/admin/posts/#{get_content_attr("post", "id", "last")}/comments"
-    page.execute_script('$("#comments_answer_list .panel-heading .btn-primary").click()')
-    wait_for_ajax
-    within 'form#new_comment' do
-      fill_in "comment_content", with: "Test comment"
-      find('button[type="submit"]').click
-    end
+    add_new_comment
     expect(page).to have_css('.alert-success')
   end
 
 
   it "list comments post" do
     admin_sign_in
+    add_new_comment
     visit "#{cama_root_relative_path}/admin/comments"
     within("#admin_content") do
       # verify post presence
@@ -27,7 +34,7 @@ describe "the Comments", js: true do
       expect(page).to have_css('#comments_answer_list')
 
       # approve || disapprove comment
-      (first('.approve') || first('.pending')).click
+      (first('.pending')).click
       expect(page).to have_css('.alert-success')
     end
 

data/spec/features/{contact_form_spec.rb → admin/contact_form_spec.rb}

@@ -1,16 +1,22 @@
 require "rails_helper"
+
+# create a new form
+def create_form
+  visit "#{cama_root_relative_path}/admin/plugins/cama_contact_form/admin_forms"
+  expect(page).to have_content('Contact Form')
+  within("#new_plugins_cama_contact_form_cama_contact_form") do
+    fill_in 'plugins_cama_contact_form_cama_contact_form_name', :with => 'Test form'
+    fill_in 'plugins_cama_contact_form_cama_contact_form_slug', :with => 'test-form'
+    first('button[type="submit"]').click
+  end
+end
+
 describe "the Contact Form", js: true do
-  login_success
+  init_site
 
   it "create new contact form" do
     admin_sign_in
-    visit "#{cama_root_relative_path}/admin/plugins/cama_contact_form/admin_forms"
-    expect(page).to have_content('Contact Form')
-    within("#new_plugins_cama_contact_form_cama_contact_form") do
-      fill_in 'plugins_cama_contact_form_cama_contact_form_name', :with => 'Test form'
-      fill_in 'plugins_cama_contact_form_cama_contact_form_slug', :with => 'test-form'
-      first('button[type="submit"]').click
-    end
+    create_form
     expect(page).to have_css('.alert-success')
 
     # adding fields
@@ -31,6 +37,7 @@ describe "the Contact Form", js: true do
 
   it "check contact submitters" do
     admin_sign_in
+    create_form
     visit "#{cama_root_relative_path}/admin/plugins/cama_contact_form/admin_forms"
     within("#admin_content") do
       all("table .btn-info").last.click
@@ -42,6 +49,7 @@ describe "the Contact Form", js: true do
 
   it "delete contact form" do
     admin_sign_in
+    create_form
     visit "#{cama_root_relative_path}/admin/plugins/cama_contact_form/admin_forms"
     within '#admin_content' do
       all("table .btn-danger").last.click
@@ -49,5 +57,4 @@ describe "the Contact Form", js: true do
     confirm_dialog
     expect(page).to have_css('.alert-success')
   end
-
 end

data/spec/features/{content_groups_spec.rb → admin/content_groups_spec.rb}

@@ -1,24 +1,31 @@
 require "rails_helper"
+
+# create a new post type
+def create_post_type
+  visit "#{cama_root_relative_path}/admin/settings/post_types"
+  expect(page).to have_content('Post')
+  expect(page).to have_content('Page')
+  within("#post_type_form") do
+    fill_in 'post_type_name', :with => 'Test cat'
+    fill_in 'post_type_slug', :with => 'test-content'
+    fill_in 'post_type_description', :with => 'test-content descri'
+    check("Manage Multiple Categories")
+    click_button 'Submit'
+  end
+end
+
 describe "the Content Groups", js: true do
-  login_success
+  init_site
 
   it "create new content group" do
     admin_sign_in
-    visit "#{cama_root_relative_path}/admin/settings/post_types"
-    expect(page).to have_content('Post')
-    expect(page).to have_content('Page')
-    within("#post_type_form") do
-      fill_in 'post_type_name', :with => 'Test cat'
-      fill_in 'post_type_slug', :with => 'test-content'
-      fill_in 'post_type_description', :with => 'test-content descri'
-      check("Manage Multiple Categories")
-      click_button 'Submit'
-    end
+    create_post_type
     expect(page).to have_css('.alert-success')
   end
 
   it "edit content type" do
     admin_sign_in
+    create_post_type
     visit "#{cama_root_relative_path}/admin/settings/post_types"
     within '#admin_content' do
       all("table .btn-default").last.click
@@ -34,6 +41,7 @@ describe "the Content Groups", js: true do
 
   it "delete content type" do
     admin_sign_in
+    create_post_type
     visit "#{cama_root_relative_path}/admin/settings/post_types"
     within '#admin_content' do
       all("table .btn-danger").last.click