staticpress 0.4.0 → 0.5.0

data/Rakefile

@@ -8,7 +8,7 @@ task :tests, :path do |t, args|
   args.with_defaults(:path => 'tests')
 
   run_recursively = lambda do |dir|
-    Pathname.new(dir).expand_path.children.each do |dir_or_test|
+    Pathname(dir).expand_path.children.each do |dir_or_test|
       if dir_or_test.directory?
         run_recursively.call dir_or_test
       elsif dir_or_test.to_s.end_with? '_test.rb'
@@ -19,3 +19,48 @@ task :tests, :path do |t, args|
 
   run_recursively.call args[:path]
 end
+
+desc 'Enumerate annotations. Optionally takes a pipe-separated list of tags to process'
+task :notes, :types do |t, args|
+  args.with_defaults :types => 'FIXME|TODO'
+
+  types = args[:types].split '|'
+  finder = /.*# ?(?<type>[A-Z]+):? (?<note>.+)$/
+  result = Hash.new { |hash, key| hash[key] = {} }
+
+  `git ls-files`.split("\n").each do |p|
+    path = Pathname(p)
+    line_number = 0
+
+    path.each_line do |line|
+      line_number += 1
+
+      if match = finder.match(line)
+        result[path][line_number] = { :type => match[:type], :note => match[:note] } if types.include? match[:type]
+      end
+    end rescue nil
+  end
+
+  numbers = []
+
+  result.each do |path, lines|
+    lines.each do |number, note|
+      numbers << number
+    end
+  end
+
+  number_width = numbers.max.to_s.length
+  type_width = types.max_by { |type| type.to_s.length }.to_s.length
+
+  result.each do |path, lines|
+    puts "\e[1m#{path}\e[0m:"
+
+    lines.each do |number, note|
+      line_number = "[\e[1m#{number.to_s.rjust(number_width)}\e[0m]"
+      type = "[\e[0;37m#{note[:type]}\e[0m]"
+      puts "  * #{line_number} #{type.ljust(type_width + type.length - note[:type].length)} #{note[:note]}"
+    end
+
+    puts
+  end
+end

data/features/happy_path.feature

@@ -93,6 +93,11 @@ Feature: The happy path
       | public/index.html       |
       | public/about/index.html |
 
+  Scenario: Building a site (verbose)
+    Given a blog with content exists
+    When I run `staticpress build --verbose`
+    Then the output should contain "    page public/about/index.html"
+
   Scenario: Building a site a custom homepage
     Given a blog with content exists
     And I write to "content/index.markdown" with:
@@ -102,6 +107,11 @@ Feature: The happy path
       ---
       in custom page
       """
+    # FIXME hacky-hack to keep Tilt happy
+    # NOTE this does not seem to be an issue when running this command for real
+    And I require "haml"
+    And I require "redcarpet"
+    And I require "sass"
     When I run `staticpress build`
     Then the file "public/index.html" should contain exactly:
       """

data/features/step_definitions/staticpress_steps.rb

@@ -16,6 +16,10 @@ Given /^the blog has been previously built$/ do
   Staticpress::CLI.new.build
 end
 
+Given /^I require "([^"]*)"$/ do |library|
+  require library
+end
+
 
 Then /^a post named "([^"]*)" should exist$/ do |post_title|
   now = Time.now.utc

data/lib/staticpress.rb

@@ -2,7 +2,7 @@ require 'pathname'
 
 module Staticpress
   def self.blog_path
-    Pathname.new(@path || '.').expand_path
+    Pathname(@path || '.').expand_path
   end
 
   def self.blog_path=(path)
@@ -10,6 +10,6 @@ module Staticpress
   end
 
   def self.root
-    Pathname.new File.expand_path('..', __FILE__)
+    Pathname File.expand_path('..', __FILE__)
   end
 end

data/lib/staticpress/cli.rb

@@ -1,7 +1,6 @@
 # http://practicingruby.com/articles/shared/ozkzbsdmagcm
 
 require 'fileutils'
-require 'pathname'
 require 'rack'
 require 'thor'
 
@@ -10,6 +9,7 @@ require 'staticpress/error'
 require 'staticpress/helpers'
 require 'staticpress/plugin'
 require 'staticpress/pusher'
+require 'staticpress/settings'
 require 'staticpress/site'
 require 'staticpress/version'
 
@@ -23,11 +23,18 @@ module Staticpress
     map ['-h', '--help'] => :help
     map ['-v', '--version'] => :version
 
+    class_option '--verbose', :type => :boolean, :default => false, :required => false, :desc => 'Output information as the task is running'
+
+    def initialize(*args)
+      super
+      Staticpress::Settings.set! options
+    end
+
     desc 'help [task]', 'Describe available tasks or one specific task'
     def help(*args)
       general_usage = <<-USAGE
 Usage:
-  staticpress <task> <required-argument> [option-argument]
+  staticpress <task> <required-argument> [option-argument] [--options...]
 
       USAGE
       puts general_usage if args.empty?
@@ -97,9 +104,10 @@ customizations. If [theme-name] is blank, copies the currently configured theme
     end
 
     desc 'list [method]', 'Send [method] to every content and output the result, or list all content if [method] is not present'
-    def list(method = nil)
-      all_content = Staticpress::Site.new.all_content
-      puts(method ? all_content.map(&method.to_sym) : all_content)
+    def list(method = :to_s)
+      Staticpress::Site.new.each do |content|
+        puts(content.respond_to?(method) ? content.send(method) : content)
+      end
     end
 
     desc 'build', 'Prepare blog for deployment'

data/lib/staticpress/content/base.rb

@@ -16,7 +16,7 @@ module Staticpress::Content
 
     attr_reader :params
 
-    def initialize(params)
+    def initialize(params = {})
       clean_params = params.select { |key, value| value }.map do |key, value|
         cast_value = case Staticpress::Route::REGEX_STUBS[key].klass
           when :integer then Integer value rescue value
@@ -101,10 +101,19 @@ module Staticpress::Content
     end
 
     def save
-      unless output_path.file?
-        FileUtils.mkdir_p output_path.dirname
-        output_path.open('w') { |f| f.write render }
+      save! unless output_path.file?
+    end
+
+    def save!
+      if settings.verbose
+        width = config.routes.to_hash.keys.max_by { |sym| sym.to_s.length }.to_s.length
+        type = self.class.type.rjust width
+        path = output_path.to_s.sub Staticpress.blog_path.to_s + '/', ''
+        puts "#{type} #{path}"
       end
+
+      FileUtils.mkdir_p output_path.dirname
+      output_path.open('w') { |f| f.write render }
     end
 
     def template_context

data/lib/staticpress/content/category.rb

@@ -8,8 +8,19 @@ module Staticpress::Content
     extend CollectionContent
     extend ResourceContent
 
+    attr_reader :name
+
+    def initialize(params)
+      @name = params[:name]
+      super
+    end
+
     def optional_param_defaults
-      { :number => 1 }
+      { :number => pages_count }
+    end
+
+    def pages_count
+      (self.class.content_by_category[name].count / config.posts_per_page.to_f).ceil
     end
 
     def sub_content
@@ -21,9 +32,15 @@ module Staticpress::Content
     end
 
     def self.all
-      categories.map do |category|
-        new :name => category, :number => '1'
+      reply = []
+
+      content_by_category.each do |category, posts|
+        1.upto paginate(posts).count do |number|
+          reply << new(:name => category, :number => number)
+        end
       end
+
+      reply
     end
 
     def self.categories
@@ -31,7 +48,7 @@ module Staticpress::Content
     end
 
     def self.content_by_category
-      reply = {}
+      reply = Hash.new { |hash, key| hash[key] = [] }
       Staticpress::Content::Post.all.each do |post|
         (post.meta.categories || []).each do |category|
           (reply[category] ||= []) << post

data/lib/staticpress/content/index.rb

@@ -1,5 +1,6 @@
 require 'staticpress'
 require 'staticpress/content/base'
+require 'staticpress/content/post'
 require 'staticpress/content/collection_content'
 
 module Staticpress::Content
@@ -7,11 +8,15 @@ module Staticpress::Content
     extend CollectionContent
 
     def optional_param_defaults
-      { :number => 1 }
+      { :number => pages_count }
+    end
+
+    def pages_count
+      (self.class.all_posts.count / config.posts_per_page.to_f).ceil
     end
 
     def sub_content
-      paginate(Staticpress::Content::Post.all)[params[:number] - 1]
+      paginate(self.class.all_posts.sort)[params[:number] - 1]
     end
 
     def template_path
@@ -19,9 +24,17 @@ module Staticpress::Content
     end
 
     def self.all
-      [
-        new(:number => '1')
-      ]
+      reply = []
+
+      1.upto paginate(all_posts).count do |number|
+        reply << new(:number => number)
+      end
+
+      reply
+    end
+
+    def self.all_posts
+      Staticpress::Content::Post.all
     end
   end
 end

data/lib/staticpress/content/page.rb

@@ -18,7 +18,7 @@ module Staticpress::Content
     def initialize(params)
       super
 
-      index = extensionless_basename Pathname.new(config.index_file)
+      index = extensionless_basename Pathname(config.index_file)
 
       @full_slug = params[:slug]
       @extension = find_supported_extension(Staticpress.blog_path + config.source_path + full_slug)
@@ -32,6 +32,10 @@ module Staticpress::Content
       end
     end
 
+    def save
+      save!
+    end
+
     def static?
       (Staticpress.blog_path + config.source_path + params[:slug]).file?
     end
@@ -64,7 +68,7 @@ module Staticpress::Content
     def self.find_by_path(path)
       if path.file?
         raw_slug = parse_slug(path, (Staticpress.blog_path + config.source_path)).first
-        basename = extensionless_basename Pathname.new(config.index_file)
+        basename = extensionless_basename Pathname(config.index_file)
         slug = raw_slug.sub(/.*(\/?#{basename})$/, '')
         new :slug => slug
       end

data/lib/staticpress/content/resource_content.rb

@@ -1,3 +1,5 @@
+require 'pathname'
+
 require 'staticpress'
 require 'staticpress/content/static_content'
 
@@ -6,7 +8,7 @@ module Staticpress::Content
     # FIXME add tests
     def find_supported_extension(extensionless_path)
       Staticpress::Content::StaticContent.supported_extensions.detect do |extension|
-        extension.to_sym if Pathname.new("#{extensionless_path}.#{extension}").file?
+        extension.to_sym if Pathname("#{extensionless_path}.#{extension}").file?
       end
     end
 

data/lib/staticpress/content/tag.rb

@@ -8,8 +8,19 @@ module Staticpress::Content
     extend CollectionContent
     extend ResourceContent
 
+    attr_reader :name
+
+    def initialize(params)
+      @name = params[:name]
+      super
+    end
+
     def optional_param_defaults
-      { :number => 1 }
+      { :number => pages_count }
+    end
+
+    def pages_count
+      (self.class.content_by_tag[name].count / config.posts_per_page.to_f).ceil
     end
 
     def sub_content
@@ -21,9 +32,15 @@ module Staticpress::Content
     end
 
     def self.all
-      tags.map do |tag|
-        new :name => tag, :number => '1'
+      reply = []
+
+      content_by_tag.each do |tag, posts|
+        1.upto paginate(posts).count do |number|
+          reply << new(:name => tag, :number => number)
+        end
       end
+
+      reply
     end
 
     def self.tags
@@ -31,7 +48,7 @@ module Staticpress::Content
     end
 
     def self.content_by_tag
-      reply = {}
+      reply = Hash.new { |hash, key| hash[key] = [] }
       Staticpress::Content::Post.all.each do |post|
         (post.meta.tags || []).each do |tag|
           (reply[tag] ||= []) << post

data/lib/staticpress/helpers.rb

@@ -1,5 +1,8 @@
+require 'pathname'
+
 require 'staticpress'
 require 'staticpress/configuration'
+require 'staticpress/settings'
 
 module Staticpress
   module Helpers
@@ -14,7 +17,7 @@ module Staticpress
 
     def extensionless_path(pathname)
       path = pathname.to_path
-      Pathname.new path[0...(path.length - pathname.extname.length)]
+      Pathname path[0...(path.length - pathname.extname.length)]
     end
 
     def hash_from_array(array, &block)
@@ -48,6 +51,10 @@ module Staticpress
       reply
     end
 
+    def settings
+      Staticpress::Settings.instance
+    end
+
     def spider_directory(dir, &block)
       dir.children.map do |child|
         if child.directory?

data/lib/staticpress/js_object.rb

@@ -16,6 +16,10 @@ module Staticpress
       method_missing key.to_s.to_sym
     end
 
+    def merge(other)
+      self.class.new to_hash.merge(other.to_hash)
+    end
+
     def to_hash
       converted = {}
 

data/lib/staticpress/settings.rb

@@ -0,0 +1,18 @@
+require 'staticpress'
+require 'staticpress/js_object'
+
+module Staticpress
+  class Settings < JSObject
+    def self.default
+      new 'verbose' => false
+    end
+
+    def self.instance
+      new(default.to_hash.merge(@runtime_settings || {}))
+    end
+
+    def self.set!(settings)
+      (@runtime_settings ||= {}).merge!(settings)
+    end
+  end
+end

data/lib/staticpress/site.rb

@@ -22,6 +22,7 @@ module Staticpress
       Staticpress::Content::Theme
     ]
 
+    include Enumerable
     include Staticpress::Helpers
 
     attr_reader :directory
@@ -30,8 +31,21 @@ module Staticpress
       @directory = Staticpress.blog_path + config.source_path
     end
 
-    def all_content
-      CONTENT_TYPES.map(&:all).flatten
+    def each(&block)
+      threads = []
+      semaphore = Mutex.new
+
+      CONTENT_TYPES.each do |content_type|
+        threads << Thread.new do
+          content_type.all.each do |content|
+            semaphore.synchronize do
+              block.call content
+            end
+          end
+        end
+      end
+
+      threads.each &:join
     end
 
     def find_content_by_env(env)
@@ -47,15 +61,13 @@ module Staticpress
 
     def meta
       # or something...
-      all_content.inject(Staticpress::Metadata.new) do |m, page|
-        m << page.meta
-      end
+      inject(Staticpress::Metadata.new) { |meta, content| meta << content.meta }
     end
 
     def save
       destination = Staticpress.blog_path + config.destination_path
       FileUtils.rm_r destination if destination.directory?
-      all_content.each &:save
+      each &:save
     end
   end
 end

data/lib/staticpress/version.rb

@@ -1,12 +1,16 @@
 module Staticpress
-  # TODO figure out how to implement Gem::Version properly
   class Version
-    MAJOR = 0
-    MINOR = 4
-    PATCH = 0
+    extend Comparable
+
+    SIGNATURE = [0, 5, 0]
+
+    def self.<=>(other)
+      other = other.split('.').map(&:to_i) if other.respond_to? :split
+      SIGNATURE <=> Array(other)
+    end
 
     def self.to_s
-      [ MAJOR, MINOR, PATCH ].join '.'
+      SIGNATURE.join('.')
     end
   end
 end

data/staticpress.gemspec

@@ -4,7 +4,7 @@ require File.expand_path('../lib/staticpress/version', __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = 'staticpress'
-  s.version     = Staticpress::Version.to_s
+  s.version     = Staticpress::Version
   s.authors     = ['Raving Genius']
   s.email       = ['rg+code@ravinggenius.com']
   s.summary     = 'Blog-centric static site builder'

data/tests/staticpress/content/base_test.rb

@@ -13,7 +13,7 @@ class ContentBaseTest < TestCase
   let(:category_1) { Staticpress::Content::Category.new(:name => 'programming', :number => '1') }
   let(:category_2) { Staticpress::Content::Category.new(:name => 'programming', :number => '2') }
 
-  let(:index) { Staticpress::Content::Index.new :number => 1 }
+  let(:index) { Staticpress::Content::Index.new }
   let(:index_2) { Staticpress::Content::Index.new :number => 2 }
 
   let(:page) { Staticpress::Content::Page.new(:slug => 'about') }
@@ -57,6 +57,7 @@ class ContentBaseTest < TestCase
     refute_operator asset_style, :==, nil
 
     refute_operator Staticpress::Content::Category.new(:name => 'programming'), :==, Staticpress::Content::Tag.new(:name => 'programming')
+    refute_operator Staticpress::Content::Tag.new(:name => 'charlotte'), :==, Staticpress::Content::Category.new(:name => 'charlotte')
   end
 
   def test_content_type

data/tests/staticpress/content/category_test.rb

@@ -2,21 +2,44 @@ require_relative '../../test_case'
 
 require 'staticpress/content/category'
 require 'staticpress/content/post'
+require 'staticpress/helpers'
 
 class ContentCategoryTest < TestCase
+  include Staticpress::Helpers
+
   let(:category) { Staticpress::Content::Category.new :name => 'programming' }
 
   def test_categories
     assert_equal [ 'programming', 'travel' ], Staticpress::Content::Category.categories
   end
 
+  def test_pages_count
+    assert_equal 1, category.pages_count
+
+    with_config :posts_per_page => 2 do
+      assert_equal 2, category.pages_count
+    end
+  end
+
   def test_sub_content
-    assert_equal 3, category.sub_content.count
+    expected = [
+      Staticpress::Content::Post.new(:year => '2011', :month => '08', :day => '01', :title => 'announcing-staticpress'),
+      Staticpress::Content::Post.new(:year => '2011', :month => '08', :day => '02', :title => 'staticpress'),
+      Staticpress::Content::Post.new(:year => '2011', :month => '08', :day => '06', :title => 'blogging-with-staticpress')
+    ]
+    assert_equal expected, category.sub_content
   end
 
   def test_all
-    assert_equal 2, Staticpress::Content::Category.all.count
-    assert Staticpress::Content::Category.all.include?(category)
+    with_config :posts_per_page => 1 do
+      expected = [
+        Staticpress::Content::Category.new(:name => 'programming', :number => 1),
+        Staticpress::Content::Category.new(:name => 'programming', :number => 2),
+        Staticpress::Content::Category.new(:name => 'programming', :number => 3),
+        Staticpress::Content::Category.new(:name => 'travel', :number => 1)
+      ]
+      assert_equal expected, Staticpress::Content::Category.all
+    end
   end
 
   def test_content_by_category

data/tests/staticpress/content/index_test.rb

@@ -1,6 +1,42 @@
 require_relative '../../test_case'
 
 require 'staticpress/content/index'
+require 'staticpress/content/post'
+require 'staticpress/helpers'
 
 class ContentIndexTest < TestCase
+  include Staticpress::Helpers
+
+  let(:index) { Staticpress::Content::Index.new }
+
+  def test_pages_count
+    assert_equal 1, index.pages_count
+
+    with_config :posts_per_page => 2 do
+      assert_equal 4, index.pages_count
+    end
+  end
+
+  def test_sub_content
+    with_config :posts_per_page => 4 do
+      # expect three most recent posts with oldest on top (index is lazy-evaluated)
+      expected = [
+        Staticpress::Content::Post.new(:year => '2011', :month => '08', :day => '06', :title => 'conferences'),
+        Staticpress::Content::Post.new(:year => '2011', :month => '08', :day => '06', :title => 'blogging-with-staticpress'),
+        Staticpress::Content::Post.new(:year => '2011', :month => '08', :day => '20', :title => 'forever')
+      ]
+      assert_equal expected, index.sub_content
+    end
+  end
+
+  def test_all
+    with_config :posts_per_page => 3 do
+      expected = [
+        Staticpress::Content::Index.new(:number => 1),
+        Staticpress::Content::Index.new(:number => 2),
+        Staticpress::Content::Index.new(:number => 3)
+      ]
+      assert_equal expected, Staticpress::Content::Index.all
+    end
+  end
 end

data/tests/staticpress/content/tag_test.rb

@@ -10,6 +10,10 @@ class ContentTagTest < TestCase
     assert_equal [ 'charlotte' ], Staticpress::Content::Tag.tags
   end
 
+  def test_pages_count
+    assert_equal 1, tag.pages_count
+  end
+
   def test_optional_param_defaults
     expected = { :number => 1 }
     assert_equal expected, Staticpress::Content::Tag.new(:name => 'charlotte').optional_param_defaults
@@ -17,12 +21,17 @@ class ContentTagTest < TestCase
   end
 
   def test_sub_content
-    assert_equal 1, tag.sub_content.count
+    expected = [
+      Staticpress::Content::Post.new(:year => '2011', :month => '08', :day => '06', :title => 'in-charlotte')
+    ]
+    assert_equal expected, tag.sub_content
   end
 
   def test_all
-    assert_equal 1, Staticpress::Content::Tag.all.count
-    assert Staticpress::Content::Tag.all.include?(tag)
+    expected = [
+      Staticpress::Content::Tag.new(:name => 'charlotte', :number => 1)
+    ]
+    assert_equal expected, Staticpress::Content::Tag.all
   end
 
   def test_content_by_tag

data/tests/staticpress/helpers_test.rb

@@ -8,19 +8,19 @@ class HelpersTest < TestCase
   include Staticpress::Helpers
 
   def test_extensionless_basename
-    assert_equal 'extensionless', extensionless_basename(Pathname.new('extensionless'))
-    assert_equal '.htaccess', extensionless_basename(Pathname.new('.htaccess'))
-    assert_equal 'tyrannasaurus_rex', extensionless_basename(Pathname.new('tyrannasaurus_rex.rb'))
-    assert_equal 'stegosaurus', extensionless_basename(Pathname.new('dinosaurs/stegosaurus.rb'))
-    assert_equal 'stegosaurus', extensionless_basename(Pathname.new('/dinosaurs/stegosaurus.rb'))
+    assert_equal 'extensionless', extensionless_basename(Pathname('extensionless'))
+    assert_equal '.htaccess', extensionless_basename(Pathname('.htaccess'))
+    assert_equal 'tyrannasaurus_rex', extensionless_basename(Pathname('tyrannasaurus_rex.rb'))
+    assert_equal 'stegosaurus', extensionless_basename(Pathname('dinosaurs/stegosaurus.rb'))
+    assert_equal 'stegosaurus', extensionless_basename(Pathname('/dinosaurs/stegosaurus.rb'))
   end
 
   def test_extensionless_path
-    assert_equal Pathname.new('extensionless'), extensionless_path(Pathname.new('extensionless'))
-    assert_equal Pathname.new('.htaccess'), extensionless_path(Pathname.new('.htaccess'))
-    assert_equal Pathname.new('tyrannasaurus_rex'), extensionless_path(Pathname.new('tyrannasaurus_rex.rb'))
-    assert_equal Pathname.new('dinosaurs/stegosaurus'), extensionless_path(Pathname.new('dinosaurs/stegosaurus.rb'))
-    assert_equal Pathname.new('/dinosaurs/stegosaurus'), extensionless_path(Pathname.new('/dinosaurs/stegosaurus.rb'))
+    assert_equal Pathname('extensionless'), extensionless_path(Pathname('extensionless'))
+    assert_equal Pathname('.htaccess'), extensionless_path(Pathname('.htaccess'))
+    assert_equal Pathname('tyrannasaurus_rex'), extensionless_path(Pathname('tyrannasaurus_rex.rb'))
+    assert_equal Pathname('dinosaurs/stegosaurus'), extensionless_path(Pathname('dinosaurs/stegosaurus.rb'))
+    assert_equal Pathname('/dinosaurs/stegosaurus'), extensionless_path(Pathname('/dinosaurs/stegosaurus.rb'))
   end
 
   def test_hash_from_empty_array
@@ -45,10 +45,11 @@ class HelpersTest < TestCase
   end
 
   def test_paginate
+    # a == oldest, z == newest
     assert_equal 3, paginate(:a..:z).count
-    assert_equal (:a..:j).to_a, paginate(:a..:z)[0]
+    assert_equal (:a..:j).to_a, paginate(:a..:z)[0] # page 1 lists oldest, with oldest at top
     assert_equal (:k..:t).to_a, paginate(:a..:z)[1]
-    assert_equal (:u..:z).to_a, paginate(:a..:z)[2]
+    assert_equal (:u..:z).to_a, paginate(:a..:z)[2] # page 3 lists newest, with newest at bottom (default page)
     assert_equal [], paginate(:a..:z)[5], 'Accessing an invalid index on anything that has been paginated should return an empty array'
   end
 

data/tests/staticpress/js_object_test.rb

@@ -37,6 +37,12 @@ class JSObjectTest < TestCase
     assert_equal :hullabaloo, js_object.hoopla
   end
 
+  def test_merge
+    assert_nil js_object.some_key
+    enhanced = js_object.merge :some_key => 42
+    assert_equal 42, enhanced.some_key
+  end
+
   def test_to_hash
     assert_equal({ :key => :value, :nested => { :a => :b } }, js_object.to_hash)
   end

data/tests/staticpress/settings_test.rb

@@ -0,0 +1,13 @@
+require_relative '../test_case'
+
+class SettingsTest < TestCase
+  def test_default
+    refute Staticpress::Settings.instance.verbose
+  end
+
+  def test_set!
+    assert_equal nil, Staticpress::Settings.instance.favorite_number
+    Staticpress::Settings.set! :favorite_number => 42
+    assert_equal 42, Staticpress::Settings.instance.favorite_number
+  end
+end

data/tests/staticpress_test.rb

@@ -4,15 +4,15 @@ require 'pathname'
 
 class StaticpressTest < TestCase
   def test_blog_path
-    assert_equal Pathname.new('tests/test_blog').expand_path, Staticpress.blog_path
+    assert_equal Pathname('tests/test_blog').expand_path, Staticpress.blog_path
   end
 
   def test_blog_path=
     Staticpress.blog_path = 'some/other/directory'
-    assert_equal Pathname.new('some/other/directory').expand_path, Staticpress.blog_path
+    assert_equal Pathname('some/other/directory').expand_path, Staticpress.blog_path
   end
 
   def test_root
-    assert_equal Pathname.new('lib/').expand_path, Staticpress.root
+    assert_equal Pathname('lib/').expand_path, Staticpress.root
   end
 end

data/tests/test_blog/Gemfile

@@ -1,6 +1,6 @@
 source :rubygems
 
-gem 'staticpress', :path => '../../../'
+gem 'staticpress', :path => '../../'
 
 gem 'compass'
 gem 'haml'

data/tests/test_case.rb

@@ -40,4 +40,15 @@ class TestCase < MiniTest::Spec
       raise e
     end
   end
+
+  def with_config(options, &block)
+    original = self.config
+
+    begin
+      self.config.merge(options).save
+      block.call
+    ensure
+      original.save
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: staticpress
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -50,11 +50,11 @@ cert_chain:
   -----END CERTIFICATE-----
 
 '
-date: 2011-12-13 00:00:00.000000000 Z
+date: 2011-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &15630400 !ruby/object:Gem::Requirement
+  requirement: &18072460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -62,10 +62,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15630400
+  version_requirements: *18072460
 - !ruby/object:Gem::Dependency
   name: compass
-  requirement: &15646340 !ruby/object:Gem::Requirement
+  requirement: &18072040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -73,10 +73,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15646340
+  version_requirements: *18072040
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &15645920 !ruby/object:Gem::Requirement
+  requirement: &18071440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -84,10 +84,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15645920
+  version_requirements: *18071440
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &15645500 !ruby/object:Gem::Requirement
+  requirement: &18070840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -95,10 +95,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15645500
+  version_requirements: *18070840
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &15645080 !ruby/object:Gem::Requirement
+  requirement: &18070260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -106,10 +106,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15645080
+  version_requirements: *18070260
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &15644660 !ruby/object:Gem::Requirement
+  requirement: &18069840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -117,10 +117,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15644660
+  version_requirements: *18069840
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &15644240 !ruby/object:Gem::Requirement
+  requirement: &18069400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -128,10 +128,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15644240
+  version_requirements: *18069400
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &15643820 !ruby/object:Gem::Requirement
+  requirement: &18068940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -139,10 +139,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *15643820
+  version_requirements: *18068940
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &15643400 !ruby/object:Gem::Requirement
+  requirement: &18068240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -150,10 +150,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *15643400
+  version_requirements: *18068240
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &15642980 !ruby/object:Gem::Requirement
+  requirement: &18067540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -161,10 +161,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *15642980
+  version_requirements: *18067540
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &15642560 !ruby/object:Gem::Requirement
+  requirement: &18066880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -172,7 +172,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *15642560
+  version_requirements: *18066880
 description: ! 'Staticpress is a blog-focused static site generator. It uses Tilt
   for rendering nearly any template you can think of and come with a built-in Rack
   server for easy development previews.
@@ -231,6 +231,7 @@ files:
 - lib/staticpress/pusher.rb
 - lib/staticpress/route.rb
 - lib/staticpress/server.rb
+- lib/staticpress/settings.rb
 - lib/staticpress/site.rb
 - lib/staticpress/theme.rb
 - lib/staticpress/version.rb
@@ -259,6 +260,7 @@ files:
 - tests/staticpress/pusher_test.rb
 - tests/staticpress/route_test.rb
 - tests/staticpress/server_test.rb
+- tests/staticpress/settings_test.rb
 - tests/staticpress/site_test.rb
 - tests/staticpress/theme_test.rb
 - tests/staticpress/view_helpers_test.rb
@@ -314,7 +316,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: staticpress
-rubygems_version: 1.8.12
+rubygems_version: 1.8.13
 signing_key: 
 specification_version: 3
 summary: Blog-centric static site builder