cmor_blog 0.0.53.pre → 0.0.58.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67520e0545e8293085e270f99fc18d9f7ce1482e6337957d33f733ab6dc9f11b
-  data.tar.gz: 82abd4eaced8e99a658e2d2b14e4850ed3ce3794914f4472cf9321c491bd59a5
+  metadata.gz: 92c7199544f0b76e3a48592371627184a1f07384a1b7cf8a2c57a51b4113801d
+  data.tar.gz: 2dae5c1513863c62b6d7a5cd1694b17825617c43a654dcf033617a482f82cf08
 SHA512:
-  metadata.gz: 9d3791ffa0a8693f02379c3b07eaf3b28e2ff2fe54036c465c0e2d91119c420c1284fa38f6adc4e9157e9f9a290698ca965631af224593637382171c2463088f
-  data.tar.gz: 198de425f2f1b930a8b1393470f5ac013c8d230c043fda4cfc31f8c0679a414ae542dd6130110d67a00459839b08e327bb3365cda3791a0c8915550024b6d2b5
+  metadata.gz: 3ebcdc68bed95dfeb11abdd837cacaf0fc22b311e8164f8bc183e3b46bf5a8c7c3104a12f457a895081f971914fbc1df58dd0122012198fe7d110ff3c7418c64
+  data.tar.gz: 6febcd753fc20547c6cdd8525d0a6b482a4a57339a3eeaa113afed91267f0694f520fb506aa002244f308fb3cf17ab2d63c365265e0f429d5af4a9aad6f53b36

data/app/models/cmor/blog/asset_detail.rb

@@ -5,6 +5,10 @@ module Cmor::Blog
 
     acts_as_list scope: :post_id
 
+    # acts as published
+    include ActsAsPublished::ActiveRecord
+    acts_as_published
+
     scope :images,     -> { joins(asset: [:blob]).where("active_storage_blobs.content_type LIKE '%image/%'") }
     scope :non_images, -> { joins(asset: [:blob]).where("active_storage_blobs.content_type NOT LIKE '%image/%'") }
 

data/app/models/cmor/blog/post.rb

@@ -34,7 +34,7 @@ module Cmor
         def body(format: nil)
           case format
           when :html
-            to_markdown(read_attribute(:body))
+            markdown_to_html(read_attribute(:body))
           else
             read_attribute(:body)
           end
@@ -42,8 +42,8 @@ module Cmor
 
         private
 
-        def to_markdown(string)
-          Kramdown::Document.new(string).to_html
+        def markdown_to_html(string)
+          instance_exec(string, &Cmor::Blog::Configuration.markdown_to_html_proc)
         end
       end
 

data/app/views/cmor/blog/application_view_helper/_render_post.html.haml

@@ -1,10 +1,13 @@
 %div{ id: dom_id(post), class: "row #{dom_class(post)} bottom-margin-5 mb-4" }
-  .col-lg-12
+  .col-lg-4
+    .post-preview-picture
+      = image_tag(main_app.url_for(post.preview_picture.asset.variant(Cmor::Blog::Configuration.preview_picture_asset_variant_options)), class: 'img-fluid')
+  .col-lg-8
     %h2.post-title
       = link_to(post.title, cmor_blog.url_for(post))
     %small
       %span.post-creation-information.text-muted
-        = "#{l(post.created_at)} | #{Cmor::Blog::Configuration.creator_label_for_post_proc.call(post)}"
+        = instance_exec(post, &Cmor::Blog::Configuration.post_creation_information_proc)
       - if Cmor::Core.features?(:cmor_comments)
         |
         %span.comments-information

data/app/views/cmor/blog/posts/_post.html.haml

@@ -1,19 +1,24 @@
 %div{ id: dom_id(post), class: dom_class(post) }
-  %h1.post-title
-    = link_to(post.title, cmor_blog.url_for(post))
-  %small
-    %span.post-creation-information.text-muted
-      = "#{l(post.created_at)} | #{Cmor::Blog::Configuration.creator_label_for_post_proc.call(post)}"
-    - if Cmor::Core.features?(:cmor_comments)
-      |
-      %span.comments-information
-        = link_to(t('cmor.comments.commentable.comments_information', comments_count: post.comments.count), cmor_blog.post_url(post, anchor: 'comments'))
-    - if Cmor::Core.features?(:cmor_tags)
-      |
-      %span.post-tags
-        = tags_helper(self).render_tags_for(post)
+  .row
+    .col-12
+      %h1.post-title
+        = post.title
+      %small
+        %span.post-creation-information.text-muted
+          = instance_exec(post, &Cmor::Blog::Configuration.post_creation_information_proc)
 
-  %p.post-body= post.body(format: :html).html_safe
+        - if Cmor::Core.features?(:cmor_comments)
+          |
+          %span.comments-information
+            = link_to(t('cmor.comments.commentable.comments_information', comments_count: post.comments.count), cmor_blog.post_url(post, anchor: 'comments'))
+        - if Cmor::Core.features?(:cmor_tags)
+          |
+          %span.post-tags
+            = tags_helper(self).render_tags_for(post)
+
+  .row
+    .col-12
+      %p.post-body= post.body(format: :html).html_safe
 
   - if post.asset_details.images.any?
     .row
@@ -21,7 +26,7 @@
         .col-lg-4.d-flex.align-items-stretch
           .card.text-center.border-0
             %a{ href: main_app.url_for(picture_detail.asset), data: { gallery: dom_id(post) } }
-              %img{ src: main_app.url_for(picture_detail.asset.variant(Cmor::Blog::Configuration.preview_picture_asset_variant_options)) }
+              %img.ing-fluid.w-100{ src: main_app.url_for(picture_detail.asset.variant(Cmor::Blog::Configuration.preview_picture_asset_variant_options)) }
             .card-body
               %h5.card-title
                 = picture_detail.title
@@ -29,8 +34,10 @@
                 = picture_detail.description
 
   - if post.asset_details.non_images.any?
-    = collection_table(collection: post.asset_details.non_images.order(position: :asc)) do |t|
-      = t.column :filename
-      = t.column :actions do |resource|
-        - link_to(main_app.url_for(resource.asset), class: 'btn btn-primary') do
-          - t('.download')
+    .row
+      .col-12
+        = collection_table(collection: post.asset_details.non_images.order(position: :asc)) do |t|
+          = t.column :filename
+          = t.column :actions do |resource|
+            - link_to(main_app.url_for(resource.asset), class: 'btn btn-primary') do
+              - t('.download')

data/app/views/cmor/blog/posts/_post_in_index.html.haml

@@ -4,7 +4,8 @@
       = link_to(post.title, cmor_blog.url_for(post))
     %small
       %span.post-creation-information.text-muted
-        = "#{l(post.created_at)} | #{Cmor::Blog::Configuration.creator_label_for_post_proc.call(post)}"
+        = instance_exec(post, &Cmor::Blog::Configuration.post_creation_information_proc)
+
       - if Cmor::Core.features?(:cmor_comments)
         |
         %span.comments-information

data/app/views/cmor/blog/posts/_post_in_index_with_preview_picture.haml

@@ -7,7 +7,8 @@
       = link_to(post.title, cmor_blog.url_for(post))
     %small
       %span.post-creation-information.text-muted
-        = "#{l(post.created_at)} | #{Cmor::Blog::Configuration.creator_label_for_post_proc.call(post)}"
+        = instance_exec(post, &Cmor::Blog::Configuration.post_creation_information_proc)
+
       - if Cmor::Core.features?(:cmor_comments)
         |
         %span.comments-information

data/app/views/cmor/blog/posts/show.html.haml

@@ -1,4 +1,9 @@
-= render @resource
+.mb-4
+  = render @resource
+
+.page-actions.row
+  .col-12
+    = link_to(t('.back'), last_location, class: 'btn btn-primary')
 
 - if Cmor::Core.features?(:cmor_comments)
   = commentable(@resource)

data/config/locales/de.yml

@@ -12,12 +12,14 @@ de:
     attributes:
       cmor/blog/post:
         id: ID
+        append_assets: Dateien hinzufügen
         asset_details_count: Anhänge
         assets: Anhänge
         body: Inhalt
         created_by_id: Erstellt von
         creator: Erstellt von
         locale: Sprache
+        overwrite_assets: Dateien ersetzen
         position: Position
         published: Veröffentlicht
         published_at: Veröffentlicht am
@@ -40,6 +42,7 @@ de:
         title: Titel
         preview_picture: Vorschau
         position: Position
+        published: Veröffentlicht
         published_at: Veröffentlicht am
         created_at: Erstellt am
         updated_at: Aktualisiert am
@@ -48,5 +51,8 @@ de:
       application_view_helper:
         render_post:
           more: 'Mehr'
+      posts:
+        show:
+          back: 'Zurück'
   routes:
     cmor_blog_engine: blog

data/config/locales/en.yml

@@ -12,12 +12,14 @@ en:
     attributes:
       cmor/blog/post:
         id: ID
+        append_assets: Append files
         asset_details_count: Assets
         assets: Asset
         body: Body
         created_by_id: Created by
         creator: Created by
         locale: Locale
+        overwrite_assets: Overwrite files
         position: Position
         published: Published
         published_at: Published at
@@ -40,6 +42,7 @@ en:
         title: Title
         preview_picture: Preview
         position: Position
+        published: Published
         published_at: Published at
         created_at: Created at
         updated_at: Updated at
@@ -48,5 +51,8 @@ en:
       application_view_helper:
         render_post:
           more: 'More'
+      posts:
+        post:
+          back: 'Back'
   routes:
     cmor_blog_engine: blog

data/lib/cmor/blog/configuration.rb

@@ -32,8 +32,12 @@ module Cmor
         { combine_options: { resize: "320x240^", extent: "384x216", gravity: "center" } }
       end
 
-      mattr_accessor(:creator_label_for_post_proc) do
-        -> (post) { post.creator&.to_s }
+      mattr_accessor(:post_creation_information_proc) do
+        -> (post) { "#{l(post.created_at)} | #{post.creator&.human}" }
+      end
+
+      mattr_accessor(:markdown_to_html_proc) do
+        -> (string) { Kramdown::Document.new(string).to_html }
       end
     end
   end

data/lib/generators/cmor/blog/install/templates/initializer.rb

@@ -46,17 +46,36 @@ Cmor::Blog.configure do |config|
   #
   config.preview_picture_asset_variant_options = { combine_options: { resize: "320x240^", extent: "384x216", gravity: "center" } }
 
-  # Define how the author will be shown on posts.
+  # Define how the author and post date will be shown on posts.
   #
   # You can generalize the label by not taking the creator into account at all:
   #
-  #     config.creator_label_for_post_proc = -> (post) { "Site Owner" }
+  #     config.post_creation_information_proc = -> (post) { "#{l(post.created_at)} | "Site Owner" }
   #
   # You can show a default when the creator is not set:
   #
-  #     config.creator_label_for_post_proc = -> (post) { post.creator&.to_s || "Site owner" }
+  #     config.post_creation_information_proc = -> (post) { post.creator&.to_s || "Site owner" }
   #
-  # default: config.creator_label_for_post_proc = -> (post) { post.creator&.to_s }
+  # You can remove the date:
   #
-  config.creator_label_for_post_proc = -> (post) { post.creator&.to_s }
+  #     config.post_creation_information_proc = -> (post) { post.creator&.to_s }
+  #
+  # default: config.post_creation_information_proc = -> (post) { "#{l(post.created_at)} | #{post.creator&.to_s}" }
+  #
+  config.post_creation_information_proc = -> (post) { "#{l(post.created_at)} | #{post.creator&.to_s}" }
+
+  # Configure how the post body is transformed from markup to html. The default
+  # format is markdown. Kramdown is used for the transformation and is a
+  # dependency of this gem.
+  #
+  # If you want to use a different markdown language you can configure it here.
+  #
+  # For example you may want to use textile as markup. First you will need to
+  # add RedCloth to your Gemfile. Then you can configure it as follows:
+  #
+  #     config.markdown_to_html_proc = -> (string) { RedCloth.new(string).to_html }
+  #
+  # default: config.markdown_to_html_proc = -> (string) { Kramdown::Document.new(string).to_html }
+  #
+  config.markdown_to_html_proc = -> (string) { Kramdown::Document.new(string).to_html }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cmor_blog
 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
@@ -499,7 +499,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: Cmor::Blog.