cmor_cms 0.0.57.pre → 0.0.58.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd2a6435a8cebd9eaf5548875ec3e29bbde6c239ce83647a22f4a1e625e85153
-  data.tar.gz: e3467e2bbe73b40325e8368278c5884d03544aef4eebbcfea9cb9015bdae6f9b
+  metadata.gz: 7e62b58cc0f32abc8a8e6cac3b17b5350a7ba6350033c2cb56daee44999c18d7
+  data.tar.gz: 868f1976844967465b2d1927eb3663451a2765d1f4af6dad2b46a5aeb023fe48
 SHA512:
-  metadata.gz: b83c50abc359f7160212c82e46f594a81d48a5b444d08a5fe5f599e4ef74f5151466cdba4e7d372ebe156ae78ecaec6e3a9ce7ff2f378a3c6464d6fd7a42705e
-  data.tar.gz: 16f4a3f52d5d9ac2c9e4f4b36109da04b83cdaf84e00fd72a65bf32ff6ec57028efdc6391fbb112c7f968fed5a76a56cd0bfaa8302fafc5a3c7835933b8604cf
+  metadata.gz: e5d90528cdf4eca40def1bed25061495afecd6c4e262f422745e299d8d93bfd6f326283d4bb66f525255e508d62031301127318b20cb759cb275845bb2720f9c
+  data.tar.gz: 6aa4f799ca502629eec72427a7463cc62ee57b0ae0a3718478f7d73d1234e14c66b8257afdd3f474fecd7aaf19930c6f58ed66b8b12166d98264cd5c03f43a91

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/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/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/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/engine.rb

@@ -11,6 +11,10 @@ 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
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cmor_cms
 version: !ruby/object:Gem::Version
-  version: 0.0.57.pre
+  version: 0.0.58.pre
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-15 00:00:00.000000000 Z
+date: 2020-07-17 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.57.pre
+        version: 0.0.58.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.57.pre
+        version: 0.0.58.pre
 - !ruby/object:Gem::Dependency
   name: cmor_core_frontend
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.57.pre
+        version: 0.0.58.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.57.pre
+        version: 0.0.58.pre
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -418,6 +418,7 @@ 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
@@ -449,7 +450,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
@@ -476,7 +476,6 @@ 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

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