cmor_cms 0.0.55.pre → 0.0.60.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf551caf3690866dadf9f89ced1eb6a77bf85a8d52b262d6f4e67e3b7c7a1b66
-  data.tar.gz: 2e0ae960a7b152d9c08a76323324916f77c155a6330ffceb6c3398ec9cedfdc7
+  metadata.gz: bbc08f4ce3bcb2c2753ba1939cd871591a64716629711206892a911489bddf9e
+  data.tar.gz: 9c2b42cc5b4df4a2ccdb7ed61f5619c570091951f981586ec0a49c07787b01a5
 SHA512:
-  metadata.gz: 786f2a27eb81b39133624eef109b980c91e6387a2a648eb26a62358d6246c24250f552ccc5d6e0edfaae11813a012284c0a9fae48452ae633eab00395ebf7072
-  data.tar.gz: d212c339d25304e17e16f188b44702bfba24187aa03da07abd86227c4222b9b92243a6c44afd7f8d44946148338b1b2d805b9424a8c700b6d5a02e881cc8b3e1
+  metadata.gz: 1263916512e708c1897e1db50a83c4bea1dd34217852a1b3c13aa8dc1b559a9ea99a2ca3c0675aa573d82b085febe6486bae9198cd7e83f149c4d41663cf8089
+  data.tar.gz: 8e71a0b45c061464471062def6d22d2a950978c29127956fc49042c070e2842626d4925cf158b04a1255dba3a695d1abda1677c612c3594d0cb44b1c7c6fd6cb

data/app/concerns/cmor/cms/models/database_template_concern.rb

@@ -0,0 +1,63 @@
+module Cmor
+  module Cms
+    module Models
+      module DatabaseTemplateConcern
+        extend ActiveSupport::Concern
+
+        included do
+          # callbacks
+          after_initialize :set_defaults
+          before_validation :assert_trailing_slash_on_pathname
+          after_save :clear_resolver_cache
+
+          # validations
+          validates :basename, presence: true,
+                               uniqueness: { scope: [:pathname, :locale, :format, :handler] }
+          validates :handler, inclusion: { in: ActionView::Template::Handlers.extensions.map(&:to_s) }
+          validates :locale, inclusion: { in: I18n.available_locales.map(&:to_s) },
+                                  allow_nil: true,
+                                  allow_blank: true
+          validates :format, inclusion: { in: Mime::SET.symbols.map(&:to_s) },
+                                  allow_nil: true,
+                                  allow_blank: true
+          validates :pathname, presence: true
+        end
+
+        def human
+          "#{self.class.name}: #{path_and_filename}"
+        end
+
+        def filename
+          filename = basename.nil? ? '' : basename.dup
+          filename << ".#{locale}" if locale.present?
+          filename << ".#{format}" if format.present?
+          filename << ".#{handler}" if handler.present?
+          filename
+        end
+
+        def path_and_filename
+          "#{pathname}#{filename}"
+        end
+
+        private
+
+        def assert_trailing_slash_on_pathname
+          self.pathname = '/' and return if pathname.blank?
+          pathname << '/' unless pathname.end_with?('/')
+        end
+
+        def clear_resolver_cache
+          klass = "#{self.class.name}Resolver"
+          klass.constantize.instance.clear_cache
+        end
+
+        def set_defaults
+          if new_record?
+            self.locale ||= I18n.default_locale.to_s
+            self.handler ||= Cmor::Cms::Configuration.default_handlers[self.class.name.demodulize.underscore.to_sym].to_s
+          end
+        end
+      end
+    end
+  end
+end

data/app/middlewares/cmor/cms/redirect_middleware.rb

@@ -0,0 +1,34 @@
+module Cmor
+  module Cms
+    class RedirectMiddleware
+      def initialize(app)
+        @app = app
+      end
+
+      def redirect_to(location)
+        [301, {'Location' => location, 'Content-Type' => 'text/html'}, ['Moved Permanently']]
+      end
+
+      def call(env)
+        req = Rack::Request.new(env)
+        if redirect = find_redirect_for(req.path)
+          return redirect_to(redirect.target)
+        end
+        @app.call(env)
+      end
+
+      def find_redirect_for(request_path)
+        Cmor::Cms::Redirect.published.where(source: request_path).first
+      end
+      # def call(env)
+      #   req = Rack::Request.new(env)
+      #   return redirect(redirects[req.path]) if redirects.include?(req.path)
+      #   @app.call(env)
+      # end
+
+      # def redirects
+      #   { '/source' => '/target' }
+      # end
+    end
+  end
+end

data/app/models/cmor/cms/layout.rb

@@ -1,7 +1,7 @@
 module Cmor::Cms
   class Layout < ApplicationRecord
     # add shared behaviour for database backed templates
-    include Cmor::Cms::DatabaseTemplate
+    include Cmor::Cms::Models::DatabaseTemplateConcern
 
     # publishing
     include ActsAsPublished::ActiveRecord

data/app/models/cmor/cms/page.rb

@@ -1,7 +1,7 @@
 module Cmor::Cms
   class Page < ActiveRecord::Base
     # add shared behaviour for database backed templates
-    include Cmor::Cms::DatabaseTemplate
+    include Cmor::Cms::Models::DatabaseTemplateConcern
 
     # associations
     has_many :navigation_items,

data/app/models/cmor/cms/partial.rb

@@ -1,7 +1,7 @@
 module Cmor::Cms
   class Partial < ActiveRecord::Base
     # add shared behaviour for database backed templates
-    include Cmor::Cms::DatabaseTemplate
+    include Cmor::Cms::Models::DatabaseTemplateConcern
 
     # publishing
     include ActsAsPublished::ActiveRecord

data/app/models/cmor/cms/redirect.rb

@@ -0,0 +1,13 @@
+module Cmor
+  module Cms
+    class Redirect < ApplicationRecord
+      include ActsAsPublished::ActiveRecord
+      acts_as_published
+
+      acts_as_list
+
+      validates :source, presence: true
+      validates :target, presence: true
+    end
+  end
+end

data/app/models/cmor/cms/template.rb

@@ -1,7 +1,7 @@
 module Cmor::Cms
   class Template < ActiveRecord::Base
     # add shared behaviour for database backed templates
-    include Cmor::Cms::DatabaseTemplate
+    include Cmor::Cms::Models::DatabaseTemplateConcern
 
     # publishing
     include ActsAsPublished::ActiveRecord

data/app/resolvers/cmor/cms/database_resolver.rb

@@ -11,40 +11,79 @@ module Cmor
       end
 
       # instance methods go here
-      def find_templates(name, prefix, partial, details, outside_app_allowed = false)
-        return [] unless resolve(partial)
+      if Rails.version < '6.0'
+        def find_templates(name, prefix, partial, details, outside_app_allowed = false)
+          return [] unless resolve(partial)
+
+          conditions = {
+            pathname: assert_slashs(prefix.to_s),
+            basename: normalize_basename(name),
+            locale: normalize_array(details[:locale]).first,
+            format: normalize_array(details[:formats]).first,
+            handler: normalize_array(details[:handlers])
+          }
+
+          format = conditions.delete(:format)
+          locale = conditions.delete(:locale)
+
+          query  = template_class.constantize.where(conditions)
 
-        conditions = {
-          pathname: assert_slashs(prefix.to_s),
-          basename: normalize_basename(name),
-          locale: normalize_array(details[:locale]).first,
-          format: normalize_array(details[:formats]).first,
-          handler: normalize_array(details[:handlers])
-        }
+          # 1) Only include published templates
+          query = query.published
 
-        format = conditions.delete(:format)
-        locale = conditions.delete(:locale)
+          # 2) Check for templates with the given format or format is nil
+          query = query.where(["format = ? OR format = '' OR format IS NULL", format])
 
-        query  = template_class.constantize.where(conditions)
+          # 3) Ensure templates with format come first
+          query = query.order('format DESC')
 
-        # 1) Only include published templates
-        query = query.published
+          # 4) Check for templates with the given locale or locale is nil
+          query = query.where(["locale = ? OR locale = '' OR locale IS NULL", locale])
 
-        # 2) Check for templates with the given format or format is nil
-        query = query.where(["format = ? OR format = '' OR format IS NULL", format])
+          # 5) Ensure templates with locale come first
+          query = query.order('locale DESC')
 
-        # 3) Ensure templates with format come first
-        query = query.order('format DESC')
+          # 6) Now trigger the query passing on conditions to initialization
+          query.map do |record|
+            initialize_template(record, details)
+          end
+        end
+      else
+        def find_templates(name, prefix, partial, details, locals)
+          return [] unless resolve(partial)
+
+          conditions = {
+            pathname: assert_slashs(prefix.to_s),
+            basename: normalize_basename(name),
+            locale: normalize_array(details[:locale]).first,
+            format: normalize_array(details[:formats]).first,
+            handler: normalize_array(details[:handlers])
+          }
 
-        # 4) Check for templates with the given locale or locale is nil
-        query = query.where(["locale = ? OR locale = '' OR locale IS NULL", locale])
+          format = conditions.delete(:format)
+          locale = conditions.delete(:locale)
 
-        # 5) Ensure templates with locale come first
-        query = query.order('locale DESC')
+          query  = template_class.constantize.where(conditions)
 
-        # 6) Now trigger the query passing on conditions to initialization
-        query.map do |record|
-          initialize_template(record, details)
+          # 1) Only include published templates
+          query = query.published
+
+          # 2) Check for templates with the given format or format is nil
+          query = query.where(["format = ? OR format = '' OR format IS NULL", format])
+
+          # 3) Ensure templates with format come first
+          query = query.order('format DESC')
+
+          # 4) Check for templates with the given locale or locale is nil
+          query = query.where(["locale = ? OR locale = '' OR locale IS NULL", locale])
+
+          # 5) Ensure templates with locale come first
+          query = query.order('locale DESC')
+
+          # 6) Now trigger the query passing on conditions to initialization
+          query.map do |record|
+            initialize_template(record, details, locals)
+          end
         end
       end
 
@@ -71,13 +110,12 @@ module Cmor
           ::ActionView::Template.new(source, identifier, handler, details)
         end
       else
-        def initialize_template(record, details)
+        def initialize_template(record, details, locals)
           source       = build_source(record)
           identifier   = "#{record.class} - #{record.id} - #{record.pathname}#{record.basename}"
           handler      = ::ActionView::Template.registered_template_handler(record.handler)
           virtual_path = "#{record.pathname}#{record.basename}"
           layout = record.layout if record.respond_to?(:layout) && record.layout.present?
-          locals       = []
 
           # 5) Check for the record.format, if none is given, try the template
           # handler format and fallback to the one given on conditions

data/app/services/cmor/cms/add_homepages_service.rb

@@ -63,6 +63,7 @@ module Cmor::Cms
           page.basename         = 'home'
           page.locale           = locale
           page.handler          = 'textile'
+          page.published        = true
         end
         if page.save
           @created_pages << page

data/config/locales/de.yml

@@ -22,6 +22,9 @@ de:
       cmor/cms/partial:
         one: Fragment
         other: Fragmente
+      cmor/cms/redirect:
+        one: Umleitung
+        other: Umleitungen
       cmor/cms/template:
         one: Vorlage
         other: Vorlagen
@@ -113,6 +116,11 @@ de:
         locale: Sprache
         path_and_filename: Dateipfad
         pathname: Pfad
+      cmor/cms/redirect:
+        <<: *defaults
+        source: Quelle
+        target: Ziel
+        position: Position
       cmor/cms/template:
         <<: *defaults
         basename: Name

data/config/locales/en.yml

@@ -22,6 +22,9 @@ en:
       cmor/cms/partial:
         one: Partial
         other: Partials
+      cmor/cms/redirect:
+        one: Umleitung
+        other: Umleitungen
       cmor/cms/template:
         one: Template
         other: Templates
@@ -111,6 +114,11 @@ en:
         locale: Language
         path_and_filename: Filepath
         pathname: Path
+      cmor/cms/redirect:
+        <<: *defaults
+        source: Source
+        target: Target
+        position: Position
       cmor/cms/template:
         <<: *defaults
         basename: Name

data/config/routes.rb

@@ -1,6 +1,8 @@
 Cmor::Cms::Engine.routes.draw do
   localized do
-    get '/*page', to: 'page#respond', as: :page
+    get '/*page', to: 'page#respond', as: :page, constraints: lambda { |req|
+      req.path.exclude? 'rails/active_storage'
+    }
     get '/',      to: 'page#respond', page: 'home'
   end
 end

data/db/migrate/20200813085847_create_cmor_cms_redirects.rb

@@ -0,0 +1,12 @@
+class CreateCmorCmsRedirects < ActiveRecord::Migration[5.2]
+  def change
+    create_table :cmor_cms_redirects do |t|
+      t.text :source
+      t.text :target
+      t.integer :position
+      t.timestamp :published_at
+
+      t.timestamps
+    end
+  end
+end

data/lib/cmor/cms.rb

@@ -4,8 +4,6 @@ require 'cmor/cms/action_view/template_renderer_patch'
 require 'cmor/cms/engine'
 require 'cmor/cms/configuration'
 
-require 'cmor/cms/database_template'
-
 require 'cmor/cms/controller_extensions/layout_resolver'
 require 'cmor/cms/controller_extensions/page_resolver'
 require 'cmor/cms/controller_extensions/partial_resolver'

data/lib/cmor/cms/action_view/template_renderer_patch.rb

@@ -55,8 +55,9 @@ module ActionView
             template = determine_template(options)
       
             prepend_formats(template.format)
-      
-            render_template(context, template, (template.layout || options[:layout]), options[:locals] || {})
+
+            layout = (template.respond_to?(:layout) ? template.layout : nil) || options[:layout]
+            render_template(context, template, (layout || options[:layout]), options[:locals] || {})
           end
         end
       end

data/lib/cmor/cms/engine.rb

@@ -11,6 +11,14 @@ module Cmor
         c.performance_tool :rspec
 
       end
+
+      initializer "cmor_cms_engine.register_template_handlers" do |app|
+        ::ActionView::Template.register_template_handler :textile, ::ActionView::Template::Handlers::Textile.new
+      end
+
+      initializer "cmor_cms_engine.add_redirect_middleware" do |app|
+        app.middleware.use Cmor::Cms::RedirectMiddleware
+      end
     end
   end
 end

data/lib/cmor_cms.rb

@@ -1,3 +1,4 @@
+require 'acts_as_list'
 require 'acts_as_published'
 require 'awesome_nested_set'
 require 'cmor_core_frontend'

data/lib/generators/cmor/cms/install/install_generator.rb

@@ -18,16 +18,24 @@ module Cmor
         end
 
         def generate_routes
+          if Rails.application.routes.url_helpers.respond_to?(:root_path)
+            routes_source = 'routes_without_root.source'
+          else
+            routes_source = 'routes.source'
+          end
+
           inject_into_file 'config/routes.rb', before: "\nend" do
-            File.read(File.join(File.expand_path('../templates', __FILE__), 'routes.source'))
+            File.read(File.join(File.expand_path('../templates', __FILE__), routes_source))
           end
         end
 
-        # def add_homepages
-        #   if yes? "Do you want to add homepages?"
-        #     AddHomepagesService.call
-        #   end
-        # end
+        def add_homepages
+          begin
+            AddHomepagesService.call(locales: [I18n.locale])
+          rescue ActiveRecord::StatementInvalid => e
+            puts "[Cmor::Cms] Could not generate homepage: #{e.message}"
+          end
+        end
       end
     end
   end

data/lib/generators/cmor/cms/install/templates/routes.source

@@ -1,4 +1,11 @@
 
   mount Cmor::Cms::Engine, at: '/' # This one is greedy and has to go last!
 
+  # Cmor::Cms adds a root route to redirect the root of your application
+  # to the default locale.
+  #
+  # For example if your default locale is en and you access www.example.com
+  # it redirects to www.example.com/en. At /en the request is handled by
+  # by Cmor::Cms.
+  #
   root to: redirect("/#{I18n.locale}")

data/lib/generators/cmor/cms/install/templates/routes_without_root.source

@@ -0,0 +1,14 @@
+
+  mount Cmor::Cms::Engine, at: '/' # This one is greedy and has to go last!
+
+  # Cmor::Cms adds a root route to redirect the root of your application
+  # to the default locale.
+  #
+  # For example if your default locale is en and you access www.example.com
+  # it redirects to www.example.com/en. At /en the request is handled by
+  # by Cmor::Cms.
+  #
+  # WARNING: As you already have a root route this default was not added.
+  # Please review your routing.
+  #
+  # root to: redirect("/#{I18n.locale}")

data/lib/tasks/cmor_cms_tasks.rake

@@ -6,10 +6,15 @@ namespace :cmor do
       Cmor::Cms::ImportPartialsService.call(args)
     end
 
-    desc 'Adds homepages for all (or given) locales'
+    desc 'Adds homepages for all (or given) locales (Specify locales like this: rails cmor:cms:add_homepages["en de"])'
     task :add_homepages, [:locales] => [:environment] do |_t, args|
       args.with_defaults(locales: I18n.available_locales)
-      Cmor::Cms::AddHomepagesService.call(args)
+      options = args.to_h
+      if options[:locales].is_a?(String)
+        options[:locales] = options[:locales].split.map(&:to_sym) & I18n.available_locales
+      end
+
+      Cmor::Cms::AddHomepagesService.call(options)
     end
   end
 end

data/spec/factories/cmor/cms/redirects.rb

@@ -0,0 +1,6 @@
+FactoryBot.define do
+  factory :cmor_cms_redirect, class: 'Cmor::Cms::Redirect' do
+    source { "/source" }
+    target { "/target" }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cmor_cms
 version: !ruby/object:Gem::Version
-  version: 0.0.55.pre
+  version: 0.0.60.pre
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-28 00:00:00.000000000 Z
+date: 2020-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.55.pre
+        version: 0.0.60.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.55.pre
+        version: 0.0.60.pre
 - !ruby/object:Gem::Dependency
   name: cmor_core_frontend
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.55.pre
+        version: 0.0.60.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.55.pre
+        version: 0.0.60.pre
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -318,6 +318,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: acts_as_list
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: awesome_nested_set
   requirement: !ruby/object:Gem::Requirement
@@ -418,11 +432,13 @@ files:
 - app/assets/stylesheets/cmor/cms/application.css
 - app/assets/stylesheets/cmor/cms/application/keep.css
 - app/assets/stylesheets/cmor_cms.css
+- app/concerns/cmor/cms/models/database_template_concern.rb
 - app/concerns/cmor/cms/navigation_item/properties_concern.rb~
 - app/controllers/cmor/cms/page_controller.rb
 - app/importers/cmor/cms/importers/navigation.rb
 - app/importers/cmor/cms/importers/navigation_item.rb
 - app/importers/cmor/cms/importers/page.rb
+- app/middlewares/cmor/cms/redirect_middleware.rb
 - app/models/cmor/cms/content_block.rb
 - app/models/cmor/cms/content_box.rb
 - app/models/cmor/cms/layout.rb
@@ -430,6 +446,7 @@ files:
 - app/models/cmor/cms/navigation_item.rb
 - app/models/cmor/cms/page.rb
 - app/models/cmor/cms/partial.rb
+- app/models/cmor/cms/redirect.rb
 - app/models/cmor/cms/template.rb
 - app/resolvers/cmor/cms/database_resolver.rb
 - app/resolvers/cmor/cms/layout_resolver.rb
@@ -449,7 +466,6 @@ files:
 - config/initializers/assets.rb
 - config/initializers/mime_types.rb
 - config/initializers/simple_navigation.rb
-- config/initializers/textile_support.rb
 - config/locales/de.yml
 - config/locales/en.yml
 - config/navigation.rb
@@ -467,6 +483,7 @@ files:
 - db/migrate/20200120134422_add_published_at_to_cmor_cms_navigation_items.rb
 - db/migrate/20200120141440_set_all_publishable_to_published.rb
 - db/migrate/20200514115526_create_cmor_cms_layouts.rb
+- db/migrate/20200813085847_create_cmor_cms_redirects.rb
 - lib/cmor/cms.rb
 - lib/cmor/cms/action_view/template_patch.rb
 - lib/cmor/cms/action_view/template_renderer_patch.rb
@@ -476,13 +493,13 @@ files:
 - lib/cmor/cms/controller_extensions/partial_resolver.rb
 - lib/cmor/cms/controller_extensions/template_resolver.rb
 - lib/cmor/cms/database_resolver.rb~
-- lib/cmor/cms/database_template.rb
 - lib/cmor/cms/engine.rb
 - lib/cmor/cms/version.rb
 - lib/cmor_cms.rb
 - lib/generators/cmor/cms/install/install_generator.rb
 - lib/generators/cmor/cms/install/templates/initializer.rb
 - lib/generators/cmor/cms/install/templates/routes.source
+- lib/generators/cmor/cms/install/templates/routes_without_root.source
 - lib/tasks/cmor_cms_tasks.rake
 - spec/factories/cmor/cms/content_block.rb
 - spec/factories/cmor/cms/content_box.rb
@@ -491,6 +508,7 @@ files:
 - spec/factories/cmor/cms/navigations.rb
 - spec/factories/cmor/cms/pages.rb
 - spec/factories/cmor/cms/partials.rb
+- spec/factories/cmor/cms/redirects.rb
 - spec/factories/cmor/cms/templates.rb
 homepage: https://github.com/content-management-on-rails
 licenses:

data/config/initializers/textile_support.rb

@@ -1,3 +0,0 @@
-Rails.application.config.to_prepare do
-  ::ActionView::Template.register_template_handler :textile, ::ActionView::Template::Handlers::Textile.new
-end

data/lib/cmor/cms/database_template.rb

@@ -1,64 +0,0 @@
-module Cmor
-  module Cms
-    module DatabaseTemplate
-      def self.included(base)
-        base.extend(ClassMethods)
-
-        # callbacks
-        base.after_initialize :set_defaults
-        base.before_validation :assert_trailing_slash_on_pathname
-        base.after_save :clear_resolver_cache
-
-        # validations
-        base.validates :basename, presence: true,
-                                  uniqueness: { scope: [:pathname, :locale, :format, :handler] }
-        base.validates :handler, inclusion: ActionView::Template::Handlers.extensions.map(&:to_s)
-        base.validates :locale, inclusion: I18n.available_locales.map(&:to_s),
-                                allow_nil: true,
-                                allow_blank: true
-        base.validates :format, inclusion: Mime::SET.symbols.map(&:to_s),
-                                allow_nil: true,
-                                allow_blank: true
-        base.validates :pathname, presence: true
-      end
-
-      module ClassMethods
-      end
-
-      def human
-        "#{self.class.name}: #{path_and_filename}"
-      end
-
-      def filename
-        filename = basename.nil? ? '' : basename.dup
-        filename << ".#{locale}" if locale.present?
-        filename << ".#{format}" if format.present?
-        filename << ".#{handler}" if handler.present?
-        filename
-      end
-
-      def path_and_filename
-        "#{pathname}#{filename}"
-      end
-
-      private
-
-      def assert_trailing_slash_on_pathname
-        self.pathname = '/' and return if pathname.blank?
-        pathname << '/' unless pathname.end_with?('/')
-      end
-
-      def clear_resolver_cache
-        klass = "#{self.class.name}Resolver"
-        klass.constantize.instance.clear_cache
-      end
-
-      def set_defaults
-        if new_record?
-          self.locale ||= I18n.default_locale.to_s
-          self.handler ||= Cmor::Cms::Configuration.default_handlers[self.class.name.demodulize.underscore.to_sym].to_s
-        end
-      end
-    end
-  end
-end