jekyll-import 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0cf5aa86194fdb6bdad5d6b80ea34737f92bbf27
-  data.tar.gz: 56b1abb55373e60f2c5b5cd51c74fec9c3d3fac9
+  metadata.gz: 3ea4fc21b7d8bde846159c3822251b2192274fa8
+  data.tar.gz: 2ab2c876e9b3e440eba999232d45665f0ba7ff7d
 SHA512:
-  metadata.gz: 29d66c08763920e7a6a06d12cd3557d5f86fca0909b39412fb53d0b39886dac88e14d76c7ac9cc3dfd84296d3ef4644df48fed9315046040a7c9b6e61d20368a
-  data.tar.gz: 50e2e862522b4f4d60a0497c443627d5218d97454623fdaf5807bf91ef8e011361a037ca63efbe639ef53ae44e25b78bcbf11fac8fac3200f51c1a2710f4b137
+  metadata.gz: bbbb4b901182d17af3d0ed0432f6443b9051cd9d3976f95108931806c82fc98342218df4a6b3750705269a88b8bce73b4f236763d5e8713d8591366189b73666
+  data.tar.gz: 6f6a0fbcf76c5a05908e8e9aba0bc8f9e3a5c9cd832a671b20b6f32d4758f69f94ac96779aa53d0bff8c151a4923a7b32cb582b21d4d173e0456e587c99f237a

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

@@ -27,7 +27,7 @@ module JekyllImport
         c.option 'user', '--user USER', 'Database user name (default: "")'
         c.option 'password', '--password PW', "Database user's password (default: "")"
         c.option 'host', '--host HOST', 'Database host name (default: "localhost")'
-        c.option 'table_prefix', '--prefix PREFIX', 'Table prefix name (default: "wp_")'
+        c.option 'table_prefix', '--table_prefix PREFIX', 'Table prefix name (default: "wp_")'
         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)'
@@ -83,7 +83,7 @@ module JekyllImport
           :host           => opts.fetch('host', 'localhost'),
           :socket         => opts.fetch('socket', ''),
           :dbname         => opts.fetch('dbname', ''),
-          :table_prefix   => opts.fetch('prefix', 'wp_'),
+          :table_prefix   => opts.fetch('table_prefix', 'wp_'),
           :clean_entities => opts.fetch('clean_entities', true),
           :comments       => opts.fetch('comments', true),
           :categories     => opts.fetch('categories', true),

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

@@ -108,6 +108,7 @@ module JekyllImport
           header = {
             'layout' => type,
             'title'  => title,
+            'date' => date,
             'categories' => categories,
             'tags'   => tags,
             'status'   => status,

data/lib/jekyll-import/version.rb

@@ -1,3 +1,3 @@
 module JekyllImport
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-import
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Tom Preston-Werner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-30 00:00:00.000000000 Z
+date: 2014-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -298,14 +298,8 @@ extra_rdoc_files:
 - README.markdown
 - LICENSE
 files:
-- ".gitignore"
-- ".travis.yml"
-- Gemfile
-- History.markdown
 - LICENSE
 - README.markdown
-- Rakefile
-- jekyll-import.gemspec
 - lib/jekyll-import.rb
 - lib/jekyll-import/importer.rb
 - lib/jekyll-import/importers.rb
@@ -333,86 +327,6 @@ files:
 - lib/jekyll-import/util.rb
 - lib/jekyll-import/version.rb
 - lib/jekyll/commands/import.rb
-- script/bootstrap
-- script/cibuild
-- site/.gitignore
-- site/CNAME
-- site/README
-- site/_config.yml
-- site/_includes/analytics.html
-- site/_includes/docs_contents.html
-- site/_includes/docs_contents_mobile.html
-- site/_includes/docs_option.html
-- site/_includes/docs_ul.html
-- site/_includes/footer.html
-- site/_includes/header.html
-- site/_includes/news_contents.html
-- site/_includes/news_contents_mobile.html
-- site/_includes/news_item.html
-- site/_includes/primary-nav-items.html
-- site/_includes/section_nav.html
-- site/_includes/top.html
-- site/_layouts/default.html
-- site/_layouts/docs.html
-- site/_layouts/news.html
-- site/_layouts/news_item.html
-- site/_posts/2013-11-09-jekyll-import-0-1-0-beta4-release.markdown
-- site/_posts/2013-11-18-jekyll-import-0-1-0-rc1-released.markdown
-- site/_posts/2013-12-17-jekyll-import-0-1-0-released.markdown
-- site/_posts/2014-03-16-jekyll-import-0-2-0-released.markdown
-- site/_posts/2014-05-23-jekyll-import-0-3-0-released.markdown
-- site/_posts/2014-06-29-jekyll-import-0-4-0-released.markdown
-- site/css/gridism.css
-- site/css/normalize.css
-- site/css/pygments.css
-- site/css/style.css
-- site/docs/behance.md
-- site/docs/contributing.md
-- site/docs/csv.md
-- site/docs/drupal6.md
-- site/docs/drupal7.md
-- site/docs/easyblog.md
-- site/docs/enki.md
-- site/docs/ghost.md
-- site/docs/google_reader.md
-- site/docs/history.md
-- site/docs/index.md
-- site/docs/installation.md
-- site/docs/joomla.md
-- site/docs/jrnl.md
-- site/docs/marley.md
-- site/docs/mephisto.md
-- site/docs/mt.md
-- site/docs/posterous.md
-- site/docs/rss.md
-- site/docs/s9y.md
-- site/docs/textpattern.md
-- site/docs/third-party.md
-- site/docs/tumblr.md
-- site/docs/typo.md
-- site/docs/usage.md
-- site/docs/wordpress.md
-- site/docs/wordpressdotcom.md
-- site/favicon.png
-- site/feed.xml
-- site/img/article-footer.png
-- site/img/footer-arrow.png
-- site/img/footer-logo.png
-- site/img/logo-2x.png
-- site/img/octojekyll.png
-- site/img/tube.png
-- site/img/tube1x.png
-- site/index.html
-- site/js/modernizr-2.5.3.min.js
-- site/news/index.html
-- site/news/releases/index.html
-- test/helper.rb
-- test/test_jrnl_importer.rb
-- test/test_mt_importer.rb
-- test/test_tumblr_importer.rb
-- test/test_util.rb
-- test/test_wordpress_importer.rb
-- test/test_wordpressdotcom_importer.rb
 homepage: http://github.com/jekyll/jekyll-import
 licenses:
 - MIT
@@ -438,11 +352,4 @@ rubygems_version: 2.2.2
 signing_key: 
 specification_version: 2
 summary: Import command for Jekyll (static site generator).
-test_files:
-- test/helper.rb
-- test/test_jrnl_importer.rb
-- test/test_mt_importer.rb
-- test/test_tumblr_importer.rb
-- test/test_util.rb
-- test/test_wordpress_importer.rb
-- test/test_wordpressdotcom_importer.rb
+test_files: []

data/.gitignore

@@ -1,21 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.config
-coverage
-InstalledFiles
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-
-# YARD artifacts
-.yardoc
-_yardoc
-doc/
-
-.DS_Store
-Gemfile.lock

data/.travis.yml

@@ -1,14 +0,0 @@
-language: ruby
-install:
-  - export NOKOGIRI_USE_SYSTEM_LIBRARIES=true
-  - travis_retry ./script/bootstrap
-rvm:
-  - 2.1
-  - 2.0
-  - 1.9.3
-script: ./script/cibuild
-notifications:
-  irc: "irc.freenode.org#jekyll"
-  email:
-    on_success: never
-    on_failure: never

data/Gemfile

@@ -1,2 +0,0 @@
-source "https://rubygems.org"
-gemspec

data/History.markdown

@@ -1,135 +0,0 @@
-## HEAD
-
-### Major Enhancements
-
-### Minor Enhancements
-
-### Bug Fixes
-
-### Site Enhancements
-
-### Development Fixes
-
-## 0.4.0 / 2014-06-29
-
-### Minor Enhancements
-
-  * Add easyblog importer (#136)
-  * WordPress: import draft posts into `_drafts` folder (#147)
-  * Be really permissive about which Jekyll version to use
-
-### Bug Fixes
-
-  * Tumblr: Photo posts with multiple photos will now all import (#145)
-
-### Site Enhancements
-
-  * Fix table prefix key in WordPress docs. (#150)
-
-### Development Fixes
-
-  * Add GitHub `script/*` conventions for easy pick-up. (#146)
-
-## 0.3.0 / 2014-05-23
-
-### Minor Enhancements
-
-  * Import WordPress.org `author` data as hash (#139)
-  * Add `socket` option to the WordPress importer (#140)
-  * Allow the CSV importer to skip writing front matter (#143)
-  * WordPress.com: Download images locally and update links to them (#134)
-  * WordPress: Import WP pages as proper Jekyll pages instead of as posts (#137)
-
-### Bug Fixes
-
-  * Replace errant `continue` expression with the valid `next` expression (#133)
-
-## 0.2.0 / 2014-03-16
-
-### Major Enhancements
-  * Add comments to MovableType importer (#66)
-  * Support auto-paragraph Wordpress convention (#125)
-
-### Minor Enhancements
-  * Extract author info from wordpress XML files (#131)
-
-### Bug Fixes
-  * Require YAML library in Enki importer (#112)
-  * Fix !ruby/string:Sequel::SQL::Blob error in MT excerpts (#113)
-  * Drupal6: Ensure post "tags" is "", never nil (#117)
-  * Fixes a bug where the Tumblr importer would write posts with `nil`
-    content (#118)
-  * Change Drupal7 layout to `post` rather than `default` (#124)
-  * WordPress: Use explicit `#to_s` when outputting post dates (#129)
-
-### Site Enhancements
-  * Fixed error in quickstart code, added required design changes/reflow (#120)
-  * Fix example parameter names for Tumblr importer (#122)
-  * Add note to WordPress installer docs page that indicates what the importer
-    does and doesn't do. (#127)
-
-### Development Fixes
-  * Bring gemspec into the 2010's (#130)
-
-## 0.1.0 / 2013-12-18
-
-### Major Enhancements
-  * Add 'Ghost' importer (#100)
-  * Add 'Behance' importer (#46, #104)
-  * Add the optional ability to include images in a posterous migration (#5)
-  * Posterous archive (unzipped directory) importer added (#12)
-  * Improve MovableType importer (#13)
-  * Add an importer for Google Reader blog exports (#36)
-  * Remove dependency on html2text in the tumblr importer (#33)
-  * Add the ability to import .jrnl files (#51)
-  * Handle missing gems a bit more gracefully (#59)
-
-### Minor Enhancements
-  * Add date and redirection pages for blogs imported from Tumblr (#54)
-  * Various Tumblr Enhancements (#27)
-  * Adding tags to Typo and forcing their encoding to UTF-8 (#11)
-  * S9Y Importer: specify data source using --source option (#18)
-  * Add taxonomy (`tags`) to Drupal6 migration (#15)
-  * Differentiate between categories and tags in the WordpressDotCom
-    importer (#31)
-  * Use tumblr slug for post is available, use that instead (#39, #40)
-  * Drupal 7 importer should use latest revision of a post (#38)
-  * Improve the handling of tags in the Drupal 6 importer. Tags with
-    spaces are handled now and the importer doesn't eat tags anymore. (#42)
-  * Upgrade to `jekyll ~> 1.3` and `safe_yaml ~> 0.9.7`
-  * Add license to gemspec (#83)
-  * Add an `Importer.run` method for easy invocation (#88)
-
-### Bug Fixes
-  * Remove usage of `Hash#at` in Tumblr importer (#14)
-  * Force encoding of Drupal 6.x titles to UTF-8 (#22)
-  * Update wordpressdotcom.rb to use its method parameter correctly (#24)
-  * Use MySQL2 adapter for WordPress importer to fix broken front-matter (#20)
-  * Fix WordPress import initialize parameters due to new Jekyll setup (#19)
-  * Fixed misspelling in method name (#17)
-  * Fix Drupal 7 importer so it compares node ID's properly between `node` and
-    `field_data_body` tables (#38)
-  * Fix prefix replacement for Drupal6 (#41)
-  * Fix an exception when a Movable Type blog did not have additional
-    entry text (#45)
-  * Create `_layouts/` before writing refresh.html in Drupal migrators (#48)
-  * Fix bug where post date in `MT` importer was not imported for older versions
-    of MT sites (#62)
-  * Fix interface of importers' `#process` method (#69)
-  * RSS importer should specify `--source` option (#81)
-  * Fix fetching of parameters from options hash (#86)
-  * Drupal6: Fix NoMethodError on untagged post (#93)
-  * S9Y: Use RSS parser from `rss` package, not the RSS importer (#102)
-  * Support as much of the current Commander interface as possible (#103)
-
-### Site Enhancements
-  * Add the site (#87)
-
-### Development Fixes
-  * Update usage docs in RSS importer (#35)
-  * Added initial version of a test case for Tumblr (#43)
-  * Remove some outdated comments in the Drupal migrators (#50)
-  * Update the README to be more informative (#52)
-  * Add comment to Wordpress importer on how to install mysql with
-    MacPorts (#56)
-  * Correcting the homepage URL so links from rubygems.org will work (#63)

data/Rakefile

@@ -1,209 +0,0 @@
-# require 'rake/testtask'
-
-require 'rubygems'
-require 'rake'
-require 'rdoc'
-require 'date'
-require 'yaml'
-
-#############################################################################
-#
-# Helper functions
-#
-#############################################################################
-
-def name
-  @name ||= Dir['*.gemspec'].first.split('.').first
-end
-
-def version
-  JekyllImport::VERSION
-end
-
-def gemspec_file
-  "#{name}.gemspec"
-end
-
-def gem_file
-  "#{name}-#{version}.gem"
-end
-
-def normalize_bullets(markdown)
-  markdown.gsub(/\s{2}\*{1}/, "-")
-end
-
-def linkify_prs(markdown)
-  markdown.gsub(/#(\d+)/) do |word|
-    "[#{word}]({{ site.repository }}/issues/#{word.delete("#")})"
-  end
-end
-
-def linkify_users(markdown)
-  markdown.gsub(/(@\w+)/) do |username|
-    "[#{username}](https://github.com/#{username.delete("@")})"
-  end
-end
-
-def linkify(markdown)
-  linkify_users(linkify_prs(markdown))
-end
-
-def liquid_escape(markdown)
-  markdown.gsub(/(`{[{%].+[}%]}`)/, "{% raw %}\\1{% endraw %}")
-end
-
-def remove_head_from_history(markdown)
-  index = markdown =~ /^##\s+\d+\.\d+\.\d+/
-  markdown[index..-1]
-end
-
-def converted_history(markdown)
-  remove_head_from_history(liquid_escape(linkify(normalize_bullets(markdown))))
-end
-
-#############################################################################
-#
-# Standard tasks
-#
-#############################################################################
-
-task :default => :test
-
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
-require 'rdoc/task'
-Rake::RDocTask.new do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "#{name} #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-desc "Open an irb session preloaded with this library"
-task :console do
-  sh "irb -rubygems -r ./lib/#{name}.rb"
-end
-
-#############################################################################
-#
-# Site tasks - http://import.jekyllrb.com
-#
-#############################################################################
-
-namespace :site do
-  desc "Generate and view the site locally"
-  task :preview do
-    require "launchy"
-
-    # Yep, it's a hack! Wait a few seconds for the Jekyll site to generate and
-    # then open it in a browser. Someday we can do better than this, I hope.
-    Thread.new do
-      sleep 4
-      puts "Opening in browser..."
-      Launchy.open("http://localhost:4000")
-    end
-
-    # Generate the site in server mode.
-    puts "Running Jekyll..."
-    Dir.chdir("site") do
-      sh "jekyll serve --watch"
-    end
-  end
-
-  desc "Update normalize.css library to the latest version and minify"
-  task :update_normalize_css do
-    Dir.chdir("site/css") do
-      sh 'curl "http://necolas.github.io/normalize.css/latest/normalize.css" -o "normalize.scss"'
-      sh 'sass "normalize.scss":"normalize.css" --style compressed'
-      sh 'rm "normalize.scss"'
-    end
-  end
-
-  desc "Commit the local site to the gh-pages branch and publish to GitHub Pages"
-  task :publish => [:history] do
-    sh "git subtree push --prefix site origin gh-pages"
-  end
-
-  desc "Create a nicely formatted history page for the jekyll site based on the repo history."
-  task :history do
-    if File.exist?("History.markdown")
-      history_file = File.read("History.markdown")
-      front_matter = {
-        "layout" => "docs",
-        "title" => "History",
-        "permalink" => "/docs/history/",
-        "prev_section" => "contributing"
-      }
-      Dir.chdir('site/docs/') do
-        File.open("history.md", "w") do |file|
-          file.write("#{front_matter.to_yaml}---\n\n")
-          file.write(converted_history(history_file))
-        end
-      end
-      unless `git diff site/docs/history.md`.strip.empty?
-        sh "git add site/docs/history.md"
-        sh "git commit -m 'Updated generated history.md file in the site.'"
-      else
-        puts "No updates to commit at this time. Skipping..."
-      end
-    else
-      abort "You seem to have misplaced your History.markdown file. I can haz?"
-    end
-  end
-
-  namespace :releases do
-    desc "Create new release post"
-    task :new, :version do |t, args|
-      raise "Specify a version: rake site:releases:new['1.2.3']" unless args.version
-      today = Time.new.strftime('%Y-%m-%d')
-      release = args.version.to_s
-      filename = "site/_posts/#{today}-jekyll-import-#{release.split('.').join('-')}-released.markdown"
-
-      File.open(filename, "wb") do |post|
-        post.puts("---")
-        post.puts("layout: news_item")
-        post.puts("title: 'jekyll-import #{release} Released'")
-        post.puts("date: #{Time.new.strftime('%Y-%m-%d %H:%M:%S %z')}")
-        post.puts("author: ")
-        post.puts("version: #{version}")
-        post.puts("categories: [release]")
-        post.puts("---")
-        post.puts
-        post.puts
-      end
-
-      puts "Created #{filename}"
-    end
-  end
-end
-
-#############################################################################
-#
-# Packaging tasks
-#
-#############################################################################
-
-desc "Create tag v#{version} and build and push #{gem_file} to Rubygems"
-task :release => :build do
-  unless `git branch` =~ /^\* master$/
-    puts "You must be on the master branch to release!"
-    exit!
-  end
-  sh "git commit --allow-empty -a -m 'Release #{version}'"
-  sh "git tag v#{version}"
-  sh "git push origin master"
-  sh "git push origin v#{version}"
-  sh "gem push pkg/#{name}-#{version}.gem"
-end
-
-desc "Build #{gem_file} into the pkg directory"
-task :build do
-  sh "mkdir -p pkg"
-  sh "gem build #{gemspec_file}"
-  sh "mv #{gem_file} pkg"
-end