tigefa 1.1.2 → 1.1.3

data/test/test_redcloth.rb

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

data/test/test_site.rb

@@ -156,7 +156,7 @@ class TestSite < Test::Unit::TestCase
 
     should "read layouts" do
       @site.read_layouts
-      assert_equal ["default", "simple", "post/simple"].sort, @site.layouts.keys.sort
+      assert_equal ["default", "simple"].sort, @site.layouts.keys.sort
     end
 
     should "read posts" do
@@ -179,6 +179,69 @@ class TestSite < Test::Unit::TestCase
       assert_equal 4, @site.categories['foo'].size
     end
 
+    should "filter entries" do
+      ent1 = %w[foo.markdown bar.markdown baz.markdown #baz.markdown#
+              .baz.markdow foo.markdown~]
+      ent2 = %w[.htaccess _posts _pages bla.bla]
+
+      assert_equal %w[foo.markdown bar.markdown baz.markdown], @site.filter_entries(ent1)
+      assert_equal %w[.htaccess bla.bla], @site.filter_entries(ent2)
+    end
+
+    should "filter entries with exclude" do
+      excludes = %w[README TODO]
+      files = %w[index.html site.css .htaccess]
+
+      @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]
+
+      @site.include = includes
+      assert_equal files, @site.filter_entries(files)
+    end
+
+    should "filter symlink entries when safe mode enabled" do
+      stub(Tigefa).configuration do
+        Tigefa::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'safe' => true})
+      end
+      site = Site.new(Tigefa.configuration)
+      stub(File).symlink?('symlink.js') {true}
+      files = %w[symlink.js]
+      assert_equal [], site.filter_entries(files)
+    end
+
+    should "not filter symlink entries when safe mode disabled" do
+      stub(File).symlink?('symlink.js') {true}
+      files = %w[symlink.js]
+      assert_equal files, @site.filter_entries(files)
+    end
+
+    should "not include symlinks in safe mode" do
+      stub(Tigefa).configuration do
+        Tigefa::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'safe' => true})
+      end
+      site = Site.new(Tigefa.configuration)
+
+      site.read_directories("symlink-test")
+      assert_equal [], site.pages
+      assert_equal [], site.static_files
+    end
+
+    should "include symlinks in unsafe mode" do
+      stub(Tigefa).configuration do
+        Tigefa::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'safe' => false})
+      end
+      site = Site.new(Tigefa.configuration)
+
+      site.read_directories("symlink-test")
+      assert_not_equal [], site.pages
+      assert_not_equal [], site.static_files
+    end
+
     context 'error handling' do
       should "raise if destination is included in source" do
         stub(Tigefa).configuration do
@@ -272,62 +335,5 @@ class TestSite < Test::Unit::TestCase
       end
     end
 
-    context 'data directory' do
-      should 'auto load yaml files' do
-        site = Site.new(Tigefa.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(Tigefa.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(Tigefa.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(Tigefa.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(Tigefa.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(Tigefa.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
   end
 end

data/test/test_tags.rb

@@ -19,7 +19,7 @@ class TestTags < Test::Unit::TestCase
     payload = { "pygments_prefix" => @converter.pygments_prefix,
                 "pygments_suffix" => @converter.pygments_suffix }
 
-    @result = Liquid::Template.parse(content).render!(payload, info)
+    @result = Liquid::Template.parse(content).render(payload, info)
     @result = @converter.convert(@result)
   end
 
@@ -55,23 +55,20 @@ CONTENT
 
   context "initialized tag" do
     should "work" do
-      tag = Jekyll::Tags::HighlightBlock.new('highlight', 'ruby ', ["test", "{% endhighlight %}", "\n"])
+      tag = Tigefa::Tags::HighlightBlock.new('highlight', 'ruby ', ["test", "{% endhighlight %}", "\n"])
       assert_equal({}, tag.instance_variable_get(:@options))
 
-      tag = Jekyll::Tags::HighlightBlock.new('highlight', 'ruby linenos ', ["test", "{% endhighlight %}", "\n"])
+      tag = Tigefa::Tags::HighlightBlock.new('highlight', 'ruby linenos ', ["test", "{% endhighlight %}", "\n"])
       assert_equal({ 'linenos' => 'inline' }, tag.instance_variable_get(:@options))
 
-      tag = Jekyll::Tags::HighlightBlock.new('highlight', 'ruby linenos=table ', ["test", "{% endhighlight %}", "\n"])
+      tag = Tigefa::Tags::HighlightBlock.new('highlight', 'ruby linenos=table ', ["test", "{% endhighlight %}", "\n"])
       assert_equal({ 'linenos' => 'table' }, tag.instance_variable_get(:@options))
 
-      tag = Jekyll::Tags::HighlightBlock.new('highlight', 'ruby linenos=table nowrap', ["test", "{% endhighlight %}", "\n"])
+      tag = Tigefa::Tags::HighlightBlock.new('highlight', 'ruby linenos=table nowrap', ["test", "{% endhighlight %}", "\n"])
       assert_equal({ 'linenos' => 'table', 'nowrap' => true }, tag.instance_variable_get(:@options))
 
-      tag = Jekyll::Tags::HighlightBlock.new('highlight', 'ruby linenos=table cssclass=hl', ["test", "{% endhighlight %}", "\n"])
+      tag = Tigefa::Tags::HighlightBlock.new('highlight', 'ruby linenos=table cssclass=hl', ["test", "{% endhighlight %}", "\n"])
       assert_equal({ 'cssclass' => 'hl', 'linenos' => 'table' }, tag.instance_variable_get(:@options))
-
-      tag = Jekyll::Tags::HighlightBlock.new('highlight', 'Ruby ', ["test", "{% endhighlight %}", "\n"])
-      assert_equal "ruby", tag.instance_variable_get(:@lang), "lexers should be case insensitive"
     end
   end
 
@@ -95,11 +92,11 @@ CONTENT
 
   context "post content has highlight with file reference" do
     setup do
-      fill_post("./jekyll.gemspec")
+      fill_post("./tigefa.gtigefaemspec")
     end
 
     should "not embed the file" do
-      assert_match %{<pre><code class='text'>./jekyll.gemspec\n</code></pre>}, @result
+      assert_match %{<pre><code class='text'>./tigefa.gemspec\n</code></pre>}, @result
     end
   end
 
@@ -132,7 +129,7 @@ CONTENT
 
     context "using Textile" do
       setup do
-        create_post(@content, {}, Jekyll::Converters::Textile)
+        create_post(@content, {}, Tigefa::Converters::Textile)
       end
 
       # Broken in RedCloth 4.1.9
@@ -226,7 +223,7 @@ CONTENT
       assert_no_match /markdown\-html\-error/, @result
     end
 
-    should "have the url to the \"complex\" post from 2008-11-21" do
+    should "have the url to the \"nested\" post from 2008-11-21" do
       assert_match %r{1\s/2008/11/21/complex/}, @result
       assert_match %r{2\s/2008/11/21/complex/}, @result
     end
@@ -252,7 +249,7 @@ CONTENT
       end
 
       should "write script tag" do
-        assert_match "<script src='https://gist.github.com/#{@gist}.js'><![CDATA[\s]]></script>", @result
+        assert_match "<script src='https://gist.github.com/#{@gist}.js'>\s</script>", @result
       end
     end
 
@@ -272,24 +269,27 @@ CONTENT
         end
 
         should "write script tag with specific file in gist" do
-          assert_match "<script src='https://gist.github.com/#{@gist}.js?file=#{@filename}'><![CDATA[\s]]></script>", @result
+          assert_match "<script src='https://gist.github.com/#{@gist}.js?file=#{@filename}'>\s</script>", @result
         end
       end
 
-      should "raise ArgumentError when invalid" do
-        @gist = "mattr-24081a1d93d2898ecf0f"
-        @filename = "myfile.ext"
-        content = <<CONTENT
+      context "when invalid" do
+        setup do
+          @gist = "mattr-24081a1d93d2898ecf0f"
+          @filename = "myfile.ext"
+          content = <<CONTENT
   ---
   title: My Cool Gist
   ---
 
   {% gist #{@gist} #{@filename} %}
 CONTENT
-
-        assert_raise ArgumentError do
           create_post(content, {'permalink' => 'pretty', 'source' => source_dir, 'destination' => dest_dir, 'read_posts' => true})
         end
+
+        should "write script tag with specific file in gist" do
+          assert_match "Error parsing gist id", @result
+        end
       end
     end
 
@@ -308,12 +308,12 @@ CONTENT
       end
 
       should "write script tag with specific file in gist" do
-        assert_match "<script src='https://gist.github.com/#{@gist}.js?file=#{@filename}'><![CDATA[\s]]></script>", @result
+        assert_match "<script src='https://gist.github.com/#{@gist}.js?file=#{@filename}'>\s</script>", @result
       end
     end
 
     context "with blank gist id" do
-      should "raise ArgumentError" do
+      setup do
         content = <<CONTENT
 ---
 title: My Cool Gist
@@ -321,15 +321,16 @@ title: My Cool Gist
 
 {% gist %}
 CONTENT
+        create_post(content, {'permalink' => 'pretty', 'source' => source_dir, 'destination' => dest_dir, 'read_posts' => true})
+      end
 
-        assert_raise ArgumentError do
-          create_post(content, {'permalink' => 'pretty', 'source' => source_dir, 'destination' => dest_dir, 'read_posts' => true})
-        end
+      should "output error message" do
+        assert_match "Error parsing gist id", @result
       end
     end
 
     context "with invalid gist id" do
-      should "raise ArgumentError" do
+      setup do
         invalid_gist = 'invalid'
         content = <<CONTENT
 ---
@@ -338,50 +339,16 @@ title: My Cool Gist
 
 {% gist #{invalid_gist} %}
 CONTENT
+        create_post(content, {'permalink' => 'pretty', 'source' => source_dir, 'destination' => dest_dir, 'read_posts' => true})
+      end
 
-        assert_raise ArgumentError do
-          create_post(content, {'permalink' => 'pretty', 'source' => source_dir, 'destination' => dest_dir, 'read_posts' => true})
-        end
+      should "output error message" do
+        assert_match "Error parsing gist id", @result
       end
     end
   end
 
   context "include tag with parameters" do
-
-    context "with symlink'd include" do
-
-      should "not allow symlink includes" do
-        File.open("/tmp/pages-test", 'w') { |file| file.write("SYMLINK TEST") }
-        assert_raise IOError do
-          content = <<CONTENT
----
-title: Include symlink
----
-
-{% include tmp/pages-test %}
-
-CONTENT
-          create_post(content, {'permalink' => 'pretty', 'source' => source_dir, 'destination' => dest_dir, 'read_posts' => true, 'safe' => true })
-        end
-        assert_no_match /SYMLINK TEST/, @result
-      end
-
-      should "not expose the existence of symlinked files" do
-        ex = assert_raise IOError do
-          content = <<CONTENT
----
-title: Include symlink
----
-
-{% include tmp/pages-test-does-not-exist %}
-
-CONTENT
-          create_post(content, {'permalink' => 'pretty', 'source' => source_dir, 'destination' => dest_dir, 'read_posts' => true, 'safe' => true })
-        end
-        assert_match /should exist and should not be a symlink/, ex.message
-      end
-    end
-
     context "with one parameter" do
       setup do
         content = <<CONTENT
@@ -406,7 +373,7 @@ CONTENT
     end
 
     context "with invalid parameter syntax" do
-      should "throw a ArgumentError" do
+      should "throw a SyntaxError" do
         content = <<CONTENT
 ---
 title: Invalid parameter syntax
@@ -414,7 +381,7 @@ title: Invalid parameter syntax
 
 {% include params.html param s="value" %}
 CONTENT
-        assert_raise ArgumentError, 'Did not raise exception on invalid "include" syntax' do
+        assert_raise SyntaxError, 'Did not raise exception on invalid "include" syntax' do
           create_post(content, {'permalink' => 'pretty', 'source' => source_dir, 'destination' => dest_dir, 'read_posts' => true})
         end
 
@@ -425,7 +392,7 @@ title: Invalid parameter syntax
 
 {% include params.html params="value %}
 CONTENT
-        assert_raise ArgumentError, 'Did not raise exception on invalid "include" syntax' do
+        assert_raise SyntaxError, 'Did not raise exception on invalid "include" syntax' do
           create_post(content, {'permalink' => 'pretty', 'source' => source_dir, 'destination' => dest_dir, 'read_posts' => true})
         end
       end

data/tigefa.gemspec

@@ -4,13 +4,13 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'tigefa'
-  s.version           = '1.1.2'
+  s.version           = '1.1.3'
   s.license           = 'MIT'
-  s.date              = '2014-02-03'
+  s.date              = '2014-03-03'
   s.rubyforge_project = 'tigefa'
 
   s.summary     = "A simple, blog aware, static site generator."
-  s.description = "Tigefa is a simple, blog aware, static site generator."
+  s.description = "tigefa is a simple, blog aware, static site generator."
 
   s.authors  = ["sugeng tigefa"]
   s.email    = 'sugeng@tigefa.org'
@@ -23,33 +23,29 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.extra_rdoc_files = %w[README.markdown LICENSE]
 
-  s.add_runtime_dependency('liquid', "~> 2.5.5")
+  s.add_runtime_dependency('liquid', "~> 2.5.2")
   s.add_runtime_dependency('classifier', "~> 1.3")
-  s.add_runtime_dependency('listen', "~> 1.3")
-  s.add_runtime_dependency('maruku', "~> 0.7.0")
+  s.add_runtime_dependency('directory_watcher', "~> 1.4.1")
+  s.add_runtime_dependency('maruku', "~> 0.5")
   s.add_runtime_dependency('pygments.rb', "~> 0.5.0")
   s.add_runtime_dependency('commander', "~> 4.1.3")
-  s.add_runtime_dependency('safe_yaml', "~> 0.9.7")
+  s.add_runtime_dependency('safe_yaml', "~> 0.7.0")
   s.add_runtime_dependency('colorator', "~> 0.1")
   s.add_runtime_dependency('redcarpet', "~> 2.3.0")
-  s.add_runtime_dependency('kramdown', "~> 1.2")
-  s.add_runtime_dependency('RedCloth', "~> 4.2")
-  s.add_runtime_dependency('rdiscount', "~> 1.6")
-  s.add_runtime_dependency('toml', '~> 0.1.0')
+  s.add_runtime_dependency('kramdown', "~> 1.0.2")
 
-  s.add_development_dependency('rake', "~> 10.1")
+  s.add_development_dependency('rake', "~> 10.0.3")
   s.add_development_dependency('rdoc', "~> 3.11")
   s.add_development_dependency('redgreen', "~> 1.2")
   s.add_development_dependency('shoulda', "~> 3.3.2")
-  s.add_development_dependency('rr', "~> 1.1")
-  s.add_development_dependency('cucumber', "~> 1.3")
-  s.add_development_dependency('launchy', "~> 2.3")
+  s.add_development_dependency('rr', "~> 1.0.0")
+  s.add_development_dependency('cucumber', "~> 1.2.1", '!= 1.2.4')
+  s.add_development_dependency('RedCloth', "~> 4.2")
+  s.add_development_dependency('rdiscount', "~> 1.6")
+  s.add_development_dependency('launchy', "~> 2.1.2")
   s.add_development_dependency('simplecov', "~> 0.7")
   s.add_development_dependency('simplecov-gem-adapter', "~> 1.0.1")
-  s.add_development_dependency('coveralls', "~> 0.7.0")
-  s.add_development_dependency('mime-types', "~> 1.5")
   s.add_development_dependency('activesupport', '~> 3.2.13')
-  s.add_development_dependency('jekyll_test_plugin')
 
   # = MANIFEST =
   s.files = %w[
@@ -62,7 +58,6 @@ Gem::Specification.new do |s|
     bin/tigefa
     cucumber.yml
     features/create_sites.feature
-    features/data.feature
     features/drafts.feature
     features/embed_filters.feature
     features/include_tag.feature
@@ -73,7 +68,7 @@ Gem::Specification.new do |s|
     features/post_excerpts.feature
     features/site_configuration.feature
     features/site_data.feature
-    features/step_definitions/tigefa_steps.rb
+    features/step_definitions/jekyll_steps.rb
     features/support/env.rb
     tigefa.gemspec
     lib/tigefa.rb
@@ -96,7 +91,6 @@ Gem::Specification.new do |s|
     lib/tigefa/core_ext.rb
     lib/tigefa/deprecator.rb
     lib/tigefa/draft.rb
-    lib/tigefa/entry_filter.rb
     lib/tigefa/errors.rb
     lib/tigefa/excerpt.rb
     lib/tigefa/filters.rb
@@ -156,19 +150,12 @@ Gem::Specification.new do |s|
     site/_posts/2013-07-25-jekyll-1-1-2-released.markdown
     site/_posts/2013-09-06-jekyll-1-2-0-released.markdown
     site/_posts/2013-09-14-jekyll-1-2-1-released.markdown
-    site/_posts/2013-10-28-jekyll-1-3-0-rc1-released.markdown
-    site/_posts/2013-11-04-jekyll-1-3-0-released.markdown
-    site/_posts/2013-11-26-jekyll-1-3-1-released.markdown
-    site/_posts/2013-12-07-jekyll-1-4-0-released.markdown
-    site/_posts/2013-12-16-jekyll-1-4-2-released.markdown
-    site/_posts/2014-01-13-jekyll-1-4-3-released.markdown
     site/css/gridism.css
     site/css/normalize.css
     site/css/pygments.css
     site/css/style.css
     site/docs/configuration.md
     site/docs/contributing.md
-    site/docs/datafiles.md
     site/docs/deployment-methods.md
     site/docs/drafts.md
     site/docs/extras.md
@@ -215,15 +202,9 @@ Gem::Specification.new do |s|
     test/helper.rb
     test/source/+/foo.md
     test/source/.htaccess
-    test/source/_config.dev.toml
-    test/source/_data/languages.yml
-    test/source/_data/members.yaml
-    test/source/_data/products.yml
     test/source/_includes/params.html
     test/source/_includes/sig.markdown
-    test/source/_includes/tmp
     test/source/_layouts/default.html
-    test/source/_layouts/post/simple.html
     test/source/_layouts/simple.html
     test/source/_plugins/dummy.rb
     test/source/_posts/2008-02-02-not-published.textile
@@ -259,7 +240,6 @@ Gem::Specification.new do |s|
     test/source/_posts/2013-05-10-number-category.textile
     test/source/_posts/2013-07-22-post-excerpt-with-layout.markdown
     test/source/_posts/2013-08-01-mkdn-extension.mkdn
-    test/source/_posts/2014-01-06-permalink-traversal.md
     test/source/_posts/es/2008-11-21-nested.textile
     test/source/about.html
     test/source/category/_posts/2008-9-23-categories.textile
@@ -268,12 +248,9 @@ Gem::Specification.new do |s|
     test/source/contacts/index.html
     test/source/css/screen.css
     test/source/deal.with.dots.html
-    test/source/exploit.md
     test/source/foo/_posts/bar/2008-12-12-topical-post.textile
     test/source/index.html
-    test/source/products.yml
     test/source/sitemap.xml
-    test/source/symlink-test/_data
     test/source/symlink-test/symlinked-dir
     test/source/symlink-test/symlinked-file
     test/source/win/_posts/2009-05-24-yaml-linebreak.markdown
@@ -283,7 +260,6 @@ Gem::Specification.new do |s|
     test/test_configuration.rb
     test/test_convertible.rb
     test/test_core_ext.rb
-    test/test_entry_filter.rb
     test/test_excerpt.rb
     test/test_filters.rb
     test/test_generated_site.rb