baron 1.0.9 → 1.0.11

data/LICENSE

@@ -20,19 +20,23 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
 SOFTWARE.
 
-- - -
+---
 
 While writing this blog engine, I barrowed some code and design approches
-from the Toto project by Cloudhead and the Scanty project by Adam Wiggins.
-I'm not sure how much code or design awesomeness one needs to use before
-they are obligated to include their license, so I'm included a link to 
-each of them just in case (and thank you both for your awesomeness!)
+from many existing blog engines. I'm not sure how much one must borrow before
+they are obligated to include the original license, so I'm including all of
+them below just in case.
 
 Toto
  - URL: https://github.com/cloudhead/toto
  - Author: http://cloudhead.io/ (Alexis Sellier)
  - License: https://github.com/cloudhead/toto/blob/master/LICENSE
 
+Jekyll
+ - URL: https://github.com/mojombo/jekyll
+ - Author: http://tom.preston-werner.com/ (Tom Preston-Werner)
+ - License: https://github.com/mojombo/jekyll/blob/master/LICENSE
+
 Scanty
  - URL: https://github.com/adamwiggins/scanty
  - Author: http://about.adamwiggins.com/ (Adam Wiggins)

data/Rakefile

@@ -8,7 +8,7 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "baron"
-    gem.summary = %Q{Minimalist, yet full-featured, blog engine in 400 lines of code.}
+    gem.summary = %Q{Minimalist, yet full-featured, blog engine.}
     gem.description = %Q{What's in the box: (1) Publish to Heroku using Git (2) Author articles in markdown (3) Article categories (4) Multiple permalink formats supported (5) Redirects (6) Advanced SEO optimizations and Google Analytics/ Webmaster Tools support. Uses Rack, RSpec, Bootstrap, JQuery, Disqus, Thin}
     gem.email = "nbuggia@gmail.com"
     gem.homepage = "https://github.com/nbuggia/baron-blog-engine-gem"
@@ -25,9 +25,7 @@ end
 # Run RSpec tests
 
 require 'rspec/core/rake_task'
-'clear'
 RSpec::Core::RakeTask.new(:spec)
 
-
 task :default => :test
 task :test => [:check_dependencies, :spec]

data/Readme.md

@@ -5,7 +5,7 @@ A minimalist, yet fully-featured, blog engine for developers.
 This project is only the blog engine gem, if you want to play with your own 
 blog, you should use this project, which includes the client:
 
-https://github.com/nbuggia/baron-blog
+**https://github.com/nbuggia/baron-blog**
 
 ##How Does it Work?
 

data/VERSION

@@ -1 +1 @@
-1.0.9
+1.0.11

data/baron.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "baron"
-  s.version = "1.0.9"
+  s.version = "1.0.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nathan Buggia"]
-  s.date = "2013-03-23"
+  s.date = "2013-03-25"
   s.description = "What's in the box: (1) Publish to Heroku using Git (2) Author articles in markdown (3) Article categories (4) Multiple permalink formats supported (5) Redirects (6) Advanced SEO optimizations and Google Analytics/ Webmaster Tools support. Uses Rack, RSpec, Bootstrap, JQuery, Disqus, Thin"
   s.email = "nbuggia@gmail.com"
   s.extra_rdoc_files = [
@@ -22,6 +22,12 @@ Gem::Specification.new do |s|
     "VERSION",
     "baron.gemspec",
     "lib/baron.rb",
+    "lib/baron/blog_engine.rb",
+    "lib/baron/config.rb",
+    "lib/baron/models/article.rb",
+    "lib/baron/models/theme.rb",
+    "lib/baron/page_controller.rb",
+    "lib/baron/utils.rb",
     "spec/baron_article_spec.rb",
     "spec/baron_blog_engine_spec.rb",
     "spec/baron_spec.rb",
@@ -89,7 +95,7 @@ Gem::Specification.new do |s|
   s.homepage = "https://github.com/nbuggia/baron-blog-engine-gem"
   s.require_paths = ["lib"]
   s.rubygems_version = "1.8.25"
-  s.summary = "Minimalist, yet full-featured, blog engine in 400 lines of code."
+  s.summary = "Minimalist, yet full-featured, blog engine."
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/lib/baron.rb

@@ -1,51 +1,22 @@
+$:.unshift File.dirname(__FILE__)
+
+# std libs
 require 'yaml'
 require 'date'
 require 'erb'
+
+# 3rd party
 require 'rack'
 require 'digest'
 require 'rdiscount'
 
-$:.unshift File.dirname(__FILE__)
-
-# Converts a number into an ordinal, 1=>1st, 2=>2nd, 3=>3rd, etc
-class Fixnum
-  def ordinal
-    case self % 100
-      when 11..13; "#{self}th"
-    else
-      case self % 10
-        when 1; "#{self}st"
-        when 2; "#{self}nd"
-        when 3; "#{self}rd"
-        else    "#{self}th"
-      end
-    end
-  end
-end
-
-# Avoid a collision with ActiveSupport
-class Date
-  unless respond_to? :iso8601
-    # Return the date as a String formatted according to ISO 8601.
-    def iso8601
-      ::Time.utc(year, month, day, 0, 0, 0, 0).iso8601
-    end
-  end
-end
-
-class String
-  # Support String::bytesize in old versions of Ruby
-  if RUBY_VERSION < "1.9"
-    def bytesize
-      size
-    end
-  end
-  
-  # Capitalize the first letter of each word in a string
-  def titleize     
-    self.split(/(\W)/).map(&:capitalize).join       
-  end
-end
+# baron specific
+require 'baron/utils'
+require 'baron/page_controller'
+require 'baron/blog_engine'
+require 'baron/config'
+require 'baron/models/article'
+require 'baron/models/theme'
 
 module Baron
   def self.env      
@@ -56,312 +27,6 @@ module Baron
     ENV['RACK_ENV'] = env             
   end
   
-  class PageController
-    def initialize articles_parts, categories, max_articles, params, theme, config
-      @categories, @params, @theme, @config = categories, params, theme, config
-      stop_at = (:all == max_articles) ? articles_parts.count : max_articles
-      @articles = articles_parts.take(stop_at).map { |file_parts| Article.new(file_parts, @config) }
-      @article = @articles.first
-    end
-    
-    def render_html partial_template, layout_template
-      @content = ERB.new(File.read(partial_template)).result(binding)
-      if @content[0..99].include? '<html'
-        return @content
-      else
-        ERB.new(File.read(layout_template)).result(binding)
-      end 
-    end
-    
-    def render_rss template
-      ERB.new(File.read(template)).result(binding)
-    end
-  end
-    
-  class BlogEngine
-    def initialize config
-      @config = config
-    end
-
-    def process_redirects request_path
-      File.open(get_system_resource('redirects.txt'), 'r') do |file|
-        file.each_line do |line|
-          if line[0] != '#'
-            command, status, source_path, destination_path = line.split(' ')
-            return destination_path, status if request_path == source_path
-          end
-        end 
-      end
-    end
-    
-    def process_request path, env = {}, mime_type = :html
-      route = (path || '/').split('/').reject { |i| i.empty? }
-      route << @config[:root] if route.empty?
-      mime_type = (mime_type =~ /txt|rss|json/) ? mime_type.to_sym : :html
-      categories = get_all_categories
-      params = {:page_name => route.first, :rss_feed => get_feed_path}
-      params[:page_title] = (route.first == @config[:root] ? '' : "#{route.first.capitalize} #{@config[:title_delimiter]} ") + "#{@config[:title]}"          
-      theme = Theme.new(@config)
-      theme.load_config
-    
-      begin
-
-        # RSS feed... /feed.rss
-        body = if mime_type == :rss
-          PageController.new(get_all_articles, categories, @config[:article_max], params, theme, @config) . 
-            render_rss(get_system_resource('feed.rss'))
-            
-        # Robots... /robots.txt
-        elsif route.first == 'robots'
-          PageController.new(get_all_articles, categories, @config[:article_max], params, theme, @config) . 
-            render_rss(get_system_resource('robots.txt'))
-        
-        # Home page... /
-        elsif route.first == @config[:root]
-          all_articles = get_all_articles
-          params[:page_forward] = '/page/2/' if @config[:article_max] < all_articles.count
-          PageController.new(all_articles, categories, @config[:article_max], params, theme, @config) . 
-            render_html(theme.get_template(route.first), theme.get_template('layout'))
-            
-        # Pagination... /page/2, /page/2/
-        elsif route.first == 'page' && route.count == 2
-          page_num = route.last.to_i rescue page_num = -1
-          all_articles = get_all_articles
-          max_pages = (all_articles.count.to_f / @config[:article_max].to_f).ceil
-          raise(Errno::ENOENT, 'Page not found') if page_num < 1 or page_num > max_pages
-          
-          starting_article = ((page_num - 1) * @config[:article_max])
-          articles_on_this_page = all_articles.slice(starting_article, @config[:article_max])
-
-          show_next = (page_num * @config[:article_max]) < all_articles.count
-          params[:page_back] = "/page/#{(page_num-1).to_s}/" if page_num > 1
-          params[:page_forward] = "/page/#{(page_num+1).to_s}/" if show_next
-          params[:page_title] = "Page #{page_num.to_s} #{@config[:title_delimiter]} #{@config[:title]}"
-          
-          PageController.new(articles_on_this_page, categories, @config[:article_max], params, theme, @config) . 
-            render_html(theme.get_template('home'), theme.get_template('layout'))
-        
-        # System routes... /robots.txt, /archives
-        elsif route.first == 'archives' or route.first == 'robots'
-          max_articles = ('archives' == route.first) ? :all : @config[:article_max]
-          PageController.new(get_all_articles, categories, max_articles, params, theme, @config) . 
-            render_html(theme.get_template(route.first), theme.get_template('layout'))
-        
-        # Custom pages... /about, /contact-us
-        elsif is_route_custom_page? route.first
-          PageController.new(get_all_articles, categories, @config[:article_max], params, theme, @config) . 
-            render_html(get_page_template(route.first), theme.get_template('layout'))
-      
-        # Category home pages... /projects/, /photography/, /poems/, etc
-        elsif is_route_category_home? route.last
-          filtered_articles = get_all_articles.select { |h| h[:category] == route.last }
-          params[:page_name] = route.last.gsub('-', ' ').titleize
-          PageController.new(filtered_articles, categories, :all, params, theme, @config) .
-            render_html(theme.get_template('category'), theme.get_template('layout'))
-      
-        # Articles... /posts/2013/01/18/my-article-title, /posts/category/2013/my-article-title, etc
-        else
-          article = [ find_single_article(route.last) ]
-          params[:page_title] = "#{article.first[:filename].gsub('-',' ').titleize} #{@config[:title_delimiter]} #{@config[:title]}"
-          PageController.new(article, categories, 1, params, theme, @config) .
-            render_html(theme.get_template('article'), theme.get_template('layout'))
-        end
-
-        return :body => body, :type => mime_type, :status => 200
-      
-      rescue Errno::ENOENT => e
-        
-        # 404 Page Not Found
-        params[:error_message] = 'Page not found'
-        params[:error_code] = '404'
-        body = PageController.new([], categories, 0, params, theme, @config) .
-                render_html(theme.get_template('error'), theme.get_template('layout'))
-        
-        return :body => body, :type => :html, :status => 404
-      end 
-    end
-
-    def get_all_category_folder_paths
-      category_paths = Dir["#{get_articles_path}/*/"].map { |a| "#{get_articles_path}/#{File.basename(a)}" }
-      # includes the default articles directory as an unnamed (e.g. empty) path
-      category_paths << "#{get_articles_path}"
-    end
-
-    def get_all_articles
-      get_all_category_folder_paths.map do |folder_name|
-        Dir["#{folder_name}/*"].map do |e|
-          if e.end_with? @config[:ext]
-            parts = e.split('/')
-            {
-              :filename_and_path => e,
-              :date => parts.last[0..9],
-              :filename => parts.last[11..(-1 * (@config[:ext].length + 2))].downcase,  # trims date and extention 
-              :category => parts[parts.count-2] == 'articles' ? '' : parts[parts.count-2]
-            }
-          end
-        end
-      end .
-        flatten .
-        delete_if { |a| a == nil } .
-        sort_by { |hash| hash[:date] } .
-        reverse # sorts by decending date 
-    end
-
-    def get_all_categories
-      Dir["#{get_articles_path}/*/"].map do |a| 
-        folder_name = File.basename(a)
-        {
-          :name => folder_name.titleize,
-          :node_name => folder_name.gsub(' ', '-'),
-          :path => "/#{@config[:permalink_prefix]}/#{folder_name.gsub(' ', '-')}/".squeeze('/'),
-          :count => Dir["#{get_articles_path}/#{folder_name}/*"].count 
-        }
-      end .
-        sort_by { |hash| hash[:name] }
-    end
-    
-    def find_single_article article_slug
-      get_all_articles.each { |fileparts| return fileparts if fileparts[:filename] == article_slug }
-      raise Errno::ENOENT, 'Article not found'
-    end    
-    
-    def is_route_custom_page? path_node
-      (Dir["#{get_pages_path}/*"]).include?("#{get_pages_path}/#{path_node}.rhtml")
-    end
-    
-    def is_route_category_home? path_node
-      get_all_categories.each { |h| return true if h[:node_name] == path_node }
-      return false
-    end
-
-    def get_pages_path()          "#{@config[:sample_data_path]}pages/"                                             end
-    def get_articles_path()       "#{@config[:sample_data_path]}articles"                                           end
-    def get_page_template(name)   "#{@config[:sample_data_path]}pages/#{name}.rhtml"                                end
-    def get_system_resource(name) "#{@config[:sample_data_path]}resources/#{name}"                                  end
-    def get_feed_path()           "#{@config[:url]}/feed.rss"                                                       end 
-  end
-  
-  class Theme < Hash
-    def initialize config
-      @config = config
-      self[:root] = "/themes/#{config[:theme]}"
-      self[:name] = config[:theme]
-      self[:file_root] = "#{@config[:sample_data_path]}themes/#{@config[:theme]}".squeeze('/')
-      self[:theme_config] = "#{self[:file_root]}/theme_config.yml".squeeze('/')
-    end
-
-    def load_config filename_and_path = ''
-      filename_and_path = filename_and_path.empty? ? self[:theme_config] : filename_and_path
-      params = YAML.load(File.read(filename_and_path))
-      params.each_pair { |key, value| self[key.downcase.to_sym] = value } unless !params
-    rescue Errno::ENOENT => e
-      puts "Warning: unable to load config file : " + filename_and_path
-    end
-        
-    def root()   self[:root]    end
-          
-    def get_template name
-      "#{self[:file_root]}/templates/#{name}.rhtml".squeeze('/')
-    end
-  end
-
-  class Article < Hash
-    def initialize file_parts, config = {}
-      @config = config
-      self[:filename_and_path] = file_parts[:filename_and_path]
-      self[:slug] = file_parts[:filename]
-      self[:category] = file_parts[:category].empty? ? '' : file_parts[:category]
-      self[:date] = Date.parse(file_parts[:date].gsub('/', '-')) rescue Date.today
-      load_article(file_parts[:filename_and_path])
-    end
-    
-    def summary length = nil
-      config = @config[:summary]
-      sum = if self[:body] =~ config[:delim]
-        self[:body].split(config[:delim]).first
-      else
-        self[:body].match(/(.{1,#{length || config[:length] || config[:max]}}.*?)(\n|\Z)/m).to_s
-      end
-      markdown(sum.length == self[:body].length ? sum : sum.strip.sub(/\.\Z/, @config[:truncation_marker]))
-    end
-
-    def body
-      markdown self[:body].sub(@config[:summary][:delim], '') rescue markdown self[:body]
-    end
-
-    def path prefix = '', date_format = ''
-      permalink_prefix = prefix.empty? ? @config[:permalink_prefix] : prefix
-      permalink_date_format = date_format.empty? ? @config[:permalink_date_format] : date_format
-      date_path = case permalink_date_format
-      when :year_date; self[:date].strftime("/%Y")
-      when :year_month_date; self[:date].strftime("/%Y/%m")
-      when :year_month_day_date; self[:date].strftime("/%Y/%m/%d")
-      else ''
-      end
-      
-      "/#{permalink_prefix}/#{self[:category]}#{date_path}/#{slug}/".squeeze('/')      
-    end
-    
-    def title()     self[:title] || 'Untitled'                                                end
-    def date()      @config[:date].call(self[:date])                                          end
-    def author()    self[:author] || @config[:author]                                         end
-    def category()  self[:category]                                                           end
-    def permalink() "http://#{(@config[:url].sub("http://", '') + self.path).squeeze('/')}"   end
-    def slug()      self[:slug]                                                               end
-    
-    protected 
-    
-    def load_article filename_and_path
-      metadata, self[:body] = File.read(filename_and_path).split(/\n\n/, 2)
-      YAML.load(metadata).each_pair { |key, value| self[key.downcase.to_sym] = value }
-    end
-    
-    def markdown text
-      if (options = @config[:markdown])
-        Markdown.new(text.to_s.strip, *(options.eql?(true) ? [] : options)).to_html
-      else
-        text.strip
-      end
-    end
-  end
-
-  class Config < Hash
-    Defaults = {
-      :cache => 28800,                                      # cache duration (seconds)
-      :root => 'home',                                      # site home page
-      :sample_data_path => '',                              # used by the RSpec tests to show where the sample data is stored
-      :author => ENV['USER'],                               # blog author
-      :title => Dir.pwd.split('/').last,                    # site title
-      :title_delimiter => "&rsaquo;",                       # used to divide the different elements of the page title
-      :truncation_marker => '&hellip;',                     # symbol used to represent trucated text (article summary)
-      :url => 'http://localhost/',                          # root URL of the site
-      :date => lambda {|now| now.strftime("%d/%m/%Y") },    # date function
-      :markdown => :smart,                                  # use markdown
-      :summary => {:max => 150, :delim => /~\n/},           # length of summary and delimiter
-      :ext => 'txt',                                        # extension for articles
-      :permalink_prefix => '',                              # common path prefix for article permalinks
-      :permalink_date_format => :year_month_day_date,       # :year_date, :year_month_date, :year_month_day_date, :no_date
-      :article_max => 5,                                    # number of most recent articles to return to custom pages
-      :theme => 'default',                                  # name of the theme to use
-      :google_analytics => '',                              # account id for google analytics account
-      :google_webmaster => '',                              # HTML Meta Tag verification code for google webmaster account
-      :disqus_shortname => false                            # account name for your disqus account www.disqus.com
-    }
-
-    def initialize obj
-      self.update Defaults
-      self.update obj
-    end
-
-    def set key, val = nil, &block
-      if val.is_a? Hash
-        self[key].update val
-      else
-        self[key] = block_given?? block : val
-      end
-    end
-  end
-
   class Server
     attr_reader :config, :site
 

data/lib/baron/blog_engine.rb

@@ -0,0 +1,185 @@
+module Baron
+
+  class BlogEngine
+    def initialize config
+      @config = config
+    end
+
+    def process_redirects request_path
+      File.open(get_system_resource('redirects.txt'), 'r') do |file|
+        file.each_line do |line|
+          if line[0] != '#'
+            command, status, source_path, destination_path = line.split(' ')
+            return destination_path, status if request_path == source_path
+          end
+        end 
+      end
+    end
+    
+    def process_request path, env = {}, mime_type = :html
+      route = (path || '/').split('/').reject { |i| i.empty? }
+      route << @config[:root] if route.empty?
+      mime_type = (mime_type =~ /txt|rss|json/) ? mime_type.to_sym : :html
+      categories = get_all_categories
+      params = {:page_name => route.first, :rss_feed => get_feed_path}
+      params[:page_title] = (route.first == @config[:root] ? '' : "#{route.first.capitalize} #{@config[:title_delimiter]} ") + "#{@config[:title]}"          
+      theme = Theme.new(@config)
+      theme.load_config
+    
+      begin
+
+        # RSS feed... /feed.rss
+        body = if mime_type == :rss
+          PageController.new(get_all_articles, categories, @config[:article_max], params, theme, @config) . 
+            render_rss(get_system_resource('feed.rss'))
+            
+        # Robots... /robots.txt
+        elsif route.first == 'robots'
+          PageController.new(get_all_articles, categories, @config[:article_max], params, theme, @config) . 
+            render_rss(get_system_resource('robots.txt'))
+        
+        # Home page... /
+        elsif route.first == @config[:root]
+          all_articles = get_all_articles
+          params[:page_forward] = '/page/2/' if @config[:article_max] < all_articles.count
+          PageController.new(all_articles, categories, @config[:article_max], params, theme, @config) . 
+            render_html(theme.get_template(route.first), theme.get_template('layout'))
+            
+        # Pagination... /page/2, /page/2/
+        elsif route.first == 'page' && route.count == 2
+          page_num = route.last.to_i rescue page_num = -1
+          all_articles = get_all_articles
+          max_pages = (all_articles.count.to_f / @config[:article_max].to_f).ceil
+          raise(Errno::ENOENT, 'Page not found') if page_num < 1 or page_num > max_pages
+          
+          starting_article = ((page_num - 1) * @config[:article_max])
+          articles_on_this_page = all_articles.slice(starting_article, @config[:article_max])
+
+          show_next = (page_num * @config[:article_max]) < all_articles.count
+          params[:page_back] = "/page/#{(page_num-1).to_s}/" if page_num > 1
+          params[:page_forward] = "/page/#{(page_num+1).to_s}/" if show_next
+          params[:page_title] = "Page #{page_num.to_s} #{@config[:title_delimiter]} #{@config[:title]}"
+          
+          PageController.new(articles_on_this_page, categories, @config[:article_max], params, theme, @config) . 
+            render_html(theme.get_template('home'), theme.get_template('layout'))
+        
+        # System routes... /robots.txt, /archives
+        elsif route.first == 'archives' or route.first == 'robots'
+          max_articles = ('archives' == route.first) ? :all : @config[:article_max]
+          PageController.new(get_all_articles, categories, max_articles, params, theme, @config) . 
+            render_html(theme.get_template(route.first), theme.get_template('layout'))
+        
+        # Custom pages... /about, /contact-us
+        elsif is_route_custom_page? route.first
+          PageController.new(get_all_articles, categories, @config[:article_max], params, theme, @config) . 
+            render_html(get_page_template(route.first), theme.get_template('layout'))
+      
+        # Category home pages... /projects/, /photography/, /poems/, etc
+        elsif is_route_category_home? route.last
+          filtered_articles = get_all_articles.select { |h| h[:category] == route.last }
+          params[:page_name] = route.last.gsub('-', ' ').titleize
+          PageController.new(filtered_articles, categories, :all, params, theme, @config) .
+            render_html(theme.get_template('category'), theme.get_template('layout'))
+      
+        # Articles... /posts/2013/01/18/my-article-title, /posts/category/2013/my-article-title, etc
+        else
+          article = [ find_single_article(route.last) ]
+          params[:page_title] = "#{article.first[:filename].gsub('-',' ').titleize} #{@config[:title_delimiter]} #{@config[:title]}"
+          PageController.new(article, categories, 1, params, theme, @config) .
+            render_html(theme.get_template('article'), theme.get_template('layout'))
+        end
+
+        return :body => body, :type => mime_type, :status => 200
+      
+      rescue Errno::ENOENT => e
+        
+        # 404 Page Not Found
+        params[:error_message] = 'Page not found'
+        params[:error_code] = '404'
+        body = PageController.new([], categories, 0, params, theme, @config) .
+                render_html(theme.get_template('error'), theme.get_template('layout'))
+        
+        return :body => body, :type => :html, :status => 404
+      end 
+    end
+
+    def get_all_category_folder_paths
+      category_paths = Dir["#{get_articles_path}/*/"].map do |a| 
+        "#{get_articles_path}/#{File.basename(a)}"
+      end
+      # includes the default articles directory as an unnamed (e.g. empty) path
+      category_paths << "#{get_articles_path}"
+    end
+
+    def get_all_articles
+      get_all_category_folder_paths.map do |folder_name|
+        Dir["#{folder_name}/*"].map do |e|
+          if e.end_with? @config[:ext]
+            parts = e.split('/')
+            {
+              :filename_and_path => e,
+              :date => parts.last[0..9],
+              # trims date and extention 
+              :filename => parts.last[11..(-1 * (@config[:ext].length + 2))].downcase,
+              :category => parts[parts.count-2] == 'articles' ? '' : parts[parts.count-2]
+            }
+          end
+        end
+      end .
+        flatten .
+        delete_if { |a| a == nil } .
+        sort_by { |hash| hash[:date] } .
+        reverse # sorts by decending date 
+    end
+
+    def get_all_categories
+      Dir["#{get_articles_path}/*/"].map do |a| 
+        folder_name = File.basename(a)
+        {
+          :name => folder_name.titleize,
+          :node_name => folder_name.gsub(' ', '-'),
+          :path => "/#{@config[:permalink_prefix]}/#{folder_name.gsub(' ', '-')}/".squeeze('/'),
+          :count => Dir["#{get_articles_path}/#{folder_name}/*"].count 
+        }
+      end .
+        sort_by { |hash| hash[:name] }
+    end
+    
+    def find_single_article article_slug
+      get_all_articles.each do |fileparts| 
+        return fileparts if fileparts[:filename] == article_slug
+      end
+      raise Errno::ENOENT, 'Article not found'
+    end    
+    
+    def is_route_custom_page? path_node
+      (Dir["#{get_pages_path}/*"]).include?("#{get_pages_path}/#{path_node}.rhtml")
+    end
+    
+    def is_route_category_home? path_node
+      get_all_categories.each { |h| return true if h[:node_name] == path_node }
+      return false
+    end
+
+    def get_pages_path
+      "#{@config[:sample_data_path]}pages/"
+    end
+    
+    def get_articles_path
+      "#{@config[:sample_data_path]}articles".squeeze('/')
+    end
+      
+    def get_page_template name
+      "#{@config[:sample_data_path]}pages/#{name}.rhtml".squeeze('/')
+    end
+    
+    def get_system_resource name
+      "#{@config[:sample_data_path]}resources/#{name}".squeeze('/')
+    end
+    
+    def get_feed_path
+      "#{@config[:url]}/feed.rss"
+    end 
+  end
+  
+end

data/lib/baron/config.rb

@@ -0,0 +1,84 @@
+module Baron
+
+  class Config < Hash
+    
+    Defaults = {
+
+      # cache duration (seconds)
+      :cache => 28800,
+      
+      # token to represent root in the app
+      :root => 'home',
+
+      # used by the RSpec tests to show where the sample data is stored
+      :sample_data_path => '',
+      
+      # default name to use for the blog's author
+      :author => ENV['USER'],
+
+      # default title for the site
+      :title => Dir.pwd.split('/').last,
+
+      # used to divide the different elements of the page title
+      :title_delimiter => "&rsaquo;",
+      
+      # symbol used to represent trucated text (article summary)
+      :truncation_marker => '&hellip;',
+
+      # root URL of the site
+      :url => 'http://localhost:3000/',
+
+      # date function block
+      :date => lambda {|now| now.strftime("%d/%m/%Y") },
+
+      # use markdown
+      :markdown => :smart,
+
+      # length of summary and delimiter
+      :summary => {:max => 150, :delim => /~\n/},
+
+      # extension for article files
+      :ext => 'txt',
+
+      # common path prefix for article permalinks
+      :permalink_prefix => '',
+
+      # :year_date, :year_month_date, :year_month_day_date, :no_date
+      :permalink_date_format => :year_month_day_date,
+
+      # number of most recent articles to return to custom pages
+      :article_max => 5,
+
+      # name of the theme to use         
+      :theme => 'default',
+
+      # account id for google analytics account  
+      :google_analytics => '',
+
+      # HTML Meta Tag verification code for google webmaster account
+      :google_webmaster => '',
+
+      # account name for your disqus account www.disqus.com
+      :disqus_shortname => false
+    }
+
+    def get_feed_permalink
+      "#{self[:url]}feed.rss"
+    end 
+
+    def initialize obj
+      self.update Defaults
+      self.update obj
+    end
+
+    def set key, val = nil, &block
+      if val.is_a? Hash
+        self[key].update val
+      else
+        self[key] = block_given?? block : val
+      end
+    end
+
+  end # Config
+  
+end

data/lib/baron/models/article.rb

@@ -0,0 +1,61 @@
+module Baron
+  class Article < Hash
+    def initialize file_parts, config = {}
+      @config = config
+      self[:filename_and_path] = file_parts[:filename_and_path]
+      self[:slug] = file_parts[:filename]
+      self[:category] = file_parts[:category].empty? ? '' : file_parts[:category]
+      self[:date] = Date.parse(file_parts[:date].gsub('/', '-')) rescue Date.today
+      load_article(file_parts[:filename_and_path])
+    end
+    
+    def summary length = nil
+      config = @config[:summary]
+      sum = if self[:body] =~ config[:delim]
+        self[:body].split(config[:delim]).first
+      else
+        self[:body].match(/(.{1,#{length || config[:length] || config[:max]}}.*?)(\n|\Z)/m).to_s
+      end
+      markdown(sum.length == self[:body].length ? sum : sum.strip.sub(/\.\Z/, @config[:truncation_marker]))
+    end
+
+    def body
+      markdown self[:body].sub(@config[:summary][:delim], '') rescue markdown self[:body]
+    end
+
+    def path prefix = '', date_format = ''
+      permalink_prefix = prefix.empty? ? @config[:permalink_prefix] : prefix
+      permalink_date_format = date_format.empty? ? @config[:permalink_date_format] : date_format
+      date_path = case permalink_date_format
+      when :year_date; self[:date].strftime("/%Y")
+      when :year_month_date; self[:date].strftime("/%Y/%m")
+      when :year_month_day_date; self[:date].strftime("/%Y/%m/%d")
+      else ''
+      end
+      
+      "/#{permalink_prefix}/#{self[:category]}#{date_path}/#{slug}/".squeeze('/')      
+    end
+    
+    def title()     self[:title] || 'Untitled'                                                end
+    def date()      @config[:date].call(self[:date])                                          end
+    def author()    self[:author] || @config[:author]                                         end
+    def category()  self[:category]                                                           end
+    def permalink() "http://#{(@config[:url].sub("http://", '') + self.path).squeeze('/')}"   end
+    def slug()      self[:slug]                                                               end
+    
+    protected 
+    
+    def load_article filename_and_path
+      metadata, self[:body] = File.read(filename_and_path).split(/\n\n/, 2)
+      YAML.load(metadata).each_pair { |key, value| self[key.downcase.to_sym] = value }
+    end
+    
+    def markdown text
+      if (options = @config[:markdown])
+        Markdown.new(text.to_s.strip, *(options.eql?(true) ? [] : options)).to_html
+      else
+        text.strip
+      end
+    end
+  end
+end

data/lib/baron/models/theme.rb

@@ -0,0 +1,25 @@
+module Baron
+  class Theme < Hash
+    def initialize config
+      @config = config
+      self[:root] = "/themes/#{config[:theme]}"
+      self[:name] = config[:theme]
+      self[:file_root] = "#{@config[:sample_data_path]}themes/#{@config[:theme]}".squeeze('/')
+      self[:theme_config] = "#{self[:file_root]}/theme_config.yml".squeeze('/')
+    end
+
+    def load_config filename_and_path = ''
+      filename_and_path = filename_and_path.empty? ? self[:theme_config] : filename_and_path
+      params = YAML.load(File.read(filename_and_path))
+      params.each_pair { |key, value| self[key.downcase.to_sym] = value } unless !params
+    rescue Errno::ENOENT => e
+      puts "Warning: unable to load config file : " + filename_and_path
+    end
+      
+    def root()   self[:root]    end
+        
+    def get_template name
+      "#{self[:file_root]}/templates/#{name}.rhtml".squeeze('/')
+    end
+  end
+end

data/lib/baron/page_controller.rb

@@ -0,0 +1,25 @@
+module Baron
+
+  class PageController
+    def initialize articles_parts, categories, max_articles, params, theme, config
+      @categories, @params, @theme, @config = categories, params, theme, config
+      stop_at = (:all == max_articles) ? articles_parts.count : max_articles
+      @articles = articles_parts.take(stop_at).map { |file_parts| Article.new(file_parts, @config) }
+      @article = @articles.first
+    end
+    
+    def render_html partial_template, layout_template
+      @content = ERB.new(File.read(partial_template)).result(binding)
+      if @content[0..99].include? '<html'
+        return @content
+      else
+        ERB.new(File.read(layout_template)).result(binding)
+      end 
+    end
+    
+    def render_rss template
+      ERB.new(File.read(template)).result(binding)
+    end
+  end
+  
+end

data/lib/baron/utils.rb

@@ -0,0 +1,39 @@
+# Converts a number into an ordinal, 1=>1st, 2=>2nd, 3=>3rd, etc
+class Fixnum
+  def ordinal
+    case self % 100
+      when 11..13; "#{self}th"
+    else
+      case self % 10
+        when 1; "#{self}st"
+        when 2; "#{self}nd"
+        when 3; "#{self}rd"
+        else    "#{self}th"
+      end
+    end
+  end
+end
+
+# Avoid a collision with ActiveSupport
+class Date
+  unless respond_to? :iso8601
+    # Return the date as a String formatted according to ISO 8601.
+    def iso8601
+      ::Time.utc(year, month, day, 0, 0, 0, 0).iso8601
+    end
+  end
+end
+
+class String
+  # Support String::bytesize in old versions of Ruby
+  if RUBY_VERSION < "1.9"
+    def bytesize
+      size
+    end
+  end
+  
+  # Capitalize the first letter of each word in a string
+  def titleize     
+    self.split(/(\W)/).map(&:capitalize).join       
+  end
+end

data/spec/sample_data/supplemental-files/theme_config.yml

@@ -2,4 +2,4 @@
 # Theme Config File
 #
 # sample config file with no variables. Need to make sure this doesn't crash the app
-#
+#d

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: baron
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-23 00:00:00.000000000 Z
+date: 2013-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -59,6 +59,12 @@ files:
 - VERSION
 - baron.gemspec
 - lib/baron.rb
+- lib/baron/blog_engine.rb
+- lib/baron/config.rb
+- lib/baron/models/article.rb
+- lib/baron/models/theme.rb
+- lib/baron/page_controller.rb
+- lib/baron/utils.rb
 - spec/baron_article_spec.rb
 - spec/baron_blog_engine_spec.rb
 - spec/baron_spec.rb
@@ -145,5 +151,5 @@ rubyforge_project:
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: Minimalist, yet full-featured, blog engine in 400 lines of code.
+summary: Minimalist, yet full-featured, blog engine.
 test_files: []