vanilla 1.17.13 → 2.0.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5589144bd83e51b4ebd633c66df520584e3aa426
-  data.tar.gz: a42f38607615af134993f3dd1a8f7fe92e712951
+  metadata.gz: 18d83e6c8385826e4b39e61dab35894534d705de
+  data.tar.gz: 63c871399b4e3efdc76c75f6df836094fca48440
 SHA512:
-  metadata.gz: f574afdaeaaa1e2a8e6bef28a6d3fd441c0c3b765615a804f36f088b926de07969ad2ca2308dac9f3fcc06549c1ade07d946c612cd8f2a0414e042d6ad959f3b
-  data.tar.gz: ac9eeccbc3be25ee3dadc73ff1a7aaba460885b49d3cb400ab9c0e209489d11fadc8bb944e1766f108f8250638bd9d37b2e31f4846a9f0171618e5f1b6b85426
+  metadata.gz: 54a1aff8f63e05e938e2f215ecf1ea5c663b15ddc08fec692e519569051e887ea13fcaac5763631840a4357e506a7cfe44cccc11a0bf168cea68a6ca81a225e6
+  data.tar.gz: 5d728473a4609f9557767e4db33229421f93c21b7505f413952b033cc309f753d44f8a89184c2792ed25ee7c986dc28c0d1dddd1804726d73acb8ea5a98b26c7

data/README

@@ -14,22 +14,24 @@ A Preface; A Warning
 The base flavour. The classic ice cream. Except riddled through with blood-red gemstones - Ruby gemstones.
 This mad gelato will break your teeth.
 
-... and run the freakiest wiki-wonki-wiki-wonki-wiki-wonki-wickedy-wiki you've ever seen. 
+... and run the freakiest wiki-wonki-wiki-wonki-wiki-wonki-wickedy-wiki you've ever seen.
 
-But you must not fear: fear is the mind-killer; fear is the little death that brings total oblivion; 
-fear is the chilling terror that makes you believe that *everything* is better when Model lays with 
+But you must not fear: fear is the mind-killer; fear is the little death that brings total oblivion;
+fear is the chilling terror that makes you believe that *everything* is better when Model lays with
 Controller and View in peace.
 
 Vanilla.rb cries "HERESY!" upon that layered orgy of filth. Vanilla.rb says "EMBRACE CHAOS!". Vanilla.rb
 says "EVERY SNIP FOR THEMSELVES!". Vanilla.rb waits quietly, in the dark corners.
 
-Use at your own risk; really. I showed it to a cat, and the cat started talking in French. 
+Use at your own risk; really. I showed it to a cat, and the cat started talking in French.
 It was MESSED. UP.
 
 
 Thee Darke Invocation
 =====================
 
+(Ruby 1.9 and above, please)
+
 $ gem install vanilla
 
 $ vanilla my_app_name
@@ -39,7 +41,7 @@ $ vanilla my_app_name
 $ cd my_app_name
 $ rackup
 
-... the wonki starts. THE PAIN BEGINS. 
+... the wonki starts. THE PAIN BEGINS.
 
 (Try going to http://localhost:9292/vanilla-rb-tutorial to salve the chafing.)
 
@@ -50,4 +52,4 @@ Working with Vanilla
 Currently unknowable; soon I hope to compile such a nercronomicon as to allow mortal kind to
 conjure up Snips and Dynasnips and Renderers...
 
-For the moment, see http://interblah.net/vanilla-rb-tutorial
+For the moment, see http://interblah.net/vanilla-rb-tutorial

data/Rakefile

@@ -5,9 +5,9 @@ require "rdoc/task"
 require "bundler/setup"
 require "vanilla"
 
-task :default => :test
+task default: :test
 
-task :test => ["test:core", "test:app"]
+task test: ["test:core", "test:app"]
 
 namespace :test do
   require "rake/testtask"
@@ -67,12 +67,12 @@ if Object.const_defined?(:Gem)
 
     # All the other gems we need.
     s.add_dependency("rack", ">= 0.9.1")
-    s.add_dependency("soup", ">= 1.0.11")
+    s.add_dependency("soup", ">= 1.0.13")
     s.add_dependency("ratom", ">= 0.3.5")
     s.add_dependency("RedCloth", ">= 4.1.1")
     s.add_dependency("BlueCloth", ">= 1.0.0")
     s.add_dependency("haml", ">=3.1")
-    s.add_dependency("parslet", "~> 1.5.0")
+    s.add_dependency("parslet", ">= 1.5.0")
     s.add_dependency("rack-test", ">=0.5.7")
 
     s.add_development_dependency("rake", ">= 0.9.1")
@@ -115,7 +115,7 @@ if Object.const_defined?(:Gem)
     File.open(file, "w") {|f| f << output }
   end
 
-  task :package => :gemspec
+  task package: :gemspec
 
   # Generate documentation
   Rake::RDocTask.new do |rd|
@@ -125,10 +125,10 @@ if Object.const_defined?(:Gem)
   end
 
   desc 'Clear out RDoc and generated packages'
-  task :clean => [:clobber_rdoc, :clobber_package]
+  task clean: [:clobber_rdoc, :clobber_package]
 
   desc 'Tag the repository in git with gem version number'
-  task :tag => [:gemspec, :package] do
+  task tag: [:gemspec, :package] do
     if `git diff --cached`.empty?
       if `git tag`.split("\n").include?("v#{spec.version}")
         raise "Version #{spec.version} has already been released"
@@ -144,7 +144,7 @@ if Object.const_defined?(:Gem)
   end
 
   desc "Tag and publish the gem to rubygems.org"
-  task :publish => :tag do
+  task publish: :tag do
     `gem push pkg/#{spec.name}-#{spec.version}.gem`
   end
 else

data/bin/vanilla

@@ -5,9 +5,8 @@ def create(new_app_dir)
   pristine_app = File.expand_path("../../pristine_app", __FILE__)
   FileUtils.cp_r(pristine_app, new_app_dir)
   FileUtils.mkdir_p(File.join(new_app_dir, "tmp"))
-  require 'vanilla'
   File.open(File.join(new_app_dir, "Gemfile"), "w") do |f|
-    f.write "source :rubygems\n\n# Vanilla itself.\ngem 'vanilla', '#{Vanilla::VERSION}'"
+    f.write "source 'https://rubygems.org'\n\n# Vanilla itself.\ngem 'vanilla'"
   end
   puts File.readlines(File.join(new_app_dir, "README"))[0..16].join
 end
@@ -51,7 +50,7 @@ def console
   require "irb"
   require "vanilla/console"
   puts "The Soup is simmering."
-  IRB.start 
+  IRB.start
 end
 
 case ARGV[0]

data/lib/vanilla.rb

@@ -1,5 +1,5 @@
 module Vanilla
-  VERSION = "1.17.13"
+  VERSION = "2.0.0.beta"
 
   autoload :Renderers, "vanilla/renderers"
   autoload :App, "vanilla/app"

data/lib/vanilla/app.rb

@@ -100,7 +100,7 @@ module Vanilla
     end
 
     def atom_feed(options={})
-      AtomFeed.new(options.merge(:app => self))
+      AtomFeed.new(options.merge(app: self))
     end
 
     private

data/lib/vanilla/atom_feed.rb

@@ -50,8 +50,8 @@ module Vanilla
           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.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]}:#{app.url_to(snip.name)}"
         end
       end

data/lib/vanilla/config.rb

@@ -19,14 +19,14 @@ module Vanilla
   class Config
     def initialize
       @attributes = {
-        :root => Dir.pwd,
-        :root_snip => "start",
-        :soup => nil,
-        :soups => ["soups/base", "soups/system"],
-        :default_layout_snip => "layout",
-        :default_renderer => Vanilla::Renderers::Base,
-        :raise_errors => false,
-        :renderers => {
+        root: Dir.pwd,
+        root_snip: "start",
+        soup: nil,
+        soups: ["soups/base", "soups/system"],
+        default_layout_snip: "layout",
+        default_renderer: Vanilla::Renderers::Base,
+        raise_errors: false,
+        renderers: {
           "base" => Vanilla::Renderers::Base,
           "markdown" => Vanilla::Renderers::Markdown,
           "bold" => Vanilla::Renderers::Bold,

data/lib/vanilla/dynasnip.rb

@@ -43,7 +43,7 @@ class Dynasnip < Vanilla::Renderers::Base
   end
 
   def self.snip_attributes
-    full_snip_attributes = {:name => snip_name, :content => self.name, :render_as => "Ruby"}
+    full_snip_attributes = {name: snip_name, content: self.name, render_as: "Ruby"}
     @attributes ? full_snip_attributes.merge!(@attributes) : full_snip_attributes
   end
 
@@ -89,4 +89,4 @@ class Dynasnip < Vanilla::Renderers::Base
     p.delete(:part)
     p
   end
-end
+end

data/lib/vanilla/renderers/base.rb

@@ -112,7 +112,8 @@ module Vanilla
 
       # Returns the raw content for the selected part of the selected snip
       def raw_content(snip, part)
-        snip.__send__((part || :content).to_sym)
+        selected_part = (part || :content).to_sym
+        snip.__send__(selected_part) if snip.respond_to?(selected_part)
       end
     end
   end

data/lib/vanilla/renderers/erb.rb

@@ -1,14 +1,13 @@
 require 'erb'
-include ERB::Util
 
 module Vanilla::Renderers
   class Erb < Base
     def prepare(snip, part=:content, args=[], enclosing_snip=snip)
       @snip = snip
     end
-    
+
     def process_text(content)
       ERB.new(content).result(binding)
     end
   end
-end
+end

data/lib/vanilla/snip_reference_parser.rb

@@ -86,21 +86,21 @@ module Vanilla
     end
 
     class SnipTransform < Parslet::Transform
-      rule(:nil => simple(:x)) { nil }
-      rule(:string => simple(:x)) { x.to_s }
-      rule(:string_arg => simple(:x)) { x }
-      rule(:string_arg_list => simple(:x)) { [x] }
-      rule(:string_arg_list => sequence(:x)) { x }
+      rule(nil: simple(:x)) { nil }
+      rule(string: simple(:x)) { x.to_s }
+      rule(string_arg: simple(:x)) { x }
+      rule(string_arg_list: simple(:x)) { [x] }
+      rule(string_arg_list: sequence(:x)) { x }
 
       class Arg
         def initialize(k, v); @k, @v = k, v; end
         def to_h; {@k.to_sym => @v}; end
       end
 
-      rule(:hash_arg => subtree(:x)) { Arg.new(x[:key], x[:value]) }
-      rule(:named_arg => subtree(:x)) { Arg.new(x[:key], x[:value]) }
-      rule(:key_value_arg_list => simple(:x)) { x.to_h }
-      rule(:key_value_arg_list => sequence(:x)) { x.inject({}) { |h, kv| h.merge(kv.to_h) } }
+      rule(hash_arg: subtree(:x)) { Arg.new(x[:key], x[:value]) }
+      rule(named_arg: subtree(:x)) { Arg.new(x[:key], x[:value]) }
+      rule(key_value_arg_list: simple(:x)) { x.to_h }
+      rule(key_value_arg_list: sequence(:x)) { x.inject({}) { |h, kv| h.merge(kv.to_h) } }
     end
   end
 end

data/pristine_app/Gemfile

@@ -1,3 +1,3 @@
 source :rubygems
 
-gem 'vanilla', :path => File.expand_path("../..", __FILE__)
+gem 'vanilla', path: File.expand_path("../..", __FILE__)

data/pristine_app/README

@@ -1,7 +1,7 @@
-                      WELCOME IN VANILLA
-                                 Vanilla
-                                 vanilla
-                                 .........vanillaaaaaAAAAAAAAAAA
+       WELCOME IN VANILLA
+                  Vanilla
+                  vanilla
+                  .........vanillaaaaaAAAAAAAAAAA
 
 What you've got:
 
@@ -24,7 +24,7 @@ slightly modified YAML files. Here's an example, which you might save
 in a file called 'soup.snip':
 
 
-    Soup is a data store supporting the {link_to snip}-space that 
+    Soup is a data store supporting the {link_to snip}-space that
     {link_to vanilla-rb} expects.
 
     It's hosted on github [here](http://github.com/lazyatom/soup).
@@ -44,4 +44,4 @@ The console
 Within a vanilla app directory, you can run `vanilla console` to start
 an IRB session and interact with your app and snips. The `app` method
 returns your application object, and `app.soup['start']` will return
-the start snip from your soup(s).
+the start snip from your soup(s).

data/pristine_app/config.ru

@@ -1,7 +1,9 @@
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+
 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')
 
-run Application.new
+run Application.new

data/pristine_app/soups/extras/comments.rb

@@ -14,7 +14,7 @@ class Comments < Dynasnip
 
   def get(disable_new_comments=false)
     return usage if self.class.snip_name == app.request.snip_name
-    comments = app.soup.with(:commenting_on => enclosing_snip.name)
+    comments = app.soup.with(commenting_on: enclosing_snip.name)
     comments_html = if app.request.snip_name == enclosing_snip.name
       rendered_comments = render_comments(comments)
       rendered_comments += comment_form.gsub('SNIP_NAME', enclosing_snip.name) unless disable_new_comments
@@ -27,16 +27,16 @@ class Comments < Dynasnip
 
   def post(*args)
     snip_name = app.request.params[:snip]
-    existing_comments = app.soup.with(:commenting_on => snip_name)
+    existing_comments = app.soup.with(commenting_on: snip_name)
     comment = app.request.params.reject { |k,v| ![:author, :email, :website, :content].include?(k) }
 
     return "You need to add some details!" if comment.empty?
     return "No spam today, thanks anyway" unless app.request.params[:human] == 'human'
 
     app.soup << comment.merge({
-     :name => "#{snip_name}-comment-#{existing_comments.length + 1}",
-     :commenting_on => snip_name,
-     :created_at => Time.now
+     name: "#{snip_name}-comment-#{existing_comments.length + 1}",
+     commenting_on: snip_name,
+     created_at: Time.now
     })
     "Thanks for your comment! Back to {link_to #{snip_name}}"
   end
@@ -75,4 +75,4 @@ class Comments < Dynasnip
   }
 
   self
-end
+end

data/pristine_app/soups/extras/kind.rb

@@ -5,7 +5,7 @@ require 'date'
 class Kind < Dynasnip
   def handle(kind, limit=10, as=:html)
     as = as.to_sym
-    snips = app.soup.with(:kind => kind)
+    snips = app.soup.with(kind: kind)
     entries = snips.sort_by { |s| s.created_at || Time.at(0) }.reverse[0...limit.to_i].map do |snip|
       render_entry_in_template(snip, as, kind)
     end
@@ -27,8 +27,8 @@ class Kind < Dynasnip
         e.updated = snip.updated_at || snip.created_at
         e.content = Atom::Content::Html.new(rendered_contents)
         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.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
@@ -69,4 +69,4 @@ class Kind < Dynasnip
       </div>
     </div>
   }
-end
+end

data/pristine_app/soups/extras/url_to.rb

@@ -4,4 +4,4 @@ class UrlTo < Dynasnip
   def handle(snip_name)
     app.soup[snip_name] ? url_to(snip_name) : "[Snip '#{snip_name}' not found]"
   end
-end
+end

data/test/core/atom_feed_test.rb

@@ -3,17 +3,17 @@ 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"})
+    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_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>.|})
+      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},
@@ -21,7 +21,7 @@ context "An atom feed" do
     end
 
     should "handle single quoted a tags" do
-      stub_app_soup({:name => "x", :content => %|<a href='/x'>x</a>.|})
+      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},
@@ -29,7 +29,7 @@ context "An atom feed" do
     end
 
     should "handle double quoted a tags without slahes" do
-      stub_app_soup({:name => "x", :content => %|<a href="x">x</a>.|})
+      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},
@@ -37,7 +37,7 @@ context "An atom feed" do
     end
 
     should "handle single quoted a tags without slashes" do
-      stub_app_soup({:name => "x", :content => %|<a href='x'>x</a>.|})
+      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},
@@ -45,7 +45,7 @@ context "An atom feed" do
     end
 
     should "handle double quoted img tags" do
-      stub_app_soup({:name => "x", :content => %|<img src="/x.jpg" />|})
+      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},
@@ -53,7 +53,7 @@ context "An atom feed" do
     end
 
     should "handle single quoted img tags" do
-      stub_app_soup({:name => "x", :content => %|<img src='/x.jpg' />|})
+      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},
@@ -61,7 +61,7 @@ context "An atom feed" do
     end
 
     should "handle double quoted img tags without slashes" do
-      stub_app_soup({:name => "x", :content => %|<img src="x.jpg" />|})
+      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},
@@ -69,7 +69,7 @@ context "An atom feed" do
     end
 
     should "handle single quoted img tags without slashes" do
-      stub_app_soup({:name => "x", :content => %|<img src='x.jpg' />|})
+      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},
@@ -77,7 +77,7 @@ context "An atom feed" do
     end
 
     should "not alter urls that are already absolute" do
-      stub_app_soup({:name => "x", :content => %|<img src='http://x.com/' />|})
+      stub_app_soup({name: "x", content: %|<img src='http://x.com/' />|})
 
       feed = get_feed
       assert feed.entries.first.content =~ %r{src='http://x\.com/'},
@@ -86,57 +86,57 @@ context "An atom feed" do
   end
 
   should "allow inclusion of only specific snips" do
-    snip_a_data = {:name => "a", :content => "x"}
-    snip_b_data = {:name => "b", :content => "x"}
+    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_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"})
+    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_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 "allow limiting of the number of snips" do
-    stub_app_soup({:name => "a", :content => "x", :kind => "blog", :updated_at => (Time.now - 10)},
-                  {:name => "b", :content => "x", :kind => "blog", :updated_at => (Time.now - 20)})
+    stub_app_soup({name: "a", content: "x", kind: "blog", updated_at: (Time.now - 10)},
+                  {name: "b", content: "x", kind: "blog", updated_at: (Time.now - 20)})
 
-    feed_xml = app.atom_feed(:domain => "whatever", :matching => {:kind => "blog"}, :count => 1).to_s
+    feed_xml = app.atom_feed(domain: "whatever", matching: {kind: "blog"}, count: 1).to_s
     feed = Atom::Feed.load_feed(feed_xml)
     assert_equal 1, feed.entries.length
     assert_equal "a", feed.entries.first.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")}
+    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_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})
+    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
+    feed_xml = app.atom_feed(domain: "whatever", snips: [app.soup["x"]]).to_s
     assert_match %r{2011\-01\-01T\d{2}\:23\:00[\+\-]\d{2}\:\d{2}}, feed_xml
   end
 
   should "work even without any snips" do
-    feed_xml = app.atom_feed(:domain => "whatever", :snips => []).to_s
+    feed_xml = app.atom_feed(domain: "whatever", snips: []).to_s
     feed = Atom::Feed.load_feed(feed_xml)
   end
 
@@ -146,13 +146,13 @@ context "An atom feed" do
     end
 
     should "be settable via the initialiser" do
-      feed_xml = app.atom_feed(:domain => "yourdomain.example.com", :title => "My Title").to_s
+      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_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
@@ -160,8 +160,8 @@ context "An atom feed" do
 
   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})
+      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
@@ -170,7 +170,7 @@ context "An atom feed" do
       end
 
       should "use the title of the snip if present" do
-        stub_app_soup({:name => "hello-mammy", :content => "x", :title => "Hello, Mammy"})
+        stub_app_soup({name: "hello-mammy", content: "x", title: "Hello, Mammy"})
         assert_equal "Hello, Mammy", get_feed.entries.first.title
       end
     end
@@ -181,7 +181,7 @@ context "An atom feed" do
       end
 
       should "set the authors if the snip provides" do
-        stub_app_soup({:name => "a", :content => "x", :author => "james"})
+        stub_app_soup({name: "a", content: "x", author: "james"})
         assert_equal ["james"], get_feed.entries.first.authors.map { |a| a.name }
       end
     end
@@ -200,8 +200,8 @@ context "An atom feed" do
     end
 
     should "not include snip name spaces in ID" do
-      stub_app_soup({:name => "snip name", :content => "The *content*",
-               :render_as => "markdown", :created_at => Time.parse("2011-01-01 12:23").to_s})
+      stub_app_soup({name: "snip name", content: "The *content*",
+               render_as: "markdown", created_at: Time.parse("2011-01-01 12:23").to_s})
 
       assert_equal "tag:yourdomain.example.com,2011-01-01:/snip+name", get_feed.entries.first.id
     end
@@ -216,7 +216,7 @@ context "An atom feed" do
       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})
+        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
@@ -225,7 +225,7 @@ context "An atom feed" do
   private
 
   def get_feed
-    feed_xml = app.atom_feed(:domain => "yourdomain.example.com").to_s
+    feed_xml = app.atom_feed(domain: "yourdomain.example.com").to_s
     Atom::Feed.load_feed(feed_xml)
   end
 end