jekyll-import 0.14.0 → 0.15.0

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module JekyllImport
   module Importers
     class WordPress < Importer
@@ -12,21 +14,23 @@ module JekyllImport
       end
 
       def self.specify_options(c)
-        c.option "dbname", "--dbname DB", "Database name (default: '')"
-        c.option "socket", "--socket SOCKET", "Database socket (default: '')"
-        c.option "user", "--user USER", "Database user name (default: '')"
-        c.option "password", "--password PW", "Database user's password (default: '')"
-        c.option "host", "--host HOST", "Database host name (default: 'localhost')"
-        c.option "port", "--port PORT", "Database port number (default: '')"
-        c.option "table_prefix", "--table_prefix PREFIX", "Table prefix name (default: 'wp_')"
-        c.option "site_prefix", "--site_prefix PREFIX", "Site prefix name (default: '')"
-        c.option "clean_entities", "--clean_entities", "Whether to clean entities (default: true)"
-        c.option "comments", "--comments", "Whether to import comments (default: true)"
-        c.option "categories", "--categories", "Whether to import categories (default: true)"
-        c.option "tags", "--tags", "Whether to import tags (default: true)"
-        c.option "more_excerpt", "--more_excerpt", "Whether to use more excerpt (default: true)"
-        c.option "more_anchor", "--more_anchor", "Whether to use more anchor (default: true)"
-        c.option "status", "--status STATUS,STATUS2", Array, "Array of allowed statuses (default: ['publish'], other options: 'draft', 'private', 'revision')"
+        c.option "dbname",         "--dbname DB",           "Database name (default: '')"
+        c.option "socket",         "--socket SOCKET",       "Database socket (default: '')"
+        c.option "user",           "--user USER",           "Database user name (default: '')"
+        c.option "password",       "--password PW",         "Database user's password (default: '')"
+        c.option "host",           "--host HOST",           "Database host name (default: 'localhost')"
+        c.option "port",           "--port PORT",           "Database port number (default: '')"
+        c.option "table_prefix",   "--table_prefix PREFIX", "Table prefix name (default: 'wp_')"
+        c.option "site_prefix",    "--site_prefix PREFIX",  "Site prefix name (default: '')"
+        c.option "clean_entities", "--clean_entities",      "Whether to clean entities (default: true)"
+        c.option "comments",       "--comments",            "Whether to import comments (default: true)"
+        c.option "categories",     "--categories",          "Whether to import categories (default: true)"
+        c.option "tags",           "--tags",                "Whether to import tags (default: true)"
+        c.option "more_excerpt",   "--more_excerpt",        "Whether to use more excerpt (default: true)"
+        c.option "more_anchor",    "--more_anchor",         "Whether to use more anchor (default: true)"
+
+        c.option "status",         "--status STATUS,STATUS2", Array,
+                 "Array of allowed statuses (default: ['publish'], other options: 'draft', 'private', 'revision')"
       end
 
       # Main migrator function. Call this to perform the migration.
@@ -107,12 +111,12 @@ module JekyllImport
         FileUtils.mkdir_p("_drafts") if options[:status].include? :draft
 
         db = Sequel.mysql2(options[:dbname],
-            :user     => options[:user],
-            :password => options[:pass],
-            :socket   => options[:socket],
-            :host     => options[:host],
-            :port     => options[:port],
-            :encoding => "utf8")
+                           :user     => options[:user],
+                           :password => options[:pass],
+                           :socket   => options[:socket],
+                           :host     => options[:host],
+                           :port     => options[:port],
+                           :encoding => "utf8")
 
         px = options[:table_prefix]
         sx = options[:site_prefix]
@@ -129,9 +133,7 @@ module JekyllImport
            WHERE posts.post_type = 'page'"
 
         db[page_name_query].each do |page|
-          if !page[:slug] || page[:slug].empty?
-            page[:slug] = sluggify(page[:title])
-          end
+          page[:slug] = sluggify(page[:title]) if page.fetch(:slug, "").empty?
           page_name_list[ page[:id] ] = {
             :slug   => page[:slug],
             :parent => page[:parent],
@@ -156,16 +158,16 @@ module JekyllImport
              users.user_email    AS `author_email`,
              users.user_url      AS `author_url`
            FROM #{px}#{sx}posts AS `posts`
-             LEFT JOIN #{px}users AS `users`
+             LEFT JOIN #{px}#{sx}users AS `users`
                ON posts.post_author = users.ID"
 
         if options[:status] && !options[:status].empty?
           status = options[:status][0]
           posts_query << "
            WHERE posts.post_status = '#{status}'"
-          options[:status][1..-1].each do |status|
+          options[:status][1..-1].each do |post_status|
             posts_query << " OR
-             posts.post_status = '#{status}'"
+             posts.post_status = '#{post_status}'"
           end
         end
 
@@ -180,21 +182,15 @@ module JekyllImport
         extension = options[:extension]
 
         title = post[:title]
-        if options[:clean_entities]
-          title = clean_entities(title)
-        end
+        title = clean_entities(title) if options[:clean_entities]
 
         slug = post[:slug]
-        if !slug || slug.empty?
-          slug = sluggify(title)
-        end
+        slug = sluggify(title) if !slug || slug.empty?
 
         date = post[:date] || Time.now
         name = format("%02d-%02d-%02d-%s.%s", date.year, date.month, date.day, slug, extension)
         content = post[:content].to_s
-        if options[:clean_entities]
-          content = clean_entities(content)
-        end
+        content = clean_entities(content) if options[:clean_entities]
 
         excerpt = post[:excerpt].to_s
 
@@ -233,24 +229,24 @@ module JekyllImport
 
           db[cquery].each do |term|
             if options[:categories] && term[:type] == "category"
-              if options[:clean_entities]
-                categories << clean_entities(term[:name])
-              else
-                categories << term[:name]
-              end
+              categories << if options[:clean_entities]
+                              clean_entities(term[:name])
+                            else
+                              term[:name]
+                            end
             elsif options[:tags] && term[:type] == "post_tag"
-              if options[:clean_entities]
-                tags << clean_entities(term[:name])
-              else
-                tags << term[:name]
-              end
+              tags << if options[:clean_entities]
+                        clean_entities(term[:name])
+                      else
+                        term[:name]
+                      end
             end
           end
         end
 
         comments = []
 
-        if options[:comments] && post[:comment_count].to_i > 0
+        if options[:comments] && post[:comment_count].to_i.positive?
           cquery =
             "SELECT
                comment_ID           AS `id`,
@@ -267,16 +263,10 @@ module JekyllImport
 
           db[cquery].each do |comment|
             comcontent = comment[:content].to_s
-            if comcontent.respond_to?(:force_encoding)
-              comcontent.force_encoding("UTF-8")
-            end
-            if options[:clean_entities]
-              comcontent = clean_entities(comcontent)
-            end
+            comcontent.force_encoding("UTF-8") if comcontent.respond_to?(:force_encoding)
+            comcontent = clean_entities(comcontent) if options[:clean_entities]
             comauthor = comment[:author].to_s
-            if options[:clean_entities]
-              comauthor = clean_entities(comauthor)
-            end
+            comauthor = clean_entities(comauthor) if options[:clean_entities]
 
             comments << {
               "id"           => comment[:id].to_i,
@@ -337,9 +327,7 @@ module JekyllImport
       end
 
       def self.clean_entities(text)
-        if text.respond_to?(:force_encoding)
-          text.force_encoding("UTF-8")
-        end
+        text.force_encoding("UTF-8") if text.respond_to?(:force_encoding)
         text = HTMLEntities.new.encode(text, :named)
         # We don't want to convert these, it would break all
         # HTML tags in the post and comments.

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

@@ -1,4 +1,4 @@
-# encoding: UTF-8
+# frozen_string_literal: true
 
 module JekyllImport
   module Importers
@@ -16,38 +16,37 @@ module JekyllImport
       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.empty?
-          return
-        end
-        puts "Downloading images for " + title
+        return if images.empty?
+
+        Jekyll.logger.info "Downloading images for ", title
         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))
-          puts "  " + uri
+          Jekyll.logger.info uri
           if File.exist?(dst)
-            puts "    Already in cache. Clean assets folder if you want a redownload."
+            Jekyll.logger.info "Already in cache. Clean assets folder if you want a redownload."
             next
           end
           begin
-            open(uri, :allow_redirections => :safe) do |f|
+            URI.parse(uri, :allow_redirections => :safe).open do |f|
               File.open(dst, "wb") do |out|
                 out.puts f.read
               end
             end
-            puts "    OK!"
-          rescue => e
-            puts "    Error: #{e.message}"
-            puts e.backtrace.join("\n")
+            Jekyll.logger.info "OK!"
+          rescue StandardError => e
+            Jekyll.logger.error "Error: #{e.message}"
+            Jekyll.logger.error e.backtrace.join("\n")
           end
         end
       end
@@ -76,23 +75,21 @@ module JekyllImport
         end
 
         def published_at
-          if published?
-            @published_at ||= Time.parse(text_for("wp:post_date"))
-          end
+          @published_at ||= Time.parse(text_for("wp:post_date")) if published?
         end
 
         def status
           @status ||= text_for("wp:status")
         end
-      
-        def password
-          @post_password ||= text_for('wp:post_password')
+
+        def post_password
+          @post_password ||= text_for("wp:post_password")
         end
 
         def post_type
           @post_type ||= text_for("wp:post_type")
         end
-      
+
         def parent_id
           @parent_id ||= text_for("wp:post_parent")
         end
@@ -171,7 +168,7 @@ module JekyllImport
             "type"       => item.post_type,
             "parent_id"  => item.parent_id,
             "published"  => item.published?,
-            "password"   => item.password,
+            "password"   => item.post_password,
             "status"     => item.status,
             "categories" => categories,
             "tags"       => tags,
@@ -183,9 +180,7 @@ module JekyllImport
             content = Hpricot(item.text_for("content:encoded"))
             header["excerpt"] = item.excerpt if item.excerpt
 
-            if fetch
-              download_images(item.title, content, assets_folder)
-            end
+            download_images(item.title, content, assets_folder) if fetch
 
             FileUtils.mkdir_p item.directory_name
             File.open(File.join(item.directory_name, item.file_name), "w") do |f|
@@ -193,11 +188,11 @@ module JekyllImport
               f.puts "---"
               f.puts Util.wpautop(content.to_html)
             end
-          rescue => e
-            puts "Couldn't import post!"
-            puts "Title: #{item.title}"
-            puts "Name/Slug: #{item.file_name}\n"
-            puts "Error: #{e.message}"
+          rescue StandardError => e
+            Jekyll.logger.error "Couldn't import post!"
+            Jekyll.logger.error "Title: #{item.title}"
+            Jekyll.logger.error "Name/Slug: #{item.file_name}\n"
+            Jekyll.logger.error "Error: #{e.message}"
             next
           end
 
@@ -205,7 +200,7 @@ module JekyllImport
         end
 
         import_count.each do |key, value|
-          puts "Imported #{value} #{key}s"
+          Jekyll.logger.info "Imported #{value} #{key}s"
         end
       end
 

data/lib/jekyll-import/util.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 module JekyllImport
   module Util
-
     # Ruby translation of wordpress wpautop (see https://core.trac.wordpress.org/browser/trunk/src/wp-includes/formatting.php)
     #
     # A group of regex replaces used to identify text formatted with newlines and

data/lib/jekyll-import/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module JekyllImport
-  VERSION = "0.14.0".freeze
+  VERSION = "0.15.0"
 end

data/lib/jekyll/commands/import.rb

@@ -1,7 +1,4 @@
-# load from jekyll-import/lib
-$LOAD_PATH.unshift File.expand_path("../", __dir__)
-require "jekyll/command"
-require "jekyll-import"
+# frozen_string_literal: true
 
 module Jekyll
   module Commands
@@ -51,7 +48,7 @@ module Jekyll
         def process(migrator, options)
           migrator = migrator.to_s.downcase
 
-          if IMPORTERS.keys.include?(migrator.to_sym)
+          if IMPORTERS.key?(migrator.to_sym)
             if JekyllImport::Importers.const_defined?(IMPORTERS[migrator.to_sym])
               klass = JekyllImport::Importers.const_get(IMPORTERS[migrator.to_sym])
               if options.respond_to?(:__hash__)
@@ -66,8 +63,8 @@ module Jekyll
         end
 
         def abort_on_invalid_migrator(migrator)
-          $stderr.puts "Sorry, '#{migrator}' isn't a valid migrator. Valid choices:"
-          IMPORTERS.keys.each { |k| $stderr.puts "* #{k}" }
+          warn "Sorry, '#{migrator}' isn't a valid migrator. Valid choices:"
+          IMPORTERS.keys.each { |k| warn "* #{k}" }
           raise "'#{migrator}' is not a valid migrator."
         end
       end

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-import
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Tom Preston-Werner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-03 00:00:00.000000000 Z
+date: 2018-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastercsv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: redgreen
   requirement: !ruby/object:Gem::Requirement
@@ -123,19 +123,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rubocop-jekyll
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.51'
+        version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.51'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: behance
   requirement: !ruby/object:Gem::Requirement
@@ -238,16 +238,16 @@ dependencies:
   name: open_uri_redirections
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -266,16 +266,16 @@ dependencies:
   name: reverse_markdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
@@ -296,28 +296,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.13
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.13
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: unidecode
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
@@ -362,11 +362,11 @@ files:
 - lib/jekyll-import/importers/mephisto.rb
 - lib/jekyll-import/importers/mt.rb
 - lib/jekyll-import/importers/posterous.rb
+- lib/jekyll-import/importers/roller.rb
 - lib/jekyll-import/importers/rss.rb
 - 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
@@ -387,7 +387,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -395,7 +395,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 2
 summary: Import command for Jekyll (static site generator).