cmor_cms 0.0.53.pre → 0.0.58.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12efcd07a0d0ec6237ba803352d464670efc4b868e9f53317e48a20ecd14dd43
-  data.tar.gz: 378c525b3ffb9027f83d45441c43f5853f87bdf2cc25cd372d9d2cf327531cf1
+  metadata.gz: 7e62b58cc0f32abc8a8e6cac3b17b5350a7ba6350033c2cb56daee44999c18d7
+  data.tar.gz: 868f1976844967465b2d1927eb3663451a2765d1f4af6dad2b46a5aeb023fe48
 SHA512:
-  metadata.gz: 6ef123061238783dc8ed466b065c88ccf500f0c1f98e3ee49724cce13c5bec39f434c134bd46c4a92aa31113b4fe09cfd00eb563acdfac48c8c3ff47b87a51ad
-  data.tar.gz: c9129cc6e5e35b7308b18468a29ce3842674ad3d065793e943796ea9e23653ff96c7af363b83cc57b19b56848ce8fdddfea30eac3175afd213483dc9fc390f7f
+  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/controllers/cmor/cms/page_controller.rb

@@ -1,6 +1,7 @@
 module Cmor
   module Cms
     class PageController < Cmor::Cms::Configuration.base_controller.constantize
+      include Cmor::Cms::ControllerExtensions::LayoutResolver
       include Cmor::Cms::ControllerExtensions::PageResolver
       include Cmor::Cms::ControllerExtensions::PartialResolver
 
@@ -22,11 +23,13 @@ module Cmor
         extend ActiveSupport::Concern
 
         included do
-          rescue_from ActionView::MissingTemplate do |exception|
-            if exception.message.start_with?('Missing partial')
-              handle_missing_partial(exception)
-            else
-              handle_missing_template(exception)
+          unless Rails.env.development?
+            rescue_from ActionView::MissingTemplate do |exception|
+              if exception.message.start_with?('Missing partial')
+                handle_missing_partial(exception)
+              else
+                handle_missing_template(exception)
+              end
             end
           end
         end

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

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

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/app/resolvers/cmor/cms/layout_resolver.rb

@@ -0,0 +1,9 @@
+module Cmor
+  module Cms
+    class LayoutResolver < TemplateResolver
+      def template_class
+        'Cmor::Cms::Layout'
+      end
+    end
+  end
+end

data/app/view_helpers/cmor/cms/application_view_helper.rb

@@ -16,8 +16,8 @@ module Cmor
         "<meta name=\"description\" content=\"#{c.content_for(:meta_description)}\">"
       end
 
-      def link_to_top
-        c.render partial: '/cmor/cms/link_to_top'
+      def link_to_top(icons: :glyphicons)
+        render icons: icons
       end
 
       def is_page?

data/app/views/cmor/cms/application_view_helper/_link_to_top.html.erb

@@ -0,0 +1,12 @@
+<%= content_tag(:div, class: 'pull-right') do %>
+  <%= link_to('#top', id: 'top-link', class: 'btn btn-primary') do %>
+    <% case icons %>
+    <% when :glyphicons %>
+      <%= content_tag(:span, nil, class: 'glyphicon glyphicon-arrow-up') %>
+    <% when :font_awesome %>
+      <%= content_tag(:i, nil, class: 'fas fa-arrow-up') %>
+    <% else %>
+      <%= content_tag(:span, "&#8963;".html_safe) %>
+    <% end %>
+  <% end %>
+<% end %>

data/config/locales/de.yml

@@ -7,6 +7,9 @@ de:
       cmor/cms/content_box:
         one: Content Box
         other: Content Boxen
+      cmor/cms/layout:
+        one: Layout
+        other: Layouts
       cmor/cms/navigation:
         one: Navigation
         other: Navigationen
@@ -44,6 +47,16 @@ de:
         body: Inhalt
         content_blocks: Content Blöcke
         content_blocks_count: Content Blöcke
+      cmor/cms/layout:
+        <<: *defaults
+        basename: Name
+        body: Inhalt
+        filename: Dateiname
+        format: Format
+        handler: Handler
+        locale: Sprache
+        path_and_filename: Dateipfad
+        pathname: Pfad
       cmor/cms/navigation:
         <<: *defaults
         navigation_items: Navigationseinträge
@@ -93,8 +106,6 @@ de:
         <<: *defaults
         basename: Name
         body: Inhalt
-        cmor_cms_folder_id: Ordner
-        cmor_cms_folder: Ordner
         filename: Dateiname
         format: Format
         handler: Handler
@@ -106,8 +117,6 @@ de:
         <<: *defaults
         basename: Name
         body: Inhalt
-        cmor_cms_folder_id: Ordner
-        cmor_cms_folder: Ordner
         filename: Dateiname
         format: Format
         handler: Handler

data/config/locales/en.yml

@@ -7,6 +7,9 @@ en:
       cmor/cms/content_box:
         one: Content box
         other: Content boxes
+      cmor/cms/layout:
+        one: Layout
+        other: Layouts
       cmor/cms/navigation:
         one: Navigation
         other: Navigations
@@ -41,7 +44,17 @@ en:
         name: Name
         body: Body
         content_blocks: Content blocks
-        content_blocks_count: Content blocksx
+        content_blocks_count: Content blocks
+      cmor/cms/layout:
+        <<: *defaults
+        basename: Name
+        body: Body
+        filename: Filename
+        format: Format
+        handler: Handler
+        locale: Language
+        path_and_filename: Filepath
+        pathname: Path
       cmor/cms/navigation:
         <<: *defaults
         navigation_items: Navigation items
@@ -91,8 +104,6 @@ en:
         <<: *defaults
         basename: Name
         body: Body
-        cmor_cms_folder_id: Folder
-        cmor_cms_folder: Folder
         filename: Filename
         format: Format
         handler: Handler
@@ -104,8 +115,6 @@ en:
         <<: *defaults
         basename: Name
         body: Body
-        cmor_cms_folder_id: Folder
-        cmor_cms_folder: Folder
         filename: Filename
         format: Format
         handler: Handler

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/20200514115526_create_cmor_cms_layouts.rb

@@ -0,0 +1,15 @@
+class CreateCmorCmsLayouts < ActiveRecord::Migration[5.2]
+  def change
+    create_table :cmor_cms_layouts do |t|
+      t.string :basename
+      t.string :pathname
+      t.text :body
+      t.string :locale
+      t.string :format
+      t.string :handler
+      t.timestamp :published_at
+
+      t.timestamps
+    end
+  end
+end

data/lib/cmor/cms.rb

@@ -4,8 +4,7 @@ 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'
 require 'cmor/cms/controller_extensions/template_resolver'

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

@@ -36,6 +36,29 @@ module ActionView
 
             render_template(template, layout, options[:locals])
           end
+        elsif Rails::VERSION::MAJOR < 6
+          def render(context, options)
+            @view    = context
+            @details = extract_details(options)
+            template = determine_template(options)
+            layout   = template.respond_to?(:layout) && template.layout.present? ? template.layout : options[:layout]
+
+            prepend_formats(template.formats)
+
+            @lookup_context.rendered_format ||= (template.formats.first || formats.first)
+
+            render_template(template, layout, options[:locals])
+          end
+        else
+          def render(context, options)
+            @details = extract_details(options)
+            template = determine_template(options)
+      
+            prepend_formats(template.format)
+
+            layout = (template.respond_to?(:layout) ? template.layout : nil) || options[:layout]
+            render_template(context, template, (layout || options[:layout]), options[:locals] || {})
+          end
         end
       end
     end

data/lib/cmor/cms/controller_extensions/layout_resolver.rb

@@ -0,0 +1,12 @@
+module Cmor
+  module Cms
+    module ControllerExtensions
+      module LayoutResolver
+        def self.included(base)
+          # add the template resolver
+          base.prepend_view_path ::Cmor::Cms::LayoutResolver.instance unless base.view_paths.include?(::Cmor::Cms::LayoutResolver.instance)
+        end
+      end
+    end
+  end
+end

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

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

@@ -0,0 +1,7 @@
+FactoryBot.define do
+  factory :cmor_cms_layout, class: 'Cmor::Cms::Layout' do
+    sequence(:basename) { |i| "layout_#{i}" }
+    handler { 'erb' }
+    pathname { '/' }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cmor_cms
 version: !ruby/object:Gem::Version
-  version: 0.0.53.pre
+  version: 0.0.58.pre
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-26 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.53.pre
+        version: 0.0.58.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.53.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.53.pre
+        version: 0.0.58.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.53.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
@@ -425,12 +426,14 @@ files:
 - app/importers/cmor/cms/importers/page.rb
 - app/models/cmor/cms/content_block.rb
 - app/models/cmor/cms/content_box.rb
+- app/models/cmor/cms/layout.rb
 - app/models/cmor/cms/navigation.rb
 - app/models/cmor/cms/navigation_item.rb
 - app/models/cmor/cms/page.rb
 - app/models/cmor/cms/partial.rb
 - app/models/cmor/cms/template.rb
 - app/resolvers/cmor/cms/database_resolver.rb
+- app/resolvers/cmor/cms/layout_resolver.rb
 - app/resolvers/cmor/cms/page_resolver.rb
 - app/resolvers/cmor/cms/partial_resolver.rb
 - app/resolvers/cmor/cms/template_resolver.rb
@@ -441,13 +444,12 @@ files:
 - app/view_helpers/cmor/cms/application_view_helper.rb
 - app/view_helpers/cmor/cms/navigation_view_helper.rb
 - app/view_helpers/cmor/cms/page_view_helper.rb
-- app/views/cmor/cms/_link_to_top.html.erb
+- app/views/cmor/cms/application_view_helper/_link_to_top.html.erb
 - app/views/cmor/cms/page/fallback.html.erb
 - app/views/cmor/cms/page/fallback.txt
 - 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
@@ -464,15 +466,16 @@ files:
 - db/migrate/20200120134400_add_published_at_to_cmor_cms_partials.rb
 - 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
 - lib/cmor/cms.rb
 - lib/cmor/cms/action_view/template_patch.rb
 - lib/cmor/cms/action_view/template_renderer_patch.rb
 - lib/cmor/cms/configuration.rb
+- lib/cmor/cms/controller_extensions/layout_resolver.rb
 - lib/cmor/cms/controller_extensions/page_resolver.rb
 - 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
@@ -482,6 +485,7 @@ files:
 - lib/tasks/cmor_cms_tasks.rake
 - spec/factories/cmor/cms/content_block.rb
 - spec/factories/cmor/cms/content_box.rb
+- spec/factories/cmor/cms/layouts.rb
 - spec/factories/cmor/cms/navigation_items.rb
 - spec/factories/cmor/cms/navigations.rb
 - spec/factories/cmor/cms/pages.rb
@@ -506,7 +510,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: CMS base module for ruby on rails.

data/app/views/cmor/cms/_link_to_top.html.erb

@@ -1,5 +0,0 @@
-<%= content_tag(:div, class: 'pull-right') do %>
-  <%= link_to('#top', id: 'top-link', class: 'btn btn-primary') do %>
-    <%= content_tag(:i, nil, class: 'glyphicon glyphicon-arrow-up') %>
-  <% end %>
-<% end %>

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