vanilla 1.17 → 1.17.1

data/test/{vanilla_presenting_test.rb → core/vanilla_presenting_test.rb}

@@ -66,6 +66,20 @@ context "When presenting" do
     end
   end
 
+  context "the root URL" do
+    should "render the start snip by default" do
+      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"
+      app.config.root_snip = "custom"
+      assert_response_body "<tag>custom</tag>", "/"
+    end
+  end
+
   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>"
@@ -100,7 +114,7 @@ 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
+      app.config.default_renderer = ::Vanilla::Renderers::Bold
       create_snip :name => "layout", :content => "{test}", :render_as => "base"
       create_snip :name => "test", :content => "test"
       assert_response_body "<b>test</b>", "/test"

data/test/pristine_app/current_snip_test.rb

@@ -0,0 +1,46 @@
+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"
+
+    visit "/test"
+
+    assert page.has_css?("layout", :content => "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"
+    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"
+    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"
+    visit "/test+snip"
+    assert page.has_content?("this is a test")
+  end
+
+  context "when the requested snip is missing" do
+    setup do
+      set_main_template "<layout>{current_snip}</layout>"
+      visit "/monkey"
+    end
+
+    should "render an explanatory message" do
+      assert page.has_content?(%{Couldn't find snip "monkey"})
+    end
+
+    should "set the response code to 404" do
+      assert_equal 404, page.status_code
+    end
+  end
+end

data/test/pristine_app/feed_test.rb

@@ -0,0 +1,47 @@
+require "test_helper"
+require "atom"
+
+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")
+    ])
+
+    visit "/feed.xml"
+
+    feed = Atom::Feed.load_feed(page.source)
+    assert_equal 2, feed.entries.length
+  end
+
+  should "included rendered snip contents" do
+    app.soup.stubs(:all_snips).returns([
+      snip(:name => "Hello", :content => "This is *the* content", :render_as => "markdown")
+    ])
+
+    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

@@ -0,0 +1,34 @@
+require "test_helper"
+
+context "The index dynasnip" do
+  should "render links to every snip with the most recently updated first" do
+    app.soup.stubs(:all_snips).returns([
+      snip(:name => "alpha", :updated_at => Time.at(10)),
+      snip(:name => "beta", :updated_at => Time.at(20)),
+      snip(:name => "gamma", :updated_at => Time.at(40)),
+      snip(:name => "delta", :updated_at => Time.at(30))
+    ])
+
+    visit "/index"
+    links = page.all("ol#index li a").map { |l| l.text }
+    assert_equal %w(gamma delta beta alpha), links
+  end
+
+  should "order snips without updated_at as if they were updated a long time ago" do
+    app.soup.stubs(:all_snips).returns([
+      snip(:name => "alpha", :updated_at => Time.at(10)),
+      snip(:name => "beta", :updated_at => Time.at(20)),
+      snip(:name => "gamma")
+    ])
+
+    visit "/index"
+    links = page.all("ol#index li a").map { |l| l.text }
+    assert_equal %w(beta alpha gamma), links
+  end
+
+  private
+
+  def snip(attributes)
+    Soup::Snip.new(attributes, nil)
+  end
+end

data/test/pristine_app/link_to_current_snip_test.rb

@@ -0,0 +1,11 @@
+require "test_helper"
+
+context "The link_to_current_snip dynasnip" do
+  should "create a link to the snip that was requested" do
+    create_snip :name => "a", :content => "{b}"
+    create_snip :name => "b", :content => "<div id='x'>{link_to_current_snip}</div>"
+
+    visit "/a"
+    assert page.has_css?("#x a[href='/a']")
+  end
+end

data/test/pristine_app/link_to_test.rb

@@ -0,0 +1,27 @@
+require "test_helper"
+
+context "The link_to dynasnip" do
+  should "render a link to the given snip using the snip name as text" do
+    create_snip :name => "test", :content => "<div id='x'>this is a {link_to test}.</div>"
+    visit "/test"
+    assert page.find("#x a[href='/test']").has_content?('test')
+  end
+
+  should "render a link to the given snip using custom link text" do
+    create_snip :name => "test", :content => "<div id='x'>this is a {link_to test, my link}.</div>"
+    visit "/test"
+    assert page.find("#x a[href='/test']").has_content?('my link')
+  end
+
+  should "render a link to the given snip and part" do
+    create_snip :name => "test", :content => "<div id='x'>this is a {link_to test, test, part}.</div>"
+    visit "/test"
+    assert page.find("#x a[href='/test/part']").has_content?('test')
+  end
+
+  should "add a 'missing' class where the snip does not exist" do
+    create_snip :name => "test", :content => "<div id='x'>this is a {link_to blah}.</div>"
+    visit "/test"
+    assert page.find("#x a.missing[href='/blah']")
+  end
+end

data/test/pristine_app/page_title_test.rb

@@ -0,0 +1,15 @@
+require "test_helper"
+
+context "The page_title dynasnip" do
+  should "render as the requested snip name if that snip has no title" do
+    visit "/"
+    assert page.has_css?("head title", :content => "start"), page.source
+  end
+
+  should "render as the requested snip's page_title when that attribute is present" do
+    create_snip :name => "test", :content => "test", :page_title => "This is a test"
+
+    visit "/test"
+    assert page.has_css?("head title", :content => "This is a test")
+  end
+end

data/test/pristine_app/raw_test.rb

@@ -0,0 +1,24 @@
+require "test_helper"
+
+context "The raw dynasnip" do
+  should "render the snip given in its raw form" do
+    create_snip :name => "a", :content => "{b}"
+    create_snip :name => "test", :content => "<div id='x'>{raw a}</div>"
+    visit "/test"
+    assert page.has_css?("#x", :content => "&#123;b&#125;")
+  end
+
+  should "escape html tags" do
+    create_snip :name => "a", :content => "<b></b>"
+    create_snip :name => "test", :content => "<div id='x'>{raw a}</div>"
+    visit "/test"
+    assert page.has_css?("#x", :content => "&lt;b&gt;&lt;/b&gt;")
+  end
+
+  should "render a raw part" do
+    create_snip :name => "a", :content => "x", :bit => "a<b"
+    create_snip :name => "test", :content => "<div id='x'>{raw a, bit}</div>"
+    visit "/test"
+    assert page.has_css?("#x", :content => "a&lt;b")
+  end
+end

data/test/pristine_app/test_helper.rb

@@ -0,0 +1,25 @@
+$LOAD_PATH.unshift(File.expand_path("../../../lib"), __FILE__)
+require "bundler/setup"
+require "kintama"
+require "kintama/mocha"
+require "vanilla/test_helper"
+require 'capybara'
+require 'capybara/dsl'
+
+require File.expand_path("../../../pristine_app/application", __FILE__)
+
+module TestHelper
+  include Vanilla::TestHelper
+end
+
+Kintama.include TestHelper
+Kintama.include Capybara
+
+Kintama.setup do
+  vanilla_setup
+  Capybara.app = app
+end
+
+Kintama.teardown do
+  vanilla_teardown
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vanilla
 version: !ruby/object:Gem::Version 
-  hash: 45
+  hash: 81
   prerelease: 
   segments: 
   - 1
   - 17
-  version: "1.17"
+  - 1
+  version: 1.17.1
 platform: ruby
 authors: 
 - James Adam
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-05 00:00:00 +01:00
+date: 2011-07-24 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,26 +30,26 @@ dependencies:
         - 9
         - 1
         version: 0.9.1
-  requirement: *id001
+  type: :runtime
   prerelease: false
+  requirement: *id001
   name: rack
-  type: :runtime
 - !ruby/object:Gem::Dependency 
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 7
         segments: 
         - 1
         - 0
-        - 6
-        version: 1.0.6
-  requirement: *id002
+        - 8
+        version: 1.0.8
+  type: :runtime
   prerelease: false
+  requirement: *id002
   name: soup
-  type: :runtime
 - !ruby/object:Gem::Dependency 
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -61,10 +62,10 @@ dependencies:
         - 3
         - 5
         version: 0.3.5
-  requirement: *id003
+  type: :runtime
   prerelease: false
+  requirement: *id003
   name: ratom
-  type: :runtime
 - !ruby/object:Gem::Dependency 
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -77,10 +78,10 @@ dependencies:
         - 1
         - 1
         version: 4.1.1
-  requirement: *id004
+  type: :runtime
   prerelease: false
+  requirement: *id004
   name: RedCloth
-  type: :runtime
 - !ruby/object:Gem::Dependency 
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -93,10 +94,10 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  requirement: *id005
+  type: :runtime
   prerelease: false
+  requirement: *id005
   name: BlueCloth
-  type: :runtime
 - !ruby/object:Gem::Dependency 
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -108,10 +109,10 @@ dependencies:
         - 3
         - 1
         version: "3.1"
-  requirement: *id006
+  type: :runtime
   prerelease: false
+  requirement: *id006
   name: haml
-  type: :runtime
 - !ruby/object:Gem::Dependency 
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -124,10 +125,10 @@ dependencies:
         - 2
         - 0
         version: 1.2.0
-  requirement: *id007
+  type: :runtime
   prerelease: false
+  requirement: *id007
   name: parslet
-  type: :runtime
 - !ruby/object:Gem::Dependency 
   version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
@@ -140,10 +141,10 @@ dependencies:
         - 5
         - 7
         version: 0.5.7
-  requirement: *id008
+  type: :runtime
   prerelease: false
+  requirement: *id008
   name: rack-test
-  type: :runtime
 - !ruby/object:Gem::Dependency 
   version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
@@ -156,10 +157,10 @@ dependencies:
         - 1
         - 6
         version: 0.1.6
-  requirement: *id009
+  type: :development
   prerelease: false
+  requirement: *id009
   name: kintama
-  type: :development
 - !ruby/object:Gem::Dependency 
   version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
@@ -170,10 +171,38 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id010
+  type: :development
   prerelease: false
+  requirement: *id010
   name: mocha
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  prerelease: false
+  requirement: *id011
+  name: capybara
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  prerelease: false
+  requirement: *id012
+  name: launchy
 description: 
 email: james@lazyatom.com.com
 executables: 
@@ -186,23 +215,31 @@ files:
 - Rakefile
 - README
 - .gemtest
-- test/dynasnip_test.rb
-- test/dynasnips/link_to_current_snip_test.rb
-- test/dynasnips/link_to_test.rb
-- test/dynasnips/page_title_test.rb
-- test/renderers/base_renderer_test.rb
-- test/renderers/erb_renderer_test.rb
-- test/renderers/haml_renderer_test.rb
-- test/renderers/markdown_renderer_test.rb
-- test/renderers/raw_renderer_test.rb
-- test/renderers/ruby_renderer_test.rb
-- test/snip_inclusion_test.rb
-- test/snip_reference_parser_test.rb
-- test/test_helper.rb
-- test/vanilla_app_test.rb
-- test/vanilla_presenting_test.rb
-- test/vanilla_request_test.rb
+- test/core/configuration_test.rb
+- test/core/dynasnip_test.rb
+- test/core/renderers/base_renderer_test.rb
+- test/core/renderers/erb_renderer_test.rb
+- test/core/renderers/haml_renderer_test.rb
+- test/core/renderers/markdown_renderer_test.rb
+- test/core/renderers/raw_renderer_test.rb
+- test/core/renderers/ruby_renderer_test.rb
+- test/core/routing_test.rb
+- test/core/snip_inclusion_test.rb
+- test/core/snip_reference_parser_test.rb
+- test/core/test_helper.rb
+- test/core/vanilla_app_test.rb
+- test/core/vanilla_presenting_test.rb
+- test/core/vanilla_request_test.rb
+- test/pristine_app/current_snip_test.rb
+- test/pristine_app/feed_test.rb
+- test/pristine_app/index_test.rb
+- test/pristine_app/link_to_current_snip_test.rb
+- test/pristine_app/link_to_test.rb
+- test/pristine_app/page_title_test.rb
+- test/pristine_app/raw_test.rb
+- test/pristine_app/test_helper.rb
 - lib/vanilla/app.rb
+- lib/vanilla/config.rb
 - lib/vanilla/console.rb
 - lib/vanilla/dynasnip.rb
 - lib/vanilla/renderers/base.rb
@@ -215,7 +252,7 @@ files:
 - lib/vanilla/renderers/textile.rb
 - lib/vanilla/renderers.rb
 - lib/vanilla/request.rb
-- lib/vanilla/routes.rb
+- lib/vanilla/routing.rb
 - lib/vanilla/snip_reference_parser.rb
 - lib/vanilla/static.rb
 - lib/vanilla/test_helper.rb
@@ -224,6 +261,7 @@ 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/layout.snip
@@ -234,6 +272,7 @@ 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
@@ -252,10 +291,12 @@ files:
 - pristine_app/soups/tutorial/tutorial-dynasnips.snip.markdown
 - pristine_app/soups/tutorial/tutorial-layout.snip
 - pristine_app/soups/tutorial/tutorial-links.snip
+- pristine_app/soups/tutorial/tutorial-removing.snip.markdown
 - pristine_app/soups/tutorial/tutorial-renderers.snip.markdown
 - 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: []