baron 1.0.12 → 1.0.13

data/VERSION

@@ -1 +1 @@
-1.0.11
+1.0.13

data/baron.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "baron"
-  s.version = "1.0.12"
+  s.version = "1.0.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nathan Buggia"]
@@ -47,6 +47,7 @@ Gem::Specification.new do |s|
     "spec/sample_data/images/robert-frost.png",
     "spec/sample_data/pages/about.rhtml",
     "spec/sample_data/pages/test.rhtml",
+    "spec/sample_data/resources/feed.atom",
     "spec/sample_data/resources/redirects.txt",
     "spec/sample_data/resources/robots.txt",
     "spec/sample_data/supplemental-files/theme_config.yml",

data/lib/baron.rb

@@ -4,6 +4,7 @@ $:.unshift File.dirname(__FILE__)
 require 'yaml'
 require 'date'
 require 'erb'
+require 'time'
 
 # 3rd party
 require 'rack'
@@ -41,24 +42,22 @@ module Baron
       return [400, {}, []] unless @request.get?
 
       @response = Rack::Response.new
-      path, mime = @request.path_info.split('.')     
-      redirected_url, status = @blog_engine.process_redirects(path)
+      
+      path, ext = @request.path_info.split('.')
+      extension = ext.to_s.empty? ? '.html' : ".#{ext}"
+
+      redirected_url, status = @blog_engine.process_redirects(@request.path_info)
 
       if status
         @response.status = status
         @response['Location'] = redirected_url
       else
-        baron_response = @blog_engine.process_request(path, env, *(mime ? mime : []))
+        baron_response = @blog_engine.process_request(@request.path_info, env)
         @response.body = [baron_response[:body]]
         @response.status = baron_response[:status]      
         @response['Content-Length'] = baron_response[:body].bytesize.to_s unless baron_response[:body].empty?
-        @response['Content-Type'] = Rack::Mime.mime_type(".#{baron_response[:type]}")
-        @response['Cache-Control'] = if Baron.env == 'production'
-          "public, max-age=#{@config[:cache]}"
-        else
-          "no-cache, must-revalidate"
-        end
-
+        @response['Content-Type'] = Rack::Mime.mime_type(extension)
+        @response['Cache-Control'] = (Baron.env == 'production') ? "public, max-age=#{@config[:cache]}" : "no-cache, must-revalidate"
         @response['ETag'] = %("#{Digest::SHA1.hexdigest(baron_response[:body])}")
       end
       

data/lib/baron/blog_engine.rb

@@ -16,27 +16,26 @@ module Baron
       end
     end
     
-    def process_request path, env = {}, mime_type = :html
+    def process_request path, env = {}
       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_name => route.first, :feed_permalink => @config.get_feed_permalink}
       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
+        # Atom feed... /feed.atom
+        body = if route.first == 'feed.atom'
           PageController.new(get_all_articles, categories, @config[:article_max], params, theme, @config) . 
-            render_rss(get_system_resource('feed.rss'))
+            render(get_system_resource('feed.atom'))
             
         # Robots... /robots.txt
-        elsif route.first == 'robots'
+        elsif route.first == 'robots.txt'
           PageController.new(get_all_articles, categories, @config[:article_max], params, theme, @config) . 
-            render_rss(get_system_resource('robots.txt'))
+            render(get_system_resource('robots.txt'))
         
         # Home page... /
         elsif route.first == @config[:root]
@@ -89,7 +88,7 @@ module Baron
             render_html(theme.get_template('article'), theme.get_template('layout'))
         end
 
-        return :body => body, :type => mime_type, :status => 200
+        return :body => body, :status => 200
       
       rescue Errno::ENOENT => e
         
@@ -99,7 +98,7 @@ module Baron
         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
+        return :body => body, :status => 404
       end 
     end
 
@@ -176,10 +175,6 @@ module Baron
     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

@@ -63,7 +63,8 @@ module Baron
     }
 
     def get_feed_permalink
-      "#{self[:url]}feed.rss"
+      #"#{self[:url]}feed.atom"
+      "http://localhost:3000/feed.atom"
     end 
 
     def initialize obj

data/lib/baron/models/article.rb

@@ -1,5 +1,7 @@
 module Baron
+  
   class Article < Hash
+    
     def initialize file_parts, config = {}
       @config = config
       self[:filename_and_path] = file_parts[:filename_and_path]
@@ -36,12 +38,34 @@ module Baron
       "/#{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
+    def title
+      self[:title] || 'Untitled'
+    end
+    
+    def date
+      @config[:date].call(self[:date])
+    end
+
+    def date_iso8601
+      # "2009-10-26T04:47:09Z"
+      self[:date].strftime("%FT%T%:z")
+    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 
     
@@ -57,5 +81,7 @@ module Baron
         text.strip
       end
     end
+
   end
+
 end

data/lib/baron/models/theme.rb

@@ -1,5 +1,7 @@
 module Baron
+  
   class Theme < Hash
+
     def initialize config
       @config = config
       self[:root] = "/themes/#{config[:theme]}"
@@ -13,13 +15,16 @@ module Baron
       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
+      # puts "Warning: unable to load config file : " + filename_and_path
     end
       
-    def root()   self[:root]    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

@@ -17,7 +17,7 @@ module Baron
       end 
     end
     
-    def render_rss template
+    def render template
       ERB.new(File.read(template)).result(binding)
     end
   end

data/lib/baron/utils.rb

@@ -15,14 +15,6 @@ class Fixnum
 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

data/spec/baron_article_spec.rb

@@ -17,37 +17,38 @@ describe "Baron::Article" do
   
   describe "Provides access to properties" do
     it "should return input parameters" do
-      @article[:filename_and_path].should eq(@article_parts[:filename_and_path])
+      @article[:filename_and_path].should == @article_parts[:filename_and_path]
       @article[:date].should be_instance_of(Date)
-      @article[:category].should eq(@article_parts[:category])
+      @article[:category].should == @article_parts[:category]
     end
     
     it "should return article data correctly" do
-      @article[:title].should eq('The Road Not Taken')
-      @article.title.should eq('The Road Not Taken')
-      @article[:author].should eq('Robert Frost')
-      @article.author.should eq('Robert Frost')
+      @article[:title].should == 'The Road Not Taken'
+      @article.title.should == 'The Road Not Taken'
+      @article.date.should == '01/01/1916'
+      @article.date_iso8601.should == '1916-01-01T00:00:00+00:00'
+      @article[:author].should == 'Robert Frost'
+      @article.author.should == 'Robert Frost'
       @article[:body].length.should > 0
-      @article[:category].should eq('poems')
-      @article.category.should eq('poems')
-      @article[:slug].should eq('the-road-not-taken')
-      @article.slug.should eq('the-road-not-taken')      
+      @article[:category].should == 'poems'
+      @article.category.should == 'poems'
+      @article[:slug].should == 'the-road-not-taken'
+      @article.slug.should == 'the-road-not-taken'   
     end
     
     it "should handle different path configuations" do
-      @article.path('', :no_date).should eq('/poems/the-road-not-taken/')
-      @article.path('', :year_month_day_date).should eq('/poems/1916/01/01/the-road-not-taken/')
-      @article.path('', :year_month_date).should eq('/poems/1916/01/the-road-not-taken/')
-      @article.path('', :year_date).should eq('/poems/1916/the-road-not-taken/')
-      @article.path('posts', :no_date).should eq('/posts/poems/the-road-not-taken/')
-      @article.path('posts', :year_month_day_date).should eq('/posts/poems/1916/01/01/the-road-not-taken/')
-      @article.path('posts', :year_month_date).should eq('/posts/poems/1916/01/the-road-not-taken/')
-      @article.path('posts', :year_date).should eq('/posts/poems/1916/the-road-not-taken/')
-      @article.path('/foo/bar/', :no_date).should eq('/foo/bar/poems/the-road-not-taken/')
-      @article.path('/foo/bar/', :no_date).should eq('/foo/bar/poems/the-road-not-taken/')
-      @article.path('/foo/bar/', :year_month_day_date).should eq('/foo/bar/poems/1916/01/01/the-road-not-taken/')
-      @article.path('/foo/bar/', :year_month_date).should eq('/foo/bar/poems/1916/01/the-road-not-taken/')
-      @article.path('/foo/bar/', :year_date).should eq('/foo/bar/poems/1916/the-road-not-taken/')
+      @article.path('', :no_date).should == '/poems/the-road-not-taken/'
+      @article.path('', :year_month_day_date).should == '/poems/1916/01/01/the-road-not-taken/'
+      @article.path('', :year_month_date).should == '/poems/1916/01/the-road-not-taken/'
+      @article.path('', :year_date).should == '/poems/1916/the-road-not-taken/'
+      @article.path('posts', :no_date).should == '/posts/poems/the-road-not-taken/'
+      @article.path('posts', :year_month_day_date).should == '/posts/poems/1916/01/01/the-road-not-taken/'
+      @article.path('posts', :year_month_date).should == '/posts/poems/1916/01/the-road-not-taken/'
+      @article.path('posts', :year_date).should == '/posts/poems/1916/the-road-not-taken/'
+      @article.path('/foo/bar/', :no_date).should == '/foo/bar/poems/the-road-not-taken/'
+      @article.path('/foo/bar/', :year_month_day_date).should == '/foo/bar/poems/1916/01/01/the-road-not-taken/'
+      @article.path('/foo/bar/', :year_month_date).should == '/foo/bar/poems/1916/01/the-road-not-taken/'
+      @article.path('/foo/bar/', :year_date).should == '/foo/bar/poems/1916/the-road-not-taken/'
     end
   end
 end

data/spec/baron_blog_engine_spec.rb

@@ -19,7 +19,7 @@ describe "Baron::BlogEngine" do
       @blog_engine.get_page_template('about').should == SAMPLE_DATA_PATH + 'pages/about.rhtml'
       @blog_engine.get_system_resource('redirects.txt').should == SAMPLE_DATA_PATH + 'resources/redirects.txt'
       @blog_engine.get_system_resource('robots.txt').should == SAMPLE_DATA_PATH + 'resources/robots.txt'
-      @blog_engine.get_system_resource('feeds.rss').should == SAMPLE_DATA_PATH + 'resources/feeds.rss'
+      @blog_engine.get_system_resource('feeds.atom').should == SAMPLE_DATA_PATH + 'resources/feeds.atom'
     end 
     
     it "finds all categories" do

data/spec/baron_spec.rb

@@ -15,6 +15,10 @@ shared_examples_for "Server HTML Response" do
   it "should be instrumented" do
     @response.body.should include(GOOGLE_ANALYTICS) unless GOOGLE_ANALYTICS.empty?
   end
+
+  it "returns HTML content type" do
+      @response['Content-Type'].should == 'text/html'
+  end
   
   it "should generate valid HTML" do
     @response.body.scan(/<html/).count.should == 1
@@ -117,24 +121,24 @@ describe "Baron" do
     
   end
   
-  describe "GET /feed.rss" do    
+  describe "GET /feed.atom" do    
     before :all do
-      @response = @baron.get('/feed.rss')
+      @response = @baron.get('/feed.atom')
     end
     
     it_behaves_like "Server Response"
     
     it "returns expected content" do
       @response.body.should include(@config[:title])
-      @response.body.should include("#{@config[:url]}/feed.rss")
+      @response.body.should include("http://localhost:3000/feed.atom")
       @response.body.scan(/<entry>/).count.should == 5
       @response.body.scan(/<\/entry>/).count.should == 5
       @response.body.should include('<feed')
       @response.body.should include('</feed>')
     end
     
-    it "returns rss content type" do
-      @response['Content-Type'].should == 'application/rss+xml'
+    it "returns atom content type" do
+      @response['Content-Type'].should == 'application/atom+xml'
     end
   end
   
@@ -146,7 +150,11 @@ describe "Baron" do
     it_behaves_like "Server Response"
     
     it "renders expected parameters" do
-      @response.body.should include("#{@config[:url]}/feed.rss")
+      @response.body.should include("http://localhost:3000/feed.atom")
+    end
+
+    it "returns text content type" do
+      @response['Content-Type'].should == 'text/plain'
     end
   end
   
@@ -161,6 +169,8 @@ describe "Baron" do
     end    
   end
   
+  # add a method to test CSS, and a downloaded file, like a ppt
+
   describe "Helper Functions" do
     it "should return a titleized string" do
       "the quick red fox".titleize.should == "The Quick Red Fox"

data/spec/sample_data/resources/feed.atom

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom">
+	<title><%= @config[:title] %></title>
+	<subtitle></subtitle>
+    <link href="<%= @config.get_feed_permalink %>" />
+	<updated><%= @articles.first[:date].iso8601 %></updated>
+	<id><%= @config.get_feed_permalink %></id>
+
+	<% for @article in @articles %>
+		<entry>
+			<title><%= @article.title %></title>
+			<link href="<%= @article.permalink %>" />
+			<category><%= @article.category %></category>
+			<author>
+				<name><%= @article.author %></name>
+			</author>
+			<id><%= @article.permalink %></id>
+			<updated></updated>
+			<summary><%= @article.summary %></summary>
+		</entry>
+	<% end %>
+
+</feed>

data/spec/sample_data/resources/robots.txt

@@ -1,4 +1,6 @@
 # Robots.txt
+#
+# Mucho information on configuring this file:
+# 	http://www.nathanbuggia.com/posts/search/managing-search-engine-access-to-your-site/
 
-
-Sitemap: <%= @params[:rss_feed] %>
+Sitemap: <%= @config.get_feed_permalink %>

data/spec/sample_data/themes/typography/templates/layout.rhtml

@@ -99,7 +99,7 @@
 				
 				<div class="span3">
 					<ul>
-						<li><a href="/feed.rss">RSS Feed</a></li>
+						<li><a href="<%= @config.get_feed_permalink %>">RSS Feed</a></li>
 					</ul>
 				</div>
 			</div>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: baron
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.0.13
   prerelease: 
 platform: ruby
 authors:
@@ -84,6 +84,7 @@ files:
 - spec/sample_data/images/robert-frost.png
 - spec/sample_data/pages/about.rhtml
 - spec/sample_data/pages/test.rhtml
+- spec/sample_data/resources/feed.atom
 - spec/sample_data/resources/redirects.txt
 - spec/sample_data/resources/robots.txt
 - spec/sample_data/supplemental-files/theme_config.yml