jekyll-import 0.18.1 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7150e73e2288d52c065007c00b4bce4fcd92b2203056683c4eff9f7ade2e27a6
-  data.tar.gz: a27cdbada366a98ae01915a232421c299d8353a91dfed226c171f62bddfe248b
+  metadata.gz: 5e0c80e9a51361d575c8282c0dd6f813d24cf36423fcbe891a4dcda8c2410003
+  data.tar.gz: 8067c22cc55a955283967999590cecc4ea5f6fd212005b62919d811cb76bcc9b
 SHA512:
-  metadata.gz: 861703cb70648e22c12cbce8063882365a0415a5245be2a647855eaa85b7f80650fa4ef704f654ec947c5827f6c5ed8caa6cd23f3ad2d9cabb2f0e44df35ee88
-  data.tar.gz: bf71067488ed4d50cd27dedd56a7a97b56d8cd9e70bf8993d3f0b37dd1a0b8070207da8812f2eb9ed289283efa5409ed99e85e62c9860c32b91e2fa62b787637
+  metadata.gz: 9ea2f084457d3192cece261e1e98511e4cf0219e62afb5d3c2b50f8c957e76fe82f85ae9b5c55beebf4c8b6c15f8acbd17da00dca245253af5ddc3a9a84888b7
+  data.tar.gz: f5abebbb51120ba3877075eaf82f4a02c07e3253011b75c996e3f1c9aa5ab9533e66775f5041702bda739513ad1e5fa600775c5e3b7e60d452422edc85507aec

data/lib/jekyll-import/importers/dotclear.rb

@@ -0,0 +1,124 @@
+# frozen_string_literal: true
+
+# Tested with dotClear 2.1.5
+module JekyllImport
+  module Importers
+    class Dotclear < Importer
+      def self.specify_options(c)
+        c.option "datafile", "--datafile PATH", "dotClear export file"
+        c.option "mediafolder", "--mediafolder PATH", "dotClear media export folder (media.zip inflated)"
+      end
+
+      def self.require_deps
+        JekyllImport.require_with_fallback(%w(
+          rubygems
+          fileutils
+          safe_yaml
+          date
+          active_support
+          active_support/core_ext/string/inflections
+          csv
+          pp
+        ))
+      end
+
+      def self.validate(opts)
+        abort "Specify a data file !" if opts["datafile"].nil? || opts["datafile"].empty?
+        abort "Specify a media folder !" if opts["mediafolder"].nil? || opts["mediafolder"].empty?
+      end
+
+      def self.extract_headers_section(str)
+        str[1..-2].split(" ")[1].split(",")
+      end
+
+      def self.extract_data_section(str)
+        str.gsub(%r!^"!, "").gsub(%r!"$!, "").split('","')
+      end
+
+      def self.process(opts)
+        options = {
+          :datafile    => opts.fetch("datafile", ""),
+          :mediafolder => opts.fetch("mediafolder", ""),
+        }
+
+        FileUtils.mkdir_p("_posts")
+        FileUtils.mkdir_p("_drafts")
+
+        type_data = ""
+        headers = {}
+        posts_and_drafts = {}
+        keywords = {}
+
+        File.readlines(options[:datafile]).each do |lineraw|
+          line = lineraw.strip.gsub(%r!\n$!, "")
+
+          next if line.empty?
+
+          if line.start_with?("[") # post | media \ meta | comment...
+            type_data = line.split(" ").first[1..-1]
+            headers[type_data] = extract_headers_section(line)
+            next
+          end
+
+          elts = extract_data_section(line)
+
+          if type_data == "post"
+            draft = (elts[headers[type_data].index("post_status")] != "1")
+
+            date_str = elts[headers[type_data].index("post_creadt")]
+            date_blank = (date_str.nil? || date_str.empty?)
+            date_str_formatted = date_blank ? Date.today : Date.parse(date_str).strftime("%Y-%m-%d")
+            title_param = elts[headers[type_data].index("post_title")].to_s.parameterize
+
+            content = elts[headers[type_data].index("post_content_xhtml")].to_s
+            content = content.gsub('\"', '"').gsub('\n', "\n").gsub("/public/", "/assets/images/")
+
+            filepath = File.join(Dir.pwd, (draft ? "_drafts" : "_posts"), "#{date_str_formatted}-#{title_param}.html")
+
+            entire_content_file = <<~POST_FILE
+              ---
+              layout: post
+              title: "#{elts[headers[type_data].index("post_title")]}"
+              date: #{elts[headers[type_data].index("post_creadt")]} +0100
+              tags: ABC
+              ---
+
+              #{content}
+            POST_FILE
+
+            posts_and_drafts[elts[headers[type_data].index("post_id")]] = { :path => filepath, :content => entire_content_file }
+          elsif type_data == "media"
+            elts[headers[type_data].index("media_title")]
+            mediafilepath = elts[headers[type_data].index("media_file")]
+
+            src_path = File.join(options[:mediafolder], mediafilepath)
+            dst_path = File.join(Dir.pwd, "assets", "images", mediafilepath.to_s)
+
+            FileUtils.mkdir_p(File.dirname(dst_path))
+            FileUtils.cp(src_path, dst_path)
+          elsif type_data == "meta"
+            keywords[elts[headers[type_data].index("post_id")]] ||= []
+            keywords[elts[headers[type_data].index("post_id")]] << elts[headers[type_data].index("meta_id")]
+          elsif type_data == "link"
+
+          elsif type_data == "setting"
+
+          elsif type_data == "comment"
+
+          end
+        end
+
+        # POST-process : Change media path in posts and drafts
+        posts_and_drafts.each do |post_id, hsh|
+          keywords_str = keywords[post_id].to_a.join(", ")
+          content_file = hsh[:content]
+          content_file = content_file.gsub("tags: ABC", "tags: [#{keywords_str}]")
+
+          File.open(hsh[:path], "wb") do |f|
+            f.write(content_file)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/jekyll-import/importers/roller.rb

@@ -80,7 +80,7 @@ module JekyllImport
           begin
             require "htmlentities"
           rescue LoadError
-            STDERR.puts "Could not require 'htmlentities', so the :clean_entities option is now disabled."
+            warn "Could not require 'htmlentities', so the :clean_entities option is now disabled."
             options[:clean_entities] = false
           end
         end

data/lib/jekyll-import/importers/rss.rb

@@ -41,9 +41,7 @@ module JekyllImport
 
         rss.items.each do |item|
           formatted_date = item.date.strftime("%Y-%m-%d")
-          post_name = item.title.split(%r{ |!|/|:|&|-|$|,}).map do |i|
-            i.downcase if i != ""
-          end.compact.join("-")
+          post_name = Jekyll::Utils.slugify(item.title, :mode => "latin")
           name = "#{formatted_date}-#{post_name}"
 
           header = {
@@ -51,18 +49,21 @@ module JekyllImport
             "title"  => item.title,
           }
 
-          header["tag"] = options["tag"] unless options.to_s.empty?
+          header["tag"] = options["tag"] unless options["tag"].nil? || options["tag"].empty?
 
           frontmatter.each do |value|
             header[value] = item.send(value)
           end
 
-          output = ""
+          output = +""
 
           body.each do |row|
-            output += item.send(row)
+            output << item.send(row).to_s
           end
 
+          output.strip!
+          output = item.content_encoded if output.empty?
+
           FileUtils.mkdir_p("_posts")
 
           File.open("_posts/#{name}.html", "w") do |f|

data/lib/jekyll-import/importers/s9y_database.rb

@@ -207,7 +207,7 @@ module JekyllImport
         require gem_name
         true
       rescue LoadError
-        STDERR.puts "Could not require '#{gem_name}', so the :#{option_name} option is now disabled."
+        warn "Could not require '#{gem_name}', so the :#{option_name} option is now disabled."
         true
       end
 

data/lib/jekyll-import/importers/wordpress.rb

@@ -101,7 +101,7 @@ module JekyllImport
           begin
             require "htmlentities"
           rescue LoadError
-            STDERR.puts "Could not require 'htmlentities', so the " \
+            warn "Could not require 'htmlentities', so the " \
                         ":clean_entities option is now disabled."
             options[:clean_entities] = false
           end

data/lib/jekyll-import/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JekyllImport
-  VERSION = "0.18.1"
+  VERSION = "0.19.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-import
 version: !ruby/object:Gem::Version
-  version: 0.18.1
+  version: 0.19.0
 platform: ruby
 authors:
 - Tom Preston-Werner
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-23 00:00:00.000000000 Z
+date: 2019-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastercsv
@@ -370,6 +370,7 @@ files:
 - lib/jekyll-import/importers/behance.rb
 - lib/jekyll-import/importers/blogger.rb
 - lib/jekyll-import/importers/csv.rb
+- lib/jekyll-import/importers/dotclear.rb
 - lib/jekyll-import/importers/drupal6.rb
 - lib/jekyll-import/importers/drupal7.rb
 - lib/jekyll-import/importers/drupal_common.rb