postview 0.9.0 → 0.9.1

data/VERSION

@@ -2,7 +2,7 @@
 :minor: 9
 :release: 
 :cycle: Beta
-:patch: 0
+:patch: 1
 :timestamp: 2009-08-24 07:46:28 -04:00
-:date: 2009-10-14
+:date: 2009-10-23
 :major: 0

data/lib/postview.rb

@@ -1,6 +1,6 @@
-# Copyright (c) 2009 Hallison Batista
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__))
-
+# Copyright (c) 2009 Hallison Batista
+#
 # Postview - The minimalist blogware and static page generator.
 #
 # == Configuration
@@ -34,7 +34,6 @@ $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__))
 # theme. To help for this, read Helpers for more informations.
 #
 module Postview
-
   # RubyGems.
   require 'rubygems' unless $LOADED_FEATURES.include? 'rubygems.rb'
 
@@ -76,7 +75,7 @@ module Postview
       @path = Pathname.new(pathname).expand_path
     end
 
-    # Version
+    # Version specification loaded from +VERSION+ file.
     def version_spec
       @version_spec ||= OpenStruct.new(YAML.load_file(ROOT.join("VERSION")))
     end
@@ -98,9 +97,9 @@ module Postview
       @about_info ||= OpenStruct.new(YAML.load_file(File.join(ROOT, "ABOUT")))
     end
 
-    # About
+    # About text.
     def about
-      <<-end_info.gsub(/^[ ]{6}/,'')
+      <<-end_info.gsub(/^[ ]{8}/,'')
         #{version_summary}
 
         Copyright (C) #{version_spec.timestamp.year} #{about_info.authors.join(', ')}

data/lib/postview/application.rb

@@ -1,137 +1,25 @@
 module Postview
 
 # Copyright (c) 2009 Hallison Batista
-class Application < Sinatra::Base #:nodoc: all
+module Application
 
-  register Sinatra::Mapping
+  autoload :Blog, 'postview/application/blog'
 
-  configure do
-    set :settings, Postview::Settings.load
-    set :site, settings.build_site
-    set :page, settings.build_page
-    set :theme, settings.path_to(:themes).join(site.theme)
+  def self.call(env)
+    puts <<-end_msg.gsub(/^[ ]{6}/,'')
+      #{Postview::version_summary}
+      >> DEPRECATION WARNING
+         The run Postview::Application is deprecated. Instead use
+         Postview::Application::Blog to call blogware.
 
-    enable :static
-    enable :session
-
-    set :root, Postview::path
-    set :public, root.join("public")
-    set :views, theme.join("templates")
-
-    mapping settings.sections
-  end
-
-  before do
-    @page = options.page
-    @settings ||= options.settings
-    @site ||= options.site
-    @all_tags ||= @site.find_all_tags
-    @all_posts ||= @site.find.all_posts.reverse
-    @all_archived_posts ||= @site.find_in_archive.all_posts.reverse
-    @all_drafted_posts ||= @site.find_in_drafts.all_posts.reverse
-    @current_post ||= @all_posts.last
-  end
-
-  helpers Postview::Helpers
-
-  use Rack::Static, :urls => ["/stylesheets", "/images", "/javascripts"], :root => theme
-
-  # Show all information for site.
-  get root_path do
-    @page.title, @page.keywords = @site.subtitle, "posts"
-    show :index
-  end
-
-  # Show all posts.
-  get posts_path do
-    @page.title, @page.keywords = title_path(:posts), @all_tags.join(' ')
-    show :"posts/index"
-  end
-
-  # Show selected post.
-  get posts_path "/:year/:month/:day/:name" do |year, month, day, name|
-    @current_post = @site.find.post(year, month, day, name)
-    @page.title, @page.keywords = @current_post.title, @current_post.tags.join(' ')
-    show :"posts/show"
-  end
-
-  # Show all tags.
-  get tags_path do
-    @page.title, @page.keywords = title_path(:tags), @all_tags.join(' ')
-    show :"tags/index"
-  end
-
-  # Show all posts by selected tag.
-  get tags_path "/:tag" do |tag|
-    @current_tag = @site.find_tag(tag)
-    @posts_found, @archived_posts_found = @site.find_all_posts_tagged_with(tag)
-    @page.title, @page.keywords = "#{title_path(:tags)} - #{@current_tag.capitalize}", "posts #{@current_tag}"
-    show :"tags/show"
-  end
-
-  # Show archives grouped by year.
-  get archive_path do
-    @page.title, @page.keywords = title_path(:archive), @all_tags.join(' ')
-    show :"archive/index"
-  end
-
-  # Show selected post in archive.
-  get archive_path "/:year/:month/:day/:name" do |year, month, day, name|
-    @current_post = @site.find_in_archive.post(year, month, day, name)
-    @page.title, @page.keywords = @current_post.title, @current_post.tags.join(' ')
-    show :"archive/show"
-  end
-
-  # Show all drafts.
-  get drafts_path do
-    authenticate!
-    if authenticated?
-      @all_tags = @site.find_in_drafts.all_tags.sort
-      @page.title, @page.keywords = title_path(:drafts), "drafts #{@all_tags.join(' ')}"
-      show :"drafts/index"
-    end
-  end
-
-  # Show selected drafted post.
-  get drafts_path "/:year/:month/:day/:name" do |year, month, day, name|
-    authenticate!
-    if authenticated?
-      @current_post = @site.find_in_drafts.post(year, month, day, name)
-      @all_tags = @site.find_in_drafts.all_tags.sort
-      @page.title, @page.keywords = @current_post.title, @current_post.tags.join(' ')
-      show :"drafts/show"
-    end
-  end
-
-  # Show information site.
-  get about_path do
-    show :about
-  end
-
-  # Search posts by title or match file name.
-  get search_path do
-    @posts_found, @archived_posts_found = @site.search_posts(*params.values)
-    @page.title, @page.keywords = title_path(:search), @all_tags.join(' ')
-    show :search
-  end
-
-  get manager_path do
-    authenticate!
-    if authenticated?
-      @page.title, @page.keywords = title_path(:manager, :posts), @all_tags.join(' ')
-      show :"posts/index"
-    end
-  end
-
-private
-
-  include Postview::Authentication
-
-  def show(template, locals = {}, options = {})
-    erb template, options.update(:locals => locals)
+         Thanks.
+         
+         Visit http://github.com/hallison/postview/tree/news for more information.
+    end_msg
+    Blog.call(env)
   end
 
-end # class Application
+end # module Application
 
 end # module Postview
 

data/lib/postview/application/blog.rb

@@ -0,0 +1,141 @@
+module Postview
+
+module Application
+
+# Copyright (c) 2009 Hallison Batista
+class Blog < Sinatra::Base #:nodoc: all
+
+  register Sinatra::Mapping
+
+  configure do
+    set :settings, Postview::Settings.load
+    set :site, settings.build_site
+    set :page, settings.build_page
+    set :theme, settings.path_to(:themes).join(site.theme)
+
+    enable :static
+    enable :session
+
+    set :root, Postview::path
+    set :public, root.join("public")
+    set :views, theme.join("templates")
+
+    mapping settings.sections
+  end
+
+  before do
+    @page = options.page
+    @settings ||= options.settings
+    @site ||= options.site
+    @all_tags ||= @site.find_all_tags
+    @all_posts ||= @site.find.all_posts.reverse
+    @all_archived_posts ||= @site.find_in_archive.all_posts.reverse
+    @all_drafted_posts ||= @site.find_in_drafts.all_posts.reverse
+    @current_post ||= @all_posts.last
+  end
+
+  helpers Postview::Helpers
+
+  use Rack::Static, :urls => ["/stylesheets", "/images", "/javascripts"], :root => theme
+
+  # Show all information for site.
+  get root_path do
+    @page.title, @page.keywords = @site.subtitle, "posts"
+    show :index
+  end
+
+  # Show all posts.
+  get posts_path do
+    @page.title, @page.keywords = title_path(:posts), @all_tags.join(' ')
+    show :"posts/index"
+  end
+
+  # Show selected post.
+  get posts_path "/:year/:month/:day/:name" do |year, month, day, name|
+    @current_post = @site.find.post(year, month, day, name)
+    @page.title, @page.keywords = @current_post.title, @current_post.tags.join(' ')
+    show :"posts/show"
+  end
+
+  # Show all tags.
+  get tags_path do
+    @page.title, @page.keywords = title_path(:tags), @all_tags.join(' ')
+    show :"tags/index"
+  end
+
+  # Show all posts by selected tag.
+  get tags_path "/:tag" do |tag|
+    @current_tag = @site.find_tag(tag)
+    @posts_found, @archived_posts_found = @site.find_all_posts_tagged_with(tag)
+    @page.title, @page.keywords = "#{title_path(:tags)} - #{@current_tag.capitalize}", "posts #{@current_tag}"
+    show :"tags/show"
+  end
+
+  # Show archives grouped by year.
+  get archive_path do
+    @page.title, @page.keywords = title_path(:archive), @all_tags.join(' ')
+    show :"archive/index"
+  end
+
+  # Show selected post in archive.
+  get archive_path "/:year/:month/:day/:name" do |year, month, day, name|
+    @current_post = @site.find_in_archive.post(year, month, day, name)
+    @page.title, @page.keywords = @current_post.title, @current_post.tags.join(' ')
+    show :"archive/show"
+  end
+
+  # Show all drafts.
+  get drafts_path do
+    authenticate!
+    if authenticated?
+      @all_tags = @site.find_in_drafts.all_tags.sort
+      @page.title, @page.keywords = title_path(:drafts), "drafts #{@all_tags.join(' ')}"
+      show :"drafts/index"
+    end
+  end
+
+  # Show selected drafted post.
+  get drafts_path "/:year/:month/:day/:name" do |year, month, day, name|
+    authenticate!
+    if authenticated?
+      @current_post = @site.find_in_drafts.post(year, month, day, name)
+      @all_tags = @site.find_in_drafts.all_tags.sort
+      @page.title, @page.keywords = @current_post.title, @current_post.tags.join(' ')
+      show :"drafts/show"
+    end
+  end
+
+  # Show information site.
+  get about_path do
+    show :about
+  end
+
+  # Search posts by title or match file name.
+  get search_path do
+    @posts_found, @archived_posts_found = @site.search_posts(*params.values)
+    @page.title, @page.keywords = title_path(:search), @all_tags.join(' ')
+    show :search
+  end
+
+  get manager_path do
+    authenticate!
+    if authenticated?
+      @page.title, @page.keywords = title_path(:manager, :posts), @all_tags.join(' ')
+      show :"posts/index"
+    end
+  end
+
+private
+
+  include Postview::Authentication
+
+  def show(template, locals = {}, options = {})
+    erb template, options.update(:locals => locals)
+  end
+
+end # class Blog
+
+end # module Application
+
+end # module Postview
+

data/lib/postview/authentication.rb

@@ -3,7 +3,7 @@ module Postview
 # Copyright (c) 2009 Hallison Batista
 module Authentication
 
-  # ...
+  # Returns a HTTP Basic authentication.
   def authentication
     @authentication ||= Rack::Auth::Basic::Request.new(request.env)
   end
@@ -16,7 +16,7 @@ module Authentication
     authentication.credentials.last
   end
 
-  # Run basic authentication.
+  # Run HTTP Basic authentication.
   def authenticate!
     headers "WWW-Authenticate" => %(Basic realm="#{@site.title}") and
     @error_message = "Not authorized\n" and throw(:halt, [401, erb(:error)]) and

data/lib/postview/cli.rb

@@ -47,6 +47,7 @@ module CLI
         printf "%1$s %2$s: ", " "*2, "#{label}"
         value = $stdin.readline.chomp.strip
         system "stty echo"
+        puts
         return value unless value.nil? || value.to_s.empty?
       end
     end

data/lib/postview/cli/server_command.rb

@@ -77,17 +77,6 @@ private
       step { @server ||= "mongrel" }
       step { @options[:Host] ||= "0.0.0.0" }
       step { @options[:Port] ||= "9000" }
-      step { @path = Pathname.new(@path) }
-      step { @config = @path.join("config.ru") }
-      step do
-        unless @config.exist?
-          raise "Configuration #{@config} not found"
-        else
-          true
-        end
-      end
-      step { @source = @config.read }
-      step { @source = @source.gsub(/^require[ ]'postview'/,'') }
       step { @server = Rack::Handler::WEBrick }
     end
   end
@@ -96,12 +85,12 @@ private
   def start_server
     init "Postview starting #{@server} on #{@options[:Host]}:#{@options[:Port]}" do
       ENV['RACK_ENV'] = "production"
-      config = @config.to_s
-      @postview = eval("Rack::Builder.new{(\n#{@source}\n)}.to_app", nil, config)
-      @application = Rack::Builder.new do |application|
+      Postview::path = @path
+      puts "PATH: #{Postview::path}"
+      @postview = Rack::Builder.new do |application|
         use Rack::CommonLogger, STDOUT
         use Rack::ShowExceptions
-        run application
+        run Postview::Application
       end.to_app
     end
     @server.run(@postview, @options)

data/lib/postview/settings.rb

@@ -3,6 +3,7 @@ module Postview
 # Copyright (c) 2009 Hallison Batista
 class Settings
 
+  # Default values that will be used for valid attributes in settings file.
   DEFAULTS = {
     :site => {
       :title     => "Postview",
@@ -34,7 +35,14 @@ class Settings
   FILE_NAME = "settings.yml"
   FILE_DIR  = "config"
 
-  attr_reader :site, :directories, :sections
+  # Site attributes
+  attr_reader :site
+
+  # Directories that be used for load files.
+  attr_reader :directories
+
+  # Section names that be used in mapping routes into application.
+  attr_reader :sections
 
   # Initialize the settings using attributes passed by arguments.
   # Only attributes valid are read. See DEFAULTS.

data/tasks/documentation.rake

@@ -6,11 +6,11 @@ rescue LoadError
 end
 
 desc "Generate RDoc API documentation."
-Rake::RDocTask.new("doc:api") do |doc|
+Rake::RDocTask.new("doc") do |doc|
   doc.title    = Postview.name
   doc.main     = %q{README.rdoc}
   doc.options  = %w{--line-numbers --show-hash}
-  doc.rdoc_dir = %q{doc/api}
+  doc.rdoc_dir = %q{doc}
   doc.rdoc_files.include %w{
     HISTORY
     LICENSE

data/test/{application_test.rb → blog_application_test.rb}

@@ -5,23 +5,23 @@ require 'test/unit'
 require 'rack/test'
 require 'test/customizations'
 
-class ApplicationTest < Test::Unit::TestCase
+class BlogApplicationTest < Test::Unit::TestCase
 
   include Rack::Test::Methods
 
   def setup
-    Postview::path = "test/fixtures/application"
+    Postview::path = "test/fixtures/blog"
   end
 
   def app
-    @app = Postview::Application
+    @app = Postview::Application::Blog
 
     @app.set :root, "#{File.dirname(__FILE__)}/.."
     @app.set :environment, :test
     @app
   end
 
-  def test_should_return_ok_for_theme_resources
+  should "return ok for theme resources" do
     get "/images/favicon.ico" do |response|
       assert response.ok?
       assert_equal "http://example.org/images/favicon.ico", last_request.url
@@ -43,53 +43,53 @@ class ApplicationTest < Test::Unit::TestCase
     end
   end
 
-  def test_should_return_ok_in_root_path
+  should "return ok in root path" do
     get app.root_path do |response|
       assert response.ok?
     end
   end
 
-  def test_should_return_ok_in_posts_path
+  should "return ok in posts path" do
     get app.posts_path do |response|
       assert response.ok?
     end
   end
 
-  def test_should_return_ok_in_posts_path_with_params
+  should "return ok in posts path with params" do
     get app.posts_path "/2009/06/02/fourth_article" do |response|
       assert response.ok?
       assert_equal "http://example.org/posts/2009/06/02/fourth_article/", last_request.url
     end
   end
 
-  def test_should_return_ok_in_tags_path
+  should "return ok in tags path" do
     get app.tags_path do |response|
       assert response.ok?
       assert_equal "http://example.org/tags/", last_request.url
     end
   end
 
-  def test_should_return_ok_in_tags_path_with_params
+  should "return ok in tags path with params" do
     get app.tags_path "t1" do |response|
       assert response.ok?
       assert_equal "http://example.org/tags/t1/", last_request.url
     end
   end
 
-  def test_should_return_ok_in_archive_path
+  should "return ok in archive path" do
     get app.archive_path do |response|
       assert response.ok?
     end
   end
 
-  def test_should_return_ok_in_archive_path_with_params
+  should "return ok in archive path with params" do
     get app.archive_path "2008/06/02/second_article" do |response|
       assert response.ok?
       assert_equal "http://example.org/archive/2008/06/02/second_article/", last_request.url
     end
   end
 
-  def test_should_return_ok_in_drafts_path
+  should "return ok in drafts path" do
     authorize("Jack Ducklet", "s3kr3t")
     get app.drafts_path do |response|
       assert response.ok?
@@ -97,7 +97,7 @@ class ApplicationTest < Test::Unit::TestCase
     end
   end
 
-  def test_should_return_ok_in_drafts_path_with_params
+  should "return ok in drafts path with params" do
     authorize("Jack Ducklet", "s3kr3t")
     get app.drafts_path "2009/07/30/fifth_article" do |response|
       assert response.ok?
@@ -105,13 +105,13 @@ class ApplicationTest < Test::Unit::TestCase
     end
   end
 
-  def test_should_return_ok_in_about_path
+  should "return ok in about path" do
     get app.about_path do |response|
       assert response.ok?
     end
   end
 
-  def test_should_return_ok_in_search_path
+  should "return ok in search path" do
     get app.search_path, :anythink => "first" do |response|
       assert response.ok?
       assert_equal "first", last_request.params.values.to_s