jekyll-import 0.24.0 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9ffb136ba16d1bf4cbeff1c00dcb67375a0ac318ee586a629606f8a153c4d38
-  data.tar.gz: 3025eb441d0034c8b74aac6d4350f82b4f2262575acdb863378027f7cea6cd39
+  metadata.gz: 80f8102721c858cbbcd1b8498202ba404b3b9a89a50818cf15e4bae04f3183ed
+  data.tar.gz: c848cf68868c1cc84564a5edca0a42c88df3858c4eb31d17a45cdfd97262a401
 SHA512:
-  metadata.gz: e36c60d548abd7c55eaefbb1bdd8dd11d96896ecbadb747f92009d4383e4f1e6595a4e8112549cef82e117966f84addc8818e31bc8d011a8cae752d3b7ce5af0
-  data.tar.gz: 7852a939368f86a5d8fa977f2ced12b2090ea4cd2582925b4375706a592c06ca8559696d5e3cb1fb4529cc7d0fb4cc5fbb517aa23adb70d3d2ccbe41580712e5
+  metadata.gz: 0fcb41bcdcdc69cb4c5fbe12e3870c9d64622e1ba3c404da8407e43f8367abdb22bd4c71abf1fe80d88787eb468e8aed6579353f3ec97a6af8b20a7e83ed88f9
+  data.tar.gz: eb56348a76059323380fd3e8823433837f2575fd43ba7b6da6769eb31627c6fc258b8110f970ddb22d05af7700cb3de2af346adc81584e1c98d98f3a53fb4d1a

data/exe/jekyll-import

@@ -21,7 +21,7 @@ Mercenary.program(:jekyll_import) do |p|
   p.action do |args, _|
     if args.empty?
       Jekyll.logger.error "An importer subcommand is required."
-      puts p
+      Jekyll.logger.info p
       abort
     else
       subcommand = args.first

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

@@ -34,10 +34,14 @@ SQL
                        n.created,
                        n.status,
                        n.type,
+                       u.name,
+                       u.mail,
                        #{tag_group}
                 FROM #{prefix}node AS n
                 LEFT JOIN #{prefix}field_data_body AS fdb
                   ON fdb.entity_id = n.nid AND fdb.entity_type = 'node'
+                RIGHT JOIN #{prefix}users AS u
+                  ON u.uid = n.uid
                 WHERE (#{types})
 QUERY
 

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

@@ -34,10 +34,14 @@ SQL
                        n.created,
                        n.status,
                        n.type,
+                       u.name,
+                       u.mail,
                        #{tag_group}
                 FROM #{prefix}node_field_data AS n
                 LEFT JOIN #{prefix}node__body AS nb
                   ON nb.entity_id = n.nid
+                RIGHT JOIN #{prefix}users AS u
+                  ON u.uid = n.uid
                 WHERE (#{types})
 QUERY
 

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

@@ -98,6 +98,8 @@ module JekyllImport
             data, content = post_data(post)
 
             data["layout"] = post[:type]
+            data["name"] = post[:name]
+            data["mail"] = post[:mail]
             title = data["title"] = post[:title].strip.force_encoding("UTF-8")
             time = data["created"] = post[:created]
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: false
+
 module JekyllImport
   module Importers
     class Pebble < Importer
@@ -8,34 +10,30 @@ module JekyllImport
         ))
       end
 
-      def self.specify_options(c) 
+      def self.specify_options(c)
         c.option "directory", "--directory PATH", "Pebble source directory"
       end
 
       def self.process(opts)
-        options = {
-          directory: opts.fetch("directory", "")
-        }
+        options = { :directory => opts.fetch("directory", "") }
 
         FileUtils.mkdir_p("_posts")
         FileUtils.mkdir_p("_drafts")
 
         traverse_posts_within(options[:directory]) do |file|
-          next if file.end_with?('categories.xml')
+          next if file.end_with?("categories.xml")
+
           process_file(file)
         end
       end
 
-      def self.traverse_posts_within(directory, &block) 
-        Dir.foreach(directory) do |fd|
+      def self.traverse_posts_within(directory, &block)
+        Dir.each_child(directory) do |fd|
           path = File.join(directory, fd)
-          if fd == '.' || fd == '..'
-            next
-          elsif File.directory?(path) 
+          if File.directory?(path)
             traverse_posts_within(path, &block)
-          elsif path.end_with?('xml')
+          elsif path.end_with?("xml")
             yield(path) if block_given?
-          else
           end
         end
       end
@@ -46,17 +44,17 @@ module JekyllImport
 
         doc = xml.xpath("blogEntry")
 
-        title = kebabize(doc.xpath('title').text).gsub('_', '-')
-        date = Date.parse(doc.xpath('date').text)
+        title = kebabize(doc.xpath("title").text).tr("_", "-")
+        date = Date.parse(doc.xpath("date").text)
 
         directory = "_posts"
-        name = "#{date.strftime('%Y-%m-%d')}-#{title}"
+        name = "#{date.strftime("%Y-%m-%d")}-#{title}"
 
         header = {
-          "layout" => 'post',
-          "title"  => doc.xpath("title").text,
-          "tags"   => doc.xpath("tags").text.split(", "),
-          "categories" => doc.xpath('category').text.split(', ')
+          "layout"     => "post",
+          "title"      => doc.xpath("title").text,
+          "tags"       => doc.xpath("tags").text.split(", "),
+          "categories" => doc.xpath("category").text.split(", "),
         }
         header["render_with_liquid"] = false
 
@@ -71,17 +69,17 @@ module JekyllImport
       end
 
       def self.kebabize(string)
-        kebab = '-'.freeze
-        string.gsub!(/[^\w\-_]+/, kebab)
+        kebab = "-".freeze
+        string.gsub!(%r![^\w\-_]+!, kebab)
 
         unless kebab.nil? || kebab.empty?
           if kebab == "-".freeze
-            re_duplicate_kebab        = /-{2,}/
-            re_leading_trailing_kebab = /^-|-$/
+            re_duplicate_kebab        = %r!-{2,}!
+            re_leading_trailing_kebab = %r!^-|-$!
           else
             re_sep = Regexp.escape(kebab)
-            re_duplicate_kebab        = /#{re_sep}{2,}/
-            re_leading_trailing_kebab = /^#{re_sep}|#{re_sep}$/
+            re_duplicate_kebab = %r!#{re_sep}{2,}!
+            re_leading_trailing_kebab = %r!^#{re_sep}|#{re_sep}$!
           end
           # No more than one of the kebab in a row.
           string.gsub!(re_duplicate_kebab, kebab)

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

@@ -8,7 +8,7 @@ module JekyllImport
           rubygems
           fileutils
           safe_yaml
-          hpricot
+          nokogiri
           time
           open-uri
           open_uri_redirections
@@ -22,16 +22,16 @@ module JekyllImport
       end
 
       # Will modify post DOM tree
-      def self.download_images(title, post_hpricot, assets_folder)
-        images = (post_hpricot / "img")
+      def self.download_images(title, post_doc, assets_folder)
+        images = post_doc.css("img")
         return if images.empty?
 
-        Jekyll.logger.info "Downloading images for ", title
+        Jekyll.logger.info "Downloading:", "images for #{title}"
         images.each do |i|
           uri = URI::DEFAULT_PARSER.escape(i["src"])
 
           dst = File.join(assets_folder, File.basename(uri))
-          i["src"] = File.join("{{ site.baseurl }}", dst)
+          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."
@@ -54,15 +54,18 @@ module JekyllImport
 
       class Item
         def initialize(node)
+          raise "Node is nil" if node.nil?
+
           @node = node
         end
 
         def text_for(path)
-          @node.at(path).inner_text
+          subnode = @node.at_xpath("./#{path}") || @node.at(path) || @node.children.find { |child| child.name == path }
+          subnode.text
         end
 
         def title
-          @title ||= text_for(:title).strip
+          @title ||= text_for("title").strip
         end
 
         def permalink_title
@@ -76,12 +79,10 @@ module JekyllImport
         end
 
         def permalink
-          # Hpricot thinks "link" is a self closing tag so it puts the text of the link after the tag
-          # but sometimes it works right! I think it's the xml declaration
           @permalink ||= begin
             uri = text_for("link")
-            uri = @node.at("link").following[0] if uri.empty?
-            URI(uri.to_s).path
+            uri = @node.at("link").next_sibling.text if uri.empty?
+            URI(uri.to_s.strip).path
           end
         end
 
@@ -127,12 +128,8 @@ module JekyllImport
 
         def excerpt
           @excerpt ||= begin
-            text = Hpricot(text_for("excerpt:encoded")).inner_text
-            if text.empty?
-              nil
-            else
-              text
-            end
+            text = Nokogiri::HTML(text_for("excerpt:encoded")).text
+            text.empty? ? nil : text
           end
         end
       end
@@ -144,29 +141,32 @@ module JekyllImport
         FileUtils.mkdir_p(assets_folder)
 
         import_count = Hash.new(0)
-        doc = Hpricot::XML(File.read(source))
+        doc = Nokogiri::XML(File.read(source))
         # Fetch authors data from header
         authors = Hash[
-          (doc / :channel / "wp:author").map do |author|
-            [author.at("wp:author_login").inner_text.strip, {
-              "login"        => author.at("wp:author_login").inner_text.strip,
-              "email"        => author.at("wp:author_email").inner_text,
-              "display_name" => author.at("wp:author_display_name").inner_text,
-              "first_name"   => author.at("wp:author_first_name").inner_text,
-              "last_name"    => author.at("wp:author_last_name").inner_text,
-            },]
+          doc.xpath("//channel/wp:author").map do |author|
+            [
+              author.xpath("./wp:author_login").text.strip,
+              {
+                "login"        => author.xpath("./wp:author_login").text.strip,
+                "email"        => author.xpath("./wp:author_email").text,
+                "display_name" => author.xpath("./wp:author_display_name").text,
+                "first_name"   => author.xpath("./wp:author_first_name").text,
+                "last_name"    => author.xpath("./wp:author_last_name").text,
+              },
+            ]
           end
         ] rescue {}
 
-        (doc / :channel / :item).each do |node|
+        doc.css("channel > item").each do |node|
           item = Item.new(node)
-          categories = node.search('category[@domain="category"]').map(&:inner_text).reject { |c| c == "Uncategorized" }.uniq
-          tags = node.search('category[@domain="post_tag"]').map(&:inner_text).uniq
+          categories = node.css('category[domain="category"]').map(&:text).reject { |c| c == "Uncategorized" }.uniq
+          tags = node.css('category[domain="post_tag"]').map(&:text).uniq
 
           metas = {}
-          node.search("wp:postmeta").each do |meta|
-            key = meta.at("wp:meta_key").inner_text
-            value = meta.at("wp:meta_value").inner_text
+          node.xpath("./wp:postmeta").each do |meta|
+            key = meta.at_xpath("./wp:meta_key").text
+            value = meta.at_xpath("./wp:meta_value").text
             metas[key] = value
           end
 
@@ -189,7 +189,7 @@ module JekyllImport
           }
 
           begin
-            content = Hpricot(item.text_for("content:encoded"))
+            content = Nokogiri::HTML(item.text_for("content:encoded"))
             header["excerpt"] = item.excerpt if item.excerpt
 
             if fetch
@@ -221,7 +221,7 @@ module JekyllImport
         end
 
         import_count.each do |key, value|
-          Jekyll.logger.info "Imported #{value} #{key}s"
+          Jekyll.logger.info "Imported", "#{value} #{Util.pluralize(key, value)}"
         end
       end
 

data/lib/jekyll-import/util.rb

@@ -73,5 +73,13 @@ module JekyllImport
       end
       pee
     end
+
+    def self.pluralize(word, count)
+      return word if count <= 1
+
+      return word if word.end_with?("s")
+
+      "#{word}s"
+    end
   end
 end

data/lib/jekyll-import/version.rb

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

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-import
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.25.0
 platform: ruby
 authors:
 - Tom Preston-Werner
 - Parker Moore
 - Matt Rogers
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-02-19 00:00:00.000000000 Z
+date: 2025-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -50,16 +50,22 @@ dependencies:
   name: reverse_markdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -186,20 +192,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: hpricot
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
@@ -318,14 +310,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '3.0'
 description: Provides the Import command for Jekyll.
 email: maintainers@jekyllrb.com
 executables:
@@ -380,7 +372,7 @@ homepage: http://github.com/jekyll/jekyll-import
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -397,7 +389,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Import command for Jekyll (static site generator).
 test_files: []