jekyll-import 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07d3bbdc383ff8bcf6b7b686332687345dc8a71b
-  data.tar.gz: 73fa392dc3e4957d0aae9dce535a0abb3655c73f
+  metadata.gz: 978cb59817a6828ea723eeef82002e9520fb9993
+  data.tar.gz: d193cd60fe7c2c3872a072030e2d08d4d7d42637
 SHA512:
-  metadata.gz: 32ddb7124f545ddc9031190529a40348051b713c2343f509ce26bc7970310ed456ed59e0dd7f4a7baaafde3141cd3248f42b85f47d3d26b237b090d452ade2d7
-  data.tar.gz: 6331a88ff5fe73131e7d4f0331e0767ff4871b190135260f42af846a2ea0b2f2c989ae678c0992400ac2defe3818a2d34b16fdf2bb3e26fc52a36a7b4af767ef
+  metadata.gz: cd53d8b869acd8123793c72e261e2a5e4a452a3ea3162783aa5df9af32059c23a37a2fb9e5eb238f91894632fb37558b735660c0257b06b242954443afb5e7dd
+  data.tar.gz: ed999729e91426cd839bb5abd8954c6a3004c78b22a6d3571bc5336d3abd634848ea19726aabef4af8041c0485765b18549a6cc3f225622e0a5d08630c051d3d

data/lib/jekyll-import.rb

@@ -9,10 +9,6 @@ require 'jekyll-import/importers'
 require 'jekyll-import/util'
 
 module JekyllImport
-  def self.logger
-    @logger ||= Jekyll::Stevenson.new
-  end
-
   # Public: Add the subcommands for each importer
   #
   # cmd - the instance of Mercenary::Command from the
@@ -39,14 +35,14 @@ module JekyllImport
       begin
         require gem
       rescue LoadError
-        logger.error "Whoops! Looks like you need to install '#{gem}' before you can use this importer."
-        logger.error ""
-        logger.error "If you're using bundler:"
-        logger.error "  1. Add 'gem \"#{gem}\"' to your Gemfile"
-        logger.error "  2. Run 'bundle install'"
-        logger.error ""
-        logger.error "If you're not using bundler:"
-        logger.abort_with "  1. Run 'gem install #{gem}'."
+        Jekyll.logger.error "Whoops! Looks like you need to install '#{gem}' before you can use this importer."
+        Jekyll.logger.error ""
+        Jekyll.logger.error "If you're using bundler:"
+        Jekyll.logger.error "  1. Add 'gem \"#{gem}\"' to your Gemfile"
+        Jekyll.logger.error "  2. Run 'bundle install'"
+        Jekyll.logger.error ""
+        Jekyll.logger.error "If you're not using bundler:"
+        Jekyll.logger.abort_with "  1. Run 'gem install #{gem}'."
       end
     end
   end

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

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 module JekyllImport
   module Importers
     class CSV < Importer
@@ -5,6 +7,7 @@ module JekyllImport
         JekyllImport.require_with_fallback(%w[
           csv
           fileutils
+          yaml
         ])
       end
 
@@ -23,34 +26,69 @@ module JekyllImport
         abort "Cannot find the file '#{file}'. Aborting." unless File.file?(file)
 
         ::CSV.foreach(file) do |row|
-          next if row[0] == "title"
+          next if row[0] == "title" # header
           posts += 1
-          name = build_name(row)
-          write_post(name, row[0], row[2], options)
+          write_post(CSVPost.new(row), options)
         end
-        "Created #{posts} posts!"
+        Jekyll.logger.info "Created #{posts} posts!"
       end
 
-      def self.write_post(name, title, content, options)
-        File.open("_posts/#{name}", "w") do |f|
-          write_frontmatter(f, title, options)
-          f.puts content
+      class CSVPost
+        attr_reader :title, :permalink, :body, :markup
+
+        MissingDataError = Class.new(RuntimeError)
+
+        # Creates a CSVPost
+        #
+        # row - Array of data, length of 4 or 5 with the columns:
+        #
+        #   1. title
+        #   2. permalink
+        #   3. body
+        #   4. published_at
+        #   5. markup (markdown, textile)
+        def initialize(row)
+          @title = row[0]        || missing_data("Post title not present in first column.")
+          @permalink = row[1]    || missing_data("Post permalink not present in second column.")
+          @body = row[2]         || missing_data("Post body not present in third column.")
+          @published_at = row[3] || missing_data("Post publish date not present in fourth column.")
+          @markup = row[4]       || "markdown"
+        end
+
+        def published_at
+          if @published_at && !@published_at.is_a?(DateTime)
+            @published_at = DateTime.parse(@published_at)
+          else
+            @published_at
+          end
+        end
+
+        def filename
+          "#{published_at.strftime("%Y-%m-%d")}-#{File.basename(permalink, ".*")}.#{markup}"
+        end
+
+        def missing_data(message)
+          raise MissingDataError, message
         end
       end
 
-      def self.build_name(row)
-        row[3].split(" ")[0]+"-"+row[1]+(row[4] =~ /markdown/ ? ".markdown" : ".textile")
+      def self.write_post(post, options = {})
+        File.open(File.join("_posts", post.filename), "w") do |f|
+          write_frontmatter(f, post, options)
+          f.puts post.body
+        end
       end
 
-      def self.write_frontmatter(f, title, options)
+      def self.write_frontmatter(f, post, options)
         no_frontmatter = options.fetch('no-front-matter', false)
         unless no_frontmatter
-          f.puts <<-HEADER
----
-layout: post
-title: #{title}
----
-HEADER
+          f.puts YAML.dump({
+            "layout"    => "post",
+            "title"     => post.title,
+            "date"      => post.published_at.to_s,
+            "permalink" => post.permalink
+          })
+          f.puts "---"
         end
       end
     end

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

@@ -13,7 +13,7 @@ module JekyllImport
                       node AS n \
                  LEFT OUTER JOIN term_node AS tn ON tn.nid = n.nid \
                  LEFT OUTER JOIN term_data AS td ON tn.tid = td.tid \
-                WHERE (n.type = 'blog' OR n.type = 'story' OR n.type = 'article') \
+                WHERE (%types%) \
                   AND n.vid = nr.vid \
              GROUP BY n.nid"
 
@@ -31,6 +31,7 @@ module JekyllImport
         c.option 'password', '--password PW', "Database user's password (default: '')"
         c.option 'host', '--host HOST', 'Database host name (default: "localhost")'
         c.option 'prefix', '--prefix PREFIX', 'Table prefix name'
+        c.option 'types', '--types TYPE1[,TYPE2[,TYPE3...]]', Array, 'The Drupal content types to be imported.'
       end
 
       def self.require_deps
@@ -48,6 +49,7 @@ module JekyllImport
         pass   = options.fetch('password', "")
         host   = options.fetch('host', "localhost")
         prefix = options.fetch('prefix', "")
+        types  = options.fetch('types', ['blog', 'story', 'article'])
 
         db = Sequel.mysql(dbname, :user => user, :password => pass, :host => host, :encoding => 'utf8')
 
@@ -58,6 +60,9 @@ module JekyllImport
           QUERY[" term_data "] = " " + prefix + "term_data "
         end
 
+        types = types.join("' OR n.type = '")
+        QUERY[" WHERE (%types%) "] = " WHERE (n.type = '#{types}') "
+
         FileUtils.mkdir_p "_posts"
         FileUtils.mkdir_p "_drafts"
         FileUtils.mkdir_p "_layouts"

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

@@ -7,12 +7,16 @@ module JekyllImport
                       fdb.body_value, \
                       fdb.body_summary, \
                       n.created, \
-                      n.status \
+                      n.status, \
+                      n.nid, \
+                      u.name \
                FROM node AS n, \
-                    field_data_body AS fdb \
-               WHERE (n.type = 'blog' OR n.type = 'story' OR n.type = 'article') \
+                    field_data_body AS fdb, \
+                    users AS u \
+               WHERE (%types%) \
                AND n.nid = fdb.entity_id \
-               AND n.vid = fdb.revision_id"
+               AND n.vid = fdb.revision_id
+               AND n.uid = u.uid"
 
       def self.validate(options)
         %w[dbname user].each do |option|
@@ -28,6 +32,7 @@ module JekyllImport
         c.option 'password', '--password PW', 'Database user\'s password (default: "")'
         c.option 'host', '--host HOST', 'Database host name (default: "localhost")'
         c.option 'prefix', '--prefix PREFIX', 'Table prefix name'
+        c.option 'types', '--types TYPE1[,TYPE2[,TYPE3...]]', Array, 'The Drupal content types to be imported.'
       end
 
       def self.require_deps
@@ -45,14 +50,19 @@ module JekyllImport
         pass   = options.fetch('password', "")
         host   = options.fetch('host', "localhost")
         prefix = options.fetch('prefix', "")
+        types  = options.fetch('types', ['blog', 'story', 'article'])
 
         db = Sequel.mysql(dbname, :user => user, :password => pass, :host => host, :encoding => 'utf8')
 
         unless prefix.empty?
           QUERY[" node "] = " " + prefix + "node "
           QUERY[" field_data_body "] = " " + prefix + "field_data_body "
+          QUERY[" users "] = " " + prefix + "users "
         end
 
+        types = types.join("' OR n.type = '")
+        QUERY[" WHERE (%types%) "] = " WHERE (n.type = '#{types}') "
+
         FileUtils.mkdir_p "_posts"
         FileUtils.mkdir_p "_drafts"
         FileUtils.mkdir_p "_layouts"
@@ -63,6 +73,8 @@ module JekyllImport
           content = post[:body_value]
           summary = post[:body_summary]
           created = post[:created]
+          author = post[:name]
+          nid = post[:nid]
           time = Time.at(created)
           is_published = post[:status] == 1
           dir = is_published ? "_posts" : "_drafts"
@@ -74,6 +86,8 @@ module JekyllImport
           data = {
             'layout' => 'post',
             'title' => title.strip.force_encoding("UTF-8"),
+            'author' => author,
+            'nid' => nid,
             'created' => created,
             'excerpt' => summary
           }.delete_if { |k,v| v.nil? || v == ''}.to_yaml

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

@@ -2,6 +2,8 @@ module JekyllImport
   module Importers
     class MT < Importer
 
+      SUPPORTED_ENGINES = %{mysql postgres sqlite}
+
       STATUS_DRAFT = 1
       STATUS_PUBLISHED = 2
       MORE_CONTENT_SEPARATOR = '<!--more-->'
@@ -65,27 +67,10 @@ module JekyllImport
       def self.process(options)
         options  = default_options.merge(options)
 
-        engine   = options.fetch('engine', 'mysql')
-        dbname   = options.fetch('dbname')
-        user     = options.fetch('user')
-        pass     = options.fetch('password', "")
-        host     = options.fetch('host', "localhost")
         comments = options.fetch('comments')
+        posts_name_by_id = {} if comments
 
-        posts_name_by_id = { } if comments
-
-        db_opts = { user => user, :password => pass, :host => host }
-
-        # Use the default port by default, but set the port if one is provided.
-        if options['port']
-          db_opts[:port] = options['port']
-        end
-
-        if engine != 'mysql' && engine != 'postgres'
-          abort("unsupported --engine value supplied '#{engine}'. Only 'mysql' and 'postgres' are supported")
-        end 
-
-        db = Sequel.public_send(engine, dbname, db_opts)
+        db = database_from_opts(options)
 
         post_categories = db[:mt_placement].join(:mt_category, :category_id => :placement_category_id)
 
@@ -102,7 +87,7 @@ module JekyllImport
 
           data = post_metadata(post, options)
           data['categories'] = categories if !categories.empty? && options['categories']
-          yaml_front_matter = data.delete_if { |k,v| v.nil? || v == '' }.to_yaml
+          yaml_front_matter = data.delete_if { |_,v| v.nil? || v == '' }.to_yaml
 
           # save post path for comment processing
           posts_name_by_id[data['post_id']] = file_name if comments
@@ -122,13 +107,13 @@ module JekyllImport
 
           comments = db[:mt_comment]
           comments.each do |comment|
-            if posts_name_by_id.has_key?(comment[:comment_entry_id]) # if the entry exists
+            if 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 = comment_metadata(comment, options)
               content = comment_content(comment, options)
-              yaml_front_matter = data.delete_if { |k,v| v.nil? || v == '' }.to_yaml
+              yaml_front_matter = data.delete_if { |_,v| v.nil? || v == '' }.to_yaml
 
               File.open("_comments/#{dir_name}/#{base_name}", "w") do |f|
                 f.puts yaml_front_matter
@@ -243,6 +228,30 @@ module JekyllImport
           entry_type
         end
       end
+
+      def self.database_from_opts(options)
+        engine   = options.fetch('engine', 'mysql')
+        dbname   = options.fetch('dbname')
+
+        case engine
+        when "sqlite"
+          Sequel.sqlite(dbname)
+        when "mysql", "postgres"
+          db_connect_opts = {
+            :host =>     options.fetch('host', 'localhost'),
+            :user =>     options.fetch('user'),
+            :password => options.fetch('password', '')
+          }
+          db_connect_opts = options['port'] if options['port']
+          Sequel.public_send(
+            engine,
+            dbname,
+            db_connect_opts
+          )
+        else
+          abort("Unsupported engine: '#{engine}'. Must be one of #{SUPPORTED_ENGINES.join(', ')}")
+        end
+      end
     end
   end
 end

data/lib/jekyll-import/version.rb

@@ -1,3 +1,3 @@
 module JekyllImport
-  VERSION = '0.9.0'
+  VERSION = '0.10.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-import
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Tom Preston-Werner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-04 00:00:00.000000000 Z
+date: 2016-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -364,7 +364,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 2
 summary: Import command for Jekyll (static site generator).