jekyll-import 0.15.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5dc36b6cb2508c37bc5af40022d3a56f75c5ccaf1ae60ab631db9986f4d0a799
-  data.tar.gz: c0ab3fd214f121e75e5388143344a2c5501d2e81e1205db004c8510c01e2ae1c
+  metadata.gz: 6130f83944ddf0b9014aadff407cbd2645a7fd3af8ffff14f8a07f951ca36b1d
+  data.tar.gz: f1a0359e7d7edce0dcfbca231febe10df7459cba5f2af3ad0a2cb8f63c2fc1bc
 SHA512:
-  metadata.gz: c0701c36d3cf270e612e1d8292447b870e3c6a3db0904d57b8f3c5a4fedb195fa6586aa840e666b325fc291f15fca95d1a17fe05e6556a95ef59c7128784e732
-  data.tar.gz: 5355d89fbe103c753cc9b48ac6d3f398e6a980a1a86a0e19e69ba0e8cc3967a188db6ba45eb515e3a711a2e55b23f768c3b3583534b6ec8760010828bc855c8b
+  metadata.gz: 3650b1cc1cedfa296c5bb0b8db5fe172d32d8f67168554280a5674deb25a0595e5005288a3a2faefb01cbc109c994f41ee7477cd09c3947f4e3db68782b924ab
+  data.tar.gz: 3cd40ad126a4890d2dde5b84f2bef3dc6be9d4f07465a42669fe5c4e3137ac57965e32a2182ddbdc8ab1847082a166a6462e4d53675682383991f23968ba8219

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

@@ -139,9 +139,7 @@ module JekyllImport
               if attrs["rel"] == "alternate" && attrs["type"] == "text/html"
                 @in_entry_elem[:meta][:original_url] = attrs["href"]
               elsif attrs["rel"] == "replies" && attrs["type"] == "text/html"
-                unless @in_entry_elem[:meta][:original_url]
-                  @in_entry_elem[:meta][:original_url] = attrs["href"].sub(%r!\#comment-form$!, "")
-                end
+                @in_entry_elem[:meta][:original_url] = attrs["href"].sub(%r!\#comment-form$!, "") unless @in_entry_elem[:meta][:original_url]
               end
             end
           when "media:thumbnail"

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

@@ -56,11 +56,11 @@ module JekyllImport
           prefix = options.fetch("prefix",   DEFAULTS["prefix"])
           types  = options.fetch("types",    DEFAULTS["types"])
 
-          if engine == "postgresql"
-            db = Sequel.postgres(dbname, :user => user, :password => pass, :host => host, :encoding => "utf8")
-          else
-            db = Sequel.mysql2(dbname, :user => user, :password => pass, :host => host, :port => port, :encoding => "utf8")
-          end
+          db = if engine == "postgresql"
+                 Sequel.postgres(dbname, :user => user, :password => pass, :host => host, :encoding => "utf8")
+               else
+                 Sequel.mysql2(dbname, :user => user, :password => pass, :host => host, :port => port, :encoding => "utf8")
+               end
 
           query = build_query(prefix, types, engine)
 

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

@@ -7,9 +7,7 @@ module JekyllImport
         if options["marley_data_dir"].nil?
           Jekyll.logger.abort_with "Missing mandatory option --marley_data_dir."
         else
-          unless File.directory?(options["marley_data_dir"])
-            raise ArgumentError, "marley dir '#{options["marley_data_dir"]}' not found"
-          end
+          raise ArgumentError, "marley dir '#{options["marley_data_dir"]}' not found" unless File.directory?(options["marley_data_dir"])
         end
       end
 

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

@@ -96,36 +96,30 @@ module JekyllImport
                            :port     => options[:port],
                            :encoding => "utf8")
 
-        posts_query = "
-           SELECT
-             weblogentry.id           AS `id`,
-             weblogentry.status       AS `status`,
-             weblogentry.title        AS `title`,
-             weblogentry.anchor       AS `slug`,
-             weblogentry.updatetime   AS `date`,
-             weblogentry.text         AS `content`,
-             weblogentry.summary      AS `excerpt`,
-             weblogentry.categoryid   AS `categoryid`,
-             roller_user.fullname     AS `author`,
-             roller_user.username     AS `author_login`,
-             roller_user.emailaddress AS `author_email`,
-             weblog.handle            AS `site`
-           FROM weblogentry AS `weblogentry`
-             LEFT JOIN roller_user AS `roller_user`
-               ON weblogentry.creator = roller_user.username
-             LEFT JOIN weblog AS `weblog`
-               ON weblogentry.websiteid = weblog.id"
+        select = ["weblogentry.id AS `id`",
+                  "weblogentry.status AS `status`",
+                  "weblogentry.title AS `title`",
+                  "weblogentry.anchor AS `slug`",
+                  "weblogentry.updatetime AS `date`",
+                  "weblogentry.text AS `content`",
+                  "weblogentry.summary AS `excerpt`",
+                  "weblogentry.categoryid AS `categoryid`",
+                  "roller_user.fullname AS `author`",
+                  "roller_user.username AS `author_login`",
+                  "roller_user.emailaddress AS `author_email`",
+                  "weblog.handle AS `site`",]
+        table = "weblogentry AS `weblogentry`"
+        join = ["roller_user AS `roller_user` ON weblogentry.creator = roller_user.username",
+                "weblog AS `weblog` ON weblogentry.websiteid = weblog.id",]
+        condition = []
 
         if options[:status] && !options[:status].empty?
-          status = options[:status][0]
-          posts_query += "
-           WHERE weblogentry.status = '#{status}'"
-          options[:status][1..-1].each do |stat|
-            posts_query += " OR
-             weblogentry.status = '#{stat}'"
+          options[:status].each do |stat|
+            condition.push("weblogentry.status = '#{stat}'")
           end
         end
 
+        posts_query = gen_db_query(select, table, condition, join, "OR")
         db[posts_query].each do |post|
           process_post(post, db, options)
         end
@@ -154,13 +148,10 @@ module JekyllImport
         tags       = []
 
         if options[:categories]
-          cquery =
-            "SELECT
-               weblogcategory.name AS `name`
-             FROM
-               weblogcategory AS `weblogcategory`
-             WHERE
-               weblogcategory.id = '#{post[:categoryid]}'"
+          select = "weblogcategory.name AS `name`"
+          table = "weblogcategory AS `weblogcategory`"
+          condition = "weblogcategory.id = '#{post[:categoryid]}'"
+          cquery = gen_db_query(select, table, condition, "", "")
 
           db[cquery].each do |term|
             categories << (options[:clean_entities] ? clean_entities(term[:name]) : term[:name])
@@ -168,13 +159,10 @@ module JekyllImport
         end
 
         if options[:tags]
-          cquery =
-            "SELECT
-               roller_weblogentrytag.name AS `name`
-             FROM
-               roller_weblogentrytag AS `roller_weblogentrytag`
-             WHERE
-               roller_weblogentrytag.entryid = '#{post[:id]}'"
+          select = "roller_weblogentrytag.name AS `name`"
+          table = "roller_weblogentrytag AS `roller_weblogentrytag`"
+          condition = "roller_weblogentrytag.entryid = '#{post[:id]}'"
+          cquery = gen_db_query(select, table, condition, "", "")
 
           db[cquery].each do |term|
             tags << (options[:clean_entities] ? clean_entities(term[:name]) : term[:name])
@@ -184,17 +172,14 @@ module JekyllImport
         comments = []
 
         if options[:comments]
-          cquery =
-            "SELECT
-               id       AS `id`,
-               name     AS `author`,
-               email    AS `author_email`,
-               posttime AS `date`,
-               content  AS `content`
-             FROM roller_comment
-             WHERE
-               entryid = '#{post[:id]}' AND
-               status = 'APPROVED'"
+          select = ["id AS `id`",
+                    "name AS `author`",
+                    "email AS `author_email`",
+                    "url AS `author_url`",
+                    "posttime AS `date`",
+                    "content AS `content`",]
+          condition = ["entryid = '#{post[:id]}'", "status = 'APPROVED'"]
+          cquery = gen_db_query(select, "roller_comment", condition, "", "AND")
 
           db[cquery].each do |comment|
             comcontent = comment[:content].to_s
@@ -210,6 +195,7 @@ module JekyllImport
               "id"           => comment[:id].to_i,
               "author"       => comauthor,
               "author_email" => comment[:author_email].to_s,
+              "author_url"   => comment[:author_url].to_s,
               "date"         => comment[:date].to_s,
               "content"      => comcontent,
             }
@@ -221,7 +207,7 @@ module JekyllImport
         # Get the relevant fields as a hash, delete empty fields and
         # convert to YAML for the header.
         data = {
-          "layout"       => post[:type].to_s,
+          "layout"       => "post",
           "status"       => post[:status].to_s,
           "published"    => post[:status].to_s == "DRAFT" ? nil : (post[:status].to_s == "PUBLISHED"),
           "title"        => title.to_s,
@@ -272,6 +258,43 @@ module JekyllImport
       def self.page_path(_page_id)
         ""
       end
+
+      def self.gen_db_query(select, table, condition, join, condition_join)
+        condition_join_string = if condition_join.empty?
+                                  "AND"
+                                else
+                                  condition_join
+                                end
+        select_string = if select.is_a?(Array)
+                          select.join(",")
+                        else
+                          select
+                        end
+        condition_string = if condition.is_a?(Array)
+                             condition.join(" #{condition_join_string} ")
+                           else
+                             condition
+                           end
+        join_string = if join.is_a?(Array)
+                        join.join(" LEFT JOIN ")
+                      else
+                        join
+                      end
+        query_select = "SELECT #{select_string}"
+        table_string = " FROM #{table}"
+        query_join = if join_string.empty?
+                       ""
+                     else
+                       " LEFT JOIN #{join_string}"
+                     end
+        query_condition = if condition_string.empty?
+                            ""
+                          else
+                            " WHERE #{condition_string}"
+                          end
+        query = "#{query_select}#{table_string}#{query_join}#{query_condition}"
+        query
+      end
     end
   end
 end

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

@@ -8,9 +8,7 @@ module JekyllImport
       end
 
       def self.validate(options)
-        if options["source"].nil?
-          abort "Missing mandatory option --source, e.g. --source \"http://blog.example.com/rss.php?version=2.0&all=1\""
-        end
+        abort "Missing mandatory option --source, e.g. --source \"http://blog.example.com/rss.php?version=2.0&all=1\"" if options["source"].nil?
       end
 
       def self.require_deps

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

@@ -84,13 +84,9 @@ module JekyllImport
           :permalinks     => opts.fetch("permalinks", false),
         }
 
-        if options[:clean_entities]
-          options[:clean_entities] = require_if_available("htmlentities", "clean_entities")
-        end
+        options[:clean_entities] = require_if_available("htmlentities", "clean_entities") if options[:clean_entities]
 
-        if options[:markdown]
-          options[:markdown] = require_if_available("reverse_markdown", "markdown")
-        end
+        options[:markdown] = require_if_available("reverse_markdown", "markdown") if options[:markdown]
 
         FileUtils.mkdir_p("_posts")
         FileUtils.mkdir_p("_drafts") if options[:drafts]

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

@@ -163,10 +163,10 @@ module JekyllImport
 
         if options[:status] && !options[:status].empty?
           status = options[:status][0]
-          posts_query << "
+          +posts_query << "
            WHERE posts.post_status = '#{status}'"
           options[:status][1..-1].each do |post_status|
-            posts_query << " OR
+            +posts_query << " OR
              posts.post_status = '#{post_status}'"
           end
         end

data/lib/jekyll-import/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-import
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
 platform: ruby
 authors:
 - Tom Preston-Werner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-17 00:00:00.000000000 Z
+date: 2018-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastercsv
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement