cmor_cms 0.0.52.pre → 0.0.57.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 383b5fe9dab96e89ad59d684dc4b7b92dcf8f0037284078ff963fbbccdebce09
-  data.tar.gz: '0649a19b8b02e03e43b0c61da469db82962c72e7e619b9e2813891938df758b9'
+  metadata.gz: bd2a6435a8cebd9eaf5548875ec3e29bbde6c239ce83647a22f4a1e625e85153
+  data.tar.gz: e3467e2bbe73b40325e8368278c5884d03544aef4eebbcfea9cb9015bdae6f9b
 SHA512:
-  metadata.gz: 8f0f050d3be7c3402fed6d64b6122063cb5c4ce8e016d99f35a251d0793bb43e93a792b1a451d2c1c11823fe7ef19ba99740d7dc415972f77a90985863f35d61
-  data.tar.gz: 014b770faa2e82398a374e725a9eab776bff49c6e6fa14111aab7cebdb298794750e3b0594c705488a984be43c9c4ab76954c7fc976c890ccaaa55aaf3077b42
+  metadata.gz: b83c50abc359f7160212c82e46f594a81d48a5b444d08a5fe5f599e4ef74f5151466cdba4e7d372ebe156ae78ecaec6e3a9ce7ff2f378a3c6464d6fd7a42705e
+  data.tar.gz: 16f4a3f52d5d9ac2c9e4f4b36109da04b83cdaf84e00fd72a65bf32ff6ec57028efdc6391fbb112c7f968fed5a76a56cd0bfaa8302fafc5a3c7835933b8604cf

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::DatabaseTemplate
+
+    # publishing
+    include ActsAsPublished::ActiveRecord
+    acts_as_published
+  end
+end

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

@@ -6,6 +6,7 @@ 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/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.52.pre
+  version: 0.0.57.pre
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-26 00:00:00.000000000 Z
+date: 2020-07-15 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.52.pre
+        version: 0.0.57.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.52.pre
+        version: 0.0.57.pre
 - !ruby/object:Gem::Dependency
   name: cmor_core_frontend
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.52.pre
+        version: 0.0.57.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.52.pre
+        version: 0.0.57.pre
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -425,12 +425,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,7 +443,7 @@ 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
@@ -464,10 +466,12 @@ 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
@@ -482,6 +486,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 +511,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 %>