jekyll-import 0.1.0.beta2 → 0.1.0.beta3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzhiN2U2ZDMwNjA0NTM4ODYxYjViM2E0ZWJkZTMyYzA2MmQxN2E3Mw==
+    YjI5ZmY4ODUyNjIxNTdlNmE1YjllMzVlOWJmYTc0Yjg3OGYyMWUwMA==
   data.tar.gz: !binary |-
-    OThkMzY2ZjhhYzZiMjQ5MmUyMDU1NTI3ODg3NTFhMTNkMDAxMzFhYg==
+    NTg5OWNkNTJmYjVmYzczMzFlYzQ5NDE3MmJlZTgxNmI4YjAwMTAzOQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YWY0NWEyOTM2OTRiOTYzNmY2Y2I0ZTMxNWMzMGRhODdlMTg1MWU0OTNmM2Qz
-    MGU2NDRlMzI2ZDc1MWZmNWU1ZDE1YWJjOTVmYzQ2MWE5ZDlkMDdmOGUxZGUx
-    YjAxNjg4OTRiYTk5OTUxZmIzMzdjNzVkNzBmMWJmNDI4ODlhM2Y=
+    NjhlNzU5ZTVlN2Y1NGJiYmU4N2IxMWMyOWU2MzliMDkyMjdhMWM1NzZjZGZh
+    MTViMGE2NDU4MDQyODQ4MWI3M2FhNjNlZGQ2OGQ3MTg0ODc3OGI4NDBkM2U1
+    ZmI0Y2E1ZjM3ZjFlMGVjYzZlNTI4YThlOTRhZWFkZGQwMzk0NDc=
   data.tar.gz: !binary |-
-    MGQwODAyZjgwNDBjOTExNjU5NDNlNTFiYmVkMGQzNTc2YmY2MjAyNzQ1Yzli
-    MTM3MmNkNWU3ZWY4ZjVlMWVlNmFjYjE1YjZjN2UyZjBkMjg1NGVmY2QwY2Mz
-    ZWY2NGYwY2I5YjMxMjc3ZDMyYmUzY2I1ZjI1OWZlNDkwNThmOGE=
+    YjVkY2UyYmY3NzFkOGMwYjY0MzE1NzBiNTk5ODgwYTFmMDg3ZDI3MjExNDM3
+    ZWMyMGMzZmRmN2IwNTcxMmYwMGIzYWMxMjcyNTJlM2QwZjk2ZTg2YmMzYTgw
+    YTNiOTM1NjdmZGZlM2Q4ZDRjYTcxMzlhYjViOGRmMTNlMzZiZGE=

data/History.markdown

@@ -4,11 +4,19 @@
   * 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)
+
 ### 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)
+  * 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)
+
 ### Bug Fixes
   * Remove usage of `Hash#at` in Tumblr importer (#14)
   * Force encoding of Drupal 6.x titles to UTF-8 (#22)
@@ -16,6 +24,11 @@
   * 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)
+
 ### Site Enhancements
+
 ### Development Fixes
   * Update usage docs in RSS importer (#35)

data/jekyll-import.gemspec

@@ -5,8 +5,8 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 1.9.2'
 
   s.name              = 'jekyll-import'
-  s.version           = '0.1.0.beta2'
-  s.date              = '2013-07-01'
+  s.version           = '0.1.0.beta3'
+  s.date              = '2013-07-14'
   s.rubyforge_project = 'jekyll-import'
 
   s.summary     = "Import command for Jekyll (static site generator)."
@@ -59,6 +59,7 @@ Gem::Specification.new do |s|
     lib/jekyll/jekyll-import/drupal6.rb
     lib/jekyll/jekyll-import/drupal7.rb
     lib/jekyll/jekyll-import/enki.rb
+    lib/jekyll/jekyll-import/google_reader.rb
     lib/jekyll/jekyll-import/joomla.rb
     lib/jekyll/jekyll-import/marley.rb
     lib/jekyll/jekyll-import/mephisto.rb

data/lib/jekyll/commands/import.rb

@@ -10,6 +10,7 @@ module Jekyll
         :drupal7 => 'Drupal7',
         :enki => 'Enki',
         :joomla => 'Joomla',
+        :google_reader => 'GoogleReader',
         :marley => 'Marley',
         :mephisto => 'Mephisto',
         :mt => 'MT',

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

@@ -33,6 +33,8 @@ module JekyllImport
       if prefix != ''
         QUERY[" node "] = " " + prefix + "node "
         QUERY[" node_revisions "] = " " + prefix + "node_revisions "
+        QUERY[" term_node "] = " " + prefix + "term_node "
+        QUERY[" term_data "] = " " + prefix + "term_data "
       end
 
       FileUtils.mkdir_p "_posts"

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

@@ -22,7 +22,8 @@ module JekyllImport
              FROM node AS n, \
                   field_data_body AS fdb \
              WHERE (n.type = 'blog' OR n.type = 'story') \
-             AND n.vid = fdb.entity_id"
+             AND n.nid = fdb.entity_id \
+             AND n.vid = fdb.revision_id"
 
     def self.process(dbname, user, pass, host = 'localhost', prefix = '')
       db = Sequel.mysql(dbname, :user => user, :password => pass, :host => host, :encoding => 'utf8')

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

@@ -0,0 +1,61 @@
+# Usage:
+#   (Local file)
+#   ruby -r 'jekyll/jekyll-import/rss' -e "JekyllImport::GoogleReader.process(:source => './somefile/on/your/computer.xml')"
+
+require 'rss'
+require 'open-uri'
+require 'fileutils'
+require 'safe_yaml'
+
+require 'rexml/document'
+require 'date'
+
+module JekyllImport
+  module GoogleReader
+    def self.validate(options)
+      if !options[:source]
+        abort "Missing mandatory option --source."
+      end
+    end
+
+    # Process the import.
+    #
+    # source - a URL or a local file String.
+    #
+    # Returns nothing.
+    def self.process(options)
+      validate(options)
+
+      source = options[:source]
+
+      open(source) do |content|
+        feed = RSS::Parser.parse(content)
+
+        raise "There doesn't appear to be any RSS items at the source (#{source}) provided." unless feed
+
+        feed.items.each do |item|
+          title = item.title.content.to_s
+          formatted_date = Date.parse(item.published.to_s)
+          post_name = title.split(%r{ |!|/|:|&|-|$|,}).map do |i|
+            i.downcase if i != ''
+          end.compact.join('-')
+          name = "#{formatted_date}-#{post_name}" 
+
+          header = {
+            'layout' => 'post',
+            'title' => title
+          }
+
+          FileUtils.mkdir_p("_posts")
+
+          File.open("_posts/#{name}.html", "w") do |f|
+            f.puts header.to_yaml
+            f.puts "---\n\n"
+            f.puts item.content.content.to_s
+          end
+        end
+      end
+    end
+  end
+end
+

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

@@ -110,8 +110,12 @@ module JekyllImport
       end
       date = Date.parse(post['date']).to_s
       title = Nokogiri::HTML(title).text
-      slug = title.downcase.strip.gsub(' ', '-').gsub(/[^\w-]/, '')
-      slug = slug.slice(0..200) if slug.length > 200
+      slug = if post["slug"] && post["slug"].strip != ""
+        post["slug"]
+      else
+        slug = title.downcase.strip.gsub(' ', '-').gsub(/[^\w-]/, '')
+        slug.length > 200 ? slug.slice(0..200) : slug
+      end
       {
         :name => "#{date}-#{slug}.#{format}",
         :header => {
@@ -177,15 +181,14 @@ module JekyllImport
       }
     end
 
-    # Uses Python's html2text to convert a post's content to
-    # markdown. Preserve HTML tables as per the markdown docs.
+    # Convert preserving HTML tables as per the markdown docs.
     def self.html_to_markdown(content)
       preserve = ["table", "tr", "th", "td"]
       preserve.each do |tag|
         content.gsub!(/<#{tag}/i, "$$" + tag)
         content.gsub!(/<\/#{tag}/i, "||" + tag)
       end
-      content = %x[echo '#{content.gsub("'", "''")}' | html2text]
+      content = Nokogiri::HTML(content.gsub("'", "''")).text
       preserve.each do |tag|
         content.gsub!("$$" + tag, "<" + tag)
         content.gsub!("||" + tag, "</" + tag)

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

@@ -32,7 +32,8 @@ module JekyllImport
         end
 
         type = item.at('wp:post_type').inner_text
-        tags = (item/:category).map{|c| c.inner_text}.reject{|c| c == 'Uncategorized'}.uniq
+        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
 
         metas = Hash.new
         item.search("wp:postmeta").each do |meta|
@@ -45,6 +46,7 @@ module JekyllImport
         header = {
           'layout' => type,
           'title'  => title,
+          'categories' => categories,
           'tags'   => tags,
           'status'   => status,
           'type'   => type,

data/lib/jekyll-import.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-import
 version: !ruby/object:Gem::Version
-  version: 0.1.0.beta2
+  version: 0.1.0.beta3
 platform: ruby
 authors:
 - Tom Preston-Werner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-01 00:00:00.000000000 Z
+date: 2013-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -268,6 +268,7 @@ files:
 - lib/jekyll/jekyll-import/drupal6.rb
 - lib/jekyll/jekyll-import/drupal7.rb
 - lib/jekyll/jekyll-import/enki.rb
+- lib/jekyll/jekyll-import/google_reader.rb
 - lib/jekyll/jekyll-import/joomla.rb
 - lib/jekyll/jekyll-import/marley.rb
 - lib/jekyll/jekyll-import/mephisto.rb