postview 0.8.1 → 0.9.0

data/ABOUT

@@ -0,0 +1,9 @@
+:summary:
+  Simple blogware that render Markdown files.
+:description:
+  Postview is a simple blogware written in Ruby using the Sinatra DSL for render files written in Markdown.
+:authors:
+  - Hallison Batista
+:email: email@hallisonbatista.com
+:homepage: http://postview.rubyforge.org/
+

data/HISTORY

@@ -1,9 +1,35 @@
+[0.9.0 - 2009-10-14 - Features, enhancements and improvements]
+  New features, enhancements and small improvements
+
+  * Features
+    * Support for authentication has been added.
+
+  * Enhancements
+    * Added instructions for use Rack::Static to serve static theme files.
+    * Added content in error theme template file.
+    * Added marshalling content in postview.gemspec file.
+    * Added tasks for build Gemspec file.
+    * Tests have been fixed for authorization feature.
+
+  * Fixes
+    * Fixes in default theme file for render list of drafts.
+  * The application path has been fixed.
+
+  * Improvements
+    * Small improvements in code.
+
+[0.8.1 - 2009-09-17 - Updates]
+  * Added helper method for list all drafted posts.
+  * Added fixtures for tests in drafts path.
+  * Added new theme files for drafts.
+  * All unneeded path variables have been removed.
+
 [0.8.0 - 2009-09-15 - Improvements]
   * Added helper methods for improves all theme views source.
   * Added core extensions.
 
 [0.7.0 - 2009-09-10 - Features, enhancements and improvements]
-  New features and enhancements for version 0.7.0.
+  New features, enhancements and several improvements.
 
   * Features
     * Postview is a RubyGems project.

data/Rakefile

@@ -5,6 +5,7 @@ require 'net/ftp'
 require 'rake/testtask'
 require 'rake/packagetask'
 
+Rake::application.options.trace = true
 
 # Show text message in console.
 def banner(message)
@@ -100,7 +101,7 @@ def rsync(directory, destination = nil)
 end
 
 desc <<-end_desc.gsub(/^[ ]{2}/,'')
-  Create new post in #{settings.directory_for(:posts)}.
+  Create new post in #{settings.path_to(:posts)}.
   For edit posts, set environment variable EDITOR or VISUAL. Otherwise,
   pass editor="<your favorite editor command and arguments>".
 
@@ -176,3 +177,4 @@ Dir["tasks/**.rake"].each do |task_file|
   load task_file
 end
 
+task :default => :test

data/VERSION

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

data/bin/postview

@@ -12,7 +12,7 @@ ARGV.options do |arguments|
   arguments.summary_indent = "  "
   arguments.summary_width  = 24
   arguments.banner = <<-end_banner.gsub /^[ ]{4}/, ''
-    #{Postview::Version}
+    #{Postview::version_summary}
 
     Usage:
       #{program} <command> [options]
@@ -28,7 +28,7 @@ ARGV.options do |arguments|
   arguments.separator "Global options:"
 
   arguments.on("-h", "--help",    nil, "Show this message.")        { puts arguments }
-  arguments.on(nil,  "--version", nil, "Show version information.") { puts Postview::About }
+  arguments.on(nil,  "--version", nil, "Show version information.") { puts Postview::about }
 
   arguments.separator ""
 

data/lib/postview.rb

@@ -36,7 +36,7 @@ $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__))
 module Postview
 
   # RubyGems.
-  require 'rubygems'
+  require 'rubygems' unless $LOADED_FEATURES.include? 'rubygems.rb'
 
   # Core requires.
   require 'optparse' 
@@ -44,7 +44,6 @@ module Postview
   require 'ostruct'
 
   # 3rd part libraries/projects.
-  require 'rack'
   require 'sinatra/base' unless defined? ::Sinatra::Base
   require 'sinatra/mapping' unless defined? ::Sinatra::Mapping
   require 'postage' unless defined? ::Postage
@@ -56,18 +55,70 @@ module Postview
   # Root path for Postview source.
   ROOT = Pathname.new("#{File.dirname(__FILE__)}/..").expand_path
 
-  # Current path.
-  PATH = Pathname.new(".").expand_path
-
   # Auto-load all internal requires.
-  autoload :About,         'postview/about'
-  autoload :Version,       'postview/version'
-
-  autoload :Settings,      'postview/settings'
-  autoload :Site,          'postview/site'
-  autoload :Helpers,       'postview/helpers'
-  autoload :Application,   'postview/application'
-  autoload :CLI,           'postview/cli'
+  autoload :Settings,       'postview/settings'
+  autoload :Site,           'postview/site'
+  autoload :Helpers,        'postview/helpers'
+  autoload :Authentication, 'postview/authentication'
+  autoload :Application,    'postview/application'
+  autoload :CLI,            'postview/cli'
+
+  class << self
+
+    # Current application path.
+    def path
+      @path ||= Pathname.new(Dir.pwd).expand_path
+    end
+
+    # Change current directory path for load all settings from other
+    # path.
+    def path=(pathname)
+      @path = Pathname.new(pathname).expand_path
+    end
+
+    # Version
+    def version_spec
+      @version_spec ||= OpenStruct.new(YAML.load_file(ROOT.join("VERSION")))
+    end
+
+    # Current version tag.
+    def version_tag
+      %w{major minor patch release}.map do |tag|
+        version_spec.send(tag)
+      end.compact.join(".")
+    end
+
+    # Version information.
+    def version_summary
+      "#{name.sub(/::.*/,'')} v#{version_tag} (#{version_spec.date.strftime('%B %d, %Y')}, #{version_spec.cycle})"
+    end
+
+    # About information loaded from +ABOUT+ file.
+    def about_info
+      @about_info ||= OpenStruct.new(YAML.load_file(File.join(ROOT, "ABOUT")))
+    end
+
+    # About
+    def about
+      <<-end_info.gsub(/^[ ]{6}/,'')
+        #{version_summary}
+
+        Copyright (C) #{version_spec.timestamp.year} #{about_info.authors.join(', ')}
+
+        #{about_info.description}
+  
+        For more information, please see the project homepage
+        #{about_info.homepage}. Bugs, enhancements and improvements,
+        please send message to #{about_info.email}.
+      end_info
+    end
+
+    # Render about text to HTML.
+    def about_to_html
+      Maruku.new(about).to_html
+    end
+
+  end
 
 end # module Postview
 

data/lib/postview/application.rb

@@ -7,16 +7,16 @@ class Application < Sinatra::Base #:nodoc: all
 
   configure do
     set :settings, Postview::Settings.load
-    set :site,     settings.build_site
-    set :page,     settings.build_page
+    set :site, settings.build_site
+    set :page, settings.build_page
+    set :theme, settings.path_to(:themes).join(site.theme)
 
-    set :static, true
+    enable :static
+    enable :session
 
-    set :root,   Postview::PATH
-    set :public, Postview::PATH.join("public")
-    set :views,  Postview::PATH.join("themes", site.theme)
-
-    map :theme, "/"
+    set :root, Postview::path
+    set :public, root.join("public")
+    set :views, theme.join("templates")
 
     mapping settings.sections
   end
@@ -34,11 +34,7 @@ class Application < Sinatra::Base #:nodoc: all
 
   helpers Postview::Helpers
 
-  # Get theme resources
-  # TOFIX: Check security and other problems
-  get theme_path "/:resource/*.*" do |resource, file, ext|
-    send_file options.views.join(resource, "#{file}.#{ext}")
-  end
+  use Rack::Static, :urls => ["/stylesheets", "/images", "/javascripts"], :root => theme
 
   # Show all information for site.
   get root_path do
@@ -88,17 +84,23 @@ class Application < Sinatra::Base #:nodoc: all
 
   # Show all drafts.
   get drafts_path do
-    @all_tags = @site.find_in_drafts.all_tags.sort
-    @page.title, @page.keywords = title_path(:drafts), "drafts #{@all_tags.join(' ')}"
-    show :"drafts/index"
+    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|
-    @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"
+    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.
@@ -113,10 +115,21 @@ class Application < Sinatra::Base #:nodoc: all
     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
-  private :show
 
 end # class Application
 

data/lib/postview/authentication.rb

@@ -0,0 +1,36 @@
+module Postview
+
+# Copyright (c) 2009 Hallison Batista
+module Authentication
+
+  # ...
+  def authentication
+    @authentication ||= Rack::Auth::Basic::Request.new(request.env)
+  end
+ 
+  def username
+    env["REMOTE_USER"] || authentication.credentials.first
+  end
+
+  def password
+    authentication.credentials.last
+  end
+
+  # Run basic authentication.
+  def authenticate!
+    headers "WWW-Authenticate" => %(Basic realm="#{@site.title}") and
+    @error_message = "Not authorized\n" and throw(:halt, [401, erb(:error)]) and
+    return unless authenticated?
+  end
+
+  def authenticated?
+    authentication.provided?   &&
+    authentication.basic?      &&
+    authentication.credentials &&
+    @site.authenticate?(username, password)
+  end
+
+end # module Authorization
+
+end # module Postview
+

data/lib/postview/cli.rb

@@ -41,6 +41,16 @@ module CLI
       end
     end
 
+    def hidden_prompt label
+      while true
+        system "stty -echo"
+        printf "%1$s %2$s: ", " "*2, "#{label}"
+        value = $stdin.readline.chomp.strip
+        system "stty echo"
+        return value unless value.nil? || value.to_s.empty?
+      end
+    end
+
     def start process, &block
       printf "%1$s %2$s ", ">"*2, process
       if block_given?

data/lib/postview/cli/create_command.rb

@@ -21,7 +21,7 @@ class CreateCommand #:nodoc: all
     if args.first =~ /^\w.*|^\/\w.*/
       new(args.shift, args.options).run
     else
-      new(".", args.options).run
+      new(nil, args.options).run
     end
   end
 
@@ -40,7 +40,7 @@ private
     @arguments.summary_indent = "  "
     @arguments.summary_width  = 24
     @arguments.banner = <<-end_banner.gsub(/^[ ]{6}/, '')
-      #{Postview::Version}
+      #{Postview::version_summary}
 
       Usage:
         #{Postview.name.downcase} create <path>
@@ -55,21 +55,27 @@ private
     @arguments.separator ""
 
     begin
-      @arguments.parse!
+      unless @path
+        puts @arguments
+        exit 1
+      else
+        @arguments.parse!
+      end
     rescue => error
       puts error
       puts @arguments
     end
-    puts "#{Postview::Version}\n\n"
+    puts "#{Postview::version_summary}\n\n"
   end
 
   def build_settings
-    create_path
+    create_root_path
     if @options[:prompt]
       prompt_for_site_settings
       prompt_for_directories_settings
       prompt_for_sections_settings
     end
+    prompt_for_site_password
     create_settings
     create_directories
     create_default_theme
@@ -87,7 +93,7 @@ private
     end
   end
 
-  def create_path
+  def create_root_path
     start "Creating #{@path} path" do
       step { @path = Pathname.new(@path) }
       step { @path.exist? ? raise("Path #{@path} exist") : true }
@@ -131,37 +137,38 @@ private
   end
 
   def create_default_theme
-    create = lambda do |path|
-      start "Creating #{path}" do
-        step { path.exist? ? raise("Theme path #{path} exist") : true }
-        step { path.mkpath; true }
-        step { path.exist? }
-      end
-    end
+    create_path @theme
+    copy_default_theme @theme_default, @theme
+  end
 
-    copy = lambda do |origin, destination|
-      start "Creating #{destination}" do
-        step { destination.exist? ? raise("Theme file #{destination} exist") : true }
-        step { FileUtils.copy(origin, destination); true }
-        step { destination.exist? }
-      end
+  def create_path(path)
+    start "Creating #{path}" do
+      step { path.exist? ? raise("Path #{path} exist") : true }
+      step { path.mkpath; true }
+      step { path.exist? }
     end
+  end
 
-    create.call @theme
-
-    @theme_default.children.map do |origin|
-      if origin.directory?
-        path = @theme.join origin.basename
-        create.call path
-        origin.children.map do |file|
-          copy.call file, path.join(file.basename)
-        end
+  def copy_default_theme(origin, destination)
+    origin.children.map do |origin_path|
+      if origin_path.directory?
+        destination_path = destination.join(origin_path.basename)
+        create_path destination_path
+        copy_default_theme origin_path, destination_path
       else
-        copy.call origin, @theme.join(origin.basename)
+        copy_file origin_path, destination.join(origin_path.basename)
       end
     end
   end
 
+  def copy_file(origin, destination)
+    start "Creating #{destination}" do
+      step { destination.exist? ? raise("Theme file #{destination} exist") : true }
+      step { FileUtils.copy(origin, destination); true }
+      step { destination.exist? }
+    end
+  end
+
   def create_rackup
     config = @path.join("config.ru")
     start "Creating #{config} file" do
@@ -182,10 +189,10 @@ private
       rakefile.open("w+") do |file|
         content = []
         content << "require 'postview'\n"
+        content << "include Postview::CLI::Command\n"
         content << <<-'end_def'.gsub(/^[ ]{10}/, '')
           # Build default settings file and load.
           def settings
-            #Postview::Settings.build_default_file
             Postview::Settings.load
           end
         end_def
@@ -242,7 +249,7 @@ private
 
         content << <<-'end_task'.gsub(/^[ ]{10}/, '')
           desc <<-end_desc.gsub(/^[ ]{2}/,'')
-            Create new post in #{settings.directory_for(:posts)}.
+            Create new post in #{settings.path_to(:posts)}.
             For edit posts, set environment variable EDITOR or VISUAL. Otherwise,
             pass editor="<your favorite editor command and arguments>".
 
@@ -255,22 +262,22 @@ private
             $ rake post[other/path/for/new/post]
           end_desc
           task :post, [:directory] do |spec, args|
-            banner "New post. Type all attributes for new post.\n"
+            puts "New post. Type all attributes for new post.\n"
             path = if args.directory
                     if settings.directories.has_key? args.directory.to_sym 
-                      settings.directory_for(args.directory.to_sym)
+                      settings.path_to(args.directory.to_sym)
                     else
                       args.directory
                     end
                   else
-                    settings.directory_for(:drafts)
+                    settings.path_to(:drafts)
                   end
             post = Postage::Post.new :title        => prompt("Post title"),
                                     :publish_date => prompt("Publish date", Date.today),
                                     :tags         => prompt("Tags separated by spaces").split(' '),
                                     :filter       => :markdown,
-                                    :content      => <<-end_content.gsub(/^[ ]{29}/,'')
-                                      Tanks for use #{Postview}.
+                                    :content      => <<-end_content.gsub(/^[ ]{28}/,'')
+                                      Thanks for use #{Postview.version_summary}.
                                       Input here the content of your post.
                                     end_content
 
@@ -303,7 +310,7 @@ private
             settings.directories.keys.each do |dirname|
               desc "Synchronize #{dirname}."
               task dirname, [:destination] do |spec,args|
-                banner "Synchronize #{dirname} directory."
+                puts "Synchronize #{dirname} directory."
                 ftp(dirname, args.destination)
               end
             end
@@ -332,6 +339,15 @@ private
     end
   end
 
+  def prompt_for_site_password
+    init "Settings required for generate new token" do |site|
+      site[:author] = prompt "Author name", @settings.site[:author]
+      site[:domain] = prompt "Domain",      @settings.site[:domain],  %r{.*\..*}
+      site[:token]  = Postview::Site::tokenize(site[:author], hidden_prompt("Password"), site[:domain])
+      @site.update site
+    end
+  end
+
   def prompt_for_directories_settings
     init "Settings for directories" do |directories|
       directories[:posts]   = prompt "Posts",   @settings.directories[:posts]