jekyll-import 0.14.0 → 0.15.0

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

@@ -1,21 +1,21 @@
+# frozen_string_literal: true
+
 module JekyllImport
   module Importers
     class Easyblog < Importer
       def self.validate(options)
         %w(dbname user).each do |option|
-          if options[option].nil?
-            abort "Missing mandatory option --#{option}."
-          end
+          abort "Missing mandatory option --#{option}." if options[option].nil?
         end
       end
 
       def self.specify_options(c)
-        c.option "dbname", "--dbname", "Database name"
-        c.option "user", "--user", "Database user name"
+        c.option "dbname",   "--dbname",   "Database name"
+        c.option "user",     "--user",     "Database user name"
         c.option "password", "--password", "Database user's password (default: '')"
-        c.option "host", "--host", "Database host name"
-        c.option "section", "--section", "Table prefix name"
-        c.option "prefix", "--prefix", "Table prefix name"
+        c.option "host",     "--host",     "Database host name"
+        c.option "section",  "--section",  "Table prefix name"
+        c.option "prefix",   "--prefix",   "Table prefix name"
       end
 
       def self.require_deps

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

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module JekyllImport
   module Importers
     class Enki < Importer
-      SQL = <<-EOS.freeze
+      SQL = <<~SQL
         SELECT p.id,
                p.title,
                p.slug,
@@ -9,21 +11,19 @@ module JekyllImport
                p.published_at as date,
                p.cached_tag_list as tags
         FROM posts p
-EOS
+      SQL
 
       def self.validate(options)
         %w(dbname user).each do |option|
-          if options[option].nil?
-            abort "Missing mandatory option --#{option}."
-          end
+          abort "Missing mandatory option --#{option}." if options[option].nil?
         end
       end
 
       def self.specify_options(c)
-        c.option "dbname", "--dbname", "Database name"
-        c.option "user", "--user", "Database name"
+        c.option "dbname",   "--dbname",   "Database name"
+        c.option "user",     "--user",     "Database name"
         c.option "password", "--password", 'Database name (default: "")'
-        c.option "host", "--host", "Database name"
+        c.option "host",     "--host",     "Database name"
       end
 
       def self.require_deps
@@ -52,10 +52,12 @@ EOS
                              :encoding => "utf8")
 
         db[SQL].each do |post|
-          name = [ format("%.04d", post[:date].year),
-                   format("%.02d", post[:date].month),
-                   format("%.02d", post[:date].day),
-                   post[:slug].strip, ].join("-")
+          name = [
+            format("%.04d", post[:date].year),
+            format("%.02d", post[:date].month),
+            format("%.02d", post[:date].day),
+            post[:slug].strip,
+          ].join("-")
           name += ".textile"
 
           File.open("_posts/#{name}", "w") do |f|

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module JekyllImport
   module Importers
     class Ghost < Importer
@@ -26,8 +28,9 @@ module JekyllImport
         end
       end
 
-      private
       class << self
+        private
+
         def fetch_posts(dbfile)
           db = Sequel.sqlite(dbfile)
           query = "SELECT `title`, `slug`, `markdown`, `created_at`, `published_at`, `status`, `page` FROM posts"

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

@@ -1,10 +1,10 @@
+# frozen_string_literal: true
+
 module JekyllImport
   module Importers
     class GoogleReader < Importer
       def self.validate(options)
-        if options["source"].nil?
-          abort "Missing mandatory option --source."
-        end
+        abort "Missing mandatory option --source." if options["source"].nil?
       end
 
       def self.specify_options(c)
@@ -31,7 +31,7 @@ module JekyllImport
       def self.process(options)
         source = options.fetch("source")
 
-        open(source) do |content|
+        URI.parse(source).open do |content|
           feed = RSS::Parser.parse(content)
 
           raise "There doesn't appear to be any RSS items at the source (#{source}) provided." unless feed

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

@@ -1,22 +1,22 @@
+# frozen_string_literal: true
+
 module JekyllImport
   module Importers
     class Joomla < Importer
       def self.validate(options)
         %w(dbname user).each do |option|
-          if options[option].nil?
-            abort "Missing mandatory option --#{option}."
-          end
+          abort "Missing mandatory option --#{option}." if options[option].nil?
         end
       end
 
       def self.specify_options(c)
-        c.option "dbname", "--dbname", "Database name"
-        c.option "user", "--user", "Database user name"
+        c.option "dbname",   "--dbname",   "Database name"
+        c.option "user",     "--user",     "Database user name"
         c.option "password", "--password", "Database user's password (default: '')"
-        c.option "host", "--host", "Database host name"
-        c.option "port", "--port", "Database port"
-        c.option "section", "--section", "Table prefix name"
-        c.option "prefix", "--prefix", "Table prefix name"
+        c.option "host",     "--host",     "Database host name"
+        c.option "port",     "--port",     "Database port"
+        c.option "section",  "--section",  "Table prefix name"
+        c.option "prefix",   "--prefix",   "Table prefix name"
       end
 
       def self.require_deps

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

@@ -1,22 +1,22 @@
+# frozen_string_literal: true
+
 module JekyllImport
   module Importers
     class Joomla3 < Importer
       def self.validate(options)
         %w(dbname user prefix).each do |option|
-          if options[option].nil?
-            abort "Missing mandatory option --#{option}."
-          end
+          abort "Missing mandatory option --#{option}." if options[option].nil?
         end
       end
 
       def self.specify_options(c)
-        c.option "dbname", "--dbname", "Database name"
-        c.option "user", "--user", "Database user name"
+        c.option "dbname",   "--dbname",   "Database name"
+        c.option "user",     "--user",     "Database user name"
         c.option "password", "--password", "Database user's password (default: '')"
-        c.option "host", "--host", "Database host name"
-        c.option "port", "--port", "Database port"
+        c.option "host",     "--host",     "Database host name"
+        c.option "port",     "--port",     "Database port"
         c.option "category", "--category", "ID of the category"
-        c.option "prefix", "--prefix", "Table prefix name"
+        c.option "prefix",   "--prefix",   "Table prefix name"
       end
 
       def self.require_deps
@@ -30,12 +30,12 @@ module JekyllImport
       end
 
       def self.process(options)
-        dbname  = options.fetch("dbname")
-        user    = options.fetch("user")
-        pass    = options.fetch("password", "")
-        host    = options.fetch("host", "localhost")
-        port    = options.fetch("port", 3306).to_i
-        cid	    = options.fetch("category", 0)
+        dbname = options.fetch("dbname")
+        user   = options.fetch("user")
+        pass   = options.fetch("password", "")
+        host   = options.fetch("host", "localhost")
+        port   = options.fetch("port", 3306).to_i
+        cid    = options.fetch("category", 0)
         table_prefix = options.fetch("prefix", "jos_")
 
         db = Sequel.mysql2(dbname, :user => user, :password => pass, :host => host, :port => port, :encoding => "utf8")
@@ -50,7 +50,7 @@ module JekyllImport
         query << "JOIN `#{table_prefix}users` AS `u` ON `cn`.`created_by` = `u`.`id` "
         query << "WHERE (`cn`.`state` = '1' OR `cn`.`state` = '2') " # Only published and archived content items to be imported
 
-        query << if cid > 0
+        query << if cid.positive?
                    " AND `cn`.`catid` = '#{cid}' "
                  else
                    " AND `cn`.`catid` != '2' " # Filter out uncategorized content

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module JekyllImport
   module Importers
     class Jrnl < Importer
@@ -10,10 +12,10 @@ module JekyllImport
       end
 
       def self.specify_options(c)
-        c.option "file", "--file FILENAME", 'Journal file (default: "~/journal.txt")'
+        c.option "file",        "--file FILENAME",      'Journal file (default: "~/journal.txt")'
         c.option "time_format", "--time_format FORMAT", 'Time format of your journal (default: "%Y-%m-%d %H:%M")'
-        c.option "extension", "--extension EXT", 'Output extension (default: "md")'
-        c.option "layout", "--layout NAME", 'Output post layout (default: "post")'
+        c.option "extension",   "--extension EXT",      'Output extension (default: "md")'
+        c.option "layout",      "--layout NAME",        'Output post layout (default: "post")'
       end
 
       # Reads a jrnl file and creates a new post for each entry
@@ -57,27 +59,27 @@ module JekyllImport
 
       # strip body from jrnl entry
       def self.get_post_content(content)
-        return content[1]
+        content[1]
       end
 
       # strip timestamp from the dateline
       def self.get_date(content, offset)
-        return content[0, offset]
+        content[0, offset]
       end
 
       # strip title from the dateline
       def self.get_title(content, offset)
-        return content[offset + 1, content.length]
+        content[offset + 1, content.length]
       end
 
       # generate slug
       def self.create_slug(title)
-        return title.downcase.strip.tr(" ", "-").gsub(%r![^\w-]!, "")
+        title.downcase.strip.tr(" ", "-").gsub(%r![^\w-]!, "")
       end
 
       # generate filename
       def self.create_filename(date, slug, extension)
-        return "#{Time.parse(date).strftime("%Y-%m-%d")}-#{slug}.#{extension}"
+        "#{Time.parse(date).strftime("%Y-%m-%d")}-#{slug}.#{extension}"
       end
 
       # Prepare YAML meta data
@@ -98,7 +100,7 @@ module JekyllImport
           "title"  => title,
           "date"   => Time.parse(date).strftime("%Y-%m-%d %H:%M %z"),
         }.to_yaml
-        return data
+        data
       end
 
       # Writes given data to file

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module JekyllImport
   module Importers
     class Marley < Importer
@@ -42,13 +44,13 @@ module JekyllImport
 
           # copied over from marley's app/lib/post.rb
           file_content  = File.read(f)
-          meta_content  = file_content.slice!(self.regexp[:meta])
-          body          = file_content.sub(self.regexp[:title], "").sub(self.regexp[:perex], "").strip
+          meta_content  = file_content.slice!(regexp[:meta])
+          body          = file_content.sub(regexp[:title], "").sub(regexp[:perex], "").strip
 
-          title = file_content.scan(self.regexp[:title]).first.to_s.strip
-          prerex = file_content.scan(self.regexp[:perex]).first.to_s.strip
+          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(self.regexp[:meta]).to_s) : {}
+          meta          = meta_content ? YAML.safe_load(meta_content.scan(regexp[:meta]).to_s) : {}
           meta["title"] = title
           meta["layout"] = "post"
 
@@ -56,11 +58,11 @@ module JekyllImport
           post_name = File.dirname(f).split(%r!/!).last.gsub(%r!\A\d+-!, "")
 
           name = "#{formatted_date}-#{post_name}"
-          File.open("_posts/#{name}.markdown", "w") do |f|
-            f.puts meta.to_yaml
-            f.puts "---\n"
-            f.puts "\n#{prerex}\n\n" if prerex
-            f.puts body
+          File.open("_posts/#{name}.markdown", "w") do |post|
+            post.puts meta.to_yaml
+            post.puts "---\n"
+            post.puts "\n#{prerex}\n\n" if prerex
+            post.puts body
           end
           posts += 1
         end

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

@@ -1,28 +1,28 @@
+# frozen_string_literal: true
+
 module JekyllImport
   module Importers
     class Mephisto < Importer
       # Accepts a hash with database config variables, exports mephisto posts into a csv
       # export PGPASSWORD if you must
       def self.postgres(c)
-        sql = <<-SQL
-        BEGIN;
-        CREATE TEMP TABLE jekyll AS
-          SELECT title, permalink, body, published_at, filter FROM contents
-          WHERE user_id = 1 AND type = 'Article' ORDER BY published_at;
-        COPY jekyll TO STDOUT WITH CSV HEADER;
-        ROLLBACK;
+        sql = <<~SQL
+          BEGIN;
+          CREATE TEMP TABLE jekyll AS
+            SELECT title, permalink, body, published_at, filter FROM contents
+            WHERE user_id = 1 AND type = 'Article' ORDER BY published_at;
+          COPY jekyll TO STDOUT WITH CSV HEADER;
+          ROLLBACK;
         SQL
         command = %(psql -h #{c[:host] || "localhost"} -c "#{sql.strip}" #{c[:database]} #{c[:username]} -o #{c[:filename] || "posts.csv"})
-        puts command
+        Jekyll.logger.info "Executing:", command
         `#{command}`
         CSV.process
       end
 
       def self.validate(options)
         %w(dbname user).each do |option|
-          if options[option].nil?
-            abort "Missing mandatory option --#{option}."
-          end
+          abort "Missing mandatory option --#{option}." if options[option].nil?
         end
       end
 
@@ -37,10 +37,10 @@ module JekyllImport
       end
 
       def self.specify_options(c)
-        c.option "dbname", "--dbname DB", "Database name"
-        c.option "user", "--user USER", "Database user name"
+        c.option "dbname",   "--dbname DB",   "Database name"
+        c.option "user",     "--user USER",   "Database user name"
         c.option "password", "--password PW", "Database user's password (default: '')"
-        c.option "host", "--host HOST", 'Database host name (default: "localhost")'
+        c.option "host",     "--host HOST",   'Database host name (default: "localhost")'
       end
 
       # This query will pull blog posts from all entries across all blogs. If
@@ -55,7 +55,7 @@ module JekyllImport
                WHERE user_id = 1 AND \
                      type = 'Article' AND \
                      published_at IS NOT NULL \
-               ORDER BY published_at".freeze
+               ORDER BY published_at"
 
       def self.process(options)
         dbname = options.fetch("dbname")

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

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 module JekyllImport
   module Importers
     class MT < Importer
-      SUPPORTED_ENGINES = %(mysql postgres sqlite).freeze
+      SUPPORTED_ENGINES = %w(mysql postgres sqlite).freeze
 
       STATUS_DRAFT = 1
       STATUS_PUBLISHED = 2
-      MORE_CONTENT_SEPARATOR = "<!--more-->".freeze
+      MORE_CONTENT_SEPARATOR = "<!--more-->"
 
       def self.default_options
         {
@@ -30,17 +32,17 @@ module JekyllImport
       end
 
       def self.specify_options(c)
-        c.option "engine", "--engine ENGINE", "Database engine, (default: 'mysql', postgres also supported)"
-        c.option "dbname", "--dbname DB", "Database name"
-        c.option "user", "--user USER", "Database user name"
-        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", "Custom database port connect to (optional)"
-        c.option "blog_id", "--blog_id ID", "Specify a single Movable Type blog ID to import (default: all blogs)"
-        c.option "categories", "--categories", "If true, save post's categories in its YAML front matter. (default: true)"
-        c.option "src_encoding", "--src_encoding ENCODING", "Encoding of strings from database. (default: UTF-8)"
+        c.option "engine",        "--engine ENGINE",          "Database engine, (default: 'mysql', postgres also supported)"
+        c.option "dbname",        "--dbname DB",              "Database name"
+        c.option "user",          "--user USER",              "Database user name"
+        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",              "Custom database port connect to (optional)"
+        c.option "blog_id",       "--blog_id ID",             "Specify a single Movable Type blog ID to import (default: all blogs)"
+        c.option "categories",    "--categories",             "If true, save post's categories in its YAML front matter. (default: true)"
+        c.option "src_encoding",  "--src_encoding ENCODING",  "Encoding of strings from database. (default: UTF-8)"
         c.option "dest_encoding", "--dest_encoding ENCODING", "Encoding of output strings. (default: UTF-8)"
-        c.option "comments", "--comments", "If true, output comments in _comments directory (default: false)"
+        c.option "comments",      "--comments",               "If true, output comments in _comments directory (default: false)"
       end
 
       # By default this migrator will include posts for all your MovableType blogs.
@@ -82,7 +84,7 @@ module JekyllImport
         posts = posts.filter(:entry_blog_id => options["blog_id"]) if options["blog_id"]
         posts.each do |post|
           categories = post_categories.filter(
-            :mt_placement__placement_entry_id => post[:entry_id]
+            :placement_entry_id => post[:entry_id]
           ).map { |ea| encode(ea[:category_basename], options) }
 
           file_name = post_file_name(post, options)
@@ -110,6 +112,7 @@ module JekyllImport
           comments = db[:mt_comment]
           comments.each do |comment|
             next unless posts_name_by_id.key?(comment[:comment_entry_id]) # if the entry exists
+
             dir_name, base_name = comment_file_dir_and_base_name(posts_name_by_id, comment, options)
             FileUtils.mkdir_p "_comments/#{dir_name}"
 

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

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module JekyllImport
   module Importers
     class Posterous < Importer
       def self.specify_options(c)
-        c.option "email", "--email EMAIL", "Posterous email address"
-        c.option "password", "--password PW", "Posterous password"
+        c.option "email",     "--email EMAIL", "Posterous email address"
+        c.option "password",  "--password PW", "Posterous password"
         c.option "api_token", "--token TOKEN", "Posterous API Token"
       end
 
@@ -39,10 +41,11 @@ module JekyllImport
       def self.fetch_images(directory, imgs)
         def self.fetch_one(url, limit = 10)
           raise ArgumentError, "HTTP redirect too deep" if limit.zero?
+
           response = Net::HTTP.get_response(URI.parse(url))
           case response
           when Net::HTTPSuccess     then response.body
-          when Net::HTTPRedirection then self.fetch_one(response["location"], limit - 1)
+          when Net::HTTPRedirection then fetch_one(response["location"], limit - 1)
           else
             response.error!
           end
@@ -54,14 +57,14 @@ module JekyllImport
           fullurl = img["full"]["url"]
           uri = URI.parse(fullurl)
           imgname = uri.path.split("/")[-1]
-          imgdata = self.fetch_one(fullurl)
-          open(directory + "/" + imgname, "wb") do |file|
+          imgdata = fetch_one(fullurl)
+          File.open(directory + "/" + imgname, "wb") do |file|
             file.write imgdata
           end
           urls.push(directory + "/" + imgname)
         end
 
-        return urls
+        urls
       end
 
       def self.process(options)
@@ -76,7 +79,7 @@ module JekyllImport
         opts = defaults.merge(opts)
         FileUtils.mkdir_p "_posts"
 
-        posts = JSON.parse(self.fetch("/api/v2/users/me/sites/#{opts[:blog]}/posts?api_token=#{@api_token}").body)
+        posts = JSON.parse(fetch("/api/v2/users/me/sites/#{opts[:blog]}/posts?api_token=#{@api_token}").body)
         page = 1
 
         while posts.any?
@@ -94,7 +97,7 @@ module JekyllImport
               post_imgs = post["media"]["images"]
               if post_imgs.any?
                 img_dir = format("imgs/%s", basename)
-                img_urls = self.fetch_images(img_dir, post_imgs)
+                img_urls = fetch_images(img_dir, post_imgs)
 
                 img_urls.map! do |url|
                   '<li><img src="' + opts[:base_path] + url + '"></li>'
@@ -123,7 +126,7 @@ module JekyllImport
           end
 
           page += 1
-          posts = JSON.parse(self.fetch("/api/v2/users/me/sites/#{opts[:blog]}/posts?api_token=#{@api_token}&page=#{page}").body)
+          posts = JSON.parse(fetch("/api/v2/users/me/sites/#{opts[:blog]}/posts?api_token=#{@api_token}&page=#{page}").body)
         end
       end
     end