vanilla 1.17.1 → 1.17.2

data/README

@@ -1,10 +1,10 @@
 --~::{ Vanilla.rb }::~---
 =========================
 
-  A wandering soul; a repo clone'd -
-  his meta_klass and methods honed.
-  But tarry he 'ponst what dark endeavour
-  with code of such unknowable terror?
+    A wandering soul; a repo clone'd -
+    his meta_klass and methods honed.
+    But tarry he 'ponst what dark endeavour
+    with code of such unknowable terror?
 
                               - H.P. Gemcraft, 1914
 

data/Rakefile

@@ -18,7 +18,6 @@ namespace :test do
     t.verbose = true
   end
 
-  require "rake/testtask"
   Rake::TestTask.new(:app) do |t|
     t.libs << "test/pristine_app"
     t.ruby_opts << "-rubygems"
@@ -28,6 +27,20 @@ namespace :test do
 end
 
 if Object.const_defined?(:Gem)
+
+  def files_for_inclusion
+    base_files = %w(Rakefile README .gemtest) + Dir.glob("{test,lib,bin,pristine_app}/**/*")
+    files_to_ignore = File.readlines(".gitignore").inject([]) do |a,p|
+      path = p.strip
+      a += Dir.glob(path)
+      if File.directory?(path)
+        a += Dir.glob(path + "/*")
+      end
+      a
+    end
+    base_files - files_to_ignore
+  end
+
   # This builds the actual gem. For details of what all these options
   # mean, and other ones you can add, check the documentation here:
   #
@@ -48,13 +61,13 @@ if Object.const_defined?(:Gem)
     s.rdoc_options      = %w(--main README)
 
     # Add any extra files to include in the gem
-    s.files             = %w(Rakefile README .gemtest) + Dir.glob("{test,lib,bin,pristine_app}/**/*")
+    s.files             = files_for_inclusion
     s.executables       = ['vanilla']
     s.require_paths     = ["lib"]
 
     # All the other gems we need.
     s.add_dependency("rack", ">= 0.9.1")
-    s.add_dependency("soup", ">= 1.0.8")
+    s.add_dependency("soup", ">= 1.0.9")
     s.add_dependency("ratom", ">= 0.3.5")
     s.add_dependency("RedCloth", ">= 4.1.1")
     s.add_dependency("BlueCloth", ">= 1.0.0")
@@ -62,7 +75,7 @@ if Object.const_defined?(:Gem)
     s.add_dependency("parslet", ">= 1.2.0")
     s.add_dependency("rack-test", ">=0.5.7")
 
-    s.add_development_dependency("kintama", ">= 0.1.6") # add any other gems for testing/development
+    s.add_development_dependency("kintama", ">= 0.1.7") # add any other gems for testing/development
     s.add_development_dependency("mocha")
     s.add_development_dependency("capybara")
     s.add_development_dependency("launchy")
@@ -111,9 +124,7 @@ if Object.const_defined?(:Gem)
   end
 
   desc 'Clear out RDoc and generated packages'
-  task :clean => [:clobber_rdoc, :clobber_package] do
-    rm "#{spec.name}.gemspec"
-  end
+  task :clean => [:clobber_rdoc, :clobber_package]
 
   desc 'Tag the repository in git with gem version number'
   task :tag => [:gemspec, :package] do

data/lib/vanilla.rb

@@ -1,5 +1,5 @@
 module Vanilla
-  VERSION = "1.17.1"
+  VERSION = "1.17.2"
 
   autoload :Renderers, "vanilla/renderers"
   autoload :App, "vanilla/app"
@@ -9,8 +9,11 @@ module Vanilla
   autoload :Routing, "vanilla/routing"
   autoload :Static, "vanilla/static"
   autoload :SnipReferenceParser, "vanilla/snip_reference_parser"
+  autoload :AtomFeed, "vanilla/atom_feed"
   autoload :TestHelper, "vanilla/test_helper"
 
+  class MissingRendererError < RuntimeError; end
+
   class << self
     # The set of currently loaded Vanilla::App subclasses
     def apps

data/lib/vanilla/app.rb

@@ -68,7 +68,13 @@ module Vanilla
     # Returns the renderer class for a given snip
     def renderer_for(snip)
       if snip
-        find_renderer(snip.render_as || snip.extension)
+        renderer_name = snip.render_as || snip.extension
+        renderer_name = nil if renderer_name == ''
+      else
+        renderer_name = nil
+      end
+      if renderer_name
+        find_renderer(renderer_name)
       else
         config.default_renderer
       end
@@ -87,6 +93,10 @@ module Vanilla
       end
     end
 
+    def atom_feed(options={})
+      AtomFeed.new(options.merge(:app => self))
+    end
+
     private
 
     def prepare_renderers
@@ -94,13 +104,18 @@ module Vanilla
     end
 
     def find_renderer(name)
-      @renderers[(name ? name.downcase : nil)]
+      if @renderers.has_key?(name.downcase)
+        @renderers[name.downcase]
+      else
+        raise MissingRendererError.new(name)
+      end
     end
 
     def rendering_and_handling_errors(snip)
       renderer_instance = renderer_for(snip).new(self)
       yield renderer_instance
     rescue Exception => e
+      response.status = 500
       snip_name = snip ? snip.name : nil
       "<pre>[Error rendering '#{snip_name}' - \"" +
         e.message.gsub("<", "&lt;").gsub(">", "&gt;") + "\"]\n" +

data/lib/vanilla/atom_feed.rb

@@ -0,0 +1,77 @@
+require "atom"
+
+module Vanilla
+  class AtomFeed
+    attr_reader :domain, :app, :title
+
+    def initialize(params={})
+      @domain = params[:domain] || "yourdomain.example.com"
+      @title = params[:title] || domain
+      @app = params[:app]
+      @criteria = params[:matching]
+      @snips = params[:snips]
+      if @snips.nil?
+        if @criteria.nil?
+          @snips = app.soup.all_snips
+        else
+          @snips = app.soup[@criteria]
+        end
+      end
+    end
+
+    def to_s
+      Atom::Feed.new do |f|
+        f.title = title
+        f.updated = most_recent_updated_at
+        f.id = "tag:x,2008-06-01:kind/x"
+        f.entries = entries
+      end.to_xml
+    end
+
+    private
+
+    def snips
+      @snips.sort_by { |s| atom_time(s.updated_at) }.reverse
+    end
+
+    def most_recent_updated_at
+      if snips.first
+        atom_time(snips.first.updated_at)
+      else
+        atom_time(nil)
+      end
+    end
+
+    def entries
+      snips.map do |snip|
+        Atom::Entry.new do |e|
+          e.published = atom_time(snip.created_at)
+          e.updated = atom_time(snip.updated_at || snip.created_at)
+          e.content = Atom::Content::Html.new(externalise_links(app.render(snip)))
+          e.title = snip.title || snip.name
+          e.authors = [Atom::Person.new(:name => snip.author || domain)]
+          e.links << Atom::Link.new(:href => "http://#{domain}#{app.url_to(snip.name)}")
+          e.id = "tag:#{domain},#{atom_time(snip.created_at || Time.now).split("T")[0]}:/#{snip.name}"
+        end
+      end
+    end
+
+    def atom_time(time)
+      return Time.at(0) if time.nil?
+      time = Time.parse(time) unless time.respond_to?(:strftime)
+      time.strftime("%Y-%m-%dT%H:%M:%S%z").insert(-3, ":")
+    end
+
+    def externalise_links(content)
+      content.gsub(/(href|src)=(["'])(\/?.*)\2/) do
+        type, quote, link = $1, $2, $3
+        if link =~ /^http/
+          "#{type}=#{quote}#{link}#{quote}"
+        else
+          absolute_link = "http://#{domain}" + (link =~ /^\// ? "" : "/") + link
+          "#{type}=#{quote}#{absolute_link}#{quote}"
+        end
+      end
+    end
+  end
+end

data/lib/vanilla/dynasnip.rb

@@ -2,40 +2,53 @@ require 'vanilla/renderers/base'
 require 'enumerator'
 
 class Dynasnip < Vanilla::Renderers::Base
-  
+
   def self.all
     ObjectSpace.enum_for(:each_object, class << self; self; end).to_a - [self]
   end
-  
-  def self.snip_name(new_name=nil)
-    if new_name
-      @snip_name = new_name.to_s
-    else
-      # borrowed from ActiveSupport
-      @snip_name ||= self.name.gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
-      gsub(/([a-z\d])([A-Z])/,'\1_\2').
-      tr("-", "_").
-      downcase
-    end
-  end
-  
+
   def self.attribute(attribute_name, attribute_value=nil)
     @attributes ||= {}
     @attributes[attribute_name.to_sym] = attribute_value if attribute_value
     @attributes[attribute_name.to_sym]
   end
-  
-  def self.usage(str)
-    attribute :usage, escape_curly_braces(str).strip
+
+  def self.default_snip_name
+    # borrowed from ActiveSupport
+    formatted_name = self.name.
+      split("::").last.
+      gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+      gsub(/([a-z\d])([A-Z])/,'\1_\2').
+      tr("-", "_").
+      downcase
+  end
+
+  def self.snip_name(new_name=nil)
+    if new_name.nil?
+      if name = attribute(:snip_name)
+        name
+      else
+        name = default_snip_name
+        attribute :snip_name, name
+        name
+      end
+    else
+      attribute :snip_name, new_name
+      new_name
+    end
   end
-  
+
+  def self.usage(str=nil)
+    attribute :usage, str
+  end
+
   def self.snip_attributes
     full_snip_attributes = {:name => snip_name, :content => self.name, :render_as => "Ruby"}
     @attributes ? full_snip_attributes.merge!(@attributes) : full_snip_attributes
   end
-  
+
   attr_accessor :enclosing_snip
-  
+
   def method_missing(method, *args)
     if snip
       snip.__send__(method)
@@ -45,28 +58,29 @@ class Dynasnip < Vanilla::Renderers::Base
       super
     end
   end
-  
+
   # dynasnips gain access to the app in the same way as Render::Base
   # subclasses
-  
+
   protected
-  
+
+  def requesting_this_snip?
+    app.request.snip_name == snip_name
+  end
+
   def snip_name
     self.class.snip_name
   end
-  
+
+  def usage
+    str = self.class.attribute(:usage)
+    self.class.escape_curly_braces(str).strip if str
+  end
+
   def snip
     app.soup[snip_name]
   end
-  
-  def show_usage
-    if snip.usage
-      Vanilla::Renderers::Markdown.render(snip_name, :usage)
-    else
-      "No usage information for #{snip_name}"
-    end
-  end
-  
+
   def cleaned_params
     p = app.request.params.dup
     p.delete(:snip)

data/lib/vanilla/snip_reference_parser.rb

@@ -26,8 +26,12 @@ module Vanilla
       rule(:spaces?) { spaces.maybe }
       rule(:comma)  { match(',') }
       rule(:dot)    { str(".") }
-      rule(:squote) { str("'") }
-      rule(:dquote) { str('"') }
+      rule(:normal_squote) { str("'") }
+      rule(:html_squote) { str("‘") | str('’') }
+      rule(:squote) { normal_squote | html_squote }
+      rule(:normal_dquote) { str('"') }
+      rule(:html_dquote) { str('“') | str('”') }
+      rule(:dquote) { normal_dquote | html_dquote }
       rule(:escaped_dquote) { str('"') }
       rule(:left_brace) { str("{") }
       rule(:right_brace) { str("}") }

data/lib/vanilla/test_helper.rb

@@ -2,10 +2,12 @@ require "vanilla"
 require "rack/test"
 require "tmpdir"
 require "fileutils"
+require "soup"
 
 module Vanilla
   module TestHelper
     include Rack::Test::Methods
+    include Soup::TestHelper
 
     def app(klass=Vanilla.apps.first)
       unless @__app
@@ -54,5 +56,9 @@ module Vanilla
     def vanilla_teardown
       FileUtils.rm_rf(test_soup_path)
     end
+
+    def stub_app_soup(*snips)
+      app.stubs(:soup).returns(stub_soup(*snips))
+    end
   end
 end

data/pristine_app/config.ru

@@ -1,6 +1,7 @@
+require "application"
+
 # If you're running your site under a proper webserver, you probably don't need this.
 require 'vanilla/static'
 use Vanilla::Static, File.join(File.dirname(__FILE__), 'public')
 
-require "application"
 run Application.new

data/pristine_app/soups/base/feed.rb

@@ -0,0 +1,12 @@
+require "vanilla/dynasnip"
+
+class Feed < Dynasnip
+  def handle(*args)
+    app.atom_feed({
+      :domain => "yourdomain.example.com", # change this
+      :title => "My Feed", # and this,
+      :matching => {:kind => "blog"}, # but probably not this, although you can if you like.
+    })
+  end
+  self
+end

data/pristine_app/soups/system/current_snip.rb

@@ -14,6 +14,7 @@ class CurrentSnip < Dynasnip
   |
 
   def handle(attribute=nil)
+    return usage if app.request.snip_name == snip_name
     if app.request.snip
       if attribute ||= app.request.part
         %|{"#{app.request.snip_name}"."#{attribute}"}|

data/pristine_app/soups/system/index.rb

@@ -3,7 +3,7 @@ require 'vanilla/dynasnip'
 class Index < Dynasnip
   def get(*args)
     list = app.soup.all_snips.sort_by { |a| a.updated_at || Time.at(0) }.reverse.map { |snip|
-      "<li>{link_to #{snip.name}}</li>"
+      %{<li>{link_to "#{snip.name}"}</li>}
     }
     %{<ol id="index">#{list}</ol>}
   end

data/pristine_app/soups/system/link_to.rb

@@ -8,11 +8,13 @@ The link_to dyna lets you create links between snips:
 
 would insert a link to the blah snip.|
 
-  def handle(snip_name, link_text=snip_name, part=nil)
-    if app.soup[snip_name]
-      %{<a href="#{url_to(snip_name, part)}">#{link_text}</a>}
+  def handle(name=nil, link_text=name, part=nil)
+    return usage if requesting_this_snip?
+    return "You must provide a snip name" unless name
+    if app.soup[name]
+      %{<a href="#{url_to(name, part)}">#{link_text}</a>}
     else
-      %{<a class="missing" href="#{url_to(snip_name, part)}">#{link_text}</a>}
+      %{<a class="missing" href="#{url_to(name, part)}">#{link_text}</a>}
     end
   end
 

data/pristine_app/soups/system/pre.rb

@@ -13,7 +13,8 @@ class ShowContentInPreTag < Dynasnip
       {pre my_snip,specific_part}
   |
 
-  def handle(snip_name, part=:content)
+  def handle(snip_name=nil, part=:content)
+    return usage if requesting_this_snip?
     %{<pre>#{app.soup[snip_name].__send__(part || :content)}</pre>}
   end
 

data/pristine_app/soups/system/raw.rb

@@ -14,7 +14,8 @@ class ShowRawContent < Dynasnip
       {raw my_snip,specific_part}
   |
 
-  def handle(snip_name, part=:content)
+  def handle(snip_name=nil, part=:content)
+    return usage if requesting_this_snip?
     %{#{Dynasnip.escape_curly_braces(CGI.escapeHTML(app.soup[snip_name].__send__(part || :content)))}}
   end
 

data/pristine_app/soups/tutorial/tutorial-layout.snip

@@ -23,19 +23,23 @@ Here's the source of `current_snip`:
 
     {raw current_snip}
 
-The default case, as in our layout, is `app.render(app.request.snip, app.request.part)` - it delegates rendering back to the application, which then takes care of processing `start` using the right renderer and so on. This method call returns the fully rendered string, and vanilla replaces the call to the dynasnip with that output, placing our snip in the appropriate place in the layout.
+The default case just renders a string corresponding to snip inclusion of whichever snip was actually requested. In the case of `/start`, this will generate the string "{start}", which Vanilla itself then deals with, including the contents of that snip using the right renderer and so on, placing our snip in the appropriate place in the layout.
 
 
 Other dynas
 -----------
 
-Of course, you can put other plain content in your layout, and other dynasnips too. In the provided layout there are calls to two other dynasnips.
+Of course, you can put other plain content in your layout, and other dynasnips too. In the provided layout there are calls to three other dynasnips.
 
 The first is `page_title`, which simply places a (hopefully) meaningful string in the title element of the page. Snips can set the title to be used by defining a `:page_title` attribute. As usual, the source explains it more clearly:
 
     {raw page_title}
 
-The second dynasnip used is `link_to_current_snip`, which returns an HTML link to the snip that's currently being rendered. I'll let you figure out how to view the source yourself.
+The second is `link_to`, which is used to create links to other snips by name; although of course you can still just write HTML, this is often more convenient and wiki-esque. Here's the source:
+
+    {raw link_to}
+
+The third dynasnip used is `link_to_current_snip`, which returns an HTML link to the snip that's currently being rendered. I'll let you figure out how to view the source yourself.
 
 
 Other layouts

data/test/core/atom_feed_test.rb

@@ -0,0 +1,214 @@
+require "test_helper"
+require "atom"
+
+context "An atom feed" do
+  should "include snips" do
+    stub_app_soup({:name => "Hello", :content => "This is the content"},
+                  {:name => "Goodbye", :content => "More content"})
+
+    feed_xml = Vanilla::AtomFeed.new(:domain => "yourdomain.example.com", :app => app).to_s
+    feed = Atom::Feed.load_feed(feed_xml)
+    assert_equal 2, feed.entries.length
+  end
+
+  context "when making links absolute" do
+    should "handle double quoted a tags" do
+      stub_app_soup({:name => "x", :content => %|<a href="/x">x</a>.|})
+
+      feed = get_feed
+      assert feed.entries.first.content =~ %r{http://yourdomain\.example\.com/x},
+             "double-quoted links external should work (got: #{feed.entries.first.content})"
+    end
+
+    should "handle single quoted a tags" do
+      stub_app_soup({:name => "x", :content => %|<a href='/x'>x</a>.|})
+
+      feed = get_feed
+      assert feed.entries.first.content =~ %r{http://yourdomain\.example\.com/x},
+             "single-quoted links external should work (got: #{feed.entries.first.content})"
+    end
+
+    should "handle double quoted a tags without slahes" do
+      stub_app_soup({:name => "x", :content => %|<a href="x">x</a>.|})
+
+      feed = get_feed
+      assert feed.entries.first.content =~ %r{http://yourdomain\.example\.com/x},
+             "double-quoted links external should work (got: #{feed.entries.first.content})"
+    end
+
+    should "handle single quoted a tags without slashes" do
+      stub_app_soup({:name => "x", :content => %|<a href='x'>x</a>.|})
+
+      feed = get_feed
+      assert feed.entries.first.content =~ %r{http://yourdomain\.example\.com/x},
+             "single-quoted links external should work (got: #{feed.entries.first.content})"
+    end
+
+    should "handle double quoted img tags" do
+      stub_app_soup({:name => "x", :content => %|<img src="/x.jpg" />|})
+
+      feed = get_feed
+      assert feed.entries.first.content =~ %r{http://yourdomain\.example\.com/x.jpg},
+             "single-quoted links external should work (got: #{feed.entries.first.content})"
+    end
+
+    should "handle single quoted img tags" do
+      stub_app_soup({:name => "x", :content => %|<img src='/x.jpg' />|})
+
+      feed = get_feed
+      assert feed.entries.first.content =~ %r{http://yourdomain\.example\.com/x.jpg},
+             "single-quoted links external should work (got: #{feed.entries.first.content})"
+    end
+
+    should "handle double quoted img tags without slashes" do
+      stub_app_soup({:name => "x", :content => %|<img src="x.jpg" />|})
+
+      feed = get_feed
+      assert feed.entries.first.content =~ %r{http://yourdomain\.example\.com/x.jpg},
+             "single-quoted links external should work (got: #{feed.entries.first.content})"
+    end
+
+    should "handle single quoted img tags without slashes" do
+      stub_app_soup({:name => "x", :content => %|<img src='x.jpg' />|})
+
+      feed = get_feed
+      assert feed.entries.first.content =~ %r{http://yourdomain\.example\.com/x.jpg},
+             "single-quoted links external should work (got: #{feed.entries.first.content})"
+    end
+
+    should "not alter urls that are already absolute" do
+      stub_app_soup({:name => "x", :content => %|<img src='http://x.com/' />|})
+
+      feed = get_feed
+      assert feed.entries.first.content =~ %r{src='http://x\.com/'},
+             "should not alter absolute links (got: #{feed.entries.first.content})"
+    end
+  end
+
+  should "allow inclusion of only specific snips" do
+    snip_a_data = {:name => "a", :content => "x"}
+    snip_b_data = {:name => "b", :content => "x"}
+    stub_app_soup(snip_a_data, snip_b_data)
+
+    feed_xml = app.atom_feed(:domain => "whatever", :snips => [app.soup["a"]]).to_s
+    feed = Atom::Feed.load_feed(feed_xml)
+    assert_equal 1, feed.entries.length
+    assert_equal "a", feed.entries.first.title
+  end
+
+  should "allow filtering of snips by matching criteria" do
+    stub_app_soup({:name => "a", :content => "x", :kind => "blog"},
+                  {:name => "b", :content => "x", :kind => "draft"},
+                  {:name => "c", :content => "x", :kind => "blog"})
+
+    feed_xml = app.atom_feed(:domain => "whatever", :matching => {:kind => "blog"}).to_s
+    feed = Atom::Feed.load_feed(feed_xml)
+    assert_equal 2, feed.entries.length
+    assert_same_elements ["a", "c"], feed.entries.map { |e| e.title }
+  end
+
+  should "set updated to be the latest updated_at of the included snips" do
+    snip_a_data = {:name => "a", :content => "x", :updated_at => Time.parse("2011-05-22 12:00")}
+    snip_b_data = {:name => "b", :content => "x", :updated_at => Time.parse("2011-05-23 12:34")}
+    snip_c_data = {:name => "c", :content => "x", :updated_at => Time.parse("2011-05-24 12:34")}
+    stub_app_soup(snip_a_data, snip_b_data, snip_c_data)
+
+    feed_xml = app.atom_feed(:domain => "whatever", :snips => [app.soup["a"], app.soup["b"]]).to_s
+    feed = Atom::Feed.load_feed(feed_xml)
+    assert_equal Time.parse("2011-05-23 12:34"), feed.updated
+  end
+
+  should "format updated_at as an RFC-3339 date-time" do
+    stub_app_soup({:name => "x", :content => "y", :updated_at => Time.parse("2011-01-01 12:23 +0000").to_s})
+
+    feed_xml = app.atom_feed(:domain => "whatever", :snips => [app.soup["x"]]).to_s
+    assert_match %r{2011\-01\-01T12\:23\:00\+00\:00}, feed_xml
+  end
+
+  should "work even without any snips" do
+    feed_xml = app.atom_feed(:domain => "whatever", :snips => []).to_s
+    feed = Atom::Feed.load_feed(feed_xml)
+  end
+
+  context "title" do
+    setup do
+      stub_app_soup
+    end
+
+    should "be settable via the initialiser" do
+      feed_xml = app.atom_feed(:domain => "yourdomain.example.com", :title => "My Title").to_s
+      feed = Atom::Feed.load_feed(feed_xml)
+      assert_equal "My Title", feed.title
+    end
+
+    should "default to the domain" do
+      feed_xml = app.atom_feed(:domain => "yourdomain.example.com").to_s
+      feed = Atom::Feed.load_feed(feed_xml)
+      assert_equal "yourdomain.example.com", feed.title
+    end
+  end
+
+  context "entry" do
+    setup do
+      stub_app_soup({:name => "Hello", :content => "The *content*",
+                     :render_as => "markdown", :created_at => Time.parse("2011-01-01 12:23").to_s})
+    end
+
+    context "titles" do
+      should "default to be the name of the snip" do
+        assert_equal "Hello", get_feed.entries.first.title
+      end
+
+      should "use the title of the snip if present" do
+        stub_app_soup({:name => "hello-mammy", :content => "x", :title => "Hello, Mammy"})
+        assert_equal "Hello, Mammy", get_feed.entries.first.title
+      end
+    end
+
+    context "authors" do
+      should "set the author to be the domain by default" do
+        assert_equal ["yourdomain.example.com"], get_feed.entries.first.authors.map { |a| a.name }
+      end
+
+      should "set the authors if the snip provides" do
+        stub_app_soup({:name => "a", :content => "x", :author => "james"})
+        assert_equal ["james"], get_feed.entries.first.authors.map { |a| a.name }
+      end
+    end
+
+    should "included rendered snip contents" do
+      assert_equal "<p>The <em>content</em></p>", get_feed.entries.first.content
+    end
+
+
+    should "include a link to the snip" do
+      assert_equal ["http://yourdomain.example.com/Hello"], get_feed.entries.first.links.map { |l| l.href }
+    end
+
+    should "set the ID based on the domain, timestamp and snip name" do
+      assert_equal "tag:yourdomain.example.com,2011-01-01:/Hello", get_feed.entries.first.id
+    end
+
+    should "set the published date based on the snip created_at date" do
+      assert_equal Time.parse("2011-01-01 12:23"), get_feed.entries.first.published
+    end
+
+    context "updated at" do
+      should "default to the published date" do
+        assert_equal Time.parse("2011-01-01 12:23"), get_feed.entries.first.updated
+      end
+
+      should "set the updated at to the snip attribute if it exists" do
+        stub_app_soup({:name => "Hello", :content => "the content", :updated_at => Time.parse("2011-01-02 13:45").to_s})
+        assert_equal Time.parse("2011-01-02 13:45"), get_feed.entries.first.updated
+      end
+    end
+  end
+
+  private
+
+  def get_feed
+    feed_xml = app.atom_feed(:domain => "yourdomain.example.com").to_s
+    Atom::Feed.load_feed(feed_xml)
+  end
+end

data/test/core/configuration_test.rb

@@ -65,6 +65,10 @@ context "Configuring a Vanilla app" do
     should "use only the specified soups" do
       assert_equal ["blah", "monkey"], TestConfigurationApp.new.config.soups
     end
+
+    teardown do
+      ["blah", "monkey"].each { |dir| FileUtils.rm_rf(dir) }
+    end
   end
 
   context "with new renderers" do

data/test/core/dynasnip_test.rb

@@ -4,7 +4,7 @@ require 'vanilla/dynasnip'
 describe Dynasnip do
   context "when storing attributes" do
 
-    class ::TestDyna < Dynasnip
+    class TestDyna < Dynasnip
       attribute :test_attribute, "test attribute content"
     end
 
@@ -27,16 +27,51 @@ describe Dynasnip do
     end
   end
 
+  context "determining name" do
+    module X
+      class TestDyna < Dynasnip
+        def handle(*args)
+          "name: #{snip_name}"
+        end
+      end
+    end
+
+    should "strip out modules from the name" do
+      assert_equal "test_dyna", X::TestDyna.snip_name
+    end
+
+    should "allow the snip to reference its own name" do
+      assert_equal "name: test_dyna", X::TestDyna.new(app).handle
+    end
+  end
+
+  context "setting name" do
+    class AnotherDyna < Dynasnip
+    end
+
+    should "be possible" do
+      AnotherDyna.snip_name "some_other_name"
+      assert_equal "some_other_name", AnotherDyna.snip_name
+    end
+  end
+
   context "when rendering usage" do
     class ::ShowUsage < Dynasnip
-      usage "This is the usage"
       def handle
         usage
       end
     end
 
     should "show the usage defined in the snip" do
+      ShowUsage.usage "This is the usage"
+
       assert_equal "This is the usage", ShowUsage.new(app).handle
     end
+
+    should "automatically escape curly braces to prevent snip inclusion" do
+      ShowUsage.usage "like {this}"
+
+      assert_equal "like &#123;this&#125;", ShowUsage.new(app).handle
+    end
   end
 end

data/test/core/snip_reference_parser_test.rb

@@ -83,6 +83,10 @@ context "The SnipReference parser" do
       %|{s 'arg, comma'}|     => {:snip => 's', :attribute => nil, :arguments => ['arg, comma']},
       # %|{s "arg { open"}|     => {:snip => 's', :attribute => nil, :arguments => ['arg { open']},
       # %|{s "arg } close"}|    => {:snip => 's', :attribute => nil, :arguments => ['arg } close']}
+    },
+
+    :html_quoting_arguments => {
+      %|{s “arg”}|  => {:snip => 's', :attribute => nil, :arguments => ['arg']},
     }
   }
 

data/test/core/vanilla_app_test.rb

@@ -45,7 +45,7 @@ describe Vanilla::App do
 
     should "raise an error if the specified renderer doesn't exist" do
       snip = create_snip(:name => "blah", :render_as => "NonExistentClass")
-      assert_raises(NameError) { app.renderer_for(snip) }
+      assert_raises(Vanilla::MissingRendererError) { app.renderer_for(snip) }
     end
   end
 end

data/test/pristine_app/feed_test.rb

@@ -1,12 +1,13 @@
 require "test_helper"
 require "atom"
+require "base/feed"
 
 context "The feed dynasnip" do
-  should "include snips" do
-    app.soup.stubs(:all_snips).returns([
-      snip(:name => "Hello", :content => "This is the content"),
-      snip(:name => "Goodbye", :content => "More content")
-    ])
+  should "include snips of the specified kind" do
+     stub_app_soup({:name => "Hello", :content => "This is the content", :kind => "blog"},
+                   {:name => "Goodbye", :content => "More content", :kind => "blog"},
+                   {:name => "system", :content => "not to be shown"},
+                   Feed.snip_attributes)
 
     visit "/feed.xml"
 
@@ -15,33 +16,13 @@ context "The feed dynasnip" do
   end
 
   should "included rendered snip contents" do
-    app.soup.stubs(:all_snips).returns([
-      snip(:name => "Hello", :content => "This is *the* content", :render_as => "markdown")
-    ])
+     stub_app_soup({:name => "Hello", :content => "This is *the* content",
+                    :render_as => "markdown", :kind => "blog"},
+                    Feed.snip_attributes)
 
     visit "/feed.xml"
 
     feed = Atom::Feed.load_feed(page.source)
     assert_equal "<p>This is <em>the</em> content</p>", feed.entries.first.content
   end
-
-  should "ensure that all links are made absolute"
-
-  context "each entry" do
-    setup do
-    end
-    should "set the name to be the name of the snip"
-    should "use the title of the snip as name if present"
-    should "set the authors"
-    should "include a link to the snip"
-    should "set the ID"
-    should "set the published date"
-    should "set the updated at"
-  end
-
-  private
-
-  def snip(attributes)
-    Soup::Snip.new(attributes, nil)
-  end
 end

data/test/pristine_app/index_test.rb

@@ -26,6 +26,16 @@ context "The index dynasnip" do
     assert_equal %w(beta alpha gamma), links
   end
 
+  should "render links to snips with weird characters and spaces" do
+    app.soup.stubs(:all_snips).returns([
+      snip(:name => "fun fun", :updated_at => Time.at(20))
+    ])
+
+    visit "/index"
+    links = page.all("ol#index li a").map { |l| l.text }
+    assert_equal ["fun fun"], links
+  end
+
   private
 
   def snip(attributes)

data/test/pristine_app/site_test.rb

@@ -0,0 +1,21 @@
+require "test_helper"
+require "timeout"
+
+context "Every snip" do
+  should "return a 200 response code" do
+    snips = app.soup.all_snips
+    snips.each do |snip|
+      expected_code = 200
+      expected_code = 500 if %w(test bad_dynasnip).include?(snip.name)
+      begin
+        Timeout.timeout(1) do
+          get snip.name
+          assert_equal expected_code, last_response.status,
+                       "#{snip.name} returned a #{last_response.status} response:\n#{last_response.body}"
+        end
+      rescue Timeout::Error
+        flunk "#{snip.name} timed out rendering"
+      end
+    end
+  end
+end

data/test/pristine_app/test_helper.rb

@@ -7,6 +7,7 @@ require 'capybara'
 require 'capybara/dsl'
 
 require File.expand_path("../../../pristine_app/application", __FILE__)
+$LOAD_PATH.unshift File.expand_path("../../../pristine_app/soups", __FILE__)
 
 module TestHelper
   include Vanilla::TestHelper

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vanilla
 version: !ruby/object:Gem::Version 
-  hash: 81
+  hash: 87
   prerelease: 
   segments: 
   - 1
   - 17
-  - 1
-  version: 1.17.1
+  - 2
+  version: 1.17.2
 platform: ruby
 authors: 
 - James Adam
@@ -15,10 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-24 00:00:00 -05:00
+date: 2011-11-01 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: rack
+  prerelease: false
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -31,26 +33,26 @@ dependencies:
         - 1
         version: 0.9.1
   type: :runtime
-  prerelease: false
   requirement: *id001
-  name: rack
 - !ruby/object:Gem::Dependency 
+  name: soup
+  prerelease: false
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 5
         segments: 
         - 1
         - 0
-        - 8
-        version: 1.0.8
+        - 9
+        version: 1.0.9
   type: :runtime
-  prerelease: false
   requirement: *id002
-  name: soup
 - !ruby/object:Gem::Dependency 
+  name: ratom
+  prerelease: false
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -63,10 +65,10 @@ dependencies:
         - 5
         version: 0.3.5
   type: :runtime
-  prerelease: false
   requirement: *id003
-  name: ratom
 - !ruby/object:Gem::Dependency 
+  name: RedCloth
+  prerelease: false
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -79,10 +81,10 @@ dependencies:
         - 1
         version: 4.1.1
   type: :runtime
-  prerelease: false
   requirement: *id004
-  name: RedCloth
 - !ruby/object:Gem::Dependency 
+  name: BlueCloth
+  prerelease: false
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -95,10 +97,10 @@ dependencies:
         - 0
         version: 1.0.0
   type: :runtime
-  prerelease: false
   requirement: *id005
-  name: BlueCloth
 - !ruby/object:Gem::Dependency 
+  name: haml
+  prerelease: false
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -110,10 +112,10 @@ dependencies:
         - 1
         version: "3.1"
   type: :runtime
-  prerelease: false
   requirement: *id006
-  name: haml
 - !ruby/object:Gem::Dependency 
+  name: parslet
+  prerelease: false
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -126,10 +128,10 @@ dependencies:
         - 0
         version: 1.2.0
   type: :runtime
-  prerelease: false
   requirement: *id007
-  name: parslet
 - !ruby/object:Gem::Dependency 
+  name: rack-test
+  prerelease: false
   version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -142,26 +144,26 @@ dependencies:
         - 7
         version: 0.5.7
   type: :runtime
-  prerelease: false
   requirement: *id008
-  name: rack-test
 - !ruby/object:Gem::Dependency 
+  name: kintama
+  prerelease: false
   version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 21
         segments: 
         - 0
         - 1
-        - 6
-        version: 0.1.6
+        - 7
+        version: 0.1.7
   type: :development
-  prerelease: false
   requirement: *id009
-  name: kintama
 - !ruby/object:Gem::Dependency 
+  name: mocha
+  prerelease: false
   version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -172,10 +174,10 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  prerelease: false
   requirement: *id010
-  name: mocha
 - !ruby/object:Gem::Dependency 
+  name: capybara
+  prerelease: false
   version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -186,10 +188,10 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  prerelease: false
   requirement: *id011
-  name: capybara
 - !ruby/object:Gem::Dependency 
+  name: launchy
+  prerelease: false
   version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -200,9 +202,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  prerelease: false
   requirement: *id012
-  name: launchy
 description: 
 email: james@lazyatom.com.com
 executables: 
@@ -215,6 +215,7 @@ files:
 - Rakefile
 - README
 - .gemtest
+- test/core/atom_feed_test.rb
 - test/core/configuration_test.rb
 - test/core/dynasnip_test.rb
 - test/core/renderers/base_renderer_test.rb
@@ -237,8 +238,10 @@ files:
 - test/pristine_app/link_to_test.rb
 - test/pristine_app/page_title_test.rb
 - test/pristine_app/raw_test.rb
+- test/pristine_app/site_test.rb
 - test/pristine_app/test_helper.rb
 - lib/vanilla/app.rb
+- lib/vanilla/atom_feed.rb
 - lib/vanilla/config.rb
 - lib/vanilla/console.rb
 - lib/vanilla/dynasnip.rb
@@ -261,9 +264,9 @@ files:
 - pristine_app/application.rb
 - pristine_app/config.ru
 - pristine_app/Gemfile
-- pristine_app/Gemfile.lock
 - pristine_app/public/vanilla.css
 - pristine_app/README
+- pristine_app/soups/base/feed.rb
 - pristine_app/soups/base/layout.snip
 - pristine_app/soups/base/start.snip
 - pristine_app/soups/extras/comments.rb
@@ -272,7 +275,6 @@ files:
 - pristine_app/soups/extras/url_to.rb
 - pristine_app/soups/system/current_snip.rb
 - pristine_app/soups/system/debug.rb
-- pristine_app/soups/system/feed.rb
 - pristine_app/soups/system/index.rb
 - pristine_app/soups/system/link_to.rb
 - pristine_app/soups/system/link_to_current_snip.rb
@@ -296,7 +298,6 @@ files:
 - pristine_app/soups/tutorial/tutorial.snip.markdown
 - pristine_app/soups/tutorial/vanilla-rb.snip
 - pristine_app/soups/tutorial/vanilla.snip
-- pristine_app/tmp/restart.txt
 has_rdoc: true
 homepage: http://github.com/lazyatom/vanilla-rb
 licenses: []
@@ -328,7 +329,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: vanilla
-rubygems_version: 1.4.1
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A bliki-type web content thing.

data/pristine_app/Gemfile.lock

@@ -1,35 +0,0 @@
-PATH
-  remote: /Users/james/Code/lazyatom/vanilla-rb
-  specs:
-    vanilla (1.17)
-      BlueCloth (>= 1.0.0)
-      RedCloth (>= 4.1.1)
-      haml (>= 3.1)
-      parslet (>= 1.2.0)
-      rack (>= 0.9.1)
-      rack-test (>= 0.5.7)
-      ratom (>= 0.3.5)
-      soup (>= 1.0.8)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    BlueCloth (1.0.1)
-    RedCloth (4.2.7)
-    blankslate (2.1.2.4)
-    haml (3.1.1)
-    libxml-ruby (2.0.5)
-    parslet (1.2.0)
-      blankslate (~> 2.0)
-    rack (1.2.2)
-    rack-test (0.5.7)
-      rack (>= 1.0)
-    ratom (0.6.8)
-      libxml-ruby (>= 1.1.2)
-    soup (1.0.8)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  vanilla!

data/pristine_app/soups/system/feed.rb

@@ -1,30 +0,0 @@
-require "vanilla/dynasnip"
-
-class Feed < Dynasnip
-  def handle(*args)
-    Atom::Feed.new do |f|
-      f.title = "blah"
-      f.updated = Time.now
-      f.id = "tag:x,2008-06-01:kind/x"
-      f.entries = entries
-    end.to_xml
-  end
-
-  private
-  
-  def entries
-    app.soup.all_snips.map do |snip|
-      Atom::Entry.new do |e|
-        # e.published = snip.created_at
-        # e.updated = snip.updated_at || snip.created_at
-        e.content = Atom::Content::Html.new(app.render(snip))
-        # e.title = snip.name
-        # e.authors = [Atom::Person.new(:name => snip.author || domain)]
-        # e.links << Atom::Link.new(:href => "http://#{domain}#{url_to(snip.name)}")
-        # e.id = "tag:#{domain},#{(snip.created_at.to_s || Date.today.to_s).split[0]}:/#{snip.name}"
-      end
-    end
-  end
-
-  self
-end