ecm_blog 1.0.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de632ffe27ad033f830a1959baf29d7a78d99ab4
-  data.tar.gz: 389d767abee60c6d20f4bb42cb6da3f3fd40e589
+  metadata.gz: 843e5ebb68cbbe18d01e5a23cdf95e7baca769fb
+  data.tar.gz: 823084d2f9afe1478db9a69437e1ed0c9b0b4142
 SHA512:
-  metadata.gz: 593e54f330468a25548c635155144b41d189b9101060105b22be0dc72c36a50b6c85fb1889e2f826e9704b79339318c09383195e3bf4d72264a7e14c67759b8f
-  data.tar.gz: 90d9832e83a280efefd21ca37324be37a041d4125cc5d82557fbb1626747a730d052fa97e8ca0c64a06ff9c97746ccaa231a799a8ef86687a0af4812ea427859
+  metadata.gz: 04062aaf40066b9bdc681b9f334783c80254e8932a30abaaa277a7d4a414ea93c804ce155e852aa065452c556b767c6a1210ae1d9024ccc40eddfee8656bc2e4
+  data.tar.gz: a78b270146ff4129e97b8f992b090ad151f134d46984d6306b543c07cf04861880a731612268a74e0a7292c395d1c3d387d5976048d8f8da26f783e667995b5e

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

@@ -6,6 +6,7 @@ module Ecm
       include ResourcesController::RestResourceUrls
       include ResourcesController::RestActions
       include ResourcesController::Kaminari
+      include ResourcesController::LocationHistory
 
       helper Ecm::Comments::ApplicationHelper
 
@@ -16,7 +17,7 @@ module Ecm
       private
 
       def load_collection_scope
-        super.published.friendly.order(updated_at: :desc)
+        super.published.friendly.order(created_at: :desc)
       end
 
       def load_resource_scope

data/app/services/ecm/blog/application_service.rb

@@ -0,0 +1,8 @@
+module Ecm
+  module Blog
+    class ApplicationService < Rails::AddOns::Service::Base
+      class Result < Rails::AddOns::Service::Result::Base
+      end
+    end
+  end
+end

data/app/services/ecm/blog/import_posts_service.rb

@@ -0,0 +1,147 @@
+require 'csv'
+
+module Ecm
+  module Blog
+    # Example:
+    #
+    # You selected joomla posts from your database like this:
+    #
+    #    SELECT joomla_content.title, joomla_content.fulltext, joomla_content.created, joomla_content.modified, joomla_users.email
+    #    FROM joomla_content, joomla_users
+    #    where created_by = joomla_users.id;
+    #
+    # And exported the data into a csv file like this:
+    # 
+    #     # tmp/old_posts.csv
+    #     title;fulltext;created;modified;email
+    #     "My first Post";"This is the body";"2013-02-12 14:22:23";"2013-02-12 21:58:54";john.doe@example.com
+    #
+    # You can import this csv file from the rails console:
+    #
+    #     # rails console
+    #     Ecm::Blog::ImportPostsService.call({ filename: 'tmp/old_posts.csv', column_map: :joomla, body_source_format: :html }, autosave: true)
+    #
+    class ImportPostsService < ApplicationService
+      class Result < ApplicationService::Result
+        attr_accessor :filename, :column_map, :body_source_format, :csv_data, :posts
+      end
+
+      COLUMN_MAPS = {
+        joomla: {
+          title:         :title,
+          body:          :fulltext,
+          created_at:    :created,
+          updated_at:    :modified,
+          # published_at:  ->(row) { Time.zone.now },
+          published_at:  :created,
+          creator_email: :email
+        }
+      }
+
+      def self.column_maps
+        COLUMN_MAPS
+      end
+
+      BODY_SOURCE_FORMATS = [:markdown, :html]
+
+      def self.body_source_formats
+        BODY_SOURCE_FORMATS
+      end
+
+      attr_accessor :filename, :column_map, :body_source_format
+
+      validates :filename, presence: true
+      validates :column_map, presence: true, inclusion: column_maps.keys
+      validates :body_source_format, presence: true, inclusion: body_source_formats
+
+      private
+
+      def after_initialize
+        @creators = {}
+        @body_source_format ||= :markdown
+      end
+
+      def _perform
+        @csv_data = load_csv_data!
+        @posts    = build_posts!
+        
+        ActiveRecord::Base.transaction { @posts.map(&:save!) } if autosave?
+
+        @result.csv_data           = @csv_data
+        @result.posts              = @posts
+        @result.filename           = @filename
+        @result.column_map         = @column_map
+        @result.body_source_format = @body_source_format
+      end
+
+      def load_csv_data!
+        CSV.read(@filename, csv_options)
+      end
+
+      def csv_options
+        { col_sep: ';', headers: true }
+      end
+
+      def build_posts!
+        say "Building posts" do
+          @csv_data.each_with_index.collect do |row, index|
+            build_post(row, index)
+          end
+        end
+      end
+
+      def build_post(row, index)
+        say "Building post [#{index}]" do
+          attrs = build_post_attributes(row.to_h)
+          Ecm::Blog::Post.new(attrs)
+        end
+      end
+
+      def build_post_attributes(row)
+        attrs = column_mapping.each_with_object({}) do |(post_attribute_name, value_key_or_proc), result|
+          result[post_attribute_name] = case value_key_or_proc
+          when Symbol, String
+            row[value_key_or_proc.to_s]
+          when Proc
+            value_key_or_proc.call(row)
+          else
+            nil
+          end
+        end
+        attrs[:creator] = load_creator(attrs.delete(:creator_email))
+        attrs[:body] = transform_body(attrs.delete(:body) || '') unless @body_source_format == :markdown
+        attrs
+      end
+
+      def column_maps
+        self.class.column_maps
+      end
+
+      def column_mapping
+        column_maps[@column_map]
+      end
+
+      def post_attribute_for_imported_key(key)
+        column_mapping.invert[key.to_sym]
+      end
+
+      def load_creator(email)
+        creator = Ecm::Blog::Configuration.creator_class_name.constantize.where(email: email).first_or_initialize { |u| u.password = u.password_confirmation = SecureRandom.uuid }
+        if creator.persisted?
+          @creators[email] ||= creator
+        else
+          creator
+        end
+      end
+
+      def transform_body(body)
+        case @body_source_format
+        when :html
+          HTMLPage.new(contents: body).markdown
+        else
+          body
+        end
+      end
+    end
+  end
+end

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

@@ -1,8 +1,14 @@
 %div{ id: dom_id(post), class: dom_class(post) }
   %h1.post-title
-    = post.title
-    %small.post-creation-information.pull-right
+    = link_to(post.title, ecm_blog.url_for(post))
+  %small
+    %span.post-creation-information.text-muted
       = "#{l(post.created_at)} | #{post.creator.try(:human)}"
-  %p.post-tags= tag_labels_for(post)
+    |
+    %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)
 
   %p.post-body= post.body(format: :html).html_safe

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

@@ -1,12 +1,14 @@
 %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.post-creation-information.pull-right
+  %small
+    %span.post-creation-information.text-muted
       = "#{l(post.created_at)} | #{post.creator.try(:human)}"
-  %p
-    %span.post-tags<= tag_labels_for(post)
     |
     %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)
 
   %p.post-body= post.body(format: :html).html_safe

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

@@ -1,6 +1,7 @@
-%h1#page-title= resource_class.model_name.human(count: :other)
+%h1#page-title= Ecm::Blog::Configuration.posts_index_page_title_proc.call(self)
 
 = render partial: "post_in_index", collection: @collection, as: :post
 
-.col-lg.12.text-center
-  = bootstrap_paginate(@collection)
+.row
+  .col-lg-12.text-center
+    = paginate(@collection, Ecm::Blog::Configuration.pagination_options_proc.call(self))

data/config/routes.rb

@@ -1,7 +1,9 @@
 Ecm::Blog::Engine.routes.draw do
   localized do
     scope :ecm_blog_engine do
-      resources :posts, only: [:index, :show]
+      resources :posts, only: [:index, :show] do
+        get 'page/:page', action: :index, on: :collection
+      end
 
       root to: 'posts#index'
     end

data/lib/ecm/blog/configuration.rb

@@ -11,6 +11,8 @@ module Ecm
 
       mattr_accessor(:base_controller) { '::FrontendController' }
       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' } } }
     end
   end
 end

data/lib/ecm/blog/version.rb

@@ -1,5 +1,5 @@
 module Ecm
   module Blog
-    VERSION = '1.0.2'.freeze
+    VERSION = '1.2.0'.freeze
   end
 end

data/lib/ecm_blog.rb

@@ -1,6 +1,7 @@
 require 'ecm_comments'
 require 'acts_as_published'
 require 'friendly_id'
+require 'html2markdown'
 require 'kaminari'
 require 'kramdown'
 

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

@@ -4,6 +4,33 @@ Ecm::Blog.configure do |config|
   # Default: config.base_controller = '<%= base_controller_class_name %>'
   #
   config.base_controller = '<%= base_controller_class_name %>'
-  
+
+  # Class to use for creators and updaters.
+  #
+  # default: config.creator_class_name = 'User'
+  #
   config.creator_class_name = 'User'
+
+  # Set the page title for the posts index page. Useful for when you use
+  # the blog posts index as main app root page.
+  #
+  # example: config.posts_index_page_title_proc = ->(view) { view.t('.welcome') }
+  #
+  # default: config.posts_index_page_title_proc = ->(view) { view.resource_class.model_name.human(count: :other) }
+  #
+  config.posts_index_page_title_proc = ->(view) { view.resource_class.model_name.human(count: :other) }
+
+  # Set options that will be passed to the paginate call.
+  #
+  # example for bootstrap 3 (You will need to add the bootstrap3-kaminari-views gem to your Gemfile):
+  #
+  #    config.pagination_options_proc = ->(view) { { theme: 'twitter-bootstrap-3' }
+  #
+  # example for bootstrap 4 (You will need to add the bootstrap4-kaminari-views gem to your Gemfile):
+  #
+  #    config.pagination_options_proc = ->(view) { { theme: 'twitter-bootstrap-4' }
+  #
+  # 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' } }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecm_blog
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-10 00:00:00.000000000 Z
+date: 2018-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: html2markdown
+  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: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -102,7 +116,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - MIT-LICENSE
-- README.rdoc
 - Rakefile
 - app/assets/javascripts/ecm/blog/application.js
 - app/assets/stylesheets/ecm/blog/application.css
@@ -110,6 +123,8 @@ files:
 - app/controllers/ecm/blog/posts_controller.rb
 - app/helpers/ecm/blog/application_helper.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/_post.haml
 - app/views/ecm/blog/posts/_post_in_index.haml
 - app/views/ecm/blog/posts/index.haml

data/README.rdoc

@@ -1,3 +0,0 @@
-= Ecm::Blog
-
-This project rocks and uses MIT-LICENSE.