cmor_cms 0.0.54.pre → 0.0.59.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ecf230a6f14fef5110d44ad62d22e4c8a591e63fcfc7799bf0104c1cc396ecd
-  data.tar.gz: 9d76b2898dd1abc22358f1b1ad7736430167ed0ad12c9c842f01450cbb676a7f
+  metadata.gz: e185b056371db7d645ccb896b3a87ca63aa61427fa0bf4d27f4f8b3ae2c9cee4
+  data.tar.gz: b7942385f07c0dbbce28f8b129229635ab4c00af1e8ed6d92d8c29322409ffaa
 SHA512:
-  metadata.gz: 9c641fe5f71beae577767861d654a4cc98169c7fc99aa8b7882678da312c0a835e619efabeda12c255c8a6749a94380290e732d50e81655df860068d86cdf65d
-  data.tar.gz: 14fa11b271dc4e2cbda5b42924f9bce79e2cdf0d9f0685a83e541b59664807038d22329f851547100f48d0fe2c515097f68446fec0fd83714a7ae1ca428caf2a
+  metadata.gz: 8d976aee1a3eab730e130b8a842123d80c44342b265cdf989ac6752847a6615fa8a117393abf47db4e954f9bf64a1ce86ed6a2572957ee3846f646c0ad128979
+  data.tar.gz: cf09c9a732f6fdd53213e84fa1d220e2056985ba11fb682bb5e996fb0f5ce616db7359db10f1cf1612d9c2a55b8ad2c9d6bbfd268a081093cbfde22d25bfe4a2

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/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/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.54.pre
+  version: 0.0.59.pre
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-20 00:00:00.000000000 Z
+date: 2020-08-18 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.54.pre
+        version: 0.0.59.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.54.pre
+        version: 0.0.59.pre
 - !ruby/object:Gem::Dependency
   name: cmor_core_frontend
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.54.pre
+        version: 0.0.59.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.54.pre
+        version: 0.0.59.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,7 +493,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
@@ -491,6 +507,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:
@@ -511,7 +528,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.1.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: CMS base module for ruby on rails.

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