postview 0.8.1 → 0.9.0

data/lib/postview/cli/server_command.rb

@@ -47,7 +47,7 @@ private
     @arguments.summary_indent = "  "
     @arguments.summary_width  = 24
     @arguments.banner = <<-end_banner.gsub(/^[ ]{6}/, '')
-      #{Postview::Version}
+      #{Postview::version_summary}
 
       Usage:
         #{Postview.name.downcase} server <path> [options]
@@ -68,7 +68,7 @@ private
       puts error
       puts @arguments
     end
-    puts "#{Postview::Version}\n\n"
+    puts "#{Postview::version_summary}\n\n"
   end
 
   def load_server

data/lib/postview/extensions.rb

@@ -6,3 +6,13 @@ class Array
   end
 
 end
+
+class String
+
+  # Clean all spaces, non-words and digits.
+  def clean
+    gsub(/[ \W\d]/,'').downcase
+  end
+
+end
+

data/lib/postview/helpers.rb

@@ -33,6 +33,9 @@ module Helpers
   # All archived posts found by search.
   attr_reader :archived_posts_found
 
+  # HTTP status error message
+  attr_reader :error_message
+
   # Returns latest posts.
   def latest_posts(limit = 5)
     @all_posts.limit(limit) || []

data/lib/postview/settings.rb

@@ -7,16 +7,18 @@ class Settings
     :site => {
       :title     => "Postview",
       :subtitle  => "Post your articles",
-      :author    => "Hallison Batista",
-      :email     => "email@example.com",
+      :author    => "Postview",
+      :email     => "postview@example.com",
       :domain    => "example.com",
       :directory => "/var/www/example",
-      :theme     => "default"
+      :theme     => "default",
+      :token     => "e44257415827b00557ae5505f93e112d6158c4ba3c567aefbbff47288c6bf7cd" # Password: admin
     },
     :directories => {
       :posts   => "posts",
       :archive => "posts/archive",
-      :drafts  => "posts/drafts"
+      :drafts  => "posts/drafts",
+      :themes  => "themes"
     },
     :sections => {
       :root    => "/",
@@ -25,14 +27,14 @@ class Settings
       :archive => "/archive",
       :drafts  => "/drafts",
       :search  => "/search",
-      :about   => "/about"
+      :about   => "/about",
+      :manager => "/manager"
     }
   }
   FILE_NAME = "settings.yml"
   FILE_DIR  = "config"
-  FILE      = Postview::PATH.join(FILE_DIR, FILE_NAME)
 
-  attr_reader :site, :theme, :directories, :sections
+  attr_reader :site, :directories, :sections
 
   # Initialize the settings using attributes passed by arguments.
   # Only attributes valid are read. See DEFAULTS.
@@ -63,12 +65,12 @@ class Settings
 
   # Build a specific finder for directory.
   def build_finder_for(directory)
-    Postage::Finder.new(directory_for(directory))
+    Postage::Finder.new(path_to(directory))
   end
 
   # Load a default settings values from file placed in +config/settings.yml+.
   def self.load
-    load_file(FILE)
+    load_file(file)
   end
 
   # Load a specific settings file.
@@ -89,25 +91,25 @@ class Settings
 
   # Build settings file using DEFAULTS.
   def self.build_default_file
-    FILE.open "w+" do |file|
+    file.open "w+" do |file|
       file << DEFAULTS.to_yaml
-    end unless FILE.exist?
+    end unless file.exist?
   end
 
   # Returns settings file.
-  def file
-    FILE
+  def self.file
+    Postview::path.join(FILE_DIR, FILE_NAME)
   end
 
   # Check directory and returns file that matches with a pattern.
-  def file_names_for(directory, pattern = "**.*")
-    directory_for(directory, pattern)
+  def file_names_from(directory, pattern = "**.*")
+    path_to(directory, pattern)
   end
 
   # Returns a valid directory loaded from settings file.
-  def directory_for(name, *paths)
+  def path_to(name, *paths)
     return Pathname.new(directories[name], *paths) if directories[name].match(%r{^/.*})
-    PATH.join(directories[name], *paths)
+    Postview::path.join(directories[name], *paths)
   end
 
   # Parse all attributes to hash.

data/lib/postview/site.rb

@@ -24,6 +24,9 @@ class Site
   # Theme directory name.
   attr_accessor :theme
 
+  # Token pass.
+  attr_accessor :token
+
   # Finder for posts
   attr_accessor :find
 
@@ -49,7 +52,6 @@ class Site
   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
@@ -60,6 +62,16 @@ class Site
     [ find.posts(*values), find_in_archive.posts(*values) ]
   end
 
+  # Check authentication for user.
+  def authenticate?(username, password)
+    @token == self.class.tokenize(username, password, domain)
+  end
+
+  # Generate digest token.
+  def self.tokenize(username, password, domain)
+    Digest::SHA256.hexdigest("$#{username}?#{password}@#{domain}")
+  end
+
 end # class Site
 
 end #module Postview

data/lib/postview/version.rb

@@ -16,7 +16,7 @@ module Version #:nodoc: all
     end
 
     def to_s
-      "#{name.sub(/::.*/,'')} v#{tag} (#{info.date.strftime('%B, %d %Y')}, #{info.cycle})"
+      "#{name.sub(/::.*/,'')} v#{tag} (#{info.date.strftime('%B %d, %Y')}, #{info.cycle})"
     end
 
   end

data/tasks/package.rake

@@ -1,8 +1,86 @@
 require 'rake/gempackagetask'
 
+def files
+  #`git ls-files`.split.sort.reject{ |out| out =~ /^\./ || out =~ /^doc/ }
+  @files ||= OpenStruct.new :documents => Dir[*%w{ABOUT HISTORY LICENSE Rakefile VERSION README.rdoc}],
+                            :binaries => Dir[*%w{{bin,scripts}/**}],
+                            :libraries => Dir[*%w{{lib,tasks}/**/**.rb tasks/**/**.rake}],
+                            :tests => Dir[*%w{test/**.rb test/fixtures/**/**}],
+                            :resources => Dir[*%w{themes/**/**}]
+end
+
+def manifest
+  files.documents +
+  files.binaries  +
+  files.libraries +
+  files.tests     +
+  files.resources
+end
+
 def gemspec
-  load 'postview.gemspec' unless @gemspec
-  @gemspec
+  @gemspec ||= Gem::Specification.new do |spec|
+
+    # Global information
+    spec.platform = Gem::Platform::RUBY
+    spec.executable = "postview"
+    spec.name = Postview.name.downcase
+    spec.version = Postview::version_tag
+    spec.date = Postview::version_spec.date.to_s
+    spec.summary = Postview::about_info.summary
+    spec.description = Postview::about_info.description
+    spec.authors = Postview::about_info.authors
+    spec.email = Postview::about_info.email
+    spec.homepage = Postview::about_info.homepage
+
+    # Dependencies
+    spec.add_dependency "sinatra", ">= 0.9.1.1"
+    spec.add_dependency "sinatra-mapping", ">= 1.0.5"
+    spec.add_dependency "postage", ">= 0.1.4.1"
+
+    spec.files = manifest
+    spec.require_paths = ["lib"]
+    spec.test_files = files.tests
+    spec.has_rdoc = true
+    spec.extra_rdoc_files = %w{README.rdoc LICENSE}
+    spec.rdoc_options = [
+      "--line-numbers",
+      "--inline-source",
+      "--title", Postview::version_summary,
+      "--main", "README.rdoc"
+    ]
+    spec.rubyforge_project = spec.name
+    spec.rubygems_version = Gem::VERSION
+    spec.post_install_message = <<-end_message.gsub(/^[ ]{6}/,'')
+      #{'-'*78}
+      #{Postview::version_summary}
+
+      Thanks for use this lightweight blogware. Now, you can read your posts by
+      editing in your favorite editor.
+
+      Please, feedback in http://github.com/hallison/postview/issues.
+      #{'-'*78}
+    end_message
+  end
+end
+
+def gemspec_file
+  @gemspec_file ||= Pathname.new("#{gemspec.name}.gemspec")
+end
+
+namespace :gem do
+
+  file gemspec_file.to_s => gemspec.files do
+    when_writing "Creating #{gemspec_file}" do
+      gemspec_file.open "w+" do |spec|
+        spec << gemspec.to_yaml
+      end
+    end
+    puts "Successfully built #{gemspec_file}"
+  end
+
+  desc "Build #{gemspec_file}"
+  task :spec => [gemspec_file]
+
 end
 
 Rake::GemPackageTask.new gemspec do |pkg|

data/test/application_test.rb

@@ -3,12 +3,16 @@ $LOAD_PATH.unshift("#{File.dirname(__FILE__)}/..")
 require 'lib/postview'
 require 'test/unit'
 require 'rack/test'
-require 'test/helper'
+require 'test/customizations'
 
 class ApplicationTest < Test::Unit::TestCase
 
   include Rack::Test::Methods
 
+  def setup
+    Postview::path = "test/fixtures/application"
+  end
+
   def app
     @app = Postview::Application
 
@@ -18,29 +22,24 @@ class ApplicationTest < Test::Unit::TestCase
   end
 
   def test_should_return_ok_for_theme_resources
-    get app.theme_path "/images/favicon.ico" do |response|
+    get "/images/favicon.ico" do |response|
       assert response.ok?
-      assert_equal "http://example.org/images/favicon.ico/", last_request.url
+      assert_equal "http://example.org/images/favicon.ico", last_request.url
     end
 
-    get app.theme_path "/javascripts/gemstone.js" do |response|
+    get "/javascripts/postview.js" do |response|
       assert response.ok?
-      assert_equal "http://example.org/javascripts/gemstone.js/", last_request.url
+      assert_equal "http://example.org/javascripts/postview.js", last_request.url
     end
 
-    get app.theme_path "/stylesheets/gemstone.css" do |response|
+    get "/stylesheets/postview.css" do |response|
       assert response.ok?
-      assert_equal "http://example.org/stylesheets/gemstone.css/", last_request.url
+      assert_equal "http://example.org/stylesheets/postview.css", last_request.url
     end
 
-    get app.theme_path "/images/banners/banner.jpg" do |response|
+    get "/images/banners/banner.jpg" do |response|
       assert response.ok?
-      assert_equal "http://example.org/images/banners/banner.jpg/", last_request.url
-    end
-
-    # TOFIX: Fix test to check security.
-    get app.theme_path "/images/trojan.com" do |response|
-      #assert !response.ok?
+      assert_equal "http://example.org/images/banners/banner.jpg", last_request.url
     end
   end
 
@@ -91,6 +90,7 @@ class ApplicationTest < Test::Unit::TestCase
   end
 
   def test_should_return_ok_in_drafts_path
+    authorize("Jack Ducklet", "s3kr3t")
     get app.drafts_path do |response|
       assert response.ok?
       assert_equal "http://example.org/drafts/", last_request.url
@@ -98,6 +98,7 @@ class ApplicationTest < Test::Unit::TestCase
   end
 
   def test_should_return_ok_in_drafts_path_with_params
+    authorize("Jack Ducklet", "s3kr3t")
     get app.drafts_path "2009/07/30/fifth_article" do |response|
       assert response.ok?
       assert_equal "http://example.org/drafts/2009/07/30/fifth_article/", last_request.url
@@ -118,5 +119,19 @@ class ApplicationTest < Test::Unit::TestCase
     end
   end
 
+  should "return ok in authorize path" do
+    authorize("Jack Ducklet", "s3kr3t")
+    get app.manager_path do |response|
+      assert response.ok?
+      assert_equal "http://example.org/manager/", last_request.url
+    end
+  end
+
+  should "load shared themes" do
+    site_path = Pathname.new("test/fixtures/site").expand_path
+    Postview::path = site_path.join("blog")
+    assert_equal site_path.join("themes/mytheme"), app.theme
+  end
+
 end
 

data/test/{extensions.rb → customizations.rb}

@@ -21,3 +21,4 @@ module Test::Unit
  
   end
 end
+

data/test/fixtures/application/config/settings.yml

@@ -7,11 +7,13 @@
   :title: Postview
   :theme: default
   :subtitle: Post your articles
-  :theme: gemstone
+  :theme: mytheme
+  :token: 948632a3174ea34188f1f261d26941cabd8a5a42b27577ff8e400d2cd139c6e1
 :directories: 
   :posts: posts
   :archive: posts/archive
   :drafts: posts/drafts
+  :themes: themes
 :sections: 
   :about: about
   :posts: posts
@@ -20,3 +22,4 @@
   :search: search
   :tags: tags
   :drafts: drafts
+  :manager: manager

data/test/fixtures/application/themes/mytheme/templates/about.erb

@@ -0,0 +1 @@
+<%=Postview::about_to_html%>

data/test/fixtures/application/themes/mytheme/templates/archive/index.erb

@@ -0,0 +1,3 @@
+<%for post in all_archived_posts%>
+<%=post%>
+<%end%>

data/test/fixtures/application/themes/mytheme/templates/archive/show.erb

@@ -0,0 +1 @@
+<%=current_post%>

data/test/fixtures/application/themes/mytheme/templates/drafts/index.erb

@@ -0,0 +1,3 @@
+<%for post in all_drafted_posts%>
+<%=post%>
+<%end%>

data/test/fixtures/application/themes/mytheme/templates/drafts/show.erb

@@ -0,0 +1 @@
+<%=current_post%>

data/test/fixtures/application/themes/mytheme/templates/error.erb

@@ -0,0 +1 @@
+<%=error_message%>

data/test/fixtures/application/themes/mytheme/templates/index.erb

@@ -0,0 +1,3 @@
+<%for post in latest_posts%>
+<%=post.summary%>
+<%end%>

data/{themes/default → test/fixtures/application/themes/mytheme/templates}/layout.erb

@@ -5,7 +5,7 @@
 
   <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="generator"   content="<%=Postview::version_summary%>" />
   <meta name="description" content="<%=site.subtitle%>" />
   <meta name="keywords"    content="<%=page.keywords%>" />
   <link rel="shortcut icon" href="<%=path_to :images, "favicon.ico"%>" />
@@ -119,7 +119,7 @@
 <div id="footer">
 
   <p>
-    <small><%=site.title%> &copy; 2009 <%=site.author%>. Powered by <%=link_to Postview::Version, "http://github.com/hallison/postview"%>.</small>
+    <small><%=site.title%> &copy; 2009 <%=site.author%>. Powered by <%=link_to Postview::version_summary, "http://github.com/hallison/postview"%>.</small>
   </p>
 
 </div><!-- footer -->