ecm_blog 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed06e1d64976f3a1563ab81483d4f255ce14a5c6
-  data.tar.gz: 26d97170469dce60dbb658d1e822abb4798cffa9
+  metadata.gz: aa66850e4536529d4ee1ffe08a0946b1a7c3e56a
+  data.tar.gz: 41de1a1a851302250642ae3aa66d6202ac48c0d4
 SHA512:
-  metadata.gz: b525df7f75466358db2f64793e891eec9cc2f85a8e210d511e831146e1ad0a5aa47c75bbf674aa8d16bcb54dadb7c3b6baaeda0c2e94abb2b46c2d6a90b652b2
-  data.tar.gz: dfc5d12e3cea8ab229a947427478c02d74e3c708e9ae3e49992cf3298a1fc45f9ce8e213af890df3820b9513c5f67ca60d38da8ab199731f8e9b72f5a6dbe215
+  metadata.gz: 66e12ee3c548916d10b3b7e94e5e61920bd89a72f2f186cd57f555da01a9082934bfd2ab35278fc76b287fa2acd95852741b7b3ca5bfab79d2294e4d0f63e505
+  data.tar.gz: 44a5f83d35c810f7ac2cb13030707fd13fa2aba202e7ff498793b34912a0dd8a4eaaaf561f993ff349ce0c74383d1bbf69a61978d5fef2112235fbf15a104f5e

data/app/controllers/ecm/blog/posts_controller.rb

@@ -10,6 +10,8 @@ module Ecm
 
       helper Ecm::Comments::ApplicationHelper
 
+      helper Rails::AddOns::TableHelper
+
       def self.resource_class
         Ecm::Blog::Post
       end
@@ -17,7 +19,11 @@ module Ecm
       private
 
       def load_collection_scope
-        super.published.friendly.order(created_at: :desc)
+        if params.has_key?(:year)
+          super.published.for_date(params[:year], params[:month], params[:day])
+        else
+          super.published
+        end
       end
 
       def load_resource_scope

data/app/helpers/ecm/blog/application_helper.rb

@@ -1,6 +1,28 @@
 module Ecm
   module Blog
     module ApplicationHelper
+      # Prerequisites:
+      # 
+      # You have to add the simple-navigation gem to your Gemfile:
+      # 
+      #     # Gemfile
+      #     gem 'simple-navigation'
+      #
+      # Usage:
+      #
+      #     # app/controllers/application_controller.rb
+      #     class ApplicationController < ActionController::Base
+      #       helper Ecm::Blog::ApplicationHelper
+      #     end
+      #
+      #     # app/views/layouts/application.html.haml
+      #     = blog_render_monthly_navigation if controller.class.name.deconstantize == 'Ecm::Blog'
+      #
+      def blog_render_monthly_navigation
+        posts = Ecm::Blog::Post.published.all.pluck(:created_at)
+        posts_by_month = posts.group_by {|t| t.beginning_of_month }
+        render partial: 'ecm/blog/posts/monthly_navigation', locals: { posts_by_month: posts_by_month}
+      end
     end
   end
 end

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

@@ -0,0 +1,19 @@
+module Ecm::Blog
+  class AssetDetail < ApplicationRecord
+    belongs_to :post
+    belongs_to :asset, class_name: 'ActiveStorage::Attachment', dependent: :destroy
+
+    acts_as_list scope: :post_id
+
+    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/%'") }
+
+    def filename
+      asset.blob.filename
+    end
+
+    def human
+      filename
+    end
+  end
+end

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

@@ -3,10 +3,17 @@ module Ecm::Blog
     include Model::Ecm::Comments::CommentableConcern
     include Model::Ecm::Tags::TaggableConcern
 
-    # acts as published
+    # publishing
     include ActsAsPublished::ActiveRecord
     acts_as_published
 
+    # positioning
+    acts_as_list
+    default_scope { order(position: :asc) }
+
+    # assets
+    has_many_attached :assets if respond_to?(:has_many_attached)
+
     # slugs
     extend FriendlyId
     friendly_id :title, use: :slugged
@@ -14,6 +21,8 @@ module Ecm::Blog
     belongs_to :creator, class_name: Ecm::Blog.creator_class_name, foreign_key: 'created_by_id'
     belongs_to :updater, class_name: Ecm::Blog.creator_class_name, foreign_key: 'updated_by_id', optional: true
 
+    scope :for_date, ->(year, month, day) { where(created_at: "#{year}-#{month || 1}-#{day || 1}".to_date.beginning_of_month.."#{year}-#{month || 1}-#{day || 1}".to_date.end_of_month) }
+
     def human
       title
     end
@@ -36,5 +45,49 @@ module Ecm::Blog
     end
 
     include Markdown
+
+    module AssetDetailsConcern
+      extend ActiveSupport::Concern
+
+      included do
+        has_many :asset_details, dependent: :destroy
+        before_validation :cleanup_orphaned_asset_details
+        before_validation :ensure_asset_details
+      end
+
+      def asset_details_count
+        asset_details.count
+      end
+
+      private
+
+      def cleanup_orphaned_asset_details
+        asset_details.each do |asset_detail|
+          asset_detail.destroy if asset_detail.asset.nil?
+        end
+      end
+
+      def ensure_asset_details
+        (assets - asset_details.all.map(&:asset)).map do |asset|
+          build_asset_detail_for_asset(asset)
+        end
+      end
+
+      def build_asset_detail_for_asset(asset)
+        asset_details.build(asset: asset)
+      end
+    end
+
+    include AssetDetailsConcern if respond_to?(:has_many_attached)
+
+    module PreviewPictureConcern
+      extend ActiveSupport::Concern
+
+      def preview_picture
+        asset_details.images.first
+      end
+    end
+
+    include PreviewPictureConcern
   end
 end

data/app/views/ecm/blog/posts/_monthly_navigation.html.haml

@@ -0,0 +1,3 @@
+= render_navigation do |primary|
+  - posts_by_month.sort.reverse.each do |month, posts|
+    - primary.item "posts_for_#{month}", "#{I18n.l(month, format: '%B %Y')} (#{posts.size})", ecm_blog.month_posts_path(year: month.year, month: month.month)

data/app/views/ecm/blog/posts/_post.haml

@@ -11,4 +11,22 @@
     %span.post-tags
       = tag_labels_for(post)
 
-  %p.post-body= post.body(format: :html).html_safe
+  %p.post-body= post.body(format: :html).html_safe
+
+  - if post.asset_details.images.any?
+    .row
+      - post.asset_details.images.order(position: :asc).each do |picture_detail|
+        .col-lg-4.d-flex.align-items-stretch
+          = bootstrap_card(image_options: { src: main_app.url_for(picture_detail.asset)}, additional_css_classes: 'text-center border-0' ) do
+            .card-body
+              %h5.card-title
+                = picture_detail.title
+              %p.card-text
+                = 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')

data/app/views/ecm/blog/posts/_post_in_index.haml

@@ -1,15 +1,16 @@
-%div{ id: dom_id(post), class: "#{dom_class(post)} bottom-margin-5" }
-  %h2.post-title
-    = link_to(post.title, ecm_blog.url_for(post))
-  %small
-    %span.post-creation-information.text-muted
-      = "#{l(post.created_at)} | #{post.creator.try(:human)}"
-    |
-    %span.comments-information
-      = link_to(t('ecm.comments.commentable.comments_information', comments_count: post.comments.count), ecm_blog.post_url(post, anchor: 'comments'))
-    |
-    %span.post-tags
-      = tag_labels_for(post)
+%div{ id: dom_id(post), class: "row #{dom_class(post)} bottom-margin-5" }
+  .col-lg-12
+    %h2.post-title
+      = link_to(post.title, ecm_blog.url_for(post))
+    %small
+      %span.post-creation-information.text-muted
+        = "#{l(post.created_at)} | #{post.creator.try(:human)}"
+      |
+      %span.comments-information
+        = link_to(t('ecm.comments.commentable.comments_information', comments_count: post.comments.count), ecm_blog.post_url(post, anchor: 'comments'))
+      |
+      %span.post-tags
+        = tag_labels_for(post)
 
-  .post-body.truncate-lines-3
-    = post.body(format: :html).html_safe
+    .post-body.truncate-lines-3
+      = post.body(format: :html).html_safe

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

@@ -0,0 +1,18 @@
+%div{ id: dom_id(post), class: "row #{dom_class(post)} bottom-margin-5" }
+  .col-lg-4
+    = image_tag(main_app.url_for(post.preview_picture.asset.variant(Ecm::Blog::Configuration.preview_picture_asset_variant_options)), class: 'img-fluid')
+  .col-lg-8
+    %h2.post-title
+      = link_to(post.title, ecm_blog.url_for(post))
+    %small
+      %span.post-creation-information.text-muted
+        = "#{l(post.created_at)} | #{post.creator.try(:human)}"
+      |
+      %span.comments-information
+        = link_to(t('ecm.comments.commentable.comments_information', comments_count: post.comments.count), ecm_blog.post_url(post, anchor: 'comments'))
+      |
+      %span.post-tags
+        = tag_labels_for(post)
+
+    .post-body.truncate-lines-3
+      = post.body(format: :html).html_safe

data/app/views/ecm/blog/posts/index.haml

@@ -1,6 +1,10 @@
 %h1#page-title= Ecm::Blog::Configuration.posts_index_page_title_proc.call(self)
 
-= render partial: "post_in_index", collection: @collection, as: :post
+- @collection.each do |resource|
+  - if resource.preview_picture.present?
+    = render partial: "post_in_index_with_preview_picture", locals: { post: resource }
+  - else
+    = render partial: "post_in_index", locals: { post: resource }
 
 .row
   .col-lg-12.text-center

data/config/locales/de.yml

@@ -6,12 +6,18 @@ de:
       ecm/blog/post:
         one: Post
         other: Posts
+      ecm/blog/asset_detail:
+        one: Anhang
+        other: Anhänge
     attributes:
       ecm/blog/post:
         id: ID
+        assets: Anhänge
+        asset_details_count: Anhänge
         title: Titel
         tags: Tags
         body: Inhalt
+        position: Position
         published: Veröffentlicht
         published_at: Veröffentlicht am
         created_by_id: Erstellt von
@@ -21,5 +27,20 @@ de:
         updater: Aktualisiert von
         created_at: Erstellt am
         updated_at: Aktualisiert am
+      ecm/blog/asset_detail:
+        id: ID
+        post: Post
+        post_id: Post
+        asset: Datei
+        asset_id: Datei
+        asset_actions: ''
+        description: Beschreibung
+        filename: Dateiname
+        title: Titel
+        preview_picture: Vorschau
+        position: Position
+        published_at: Veröffentlicht am
+        created_at: Erstellt am
+        updated_at: Aktualisiert am
   routes:
     ecm_blog_engine: blog

data/config/locales/en.yml

@@ -6,12 +6,18 @@ en:
       ecm/blog/post:
         one: Post
         other: Posts
+      ecm/blog/asset_detail:
+        one: Asset
+        other: Assets
     attributes:
       ecm/blog/post:
         id: ID
+        assets: Asset
+        asset_details_count: Assets
         title: Title
         tags: Tags
         body: Body
+        position: Position
         published: Published
         published_at: Published at
         created_by_id: Created by
@@ -21,5 +27,20 @@ en:
         updater: Updated by
         created_at: Created at
         updated_at: Updated at
+      ecm/blog/asset_detail:
+        id: ID
+        post: Post
+        post_id: Post
+        asset: File
+        asset_id: File
+        asset_actions: ''
+        description: Description
+        filename: Filename
+        title: Title
+        preview_picture: Preview
+        position: Position
+        published_at: Published at
+        created_at: Created at
+        updated_at: Updated at
   routes:
     ecm_blog_engine: blog

data/config/routes.rb

@@ -3,6 +3,9 @@ Ecm::Blog::Engine.routes.draw do
     scope :ecm_blog_engine do
       resources :posts, only: [:index, :show] do
         get 'page/:page', action: :index, on: :collection
+        get ':year/:month/:day', action: :index, on: :collection, constraints: { year: /\d+/, month: /\d+/, day: /\d+/ }, as: :day
+        get ':year/:month', action: :index, on: :collection, constraints: { year: /\d+/, month: /\d+/ }, as: :month
+        get ':year', action: :index, on: :collection, constraints: { year: /\d+/ }, as: :year
       end
 
       root to: 'posts#index'

data/db/migrate/20180429134813_create_ecm_blog_asset_details.rb

@@ -0,0 +1,14 @@
+class CreateEcmBlogAssetDetails < ActiveRecord::Migration[5.2]
+  def change
+    create_table :ecm_blog_asset_details do |t|
+      t.references :post
+      t.references :asset
+      t.string :title
+      t.text :description
+      t.integer :position
+      t.timestamp :published_at
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20181219233939_add_position_to_ecm_blog_posts.rb

@@ -0,0 +1,5 @@
+class AddPositionToEcmBlogPosts < ActiveRecord::Migration[5.2]
+  def change
+    add_column :ecm_blog_posts, :position, :integer
+  end
+end

data/lib/ecm/blog/configuration.rb

@@ -13,6 +13,7 @@ module Ecm
       mattr_accessor(:creator_class_name) { 'User' }
       mattr_accessor(:posts_index_page_title_proc) { ->(view) { view.resource_class.model_name.human(count: :other) } }
       mattr_accessor(:pagination_options_proc) { ->(view) { { theme: 'twitter-bootstrap-3' } } }
+      mattr_accessor(:preview_picture_asset_variant_options) { { resize: '320x240' } }
     end
   end
 end

data/lib/ecm/blog/version.rb

@@ -1,5 +1,5 @@
 module Ecm
   module Blog
-    VERSION = '1.2.1'.freeze
+    VERSION = '1.3.0'.freeze
   end
 end

data/lib/ecm_blog.rb

@@ -1,4 +1,5 @@
 require 'ecm_comments'
+require 'acts_as_list'
 require 'acts_as_published'
 require 'friendly_id'
 require 'html2markdown'

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

@@ -33,4 +33,10 @@ Ecm::Blog.configure do |config|
   # default: config.pagination_options_proc = ->(view) { { theme: 'twitter-bootstrap-4', pagination_class: 'justify-content-center' } }
   #
   config.pagination_options_proc = ->(view) { { theme: 'twitter-bootstrap-4', pagination_class: 'justify-content-center' } }
+
+  # Options for rendering the ActiveStorage preview picture in the posts index view.
+  #
+  # Default: config.preview_picture_asset_variant_options = { resize: '320x240' }
+  #
+  config.preview_picture_asset_variant_options = { resize: '320x240' }
 end

data/lib/tasks/ecm_blog_tasks.rake

@@ -0,0 +1,10 @@
+namespace :ecm do
+  namespace :blog do
+    desc "Initializes Post positions"
+    task initialize_post_positions: :environment do
+      Ecm::Blog::Post.order(created_at: :desc).each.with_index(1) do |post, index|
+        post.update_column :position, index
+      end
+    end
+  end
+end

data/spec/factories/ecm_blog_asset_details.rb

@@ -0,0 +1,13 @@
+FactoryGirl.define do
+  factory :ecm_blog_asset_detail, class: Ecm::Blog::AssetDetail do
+    association(:post, factory: :ecm_blog_post)
+    after(:build) { |ad| 
+      assets = ad.post.assets.attach(
+        io:           File.open(File.join(Ecm::Blog::Engine.root.join(*%w( spec files ecm blog asset example.jpg)))),
+        filename:     'example.jpg',
+        content_type: 'image/jpeg'
+      )
+      ad.asset = assets.first
+    }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecm_blog
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-05 00:00:00.000000000 Z
+date: 2018-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -24,6 +24,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: acts_as_published
   requirement: !ruby/object:Gem::Requirement
@@ -122,11 +136,14 @@ files:
 - app/controllers/ecm/blog/application_controller.rb
 - app/controllers/ecm/blog/posts_controller.rb
 - app/helpers/ecm/blog/application_helper.rb
+- app/models/ecm/blog/asset_detail.rb
 - app/models/ecm/blog/post.rb
 - app/services/ecm/blog/application_service.rb
 - app/services/ecm/blog/import_posts_service.rb
+- app/views/ecm/blog/posts/_monthly_navigation.html.haml
 - app/views/ecm/blog/posts/_post.haml
 - app/views/ecm/blog/posts/_post_in_index.haml
+- app/views/ecm/blog/posts/_post_in_index_with_preview_picture.haml
 - app/views/ecm/blog/posts/index.haml
 - app/views/ecm/blog/posts/show.haml
 - app/views/layouts/ecm/blog/application.html.erb
@@ -134,6 +151,8 @@ files:
 - config/locales/en.yml
 - config/routes.rb
 - db/migrate/20160214133500_create_ecm_blog_posts.rb
+- db/migrate/20180429134813_create_ecm_blog_asset_details.rb
+- db/migrate/20181219233939_add_position_to_ecm_blog_posts.rb
 - lib/ecm/blog.rb
 - lib/ecm/blog/configuration.rb
 - lib/ecm/blog/engine.rb
@@ -143,7 +162,10 @@ files:
 - lib/generators/ecm/blog/install/templates/initializer.rb
 - lib/generators/ecm/blog/install/templates/routes.source
 - lib/tasks/ecm/blog_tasks.rake
+- lib/tasks/ecm_blog_tasks.rake
+- spec/factories/ecm_blog_asset_details.rb
 - spec/factories/ecm_blog_posts.rb
+- spec/files/ecm/blog/asset/example.jpg
 homepage: https://github.com/robotex82/ecm_blog
 licenses:
 - MIT