vanilla 1.17.13 → 2.0.0.beta

data/test/core/configuration_test.rb

@@ -91,7 +91,7 @@ context "Configuring a Vanilla app" do
       TestConfigurationApp.configure do |c|
         c.renderers[:my_renderer] = "MyRenderer"
       end
-      snip = create_snip(:name => "blah", :render_as => "my_renderer")
+      snip = create_snip(name: "blah", render_as: "my_renderer")
       assert_equal MyRenderer, TestConfigurationApp.new.renderer_for(snip)
     end
 
@@ -99,7 +99,7 @@ context "Configuring a Vanilla app" do
       TestConfigurationApp.configure do |c|
         c.renderers["markdown"] = "Vanilla::Renderers::Bold"
       end
-      snip = create_snip(:name => "blah", :extension => "markdown")
+      snip = create_snip(name: "blah", extension: "markdown")
       assert_equal Vanilla::Renderers::Bold, TestConfigurationApp.new.renderer_for(snip)
     end
   end

data/test/core/snip_inclusion_test.rb

@@ -2,7 +2,7 @@ require "test_helper"
 
 context "When including snips in other snips" do
   setup do
-    create_snip :name => "test", :content => "snip content"
+    create_snip name: "test", content: "snip content"
   end
 
   should "match simple snips" do
@@ -18,34 +18,34 @@ context "When including snips in other snips" do
   end
 
   should "match snips with hyphens" do
-    create_snip :name => "test-snip", :content => "snip content"
+    create_snip name: "test-snip", content: "snip content"
     assert_equal "rendering snip content", render("rendering {test-snip}")
   end
 
   should "match snips with underscores" do
-    create_snip :name => "test_snip", :content => "snip content"
+    create_snip name: "test_snip", content: "snip content"
     assert_equal "rendering snip content", render("rendering {test_snip}")
   end
 
   should "match snips with numbers" do
-    create_snip :name => "test1", :content => "snip content"
+    create_snip name: "test1", content: "snip content"
     assert_equal "rendering snip content", render("rendering {test1}")
   end
 
   should "match snips with dots in their arguments" do
-    create_snip :name => "test", :content => "dot arguments"
+    create_snip name: "test", content: "dot arguments"
     assert_equal %{allow dot arguments}, render(%|allow {test "allow but ignore this argument..."}|)
   end
 
   should "match snips with ruby 1.9 style hashes" do
-    create_snip :name => "test", :content => %{
+    create_snip name: "test", content: %{
       class Blah
         def handle(args)
           args.inspect
         end
         self
       end
-    }, :render_as => "Ruby"
+    }, render_as: "Ruby"
     assert_equal %{rendering {:x=>"1"}}, render("rendering {test x:1}")
   end
 
@@ -59,13 +59,13 @@ context "When including snips in other snips" do
   end
 
   should "render malformed snip inclusions for easier debugging" do
-    create_snip :name => "some_dyna"
+    create_snip name: "some_dyna"
     assert_equal %|this is a <span class="malformed_snip_inclusion">(malformed snip inclusion: &#123;some_dyna blah! blah&#125;)</span>|,
       render("this is a {some_dyna blah! blah}")
   end
 
   def render(content)
-    snip = create_snip :name => "test-content", :content => content
+    snip = create_snip name: "test-content", content: content
     Vanilla::Renderers::Base.new(app).render(snip)
   end
 end

data/test/core/snip_reference_parser_test.rb

@@ -9,88 +9,88 @@ context "The SnipReference parser" do
   end
 
   examples = {
-    :snip_names => {
-      %|{snip}|                  => {:snip => 'snip', :attribute => nil, :arguments => []},
-      %|{Snip}|                  => {:snip => 'Snip', :attribute => nil, :arguments => []},
-      %|{123snip}|               => {:snip => '123snip', :attribute => nil, :arguments => []},
-      %|{Snip123}|               => {:snip => 'Snip123', :attribute => nil, :arguments => []},
-      %|{snip-with-dashes}|      => {:snip => 'snip-with-dashes', :attribute => nil, :arguments => []},
-      %|{snip_with_underscores}| => {:snip => 'snip_with_underscores', :attribute => nil, :arguments => []},
+    snip_names: {
+      %|{snip}|                  => {snip: 'snip', attribute: nil, arguments: []},
+      %|{Snip}|                  => {snip: 'Snip', attribute: nil, arguments: []},
+      %|{123snip}|               => {snip: '123snip', attribute: nil, arguments: []},
+      %|{Snip123}|               => {snip: 'Snip123', attribute: nil, arguments: []},
+      %|{snip-with-dashes}|      => {snip: 'snip-with-dashes', attribute: nil, arguments: []},
+      %|{snip_with_underscores}| => {snip: 'snip_with_underscores', attribute: nil, arguments: []},
     },
 
-    :snip_attributes => {
-      %|{snip.snip_attribute}|     => {:snip => 'snip', :attribute => 'snip_attribute', :arguments => []},
-      %|{snip.snip_attribute arg}| => {:snip => 'snip', :attribute => 'snip_attribute', :arguments => ['arg']},
-      %|{snip."spaced attribute"}| => {:snip => 'snip', :attribute => 'spaced attribute', :arguments => []},
-      %|{snip.'spaced attribute'}| => {:snip => 'snip', :attribute => 'spaced attribute', :arguments => []}
+    snip_attributes: {
+      %|{snip.snip_attribute}|     => {snip: 'snip', attribute: 'snip_attribute', arguments: []},
+      %|{snip.snip_attribute arg}| => {snip: 'snip', attribute: 'snip_attribute', arguments: ['arg']},
+      %|{snip."spaced attribute"}| => {snip: 'snip', attribute: 'spaced attribute', arguments: []},
+      %|{snip.'spaced attribute'}| => {snip: 'snip', attribute: 'spaced attribute', arguments: []}
     },
 
-    :simple_arguments => {
-      %|{snip argument}|           => {:snip => 'snip', :attribute => nil, :arguments => ["argument"]},
-      %|{snip1 argument}|          => {:snip => 'snip1', :attribute => nil, :arguments => ["argument"]},
-      %|{snip arg-dashes}|         => {:snip => 'snip', :attribute => nil, :arguments => ["arg-dashes"]},
-      %|{snip arg_underscores}|    => {:snip => 'snip', :attribute => nil, :arguments => ["arg_underscores"]},
-      %|{snip arg1,arg2}|          => {:snip => 'snip', :attribute => nil, :arguments => ['arg1', 'arg2']},
-      %|{snip arg1, arg2}|         => {:snip => 'snip', :attribute => nil, :arguments => ['arg1', 'arg2']},
-      %|{snip arg1,  arg2}|        => {:snip => 'snip', :attribute => nil, :arguments => ['arg1', 'arg2']},
-      %|{snip 1ARG, arg_2, arg-3}| => {:snip => 'snip', :attribute => nil, :arguments => ['1ARG', 'arg_2', 'arg-3']}
+    simple_arguments: {
+      %|{snip argument}|           => {snip: 'snip', attribute: nil, arguments: ["argument"]},
+      %|{snip1 argument}|          => {snip: 'snip1', attribute: nil, arguments: ["argument"]},
+      %|{snip arg-dashes}|         => {snip: 'snip', attribute: nil, arguments: ["arg-dashes"]},
+      %|{snip arg_underscores}|    => {snip: 'snip', attribute: nil, arguments: ["arg_underscores"]},
+      %|{snip arg1,arg2}|          => {snip: 'snip', attribute: nil, arguments: ['arg1', 'arg2']},
+      %|{snip arg1, arg2}|         => {snip: 'snip', attribute: nil, arguments: ['arg1', 'arg2']},
+      %|{snip arg1,  arg2}|        => {snip: 'snip', attribute: nil, arguments: ['arg1', 'arg2']},
+      %|{snip 1ARG, arg_2, arg-3}| => {snip: 'snip', attribute: nil, arguments: ['1ARG', 'arg_2', 'arg-3']}
     },
 
-    :snip_name_spaces => {
-      %|{"snip with spaces"}|           => {:snip => 'snip with spaces', :attribute => nil, :arguments => []},
-      %|{'snip with spaces'}|           => {:snip => 'snip with spaces', :attribute => nil, :arguments => []},
-      %|{"snip with spaces" argument}|  => {:snip => 'snip with spaces', :attribute => nil, :arguments => ['argument']},
-      %|{'snip with spaces' argument}|  => {:snip => 'snip with spaces', :attribute => nil, :arguments => ['argument']},
-      %|{"snip with spaces" a, b}|      => {:snip => 'snip with spaces', :attribute => nil, :arguments => ['a', 'b']},
-      %|{'snip with spaces' a, b}|      => {:snip => 'snip with spaces', :attribute => nil, :arguments => ['a', 'b']},
-      %|{"snip with spaces".attribute}| => {:snip => 'snip with spaces', :attribute => 'attribute', :arguments => []},
-      %|{'snip with spaces'.attribute}| => {:snip => 'snip with spaces', :attribute => 'attribute', :arguments => []}
+    snip_name_spaces: {
+      %|{"snip with spaces"}|           => {snip: 'snip with spaces', attribute: nil, arguments: []},
+      %|{'snip with spaces'}|           => {snip: 'snip with spaces', attribute: nil, arguments: []},
+      %|{"snip with spaces" argument}|  => {snip: 'snip with spaces', attribute: nil, arguments: ['argument']},
+      %|{'snip with spaces' argument}|  => {snip: 'snip with spaces', attribute: nil, arguments: ['argument']},
+      %|{"snip with spaces" a, b}|      => {snip: 'snip with spaces', attribute: nil, arguments: ['a', 'b']},
+      %|{'snip with spaces' a, b}|      => {snip: 'snip with spaces', attribute: nil, arguments: ['a', 'b']},
+      %|{"snip with spaces".attribute}| => {snip: 'snip with spaces', attribute: 'attribute', arguments: []},
+      %|{'snip with spaces'.attribute}| => {snip: 'snip with spaces', attribute: 'attribute', arguments: []}
     },
 
-    :arguments_with_spaces => {
-      %|{snip arg spaces}|           => {:snip => 'snip', :attribute => nil, :arguments => ['arg spaces']},
-      %|{snip arg spaces, and this}| => {:snip => 'snip', :attribute => nil, :arguments => ['arg spaces', 'and this']},
-      %|{snip "arg spaces"}|         => {:snip => 'snip', :attribute => nil, :arguments => ['arg spaces']},
-      %|{snip 'arg spaces'}|         => {:snip => 'snip', :attribute => nil, :arguments => ['arg spaces']},
-      %|{snip "arg spaces", arg2}|   => {:snip => 'snip', :attribute => nil, :arguments => ['arg spaces', 'arg2']}
+    arguments_with_spaces: {
+      %|{snip arg spaces}|           => {snip: 'snip', attribute: nil, arguments: ['arg spaces']},
+      %|{snip arg spaces, and this}| => {snip: 'snip', attribute: nil, arguments: ['arg spaces', 'and this']},
+      %|{snip "arg spaces"}|         => {snip: 'snip', attribute: nil, arguments: ['arg spaces']},
+      %|{snip 'arg spaces'}|         => {snip: 'snip', attribute: nil, arguments: ['arg spaces']},
+      %|{snip "arg spaces", arg2}|   => {snip: 'snip', attribute: nil, arguments: ['arg spaces', 'arg2']}
     },
 
-    :nil_arguments => {
-      %|{snip arg1,nil,arg3}|   => {:snip => 'snip', :attribute => nil, :arguments => ['arg1', nil, 'arg3']},
-      %|{snip arg1, nil ,arg3}| => {:snip => 'snip', :attribute => nil, :arguments => ['arg1', nil, 'arg3']}
+    nil_arguments: {
+      %|{snip arg1,nil,arg3}|   => {snip: 'snip', attribute: nil, arguments: ['arg1', nil, 'arg3']},
+      %|{snip arg1, nil ,arg3}| => {snip: 'snip', attribute: nil, arguments: ['arg1', nil, 'arg3']}
     },
 
-    :classic_ruby_hash_arguments => {
-      %|{s key1=>value1, key2 => value2}|     => {:snip => 's', :arguments => {:key1 => 'value1', :key2 => 'value2'}},
-      %|{s key1 => value1, key2 => value2}|   => {:snip => 's', :arguments => {:key1 => 'value1', :key2 => 'value2'}},
-      %|{s :key1 => value1, :key2 => value2}| => {:snip => 's', :arguments => {:key1 => 'value1', :key2 => 'value2'}},
-      %|{s key1 => "value with spaces"}|      => {:snip => 's', :arguments => {:key1 => "value with spaces"}},
-      %|{s.attr key1=>value1}|                => {:snip => 's', :attribute => 'attr', :arguments => {:key1 => 'value1'}},
-      %|{s "key with spaces" => value}|       => {:snip => 's', :arguments => {:"key with spaces" => "value"}}
+    classic_ruby_hash_arguments: {
+      %|{s key1=>value1, key2 => value2}|     => {snip: 's', arguments: {key1: 'value1', key2: 'value2'}},
+      %|{s key1 => value1, key2 => value2}|   => {snip: 's', arguments: {key1: 'value1', key2: 'value2'}},
+      %|{s key1: value1, key2: value2}| => {snip: 's', arguments: {key1: 'value1', key2: 'value2'}},
+      %|{s key1 => "value with spaces"}|      => {snip: 's', arguments: {key1: "value with spaces"}},
+      %|{s.attr key1=>value1}|                => {snip: 's', attribute: 'attr', arguments: {key1: 'value1'}},
+      %|{s "key with spaces" => value}|       => {snip: 's', arguments: {:"key with spaces" => "value"}}
     },
 
-    :named_arguments => {
-      %|{s key1:value1,key2:value2}|    => {:snip => 's', :arguments => {:key1 => 'value1', :key2 => 'value2'}},
-      %|{s key1:value1, key2:value2}|   => {:snip => 's', :arguments => {:key1 => 'value1', :key2 => 'value2'}},
-      %|{s key1: value1, key2: value2}| => {:snip => 's', :arguments => {:key1 => 'value1', :key2 => 'value2'}},
-      %|{s key1:"value with spaces"}|   => {:snip => 's', :arguments => {:key1 => 'value with spaces'}}
+    named_arguments: {
+      %|{s key1:value1,key2:value2}|    => {snip: 's', arguments: {key1: 'value1', key2: 'value2'}},
+      %|{s key1:value1, key2:value2}|   => {snip: 's', arguments: {key1: 'value1', key2: 'value2'}},
+      %|{s key1: value1, key2: value2}| => {snip: 's', arguments: {key1: 'value1', key2: 'value2'}},
+      %|{s key1:"value with spaces"}|   => {snip: 's', arguments: {key1: 'value with spaces'}}
     },
 
-    :quoting_arguments => {
-      # %|{s "arg \\" double"}| => {:snip => 's', :attribute => nil, :arguments => ['arg " double']},
-      # %|{s 'arg \\' single'}| => {:snip => 's', :attribute => nil, :arguments => ["arg ' single"]},
-      %|{s "arg ' single"}|   => {:snip => 's', :attribute => nil, :arguments => ["arg ' single"]},
-      %|{s 'arg " double'}|   => {:snip => 's', :attribute => nil, :arguments => ['arg " double']},
-      %|{s "arg, comma"}|     => {:snip => 's', :attribute => nil, :arguments => ['arg, comma']},
-      %|{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']}
-      %|{s 'arg.with.fullstop'}| => {:snip => 's', :attribute => nil, :arguments => ['arg.with.fullstop']},
+    quoting_arguments: {
+      # %|{s "arg \\" double"}| => {snip: 's', attribute: nil, arguments: ['arg " double']},
+      # %|{s 'arg \\' single'}| => {snip: 's', attribute: nil, arguments: ["arg ' single"]},
+      %|{s "arg ' single"}|   => {snip: 's', attribute: nil, arguments: ["arg ' single"]},
+      %|{s 'arg " double'}|   => {snip: 's', attribute: nil, arguments: ['arg " double']},
+      %|{s "arg, comma"}|     => {snip: 's', attribute: nil, arguments: ['arg, comma']},
+      %|{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']}
+      %|{s 'arg.with.fullstop'}| => {snip: 's', attribute: nil, arguments: ['arg.with.fullstop']},
     },
 
-    :html_quoting_arguments => {
-      %|{s “arg”}|  => {:snip => 's', :attribute => nil, :arguments => ['arg']},
-      %|{s “arg”}|              => {:snip => 's', :attribute => nil, :arguments => ['arg']}
+    html_quoting_arguments: {
+      %|{s “arg”}|  => {snip: 's', attribute: nil, arguments: ['arg']},
+      %|{s “arg”}|              => {snip: 's', attribute: nil, arguments: ['arg']}
     }
   }
 
@@ -122,13 +122,13 @@ context "The SnipReference parser" do
 
   def assert_parsable_by_vanilla(example, expected)
     create_snip_from_expected expected
-    create_snip :name => "test", :content => "alpha #{example} beta"
+    create_snip name: "test", content: "alpha #{example} beta"
     assert_response_body "alpha ok beta", "/test"
   end
 
   def create_snip_from_expected(expected)
     simple_dyna = %|class SimpleDyna;def handle(*args); 'ok'; end;self;end|
-    attributes = {:name => expected[:snip], :content => simple_dyna, :render_as => "ruby"}
+    attributes = {name: expected[:snip], content: simple_dyna, render_as: "ruby"}
     if expected[:attribute]
       attributes[expected[:attribute]] = simple_dyna
     end

data/test/core/test_helper.rb

@@ -12,7 +12,7 @@ module TestHelper
   def create_simple_layout
     require File.expand_path("../../../pristine_app/soups/system/current_snip", __FILE__)
     app.soup << CurrentSnip.snip_attributes
-    create_snip :name => "layout", :content => "{current_snip}"
+    create_snip name: "layout", content: "{current_snip}"
   end
 end
 
@@ -26,4 +26,4 @@ end
 
 Kintama.teardown do
   vanilla_teardown
-end
+end

data/test/core/vanilla_app_test.rb

@@ -4,7 +4,7 @@ require "tmpdir"
 describe Vanilla::App do
   context "when behaving as a Rack application" do
     should "return a valid rack response" do
-      create_snip(:name => "test", :content => "content")
+      create_snip(name: "test", content: "content")
       get "/test.text"
       assert_equal 200, last_response.status
       assert_kind_of Hash, last_response.headers
@@ -12,7 +12,7 @@ describe Vanilla::App do
     end
 
     should "return an empty body for HEAD request" do
-      create_snip(:name => "test", :content => "content")
+      create_snip(name: "test", content: "content")
       head "/test.text"
       assert_equal 200, last_response.status
       assert_kind_of Hash, last_response.headers
@@ -22,7 +22,7 @@ describe Vanilla::App do
 
   context "when detecting the snip renderer" do
     should "return the constant refered to in the render_as property of the snip" do
-      snip = create_snip(:name => "blah", :render_as => "Raw")
+      snip = create_snip(name: "blah", render_as: "Raw")
       assert_equal Vanilla::Renderers::Raw, app.renderer_for(snip)
     end
 
@@ -35,24 +35,24 @@ describe Vanilla::App do
         "haml" => Vanilla::Renderers::Haml
       }.each do |extension, renderer|
         should "return the renderer #{renderer} when the snip has extension #{extension}" do
-          snip = create_snip(:name => "blah", :extension => extension)
+          snip = create_snip(name: "blah", extension: extension)
           assert_equal renderer, app.renderer_for(snip)
         end
       end
     end
 
     should "return Vanilla::Renderers::Base if no render_as property exists" do
-      snip = create_snip(:name => "blah")
+      snip = create_snip(name: "blah")
       assert_equal Vanilla::Renderers::Base, app.renderer_for(snip)
     end
 
     should "return Vanilla::Renderers::Base if the render_as property is blank" do
-      snip = create_snip(:name => "blah", :render_as => '')
+      snip = create_snip(name: "blah", render_as: '')
       assert_equal Vanilla::Renderers::Base, app.renderer_for(snip)
     end
 
     should "raise an error if the specified renderer doesn't exist" do
-      snip = create_snip(:name => "blah", :render_as => "NonExistentClass")
+      snip = create_snip(name: "blah", render_as: "NonExistentClass")
       assert_raises(Vanilla::MissingRendererError) { app.renderer_for(snip) }
     end
   end

data/test/core/vanilla_presenting_test.rb

@@ -3,8 +3,8 @@ require "test_helper"
 context "When presenting" do
   setup do
     set_main_template "<tag>{current_snip}</tag>"
-    create_snip :name => "test", :content => "blah {other_snip}", :part => 'part content'
-    create_snip :name => "other_snip", :content => "blah!"
+    create_snip name: "test", content: "blah {other_snip}", part: 'part content'
+    create_snip name: "other_snip", content: "blah!"
   end
 
   context "HTML" do
@@ -68,13 +68,13 @@ context "When presenting" do
 
   context "the root URL" do
     should "render the start snip by default" do
-      create_snip :name => "start", :content => "default"
+      create_snip name: "start", content: "default"
       assert_response_body "<tag>default</tag>", "/"
     end
 
     should "render any custom-set root snip if provided" do
-      create_snip :name => "start", :content => "default"
-      create_snip :name => "custom", :content => "custom"
+      create_snip name: "start", content: "default"
+      create_snip name: "custom", content: "custom"
       app.config.root_snip = "custom"
       assert_response_body "<tag>custom</tag>", "/"
     end
@@ -82,8 +82,8 @@ context "When presenting" do
 
   context "a snip with a custom layout" do
     should "render the snips contents within that layout" do
-      create_snip :name => "custom-layout", :content => "<custom>{current_snip}</custom>"
-      create_snip :name => "test", :content => "this is a test", :layout => "custom-layout"
+      create_snip name: "custom-layout", content: "<custom>{current_snip}</custom>"
+      create_snip name: "test", content: "this is a test", layout: "custom-layout"
       assert_response_body "<custom>this is a test</custom>", "/test"
     end
   end
@@ -97,17 +97,17 @@ context "When presenting" do
   context "a snip using a renderer that specifies a template" do
     setup do
       app.register_renderer CustomRenderer, "custom"
-      create_snip :name => "custom-layout", :content => "<custom>{current_snip}</custom>"
+      create_snip name: "custom-layout", content: "<custom>{current_snip}</custom>"
     end
 
     should "use the renderer's specified layout" do
-      create_snip :name => "test", :content => "this is a test", :render_as => "custom"
+      create_snip name: "test", content: "this is a test", render_as: "custom"
       assert_response_body "<custom>this is a test</custom>", "/test"
     end
 
     should "use the snips layout when given" do
-      create_snip :name => "snip-custom-layout", :content => "<snipcustom>{current_snip}</snipcustom>"
-      create_snip :name => "test", :content => "this is a test", :render_as => "custom", :layout => "snip-custom-layout"
+      create_snip name: "snip-custom-layout", content: "<snipcustom>{current_snip}</snipcustom>"
+      create_snip name: "test", content: "this is a test", render_as: "custom", layout: "snip-custom-layout"
       assert_response_body "<snipcustom>this is a test</snipcustom>", "/test"
     end
   end
@@ -115,8 +115,8 @@ context "When presenting" do
   context "and a custom default renderer has been provided" do
     should "use that renderer" do
       app.config.default_renderer = ::Vanilla::Renderers::Bold
-      create_snip :name => "layout", :content => "{test}", :render_as => "base"
-      create_snip :name => "test", :content => "test"
+      create_snip name: "layout", content: "{test}", render_as: "base"
+      create_snip name: "test", content: "test"
       assert_response_body "<b>test</b>", "/test"
     end
   end

data/test/pristine_app/current_snip_test.rb

@@ -3,28 +3,28 @@ require "test_helper"
 context "The current_snip dynasnip" do
   should "render the snip from the current request" do
     set_main_template "<layout>{current_snip}</layout>"
-    create_snip :name => "test", :content => "test"
+    create_snip name: "test", content: "test"
 
     visit "/test"
 
-    assert page.has_css?("layout", :content => "test")
+    assert page.has_css?("layout", text: "test")
   end
 
   should "render a given attribute of the current snip" do
-    create_snip :name => "test", :content => "this is my {current_snip part}", :part => "underbelly"
+    create_snip name: "test", content: "this is my {current_snip part}", part: "underbelly"
     visit "/test"
     assert page.has_content?("this is my underbelly")
   end
 
   should "render based on the requested snip, not the including snip" do
-    create_snip :name => "test", :content => "this is my {current_snip part}", :part => "underbelly"
-    create_snip :name => "blah", :content => "{test}", :part => "flange"
+    create_snip name: "test", content: "this is my {current_snip part}", part: "underbelly"
+    create_snip name: "blah", content: "{test}", part: "flange"
     visit "/blah"
     assert page.has_content?("this is my flange")
   end
 
   should "be able to handle snips with spaces in their names" do
-    create_snip :name => "test snip", :content => "this is a test"
+    create_snip name: "test snip", content: "this is a test"
     visit "/test+snip"
     assert page.has_content?("this is a test")
   end
@@ -58,7 +58,7 @@ context "The current_snip dynasnip" do
   context "when the requested part of a snip is missing" do
     setup do
       set_main_template "<layout>{current_snip}</layout>"
-      create_snip :name => "test", :content => "test"
+      create_snip name: "test", content: "test"
 
       visit "/test/monkey"
     end
@@ -71,4 +71,4 @@ context "The current_snip dynasnip" do
       assert_equal 404, page.status_code
     end
   end
-end
+end

data/test/pristine_app/feed_test.rb

@@ -4,9 +4,9 @@ require "base/feed"
 
 context "The feed dynasnip" do
   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"},
+     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"
@@ -16,8 +16,8 @@ context "The feed dynasnip" do
   end
 
   should "included rendered snip contents" do
-     stub_app_soup({:name => "Hello", :content => "This is *the* content",
-                    :render_as => "markdown", :kind => "blog"},
+     stub_app_soup({name: "Hello", content: "This is *the* content",
+                    render_as: "markdown", kind: "blog"},
                     Feed.snip_attributes)
 
     visit "/feed.xml"
@@ -27,8 +27,8 @@ context "The feed dynasnip" do
   end
 
   should "ensure relative links are made absolute" do
-     stub_app_soup({:name => "Hello", :content => "a [relative](/link)",
-                    :render_as => "markdown", :kind => "blog"},
+     stub_app_soup({name: "Hello", content: "a [relative](/link)",
+                    render_as: "markdown", kind: "blog"},
                     Feed.snip_attributes)
 
     visit "/feed.xml"
@@ -36,4 +36,4 @@ context "The feed dynasnip" do
     feed = Atom::Feed.load_feed(page.source)
     assert_equal %{<p>a <a href="http://yourdomain.example.com/link">relative</a></p>}, feed.entries.first.content
   end
-end
+end