cmor_cms 0.0.41.pre → 0.0.42.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11ad72e3dce124f192f3d1ce753f7fd46bc09ca90f67698d80073a0a2577ab3c
-  data.tar.gz: 6d7e2ae8406d0e44e4e6f9dc1e19fab564c396e804c15e273ca36b3d4d6406ee
+  metadata.gz: 90f0546f5a5685f505565098b2661619c9ebd7709e9f417afec3c59ce148c57f
+  data.tar.gz: 692e92872c9310bcb78619d4a9c2daf11ca479ec95bee3fce82393be4fefeea9
 SHA512:
-  metadata.gz: cd3c931520468730aa58757db1dc6a7a4612cf319f0799d94d351d1441d108b8b4fb1510b2e152cc11b230e3c95fa3a7416a381d7a1838d9d7f9b1b5a7441f36
-  data.tar.gz: 2a61b273471befdef7a297c0663b2ca6ec80a9d70cb117e5c60288d66a087627ba06a9783f1aff56ccccd3df9ae081504ee9451cdaad445df54c94899cd73818
+  metadata.gz: 70caf6861fb95e2443cc061457052fafc548429abd3959dfea37eb33128b88795a8daa998801504b711a36ddc2b023829bc870fe3471e78d59e4fef5f62ed080
+  data.tar.gz: ef85c25428f70e360cab41df214b30ba6267b2922af79c759a4f3f94253ad94d1b441cfa5d92b84fb0eebd66de137de6ff99925bd7244a38e2991429b3831921

data/app/{models/concerns/model → concerns}/cmor/cms/navigation_item/properties_concern.rb

@@ -1,7 +1,5 @@
-require 'active_support/concern'
-
-module Model::Cmor::Cms::NavigationItem
-  module PropertiesConcern
+module Cmor::Cms
+  module NavigationItem::PropertiesConcern
     extend ActiveSupport::Concern
 
     included do

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

@@ -1,7 +1,11 @@
 class Cmor::Cms::Navigation < ActiveRecord::Base
   # associations
   has_many :navigation_items,
-           dependent: :destroy
+           dependent: :destroy do
+    def published
+      merge(Cmor::Cms::NavigationItem.published)
+    end
+  end
 
   # validations
   validates :locale, inclusion: I18n.available_locales.map(&:to_s),

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

@@ -1,8 +1,6 @@
-require_dependency 'model/cmor/cms/navigation_item/properties_concern'
-
 module Cmor::Cms
   class NavigationItem < ActiveRecord::Base
-    include Model::Cmor::Cms::NavigationItem::PropertiesConcern
+    include Cmor::Cms::NavigationItem::PropertiesConcern
 
     # associations
     belongs_to :navigation,
@@ -10,6 +8,10 @@ module Cmor::Cms
     belongs_to :page,
                optional: true
 
+    # publishing
+    include ActsAsPublished::ActiveRecord
+    acts_as_published
+
     # awesome nested set
     acts_as_nested_set dependent: :destroy, counter_cache: :children_count, scope: :navigation_id
 

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 DatabaseTemplate
+    include Cmor::Cms::DatabaseTemplate
 
     # associations
     has_many :navigation_items,
@@ -12,6 +12,10 @@ module Cmor::Cms
 
     accepts_nested_attributes_for :content_blocks, allow_destroy: true
 
+    # publishing
+    include ActsAsPublished::ActiveRecord
+    acts_as_published
+
     # callbacks
     after_save :touch_navigation_items
 

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

@@ -1,15 +1,19 @@
-require 'cmor/cms/database_template'
+module Cmor::Cms
+  class Partial < ActiveRecord::Base
+    # add shared behaviour for database backed templates
+    include Cmor::Cms::DatabaseTemplate
 
-class Cmor::Cms::Partial < ActiveRecord::Base
-  # add shared behaviour for database backed templates
-  include Cmor::Cms::DatabaseTemplate
+    # publishing
+    include ActsAsPublished::ActiveRecord
+    acts_as_published
 
-  # callbacks
-  before_validation :ensure_basename_starts_with_underscore, if: proc { |t| t.basename.present? }
+    # callbacks
+    before_validation :ensure_basename_starts_with_underscore, if: proc { |t| t.basename.present? }
 
-  private
+    private
 
-  def ensure_basename_starts_with_underscore
-    basename.insert(0, '_') unless basename.start_with?('_')
+    def ensure_basename_starts_with_underscore
+      basename.insert(0, '_') unless basename.start_with?('_')
+    end
   end
 end

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

@@ -1,13 +1,19 @@
-class Cmor::Cms::Template < ActiveRecord::Base
-  # add shared behaviour for database backed templates
-  include Cmor::Cms::DatabaseTemplate
+module Cmor::Cms
+  class Template < ActiveRecord::Base
+    # add shared behaviour for database backed templates
+    include Cmor::Cms::DatabaseTemplate
 
-  # callbacks
-  before_validation :ensure_basename_starts_without_underscore, if: proc { |t| t.basename.present? }
+    # publishing
+    include ActsAsPublished::ActiveRecord
+    acts_as_published
 
-  private
+    # callbacks
+    before_validation :ensure_basename_starts_without_underscore, if: proc { |t| t.basename.present? }
 
-  def ensure_basename_starts_without_underscore
-    basename.slice!(0) if basename.start_with?('_')
+    private
+
+    def ensure_basename_starts_without_underscore
+      basename.slice!(0) if basename.start_with?('_')
+    end
   end
 end

data/app/resolvers/cmor/cms/database_resolver.rb

@@ -27,6 +27,9 @@ module Cmor
 
         query  = template_class.constantize.where(conditions)
 
+        # 1) Only include published templates
+        query = query.published
+
         # 2) Check for templates with the given format or format is nil
         query = query.where(["format = ? OR format = '' OR format IS NULL", format])
 

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

@@ -22,7 +22,7 @@ module Cmor
       #
       def render(name, options = {})
         options.reverse_merge!(
-          renderer:       :bootstrap,
+          renderer:       :list,
           expand_all:     true,
           level:          1,
           selected_class: nil,
@@ -48,7 +48,7 @@ module Cmor
           return I18n.t('cmor.cms.navigation.messages.not_found', lang: I18n.locale.to_s, name: name.to_s)
         end
 
-        roots = navigation.navigation_items.roots.all
+        roots = navigation.navigation_items.roots.published.all
         if roots.empty?
           return I18n.t('cmor.cms.navigation.messages.empty', lang: I18n.locale.to_s, name: name)
         end
@@ -72,9 +72,9 @@ module Cmor
         options.reverse_merge!(html: item_html.dup, link_html: link_html)
 
         navigation.dom_class = container_css_class
-        if item.children.present?
+        if item.children.published.present?
           navigation.item(item.key, item.name, item.url, options) do |sub_navigation|
-            item.children.each do |sub_item|
+            item.children.published.each do |sub_item|
               build_navigation_item(sub_navigation, sub_item, container_css_class, item_html, link_html)
             end
           end

data/config/locales/de.yml

@@ -23,8 +23,14 @@ de:
         one: Vorlage
         other: Vorlagen
     attributes:
-      cmor/cms/content_block:
+      defaults: &defaults
         id: ID
+        created_at: Erstellt am
+        updated_at: Aktualisiert am
+        published_at: Veröffentlicht am
+        published: Veröffentlicht
+      cmor/cms/content_block:
+        <<: *defaults
         body: Inhalt
         page: Seite
         page_id: Seite
@@ -33,24 +39,20 @@ de:
         created_at: Erstellt am
         updated_at: Aktualisiert am
       cmor/cms/content_box:
-        id: ID
+        <<: *defaults
         name: Name
         body: Inhalt
         content_blocks: Content Blöcke
         content_blocks_count: Content Blöcke
-        created_at: Erstellt am
-        updated_at: Aktualisiert am
       cmor/cms/navigation:
-        id: ID
-        created_at: Erstellt am
+        <<: *defaults
         navigation_items: Navigationseinträge
         navigation_items_count: Navigationseinträge
         locale: Sprache
         name: Name
         slug: Freundliche ID
-        updated_at: Aktualisiert am
       cmor/cms/navigation_item:
-        id: ID
+        <<: *defaults
         children_count: Unterelemente
         data_add_icon: Symbol
         depth: Baumtiefe
@@ -70,10 +72,8 @@ de:
         rgt: Rechts
         slug: Freundliche ID
         url: Ziel-URL
-        created_at: Erstellt am
-        updated_at: Aktualisiert am
       cmor/cms/page:
-        id: ID
+        <<: *defaults
         basename: Name
         body: Inhalt
         cmor_cms_folder_id: Ordner
@@ -89,10 +89,8 @@ de:
         path_and_filename: Dateipfad
         pathname: Pfad
         title: Titel
-        created_at: Erstellt am
-        updated_at: Aktualisiert am
       cmor/cms/partial:
-        id: ID
+        <<: *defaults
         basename: Name
         body: Inhalt
         cmor_cms_folder_id: Ordner
@@ -104,10 +102,8 @@ de:
         locale: Sprache
         path_and_filename: Dateipfad
         pathname: Pfad
-        created_at: Erstellt am
-        updated_at: Aktualisiert am
       cmor/cms/template:
-        id: ID
+        <<: *defaults
         basename: Name
         body: Inhalt
         cmor_cms_folder_id: Ordner
@@ -119,8 +115,6 @@ de:
         locale: Sprache
         path_and_filename: Dateipfad
         pathname: Pfad
-        created_at: Erstellt am
-        updated_at: Aktualsiert am
   classes:
     cmor/cms/add_homepages_service: 'Dienst zum hinzufügen von Homepages'
     cmor/cms/import_partials_service: 'Dienst zum importieren von Fragmenten'
@@ -130,7 +124,7 @@ de:
         menu: CMS
       navigation:
         messages:
-          empty: Navigation  %{name} (%{lang}) ist leer
+          empty: Navigation %{name} (%{lang}) ist leer
           not_found: Navigation %{name} (%{lang}) nicht gefunden
   resources:
     navigations: navigationen

data/config/locales/en.yml

@@ -23,34 +23,34 @@ en:
         one: Template
         other: Templates
     attributes:
-      cmor/cms/content_block:
+      defaults: &defaults
         id: ID
+        created_at: Created at
+        updated_at: Updated at
+        published_at: Published at
+        published: Published
+      cmor/cms/content_block:
+        <<: *defaults
         body: Body
         page: Page
         page_id: Page
         content_box: Content box
         content_box_id: Content box
-        created_at: Created at
-        updated_at: Updated at
       cmor/cms/content_box:
-        id: ID
+        <<: *defaults
         name: Name
         body: Body
         content_blocks: Content blocks
-        content_blocks_count: Content blocks
-        created_at: Created at
-        updated_at: updated at
+        content_blocks_count: Content blocksx
       cmor/cms/navigation:
-        id: ID
+        <<: *defaults
         navigation_items: Navigation items
         navigation_items_count: Navigation items
         locale: Language
         name: Name
         slug: Slug
-        created_at: Created at
-        updated_at: updated at
       cmor/cms/navigation_item:
-        id: ID
+        <<: *defaults
         children_count: Subitems
         data_add_icon: Icon
         depth: Tree depth
@@ -70,10 +70,8 @@ en:
         rgt: Right
         slug: Slug
         url: Target url
-        created_at: Created at
-        updated_at: Updated at
       cmor/cms/page:
-        id: ID
+        <<: *defaults
         basename: Name
         body: Body
         cmor_cms_folder_id: Folder
@@ -89,10 +87,8 @@ en:
         path_and_filename: Filepath
         pathname: Path
         title: Title
-        created_at: Created at
-        updated_at: Updated at
       cmor/cms/partial:
-        id: ID
+        <<: *defaults
         basename: Name
         body: Body
         cmor_cms_folder_id: Folder
@@ -104,10 +100,8 @@ en:
         locale: Language
         path_and_filename: Filepath
         pathname: Path
-        created_at: Created at
-        updated_at: Updated at
       cmor/cms/template:
-        id: ID
+        <<: *defaults
         basename: Name
         body: Body
         cmor_cms_folder_id: Folder
@@ -119,8 +113,6 @@ en:
         locale: Language
         path_and_filename: Filepath
         pathname: Path
-        created_at: Created at
-        updated_at: Updated at
   classes:
     cmor/cms/add_homepages_service: 'Add homepages service'
     cmor/cms/import_partials_service: 'Import partials service'

data/db/migrate/20200120134306_add_published_at_to_cmor_cms_pages.rb

@@ -0,0 +1,5 @@
+class AddPublishedAtToCmorCmsPages < ActiveRecord::Migration[5.2]
+  def change
+    add_column :cmor_cms_pages, :published_at, :timestamp
+  end
+end

data/db/migrate/20200120134342_add_published_at_to_cmor_cms_templates.rb

@@ -0,0 +1,5 @@
+class AddPublishedAtToCmorCmsTemplates < ActiveRecord::Migration[5.2]
+  def change
+    add_column :cmor_cms_templates, :published_at, :timestamp
+  end
+end

data/db/migrate/20200120134400_add_published_at_to_cmor_cms_partials.rb

@@ -0,0 +1,5 @@
+class AddPublishedAtToCmorCmsPartials < ActiveRecord::Migration[5.2]
+  def change
+    add_column :cmor_cms_partials, :published_at, :timestamp
+  end
+end

data/db/migrate/20200120134422_add_published_at_to_cmor_cms_navigation_items.rb

@@ -0,0 +1,5 @@
+class AddPublishedAtToCmorCmsNavigationItems < ActiveRecord::Migration[5.2]
+  def change
+    add_column :cmor_cms_navigation_items, :published_at, :timestamp
+  end
+end

data/db/migrate/20200120141440_set_all_publishable_to_published.rb

@@ -0,0 +1,27 @@
+class SetAllPublishableToPublished < ActiveRecord::Migration[5.2]
+  def self.up
+    ActiveRecord::Base.transaction do
+      [
+        Cmor::Cms::NavigationItem,
+        Cmor::Cms::Page,
+        Cmor::Cms::Partial,
+        Cmor::Cms::Template
+      ].each do |klass|
+        klass.update_all(published_at: Time.zone.now)
+      end
+    end
+  end
+
+  def down.up
+    ActiveRecord::Base.transaction do
+      [
+        Cmor::Cms::NavigationItem,
+        Cmor::Cms::Page,
+        Cmor::Cms::Partial,
+        Cmor::Cms::Template
+      ].each do |klass|
+        klass.update_all(published_at: nil)
+      end
+    end
+  end
+end

data/lib/cmor_cms.rb

@@ -1,3 +1,4 @@
+require 'acts_as_published'
 require 'awesome_nested_set'
 require 'cmor_core_frontend'
 require 'rao-service'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cmor_cms
 version: !ruby/object:Gem::Version
-  version: 0.0.41.pre
+  version: 0.0.42.pre
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-19 00:00:00.000000000 Z
+date: 2020-01-21 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.41.pre
+        version: 0.0.42.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.41.pre
+        version: 0.0.42.pre
 - !ruby/object:Gem::Dependency
   name: cmor_core_frontend
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.41.pre
+        version: 0.0.42.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.41.pre
+        version: 0.0.42.pre
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -304,6 +304,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: acts_as_published
+  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
@@ -404,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/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
@@ -415,7 +430,6 @@ files:
 - app/models/cmor/cms/page.rb
 - app/models/cmor/cms/partial.rb
 - app/models/cmor/cms/template.rb
-- app/models/concerns/model/cmor/cms/navigation_item/properties_concern.rb
 - app/resolvers/cmor/cms/database_resolver.rb
 - app/resolvers/cmor/cms/page_resolver.rb
 - app/resolvers/cmor/cms/partial_resolver.rb
@@ -445,6 +459,11 @@ files:
 - db/migrate/006_create_cmor_cms_navigation_items.rb
 - db/migrate/007_create_cmor_cms_content_boxes.rb
 - db/migrate/008_create_cmor_cms_content_blocks.rb
+- db/migrate/20200120134306_add_published_at_to_cmor_cms_pages.rb
+- db/migrate/20200120134342_add_published_at_to_cmor_cms_templates.rb
+- 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
 - lib/cmor/cms.rb
 - lib/cmor/cms/action_view/template_patch.rb
 - lib/cmor/cms/action_view/template_renderer_patch.rb