jekyll-import 0.1.0.beta1 → 0.1.0.beta2

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YzhiN2U2ZDMwNjA0NTM4ODYxYjViM2E0ZWJkZTMyYzA2MmQxN2E3Mw==
+  data.tar.gz: !binary |-
+    OThkMzY2ZjhhYzZiMjQ5MmUyMDU1NTI3ODg3NTFhMTNkMDAxMzFhYg==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    YWY0NWEyOTM2OTRiOTYzNmY2Y2I0ZTMxNWMzMGRhODdlMTg1MWU0OTNmM2Qz
+    MGU2NDRlMzI2ZDc1MWZmNWU1ZDE1YWJjOTVmYzQ2MWE5ZDlkMDdmOGUxZGUx
+    YjAxNjg4OTRiYTk5OTUxZmIzMzdjNzVkNzBmMWJmNDI4ODlhM2Y=
+  data.tar.gz: !binary |-
+    MGQwODAyZjgwNDBjOTExNjU5NDNlNTFiYmVkMGQzNTc2YmY2MjAyNzQ1Yzli
+    MTM3MmNkNWU3ZWY4ZjVlMWVlNmFjYjE1YjZjN2UyZjBkMjg1NGVmY2QwY2Mz
+    ZWY2NGYwY2I5YjMxMjc3ZDMyYmUzY2I1ZjI1OWZlNDkwNThmOGE=

data/History.markdown

@@ -0,0 +1,21 @@
+## HEAD
+
+### Major Enhancements
+  * Add the optional ability to include images in a posterous migration (#5)
+  * Posterous archive (unzipped directory) importer added (#12)
+  * Improve MovableType importer (#13)
+### Minor Enhancements
+  * 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)
+### 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)
+### Site Enhancements
+### Development Fixes
+  * Update usage docs in RSS importer (#35)

data/README.markdown

@@ -0,0 +1,7 @@
+jekyll-import
+=============
+
+The Jekyll import command for importing from various blogs to Jekyll format.
+
+[![Build
+Status](https://travis-ci.org/jekyll/jekyll-import.png?branch=master)](https://travis-ci.org/jekyll/jekyll-import)

data/jekyll-import.gemspec

@@ -2,10 +2,11 @@ Gem::Specification.new do |s|
   s.specification_version = 2 if s.respond_to? :specification_version=
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.rubygems_version = '1.3.5'
+  s.required_ruby_version = '>= 1.9.2'
 
   s.name              = 'jekyll-import'
-  s.version           = '0.1.0.beta1'
-  s.date              = '2013-03-19'
+  s.version           = '0.1.0.beta2'
+  s.date              = '2013-07-01'
   s.rubyforge_project = 'jekyll-import'
 
   s.summary     = "Import command for Jekyll (static site generator)."
@@ -18,16 +19,17 @@ Gem::Specification.new do |s|
   s.require_paths = %w[lib]
 
   s.rdoc_options = ["--charset=UTF-8"]
-  s.extra_rdoc_files = %w[README.md LICENSE]
+  s.extra_rdoc_files = %w[README.markdown LICENSE]
 
-  s.add_runtime_dependency('jekyll')
+  s.add_runtime_dependency('jekyll', '~> 1.0')
   s.add_runtime_dependency('fastercsv')
   s.add_runtime_dependency('nokogiri')
-  s.add_runtime_dependency('safe_yaml', '~> 0.7')
+  s.add_runtime_dependency('safe_yaml', '~> 0.7.0')
   
   # development dependencies
   s.add_development_dependency('rake', "~> 10.0.3")
   s.add_development_dependency('rdoc', "~> 4.0.0")
+  s.add_development_dependency('activesupport', '~> 3.2')
   
   # test dependencies:
   s.add_development_dependency('redgreen', "~> 1.2")
@@ -46,9 +48,9 @@ Gem::Specification.new do |s|
   # = MANIFEST =
   s.files = %w[
     Gemfile
-    History.txt
+    History.markdown
     LICENSE
-    README.md
+    README.markdown
     Rakefile
     jekyll-import.gemspec
     lib/jekyll-import.rb

data/lib/jekyll/commands/import.rb

@@ -23,8 +23,8 @@ module Jekyll
         :wordpressdotcom => 'WordpressDotCom'
       }
 
-      def self.abort_on_invalid_migator
-        msg = "You must specify a valid migrator. Valid choices:\n"
+      def self.abort_on_invalid_migrator(migrator)
+        msg = "Sorry, '#{migrator}' isn't a valid migrator. Valid choices:\n"
         IMPORTERS.keys.each do |k, v|
           msg += "* #{k}\n"
         end
@@ -32,18 +32,19 @@ module Jekyll
       end
 
       def self.process(migrator, options)
-        if IMPORTERS.keys.include?(migrator.to_sym)
-          migrator = migrator.downcase
+        if IMPORTERS.keys.include?(migrator.to_s.to_sym)
+          migrator = migrator.to_s.downcase
 
           require File.join(File.dirname(__FILE__), "..", "jekyll-import", "#{migrator}.rb")
 
           if JekyllImport.const_defined?(IMPORTERS[migrator.to_sym])
-            puts 'Importing...'
             klass = JekyllImport.const_get(IMPORTERS[migrator.to_sym])
+            klass.validate(options.__hash__) if klass.respond_to?(:validate)
+            puts 'Importing...'
             klass.process(options.__hash__)
           end
         else
-          abort_on_invalid_migator
+          abort_on_invalid_migrator(migrator)
         end
       end
     end

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

@@ -1,11 +1,15 @@
+require "csv"
+
 module JekyllImport
   module CSV
     # 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(file = "posts.csv")
+    def self.process(options)
+      file = options[:file] || "posts.csv"
       FileUtils.mkdir_p "_posts"
       posts = 0
-      FasterCSV.foreach(file) do |row|
+      abort "Cannot find the file '#{file}'. Aborting." unless File.file?(file)
+      ::CSV.foreach(file) do |row|
         next if row[0] == "title"
         posts += 1
         name = row[3].split(" ")[0]+"-"+row[1]+(row[4] =~ /markdown/ ? ".markdown" : ".textile")

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

@@ -17,11 +17,15 @@ module JekyllImport
                     n.title, \
                     nr.body, \
                     n.created, \
-                    n.status \
-             FROM node AS n, \
-                  node_revisions AS nr \
-             WHERE (n.type = 'blog' OR n.type = 'story') \
-             AND n.vid = nr.vid"
+                    n.status, \
+                    GROUP_CONCAT( td.name SEPARATOR ' ' ) AS 'tags' \
+               FROM node_revisions AS nr, \
+                    node AS n \
+               JOIN term_node AS tn ON tn.nid = n.nid \
+               JOIN term_data AS td ON tn.tid = td.tid \
+              WHERE (n.type = 'blog' OR n.type = 'story') \
+                AND n.vid = nr.vid \
+           GROUP BY n.nid"
 
     def self.process(dbname, user, pass, host = 'localhost', prefix = '')
       db = Sequel.mysql(dbname, :user => user, :password => pass, :host => host, :encoding => 'utf8')
@@ -53,6 +57,7 @@ EOF
         node_id = post[:nid]
         title = post[:title]
         content = post[:body]
+        tags = post[:tags].downcase.strip
         created = post[:created]
         time = Time.at(created)
         is_published = post[:status] == 1
@@ -66,7 +71,10 @@ EOF
            'layout' => 'post',
            'title' => title.to_s,
            'created' => created,
-         }.delete_if { |k,v| v.nil? || v == ''}.to_yaml
+           'categories' => tags
+         }.delete_if { |k,v| v.nil? || v == ''}.each_pair {
+            |k,v| ((v.is_a? String) ? v.force_encoding("UTF-8") : v)
+         }.to_yaml
 
         # Write out the data and content to file
         File.open("#{dir}/#{name}", "w") do |f|

data/lib/jekyll/jekyll-import/posterous.rb

@@ -5,7 +5,14 @@ require 'net/http'
 require 'uri'
 require "json"
 
-# ruby -r './lib/jekyll/migrators/posterous.rb' -e 'Jekyll::Posterous.process(email, pass, api_key, blog)'
+# ruby -r './lib/jekyll/migrators/posterous.rb' -e 'Jekyll::Posterous.process(email, pass, api_key)'
+# Other arguments are optional; the default values are:
+# * :include_imgs => false         # should images be downloaded as well?
+# * :blog         => 'primary'     # blog, if you have more than one.
+# * :base_path    => '/'           # for image, if they will be served from a different host for eg.
+
+# For example, to download images as well as your posts, use the above command with
+# ....process(email, pass, api_key, :include_imgs => true)
 
 module JekyllImport
   module Posterous
@@ -55,11 +62,13 @@ module JekyllImport
       return urls
     end
 
-    def self.process(email, pass, api_token, blog = 'primary', base_path = '/')
+    def self.process(email, pass, api_token, opts={})
       @email, @pass, @api_token = email, pass, api_token
+      defaults = { :include_imgs => false, :blog => 'primary', :base_path => '/' }
+      opts = defaults.merge(opts)
       FileUtils.mkdir_p "_posts"
 
-      posts = JSON.parse(self.fetch("/api/v2/users/me/sites/#{blog}/posts?api_token=#{@api_token}").body)
+      posts = JSON.parse(self.fetch("/api/v2/users/me/sites/#{opts[:blog]}/posts?api_token=#{@api_token}").body)
       page = 1
 
       while posts.any?
@@ -73,18 +82,20 @@ module JekyllImport
           name = basename + '.html'
 
           # Images:
-          post_imgs = post["media"]["images"]
-          if post_imgs.any?
-            img_dir = "imgs/%s" % basename
-            img_urls = self.fetch_images(img_dir, post_imgs)
-
-            img_urls.map! do |url|
-              '<li><img src="' + base_path + url + '"></li>'
+          if opts[:include_imgs]
+            post_imgs = post["media"]["images"]
+            if post_imgs.any?
+              img_dir = "imgs/%s" % basename
+              img_urls = self.fetch_images(img_dir, post_imgs)
+
+              img_urls.map! do |url|
+                '<li><img src="' + opts[:base_path] + url + '"></li>'
+              end
+              imgcontent = "<ol>\n" + img_urls.join("\n") + "</ol>\n"
+
+              # filter out "posterous-content", replacing with imgs:
+              content = content.sub(/\<p\>\[\[posterous-content:[^\]]+\]\]\<\/p\>/, imgcontent)
             end
-            imgcontent = "<ol>\n" + img_urls.join("\n") + "</ol>\n"
-
-            # filter out "posterous-content", replacing with imgs:
-            content = content.sub(/\<p\>\[\[posterous-content:[^\]]+\]\]\<\/p\>/, imgcontent)
           end
 
           # Get the relevant fields as a hash, delete empty fields and convert
@@ -104,7 +115,7 @@ module JekyllImport
         end
 
         page += 1
-        posts = JSON.parse(self.fetch("/api/v2/users/me/sites/#{blog}/posts?api_token=#{@api_token}&page=#{page}").body)
+        posts = JSON.parse(self.fetch("/api/v2/users/me/sites/#{opts[:blog]}/posts?api_token=#{@api_token}&page=#{page}").body)
       end
     end
   end

data/lib/jekyll/jekyll-import/rss.rb

@@ -3,10 +3,10 @@
 #
 # Usage:
 #   (URL)
-#   ruby -r '_import/rss.rb' -e "Jekyll::MigrateRSS.process('http://yourdomain.com/your-favorite-feed.xml')"
+#   ruby -r 'jekyll/jekyll-import/rss' -e "JekyllImport::RSS.process(:source => 'http://yourdomain.com/your-favorite-feed.xml')"
 #
 #   (Local file)
-#   ruby -r '_import/rss.rb' -e "Jekyll::MigrateRSS.process('./somefile/on/your/computer.xml')"
+#   ruby -r 'jekyll/jekyll-import/rss' -e "JekyllImport::RSS.process(:source => './somefile/on/your/computer.xml')"
 
 require 'rss/1.0'
 require 'rss/2.0'

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

@@ -12,11 +12,21 @@ require 'yaml'
 
 module JekyllImport
   module S9Y
-    def self.process(file_name)
+    def self.validate(options)
+      if !options[:source]
+        abort "Missing mandatory option --source, e.g. --source \"http://blog.example.com/rss.php?version=2.0&all=1\""
+      end
+    end
+
+    def self.process(options)
+      validate(options)
+
       FileUtils.mkdir_p("_posts")
 
+      source = options[:source]
+
       text = ''
-      open(file_name, 'r') { |line| text = line.read }
+      open(source) { |line| text = line.read }
       rss = RSS::Parser.parse(text)
 
       rss.items.each do |item|

data/lib/jekyll/jekyll-import/tumblr.rb

@@ -20,28 +20,46 @@ module JekyllImport
       # First pass builds up an array of each post as a hash.
       begin
         current_page = (current_page || -1) + 1
-        feed = open(url + "?num=#{per_page}&start=#{current_page * per_page}")
+        feed_url = url + "?num=#{per_page}&start=#{current_page * per_page}"
+        puts "Fetching #{feed_url}"
+        feed = open(feed_url)
         json = feed.readlines.join("\n")[21...-2]  # Strip Tumblr's JSONP chars.
         blog = JSON.parse(json)
         puts "Page: #{current_page + 1} - Posts: #{blog["posts"].size}"
-        posts += blog["posts"].map { |post| post_to_hash(post, format) }
-      end until blog["posts"].size < per_page
-      # Rewrite URLs and create redirects.
-      posts = rewrite_urls_and_redirects posts if rewrite_urls
-      # Second pass for writing post files.
-      posts.each do |post|
-        if format == "md"
-          post[:content] = html_to_markdown post[:content]
-          post[:content] = add_syntax_highlights post[:content] if add_highlights
-        end
-        File.open("_posts/tumblr/#{post[:name]}", "w") do |f|
-          f.puts post[:header].to_yaml + "---\n" + post[:content]
+        batch = blog["posts"].map { |post| post_to_hash(post, format) }
+
+        # If we're rewriting, save the posts for later.  Otherwise, go ahead and
+        # dump these to disk now
+        if rewrite_urls
+          posts += batch
+        else
+          batch.each {|post| write_post(post, format == "md", add_highlights)}
         end
+
+      end until blog["posts"].size < per_page
+
+      # Rewrite URLs, create redirects and write out out posts if necessary
+      if rewrite_urls
+        posts = rewrite_urls_and_redirects posts
+        posts.each {|post| write_post(post, format == "md", add_highlights)}
       end
     end
 
     private
 
+    # Writes a post out to disk
+    def self.write_post(post, use_markdown, add_highlights)
+      content = post[:content]
+      if use_markdown
+        content = html_to_markdown content
+        content = add_syntax_highlights content if add_highlights
+      end
+
+      File.open("_posts/tumblr/#{post[:name]}", "w") do |f|
+        f.puts post[:header].to_yaml + "---\n" + content
+      end
+    end
+
     # Converts each type of Tumblr post to a hash with all required
     # data for Jekyll.
     def self.post_to_hash(post, format)
@@ -57,22 +75,18 @@ module JekyllImport
           end
         when "photo"
           title = post["photo-caption"]
-          max_size = post.keys.map{ |k| k.gsub("photo-url-", "").to_i }.max
-          url = post["photo-url"] || post["photo-url-#{max_size}"]
-          ext = "." + post[post.keys.select { |k|
-            k =~ /^photo-url-/ && post[k].split("/").last =~ /\./
-          }.first].split(".").last
-          content = "<img src=\"#{save_file(url, ext)}\"/>"
-          unless post["photo-link-url"].nil?
-            content = "<a href=\"#{post["photo-link-url"]}\">#{content}</a>"
+          content = if post["photo-link-url"].nil?
+            "<a href=\"#{post["photo-link-url"]}\">#{content}</a>"
+          else
+            fetch_photo post
           end
         when "audio"
           if !post["id3-title"].nil?
             title = post["id3-title"]
-            content = post.at["audio-player"] + "<br/>" + post["audio-caption"]
+            content = post["audio-player"] + "<br/>" + post["audio-caption"]
           else
             title = post["audio-caption"]
-            content = post.at["audio-player"]
+            content = post["audio-player"]
           end
         when "quote"
           title = post["quote-text"]
@@ -111,6 +125,31 @@ module JekyllImport
       }
     end
 
+    # Attempts to fetch the largest version of a photo available for a post.
+    # If that file fails, it tries the next smaller size until all available
+    # photo URLs are exhausted.  If they all fail, the import is aborted.
+    def self.fetch_photo(post)
+      sizes = post.keys.map {|k| k.gsub("photo-url-", "").to_i}
+      sizes.sort! {|a,b| b <=> a}
+
+      ext_key, ext_val = post.find do |k,v|
+        k =~ /^photo-url-/ && v.split("/").last =~ /\./
+      end
+      ext = "." + ext_val.split(".").last
+
+      sizes.each do |size|
+        url = post["photo-url"] || post["photo-url-#{size}"]
+        next if url.nil?
+        begin
+          return "<img src=\"#{save_photo(url, ext)}\"/>"
+        rescue OpenURI::HTTPError => err
+          puts "Failed to grab photo"
+        end
+      end
+
+      abort "Failed to fetch photo for post #{post['url']}"
+    end
+
     # Create a Hash of old urls => new urls, for rewriting and
     # redirects, and replace urls in each post. Instantiate Jekyll
     # site/posts to get the correct permalink format.
@@ -181,12 +220,17 @@ module JekyllImport
       lines.join("\n")
     end
 
-    def self.save_file(url, ext)
+    def self.save_photo(url, ext)
       if @grab_images
         path = "tumblr_files/#{url.split('/').last}"
         path += ext unless path =~ /#{ext}$/
         FileUtils.mkdir_p "tumblr_files"
-        File.open(path, "w") { |f| f.write(open(url).read) }
+
+        # Don't fetch if we've already cached this file
+        unless File.size? path
+          puts "Fetching photo #{url}"
+          File.open(path, "w") { |f| f.write(open(url).read) }
+        end
         url = "/" + path
       end
       url

data/lib/jekyll/jekyll-import/typo.rb

@@ -15,6 +15,7 @@ module JekyllImport
            c.extended extended,
            c.published_at date,
            c.state state,
+           c.keywords keywords,
            COALESCE(tf.name, 'html') filter
       FROM contents c
            LEFT OUTER JOIN text_filters tf
@@ -32,7 +33,7 @@ module JekyllImport
         raise "Unknown database server '#{server}'"
       end
       db[SQL].each do |post|
-        next unless post[:state] =~ /published/
+        next unless post[:state] =~ /published/i
 
         if post[:slug] == nil
           post[:slug] = "no slug"
@@ -54,7 +55,8 @@ module JekyllImport
 
         File.open("_posts/#{name}", 'w') do |f|
           f.puts({ 'layout'   => 'post',
-                   'title'    => post[:title].to_s,
+                   'title'    => (post[:title] and post[:title].to_s.force_encoding('UTF-8')),
+                   'tags'     => (post[:keywords] and post[:keywords].to_s.force_encoding('UTF-8')),
                    'typo_id'  => post[:id]
                  }.delete_if { |k, v| v.nil? || v == '' }.to_yaml)
           f.puts '---'

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

@@ -1,7 +1,6 @@
 require 'rubygems'
 require 'sequel'
 require 'fileutils'
-require 'psych'
 require 'safe_yaml'
 
 # NOTE: This converter requires Sequel and the MySQL gems.
@@ -50,9 +49,13 @@ module JekyllImport
     #                   and :revision. If this is nil or an empty
     #                   array, all posts are migrated regardless of
     #                   status. Default: [:publish].
-    # 
-    def self.process(dbname, user, pass, host='localhost', options={})
+    #
+    def self.process(options={})
       options = {
+        :user           => '',
+        :pass           => '',
+        :host           => 'localhost',
+        :dbname         => '',
         :table_prefix   => 'wp_',
         :clean_entities => true,
         :comments       => true,
@@ -75,8 +78,8 @@ module JekyllImport
 
       FileUtils.mkdir_p("_posts")
 
-      db = Sequel.mysql(dbname, :user => user, :password => pass,
-                        :host => host, :encoding => 'utf8')
+      db = Sequel.mysql2(options[:dbname], :user => options[:user], :password => options[:pass],
+                        :host => options[:host], :encoding => 'utf8')
 
       px = options[:table_prefix]
 

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

@@ -10,9 +10,9 @@ module JekyllImport
   # This importer takes a wordpress.xml file, which can be exported from your
   # wordpress.com blog (/wp-admin/export.php).
   module WordpressDotCom
-    def self.process(filename = "wordpress.xml")
+    def self.process(filename = {:source => "wordpress.xml"})
       import_count = Hash.new(0)
-      doc = Hpricot::XML(File.read(filename))
+      doc = Hpricot::XML(File.read(filename[:source]))
 
       (doc/:channel/:item).each do |item|
         title = item.at(:title).inner_text.strip

data/lib/jekyll-import.rb

@@ -3,5 +3,5 @@ require 'rubygems'
 require 'jekyll/commands/import'
 
 module JekyllImport
-  VERSION = '0.1.0.beta1'
+  VERSION = '0.1.0.beta2'
 end

data/test/helper.rb

@@ -9,6 +9,12 @@ require 'redgreen' if RUBY_VERSION < '1.9'
 require 'shoulda'
 require 'rr'
 
+unless defined?(Test::Unit::AssertionFailedError)
+  require 'active_support'
+  class Test::Unit::AssertionFailedError < ActiveSupport::TestCase::Assertion
+  end
+end
+
 Dir.glob(File.expand_path('../../lib/jekyll/jekyll-import/*', __FILE__)).each do |f|
   require f
 end

data/test/test_mt_importer.rb

@@ -89,11 +89,11 @@ class TestMTMigrator < Test::Unit::TestCase
 
   should "not include a <!--MORE--> separator when there is no entry_text_more" do
     post = stub_entry_row(:entry_text_more => "")
-    refute JekyllImport::MT.post_content(post).include?(JekyllImport::MT::MORE_CONTENT_SEPARATOR)
+    assert !JekyllImport::MT.post_content(post).include?(JekyllImport::MT::MORE_CONTENT_SEPARATOR)
   end
 
   should "include the entry_authored_on date in the file name" do
-    post = stub_entry_row(:entry_authored_on => Time.parse("2013-01-02 00:00:00").utc)
+    post = stub_entry_row(:entry_authored_on => Time.parse("2013-01-02 00:00:00 -00:00").utc)
     assert JekyllImport::MT.post_file_name(post).include?("2013-01-02")
   end
 

metadata

@@ -1,36 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-import
 version: !ruby/object:Gem::Version
-  version: 0.1.0.beta1
-  prerelease: 6
+  version: 0.1.0.beta2
 platform: ruby
 authors:
 - Tom Preston-Werner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-19 00:00:00.000000000 Z
+date: 2013-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: fastercsv
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,23 +55,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: safe_yaml
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,15 +90,27 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 4.0.0
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: redgreen
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,7 +118,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -126,7 +125,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -134,7 +132,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -142,7 +139,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -150,7 +146,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -158,7 +153,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -166,7 +160,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -174,7 +167,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov-gem-adapter
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -182,7 +174,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -190,7 +181,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -198,7 +188,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -206,7 +195,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -214,7 +202,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -222,7 +209,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: hpricot
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -230,7 +216,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -238,7 +223,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -246,7 +230,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -254,7 +237,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -262,7 +244,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -272,13 +253,13 @@ email: tom@mojombo.com
 executables: []
 extensions: []
 extra_rdoc_files:
-- README.md
+- README.markdown
 - LICENSE
 files:
 - Gemfile
-- History.txt
+- History.markdown
 - LICENSE
-- README.md
+- README.markdown
 - Rakefile
 - jekyll-import.gemspec
 - lib/jekyll-import.rb
@@ -305,26 +286,25 @@ files:
 - test/test_wordpressdotcom_importer.rb
 homepage: http://github.com/mojombo/jekyll-import
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: jekyll-import
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 2
 summary: Import command for Jekyll (static site generator).

data/History.txt

@@ -1,7 +0,0 @@
-== HEAD
-  * Major Enhancements
-    * Improve MovableType importer (#13)
-  * Minor Enhancements
-  * Bug Fixes
-  * Site Enhancements
-  * Development fixes

data/README.md

@@ -1,4 +0,0 @@
-jekyll-import
-=============
-
-The Jekyll import command for importing from various blogs to Jekyll format.