jekyll-import 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a947f69d45cba1f40650a00310fddcadf9d70946
-  data.tar.gz: 005879da661a64860ba0850b8fc0fe7b646854d5
+  metadata.gz: f5109d834df31bbc016f4fa9ed39b543cf7c914e
+  data.tar.gz: 6954fc663c0cd876b3704ddbfb22503d35777820
 SHA512:
-  metadata.gz: f2fe80266f9cffae5ad72c3018921202c49525afd7fd21f3c4cd1f0c035e08fab67891a662f03789c857375ad00f90dd59f54df6e9c6dae8b8ec110f080d26e5
-  data.tar.gz: 8a3c66189f0882f141df0f709a508b0151d5abb53de802c927493130e25c20946cc26e84e812298e3e3d20227b94507df42e70cdf12efd2ab9fb0fe12619f874
+  metadata.gz: e4210991177bd53645dc452a866231e90bd7ecfb65832702683f053cf5ee66ce7e01133db3984d436941150408af49e9ba69c3b91cfd2c37c1080d2e2c797249
+  data.tar.gz: 80b9a2d9153efda4337f4245e8b6e7e01ff793b83659c4e149ebc7b40631d0327b46a6bb80f51effcf8da3c1a384899117e72938cb493062510145beb2e49e6e

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

@@ -19,6 +19,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 '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)'
@@ -41,6 +42,9 @@ module JekyllImport
       #
       # :table_prefix::   Prefix of database tables used by WordPress.
       #                   Default: 'wp_'
+      # :site_prefix::    Prefix of database tables used by WordPress
+      #                   Multisite, eg: 2_.
+      #                   Default: ''
       # :clean_entities:: If true, convert non-ASCII characters to HTML
       #                   entities in the posts, comments, titles, and
       #                   names. Requires the 'htmlentities' gem to
@@ -49,9 +53,9 @@ module JekyllImport
       #                   are saved in the post's YAML front matter.
       #                   Default: true.
       # :categories::     If true, save the post's categories in its
-      #                   YAML front matter.
+      #                   YAML front matter. Default: true.
       # :tags::           If true, save the post's tags in its
-      #                   YAML front matter.
+      #                   YAML front matter. Default: true.
       # :more_excerpt::   If true, when a post has no excerpt but
       #                   does have a <!-- more --> tag, use the
       #                   preceding post content as the excerpt.
@@ -60,6 +64,7 @@ module JekyllImport
       #                   two HTML anchors with ids "more" and
       #                   "more-NNN" (where NNN is the post number).
       #                   Default: true.
+      # :extension::      Set the post extension. Default: "html"
       # :status::         Array of allowed post statuses. Only
       #                   posts with matching status will be migrated.
       #                   Known statuses are :publish, :draft, :private,
@@ -75,13 +80,15 @@ module JekyllImport
           :socket         => opts.fetch('socket', nil),
           :dbname         => opts.fetch('dbname', ''),
           :table_prefix   => opts.fetch('table_prefix', 'wp_'),
+          :site_prefix    => opts.fetch('site_prefix', nil),
           :clean_entities => opts.fetch('clean_entities', true),
           :comments       => opts.fetch('comments', true),
           :categories     => opts.fetch('categories', true),
           :tags           => opts.fetch('tags', true),
           :more_excerpt   => opts.fetch('more_excerpt', true),
           :more_anchor    => opts.fetch('more_anchor', true),
-          :status         => opts.fetch('status', ["publish"]).map(&:to_sym) # :draft, :private, :revision
+          :extension      => opts.fetch('extension', 'html'),
+          :status         => opts.fetch('status', ['publish']).map(&:to_sym) # :draft, :private, :revision
         }
 
         if options[:clean_entities]
@@ -101,6 +108,7 @@ module JekyllImport
                           :socket => options[:socket], :host => options[:host], :encoding => 'utf8')
 
         px = options[:table_prefix]
+        sx = options[:site_prefix]
 
         page_name_list = {}
 
@@ -110,7 +118,7 @@ module JekyllImport
              posts.post_title    AS `title`,
              posts.post_name     AS `slug`,
              posts.post_parent   AS `parent`
-           FROM #{px}posts AS `posts`
+           FROM #{px}#{sx}posts AS `posts`
            WHERE posts.post_type = 'page'"
 
         db[page_name_query].each do |page|
@@ -140,7 +148,7 @@ module JekyllImport
              users.user_login    AS `author_login`,
              users.user_email    AS `author_email`,
              users.user_url      AS `author_url`
-           FROM #{px}posts AS `posts`
+           FROM #{px}#{sx}posts AS `posts`
              LEFT JOIN #{px}users AS `users`
                ON posts.post_author = users.ID"
 
@@ -162,6 +170,8 @@ module JekyllImport
 
       def self.process_post(post, db, options, page_name_list)
         px = options[:table_prefix]
+        sx = options[:site_prefix]
+        extension = options[:extension]
 
         title = post[:title]
         if options[:clean_entities]
@@ -174,8 +184,8 @@ module JekyllImport
         end
 
         date = post[:date] || Time.now
-        name = "%02d-%02d-%02d-%s.markdown" % [date.year, date.month,
-                                               date.day, slug]
+        name = "%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)
@@ -208,9 +218,9 @@ module JekyllImport
                terms.name AS `name`,
                ttax.taxonomy AS `type`
              FROM
-               #{px}terms AS `terms`,
-               #{px}term_relationships AS `trels`,
-               #{px}term_taxonomy AS `ttax`
+               #{px}#{sx}terms AS `terms`,
+               #{px}#{sx}term_relationships AS `trels`,
+               #{px}#{sx}term_taxonomy AS `ttax`
              WHERE
                trels.object_id = '#{post[:id]}' AND
                trels.term_taxonomy_id = ttax.term_taxonomy_id AND
@@ -245,7 +255,7 @@ module JekyllImport
                comment_date         AS `date`,
                comment_date_gmt     AS `date_gmt`,
                comment_content      AS `content`
-             FROM #{px}comments
+             FROM #{px}#{sx}comments
              WHERE
                comment_post_ID = '#{post[:id]}' AND
                comment_approved != 'spam'"
@@ -307,7 +317,7 @@ module JekyllImport
         }.delete_if { |k,v| v.nil? || v == '' }.to_yaml
 
         if post[:type] == 'page'
-          filename = page_path(post[:id], page_name_list) + 'index.markdown'
+          filename = page_path(post[:id], page_name_list) + "index.#{extension}"
           FileUtils.mkdir_p(File.dirname(filename))
         elsif post[:status] == 'draft'
           filename = "_drafts/#{slug}.md"

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

@@ -30,7 +30,7 @@ module JekyllImport
         images.each do |i|
           uri = i["src"]
 
-          i["src"] = assets_folder + "/" + File.basename(uri)
+          i["src"] = "{{ site.baseurl }}/%s/%s" % [assets_folder, File.basename(uri)]
           dst = File.join(assets_folder, File.basename(uri))
           puts "  " + uri
           if File.exist?(dst)
@@ -50,6 +50,75 @@ module JekyllImport
         end
       end
 
+      class Item
+        def initialize(node)
+          @node = node
+        end
+
+        def text_for(path)
+          @node.at(path).inner_text
+        end
+
+        def title
+          @title ||= text_for(:title).strip
+        end
+
+        def permalink_title
+          post_name = text_for('wp:post_name')
+          # Fallback to "prettified" title if post_name is empty (can happen)
+          @permalink_title ||= if post_name.empty?
+            WordpressDotCom.sluggify(title)
+          else
+            post_name
+          end
+        end
+
+        def published_at
+          if published?
+            @published_at ||= Time.parse(text_for('wp:post_date'))
+          end
+        end
+
+        def status
+          @status ||= text_for('wp:status')
+        end
+
+        def post_type
+          @post_type ||= text_for('wp:post_type')
+        end
+
+        def file_name
+          @file_name ||= if published?
+            "#{published_at.strftime('%Y-%m-%d')}-#{permalink_title}.html"
+          else
+            "#{permalink_title}.html"
+          end
+        end
+
+        def directory_name
+          @directory_name ||= if !published? && post_type == 'post'
+            '_drafts'
+          else
+            "_#{post_type}s"
+          end
+        end
+
+        def published?
+          @published ||= (status == 'publish')
+        end
+
+        def excerpt
+          @excerpt ||= begin
+            text = Hpricot(text_for('excerpt:encoded')).inner_text
+            if text.empty?
+              nil
+            else
+              text
+            end
+          end
+        end
+      end
+
       def self.process(options)
         source        = options.fetch('source', "wordpress.xml")
         fetch         = !options.fetch('no_fetch_images', false)
@@ -71,77 +140,56 @@ module JekyllImport
           end
         ] rescue {}
 
-        (doc/:channel/:item).each do |item|
-          title = item.at(:title).inner_text.strip
-          permalink_title = item.at('wp:post_name').inner_text
-          # Fallback to "prettified" title if post_name is empty (can happen)
-          if permalink_title == ""
-            permalink_title = sluggify(title)
-          end
-
-          date = Time.parse(item.at('wp:post_date').inner_text)
-          status = item.at('wp:status').inner_text
-
-          if status == "publish"
-            published = true
-          else
-            published = false
-          end
-
-          type = item.at('wp:post_type').inner_text
-          categories = item.search('category[@domain="category"]').map{|c| c.inner_text}.reject{|c| c == 'Uncategorized'}.uniq
-          tags = item.search('category[@domain="post_tag"]').map{|t| t.inner_text}.uniq
+        (doc/:channel/:item).each do |node|
+          item = Item.new(node)
+          categories = node.search('category[@domain="category"]').map(&:inner_text).reject{|c| c == 'Uncategorized'}.uniq
+          tags = node.search('category[@domain="post_tag"]').map(&:inner_text).uniq
 
           metas = Hash.new
-          item.search("wp:postmeta").each do |meta|
+          node.search("wp:postmeta").each do |meta|
             key = meta.at('wp:meta_key').inner_text
             value = meta.at('wp:meta_value').inner_text
             metas[key] = value
           end
 
-          author_login = item.at('dc:creator').inner_text.strip
+          author_login = item.text_for('dc:creator').strip
 
-          name = "#{date.strftime('%Y-%m-%d')}-#{permalink_title}.html"
           header = {
-            'layout' => type,
-            'title'  => title,
-            'date' => date,
+            'layout'     => item.post_type,
+            'title'      => item.title,
+            'date'       => item.published_at,
+            'type'       => item.post_type,
+            'published'  => item.published?,
+            'status'     => item.status,
             'categories' => categories,
-            'tags'   => tags,
-            'status'   => status,
-            'type'   => type,
-            'published' => published,
-            'meta'   => metas,
-            'author' => authors[author_login]
+            'tags'       => tags,
+            'meta'       => metas,
+            'author'     => authors[author_login]
           }
 
           begin
-            content = Hpricot(item.at('content:encoded').inner_text)
-            excerpt = Hpricot(item.at('excerpt:encoded').inner_text)
-
-            if excerpt
-              header['excerpt'] = excerpt
-            end
+            content = Hpricot(item.text_for('content:encoded'))
+            header['excerpt'] = item.excerpt if item.excerpt
 
             if fetch
-              download_images(title, content, assets_folder)
+              download_images(item.title, content, assets_folder)
             end
 
-            FileUtils.mkdir_p "_#{type}s"
-            File.open("_#{type}s/#{name}", "w") do |f|
+            FileUtils.mkdir_p item.directory_name
+            File.open(File.join(item.directory_name, item.file_name), "w") do |f|
               f.puts header.to_yaml
               f.puts '---'
               f.puts Util.wpautop(content.to_html)
             end
           rescue => e
             puts "Couldn't import post!"
-            puts "Title: #{title}"
-            puts "Name/Slug: #{name}\n"
+            puts "Title: #{item.title}"
+            puts "Name/Slug: #{item.file_name}\n"
             puts "Error: #{e.message}"
             next
           end
 
-          import_count[type] += 1
+          import_count[item.post_type] += 1
         end
 
         import_count.each do |key, value|

data/lib/jekyll-import/version.rb

@@ -1,3 +1,3 @@
 module JekyllImport
-  VERSION = '0.7.1'
+  VERSION = '0.8.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-import
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Tom Preston-Werner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-07 00:00:00.000000000 Z
+date: 2015-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -349,7 +349,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 2
 summary: Import command for Jekyll (static site generator).