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

henshin 0.2.2 → 0.3.0

Files changed (48) hide show

data/.gitignore +1 -1
data/README.markdown +0 -1
data/Rakefile +4 -1
data/VERSION +1 -1
data/bin/files.rb +46 -0
data/bin/henshin +47 -79
data/henshin.gemspec +37 -14
data/lib/henshin.rb +50 -36
data/lib/henshin/archive.rb +161 -0
data/lib/henshin/categories.rb +6 -1
data/lib/henshin/ext.rb +2 -53
data/lib/henshin/gen.rb +16 -15
data/lib/henshin/plugin.rb +20 -7
data/lib/henshin/plugins/highlight.rb +31 -0
data/lib/henshin/plugins/liquid.rb +48 -14
data/lib/henshin/plugins/maruku.rb +3 -4
data/lib/henshin/plugins/sass.rb +7 -6
data/lib/henshin/plugins/textile.rb +3 -4
data/lib/henshin/post.rb +50 -8
data/lib/henshin/site.rb +60 -34
data/lib/henshin/tags.rb +5 -1
data/test/site/css/{print.sass → includes/reset.sass} +0 -3
data/test/site/css/{screen.css → print.css} +1 -4
data/test/site/css/screen.sass +70 -0
data/test/site/includes/head.html +1 -0
data/test/site/index.html +12 -2
data/test/site/layouts/archive_date.html +19 -0
data/test/site/layouts/archive_month.html +19 -0
data/test/site/layouts/archive_year.html +19 -0
data/test/site/layouts/category_index.html +5 -4
data/test/site/layouts/category_page.html +2 -2
data/test/site/layouts/main.html +1 -36
data/test/site/layouts/post.html +15 -5
data/test/site/layouts/tag_index.html +3 -3
data/test/site/layouts/tag_page.html +2 -2
data/test/site/options.yaml +7 -4
data/test/site/posts/Testing-Stuff.markdown +7 -1
data/test/test_archives.rb +27 -0
data/test/test_categories.rb +0 -0
data/test/test_gens.rb +28 -7
data/test/test_options.rb +4 -2
data/test/test_posts.rb +50 -14
data/test/test_site.rb +55 -7
data/test/test_statics.rb +0 -0
data/test/test_tags.rb +0 -0
data/test/text_exts.rb +0 -0
metadata +86 -17
data/lib/henshin/plugins/pygments.rb +0 -17

	@@ -0,0 +1 @@
1	+ <link rel="stylesheet" href="/css/screen.css" type="text/css" />

data/test/site/index.html CHANGED

@@ -5,10 +5,20 @@ title: Home Page
 <header>
-	<h1>Home Page</h1>
+	<h1>{{ gen.title }}</h1>
 </header>
 <p>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.</p>
+<hr/>
-<p>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.</p>
+<h2>Posts</h2>
+<ul>
+  {% for post in site.posts %}
+    <li><time>{{ post.date | date_to_string }}</time> - <a href="{{ post.url }}">{{ post.title }}</a></li>
+  {% endfor %}
+</ul>
+<ul>
+  <li><a href="/categories/">Categories</a></li>
+  <li><a href="/tags/">Tags</a></li>
+</ul>

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

@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <title>{{ site.title }}</title>
+    {% include head.html %}
+  </head>
+  <body>
+    <h2>{{ archive.date }}</h2>
+    <ul>
+    {% for post in archive.posts %}
+      <li><a href="{{ post.url }}">{{ post.title }}</a></li>
+    {% endfor %}
+    </ul>
+    <span>Copyright &copy; {{ site.author }}</span>
+  </body>
+</html>

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

@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <title>{{ site.title }}</title>
+    {% include head.html %}
+  </head>
+  <body>
+    <h2>{{ archive.date }}</h2>
+    <ul>
+    {% for post in archive.posts %}
+      <li><a href="{{ post.url }}">{{ post.title }}</a></li>
+    {% endfor %}
+    </ul>
+    <span>Copyright &copy; {{ site.author }}</span>
+  </body>
+</html>

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

@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <title>{{ site.title }}</title>
+    {% include head.html %}
+  </head>
+  <body>
+    <h2>{{ archive.date }}</h2>
+    <ul>
+    {% for post in archive.posts %}
+      <li><a href="{{ post.url }}">{{ post.title }}</a></li>
+    {% endfor %}
+    </ul>
+    <span>Copyright &copy; {{ site.author }}</span>
+  </body>
+</html>

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

@@ -3,18 +3,19 @@
   <head>
     <meta charset="utf-8" />
     <title>{{ site.title }}</title>
-    <link rel="stylesheet" href="screen.css" type="text/css" />
+    {% include head.html %}
   </head>
   <body>
+    <a href="/">Home</a>
     <h2>A List of Categories</h2>
     <ul>
       {% for category in site.categories %}
         <li>
-          {{ category.name }}
+          <a href="{{ category.url }}">{{ category.name }}</a>
           <ul>
           {% for post in category.posts %}
-            <li>{{ post.title }} - {{ post.date }}</li>
+            <li><time>{{ post.date | date_to_string }}</time> - <a href="{{ post.url }}">{{ post.title }}</a></li>
           {% endfor %}
           </ul>
         </li>

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

@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8" />
     <title>{{ site.title }}</title>
-    <link rel="stylesheet" href="screen.css" type="text/css" />
+    {% include head.html %}
   </head>
   <body>
@@ -11,7 +11,7 @@
       <ul>
       {% for post in category.posts %}
-        <li>{{ post.title }} - {{ post.date }}</li>
+        <li><time>{{ post.date | date_to_string }}</time> - <a href="{{ post.url }}">{{ post.title }}</a></li>
       {% endfor %}
       </ul>

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

@@ -3,47 +3,12 @@
   <head>
     <meta charset="utf-8" />
     <title>{{ site.title }}</title>
-    <link rel="stylesheet" href="screen.css" type="text/css" />
+    {% include head.html %}
   </head>
   <body>
     {{ yield }}
-    <h2>A List of Posts</h2>
-    <ul>
-      {% for post in site.posts %}
-        <li><a href="{{ post.url }}">{{ post.title }}</a> - {{ post.date }}</li>
-      {% endfor %}
-    </ul>
-    <h2>A List of Tags</h2>
-    <ul>
-      {% for tag in site.tags %}
-        <li>
-          {{ tag.name }}
-          <ul>
-          {% for post in tag.posts %}
-            <li>{{ post.title }} - {{ post.date }}</li>
-          {% endfor %}
-          </ul>
-        </li>
-      {% endfor %}
-    </ul>
-    <h2>A List of Categories</h2>
-    <ul>
-      {% for category in site.categories %}
-        <li>{{ category.name }}</li>
-        <ul>
-        {% for post in category.posts %}
-          <li>{{ post.title }} - {{ post.date }}</li>
-        {% endfor %}
-        </ul>
-      {% endfor %}
-    </ul>
     <span>Copyright &copy; {{ site.author }}</span>
   </body>
 </html>

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

@@ -3,17 +3,27 @@
   <head>
     <meta charset="utf-8" />
     <title>{{ post.title }}</title>
-    <link rel="stylesheet" href="" type="text/css" />
+    {% include head.html %}
   </head>
   <body>
+  <nav>
+    {% if post.next %}
+      <a href="{{ post.next.url }}">&larr;</a>&emsp;
+    {% endif %}
+    <a href="/">Home</a>
+    {% if post.prev %}
+      &emsp;<a href="{{ post.prev.url }}">&rarr;</a>
+    {% endif %}
+  </nav>
   <header>
-    <h1>{{ post.title }}</h1><span>in {{ post.category }}</span>
-    <time>{{ post.date }}</time>
+    <h1>{{ post.title }}</h1>
+    <time>{{ post.date | date_to_string }}</time>
-    <ul>
+    <ul class="tags">
       {% for tag in post.tags %}
-        <li>{{ tag }}</li>
+        <li><a href="{{ tag.url }}">{{ tag.name }}</a></li>
       {% endfor %}
     </ul>

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

@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8" />
     <title>{{ site.title }}</title>
-    <link rel="stylesheet" href="screen.css" type="text/css" />
+    {% include head.html %}
   </head>
   <body>
@@ -11,10 +11,10 @@
     <ul>
       {% for tag in site.tags %}
         <li>
-          {{ tag.name }}
+          <a href="{{ tag.url }}">{{ tag.name }}</a>
           <ul>
           {% for post in tag.posts %}
-            <li>{{ post.title }} - {{ post.date }}</li>
+            <li><time>{{ post.date | date_to_string }}</time> - <a href="{{ post.url }}">{{ post.title }}</a></li>
           {% endfor %}
           </ul>
         </li>

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

@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8" />
     <title>{{ site.title }}</title>
-    <link rel="stylesheet" href="screen.css" type="text/css" />
+    {% include head.html %}
   </head>
   <body>
@@ -11,7 +11,7 @@
       <ul>
       {% for post in tag.posts %}
-        <li>{{ post.title }} - {{ post.date }}</li>
+        <li><time>{{ post.date | date_to_string }}</time> - <a href="{{ post.url }}">{{ post.title }}</a></li>
       {% endfor %}
       </ul>

data/test/site/options.yaml CHANGED

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

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

@@ -5,4 +5,10 @@ tags: test, markdown
 category: test
 ---
-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.
+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.
+$highlight ruby
+def hello
+  puts "hello"
+end
+$end

data/test/test_archives.rb ADDED

@@ -0,0 +1,27 @@
+require File.join(File.dirname(__FILE__) ,'helper')
+class TestArchives < Test::Unit::TestCase
+  context "An archive" do
+    setup do
+      @site = new_site
+    end
+    should "turn to hash" do
+    end
+    should "turn to hash of dates" do
+    end
+    should "turn to hash of months" do
+    end
+    should "turn to hash of years" do
+    end
+  end
+end

data/test/test_categories.rb ADDED

File without changes

data/test/test_gens.rb CHANGED

@@ -5,28 +5,49 @@ class TestGens < Test::Unit::TestCase
     setup do
       @site = new_site
-      @gen = Henshin::Gen.new( "#{root_dir}/index.html", @site )
+      @gen = Henshin::Gen.new "#{root_dir}/index.html", @site
       remove_site
     end
     should "read frontmatter" do
       @site.read_layouts
       @gen.read_yaml
-      assert_equal @gen.title, 'Home Page'
-      assert_equal @gen.layout, "#{root_dir}/layouts/main.html"
+      assert_equal 'Home Page', @gen.title
+      assert_equal File.open("#{root_dir}/layouts/main.html", "r"){|f| f.read}, @gen.layout
     end
-    should "have the correct permalink" do
+    should "render with correct layout" do
+      @site.read_layouts
+      @gen.read_yaml
+      # index.html uses 'layout: main'
+      assert_equal File.open("#{root_dir}/layouts/main.html", "r"){|f| f.read}, @gen.layout
+    end
+    should "have the correct permalink and url" do
       @gen.read_yaml
-      assert_equal @gen.permalink, '/index.html'
-      assert_equal @gen.url, '/'
+      assert_equal '/index.html', @gen.permalink
+      assert_equal '/', @gen.url
+    end
+    should "respond to #to_hash" do
+      @gen.process
+      assert_equal @gen.title, @gen.to_hash['title']
+      assert_equal @gen.permalink, @gen.to_hash['permalink']
+      assert_equal @gen.url, @gen.to_hash['url']
+      assert_equal @gen.content, @gen.to_hash['content']
     end
     should "allow a hash to be added to the payload" do
       payload = { :name => 'people', :payload => {'fname' => 'John', 'sname' => 'Doe'} }
       gen = Henshin::Gen.new( "#{root_dir}/index.html", @site, payload )
       gen.read_yaml
-      assert_equal gen.payload['people'], payload[:payload]
+      assert_equal payload[:payload], gen.payload['people']
+    end
+    should "be sortable" do
+      another_gen = Henshin::Gen.new( "#{root_dir}/css/print.sass", @site )
+      gen_array = [@gen, another_gen]
+      assert_equal gen_array.reverse, gen_array.sort
     end
   end

data/test/test_options.rb CHANGED

@@ -44,11 +44,13 @@ class TestOptions < Test::Unit::TestCase
       override = {:time_zone => '+01:00'}
       configured = Henshin.configure(override)
-      assert_equal configured[:time_zone], '+01:00'
+      assert_equal '+01:00', configured[:time_zone]
     end
     should "load plugins" do
-      loaded = Henshin.load_plugins( ['maruku'], '.', {} )
+      opts = Henshin::Defaults.dup
+      opts[:plugins] = ['maruku']
+      loaded = Henshin.load_plugins(opts)
       assert loaded[0].is_a? MarukuPlugin
     end

data/test/test_posts.rb CHANGED

@@ -5,6 +5,9 @@ class TestPosts < Test::Unit::TestCase
     setup do
       @site = new_site
+      @site.read
+      @site.process
+      @post = Henshin::Post.new( "#{root_dir}/posts/lorem-ipsum.markdown", @site )
       remove_site
     end
@@ -14,25 +17,58 @@ class TestPosts < Test::Unit::TestCase
       site.config[:file_name] = "{date}-{title-with-dashes}.{extension}"
       post = Henshin::Post.new( post_file, site )
       post.read_name
-      assert_equal post.title, 'lorem ipsum'
-      assert_equal post.date, Time.parse('2010-08-10')
-      assert_equal post.extension, 'markdown'
+      assert_equal 'Lorem Ipsum', post.title
+      assert_equal Time.parse('2010-08-10'), post.date
+      assert_equal 'markdown', post.extension
     end
-    should "read frontmatter" do
-      post_file = "#{root_dir}/posts/lorem-ipsum.markdown"
+    should "get category from folder" do
+      post_file = "#{root_dir}/posts/category/test-post.markdown"
       post = Henshin::Post.new( post_file, @site )
-      post.read_yaml
-      assert_equal post.title, 'Lorem Ipsum'
-      assert_equal post.date, Time.parse('2010-05-15 at 13:23:47')
-      assert_equal post.tags, ['test', 'lorem']
+      post.read_name
+      assert_equal 'category', post.category
     end
-    should "have the correct permalink" do
-      post_file = "#{root_dir}/posts/lorem-ipsum.markdown"
-      post = Henshin::Post.new( post_file, @site )
-      post.process
-      assert_equal post.permalink, "/2010/5/15-lorem-ipsum/index.html"
+    should "render with correct layout" do
+      @post.process
+      # lorem-ipsum.markdown uses default 'layout: post'
+      assert_equal File.open("#{root_dir}/layouts/post.html"){|f| f.read} , @post.layout
+    end
+    should "read frontmatter" do
+      @post.read_yaml
+      assert_equal 'Lorem Ipsum', @post.title
+      assert_equal Time.parse('2010-05-15 at 13:23:47'), @post.date
+      assert_equal ['test', 'lorem'], @post.tags
+    end
+    should "have the correct permalink and url" do
+      @post.process
+      assert_equal "/2010/5/15/lorem-ipsum/index.html", @post.permalink
+      assert_equal "/2010/5/15/lorem-ipsum/", @post.url
+    end
+    should "respond to #to_hash" do
+      @post.process
+      assert_equal @post.title, @post.to_hash['title']
+      assert_equal @post.author, @post.to_hash['author']
+      assert_equal @post.permalink, @post.to_hash['permalink']
+      assert_equal @post.url, @post.to_hash['url']
+      assert_equal @post.date, @post.to_hash['date']
+      assert_equal @post.category, @post.to_hash['category']
+      assert_equal @post.content, @post.to_hash['content']
+    end
+    should "be sortable" do
+      another_post = Henshin::Post.new( "#{root_dir}/posts/Testing-Stuff.markdown", @site )
+      post_array = [another_post, @post]
+      assert_equal post_array.reverse, post_array.sort
+    end
+    should "sort by url if dates are same" do
+      another_post = Henshin::Post.new( "#{root_dir}/posts/same-date.markdown", @site )
+      post_array = [another_post, @post]
+      assert_equal post_array.reverse, post_array.sort
     end
   end