cmor_cms 0.0.58.pre → 0.0.59.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e62b58cc0f32abc8a8e6cac3b17b5350a7ba6350033c2cb56daee44999c18d7
-  data.tar.gz: 868f1976844967465b2d1927eb3663451a2765d1f4af6dad2b46a5aeb023fe48
+  metadata.gz: e185b056371db7d645ccb896b3a87ca63aa61427fa0bf4d27f4f8b3ae2c9cee4
+  data.tar.gz: b7942385f07c0dbbce28f8b129229635ab4c00af1e8ed6d92d8c29322409ffaa
 SHA512:
-  metadata.gz: e5d90528cdf4eca40def1bed25061495afecd6c4e262f422745e299d8d93bfd6f326283d4bb66f525255e508d62031301127318b20cb759cb275845bb2720f9c
-  data.tar.gz: 6aa4f799ca502629eec72427a7463cc62ee57b0ae0a3718478f7d73d1234e14c66b8257afdd3f474fecd7aaf19930c6f58ed66b8b12166d98264cd5c03f43a91
+  metadata.gz: 8d976aee1a3eab730e130b8a842123d80c44342b265cdf989ac6752847a6615fa8a117393abf47db4e954f9bf64a1ce86ed6a2572957ee3846f646c0ad128979
+  data.tar.gz: cf09c9a732f6fdd53213e84fa1d220e2056985ba11fb682bb5e996fb0f5ce616db7359db10f1cf1612d9c2a55b8ad2c9d6bbfd268a081093cbfde22d25bfe4a2

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

@@ -15,6 +15,10 @@ module Cmor
       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.58.pre
+  version: 0.0.59.pre
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-17 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.58.pre
+        version: 0.0.59.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.58.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.58.pre
+        version: 0.0.59.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.58.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
@@ -424,6 +438,7 @@ files:
 - 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
@@ -431,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
@@ -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
@@ -490,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: