cmor_blog 0.0.44.pre → 0.0.45.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91c0bf356a37ac55f326bb8a8cc4bb3e4b2d623be744cb2a137a14cf9e4e0eab
-  data.tar.gz: cae31b1e3586e9b351fc0bfc1031466bfb73afff7b4e39f613af94200d255d41
+  metadata.gz: 97a7d0f0313e974c46029c6a8007a232efe65b7ccb0e7887db726f7a06f8ad0d
+  data.tar.gz: 21da5ddbe8126eb3ca1001dc0facce11c34fac5571031db3e86fa3d13bef0313
 SHA512:
-  metadata.gz: b4b0c266f02fd459e88a432dc47a3c9dc983059442a28c097230b390761427f357fc107a377be8849c92d096ce17dd31ded7d57827a9f4982d2aafd8bc035e6b
-  data.tar.gz: a7b67b2ca5df633ab8881b937fdba4a2cfde627179e1d976c78db670ec0da0fd7316da1f2a267c0ae5010ba6fe486c9c941a7267956226157013bbd3203effae
+  metadata.gz: bffa2904af71c91cd81e4454b677a805f0c44286ef1f28aaca6427c226d5d71027ad9cd3d009dbab8a801c4d762af7b4eba7b8e97832603888533a51411a19e7
+  data.tar.gz: 494486d7f401a088a73aa5ecb88fa01a6ca9135aefd672d222e6a9553afcc2db91b8b3d69f3977b0c760aeef7d4c0e2efcdb476450be36c811c525ccd7573195

data/app/assets/javascripts/cmor/blog/application.js

@@ -10,4 +10,4 @@
 // Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
 // about supported directives.
 //
-//= require_tree .
+//= require_tree ./application

data/app/assets/javascripts/cmor_blog.js

@@ -0,0 +1 @@
+//= require cmor/blog/application

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

@@ -18,14 +18,14 @@ module Cmor
 
       def load_collection_scope
         if params.has_key?(:year)
-          super.published.for_date(params[:year], params[:month], params[:day])
+          super.published.for_locale.for_date(params[:year], params[:month], params[:day])
         else
-          super.published
+          super.published.for_locale
         end
       end
 
       def load_resource_scope
-        super.published.friendly
+        super.published.for_locale.friendly
       end
     end
   end

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

@@ -19,7 +19,7 @@ module Cmor
       #     = blog_render_monthly_navigation if controller.class.name.deconstantize == 'Cmor::Blog'
       #
       def blog_render_monthly_navigation
-        posts = Cmor::Blog::Post.published.all.pluck(:created_at)
+        posts = Cmor::Blog::Post.published.for_locale.all.pluck(:created_at)
         posts_by_month = posts.group_by {|t| t.beginning_of_month }
         render partial: 'cmor/blog/posts/monthly_navigation', locals: { posts_by_month: posts_by_month}
       end

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

@@ -19,11 +19,13 @@ module Cmor
       extend FriendlyId
       friendly_id :title, use: :slugged
 
-      belongs_to :creator, class_name: Cmor::Blog.creator_class_name, foreign_key: 'created_by_id'
+      belongs_to :creator, class_name: Cmor::Blog.creator_class_name, foreign_key: 'created_by_id', optional: true
       belongs_to :updater, class_name: Cmor::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) }
 
+      validates :title, :body, presence: true
+
       def human
         title
       end
@@ -112,6 +114,8 @@ module Cmor
       end
 
       include PreviewPictureConcern
+
+      include Cmor::Core::Model::LocalizationConcern
     end
   end
 end

data/app/view_helpers/cmor/blog/application_view_helper.rb

@@ -1,13 +1,25 @@
 module Cmor
   module Blog
+    # Example:
+    #
+    #     # app/controllers/application_controller.rb
+    #     class ApplicationController < ActionController::Base
+    #       view_helper Cmor::Blog::ApplicationViewHelper, as: :blog_helper
+    #     end
+    #
     class ApplicationViewHelper < Rao::ViewHelper::Base
+      # Example:
+      #
+      #     # app/views/layouts/application.html.haml
+      #     = blog_helper(self).render_recent_posts(3)
+      #
       def render_recent_posts(count)
-        posts = Cmor::Blog::Post.limit(count).all
+        posts = Cmor::Blog::Post.published.for_locale.limit(count).all
         c.render html: posts.collect { |p| render_post(p.id) }.join("<hr />").html_safe
       end
 
       def render_post(id)
-        post = Cmor::Blog::Post.where(id: id).first
+        post = Cmor::Blog::Post.published.for_locale.where(id: id).first
         render(post: post) if post.present?
       end
     end

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

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

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

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

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

@@ -4,7 +4,7 @@
       = link_to(post.title, cmor_blog.url_for(post))
     %small
       %span.post-creation-information.text-muted
-        = "#{l(post.created_at)} | #{post.creator.send(Cmor::Blog::Configuration.creator_label_method_name)}"
+        = "#{l(post.created_at)} | #{Cmor::Blog::Configuration.creator_label_for_post_proc.call(post)}"
       - 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,7 @@
       = link_to(post.title, cmor_blog.url_for(post))
     %small
       %span.post-creation-information.text-muted
-        = "#{l(post.created_at)} | #{post.creator.send(Cmor::Blog::Configuration.creator_label_method_name)}"
+        = "#{l(post.created_at)} | #{Cmor::Blog::Configuration.creator_label_for_post_proc.call(post)}"
       - if Cmor::Core.features?(:cmor_comments)
         |
         %span.comments-information

data/config/locales/de.yml

@@ -12,17 +12,18 @@ de:
     attributes:
       cmor/blog/post:
         id: ID
-        assets: Anhänge
         asset_details_count: Anhänge
-        title: Titel
-        tags: Tags
+        assets: Anhänge
         body: Inhalt
+        created_by_id: Erstellt von
+        creator: Erstellt von
+        locale: Sprache
         position: Position
         published: Veröffentlicht
         published_at: Veröffentlicht am
-        created_by_id: Erstellt von
-        creator: Erstellt von
         slug: Freundliche ID
+        tags: Tags
+        title: Titel
         updated_by_id: Aktualisiert von
         updater: Aktualisiert von
         created_at: Erstellt am

data/config/locales/en.yml

@@ -12,17 +12,18 @@ en:
     attributes:
       cmor/blog/post:
         id: ID
-        assets: Asset
         asset_details_count: Assets
-        title: Title
-        tags: Tags
+        assets: Asset
         body: Body
+        created_by_id: Created by
+        creator: Created by
+        locale: Locale
         position: Position
         published: Published
         published_at: Published at
-        created_by_id: Created by
-        creator: Created by
         slug: Slug
+        tags: Tags
+        title: Title
         updated_by_id: Updated by
         updater: Updated by
         created_at: Created at

data/db/migrate/20200217105600_add_locale_to_cmor_blog_posts.rb

@@ -0,0 +1,5 @@
+class AddLocaleToCmorBlogPosts < ActiveRecord::Migration[5.2]
+  def change
+    add_column :cmor_blog_posts, :locale, :string
+  end
+end

data/lib/cmor/blog/configuration.rb

@@ -32,8 +32,8 @@ module Cmor
         { combine_options: { resize: "320x240^", extent: "384x216", gravity: "center" } }
       end
 
-      mattr_accessor(:creator_label_method_name) do
-        :to_s
+      mattr_accessor(:creator_label_for_post_proc) do
+        -> (post) { post.creator&.to_s }
       end
     end
   end

data/lib/cmor_blog.rb

@@ -8,4 +8,5 @@ require 'rails-i18n'
 require 'rao-resources_controller'
 require 'rao-service'
 
-require 'cmor/blog'
+require 'cmor/core/model/localization_concern'
+require 'cmor/blog'

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

@@ -46,9 +46,17 @@ Cmor::Blog.configure do |config|
   #
   config.preview_picture_asset_variant_options = { combine_options: { resize: "320x240^", extent: "384x216", gravity: "center" } }
 
-  # Method to call on creator for display.
+  # Define how the author will be shown on posts.
   #
-  # default: config.creator_label_method_name = :to_s
+  # You can generalize the label by not taking the creator into account at all:
   #
-  config.creator_label_method_name = :to_s
+  #     config.creator_label_for_post_proc = -> (post) { "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" }
+  #
+  # default: config.creator_label_for_post_proc = -> (post) { post.creator&.to_s }
+  #
+  config.creator_label_for_post_proc = -> (post) { post.creator&.to_s }
 end

data/spec/models/cmor/blog/post_spec.rb

@@ -1,55 +1,61 @@
 require 'rails_helper'
 
 RSpec.describe Cmor::Blog::Post, type: :model do
-  before(:each) { ActiveStorage::Attachment.destroy_all; ActiveStorage::Blob.destroy_all; }
+  it { expect(described_class).to respond_to(:for_locale) }
+  it { expect(subject).to respond_to(:locale) }
+  it { expect(subject).to validate_inclusion_of(:locale).in_array(I18n.available_locales.map(&:to_s)) }
 
   describe 'assets' do
-    let(:assets) {[
-      { io: File.open(Cmor::Blog::Engine.root.join(*%w(spec files cmor blog asset example.jpg))), filename: 'example.jpg'},
-      { io: File.open(Cmor::Blog::Engine.root.join(*%w(spec files cmor blog asset example.jpg))), filename: 'example.jpg'}
-    ]}
+    before(:each) { ActiveStorage::Attachment.destroy_all; ActiveStorage::Blob.destroy_all; }
 
-    subject { build(:cmor_blog_post) }
+    describe '#assets' do
+      let(:assets) {[
+        { io: File.open(Cmor::Blog::Engine.root.join(*%w(spec files cmor blog asset example.jpg))), filename: 'example.jpg'},
+        { io: File.open(Cmor::Blog::Engine.root.join(*%w(spec files cmor blog asset example.jpg))), filename: 'example.jpg'}
+      ]}
 
-    before(:each) { subject.save }
+      subject { build(:cmor_blog_post) }
 
-    it { expect{  subject.append_assets = assets; subject.save }.to change { Cmor::Blog::AssetDetail.count }.from(0).to(2) }
-    it { expect{  subject.append_assets = assets; subject.save }.to change { ActiveStorage::Attachment.count }.from(0).to(2) }
-  end
+      before(:each) { subject.save }
 
-  describe 'appending assets' do
-    let(:original_assets) {[
-      { io: File.open(Cmor::Blog::Engine.root.join(*%w(spec files cmor blog asset example.jpg))), filename: 'example.jpg'},
-      { io: File.open(Cmor::Blog::Engine.root.join(*%w(spec files cmor blog asset example.jpg))), filename: 'example.jpg'}
-    ]}
+      it { expect{  subject.append_assets = assets; subject.save }.to change { Cmor::Blog::AssetDetail.count }.from(0).to(2) }
+      it { expect{  subject.append_assets = assets; subject.save }.to change { ActiveStorage::Attachment.count }.from(0).to(2) }
+    end
 
-    let(:new_assets) {[
-      { io: File.open(Cmor::Blog::Engine.root.join(*%w(spec files cmor blog asset example.jpg))), filename: 'example.jpg'}
-    ]}
+    describe '#appending assets' do
+      let(:original_assets) {[
+        { io: File.open(Cmor::Blog::Engine.root.join(*%w(spec files cmor blog asset example.jpg))), filename: 'example.jpg'},
+        { io: File.open(Cmor::Blog::Engine.root.join(*%w(spec files cmor blog asset example.jpg))), filename: 'example.jpg'}
+      ]}
 
-    subject { build(:cmor_blog_post, assets: original_assets) }
+      let(:new_assets) {[
+        { io: File.open(Cmor::Blog::Engine.root.join(*%w(spec files cmor blog asset example.jpg))), filename: 'example.jpg'}
+      ]}
 
-    before(:each) { subject.save }
+      subject { build(:cmor_blog_post, assets: original_assets) }
 
-    it { expect{ subject.append_assets = new_assets; subject.save }.to change { Cmor::Blog::AssetDetail.count }.from(2).to(3) }
-    it { expect{ subject.append_assets = new_assets; subject.save }.to change { ActiveStorage::Attachment.count }.from(2).to(3) }
-  end
+      before(:each) { subject.save }
+
+      it { expect{ subject.append_assets = new_assets; subject.save }.to change { Cmor::Blog::AssetDetail.count }.from(2).to(3) }
+      it { expect{ subject.append_assets = new_assets; subject.save }.to change { ActiveStorage::Attachment.count }.from(2).to(3) }
+    end
 
-  describe 'overwriting assets' do
-    let(:original_assets) {[
-      { io: File.open(Cmor::Blog::Engine.root.join(*%w(spec files cmor blog asset example.jpg))), filename: 'example.jpg'},
-      { io: File.open(Cmor::Blog::Engine.root.join(*%w(spec files cmor blog asset example.jpg))), filename: 'example.jpg'}
-    ]}
+    describe '#overwriting assets' do
+      let(:original_assets) {[
+        { io: File.open(Cmor::Blog::Engine.root.join(*%w(spec files cmor blog asset example.jpg))), filename: 'example.jpg'},
+        { io: File.open(Cmor::Blog::Engine.root.join(*%w(spec files cmor blog asset example.jpg))), filename: 'example.jpg'}
+      ]}
 
-    let(:new_assets) {[
-      { io: File.open(Cmor::Blog::Engine.root.join(*%w(spec files cmor blog asset example.jpg))), filename: 'example.jpg'}
-    ]}
+      let(:new_assets) {[
+        { io: File.open(Cmor::Blog::Engine.root.join(*%w(spec files cmor blog asset example.jpg))), filename: 'example.jpg'}
+      ]}
 
-    subject { build(:cmor_blog_post, assets: original_assets) }
+      subject { build(:cmor_blog_post, assets: original_assets) }
 
-    before(:each) { subject.save }
+      before(:each) { subject.save }
 
-    it { expect{ subject.overwrite_assets = new_assets; subject.save }.to change { Cmor::Blog::AssetDetail.count }.from(2).to(1) }
-    it { expect{ subject.overwrite_assets = new_assets; subject.save }.to change { ActiveStorage::Attachment.count }.from(2).to(1) }
+      it { expect{ subject.overwrite_assets = new_assets; subject.save }.to change { Cmor::Blog::AssetDetail.count }.from(2).to(1) }
+      it { expect{ subject.overwrite_assets = new_assets; subject.save }.to change { ActiveStorage::Attachment.count }.from(2).to(1) }
+    end
   end
-end
+end

data/spec/support/shoulda_matchers.rb

@@ -0,0 +1,8 @@
+require 'shoulda-matchers'
+
+Shoulda::Matchers.configure do |config|
+  config.integrate do |with|
+    with.test_framework :rspec
+    with.library :rails
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cmor_blog
 version: !ruby/object:Gem::Version
-  version: 0.0.44.pre
+  version: 0.0.45.pre
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-29 00:00:00.000000000 Z
+date: 2020-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 5.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 5.2.3
 - !ruby/object:Gem::Dependency
   name: cmor_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.44.pre
+        version: 0.0.45.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.44.pre
+        version: 0.0.45.pre
 - !ruby/object:Gem::Dependency
   name: cmor_core_frontend
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.44.pre
+        version: 0.0.45.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.44.pre
+        version: 0.0.45.pre
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -440,6 +440,8 @@ files:
 - MIT-LICENSE
 - Rakefile
 - app/assets/javascripts/cmor/blog/application.js
+- app/assets/javascripts/cmor/blog/application/keep.js
+- app/assets/javascripts/cmor_blog.js
 - app/assets/stylesheets/cmor/blog/application.css
 - app/assets/stylesheets/cmor/blog/application/truncate.css
 - app/assets/stylesheets/cmor_blog.css
@@ -458,13 +460,13 @@ files:
 - app/views/cmor/blog/posts/_post_in_index_with_preview_picture.haml
 - app/views/cmor/blog/posts/index.html.haml
 - app/views/cmor/blog/posts/show.html.haml
-- app/views/layouts/cmor/blog/application.html.erb
 - config/initializers/assets.rb
 - config/locales/de.yml
 - config/locales/en.yml
 - config/routes.rb
 - db/migrate/20160214133500_create_cmor_blog_posts.rb
 - db/migrate/20180429134813_create_cmor_blog_asset_details.rb
+- db/migrate/20200217105600_add_locale_to_cmor_blog_posts.rb
 - lib/cmor/blog.rb
 - lib/cmor/blog/configuration.rb
 - lib/cmor/blog/engine.rb
@@ -742,6 +744,7 @@ files:
 - spec/support/capybara.rb
 - spec/support/factory_bot.rb
 - spec/support/rao-shoulda_matchers.rb
+- spec/support/shoulda_matchers.rb
 homepage: https://github.com/content-management-on-rails
 licenses:
 - MIT

data/app/views/layouts/cmor/blog/application.html.erb

@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>Blog</title>
-  <%= stylesheet_link_tag    "cmor/blog/application", media: "all" %>
-  <%= javascript_include_tag "cmor/blog/application" %>
-  <%= csrf_meta_tags %>
-</head>
-<body>
-
-<%= yield %>
-
-</body>
-</html>