postview 0.7.0 → 0.8.0

data/lib/postview/site.rb

@@ -28,21 +28,36 @@ class Site
   attr_accessor :find
 
   # Finder for archived posts
-  attr_accessor :find_archived
+  attr_accessor :find_in_archive
 
   # Finder for drafted posts
-  attr_accessor :find_drafted
+  attr_accessor :find_in_drafts
 
+  # Initialize site with attributes passed by arguments.
   def initialize(attributes = {})
     attributes.instance_variables_set_to(self)
   end
 
+  # Find all tags from all posts and archived posts.
   def find_all_tags
-    (find.all_tags + find_archived.all_tags).uniq.sort
+    (find.all_tags + find_in_archive.all_tags).uniq.sort
   end
 
+  # Find a specific tag from posts and archived posts.
   def find_tag(tag)
-    find.tag(tag) || find_archived.tag(tag)
+    find.tag(tag) || find_in_archive.tag(tag)
+  end
+
+  # Find all posts tagged with a specific tag.
+  # Returns two lists: posts and archived posts.
+  def find_all_posts_tagged_with(tag)
+    [ find.all_posts_by_tag(tag), find_in_archive.all_posts_by_tag(tag) ]
+  end
+
+  # Find posts using any string values.
+  # Returns two lists: posts and archived posts.
+  def search_posts(*values)
+    [ find.posts(*values), find_in_archive.posts(*values) ]
   end
 
 end # class Site

data/tasks/history.rake

@@ -1,7 +1,7 @@
 desc "Creates/updates history file."
 task :history, [:branch] do |spec, args|
-  File.open(spec.name.upcase, "w+") do |history|
-    history << `git log #{args[:branch] || :master} --format="== %ai - %s%n%n%b"`
+  File.open("#{spec.name.upcase}.new", "w+") do |history|
+    history << `git log #{args[:branch] || :master} --date=short --format="== %ci%n%n=== %s%n%n%b"`
   end
 end
 

data/test/application_test.rb

@@ -5,7 +5,7 @@ require 'test/unit'
 require 'rack/test'
 require 'test/helper'
 
-class TestApplication < Test::Unit::TestCase
+class ApplicationTest < Test::Unit::TestCase
 
   include Rack::Test::Methods
 
@@ -57,9 +57,9 @@ class TestApplication < Test::Unit::TestCase
   end
 
   def test_should_return_ok_in_posts_path_with_params
-    get app.posts_path "/2009/06/02/postview_blogware" do |response|
+    get app.posts_path "/2009/06/02/fourth_article" do |response|
       assert response.ok?
-      assert_equal "http://example.org/posts/2009/06/02/postview_blogware/", last_request.url
+      assert_equal "http://example.org/posts/2009/06/02/fourth_article/", last_request.url
     end
   end
 
@@ -71,9 +71,9 @@ class TestApplication < Test::Unit::TestCase
   end
 
   def test_should_return_ok_in_tags_path_with_params
-    get app.tags_path "ruby" do |response|
+    get app.tags_path "t1" do |response|
       assert response.ok?
-      assert_equal "http://example.org/tags/ruby/", last_request.url
+      assert_equal "http://example.org/tags/t1/", last_request.url
     end
   end
 
@@ -84,9 +84,9 @@ class TestApplication < Test::Unit::TestCase
   end
 
   def test_should_return_ok_in_archive_path_with_params
-    get app.archive_path "2008/06/02/postview_blogware" do |response|
+    get app.archive_path "2008/06/02/second_article" do |response|
       assert response.ok?
-      assert_equal "http://example.org/archive/2008/06/02/postview_blogware/", last_request.url
+      assert_equal "http://example.org/archive/2008/06/02/second_article/", last_request.url
     end
   end
 
@@ -98,9 +98,9 @@ class TestApplication < Test::Unit::TestCase
   end
 
   def test_should_return_ok_in_drafts_path_with_params
-    get app.drafts_path "2009/07/30/draft_postview_blogware" do |response|
+    get app.drafts_path "2009/07/30/fifth_article" do |response|
       assert response.ok?
-      assert_equal "http://example.org/drafts/2009/07/30/draft_postview_blogware/", last_request.url
+      assert_equal "http://example.org/drafts/2009/07/30/fifth_article/", last_request.url
     end
   end
 
@@ -111,10 +111,10 @@ class TestApplication < Test::Unit::TestCase
   end
 
   def test_should_return_ok_in_search_path
-    get app.search_path, :anythink => "postview" do |response|
+    get app.search_path, :anythink => "first" do |response|
       assert response.ok?
-      assert_equal "postview", last_request.params.values.to_s
-      assert_equal "http://example.org/search/?anythink=postview", last_request.url
+      assert_equal "first", last_request.params.values.to_s
+      assert_equal "http://example.org/search/?anythink=first", last_request.url
     end
   end
 

data/test/extensions.rb

@@ -6,15 +6,15 @@ module Test::Unit
   
   class TestCase
    
-    def self.must(name, &block)
-      test_name = "test_#{name.gsub(/\s+/,'_')}".to_sym
+    def self.should(description, &block)
+      test_name = "test_#{description.gsub(/\s+/,'_')}".to_sym
       defined = instance_method(test_name) rescue false
       raise "#{test_name} is already defined in #{self}" if defined
       if block_given?
         define_method(test_name, &block)
       else
         define_method(test_name) do
-          flunk "No implementation provided for #{name}"
+          flunk "No implementation provided for #{description}"
         end
       end
     end

data/test/fixtures/application/themes/gemstone/about.erb

@@ -0,0 +1,22 @@
+<div class="entry">
+
+  <h1><%= link_to title_path(:about, site.title), :about %></h1>
+
+  <div class="text">
+
+    <%=Postview::About.to_html%>
+
+    <p>
+      <%=Postview.name%> uses the following libraries/projects:
+    </p>
+
+    <ul>
+      <li><%=link_to "#{Sinatra}", "http://www.sinatrarb.com/"%></li>
+      <li><%=link_to "#{Sinatra::Mapping}", "http://sinatra-mapping.rubyforge.org/"%></li>
+      <li><%=link_to "#{Postage}", "http://postage.rubyforge.org/"%></li>
+    </ul>
+
+  </div><!--text-->
+
+</div><!--entry-->
+

data/test/fixtures/application/themes/gemstone/archive/index.erb

@@ -0,0 +1,21 @@
+<div class="entry">
+
+  <h1><%=title_path :archive%></h1> 
+
+  <div class="text">
+
+    <dl>
+      <% for post in all_archived_posts %>
+      <dt>
+        <b><%=link_to "#{post.publish_date} - #{post.title}", archive_path, post, :title => post.title%></b>
+        (<%= post.tags.map{ |tag| link_to tag.capitalize, tags_path, tag, :title => tag.capitalize }.join(', ') %>)
+      </dt>
+
+      <dd>
+        <%=post.summary%>
+      </dd>
+      <% end %>
+    </dl>
+  </div><!--text-->
+</div><!--entry-->
+

data/test/fixtures/application/themes/gemstone/archive/show.erb

@@ -1,15 +1,15 @@
 <div class="entry">
 
-  <h1><%= link_to post.title, posts_path, post %></h1> 
+  <h1><%= link_to current_post.title, posts_path, current_post %></h1> 
 
   <span class="entry-meta">
-    Published at <%= post.publish_date.strftime('%A, %B %d, %Y') %>,
-    tagged with <%= post.tags.map{ |tag| link_to tag.capitalize, tags_path, tag, :title => tag.capitalize }.join(', ') %>.
+    Published at <%= current_post.publish_date.strftime('%A, %B %d, %Y') %>,
+    tagged with <%= current_post.tags.map{ |tag| link_to tag.capitalize, tags_path, tag, :title => tag.capitalize }.join(', ') %>.
   </span>
 
   <div class="text">
 
-  <%= post.content  %>
+  <%= current_post.content  %>
 
   </div><!--text-->
 

data/test/fixtures/application/themes/gemstone/index.erb

@@ -0,0 +1,38 @@
+<% unless latest_posts.empty? %>
+<% for post in latest_posts %>
+<div class="entry">
+
+  <h1><%= link_to post.title, posts_path, post %></h1> 
+
+  <span class="entry-meta">
+    Published at <%= post.publish_date.strftime('%A, %B %d, %Y') %>,
+    tagged with <%= post.tags.map{ |tag| link_to tag.capitalize, tags_path, tag, :title => tag.capitalize }.join(', ') %>.
+  </span>
+
+  <div class="text">
+
+    <%= post.summary %>
+
+    <p>
+    <%= link_to "Read more ...", posts_path, post %>
+    </p>
+
+  </div><!--text-->
+
+</div><!--entry-->
+<% end %>
+<% else %>
+<div class="entry">
+
+  <h1>No posts</h1>
+
+  <div class="text">
+
+    <p>
+      Please, check your posts directory.
+    </p>
+
+  </div><!--text-->
+
+</div><!-- entry -->
+<% end %>

data/test/fixtures/application/themes/gemstone/layout.erb

@@ -0,0 +1,124 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  
+<head>
+
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+  <title><%=site.title%> :: <%=page.title%></title>
+  <meta name="generator"   content="<%=Postview::Version%>" />
+  <meta name="description" content="<%=site.subtitle%>" />
+  <meta name="keywords"    content="<%=page.keywords%>" />
+  <link rel="shortcut icon" href="<%=path_to :images, "favicon.ico"%>" />
+  <link rel="stylesheet" type="text/css" href="<%=path_to :stylesheets, "postview.css"%>" />
+
+</head>
+
+<body>
+
+<div id="header">
+
+  <h1><%=link_to site.title, :root, :title => "#{site.title}"%></h1>
+
+  <h2><%=page.title || site.subtitle%></h2>
+
+  <span>By <%=link_to site.author, "mailto:#{site.email}", :title => "Send mail to #{site.author}"%></span>
+
+  <img src="<%=path_to "/images/logo.png"%>" id="logo" alt="Postview" />
+
+</div><!-- header -->
+
+<br/>
+
+<div id="navigation-bar">
+
+  <address>
+
+    <%=link_to "Home", :root, :title => site.title%>
+    <%=link_to title_path(:posts), :posts, :title => title_path(:posts)%>
+    <%=link_to title_path(:archive), :archive, :title => title_path(:archive)%>
+    <%=link_to title_path(:about), :about, :title => title_path(:about)%>
+
+  </address>
+
+  <form action="<%=path_to :search%>" method="get">
+    <input type="text" name="keyword" value="<%=title_path :search%>" onfocus="this.value=''" onblur="this.value='<%=title_path :search%>'" title="<%=title_path :search%>"/>
+  </form>
+
+</div><!-- navigation-bar -->
+
+<br/>
+
+<div id="content">
+
+<%=yield%>
+
+</div>
+
+<div id="options">
+
+  <div class="entry">
+
+    <h1>Related Posts</h1>
+
+    <h2>Published</h2>
+    <ul>
+    <% for post in related_posts_in :posts %>
+      <li><%= link_to "#{post.publish_date} - #{post.title}", :posts, post, :title => post.title %></li>
+    <% end %>
+    </ul>
+
+    <h2>Archived</h2>
+    <ul>
+    <% for post in related_posts_in :archive %>
+      <li><%= link_to "#{post.publish_date} - #{post.title}", :archive, post, :title => post.title %></li>
+    <% end %>
+    </ul>
+  </div>
+
+  <div class="entry">
+
+    <h1>Related Tags</h1>
+
+    <ul>
+    <% for tag in all_related_tags %>
+      <li><%= link_to "#{tag.capitalize} (#{count_posts_by_tag(tag)})", :tags, tag, :title => tag.capitalize %></li>
+    <% end %>
+    </ul>
+
+  </div>
+
+  <div class="entry">
+
+    <div class="text">
+
+      <p>
+        <span><a href="http://github.com/hallison/postview" title="Project hosted by Github"><img alt="Project hosted by Github" src="http://github.com/images/modules/header/logov3.png" border="0" /></a></span>
+        <span><a href="http://www.pledgie.com/campaigns/5600" title="Donations"><img alt="Click here to lend your support to: postview and make a donation at www.pledgie.com !" src="http://www.pledgie.com/campaigns/5600.png?skin_name=chrome" border="0" /></a></span>
+      </p>
+
+      <p>
+        <span><a href="http://www.ruby-lang.org/" title="Ruby programming language"><img alt="Ruby programming language" src="<%=path_to "/images/ruby.png"%>" border="0" /></a></span>
+        <span><a href="http://rack.rubyforge.org/" title="Powers Web Applications"><img alt="Rack"src="<%=path_to "/images/rack.png"%>" border="0" /></a></span>
+        <span><a href="http://www.sinatrarb.com/" title="Sinatra DSL"><img alt="Sinatra DSL"src="<%=path_to "/images/sinatra.png"%>" border="0" /></a></span>
+      </p>
+
+    </div>
+
+  </div>
+
+</div><!-- options -->
+
+<br/>
+
+<div id="footer">
+
+  <p>
+    <small><%=site.title%> &copy; 2009 <%=site.author%>. Powered by <%=link_to Postview::Version, "http://github.com/hallison/postview"%>.</small>
+  </p>
+
+</div><!-- footer -->
+
+</body>
+
+</html>
+

data/test/fixtures/application/themes/gemstone/posts/index.erb

@@ -0,0 +1,21 @@
+<div class="entry">
+
+  <h1><%=title_path :posts%></h1> 
+
+  <div class="text">
+
+    <dl>
+      <% for post in all_posts %>
+      <dt>
+        <b><%=link_to "#{post.publish_date} - #{post.title}", posts_path, post%></b>
+        (<%= post.tags.map{ |tag| link_to tag.capitalize, tags_path, tag, :title => tag.capitalize }.join(', ') %>)
+      </dt>
+
+      <dd>
+        <%=post.summary%>
+      </dd>
+      <% end %>
+    </dl>
+  </div><!--text-->
+</div><!--entry-->
+

data/test/fixtures/application/themes/gemstone/posts/show.erb

@@ -0,0 +1,17 @@
+<div class="entry">
+
+  <h1><%= link_to current_post.title, posts_path, current_post %></h1> 
+
+  <span class="entry-meta">
+    Published at <%= current_post.publish_date.strftime('%A, %B %d, %Y') %>,
+    tagged with <%= current_post.tags.map{ |tag| link_to tag.capitalize, tags_path, tag, :title => tag.capitalize }.join(', ') %>.
+  </span>
+
+  <div class="text">
+
+  <%= current_post.content  %>
+
+  </div><!--text-->
+
+</div><!--entry-->
+

data/test/fixtures/application/themes/gemstone/search.erb

@@ -0,0 +1,40 @@
+<div class="entry">
+
+  <h1><%= title_path :search %> - Results for <%= params.values.to_s.split.join(', ') %></h1>
+
+  <div class="text">
+
+    <p>
+    <%= posts_found.size %> found in posts and <%= archived_posts_found.size %> found in archive.
+    </p>
+
+    <% unless posts_found.empty? %>
+    <h2><%= title_path :posts %></h2>
+
+    <ul>
+    <% for post in posts_found %>
+    <li>
+      <%= post.publish_date.strftime('%Y-%m-%d') %> - <strong><%= link_to post.title, posts_path, post, :title => post.title %></strong>
+      <span>(<%= post.tags.map{ |tag| link_to tag.capitalize, tags_path, tag, :title => tag.capitalize }.join(', ') %>)</span>
+    </li>
+    <% end %>
+    </ul>
+    <% end %>
+
+    <% unless archived_posts_found.empty? %>
+    <h2><%= title_path :archive %></h2>
+
+    <ul>
+    <% for post in archived_posts_found %>
+    <li>
+      <b><%= link_to "#{post.publish_date} - #{post.title}", archive_path, post, :title => post.title %></b>
+      <span>(<%= post.tags.map{ |tag| link_to tag.capitalize, tags_path, tag, :title => tag.capitalize }.join(', ') %>)</span>
+    </li>
+    <% end %>
+    </ul>
+    <% end %>
+
+  </div><!--text-->
+
+</div><!--entry-->
+