monad 0.0.2 → 0.0.3

data/test/test_excerpt.rb

@@ -0,0 +1,78 @@
+require 'helper'
+
+class TestExcerpt < Test::Unit::TestCase
+  def setup_post(file)
+    Post.new(@site, source_dir, '', file)
+  end
+
+  def do_render(post)
+    layouts = { "default" => Layout.new(@site, source_dir('_layouts'), "simple.html")}
+    post.render(layouts, {"site" => {"posts" => []}})
+  end
+
+  context "With extraction disabled" do
+    setup do
+      clear_dest
+      stub(Jekyll).configuration do
+        Jekyll::Configuration::DEFAULTS.merge({'excerpt_separator' => ''})
+      end
+      @site = Site.new(Jekyll.configuration)
+      @post = setup_post("2013-07-22-post-excerpt-with-layout.markdown")
+    end
+
+    should "not be generated" do
+      excerpt = @post.send(:extract_excerpt)
+      assert_equal true, excerpt.empty?
+    end
+  end
+
+  context "An extracted excerpt" do
+    setup do
+      clear_dest
+      stub(Jekyll).configuration { Jekyll::Configuration::DEFAULTS }
+      @site = Site.new(Jekyll.configuration)
+      @post = setup_post("2013-07-22-post-excerpt-with-layout.markdown")
+      @excerpt = @post.send :extract_excerpt
+    end
+
+    context "#to_liquid" do
+      should "contain the proper page data to mimick the post liquid" do
+        assert_equal "Post Excerpt with Layout", @excerpt.to_liquid["title"]
+        assert_equal "/bar/baz/z_category/2013/07/22/post-excerpt-with-layout.html", @excerpt.to_liquid["url"]
+        assert_equal Time.parse("2013-07-22"), @excerpt.to_liquid["date"]
+        assert_equal %w[bar baz z_category], @excerpt.to_liquid["categories"]
+        assert_equal %w[first second third jekyllrb.com], @excerpt.to_liquid["tags"]
+        assert_equal "_posts/2013-07-22-post-excerpt-with-layout.markdown", @excerpt.to_liquid["path"]
+      end
+    end
+
+    context "#content" do
+
+      context "before render" do
+        should "be the first paragraph of the page" do
+          assert_equal "First paragraph with [link ref][link].\n\n[link]: http://www.jekyllrb.com/", @excerpt.content
+        end
+
+        should "contain any refs at the bottom of the page" do
+          assert @excerpt.content.include?("[link]: http://www.jekyllrb.com/")
+        end
+      end
+
+      context "after render" do
+        setup do
+          @rendered_post = @post.dup
+          do_render(@rendered_post)
+          @extracted_excerpt = @rendered_post.send :extracted_excerpt
+        end
+
+        should "be the first paragraph of the page" do
+          assert_equal "<p>First paragraph with <a href='http://www.jekyllrb.com/'>link ref</a>.</p>", @extracted_excerpt.content
+        end
+
+        should "link properly" do
+          assert @extracted_excerpt.content.include?("http://www.jekyllrb.com/")
+        end
+      end
+    end
+  end
+end

data/test/test_filters.rb

@@ -1,18 +1,18 @@
 require 'helper'
 
 class TestFilters < Test::Unit::TestCase
-  class MonadFilter
-    include Monad::Filters
+  class JekyllFilter
+    include Jekyll::Filters
 
     def initialize
-      site = Monad::Site.new(Monad.configuration({}))
+      site = Jekyll::Site.new(Jekyll.configuration({}))
       @context = Liquid::Context.new({}, {}, { :site => site })
     end
   end
 
   context "filters" do
     setup do
-      @filter = MonadFilter.new
+      @filter = JekyllFilter.new
       @sample_time = Time.utc(2013, 03, 27, 11, 22, 33)
       @time_as_string = "September 11, 2001 12:46:30 -0000"
     end

data/test/test_generated_site.rb

@@ -4,17 +4,17 @@ class TestGeneratedSite < Test::Unit::TestCase
   context "generated sites" do
     setup do
       clear_dest
-      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)
       @site.process
       @index = File.read(dest_dir('index.html'))
     end
 
     should "ensure post count is as expected" do
-      assert_equal 34, @site.posts.size
+      assert_equal 36, @site.posts.size
     end
 
     should "insert site.posts into the index" do
@@ -45,11 +45,11 @@ class TestGeneratedSite < Test::Unit::TestCase
   context "generating limited posts" do
     setup do
       clear_dest
-      stub(Monad).configuration do
-        Monad::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'limit_posts' => 5})
+      stub(Jekyll).configuration do
+        Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'limit_posts' => 5})
       end
 
-      @site = Site.new(Monad.configuration)
+      @site = Site.new(Jekyll.configuration)
       @site.process
       @index = File.read(dest_dir('index.html'))
     end
@@ -61,22 +61,22 @@ class TestGeneratedSite < Test::Unit::TestCase
     should "ensure limit posts is 0 or more" do
       assert_raise ArgumentError do
         clear_dest
-        stub(Monad).configuration do
-          Monad::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'limit_posts' => -1})
+        stub(Jekyll).configuration do
+          Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'limit_posts' => -1})
         end
 
-        @site = Site.new(Monad.configuration)
+        @site = Site.new(Jekyll.configuration)
       end
     end
 
     should "acceptable limit post is 0" do
       assert_nothing_raised ArgumentError do
         clear_dest
-        stub(Monad).configuration do
-          Monad::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'limit_posts' => 0})
+        stub(Jekyll).configuration do
+          Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'limit_posts' => 0})
         end
 
-        @site = Site.new(Monad.configuration)
+        @site = Site.new(Jekyll.configuration)
       end
     end
   end

data/test/test_json_driver.rb

@@ -5,25 +5,25 @@ class TestJsonDriver < Test::Unit::TestCase
     context 'incorrect input' do
       should 'throw exception if url option is not parsed in' do
         assert_raise FatalException do
-          Monad::Drivers::JsonDriver.new({})
+          Jekyll::Drivers::JsonDriver.new({})
         end
       end
 
       should 'throw exception if url option is nil' do
-        assert_raise Monad::FatalException do
-          Monad::Drivers::JsonDriver.new('url' => nil)
+        assert_raise Jekyll::FatalException do
+          Jekyll::Drivers::JsonDriver.new('url' => nil)
         end
       end
 
       should 'throw exception if parsed in url is invalid' do
         assert_raise FatalException do
-          json_driver = Monad::Drivers::JsonDriver.new('url' => 'abc.com')
+          json_driver = Jekyll::Drivers::JsonDriver.new('url' => 'abc.com')
         end
       end
 
       should 'throw exception if parsed in url is not http' do
         assert_raise FatalException do
-          json_driver = Monad::Drivers::JsonDriver.new('url' => 'ftp://abc.com')
+          json_driver = Jekyll::Drivers::JsonDriver.new('url' => 'ftp://abc.com')
         end
       end
     end
@@ -31,14 +31,14 @@ class TestJsonDriver < Test::Unit::TestCase
     context 'incorrect environment' do
       should 'throw exception if server does not respond' do
         assert_raise Errno::ECONNREFUSED do
-          Monad::Drivers::JsonDriver.new('url' => 'http://127.0.0.1:1').load
+          Jekyll::Drivers::JsonDriver.new('url' => 'http://127.0.0.1:1').load
         end
       end
 
       should 'throw exception if server returns non-json content' do
         assert_raise JSON::ParserError do
           stub_http_request(:get, 'http://test.com/').to_return(body: 'hello, world')
-          Monad::Drivers::JsonDriver.new('url' => 'http://test.com/').load
+          Jekyll::Drivers::JsonDriver.new('url' => 'http://test.com/').load
         end
       end
     end
@@ -48,7 +48,7 @@ class TestJsonDriver < Test::Unit::TestCase
         assert_nothing_raised do
           stub_http_request(:get, 'http://test.com/').to_return(body: '{"ip": "127.0.0.1"}')
 
-          data = Monad::Drivers::JsonDriver.new('url' => 'http://test.com/').load
+          data = Jekyll::Drivers::JsonDriver.new('url' => 'http://test.com/').load
           assert_equal data['ip'], '127.0.0.1'
         end
       end
@@ -57,7 +57,7 @@ class TestJsonDriver < Test::Unit::TestCase
         assert_nothing_raised do
           stub_http_request(:get, 'https://test.com/').to_return(body: '{"city": "Nanjing"}')
 
-          data = Monad::Drivers::JsonDriver.new('url' => 'https://test.com/').load
+          data = Jekyll::Drivers::JsonDriver.new('url' => 'https://test.com/').load
           assert_equal data['city'], 'Nanjing'
         end
       end

data/test/test_kramdown.rb

@@ -12,24 +12,51 @@ class TestKramdown < Test::Unit::TestCase
           'footnote_nr'   => 1,
           'entity_output' => 'as_char',
           'toc_levels'    => '1..6',
-          'smart_quotes'  => 'lsquo,rsquo,ldquo,rdquo'
+          'smart_quotes'  => 'lsquo,rsquo,ldquo,rdquo',
+
+          'use_coderay'   => true,
+          'coderay_bold_every'=> 12,
+          'coderay' => {
+            'coderay_css'        => :style,
+            'coderay_bold_every' => 8
+          }
         }
       }
+      @config = Jekyll.configuration(@config)
+      @markdown = Converters::Markdown.new(@config)
     end
 
     # http://kramdown.rubyforge.org/converter/html.html#options
     should "pass kramdown options" do
-      markdown = Converters::Markdown.new(@config)
-      assert_equal "<h1>Some Header</h1>", markdown.convert('# Some Header #').strip
+      assert_equal "<h1>Some Header</h1>", @markdown.convert('# Some Header #').strip
     end
 
     should "convert quotes to smart quotes" do
-      markdown = Converters::Markdown.new(@config)
-      assert_match /<p>(&#8220;|“)Pit(&#8217;|’)hy(&#8221;|”)<\/p>/, markdown.convert(%{"Pit'hy"}).strip
+      assert_match /<p>(&#8220;|“)Pit(&#8217;|’)hy(&#8221;|”)<\/p>/, @markdown.convert(%{"Pit'hy"}).strip
 
       override = { 'kramdown' => { 'smart_quotes' => 'lsaquo,rsaquo,laquo,raquo' } }
       markdown = Converters::Markdown.new(@config.deep_merge(override))
       assert_match /<p>(&#171;|«)Pit(&#8250;|›)hy(&#187;|»)<\/p>/, markdown.convert(%{"Pit'hy"}).strip
     end
+
+    context "moving up nested coderay options" do
+      setup do
+        @markdown.convert('some markup')
+        @converter_config = @markdown.instance_variable_get(:@config)['kramdown']
+      end
+
+      should "work correctly" do
+        assert_equal :style, @converter_config['coderay_css']
+      end
+
+      should "also work for defaults" do
+        default = Jekyll::Configuration::DEFAULTS['kramdown']['coderay']['coderay_tab_width']
+        assert_equal default, @converter_config['coderay_tab_width']
+      end
+
+      should "not overwrite" do
+        assert_equal 12, @converter_config['coderay_bold_every']
+      end
+    end
   end
 end

data/test/test_new_command.rb

@@ -1,5 +1,5 @@
 require 'helper'
-require 'monad/commands/new'
+require 'jekyll/commands/new'
 
 class TestNewCommand < Test::Unit::TestCase
   def dir_contents(path)
@@ -25,13 +25,13 @@ class TestNewCommand < Test::Unit::TestCase
 
     should 'create a new directory' do
       assert !File.exists?(@full_path)
-      capture_stdout { Monad::Commands::New.process(@args) }
+      capture_stdout { Jekyll::Commands::New.process(@args) }
       assert File.exists?(@full_path)
     end
 
     should 'display a success message' do
-      output = capture_stdout { Monad::Commands::New.process(@args) }
-      success_message = "New monad site installed in #{@full_path}.\n"
+      output = capture_stdout { Jekyll::Commands::New.process(@args) }
+      success_message = "New jekyll site installed in #{@full_path}.\n"
       assert_equal success_message, output
     end
 
@@ -40,7 +40,7 @@ class TestNewCommand < Test::Unit::TestCase
         File.extname(f) == '.erb'
       end
 
-      capture_stdout { Monad::Commands::New.process(@args) }
+      capture_stdout { Jekyll::Commands::New.process(@args) }
 
       new_site_files = dir_contents(@full_path).reject do |f|
         File.extname(f) == '.markdown'
@@ -62,7 +62,7 @@ class TestNewCommand < Test::Unit::TestCase
         f.gsub! '0000-00-00', stubbed_date
       end
 
-      capture_stdout { Monad::Commands::New.process(@args) }
+      capture_stdout { Jekyll::Commands::New.process(@args) }
 
       new_site_files = dir_contents(@full_path).select do |f|
         erb_template_files.include? f
@@ -84,7 +84,7 @@ class TestNewCommand < Test::Unit::TestCase
 
     should 'create a new directory' do
       assert !File.exists?(@site_name_with_spaces)
-      capture_stdout { Monad::Commands::New.process(@multiple_args) }
+      capture_stdout { Jekyll::Commands::New.process(@multiple_args) }
       assert File.exists?(@site_name_with_spaces)
     end
   end
@@ -96,7 +96,7 @@ class TestNewCommand < Test::Unit::TestCase
 
     should 'raise an ArgumentError' do
       exception = assert_raise ArgumentError do
-        Monad::Commands::New.process(@empty_args)
+        Jekyll::Commands::New.process(@empty_args)
       end
       assert_equal 'You must specify a path.', exception.message
     end

data/test/test_page.rb

@@ -15,8 +15,8 @@ class TestPage < Test::Unit::TestCase
   context "A Page" 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
 
     context "processing pages" do
@@ -102,7 +102,7 @@ class TestPage < Test::Unit::TestCase
         assert_equal "/about/", @page.dir
       end
     end
-        
+
     context "with specified layout of nil" do
       setup do
         @page = setup_page('sitemap.xml')
@@ -127,6 +127,15 @@ class TestPage < Test::Unit::TestCase
         assert File.exists?(File.join(dest_dir, 'contacts.html'))
       end
 
+      should "write even when the folder name is plus and permalink has +" do
+        page = setup_page('+', 'foo.md')
+        do_render(page)
+        page.write(dest_dir)
+
+        assert File.directory?(dest_dir)
+        assert File.exists?(File.join(dest_dir, '+', 'plus+in+url'))
+      end
+
       should "write properly without html extension" do
         page = setup_page('contacts.html')
         page.site.permalink_style = :pretty

data/test/test_pager.rb

@@ -2,6 +2,17 @@ require 'helper'
 
 class TestPager < Test::Unit::TestCase
 
+  def build_site(config = {})
+    base = Jekyll::Configuration::DEFAULTS.deep_merge({
+      'source'      => source_dir,
+      'destination' => dest_dir,
+      'paginate'    => 1
+    })
+    site = Jekyll::Site.new(base.deep_merge(config))
+    site.process
+    site
+  end
+
   should "calculate number of pages" do
     assert_equal(0, Pager.calculate_pages([], '2'))
     assert_equal(1, Pager.calculate_pages([1], '2'))
@@ -11,43 +22,33 @@ class TestPager < Test::Unit::TestCase
     assert_equal(3, Pager.calculate_pages([1,2,3,4,5], '2'))
   end
 
-  context "pagination disabled" do
-    setup do
-      stub(Monad).configuration do
-        Monad::Configuration::DEFAULTS.merge({
-          'source'      => source_dir,
-          'destination' => dest_dir
-        })
-      end
-      @config = Monad.configuration
-    end
+  should "determine the pagination path" do
+    assert_equal("/index.html",  Pager.paginate_path(build_site, 1))
+    assert_equal("/page2",       Pager.paginate_path(build_site, 2))
+    assert_equal("/index.html",  Pager.paginate_path(build_site({'paginate_path' => '/blog/page-:num'}), 1))
+    assert_equal("/blog/page-2", Pager.paginate_path(build_site({'paginate_path' => '/blog/page-:num'}), 2))
+    assert_equal("/index.html",  Pager.paginate_path(build_site({'paginate_path' => '/blog/page/:num'}), 1))
+    assert_equal("/blog/page/2", Pager.paginate_path(build_site({'paginate_path' => '/blog/page/:num'}), 2))
+    assert_equal("/contacts/index.html", Pager.paginate_path(build_site({'paginate_path' => '/contacts/page:num'}), 1))
+    assert_equal("/contacts/page2",      Pager.paginate_path(build_site({'paginate_path' => '/contacts/page:num'}), 2))
+    assert_equal("/contacts/index.html", Pager.paginate_path(build_site({'paginate_path' => '/contacts/page/:num'}), 1))
+    assert_equal("/contacts/page/2",     Pager.paginate_path(build_site({'paginate_path' => '/contacts/page/:num'}), 2))
+  end
 
+  context "pagination disabled" do
     should "report that pagination is disabled" do
-      page = OpenStruct.new({ :name => 'index.html', :dir => '/' })
-      assert !Pager.pagination_enabled?(@config, page)
+      assert !Pager.pagination_enabled?(build_site('paginate' => nil))
     end
-
   end
 
   context "pagination enabled for 2" do
     setup do
-      stub(Monad).configuration do
-        Monad::Configuration::DEFAULTS.merge({
-          'source'      => source_dir,
-          'destination' => dest_dir,
-          'paginate'    => 2
-        })
-      end
-
-      @config = Monad.configuration
-      @site = Site.new(@config)
-      @site.process
+      @site  = build_site('paginate' => 2)
       @posts = @site.posts
     end
 
     should "report that pagination is enabled" do
-      page = OpenStruct.new({ :name => 'index.html', :dir => '/' })
-      assert Pager.pagination_enabled?(@config, page)
+      assert Pager.pagination_enabled?(@site)
     end
 
     context "with 4 posts" do
@@ -56,7 +57,7 @@ class TestPager < Test::Unit::TestCase
       end
 
       should "create first pager" do
-        pager = Pager.new(@config, 1, @posts)
+        pager = Pager.new(@site, 1, @posts)
         assert_equal(2, pager.posts.size)
         assert_equal(2, pager.total_pages)
         assert_nil(pager.previous_page)
@@ -64,7 +65,7 @@ class TestPager < Test::Unit::TestCase
       end
 
       should "create second pager" do
-        pager = Pager.new(@config, 2, @posts)
+        pager = Pager.new(@site, 2, @posts)
         assert_equal(2, pager.posts.size)
         assert_equal(2, pager.total_pages)
         assert_equal(1, pager.previous_page)
@@ -72,7 +73,7 @@ class TestPager < Test::Unit::TestCase
       end
 
       should "not create third pager" do
-        assert_raise(RuntimeError) { Pager.new(@config, 3, @posts) }
+        assert_raise(RuntimeError) { Pager.new(@site, 3, @posts) }
       end
 
     end
@@ -83,7 +84,7 @@ class TestPager < Test::Unit::TestCase
       end
 
       should "create first pager" do
-        pager = Pager.new(@config, 1, @posts)
+        pager = Pager.new(@site, 1, @posts)
         assert_equal(2, pager.posts.size)
         assert_equal(3, pager.total_pages)
         assert_nil(pager.previous_page)
@@ -91,7 +92,7 @@ class TestPager < Test::Unit::TestCase
       end
 
       should "create second pager" do
-        pager = Pager.new(@config, 2, @posts)
+        pager = Pager.new(@site, 2, @posts)
         assert_equal(2, pager.posts.size)
         assert_equal(3, pager.total_pages)
         assert_equal(1, pager.previous_page)
@@ -99,7 +100,7 @@ class TestPager < Test::Unit::TestCase
       end
 
       should "create third pager" do
-        pager = Pager.new(@config, 3, @posts)
+        pager = Pager.new(@site, 3, @posts)
         assert_equal(1, pager.posts.size)
         assert_equal(3, pager.total_pages)
         assert_equal(2, pager.previous_page)
@@ -107,7 +108,7 @@ class TestPager < Test::Unit::TestCase
       end
 
       should "not create fourth pager" do
-        assert_raise(RuntimeError) { Pager.new(@config, 4, @posts) }
+        assert_raise(RuntimeError) { Pager.new(@site, 4, @posts) }
       end
 
     end