jekyll-import 0.12.0 → 0.13.0

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

@@ -4,22 +4,22 @@ module JekyllImport
   module Importers
     class CSV < Importer
       def self.require_deps
-        JekyllImport.require_with_fallback(%w[
+        JekyllImport.require_with_fallback(%w(
           csv
           fileutils
           yaml
-        ])
+        ))
       end
 
       def self.specify_options(c)
-        c.option 'file', '--file NAME', 'The CSV file to import (default: "posts.csv")'
-        c.option 'no-front-matter', '--no-front-matter', 'Do not add the default front matter to the post body'
+        c.option "file", "--file NAME", 'The CSV file to import (default: "posts.csv")'
+        c.option "no-front-matter", "--no-front-matter", "Do not add the default front matter to the post body"
       end
 
       # Reads a csv with title, permalink, body, published_at, and filter.
       # It creates a post file for each row in the csv
       def self.process(options)
-        file = options.fetch('file', "posts.csv")
+        file = options.fetch("file", "posts.csv")
 
         FileUtils.mkdir_p "_posts"
         posts = 0
@@ -80,13 +80,13 @@ module JekyllImport
       end
 
       def self.write_frontmatter(f, post, options)
-        no_frontmatter = options.fetch('no-front-matter', false)
+        no_frontmatter = options.fetch("no-front-matter", false)
         unless no_frontmatter
           f.puts YAML.dump({
             "layout"    => "post",
             "title"     => post.title,
             "date"      => post.published_at.to_s,
-            "permalink" => post.permalink
+            "permalink" => post.permalink,
           })
           f.puts "---"
         end

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

@@ -1,4 +1,4 @@
-require 'jekyll-import/importers/drupal_common'
+require "jekyll-import/importers/drupal_common"
 
 module JekyllImport
   module Importers
@@ -38,16 +38,15 @@ EOS
       def self.post_data(sql_post_data)
         content = sql_post_data[:body].to_s
         summary = sql_post_data[:teaser].to_s
-        tags = (sql_post_data[:tags] || '').downcase.strip
+        tags = (sql_post_data[:tags] || "").downcase.strip
 
         data = {
-          'excerpt' => summary,
-          'categories' => tags.split('|')
+          "excerpt"    => summary,
+          "categories" => tags.split("|"),
         }
 
-         return data, content
+        return data, content
       end
-
     end
   end
 end

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

@@ -1,4 +1,4 @@
-require 'jekyll-import/importers/drupal_common'
+require "jekyll-import/importers/drupal_common"
 
 module JekyllImport
   module Importers
@@ -18,15 +18,10 @@ module JekyllImport
                        n.created,
                        n.status,
                        n.type,
-                       GROUP_CONCAT( td.name SEPARATOR '|' ) AS 'tags'
-                FROM #{prefix}field_data_body AS fdb,
-                     #{prefix}node AS n
-                     LEFT OUTER JOIN #{prefix}taxonomy_index AS ti ON ti.nid = n.nid
-                     LEFT OUTER JOIN #{prefix}taxonomy_term_data AS td ON ti.tid = td.tid
+                       (SELECT GROUP_CONCAT(td.name SEPARATOR '|') FROM taxonomy_term_data td, taxonomy_index ti WHERE ti.tid = td.tid AND ti.nid = n.nid) AS 'tags'
+                FROM #{prefix}node AS n
+                LEFT JOIN #{prefix}field_data_body AS fdb ON fdb.entity_id = n.nid AND fdb.entity_type = 'node'
                 WHERE (#{types})
-                  AND n.nid = fdb.entity_id
-                  AND n.vid = fdb.revision_id
-                GROUP BY n.nid"
 EOS
 
         return query
@@ -39,16 +34,15 @@ EOS
       def self.post_data(sql_post_data)
         content = sql_post_data[:body_value].to_s
         summary = sql_post_data[:body_summary].to_s
-        tags = (sql_post_data[:tags] || '').downcase.strip
+        tags = (sql_post_data[:tags] || "").downcase.strip
 
         data = {
-          'excerpt' => summary,
-          'categories' => tags.split('|')
+          "excerpt"    => summary,
+          "categories" => tags.split("|"),
         }
 
         return data, content
       end
-
     end
   end
 end

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

@@ -1,4 +1,4 @@
-require 'date'
+require "date"
 
 module JekyllImport
   module Importers
@@ -15,56 +15,57 @@ module JekyllImport
           "password" => "",
           "host"     => "localhost",
           "prefix"   => "",
-          "types"    => %w(blog story article)
-        }
+          "types"    => %w(blog story article),
+        }.freeze
 
         def specify_options(c)
-          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: #{DEFAULTS["password"].inspect})"
-          c.option 'host', '--host HOST', "Database host name (default: #{DEFAULTS["host"].inspect})"
-          c.option 'prefix', '--prefix PREFIX', "Table prefix name (default: #{DEFAULTS["prefix"].inspect})"
-          c.option 'types', '--types TYPE1[,TYPE2[,TYPE3...]]', Array,
+          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: #{DEFAULTS["password"].inspect})"
+          c.option "host", "--host HOST", "Database host name (default: #{DEFAULTS["host"].inspect})"
+          c.option "prefix", "--prefix PREFIX", "Table prefix name (default: #{DEFAULTS["prefix"].inspect})"
+          c.option "types", "--types TYPE1[,TYPE2[,TYPE3...]]", Array,
             "The Drupal content types to be imported  (default: #{DEFAULTS["types"].join(",")})"
         end
 
         def require_deps
-          JekyllImport.require_with_fallback(%w[
+          JekyllImport.require_with_fallback(%w(
             rubygems
             sequel
+            mysql2
             fileutils
             safe_yaml
-          ])
+          ))
         end
 
         def process(options)
-          dbname = options.fetch('dbname')
-          user   = options.fetch('user')
-          pass   = options.fetch('password', DEFAULTS["password"])
-          host   = options.fetch('host',     DEFAULTS["host"])
-          prefix = options.fetch('prefix',   DEFAULTS["prefix"])
-          types  = options.fetch('types',    DEFAULTS["types"])
+          dbname = options.fetch("dbname")
+          user   = options.fetch("user")
+          pass   = options.fetch("password", DEFAULTS["password"])
+          host   = options.fetch("host",     DEFAULTS["host"])
+          prefix = options.fetch("prefix",   DEFAULTS["prefix"])
+          types  = options.fetch("types",    DEFAULTS["types"])
 
-          db = Sequel.mysql(dbname, :user => user, :password => pass, :host => host, :encoding => 'utf8')
+          db = Sequel.mysql2(dbname, :user => user, :password => pass, :host => host, :encoding => "utf8")
 
           query = self.build_query(prefix, types)
 
           conf = Jekyll.configuration({})
-          src_dir = conf['source']
+          src_dir = conf["source"]
 
           dirs = {
-              :_posts   => File.join(src_dir, '_posts').to_s,
-              :_drafts  => File.join(src_dir, '_drafts').to_s,
-              :_layouts => Jekyll.sanitized_path(src_dir, conf['layouts_dir'].to_s)
+            :_posts   => File.join(src_dir, "_posts").to_s,
+            :_drafts  => File.join(src_dir, "_drafts").to_s,
+            :_layouts => Jekyll.sanitized_path(src_dir, conf["layouts_dir"].to_s),
           }
 
-          dirs.each do |key, dir|
+          dirs.each do |_key, dir|
             FileUtils.mkdir_p dir
           end
 
           # Create the refresh layout
           # Change the refresh url if you customized your permalink config
-          File.open(File.join(dirs[:_layouts], 'refresh.html'), 'w') do |f|
+          File.open(File.join(dirs[:_layouts], "refresh.html"), "w") do |f|
             f.puts <<-HTML
 <!DOCTYPE html>
 <html>
@@ -80,78 +81,75 @@ HTML
             # Get required fields
             data, content = self.post_data(post)
 
-            data['layout'] = post[:type]
-            title = data['title'] = post[:title].strip.force_encoding('UTF-8')
-            time = data['created'] = post[:created]
+            data["layout"] = post[:type]
+            title = data["title"] = post[:title].strip.force_encoding("UTF-8")
+            time = data["created"] = post[:created]
 
             # Get the relevant fields as a hash and delete empty fields
-            data = data.delete_if { |k,v| v.nil? || v == ''}.each_pair {
-                |k,v| ((v.is_a? String) ? v.force_encoding('UTF-8') : v)
-            }
+            data = data.delete_if { |_k, v| v.nil? || v == "" }.each_pair do |_k, v|
+              (v.is_a? String ? v.force_encoding("UTF-8") : v)
+            end
 
             # Construct a Jekyll compatible file name
             is_published = post[:status] == 1
             node_id = post[:nid]
             dir = is_published ? dirs[:_posts] : dirs[:_drafts]
-            slug = title.strip.downcase.gsub(/(&|&amp;)/, ' and ').gsub(/[\s\.\/\\]/, '-').gsub(/[^\w-]/, '').gsub(/[-_]{2,}/, '-').gsub(/^[-_]/, '').gsub(/[-_]$/, '')
-            filename = Time.at(time).to_datetime.strftime('%Y-%m-%d-') + slug + '.md'
+            slug = title.strip.downcase.gsub(%r!(&|&amp;)!, " and ").gsub(%r![\s\.\/\\]!, "-").gsub(%r![^\w-]!, "").gsub(%r![-_]{2,}!, "-").gsub(%r!^[-_]!, "").gsub(%r![-_]$!, "")
+            filename = Time.at(time).to_datetime.strftime("%Y-%m-%d-") + slug + ".md"
 
             # Write out the data and content to file
-            File.open("#{dir}/#{filename}", 'w') do |f|
+            File.open("#{dir}/#{filename}", "w") do |f|
               f.puts data.to_yaml
-              f.puts '---'
+              f.puts "---"
               f.puts content
             end
 
-
             # Make a file to redirect from the old Drupal URL
-            if is_published
-              alias_query = self.aliases_query(prefix)
-              type = post[:type]
-
-              aliases = db[alias_query, "#{type}/#{node_id}"].all
-
-              aliases.push(:alias => "#{type}/#{node_id}")
-
-              aliases.each do |url_alias|
-                FileUtils.mkdir_p url_alias[:alias]
-                File.open("#{url_alias[:alias]}/index.md", "w") do |f|
-                  f.puts '---'
-                  f.puts 'layout: refresh'
-                  f.puts "refresh_to_post_id: /#{Time.at(time).to_datetime.strftime('%Y/%m/%d/') + slug}"
-                  f.puts '---'
-                end
+            next unless is_published
+            alias_query = self.aliases_query(prefix)
+            type = post[:type]
+
+            aliases = db[alias_query, "#{type}/#{node_id}"].all
+
+            aliases.push(:alias => "#{type}/#{node_id}")
+
+            aliases.each do |url_alias|
+              FileUtils.mkdir_p url_alias[:alias]
+              File.open("#{url_alias[:alias]}/index.md", "w") do |f|
+                f.puts "---"
+                f.puts "layout: refresh"
+                f.puts "refresh_to_post_id: /#{Time.at(time).to_datetime.strftime("%Y/%m/%d/") + slug}"
+                f.puts "---"
               end
             end
           end
         end
       end
 
-      def build_query(prefix, types)
-        raise 'The importer you are trying to use does not implement the get_query() method.'
+      def build_query(_prefix, _types)
+        raise "The importer you are trying to use does not implement the get_query() method."
       end
 
-      def aliases_query(prefix)
+      def aliases_query(_prefix)
         # Make sure you implement the query returning "alias" as the column name
         # for the URL aliases. See the Drupal 6 importer for an example. The
         # alias field is called 'dst' but we alias it to 'alias', to follow
         # Drupal 7's column names.
-        raise 'The importer you are trying to use does not implement the get_aliases_query() method.'
+        raise "The importer you are trying to use does not implement the get_aliases_query() method."
       end
 
-      def post_data(sql_post_data)
-        raise 'The importer you are trying to use does not implement the get_query() method.'
+      def post_data(_sql_post_data)
+        raise "The importer you are trying to use does not implement the get_query() method."
       end
 
       def validate(options)
-        %w[dbname user].each do |option|
+        %w(dbname user).each do |option|
           if options[option].nil?
             abort "Missing mandatory option --#{option}."
           end
         end
       end
 
-
     end
   end
 end

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

@@ -2,7 +2,7 @@ module JekyllImport
   module Importers
     class Easyblog < Importer
       def self.validate(options)
-        %w[dbname user].each do |option|
+        %w(dbname user).each do |option|
           if options[option].nil?
             abort "Missing mandatory option --#{option}."
           end
@@ -10,32 +10,33 @@ module JekyllImport
       end
 
       def self.specify_options(c)
-        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 "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"
       end
 
       def self.require_deps
-        JekyllImport.require_with_fallback(%w[
-                                           rubygems
-                                          sequel
-                                          fileutils
-                                          safe_yaml
-                                          ])
+        JekyllImport.require_with_fallback(%w(
+          rubygems
+          sequel
+          mysql2
+          fileutils
+          safe_yaml
+        ))
       end
 
       def self.process(options)
-        dbname  = options.fetch('dbname')
-        user    = options.fetch('user')
-        pass    = options.fetch('password', '')
-        host    = options.fetch('host', "localhost")
-        section = options.fetch('section', '1')
-        table_prefix = options.fetch('prefix', "jos_")
+        dbname  = options.fetch("dbname")
+        user    = options.fetch("user")
+        pass    = options.fetch("password", "")
+        host    = options.fetch("host", "localhost")
+        section = options.fetch("section", "1")
+        table_prefix = options.fetch("prefix", "jos_")
 
-        db = Sequel.mysql(dbname, :user => user, :password => pass, :host => host, :encoding => 'utf8')
+        db = Sequel.mysql2(dbname, :user => user, :password => pass, :host => host, :encoding => "utf8")
 
         FileUtils.mkdir_p("_posts")
 
@@ -68,20 +69,19 @@ module JekyllImport
           content = post[:content]
           category = post[:category]
           tags = post[:tags]
-          name = "%02d-%02d-%02d-%s.markdown" % [date.year, date.month, date.day,
-                                                 slug]
+          name = format("%02d-%02d-%02d-%s.markdown", date.year, date.month, date.day, slug)
 
           # Get the relevant fields as a hash, delete empty fields and convert
           # to YAML for the header.
           data = {
-            'layout' => 'post',
-            'title' => title.to_s,
-            'joomla_id' => post[:id],
-            'joomla_url' => post[:alias],
-            'category' => post[:category],
-            'tags' => post[:tags],
-            'date' => date
-          }.delete_if { |k,v| v.nil? || v == '' }.to_yaml
+            "layout"     => "post",
+            "title"      => title.to_s,
+            "joomla_id"  => post[:id],
+            "joomla_url" => post[:alias],
+            "category"   => post[:category],
+            "tags"       => post[:tags],
+            "date"       => date,
+          }.delete_if { |_k, v| v.nil? || v == "" }.to_yaml
 
           # Write out the data and content to file
           File.open("_posts/#{name}", "w") do |f|

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

@@ -1,7 +1,7 @@
 module JekyllImport
-    module Importers
+  module Importers
     class Enki < Importer
-      SQL = <<-EOS
+      SQL = <<-EOS.freeze
         SELECT p.id,
                p.title,
                p.slug,
@@ -12,7 +12,7 @@ module JekyllImport
 EOS
 
       def self.validate(options)
-        %w[dbname user].each do |option|
+        %w(dbname user).each do |option|
           if options[option].nil?
             abort "Missing mandatory option --#{option}."
           end
@@ -20,51 +20,50 @@ EOS
       end
 
       def self.specify_options(c)
-        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 "dbname", "--dbname", "Database name"
+        c.option "user", "--user", "Database name"
+        c.option "password", "--password", 'Database name (default: "")'
+        c.option "host", "--host", "Database name"
       end
 
       def self.require_deps
-        JekyllImport.require_with_fallback(%w[
+        JekyllImport.require_with_fallback(%w(
           rubygems
           sequel
           fileutils
           pg
           yaml
-        ])
+        ))
       end
 
       # Just working with postgres, but can be easily adapted
       # to work with both mysql and postgres.
       def self.process(options)
-        dbname = options.fetch('dbname')
-        user   = options.fetch('user')
-        pass   = options.fetch('password', "")
-        host   = options.fetch('host', "localhost")
+        dbname = options.fetch("dbname")
+        user   = options.fetch("user")
+        pass   = options.fetch("password", "")
+        host   = options.fetch("host", "localhost")
 
-        FileUtils.mkdir_p('_posts')
+        FileUtils.mkdir_p("_posts")
         db = Sequel.postgres(:database => dbname,
-                             :user => user,
+                             :user     => user,
                              :password => pass,
-                             :host => host,
-                             :encoding => 'utf8')
+                             :host     => host,
+                             :encoding => "utf8")
 
         db[SQL].each do |post|
-          name = [ sprintf("%.04d", post[:date].year),
-                   sprintf("%.02d", post[:date].month),
-                   sprintf("%.02d", post[:date].day),
-                   post[:slug].strip ].join('-')
-          name += '.textile'
+          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|
-            f.puts({ 'layout'   => 'post',
-                     'title'    => post[:title].to_s,
-                     'enki_id'  => post[:id],
-                     'categories'  => post[:tags]
-                   }.delete_if { |k, v| v.nil? || v == '' }.to_yaml)
-            f.puts '---'
+          File.open("_posts/#{name}", "w") do |f|
+            f.puts({ "layout"     => "post",
+                     "title"      => post[:title].to_s,
+                     "enki_id"    => post[:id],
+                     "categories" => post[:tags], }.delete_if { |_k, v| v.nil? || v == "" }.to_yaml)
+            f.puts "---"
             f.puts post[:body].delete("\r")
           end
         end