monad 0.0.2 → 0.0.3

data/test/test_post.rb

@@ -13,8 +13,8 @@ class TestPost < Test::Unit::TestCase
   context "A Post" do
     setup do
       clear_dest
-      stub(Monad).configuration { Monad::Configuration::DEFAULTS }
-      @site = Site.new(Monad.configuration)
+      stub(Jekyll).configuration { Jekyll::Configuration::DEFAULTS }
+      @site = Site.new(Jekyll.configuration)
     end
 
     should "ensure valid posts are valid" do
@@ -53,7 +53,7 @@ class TestPost < Test::Unit::TestCase
       end
 
       should "raise a good error on invalid post date" do
-        assert_raise Monad::FatalException do
+        assert_raise Jekyll::FatalException do
           @post.process("2009-27-03-foo-bar.textile")
         end
       end
@@ -139,7 +139,7 @@ class TestPost < Test::Unit::TestCase
             assert_equal "/2013/2008/09/09/foo-bar.html", @post.url
           end
         end
-        
+
         context "with specified layout of nil" do
           setup do
             file = '2013-01-12-nil-layout.textile'
@@ -267,9 +267,10 @@ class TestPost < Test::Unit::TestCase
       context "#excerpt" do
         setup do
           file = "2013-01-02-post-excerpt.markdown"
+          @post = setup_post(file)
           @post.process(file)
           @post.read_yaml(@source, file)
-          @post.transform
+          do_render(@post)
         end
 
         should "return first paragraph by default" do
@@ -279,11 +280,11 @@ class TestPost < Test::Unit::TestCase
         end
 
         should "correctly resolve link references" do
-          assert @post.excerpt.include?("www.monadrb.com"), "contains referenced link URL"
+          assert @post.excerpt.include?("www.jekyllrb.com"), "contains referenced link URL"
         end
 
         should "return rendered HTML" do
-          assert_equal "<p>First paragraph with <a href='http://www.monadrb.com/'>link ref</a>.</p>",
+          assert_equal "<p>First paragraph with <a href='http://www.jekyllrb.com/'>link ref</a>.</p>",
                        @post.excerpt
         end
 
@@ -332,8 +333,8 @@ class TestPost < Test::Unit::TestCase
     context "when in a site" do
       setup do
         clear_dest
-        stub(Monad).configuration { Monad::Configuration::DEFAULTS }
-        @site = Site.new(Monad.configuration)
+        stub(Jekyll).configuration { Jekyll::Configuration::DEFAULTS }
+        @site = Site.new(Jekyll.configuration)
         @site.posts = [setup_post('2008-02-02-published.textile'),
                        setup_post('2009-01-27-categories.textile')]
       end
@@ -422,7 +423,7 @@ class TestPost < Test::Unit::TestCase
         post = setup_post("2009-01-27-empty-categories.textile")
         assert_equal [], post.categories
       end
-      
+
       should "recognize number category in yaml" do
         post = setup_post("2013-05-10-number-category.textile")
         assert post.categories.include?('2013')
@@ -440,7 +441,7 @@ class TestPost < Test::Unit::TestCase
         assert post.tags.include?('cooking')
         assert post.tags.include?('pizza')
       end
-      
+
       should "recognize empty tag in yaml" do
         post = setup_post("2009-05-18-empty-tag.textile")
         assert_equal [], post.tags
@@ -528,46 +529,53 @@ class TestPost < Test::Unit::TestCase
       assert_equal ['foo'], post.categories
     end
   end
-  
+
   context "converter file extension settings" do
     setup do
-      stub(Monad).configuration { Monad::Configuration::DEFAULTS }
-      @site = Site.new(Monad.configuration)
+      stub(Jekyll).configuration { Jekyll::Configuration::DEFAULTS }
+      @site = Site.new(Jekyll.configuration)
     end
-    
+
     should "process .md as markdown under default configuration" do
       post = setup_post '2011-04-12-md-extension.md'
       conv = post.converter
-      assert conv.kind_of? Monad::Converters::Markdown
+      assert conv.kind_of? Jekyll::Converters::Markdown
     end
-    
+
     should "process .text as identity under default configuration" do
       post = setup_post '2011-04-12-text-extension.text'
       conv = post.converter
-      assert conv.kind_of? Monad::Converters::Identity
+      assert conv.kind_of? Jekyll::Converters::Identity
     end
-    
+
     should "process .text as markdown under alternate configuration" do
       @site.config['markdown_ext'] = 'markdown,mdw,mdwn,md,text'
       post = setup_post '2011-04-12-text-extension.text'
       conv = post.converter
-      assert conv.kind_of? Monad::Converters::Markdown
+      assert conv.kind_of? Jekyll::Converters::Markdown
     end
-    
+
     should "process .md as markdown under alternate configuration" do
       @site.config['markdown_ext'] = 'markdown,mkd,mkdn,md,text'
       post = setup_post '2011-04-12-text-extension.text'
       conv = post.converter
-      assert conv.kind_of? Monad::Converters::Markdown
+      assert conv.kind_of? Jekyll::Converters::Markdown
+    end
+
+    should "process .mkdn under text if it is not in the markdown config" do
+      @site.config['markdown_ext'] = 'markdown,mkd,md,text'
+      post = setup_post '2013-08-01-mkdn-extension.mkdn'
+      conv = post.converter
+      assert conv.kind_of? Jekyll::Converters::Identity
     end
-    
+
     should "process .text as textile under alternate configuration" do
       @site.config['textile_ext'] = 'textile,text'
       post = setup_post '2011-04-12-text-extension.text'
       conv = post.converter
-      assert conv.kind_of? Monad::Converters::Textile
+      assert conv.kind_of? Jekyll::Converters::Textile
     end
-    
+
   end
-  
+
 end

data/test/test_redcloth.rb

@@ -6,7 +6,7 @@ class TestRedCloth < Test::Unit::TestCase
     setup do
       @textile = Converters::Textile.new
     end
-    
+
     should "preserve single line breaks in HTML output" do 
       assert_equal "<p>line1<br />\nline2</p>", @textile.convert("p. line1\nline2").strip
     end
@@ -19,7 +19,7 @@ class TestRedCloth < Test::Unit::TestCase
         }
       @textile = Converters::Textile.new config
     end
-    
+
     should "preserve single line breaks in HTML output" do 
       assert_equal "<p>line1<br />\nline2</p>", @textile.convert("p. line1\nline2").strip
     end
@@ -34,7 +34,7 @@ class TestRedCloth < Test::Unit::TestCase
       }
       @textile = Converters::Textile.new config
     end
-    
+
     should "preserve single line breaks in HTML output" do 
       assert_equal "<p>line1<br />\nline2</p>", @textile.convert("p. line1\nline2").strip
     end

data/test/test_related_posts.rb

@@ -0,0 +1,47 @@
+require 'helper'
+
+class TestRelatedPosts < Test::Unit::TestCase
+  context "building related posts without lsi" do
+    setup do
+      stub(Jekyll).configuration do
+        Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir,
+                                               'destination' => dest_dir})
+      end
+      @site = Site.new(Jekyll.configuration)
+    end
+
+    should "use the most recent posts for related posts" do
+      @site.reset
+      @site.read
+
+      last_post     = @site.posts.last
+      related_posts = Jekyll::RelatedPosts.new(last_post).build
+
+      last_10_recent_posts = (@site.posts.reverse - [last_post]).first(10)
+      assert_equal last_10_recent_posts, related_posts
+    end
+  end
+
+  context "building related posts with lsi" do
+    setup do
+      stub(Jekyll).configuration do
+        Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir,
+                                               'destination' => dest_dir,
+                                               'lsi' => true})
+      end
+      any_instance_of(Jekyll::RelatedPosts) { |i| stub(i).display }
+      @site = Site.new(Jekyll.configuration)
+    end
+
+    should "use lsi for the related posts" do
+      @site.reset
+      @site.read
+      require 'classifier'
+      any_instance_of(::Classifier::LSI) do |c|
+        stub(c).find_related { @site.posts[-1..-9] }
+        stub(c).build_index
+      end
+      assert_equal @site.posts[-1..-9], Jekyll::RelatedPosts.new(@site.posts.last).build
+    end
+  end
+end

data/test/test_site.rb

@@ -3,51 +3,51 @@ require 'helper'
 class TestSite < Test::Unit::TestCase
   context "configuring sites" do
     should "have an array for plugins by default" do
-      site = Site.new(Monad::Configuration::DEFAULTS)
+      site = Site.new(Jekyll::Configuration::DEFAULTS)
       assert_equal [File.join(Dir.pwd, '_plugins')], site.plugins
     end
 
     should "look for plugins under the site directory by default" do
-      site = Site.new(Monad::Configuration::DEFAULTS.merge({'source' => File.expand_path(source_dir)}))
+      site = Site.new(Jekyll::Configuration::DEFAULTS.merge({'source' => File.expand_path(source_dir)}))
       assert_equal [File.join(source_dir, '_plugins')], site.plugins
     end
 
     should "have an array for plugins if passed as a string" do
-      site = Site.new(Monad::Configuration::DEFAULTS.merge({'plugins' => '/tmp/plugins'}))
+      site = Site.new(Jekyll::Configuration::DEFAULTS.merge({'plugins' => '/tmp/plugins'}))
       assert_equal ['/tmp/plugins'], site.plugins
     end
 
     should "have an array for plugins if passed as an array" do
-      site = Site.new(Monad::Configuration::DEFAULTS.merge({'plugins' => ['/tmp/plugins', '/tmp/otherplugins']}))
+      site = Site.new(Jekyll::Configuration::DEFAULTS.merge({'plugins' => ['/tmp/plugins', '/tmp/otherplugins']}))
       assert_equal ['/tmp/plugins', '/tmp/otherplugins'], site.plugins
     end
 
     should "have an empty array for plugins if nothing is passed" do
-      site = Site.new(Monad::Configuration::DEFAULTS.merge({'plugins' => []}))
+      site = Site.new(Jekyll::Configuration::DEFAULTS.merge({'plugins' => []}))
       assert_equal [], site.plugins
     end
 
     should "have an empty array for plugins if nil is passed" do
-      site = Site.new(Monad::Configuration::DEFAULTS.merge({'plugins' => nil}))
+      site = Site.new(Jekyll::Configuration::DEFAULTS.merge({'plugins' => nil}))
       assert_equal [], site.plugins
     end
 
     should "expose default baseurl" do
-      site = Site.new(Monad::Configuration::DEFAULTS)
-      assert_equal Monad::Configuration::DEFAULTS['baseurl'], site.baseurl
+      site = Site.new(Jekyll::Configuration::DEFAULTS)
+      assert_equal Jekyll::Configuration::DEFAULTS['baseurl'], site.baseurl
     end
 
     should "expose baseurl passed in from config" do
-      site = Site.new(Monad::Configuration::DEFAULTS.merge({'baseurl' => '/blog'}))
+      site = Site.new(Jekyll::Configuration::DEFAULTS.merge({'baseurl' => '/blog'}))
       assert_equal '/blog', site.baseurl
     end
   end
   context "creating sites" do
     setup do
-      stub(Monad).configuration do
-        Monad::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir})
+      stub(Jekyll).configuration do
+        Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir})
       end
-      @site = Site.new(Monad.configuration)
+      @site = Site.new(Jekyll.configuration)
       @num_invalid_posts = 2
     end
 
@@ -156,7 +156,7 @@ class TestSite < Test::Unit::TestCase
 
     should "read layouts" do
       @site.read_layouts
-      assert_equal ["default", "simple"].sort, @site.layouts.keys.sort
+      assert_equal ["default", "simple", "post/simple"].sort, @site.layouts.keys.sort
     end
 
     should "read posts" do
@@ -195,7 +195,7 @@ class TestSite < Test::Unit::TestCase
       @site.exclude = excludes + ["exclude*"]
       assert_equal files, @site.filter_entries(excludes + files + ["excludeA"])
     end
-    
+
     should "not filter entries within include" do
       includes = %w[_index.html .htaccess include*]
       files = %w[index.html _index.html .htaccess includeA]
@@ -205,10 +205,10 @@ class TestSite < Test::Unit::TestCase
     end
 
     should "filter symlink entries when safe mode enabled" do
-      stub(Monad).configuration do
-        Monad::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'safe' => true})
+      stub(Jekyll).configuration do
+        Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'safe' => true})
       end
-      site = Site.new(Monad.configuration)
+      site = Site.new(Jekyll.configuration)
       stub(File).symlink?('symlink.js') {true}
       files = %w[symlink.js]
       assert_equal [], site.filter_entries(files)
@@ -221,10 +221,10 @@ class TestSite < Test::Unit::TestCase
     end
 
     should "not include symlinks in safe mode" do
-      stub(Monad).configuration do
-        Monad::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'safe' => true})
+      stub(Jekyll).configuration do
+        Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'safe' => true})
       end
-      site = Site.new(Monad.configuration)
+      site = Site.new(Jekyll.configuration)
 
       site.read_directories("symlink-test")
       assert_equal [], site.pages
@@ -232,10 +232,10 @@ class TestSite < Test::Unit::TestCase
     end
 
     should "include symlinks in unsafe mode" do
-      stub(Monad).configuration do
-        Monad::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'safe' => false})
+      stub(Jekyll).configuration do
+        Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'safe' => false})
       end
-      site = Site.new(Monad.configuration)
+      site = Site.new(Jekyll.configuration)
 
       site.read_directories("symlink-test")
       assert_not_equal [], site.pages
@@ -244,22 +244,22 @@ class TestSite < Test::Unit::TestCase
 
     context 'error handling' do
       should "raise if destination is included in source" do
-        stub(Monad).configuration do
-          Monad::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => source_dir})
+        stub(Jekyll).configuration do
+          Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => source_dir})
         end
 
-        assert_raise Monad::FatalException do
-          site = Site.new(Monad.configuration)
+        assert_raise Jekyll::FatalException do
+          site = Site.new(Jekyll.configuration)
         end
       end
 
       should "raise if destination is source" do
-        stub(Monad).configuration do
-          Monad::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => File.join(source_dir, "..")})
+        stub(Jekyll).configuration do
+          Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => File.join(source_dir, "..")})
         end
 
-        assert_raise Monad::FatalException do
-          site = Site.new(Monad.configuration)
+        assert_raise Jekyll::FatalException do
+          site = Site.new(Jekyll.configuration)
         end
       end
     end
@@ -284,7 +284,7 @@ class TestSite < Test::Unit::TestCase
         File.open(dest_dir('.svn/HEAD'), 'w')
         File.open(dest_dir('.hg/HEAD'), 'w')
       end
-      
+
       teardown do
         FileUtils.rm_f(dest_dir('obsolete.html'))
         FileUtils.rm_rf(dest_dir('qux'))
@@ -293,7 +293,7 @@ class TestSite < Test::Unit::TestCase
         FileUtils.rm_rf(dest_dir('.svn'))
         FileUtils.rm_rf(dest_dir('.hg'))
       end
-      
+
       should 'remove orphaned files in destination' do
         @site.process
         assert !File.exist?(dest_dir('obsolete.html'))
@@ -304,7 +304,7 @@ class TestSite < Test::Unit::TestCase
       end
 
       should 'remove orphaned files in destination - keep_files .svn' do
-        config = Monad::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'keep_files' => ['.svn']})
+        config = Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'keep_files' => ['.svn']})
         @site = Site.new(config)
         @site.process
         assert !File.exist?(dest_dir('.htpasswd'))
@@ -317,39 +317,97 @@ class TestSite < Test::Unit::TestCase
         assert File.exist?(dest_dir('.svn/HEAD'))
       end
     end
-    
+
     context 'with an invalid markdown processor in the configuration' do
       should 'not throw an error at initialization time' do
         bad_processor = 'not a processor name'
         assert_nothing_raised do
-          Site.new(Monad.configuration.merge({ 'markdown' => bad_processor }))
+          Site.new(Jekyll.configuration.merge({ 'markdown' => bad_processor }))
         end
       end
-      
+
       should 'throw FatalException at process time' do
         bad_processor = 'not a processor name'
-        s = Site.new(Monad.configuration.merge({ 'markdown' => bad_processor }))
-        assert_raise Monad::FatalException do
+        s = Site.new(Jekyll.configuration.merge({ 'markdown' => bad_processor }))
+        assert_raise Jekyll::FatalException do
           s.process
         end
       end
     end
-    
+
+    context 'data directory' do
+      should 'auto load yaml files' do
+        site = Site.new(Jekyll.configuration)
+        site.process
+
+        file_content = YAML.safe_load_file(File.join(source_dir, '_data', 'members.yaml'))
+
+        assert_equal site.data['members'], file_content
+        assert_equal site.site_payload['site']['data']['members'], file_content
+      end
+
+      should 'auto load yml files' do
+        site = Site.new(Jekyll.configuration)
+        site.process
+
+        file_content = YAML.safe_load_file(File.join(source_dir, '_data', 'languages.yml'))
+
+        assert_equal site.data['languages'], file_content
+        assert_equal site.site_payload['site']['data']['languages'], file_content
+      end
+
+      should "load symlink files in unsafe mode" do
+        site = Site.new(Jekyll.configuration.merge({'safe' => false}))
+        site.process
+
+        file_content = YAML.safe_load_file(File.join(source_dir, '_data', 'products.yml'))
+
+        assert_equal site.data['products'], file_content
+        assert_equal site.site_payload['site']['data']['products'], file_content
+      end
+
+      should "not load symlink files in safe mode" do
+        site = Site.new(Jekyll.configuration.merge({'safe' => true}))
+        site.process
+
+        assert_nil site.data['products']
+        assert_nil site.site_payload['site']['data']['products']
+      end
+
+      should "load symlink directory in unsafe mode" do
+        site = Site.new(Jekyll.configuration.merge({'safe' => false, 'data_source' => File.join('symlink-test', '_data')}))
+        site.process
+
+        assert_not_nil site.data['products']
+        assert_not_nil site.data['languages']
+        assert_not_nil site.data['members']
+      end
+
+      should "not load symlink directory in safe mode" do
+        site = Site.new(Jekyll.configuration.merge({'safe' => true, 'data_source' => File.join('symlink-test', '_data')}))
+        site.process
+
+        assert_nil site.data['products']
+        assert_nil site.data['languages']
+        assert_nil site.data['members']
+      end
+    end
+
     context 'data sources' do
       should 'not throw exception if data sources is nil' do
         assert_nothing_raised do
-          Site.new(Monad.configuration.merge({ 'data_sources' => nil }))
+          Site.new(Jekyll.configuration.merge({ 'data_sources' => nil }))
         end
       end
 
       should 'not throw exception if data sources is empty' do
         assert_nothing_raised do
-          Site.new(Monad.configuration.merge({ 'data_sources' => [] }))
+          Site.new(Jekyll.configuration.merge({ 'data_sources' => [] }))
         end
       end
 
       should 'load one data source' do
-        site = Site.new(Monad.configuration.merge({ 'data_sources' => [{'name' => 'jsonip', 'type' => 'json', 'url' => 'http://jsonip.com/'}] }))
+        site = Site.new(Jekyll.configuration.merge({ 'data_sources' => [{'name' => 'jsonip', 'type' => 'json', 'url' => 'http://jsonip.com/'}] }))
         site.process
 
         assert_not_nil site.data_sources['jsonip']['ip']
@@ -362,7 +420,7 @@ class TestSite < Test::Unit::TestCase
         base = File.expand_path('../fixtures', __FILE__)
         members = {'name' => 'members', 'type' => 'yaml', 'path' => File.join(base, 'members.yaml')}
 
-        site = Site.new(Monad.configuration.merge({ 'data_sources' => [jsonip, members] }))
+        site = Site.new(Jekyll.configuration.merge({ 'data_sources' => [jsonip, members] }))
         site.process
 
         assert_not_nil site.data_sources['jsonip']['ip']