jekyll-import 0.1.0.beta3 → 0.1.0.beta4

data/lib/jekyll/commands/import.rb

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

data/test/helper.rb

@@ -15,10 +15,12 @@ unless defined?(Test::Unit::AssertionFailedError)
   end
 end
 
-Dir.glob(File.expand_path('../../lib/jekyll/jekyll-import/*', __FILE__)).each do |f|
+Dir.glob(File.expand_path('../../lib/*.rb', __FILE__)).each do |f|
   require f
 end
 
+include JekyllImport
+
 # Send STDERR into the void to suppress program output messages
 STDERR.reopen(test(?e, '/dev/null') ? '/dev/null' : 'NUL:')
 

data/test/test_jrnl_importer.rb

@@ -0,0 +1,39 @@
+require 'helper'
+require 'time'
+
+class TestJrnlMigrator < Test::Unit::TestCase
+
+  context "jrnl" do
+    setup do
+      @journal = "2013-09-24 11:36 jrnl test case 1.\nThis is a test case for jekyll-import."
+      @entries = @journal.split("\n\n")
+      @entry = @entries.first.split("\n")
+      @date_length = Time.now().strftime("%Y-%m-%d %H:%M").length
+    end
+
+    should "have posts" do
+      assert_equal(1, @entries.size)
+    end
+
+    should "have content" do
+      assert_equal("This is a test case for jekyll-import.", Importers::Jrnl.get_post_content(@entry))
+    end
+
+    should "have date" do
+      assert_equal("2013-09-24 11:36", Importers::Jrnl.get_date(@entry[0], @date_length))
+    end
+
+    should "have title" do
+      assert_equal("jrnl test case 1.", Importers::Jrnl.get_title(@entry[0], @date_length))
+    end
+
+    should "have slug" do
+      assert_equal("jrnl-test-case-1", Importers::Jrnl.create_slug(Importers::Jrnl.get_title(@entry[0], @date_length)))
+    end
+
+    should "have filename" do
+      assert_equal("2013-09-24-jrnl-test-case-1.md", Importers::Jrnl.create_filename(Importers::Jrnl.get_date(@entry[0], @date_length), Importers::Jrnl.create_slug(Importers::Jrnl.get_title(@entry[0], @date_length)), 'md'))
+    end
+
+  end
+end

data/test/test_mt_importer.rb

@@ -8,7 +8,7 @@ class TestMTMigrator < Test::Unit::TestCase
     {
       :entry_id => 1,
       :entry_blog_id => 1,
-      :entry_status => JekyllImport::MT::STATUS_PUBLISHED,
+      :entry_status => Importers::MT::STATUS_PUBLISHED,
       :entry_author_id => 1,
       :entry_allow_comments => 0,
       :entry_allow_pings => 0,
@@ -38,67 +38,67 @@ class TestMTMigrator < Test::Unit::TestCase
   end
 
   should "set layout to post" do
-    assert_equal("post", JekyllImport::MT.post_metadata(stub_entry_row)["layout"])
+    assert_equal("post", Importers::MT.post_metadata(stub_entry_row)["layout"])
   end
 
   should "extract authored_on as date, formatted as 'YYYY-MM-DD HH:MM:SS Z'" do
     post = stub_entry_row
     expected_date = post[:entry_authored_on].strftime('%Y-%m-%d %H:%M:%S %z')
-    assert_equal(expected_date, JekyllImport::MT.post_metadata(post)["date"])
+    assert_equal(expected_date, Importers::MT.post_metadata(post)["date"])
   end
 
   should "extract entry_excerpt as excerpt" do
     post = stub_entry_row
-    assert_equal(post[:entry_excerpt], JekyllImport::MT.post_metadata(post)["excerpt"])
+    assert_equal(post[:entry_excerpt], Importers::MT.post_metadata(post)["excerpt"])
   end
 
   should "extract entry_id as mt_id" do
     post = stub_entry_row(:entry_id => 123)
-    assert_equal(123, JekyllImport::MT.post_metadata(post)["mt_id"])
+    assert_equal(123, Importers::MT.post_metadata(post)["mt_id"])
   end
 
   should "extract entry_title as title" do
     post = stub_entry_row
-    assert_equal(post[:entry_title], JekyllImport::MT.post_metadata(post)["title"])
+    assert_equal(post[:entry_title], Importers::MT.post_metadata(post)["title"])
   end
 
   should "set published to false if entry_status is not published" do
-    post = stub_entry_row(:entry_status => JekyllImport::MT::STATUS_DRAFT)
-    assert_equal(false, JekyllImport::MT.post_metadata(post)["published"])
+    post = stub_entry_row(:entry_status => Importers::MT::STATUS_DRAFT)
+    assert_equal(false, Importers::MT.post_metadata(post)["published"])
   end
 
   should "not set published if entry_status is published" do
-    post = stub_entry_row(:entry_status => JekyllImport::MT::STATUS_PUBLISHED)
-    assert_equal(nil, JekyllImport::MT.post_metadata(post)["published"])
+    post = stub_entry_row(:entry_status => Importers::MT::STATUS_PUBLISHED)
+    assert_equal(nil, Importers::MT.post_metadata(post)["published"])
   end
 
   should "include entry_text" do
     post = stub_entry_row
-    assert JekyllImport::MT.post_content(post).include?(post[:entry_text])
+    assert Importers::MT.post_content(post).include?(post[:entry_text])
   end
 
   should "include entry_text_more" do
     post = stub_entry_row
-    assert JekyllImport::MT.post_content(post).include?(post[:entry_text_more])
+    assert Importers::MT.post_content(post).include?(post[:entry_text_more])
   end
 
   should "include a <!--MORE--> separator when there is entry_text_more" do
     post = stub_entry_row(:entry_text_more => "Some more entry")
-    assert JekyllImport::MT.post_content(post).include?(JekyllImport::MT::MORE_CONTENT_SEPARATOR)
+    assert Importers::MT.post_content(post).include?(Importers::MT::MORE_CONTENT_SEPARATOR)
   end
 
   should "not include a <!--MORE--> separator when there is no entry_text_more" do
     post = stub_entry_row(:entry_text_more => "")
-    assert !JekyllImport::MT.post_content(post).include?(JekyllImport::MT::MORE_CONTENT_SEPARATOR)
+    assert !Importers::MT.post_content(post).include?(Importers::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 -00:00").utc)
-    assert JekyllImport::MT.post_file_name(post).include?("2013-01-02")
+    assert Importers::MT.post_file_name(post).include?("2013-01-02")
   end
 
   should "include entry_basename in the file name" do
     post = stub_entry_row(:entry_basename => "my_blog-entry")
-    assert JekyllImport::MT.post_file_name(post).include?("my_blog-entry")
+    assert Importers::MT.post_file_name(post).include?("my_blog-entry")
   end
 end

data/test/test_tumblr_importer.rb

@@ -0,0 +1,61 @@
+require 'helper'
+require 'json'
+
+class TestTumblrImporter < Test::Unit::TestCase
+
+	context "A Tumblr blog" do
+		setup do
+      Importers::Tumblr.require_deps
+			@jsonPayload = '{"tumblelog":{"title":"JekyllImport","description":"Jekyll Importer Test.","name":"JekyllImport","timezone":"Canada\/Atlantic","cname":"https://github.com/jekyll/jekyll-import/","feeds":[]},"posts-start":0,"posts-total":"1","posts-type":false,"posts":[{"id":54759400073,"url":"https:\/\/github.com\/post\/54759400073","url-with-slug":"http:\/\/github.com\/post\/54759400073\/jekyll-test","type":"regular","date-gmt":"2013-07-06 16:27:23 GMT","date":"Sat, 06 Jul 2013 13:27:23","bookmarklet":null,"mobile":null,"feed-item":"","from-feed-id":0,"unix-timestamp":1373128043,"format":"html","reblog-key":"0L6yPcHr","slug":"jekyll-test","regular-title":"Jekyll: Test","regular-body":"<p>Testing...<\/p>","tags":["jekyll"]}]}'
+			@posts = JSON.parse(@jsonPayload)
+		end
+
+		should "have a post" do
+			assert_equal(1, @posts["posts"].size)
+	    end
+
+	    should "have a regular post" do
+	    	assert_equal("regular", @posts['posts'][0]['type'])
+	    end
+
+	    should "convert post into hash" do
+	    	batch = @posts["posts"].map { |post| Importers::Tumblr.post_to_hash(post, 'html') }
+	    	refute_nil(batch, "a batch with a valid post should exist")
+	    end
+
+	    should "have a hash with a valid name" do
+	    	batch = @posts["posts"].map { |post| Importers::Tumblr.post_to_hash(post, 'html') }
+	    	assert_equal("2013-07-06-jekyll-test.html", batch[0][:name])
+	    end
+
+	    should "have a hash with a valid layout" do
+	    	batch = @posts["posts"].map { |post| Importers::Tumblr.post_to_hash(post, 'html') }
+	    	assert_equal("post", batch[0][:header]['layout'])
+	    end
+
+	    should "have a hash with a valid title" do
+	    	batch = @posts["posts"].map { |post| Importers::Tumblr.post_to_hash(post, 'html') }
+	    	assert_equal("Jekyll: Test", batch[0][:header]['title'])
+	    end
+
+	    should "have a hash with valid tags" do
+	    	batch = @posts["posts"].map { |post| Importers::Tumblr.post_to_hash(post, 'html') }
+	    	assert_equal("jekyll", batch[0][:header]['tags'][0])
+	    end
+
+	    should "have a hash with valid content" do
+	    	batch = @posts["posts"].map { |post| Importers::Tumblr.post_to_hash(post, 'html') }
+	    	assert_equal("<p>Testing...</p>", batch[0][:content])
+	    end
+
+	    should "have a hash with a valid url" do
+	    	batch = @posts["posts"].map { |post| Importers::Tumblr.post_to_hash(post, 'html') }
+	    	assert_equal("https://github.com/post/54759400073", batch[0][:url])
+	    end
+
+	    should "have a hash with a valid slug" do
+	    	batch = @posts["posts"].map { |post| Importers::Tumblr.post_to_hash(post, 'html') }
+	    	assert_equal("http://github.com/post/54759400073/jekyll-test", batch[0][:slug])
+	    end
+	end
+end

data/test/test_wordpress_importer.rb

@@ -4,6 +4,6 @@ require 'htmlentities'
 class TestWordpressMigrator < Test::Unit::TestCase
   should "clean slashes from slugs" do
     test_title = "blogs part 1/2"
-    assert_equal("blogs-part-1-2", JekyllImport::WordPress.sluggify(test_title))
+    assert_equal("blogs-part-1-2", Importers::WordPress.sluggify(test_title))
   end
 end

data/test/test_wordpressdotcom_importer.rb

@@ -3,6 +3,6 @@ require 'helper'
 class TestWordpressDotComMigrator < Test::Unit::TestCase
   should "clean slashes from slugs" do
     test_title = "blogs part 1/2"
-    assert_equal("blogs-part-1-2", JekyllImport::WordpressDotCom.sluggify(test_title))
+    assert_equal("blogs-part-1-2", Importers::WordpressDotCom.sluggify(test_title))
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-import
 version: !ruby/object:Gem::Version
-  version: 0.1.0.beta3
+  version: 0.1.0.beta4
 platform: ruby
 authors:
 - Tom Preston-Werner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-14 00:00:00.000000000 Z
+date: 2013-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -16,40 +16,40 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: fastercsv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.9.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.9.7
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 10.0.3
+        version: 10.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 10.0.3
+        version: 10.1.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -248,6 +248,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.12'
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.3'
 description: Provides the Import command for Jekyll.
 email: tom@mojombo.com
 executables: []
@@ -263,29 +277,34 @@ files:
 - Rakefile
 - jekyll-import.gemspec
 - lib/jekyll-import.rb
+- lib/jekyll-import/importer.rb
+- lib/jekyll-import/importers.rb
+- lib/jekyll-import/importers/csv.rb
+- lib/jekyll-import/importers/drupal6.rb
+- lib/jekyll-import/importers/drupal7.rb
+- lib/jekyll-import/importers/enki.rb
+- lib/jekyll-import/importers/google_reader.rb
+- lib/jekyll-import/importers/joomla.rb
+- lib/jekyll-import/importers/jrnl.rb
+- lib/jekyll-import/importers/marley.rb
+- lib/jekyll-import/importers/mephisto.rb
+- lib/jekyll-import/importers/mt.rb
+- lib/jekyll-import/importers/posterous.rb
+- lib/jekyll-import/importers/rss.rb
+- lib/jekyll-import/importers/s9y.rb
+- lib/jekyll-import/importers/textpattern.rb
+- lib/jekyll-import/importers/tumblr.rb
+- lib/jekyll-import/importers/typo.rb
+- lib/jekyll-import/importers/wordpress.rb
+- lib/jekyll-import/importers/wordpressdotcom.rb
 - lib/jekyll/commands/import.rb
-- lib/jekyll/jekyll-import/csv.rb
-- 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
-- lib/jekyll/jekyll-import/mt.rb
-- lib/jekyll/jekyll-import/posterous.rb
-- lib/jekyll/jekyll-import/rss.rb
-- lib/jekyll/jekyll-import/s9y.rb
-- lib/jekyll/jekyll-import/textpattern.rb
-- lib/jekyll/jekyll-import/tumblr.rb
-- lib/jekyll/jekyll-import/typo.rb
-- lib/jekyll/jekyll-import/wordpress.rb
-- lib/jekyll/jekyll-import/wordpressdotcom.rb
 - test/helper.rb
+- test/test_jrnl_importer.rb
 - test/test_mt_importer.rb
+- test/test_tumblr_importer.rb
 - test/test_wordpress_importer.rb
 - test/test_wordpressdotcom_importer.rb
-homepage: http://github.com/mojombo/jekyll-import
+homepage: http://github.com/jekyll/jekyll-import
 licenses: []
 metadata: {}
 post_install_message: 
@@ -295,12 +314,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>'
+  - - '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
@@ -310,6 +329,8 @@ signing_key:
 specification_version: 2
 summary: Import command for Jekyll (static site generator).
 test_files:
+- test/test_jrnl_importer.rb
 - test/test_mt_importer.rb
+- test/test_tumblr_importer.rb
 - test/test_wordpress_importer.rb
 - test/test_wordpressdotcom_importer.rb

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

@@ -1,30 +0,0 @@
-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(options)
-      file = options[:file] || "posts.csv"
-      FileUtils.mkdir_p "_posts"
-      posts = 0
-      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")
-        File.open("_posts/#{name}", "w") do |f|
-          f.puts <<-HEADER
----
-layout: post
-title: #{row[0]}
----
-
-          HEADER
-          f.puts row[2]
-        end
-      end
-      "Created #{posts} posts!"
-    end
-  end
-end