RubyGems - henshin - Versions diffs - 0.3.0 → 0.4.0 - Mend

henshin 0.3.0 → 0.4.0

Files changed (56) hide show

data/.gitignore +5 -1
data/README.markdown +9 -46
data/Rakefile +2 -1
data/VERSION +1 -1
data/bin/henshin +11 -12
data/henshin.gemspec +20 -27
data/lib/henshin.rb +21 -98
data/lib/henshin/archive.rb +87 -115
data/{bin → lib/henshin/exec}/files.rb +0 -0
data/lib/henshin/ext.rb +35 -58
data/lib/henshin/gen.rb +83 -68
data/lib/henshin/labels.rb +144 -0
data/lib/henshin/plugin.rb +70 -33
data/lib/henshin/plugins/highlight.rb +19 -26
data/lib/henshin/plugins/liquid.rb +50 -52
data/lib/henshin/plugins/maruku.rb +14 -16
data/lib/henshin/plugins/sass.rb +19 -23
data/lib/henshin/plugins/textile.rb +14 -16
data/lib/henshin/post.rb +67 -120
data/lib/henshin/site.rb +154 -131
data/lib/henshin/static.rb +10 -8
data/test/helper.rb +20 -8
data/test/site/css/{includes/reset.sass → _reset.sass} +0 -0
data/test/site/css/screen.sass +1 -1
data/test/site/index.html +2 -3
data/test/site/layouts/archive_date.html +5 -4
data/test/site/layouts/archive_month.html +10 -5
data/test/site/layouts/archive_year.html +13 -6
data/test/site/layouts/category_page.html +7 -7
data/test/site/layouts/main.html +3 -4
data/test/site/layouts/post.html +1 -1
data/test/site/layouts/tag_index.html +3 -2
data/test/site/layouts/tag_page.html +6 -6
data/test/site/options.yaml +2 -2
data/test/site/plugins/test.rb +1 -3
data/test/site/posts/Testing-Stuff.markdown +1 -1
data/test/site/posts/Textile-Test.textile +1 -1
data/test/site/posts/lorem-ipsum.markdown +1 -1
data/test/site/posts/same-date.markdown +1 -1
data/test/{test_henshin.rb → suite.rb} +0 -1
data/test/test_gen.rb +98 -0
data/test/test_options.rb +34 -19
data/test/test_post.rb +67 -0
data/test/test_site.rb +159 -46
data/test/test_static.rb +13 -0
metadata +53 -32
data/lib/henshin/categories.rb +0 -29
data/lib/henshin/tags.rb +0 -28
data/test/test_archives.rb +0 -27
data/test/test_categories.rb +0 -0
data/test/test_gens.rb +0 -54
data/test/test_layouts.rb +0 -14
data/test/test_posts.rb +0 -75
data/test/test_statics.rb +0 -0
data/test/test_tags.rb +0 -0
data/test/text_exts.rb +0 -0

data/test/site/css/{includes/reset.sass → _reset.sass} RENAMED

File without changes

@@ -1,4 +1,4 @@
-@import includes/reset.css
+@import _reset.sass
 body
   width: 500px

data/test/site/index.html CHANGED

@@ -3,7 +3,6 @@ layout: main
 title: Home Page
 ---
 <header>
 	<h1>{{ gen.title }}</h1>
 </header>
@@ -19,6 +18,6 @@ title: Home Page
 </ul>
 <ul>
-  <li><a href="/categories/">Categories</a></li>
-  <li><a href="/tags/">Tags</a></li>
+  <li><a href="/category/">Categories</a></li>
+  <li><a href="/tag/">Tags</a></li>
 </ul>

data/test/site/layouts/archive_date.html CHANGED

@@ -6,12 +6,13 @@
     {% include head.html %}
   </head>
   <body>
+    <a href="/">Home</a>
+    <h1>Archive for {{ archive.year }}/{{ archive.month }}/{{ archive.day }}</h1>
-    <h2>{{ archive.date }}</h2>
     <ul>
-    {% for post in archive.posts %}
-      <li><a href="{{ post.url }}">{{ post.title }}</a></li>
-    {% endfor %}
+      {% for post in archive.posts[archive.year][archive.month][archive.day] %}
+        <li><a href="{{ post.url }}">{{ post.title }}</a></li>
+      {% endfor %}
     </ul>
     <span>Copyright &copy; {{ site.author }}</span>

data/test/site/layouts/archive_month.html CHANGED

@@ -6,12 +6,17 @@
     {% include head.html %}
   </head>
   <body>
-    <h2>{{ archive.date }}</h2>
+    <a href="/">Home</a>
+    <h1>Archive for {{ archive.year }}/{{ archive.month }}</h1>
     <ul>
-    {% for post in archive.posts %}
-      <li><a href="{{ post.url }}">{{ post.title }}</a></li>
-    {% endfor %}
+      {% for day in (1..31) %}
+        {% if archive.posts[archive.year][archive.month][day] %}
+          {% for post in archive.posts[archive.year][archive.month][day] %}
+            <li><a href="{{ post.url }}">{{ post.title }}</a></li>
+          {% endfor %}
+        {% endif %}
+      {% endfor %}
     </ul>
     <span>Copyright &copy; {{ site.author }}</span>

data/test/site/layouts/archive_year.html CHANGED

@@ -6,14 +6,21 @@
     {% include head.html %}
   </head>
   <body>
-    <h2>{{ archive.date }}</h2>
+    <a href="/">Home</a>
+    <h1>Archive for {{ archive.year }}</h1>
     <ul>
-    {% for post in archive.posts %}
-      <li><a href="{{ post.url }}">{{ post.title }}</a></li>
-    {% endfor %}
+      {% for day in (1..31) %}
+        {% for month in (1..12) %}
+          {% if archive.posts[archive.year][month][day] %}
+            {% for post in archive.posts[archive.year][month][day] %}
+              <li><a href="{{ post.url }}">{{ post.title }}</a></li>
+            {% endfor %}
+          {% endif %}
+        {% endfor %}
+      {% endfor %}
     </ul>
     <span>Copyright &copy; {{ site.author }}</span>
   </body>
 </html>

data/test/site/layouts/category_page.html CHANGED

@@ -6,14 +6,14 @@
     {% include head.html %}
   </head>
   <body>
-    <h2>{{ category.name }}</h2>
+    <a href="/">Home</a>
-      <ul>
-      {% for post in category.posts %}
-        <li><time>{{ post.date | date_to_string }}</time> - <a href="{{ post.url }}">{{ post.title }}</a></li>
-      {% endfor %}
-      </ul>
+    <h2>{{ category.name }}</h2>
+    <ul>
+    {% for post in category.posts %}
+      <li><time>{{ post.date | date_to_string }}</time> - <a href="{{ post.url }}">{{ post.title }}</a></li>
+    {% endfor %}
+    </ul>
     <span>Copyright &copy; {{ site.author }}</span>
   </body>

data/test/site/layouts/main.html CHANGED

@@ -2,13 +2,12 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" />
-    <title>{{ site.title }}</title>
+    <title>{{ gen.title }}</title>
     {% include head.html %}
   </head>
   <body>
-    {{ yield }}
-    <span>Copyright &copy; {{ site.author }}</span>
+  {{ yield }}
   </body>
 </html>

data/test/site/layouts/post.html CHANGED

@@ -31,6 +31,6 @@
   {{ yield }}
-  <span>Copyright &copy; {{ post.author }}</span>
+  <span>Copyright &copy; {% if post.author %}{{ post.author }}{% else %}{{ site.author }}{% endif %}</span>
   </body>
 </html>

data/test/site/layouts/tag_index.html CHANGED

@@ -2,11 +2,12 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" />
-    <title>{{ site.title }}</title>
+    <title>{{ site.title }} > Tags</title>
     {% include head.html %}
   </head>
   <body>
+    <a href="/">Home</a>
     <h2>A List of Tags</h2>
     <ul>
       {% for tag in site.tags %}

data/test/site/layouts/tag_page.html CHANGED

@@ -6,14 +6,14 @@
     {% include head.html %}
   </head>
   <body>
+    <a href="/">Home</a>
     <h2>{{ tag.name }}</h2>
-      <ul>
-      {% for post in tag.posts %}
-        <li><time>{{ post.date | date_to_string }}</time> - <a href="{{ post.url }}">{{ post.title }}</a></li>
-      {% endfor %}
-      </ul>
+    <ul>
+    {% for post in tag.posts %}
+      <li><time>{{ post.date | date_to_string }}</time> - <a href="{{ post.url }}">{{ post.title }}</a></li>
+    {% endfor %}
+    </ul>
     <span>Copyright &copy; {{ site.author }}</span>
   </body>

data/test/site/options.yaml CHANGED

@@ -5,10 +5,10 @@ author: Joshua Hawxwell
 layout: post
-exclude: ['includes']
+exclude: ['includes', 'css/_reset.sass']
 post_name: '{title-with-dashes}.{extension}'
 permalink: '/{year}/{month}/{date}/{title}/index.html'
-plugins: [maruku, sass, pygments, liquid, test, textile, highlight]
+plugins: [maruku, sass, liquid, test, textile, highlight]
 sass:
   style: :compact

data/test/site/plugins/test.rb CHANGED

@@ -1,5 +1,3 @@
-require 'henshin/plugin'
-class TestPlugin < Henshin::StandardPlugin
+class TestPlugin < Henshin::Plugin
 end

data/test/site/posts/Testing-Stuff.markdown CHANGED

@@ -1,7 +1,7 @@
 ---
 title: Testing Stuff
 date: 2010-10-20 at 17:33:23
-tags: test, markdown
+tags: [test, markdown]
 category: test
 ---

data/test/site/posts/Textile-Test.textile CHANGED

@@ -1,7 +1,7 @@
 ---
 title: Textile Test
 date: 2009-11-09 at 13:23:47
-tags: test, plugin
+tags: [test, plugin]
 ---
 So Lorem ipsum dolor sit _amet, consectetur_ adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris *nisi ut aliquip* ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

data/test/site/posts/lorem-ipsum.markdown CHANGED

@@ -1,7 +1,7 @@
 ---
 title: Lorem Ipsum
 date: 2010-05-15 at 13:23:47
-tags: test, lorem
+tags: [test, lorem]
 ---
 So Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

data/test/site/posts/same-date.markdown CHANGED

@@ -1,7 +1,7 @@
 ---
 title: Same Date as "Lorem Ipsum"
 date: 2010-05-15 at 13:23:47
-tags: test, lorem
+tags: [test, lorem]
 ---
 So Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

data/test/{test_henshin.rb → suite.rb} RENAMED

@@ -1,5 +1,4 @@
 require File.join(File.dirname(__FILE__) ,'helper')
 test_files = Dir.glob( File.join(File.dirname(__FILE__), "test_*.rb") )
-test_files -= [File.join(File.dirname(__FILE__), 'test_henshin.rb')] # don't include self!
 test_files.each {|f| require f }

data/test/test_gen.rb ADDED

@@ -0,0 +1,98 @@
+require File.join(File.dirname(__FILE__) ,'helper')
+class TestGen < Test::Unit::TestCase
+  context "A gen" do
+    setup do
+      @site = Henshin::Site.new(site_override).read.process
+      @index = "#{root_dir}/index.html"
+      @sass = "#{root_dir}/css/screen.sass"
+      remove_site
+    end
+    def new_sass_gen
+      Henshin::Gen.new(@sass.to_p, @site)
+    end
+    def new_html_gen
+      Henshin::Gen.new(@index.to_p, @site)
+    end
+    should "be have file data read" do
+      gen = new_html_gen
+      gen.read_file
+      assert_equal 'Home Page', gen.data['title']
+      assert_equal "main", gen.data['layout']
+    end
+    should "be rendered" do
+      gen = new_html_gen
+      gen.read
+      gen2 = new_html_gen
+      gen2.read
+      gen2.render
+      assert_not_equal gen.content, gen2.content
+    end
+    should "get output extension from plugin" do
+      gen = new_sass_gen
+      gen.read
+      assert_equal 'sass', gen.data['input']
+      assert_equal 'css', gen.data['output']
+    end
+    should "render with correct layout" do
+      gen = new_html_gen
+      # index.html should use 'main'
+      gen.read
+      gen.render
+      l = File.open("#{root_dir}/layouts/main.html", 'r') {|f| f.read}
+      assert_equal l, gen.data['layout']
+    end
+    should "have the correct permalink" do
+      gen = new_html_gen
+      gen.read
+      assert_equal '/index.html', gen.permalink
+    end
+    should "have the correct url" do
+      gen = new_html_gen
+      gen.read
+      assert_equal '/', gen.url
+    end
+    should "be written to the correct place" do
+      gen = new_html_gen
+      gen.read
+      assert_equal "#{target_dir}/index.html".to_p, gen.write_path
+    end
+    should "write with the correct output" do
+      gen = new_sass_gen
+      gen.read
+      assert_equal "#{target_dir}/css/screen.css".to_p, gen.write_path
+    end
+    should "turn all data to hash" do
+      gen = new_html_gen
+      gen.read
+      assert gen.to_hash.is_a? Hash
+    end
+    should "insert optional payload" do
+      gen = Henshin::Gen.new(@index.to_p, @site, {:name => 'test', :payload => {'data' => 'to_test'}})
+      gen.read
+      assert_equal 'to_test', gen.payload['test']['data']
+    end
+    should "be sortable" do
+      gen = new_html_gen
+      gen2 = new_sass_gen
+      gens = [gen, gen2]
+      assert_equal gens.reverse, gens.sort
+    end
+  end
+end

data/test/test_options.rb CHANGED

@@ -12,11 +12,9 @@ class TestOptions < Test::Unit::TestCase
     should "warn of invalid options.yaml" do
       mock(YAML).load_file(@opts) {"boo"}
       mock($stderr).puts("\nCould not read configuration, falling back to defaults...")
-      mock($stderr).puts("-> undefined method `to_options' for \"boo\":String")
+      mock($stderr).puts("-> can't convert String into Hash")
-      configured = Henshin.configure
-      configured[:plugins] = ["maruku", "liquid"]
-      assert_equal Henshin::Defaults, configured
+      assert_equal Henshin::Defaults, Henshin::Site.new.config
     end
     should "warn of no options.yaml" do
@@ -24,34 +22,51 @@ class TestOptions < Test::Unit::TestCase
       mock($stderr).puts("\nCould not read configuration, falling back to defaults...")
       mock($stderr).puts("-> No such file or directory - #{@opts}")
-      configured = Henshin.configure
-      configured[:plugins] = ["maruku", "liquid"]
-      assert_equal Henshin::Defaults, configured
+      assert_equal Henshin::Defaults, Henshin::Site.new.config
     end
     should "use defaults if no options.yaml" do
       mock($stderr).puts("\nCould not read configuration, falling back to defaults...")
       mock($stderr).puts("-> No such file or directory - #{@opts}")
-      configured = Henshin.configure
-      configured[:plugins] = ["maruku", "liquid"]
-      assert_equal Henshin::Defaults, configured
+      assert_equal Henshin::Defaults, Henshin::Site.new.config
     end
     should "merge override with defaults" do
       mock($stderr).puts("\nCould not read configuration, falling back to defaults...")
       mock($stderr).puts("-> No such file or directory - #{@opts}")
-      override = {:time_zone => '+01:00'}
-      configured = Henshin.configure(override)
-      assert_equal '+01:00', configured[:time_zone]
+      override = {'time_zone' => '+01:00'}
+      site = Henshin::Site.new(override)
+      assert_equal '+01:00', site.config['time_zone']
+    end
+    should "add special directories to exclude after loading" do
+      mock($stderr).puts("\nCould not read configuration, falling back to defaults...")
+      mock($stderr).puts("-> No such file or directory - #{@opts}")
+      site = Henshin::Site.new
+      to_ignore = ['/_site', '/plugins']
+      assert_equal to_ignore, site.config['exclude']
+      mock(YAML).load_file(@opts) { {'exclude' => ['/my_dir', 'my_file.txt']} }
+      site2 = Henshin::Site.new
+      to_ignore = ['/my_dir', 'my_file.txt', '/_site', '/plugins']
+      assert_equal to_ignore, site2.config['exclude']
     end
-    should "load plugins" do
-      opts = Henshin::Defaults.dup
-      opts[:plugins] = ['maruku']
-      loaded = Henshin.load_plugins(opts)
-      assert loaded[0].is_a? MarukuPlugin
+    should "convert root, target to Pathnames" do
+      mock($stderr).puts("\nCould not read configuration, falling back to defaults...")
+      mock($stderr).puts("-> No such file or directory - #{@opts}")
+      site = Henshin::Site.new
+      assert site.root.is_a? Pathname
+      assert site.target.is_a? Pathname
+    end
+    should "set base" do
+      mock($stderr).puts("\nCould not read configuration, falling back to defaults...")
+      mock($stderr).puts("-> No such file or directory - #{@opts}")
+      site = Henshin::Site.new
+      assert site.base
     end
   end

data/test/test_post.rb ADDED

@@ -0,0 +1,67 @@
+require File.join(File.dirname(__FILE__) ,'helper')
+class TestPost < Test::Unit::TestCase
+  context "A post" do
+    setup do
+      @site = Henshin::Site.new(site_override)
+      @post = "#{root_dir}/posts/lorem-ipsum.markdown"
+      @post_with_date = "#{root_dir}/posts/2010-08-10-lorem-ipsum.markdown"
+      remove_site
+    end
+    should "get data from filename" do
+      site = @site.dup
+      site.config['file_name'] = "{date}-{title-with-dashes}.{extension}"
+      post = Henshin::Post.new(@post_with_date.to_p, site)
+      post.read_name
+      assert_equal 'Lorem Ipsum', post.data['title']
+      assert_equal '2010-08-10', post.data['date']
+      assert_equal 'markdown', post.data['input']
+    end
+    should "turn date to Time object" do
+      post = Henshin::Post.new(@post.to_p, @site)
+      post.read
+      assert post.data['date'].is_a? Time
+    end
+    should "get next post" do
+    end
+    should "get previous post" do
+    end
+    should "have correct permalink" do
+      site = @site.dup
+      site.config['file_name'] = "{date}-{title-with-dashes}.{extension}"
+      post = Henshin::Post.new(@post_with_date.to_p, @site)
+      post.read
+      assert_equal '/2010/8/10/lorem-ipsum/index.html', post.permalink
+    end
+    should "have correct url" do
+      site = @site.dup
+      site.config['file_name'] = "{date}-{title-with-dashes}.{extension}"
+      post = Henshin::Post.new(@post_with_date.to_p, @site)
+      post.read
+      assert_equal '/2010/8/10/lorem-ipsum', post.url
+    end
+    should "be written to the correct place" do
+      site = @site.dup
+      site.config['file_name'] = "{date}-{title-with-dashes}.{extension}"
+      post = Henshin::Post.new(@post_with_date.to_p, @site)
+      post.read
+      path = Pathname.new("#{root_dir}/_site/2010/8/10/lorem-ipsum/index.html")
+      assert_equal path, post.write_path
+    end
+    should "be sortable" do
+    end
+  end
+end