jekyll-import 0.19.2 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6ddd22f60f79ab5fcac6c78d151803f28802b8ad59f54862e3bdb64922e32d9
-  data.tar.gz: cdab53c2d665022bf20255ec6d63746f061dfb5bf0dcf435743b4c59db24c0d9
+  metadata.gz: 334724ebd0dbdc9774dd2e4799dea04dc5adaacc911d05cfc26f2a5daf23bbfa
+  data.tar.gz: 79a4f8c6de087aebca9f726275ebb3c234361b7341a01ce10c544ff65a0b6bac
 SHA512:
-  metadata.gz: ed0ae1253459a1c2735808848131839fd3f76a89ecb1c732760b76196988681064e913a370a0a2753882f34f649e8af0982df764dc0618fa97ded46cee6e984d
-  data.tar.gz: b2bde6c35679c9673aeb7bbdade9963b1b381c602e7df46fcbb8121ee9e43074e7b5d6a5013bfcc780eed8713fcda15bad3ad8ee0f373792db546cdc4376c188
+  metadata.gz: d716d81c1e596e1004a65eadaa6c4df3e130d134d0b3db0fef7e06151350a90525f59db50aefd6f771950b0698f174fe19311dca7134c3488be970b85e76737a
+  data.tar.gz: f5ee7ba0c29bfad8267482789e2f571ee2d6ccafd343d173c9e9408b1c6c9c25941f28476386c3076310ec630fc5ff84c7ef12aaac2bc934aa1b8ee8e11010f5

data/lib/jekyll-import/importer.rb

@@ -12,7 +12,7 @@ module JekyllImport
 
     def self.stringify_keys(hash)
       the_hash = hash.clone
-      the_hash.keys.each do |key|
+      hash.each_key do |key|
         the_hash[(key.to_s rescue key) || key] = the_hash.delete(key)
       end
       the_hash

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

@@ -258,8 +258,8 @@ module JekyllImport
             body = @in_entry_elem[:body]
 
             # body escaping associated with liquid
-            body.gsub!(%r!{{!, '{{ "{{" }}') if body =~ %r!{{!
-            body.gsub!(%r!{%!, '{{ "{%" }}') if body =~ %r!{%!
+            body.gsub!(%r!{{!, '{{ "{{" }}') if %r!{{!.match?(body)
+            body.gsub!(%r!{%!, '{{ "{%" }}') if %r!{%!.match?(body)
 
             { :filename => filename, :header => header, :body => body }
           elsif @in_entry_elem[:meta][:kind] == "comment"
@@ -291,8 +291,8 @@ module JekyllImport
             body = @in_entry_elem[:body]
 
             # body escaping associated with liquid
-            body.gsub!(%r!{{!, '{{ "{{" }}') if body =~ %r!{{!
-            body.gsub!(%r!{%!, '{{ "{%" }}') if body =~ %r!{%!
+            body.gsub!(%r!{{!, '{{ "{{" }}') if %r!{{!.match?(body)
+            body.gsub!(%r!{%!, '{{ "{%" }}') if %r!{%!.match?(body)
 
             { :filename => filename, :header => header, :body => body }
           end

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

@@ -48,7 +48,7 @@ module JekyllImport
           title = file_content.scan(regexp[:title]).first.to_s.strip
           prerex = file_content.scan(regexp[:perex]).first.to_s.strip
           published_on = DateTime.parse(post[:published_on]) rescue File.mtime(File.dirname(f))
-          meta          = meta_content ? YAML.safe_load(meta_content.scan(regexp[:meta]).to_s) : {}
+          meta = meta_content ? YAML.safe_load(meta_content.scan(regexp[:meta]).to_s) : {}
           meta["title"] = title
           meta["layout"] = "post"
 

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

@@ -69,7 +69,7 @@ module JekyllImport
       # comments::        If true, output comments in _comments directory, like the one
       #                   mentioned at https://github.com/mpalmer/jekyll-static-comments/
       def self.process(options)
-        options  = default_options.merge(options)
+        options = default_options.merge(options)
 
         comments = options.fetch("comments")
         posts_name_by_id = {} if comments

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

@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+module JekyllImport
+  module Importers
+    class Pluxml < Importer
+      def self.require_deps
+        JekyllImport.require_with_fallback(%w(
+          nokogiri
+          fileutils
+          safe_yaml
+        ))
+      end
+
+      def self.specify_options(c)
+        c.option "source", "--source NAME", "The PluXML data directory to import"
+        c.option "layout", "--layout NAME", "The layout to apply"
+        c.option "avoid_liquid", "--avoid_liquid true", "Will add render_with_liquid: false in frontmatter"
+      end
+
+      def self.validate(options)
+        abort "Missing mandatory option --source." if options["source"].nil?
+        # no layout option, layout by default is post
+        options["layout"] = "post" if options["layout"].nil?
+        # no avoid_liquid option, avoid_liquid by default is false
+        options["avoid_liquid"] = false if options["avoid_liquid"].nil?
+      end
+
+      def self.process(options)
+        source       = options.fetch("source")
+        layout       = options.fetch("layout")
+        avoid_liquid = options.fetch("avoid_liquid")
+
+        FileUtils.mkdir_p("_posts")
+        FileUtils.mkdir_p("_drafts")
+
+        # for each XML file in source location
+        Dir.glob("*.xml", :base => source).each do |df|
+          df = File.join(source, df)
+          filename = File.basename(df, ".*")
+
+          # prepare post file name in Jekyll format
+          a_filename = filename.split(".")
+          post_name  = a_filename.pop
+          file_date  = a_filename.pop
+          post_date  = file_date[0..3] + "-" + file_date[4..5] + "-" + file_date[6..7]
+
+          # if draft, only take post name
+          if filename.split(".")[1].split(",")[0] == "draft"
+            directory = "_drafts"
+            name      = post_name.to_s
+          # if post, post date precede post name
+          else
+            directory = "_posts"
+            name      = "#{post_date}-#{post_name}"
+          end
+
+          xml = File.open(df) { |f| Nokogiri::XML(f) }
+          raise "There doesn't appear to be any XML items at the source (#{df}) provided." unless xml
+
+          doc = xml.xpath("document")
+          header = {
+            "layout" => layout,
+            "title"  => doc.xpath("title").text,
+            "tags"   => doc.xpath("tags").text.split(", "),
+          }
+          header["render_with_liquid"] = false if avoid_liquid
+
+          path = File.join(directory, "#{name}.html")
+          File.open(path, "w") do |f|
+            f.puts header.to_yaml
+            f.puts "---\n\n"
+            f.puts doc.xpath("chapo").text
+            f.puts doc.xpath("content").text
+          end
+
+          Jekyll.logger.info "Wrote file #{path} successfully!"
+        end
+        nil
+      end
+    end
+  end
+end

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

@@ -266,7 +266,7 @@ module JekyllImport
               lang  = "python"
               start = i
             elsif block
-              lang  = "javascript" if line =~ %r!;$!
+              lang  = "javascript" if %r!;$!.match?(line)
               block = line =~ indent && i < lines.size - 1 # Also handle EOF
               unless block
                 lines[start] = "{% highlight #{lang} %}"
@@ -283,7 +283,7 @@ module JekyllImport
           return url unless @grab_images
 
           path = "tumblr_files/#{url.split("/").last}"
-          path += ext unless path =~ %r!#{ext}$!
+          path += ext unless %r!#{ext}$!.match?(path)
           FileUtils.mkdir_p "tumblr_files"
 
           # Don't fetch if we've already cached this file

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

@@ -55,7 +55,7 @@ module JekyllImport
           raise "Unknown database server '#{server}'"
         end
         db[SQL].each do |post|
-          next unless post[:state] =~ %r!published!i
+          next unless %r!published!i.match?(post[:state])
 
           post[:slug] = "no slug" if post[:slug].nil?
 
@@ -77,8 +77,8 @@ module JekyllImport
 
           File.open("_posts/#{name}", "w") do |f|
             f.puts({ "layout"  => "post",
-                     "title"   => (post[:title]&.to_s&.force_encoding("UTF-8")),
-                     "tags"    => (post[:keywords]&.to_s&.force_encoding("UTF-8")),
+                     "title"   => post[:title]&.to_s&.force_encoding("UTF-8"),
+                     "tags"    => post[:keywords]&.to_s&.force_encoding("UTF-8"),
                      "typo_id" => post[:id], }.delete_if { |_k, v| v.nil? || v == "" }.to_yaml)
             f.puts "---"
             f.puts post[:body].delete("\r")

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

@@ -30,14 +30,15 @@ module JekyllImport
         images.each do |i|
           uri = i["src"]
 
-          i["src"] = format("{{ site.baseurl }}/%s/%s", assets_folder, File.basename(uri))
           dst = File.join(assets_folder, File.basename(uri))
+          i["src"] = File.join("{{ site.baseurl }}", dst)
           Jekyll.logger.info uri
           if File.exist?(dst)
             Jekyll.logger.info "Already in cache. Clean assets folder if you want a redownload."
             next
           end
           begin
+            FileUtils.mkdir_p assets_folder
             OpenURI.open_uri(uri, :allow_redirections => :safe) do |f|
               File.open(dst, "wb") do |out|
                 out.puts f.read
@@ -191,7 +192,16 @@ module JekyllImport
             content = Hpricot(item.text_for("content:encoded"))
             header["excerpt"] = item.excerpt if item.excerpt
 
-            download_images(item.title, content, assets_folder) if fetch
+            if fetch
+              # Put the images into a /yyyy/mm/ subfolder to reduce clashes
+              assets_dir_path = if item.published_at
+                                  File.join(assets_folder, item.published_at.strftime("/%Y/%m"))
+                                else
+                                  assets_folder
+                                end
+
+              download_images(item.title, content, assets_dir_path)
+            end
 
             FileUtils.mkdir_p item.directory_name
             File.open(File.join(item.directory_name, item.file_name), "w") do |f|

data/lib/jekyll-import/version.rb

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

data/lib/jekyll/commands/import.rb

@@ -64,7 +64,7 @@ module Jekyll
 
         def abort_on_invalid_migrator(migrator)
           warn "Sorry, '#{migrator}' isn't a valid migrator. Valid choices:"
-          IMPORTERS.keys.each { |k| warn "* #{k}" }
+          IMPORTERS.each_key { |k| warn "* #{k}" }
           raise "'#{migrator}' is not a valid migrator."
         end
       end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-import
 version: !ruby/object:Gem::Version
-  version: 0.19.2
+  version: 0.20.0
 platform: ruby
 authors:
 - Tom Preston-Werner
 - Parker Moore
 - Matt Rogers
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-07 00:00:00.000000000 Z
+date: 2020-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -150,14 +150,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 0.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
@@ -370,6 +370,7 @@ files:
 - lib/jekyll-import/importers/marley.rb
 - lib/jekyll-import/importers/mephisto.rb
 - lib/jekyll-import/importers/mt.rb
+- lib/jekyll-import/importers/pluxml.rb
 - lib/jekyll-import/importers/posterous.rb
 - lib/jekyll-import/importers/roller.rb
 - lib/jekyll-import/importers/rss.rb
@@ -387,7 +388,7 @@ homepage: http://github.com/jekyll/jekyll-import
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -396,7 +397,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -404,7 +405,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Import command for Jekyll (static site generator).
 test_files: []