jekyll-import 0.12.0 → 0.13.0

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

@@ -4,7 +4,7 @@ module JekyllImport
   module Importers
     class WordpressDotCom < Importer
       def self.require_deps
-        JekyllImport.require_with_fallback(%w[
+        JekyllImport.require_with_fallback(%w(
           rubygems
           fileutils
           safe_yaml
@@ -12,26 +12,26 @@ module JekyllImport
           time
           open-uri
           open_uri_redirections
-        ])
+        ))
       end
 
       def self.specify_options(c)
-        c.option 'source', '--source FILE', 'WordPress export XML file (default: "wordpress.xml")'
-        c.option 'no_fetch_images', '--no-fetch-images', 'Do not fetch the images referenced in the posts'
-        c.option 'assets_folder', '--assets_folder FOLDER', 'Folder where assets such as images will be downloaded to (default: assets)'
+        c.option "source", "--source FILE", 'WordPress export XML file (default: "wordpress.xml")'
+        c.option "no_fetch_images", "--no-fetch-images", "Do not fetch the images referenced in the posts"
+        c.option "assets_folder", "--assets_folder FOLDER", "Folder where assets such as images will be downloaded to (default: assets)"
       end
 
       # Will modify post DOM tree
       def self.download_images(title, post_hpricot, assets_folder)
-        images = (post_hpricot/"img")
-        if images.length == 0
+        images = (post_hpricot / "img")
+        if images.empty?
           return
         end
         puts "Downloading images for " + title
         images.each do |i|
           uri = i["src"]
 
-          i["src"] = "{{ site.baseurl }}/%s/%s" % [assets_folder, File.basename(uri)]
+          i["src"] = format("{{ site.baseurl }}/%s/%s", assets_folder, File.basename(uri))
           dst = File.join(assets_folder, File.basename(uri))
           puts "  " + uri
           if File.exist?(dst)
@@ -39,11 +39,11 @@ module JekyllImport
             next
           end
           begin
-            open(uri, allow_redirections: :safe) {|f|
+            open(uri, :allow_redirections => :safe) do |f|
               File.open(dst, "wb") do |out|
                 out.puts f.read
               end
-            }
+            end
             puts "    OK!"
           rescue => e
             puts "    Error: #{e.message}"
@@ -66,52 +66,60 @@ module JekyllImport
         end
 
         def permalink_title
-          post_name = text_for('wp:post_name')
+          post_name = text_for("wp:post_name")
           # Fallback to "prettified" title if post_name is empty (can happen)
           @permalink_title ||= if post_name.empty?
-            WordpressDotCom.sluggify(title)
-          else
-            post_name
-          end
+                                 WordpressDotCom.sluggify(title)
+                               else
+                                 post_name
+                               end
         end
 
         def published_at
           if published?
-            @published_at ||= Time.parse(text_for('wp:post_date'))
+            @published_at ||= Time.parse(text_for("wp:post_date"))
           end
         end
 
         def status
-          @status ||= text_for('wp:status')
+          @status ||= text_for("wp:status")
+        end
+      
+        def password
+          @post_password ||= text_for('wp:post_password')
         end
 
         def post_type
-          @post_type ||= text_for('wp:post_type')
+          @post_type ||= text_for("wp:post_type")
+        end
+      
+        def parent_id
+          @parent_id ||= text_for("wp:post_parent")
         end
 
         def file_name
           @file_name ||= if published?
-            "#{published_at.strftime('%Y-%m-%d')}-#{permalink_title}.html"
-          else
-            "#{permalink_title}.html"
-          end
+                           "#{published_at.strftime("%Y-%m-%d")}-#{permalink_title}.html"
+                         else
+                           "#{permalink_title}.html"
+                         end
         end
 
         def directory_name
-          @directory_name ||= if !published? && post_type == 'post'
-            '_drafts'
-          else
-            "_#{post_type}s"
-          end
+          @directory_name ||= if !published? && post_type == "post"
+                                "_drafts"
+                              else
+                                "_#{post_type}s"
+                              end
         end
 
         def published?
-          @published ||= (status == 'publish')
+          @published ||= (status == "publish")
         end
 
         def excerpt
           @excerpt ||= begin
-            text = Hpricot(text_for('excerpt:encoded')).inner_text
+            text = Hpricot(text_for("excerpt:encoded")).inner_text
             if text.empty?
               nil
             else
@@ -122,56 +130,58 @@ module JekyllImport
       end
 
       def self.process(options)
-        source        = options.fetch('source', "wordpress.xml")
-        fetch         = !options.fetch('no_fetch_images', false)
-        assets_folder = options.fetch('assets_folder', 'assets')
+        source        = options.fetch("source", "wordpress.xml")
+        fetch         = !options.fetch("no_fetch_images", false)
+        assets_folder = options.fetch("assets_folder", "assets")
         FileUtils.mkdir_p(assets_folder)
 
         import_count = Hash.new(0)
         doc = Hpricot::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 / :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,
+            },]
           end
         ] rescue {}
 
-        (doc/:channel/:item).each do |node|
+        (doc / :channel / :item).each do |node|
           item = Item.new(node)
-          categories = node.search('category[@domain="category"]').map(&:inner_text).reject{|c| c == 'Uncategorized'}.uniq
+          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
 
-          metas = Hash.new
+          metas = {}
           node.search("wp:postmeta").each do |meta|
-            key = meta.at('wp:meta_key').inner_text
-            value = meta.at('wp:meta_value').inner_text
+            key = meta.at("wp:meta_key").inner_text
+            value = meta.at("wp:meta_value").inner_text
             metas[key] = value
           end
 
-          author_login = item.text_for('dc:creator').strip
+          author_login = item.text_for("dc:creator").strip
 
           header = {
-            'layout'     => item.post_type,
-            'title'      => item.title,
-            'date'       => item.published_at,
-            'type'       => item.post_type,
-            'published'  => item.published?,
-            'status'     => item.status,
-            'categories' => categories,
-            'tags'       => tags,
-            'meta'       => metas,
-            'author'     => authors[author_login]
+            "layout"     => item.post_type,
+            "title"      => item.title,
+            "date"       => item.published_at,
+            "type"       => item.post_type,
+            "parent_id"  => item.parent_id,
+            "published"  => item.published?,
+            "password"   => item.password,
+            "status"     => item.status,
+            "categories" => categories,
+            "tags"       => tags,
+            "meta"       => metas,
+            "author"     => authors[author_login],
           }
 
           begin
-            content = Hpricot(item.text_for('content:encoded'))
-            header['excerpt'] = item.excerpt if item.excerpt
+            content = Hpricot(item.text_for("content:encoded"))
+            header["excerpt"] = item.excerpt if item.excerpt
 
             if fetch
               download_images(item.title, content, assets_folder)
@@ -180,7 +190,7 @@ module JekyllImport
             FileUtils.mkdir_p item.directory_name
             File.open(File.join(item.directory_name, item.file_name), "w") do |f|
               f.puts header.to_yaml
-              f.puts '---'
+              f.puts "---"
               f.puts Util.wpautop(content.to_html)
             end
           rescue => e
@@ -200,7 +210,7 @@ module JekyllImport
       end
 
       def self.sluggify(title)
-        title.gsub(/[^[:alnum:]]+/, '-').downcase
+        title.gsub(%r![^[:alnum:]]+!, "-").downcase
       end
     end
   end

data/lib/jekyll-import/util.rb

@@ -12,18 +12,18 @@ module JekyllImport
     # @return string Text which has been converted into correct paragraph tags.
     #
     def self.wpautop(pee, br = true)
-      return '' if pee.strip == ''
+      return "" if pee.strip == ""
 
-      allblocks = '(?:table|thead|tfoot|caption|col|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|select|option|form|map|area|blockquote|address|math|style|p|h[1-6]|hr|fieldset|noscript|legend|section|article|aside|hgroup|header|footer|nav|figure|figcaption|details|menu|summary)'
+      allblocks = "(?:table|thead|tfoot|caption|col|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|select|option|form|map|area|blockquote|address|math|style|p|h[1-6]|hr|fieldset|noscript|legend|section|article|aside|hgroup|header|footer|nav|figure|figcaption|details|menu|summary)"
       pre_tags = {}
-      pee = pee + "\n"
+      pee += "\n"
 
-      if pee.include?('<pre')
-        pee_parts = pee.split('</pre>')
+      if pee.include?("<pre")
+        pee_parts = pee.split("</pre>")
         last_pee = pee_parts.pop
-        pee = ''
+        pee = ""
         pee_parts.each_with_index do |pee_part, i|
-          start = pee_part.index('<pre')
+          start = pee_part.index("<pre")
 
           unless start
             pee += pee_part
@@ -31,7 +31,7 @@ module JekyllImport
           end
 
           name = "<pre wp-pre-tag-#{i}></pre>"
-          pre_tags[name] = pee_part[start..-1] + '</pre>'
+          pre_tags[name] = pee_part[start..-1] + "</pre>"
 
           pee += pee_part[0, start] + name
         end
@@ -41,31 +41,31 @@ module JekyllImport
       pee = pee.gsub(Regexp.new('<br />\s*<br />'), "\n\n")
       pee = pee.gsub(Regexp.new("(<" + allblocks + "[^>]*>)"), "\n\\1")
       pee = pee.gsub(Regexp.new("(</" + allblocks + ">)"), "\\1\n\n")
-      pee = pee.gsub("\r\n", "\n").gsub("\r", "\n")
-      if pee.include? '<object'
+      pee = pee.gsub("\r\n", "\n").tr("\r", "\n")
+      if pee.include? "<object"
         pee = pee.gsub(Regexp.new('\s*<param([^>]*)>\s*'), "<param\\1>")
-        pee = pee.gsub(Regexp.new('\s*</embed>\s*'), '</embed>')
+        pee = pee.gsub(Regexp.new('\s*</embed>\s*'), "</embed>")
       end
 
-      pees = pee.split(/\n\s*\n/).compact
-      pee = ''
-      pees.each { |tinkle| pee += '<p>' + tinkle.chomp("\n") + "</p>\n" }
-      pee = pee.gsub(Regexp.new('<p>\s*</p>'), '')
-      pee = pee.gsub(Regexp.new('<p>([^<]+)</(div|address|form)>'), "<p>\\1</p></\\2>")
+      pees = pee.split(%r!\n\s*\n!).compact
+      pee = ""
+      pees.each { |tinkle| pee += "<p>" + tinkle.chomp("\n") + "</p>\n" }
+      pee = pee.gsub(Regexp.new('<p>\s*</p>'), "")
+      pee = pee.gsub(Regexp.new("<p>([^<]+)</(div|address|form)>"), "<p>\\1</p></\\2>")
       pee = pee.gsub(Regexp.new('<p>\s*(</?' + allblocks + '[^>]*>)\s*</p>'), "\\1")
-      pee = pee.gsub(Regexp.new('<p>(<li.+?)</p>'), "\\1")
-      pee = pee.gsub(Regexp.new('<p><blockquote([^>]*)>', 'i'), "<blockquote\\1><p>")
-      pee = pee.gsub('</blockquote></p>', '</p></blockquote>')
-      pee = pee.gsub(Regexp.new('<p>\s*(</?' + allblocks + '[^>]*>)'), "\\1")
-      pee = pee.gsub(Regexp.new('(</?' + allblocks + '[^>]*>)\s*</p>'), "\\1")
+      pee = pee.gsub(Regexp.new("<p>(<li.+?)</p>"), "\\1")
+      pee = pee.gsub(Regexp.new("<p><blockquote([^>]*)>", "i"), "<blockquote\\1><p>")
+      pee = pee.gsub("</blockquote></p>", "</p></blockquote>")
+      pee = pee.gsub(Regexp.new('<p>\s*(</?' + allblocks + "[^>]*>)"), "\\1")
+      pee = pee.gsub(Regexp.new("(</?" + allblocks + '[^>]*>)\s*</p>'), "\\1")
       if br
         pee = pee.gsub(Regexp.new('<(script|style).*?</\1>')) { |match| match.gsub("\n", "<WPPreserveNewline />") }
         pee = pee.gsub(Regexp.new('(?<!<br />)\s*\n'), "<br />\n")
-        pee = pee.gsub('<WPPreserveNewline />', "\n")
+        pee = pee.gsub("<WPPreserveNewline />", "\n")
       end
-      pee = pee.gsub(Regexp.new('(</?' + allblocks + '[^>]*>)\s*<br />'), "\\1")
+      pee = pee.gsub(Regexp.new("(</?" + allblocks + '[^>]*>)\s*<br />'), "\\1")
       pee = pee.gsub(Regexp.new('<br />(\s*</?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)[^>]*>)'), "\\1")
-      pee = pee.gsub(Regexp.new('\n</p>$'), '</p>')
+      pee = pee.gsub(Regexp.new('\n</p>$'), "</p>")
 
       pre_tags.each do |name, value|
         pee.gsub!(name, value)

data/lib/jekyll-import/version.rb

@@ -1,3 +1,3 @@
 module JekyllImport
-  VERSION = '0.12.0'
+  VERSION = "0.13.0".freeze
 end

data/lib/jekyll/commands/import.rb

@@ -1,49 +1,48 @@
-$:.unshift File.expand_path("../../", File.dirname(__FILE__)) # load from jekyll-import/lib
-require 'jekyll/command'
-require 'jekyll-import'
+# load from jekyll-import/lib
+$LOAD_PATH.unshift File.expand_path("../", __dir__)
+require "jekyll/command"
+require "jekyll-import"
 
 module Jekyll
   module Commands
     class Import < Command
-
       IMPORTERS = {
-        :blogger => 'Blogger',
-        :behance => 'Behance',
-        :csv => 'CSV',
-        :drupal6 => 'Drupal6',
-        :drupal7 => 'Drupal7',
-        :enki => 'Enki',
-        :joomla => 'Joomla',
-        :joomla3 => 'Joomla3',
-        :jrnl => 'Jrnl',
-        :ghost => 'Ghost',
-        :google_reader => 'GoogleReader',
-        :marley => 'Marley',
-        :mephisto => 'Mephisto',
-        :mt => 'MT',
-        :posterous => 'Posterous',
-        :rss => 'RSS',
-        :s9y => 'S9Y',
-        :textpattern => 'TextPattern',
-        :tumblr => 'Tumblr',
-        :typo => 'Typo',
-        :wordpress => 'WordPress',
-        :wordpressdotcom => 'WordpressDotCom'
-      }
+        :blogger         => "Blogger",
+        :behance         => "Behance",
+        :csv             => "CSV",
+        :drupal6         => "Drupal6",
+        :drupal7         => "Drupal7",
+        :enki            => "Enki",
+        :joomla          => "Joomla",
+        :joomla3         => "Joomla3",
+        :jrnl            => "Jrnl",
+        :ghost           => "Ghost",
+        :google_reader   => "GoogleReader",
+        :marley          => "Marley",
+        :mephisto        => "Mephisto",
+        :mt              => "MT",
+        :posterous       => "Posterous",
+        :rss             => "RSS",
+        :s9y             => "S9Y",
+        :textpattern     => "TextPattern",
+        :tumblr          => "Tumblr",
+        :typo            => "Typo",
+        :wordpress       => "WordPress",
+        :wordpressdotcom => "WordpressDotCom",
+      }.freeze
 
       class << self
-
         def init_with_program(prog)
           prog.command(:import) do |c|
-            c.syntax 'import <platform> [options]'
-            c.description 'Import your old blog to Jekyll'
+            c.syntax "import <platform> [options]"
+            c.description "Import your old blog to Jekyll"
             importers = JekyllImport.add_importer_commands(c)
 
-            c.action do |args, options|
+            c.action do |args, _options|
               if args.empty?
                 Jekyll.logger.warn "You must specify an importer."
                 Jekyll.logger.info "Valid options are:"
-                importers.each { |i| Jekyll.logger.info "*", "#{i}" }
+                importers.each { |i| Jekyll.logger.info "*", i.to_s }
               end
             end
           end
@@ -69,11 +68,9 @@ module Jekyll
         def abort_on_invalid_migrator(migrator)
           $stderr.puts "Sorry, '#{migrator}' isn't a valid migrator. Valid choices:"
           IMPORTERS.keys.each { |k| $stderr.puts "* #{k}" }
-          raise RuntimeError.new("'#{migrator}' is not a valid migrator.")
+          raise "'#{migrator}' is not a valid migrator."
         end
-
       end
-
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-import
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Tom Preston-Werner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-29 00:00:00.000000000 Z
+date: 2017-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -221,47 +221,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
-  name: mysql
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '0.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '0.12'
 - !ruby/object:Gem::Dependency
-  name: pg
+  name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
-  name: mysql2
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 1.3.13
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 1.3.13
 - !ruby/object:Gem::Dependency
   name: behance
   requirement: !ruby/object:Gem::Requirement
@@ -366,6 +366,7 @@ files:
 - lib/jekyll-import/importers/s9y.rb
 - lib/jekyll-import/importers/s9y_database.rb
 - lib/jekyll-import/importers/textpattern.rb
+- lib/jekyll-import/importers/tmp.rb
 - lib/jekyll-import/importers/tumblr.rb
 - lib/jekyll-import/importers/typo.rb
 - lib/jekyll-import/importers/wordpress.rb
@@ -386,7 +387,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -394,7 +395,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 2
 summary: Import command for Jekyll (static site generator).