vanilla 1.13.1 → 1.13.2

data/Rakefile

@@ -41,14 +41,14 @@ if Object.const_defined?(:Gem)
 
     # All the other gems we need.
     s.add_dependency("rack", ">= 0.9.1")
-    s.add_dependency("soup", ">= 1.0.3")
+    s.add_dependency("soup", ">= 1.0.6")
     s.add_dependency("ratom", ">= 0.3.5")
     s.add_dependency("RedCloth", ">= 4.1.1")
     s.add_dependency("BlueCloth", ">= 1.0.0")
     s.add_dependency("treetop", ">= 1.4.1")
     s.add_dependency("haml")
 
-    s.add_development_dependency("shoulda") # add any other gems for testing/development
+    s.add_development_dependency("kintama") # add any other gems for testing/development
     s.add_development_dependency("mocha")
 
     # If you want to publish automatically to rubyforge, you'll may need

data/lib/tasks/vanilla.rake

@@ -4,7 +4,7 @@ require 'vanilla'
 namespace :vanilla do
   desc "Open an irb session preloaded with this library"
   task :console do
-    sh "irb -Ilib -rubygems -rvanilla -rvanilla/console"
+    sh "irb -Ilib -rubygems -rbundler/setup -rvanilla -rvanilla/console"
   end
 
   desc 'Upgrade dynasnips and system snips'

data/lib/vanilla.rb

@@ -1,7 +1,7 @@
 require 'vanilla/app'
 
 module Vanilla
-  VERSION = "1.13.1"
+  VERSION = "1.13.2"
 end
 
 # Load all the other renderer subclasses

data/lib/vanilla/app.rb

@@ -75,6 +75,8 @@ module Vanilla
     def renderer_for(snip)
       if snip && snip.render_as && !snip.render_as.empty?
         Vanilla::Renderers.const_get(snip.render_as)
+      elsif snip && snip.extension && !snip.extension.empty?
+        Vanilla::Renderers.const_get(renderer_for_extension(snip.extension))
       else
         Vanilla::Renderers::Base
       end
@@ -103,6 +105,16 @@ module Vanilla
 
     private
 
+    def renderer_for_extension(extension)
+      mapping = Hash.new("Base")
+      mapping["markdown"] = "Markdown"
+      mapping["textile"] = "Textile"
+      mapping["erb"] = "Erb"
+      mapping["rb"] = "Ruby"
+      mapping["haml"] = "Haml"
+      mapping[extension]
+    end
+
     def prepare_configuration(config_file)
       config_file ||= "config.yml"
       @config = YAML.load(File.open(config_file)) rescue {}

data/lib/vanilla/snips/tutorial/hello_world.snip

@@ -4,7 +4,7 @@ class HelloWorld
 
   def handle(name=nil)
     if name
-      "Hey \#{name} - Hello World!"
+      "Hey #{name} - Hello World!"
     else
       "Hello World!"
     end

data/test/base_renderer_test.rb

@@ -1,34 +1,32 @@
 require "test_helper"
 
-class BaseRendererTest < Vanilla::TestCase
-  context "in general" do
-    setup do
-      create_snip(:name => "test", :content => "content content", :part => "part content")
-    end
+describe Vanilla::Renderers::Base do
+  setup do
+    create_snip(:name => "test", :content => "content content", :part => "part content")
+  end
 
-    should "render the contents part of the snip as it is" do
-      assert_response_body "content content", "/test"
-    end
-  
-    should "render the specified part of the snip" do
-      assert_response_body "part content", "/test/part"
-    end
-  
-    should "include the contents of a referenced snip" do
-      create_snip(:name => "snip_with_inclusions", :content => "loading {test}")
-      assert_response_body "loading content content", "/snip_with_inclusions"
-    end
-  
-    should "perform snip inclusion when rendering a part" do
-      create_snip(:name => "snip_with_inclusions", :content => "other content", :part => "loading {test}")
-      assert_response_body "loading content content", "/snip_with_inclusions/part"
-    end
-  
-    should "include other snips using their renderers" do
-      create_snip(:name => "including_snip", :content => "lets include {another_snip}")
-      create_snip(:name => "another_snip", :content => "blah", :render_as => "Bold")
-      assert_equal "lets include <b>blah</b>", response_body_for("/including_snip").gsub(/\s+/, ' ')
-    end
+  should "render the contents part of the snip as it is" do
+    assert_response_body "content content", "/test"
+  end
+
+  should "render the specified part of the snip" do
+    assert_response_body "part content", "/test/part"
+  end
+
+  should "include the contents of a referenced snip" do
+    create_snip(:name => "snip_with_inclusions", :content => "loading {test}")
+    assert_response_body "loading content content", "/snip_with_inclusions"
+  end
+
+  should "perform snip inclusion when rendering a part" do
+    create_snip(:name => "snip_with_inclusions", :content => "other content", :part => "loading {test}")
+    assert_response_body "loading content content", "/snip_with_inclusions/part"
+  end
+
+  should "include other snips using their renderers" do
+    create_snip(:name => "including_snip", :content => "lets include {another_snip}")
+    create_snip(:name => "another_snip", :content => "blah", :render_as => "Bold")
+    assert_equal "lets include <b>blah</b>", response_body_for("/including_snip").gsub(/\s+/, ' ')
   end
   
   context "when trying to include a missing snip" do

data/test/dynasnip_test.rb

@@ -1,8 +1,7 @@
 require "test_helper"
 require 'vanilla/dynasnip'
 
-class DynasnipTest < Vanilla::TestCase
-
+describe Dynasnip do
   context "when storing attributes" do
 
     class ::TestDyna < Dynasnip
@@ -27,5 +26,4 @@ class DynasnipTest < Vanilla::TestCase
       assert_equal "altered content", TestDyna.new(@app).test_attribute
     end
   end
-  
 end

data/test/erb_renderer_test.rb

@@ -1,6 +1,6 @@
 require "test_helper"
 
-class ErbRendererTest < Vanilla::TestCase
+describe Vanilla::Renderers::Erb do
   context "when rendering" do
     should "insert evaluated Erb content into the snip" do
       erb_snip(:name => "test", :content => "<%= 1 + 2 %>")
@@ -23,8 +23,6 @@ class ErbRendererTest < Vanilla::TestCase
     end
   end
 
-  private
-
   def erb_snip(params)
     create_snip(params.merge(:render_as => "Erb"))
   end

data/test/haml_renderer_test.rb

@@ -1,7 +1,7 @@
-require 'haml'
 require 'test_helper'
+require 'haml'
 
-class HamlRendererTest < Vanilla::TestCase
+describe Vanilla::Renderers::Haml do
   context "when rendering" do
     should "render Haml into HTML" do
       haml_snip(:name => "test", :content => "#hello\n  stuff")
@@ -29,8 +29,6 @@ class HamlRendererTest < Vanilla::TestCase
     end
   end
 
-  private
-
   def haml_snip(params)
     create_snip(params.merge(:render_as => "Haml"))
   end

data/test/markdown_renderer_test.rb

@@ -1,6 +1,6 @@
 require "test_helper"
 
-class MarkdownRendererTest < Vanilla::TestCase
+describe Vanilla::Renderers::Markdown do
   context "when rendering" do
     should "return the snip contents rendered via Markdown" do
       content = <<Markdown
@@ -25,8 +25,6 @@ Markdown
     end
   end
 
-  private
-
   def markdown_snip(attributes)
     create_snip(attributes.merge(:render_as => "Markdown"))
   end

data/test/raw_renderer_test.rb

@@ -1,6 +1,6 @@
 require "test_helper"
 
-class RawRendererTest < Vanilla::TestCase
+describe Vanilla::Renderers::Raw do
   context "when rendering" do
     setup do
       @snip = create_snip(:name => "test", :content => "raw content", :part => "raw part")

data/test/ruby_renderer_test.rb

@@ -1,6 +1,6 @@
 require "test_helper"
 
-class RubyRendererTest < Vanilla::TestCase
+describe Vanilla::Renderers::Ruby do
   context "when rendering normally" do
     class ::TestDyna < Dynasnip
       def handle(*args)
@@ -11,7 +11,7 @@ class RubyRendererTest < Vanilla::TestCase
     setup do
       @app.soup << TestDyna.snip_attributes
     end
-  
+
     should "render the result of the handle method" do
       assert_response_body 'handle called', "/test_dyna"
     end
@@ -24,34 +24,34 @@ class RubyRendererTest < Vanilla::TestCase
       end
       def post(*args)
         'post called'
-      end  
+      end
     end
-    
+
     setup do
       @app.soup << RestishDyna.snip_attributes
     end
-  
+
     should "render the result of the get method on GET requests" do
       assert_response_body 'get called', "/restish_dyna"
     end
-  
+
     should "render the result of the post method on POST requests" do
       assert_response_body 'post called', "/restish_dyna?_method=post"
     end
   end
-  
+
   context "when knowing about enclosing snips" do
     class ::Encloser < Dynasnip
       def handle(*args)
         "enclosing snip is #{enclosing_snip.name}"
       end
     end
-    
+
     setup do
       @app.soup << Encloser.snip_attributes
       create_snip(:name => "test", :content => "{encloser}")
     end
-    
+
     should "know about the snip that called this dynasnip" do
       assert_response_body 'enclosing snip is test', "/test"
     end

data/test/snip_reference_parser_test.rb

@@ -1,7 +1,11 @@
 require "test_helper"
 Treetop.load File.join(File.dirname(__FILE__), *%w[.. lib vanilla snip_reference])
 
-class SnipReferenceParserTest < Test::Unit::TestCase
+context "The SnipReference parser" do
+  setup do
+    @parser = SnipReferenceParser.new
+  end
+
   examples = {
     %|{snip}|                                  => {:snip => 'snip', :attribute => nil, :arguments => []},
     %|{snip argument}|                         => {:snip => 'snip', :attribute => nil, :arguments => ["argument"]},
@@ -35,13 +39,9 @@ class SnipReferenceParserTest < Test::Unit::TestCase
     %|{snip key1: value1, key2: value2}|       => {:snip => 'snip', :arguments => {:key1 => 'value1', :key2 => 'value2'}},
     %|{snip key1:"value with spaces"}|         => {:snip => 'snip', :arguments => {:key1 => 'value with spaces'}}
   }
-  
-  def setup
-    @parser = SnipReferenceParser.new
-  end
-  
+
   examples.each do |example, expected|
-    define_method :"test_parsing_#{example}" do
+    should "parse '#{example}' into #{expected.inspect}" do
       reference = @parser.parse(example)
       if reference
         assert_equal expected[:snip],      reference.snip

data/test/snip_reference_test.rb

@@ -1,8 +1,7 @@
 require "test_helper"
 
-class SnipReferenceTest < Vanilla::TestCase
-  def setup
-    super
+context "The SnipReference parser" do
+  setup do
     create_snip :name => "test", :content => "snip content"
   end
 
@@ -50,8 +49,6 @@ class SnipReferenceTest < Vanilla::TestCase
     assert_equal "10.times {|x| puts x }", render("10.times {|x| puts x }")
   end
 
-  private
-
   def render(content)
     snip = create_snip :name => "test-content", :content => content
     Vanilla::Renderers::Base.new(@app).render(snip)

data/test/test_helper.rb

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'bundler/setup'
 $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
-require "shoulda"
+require "kintama"
 require "mocha"
 require "fileutils"
 require "rack/mock"
@@ -12,7 +12,6 @@ module Vanilla
   module Test
     def setup_clean_environment
       FileUtils.mkdir_p(File.dirname(config_file_for_tests))
-      clear_soup
       File.open(config_file_for_tests, 'w') { |f| f.write({:soup => soup_path}.to_yaml) }
       @app = Vanilla::App.new(config_file_for_tests)
 
@@ -53,8 +52,12 @@ module Vanilla
       Rack::Request.new(mock_env_for_url(url))
     end
 
+    def test_app_directory
+      File.join(File.dirname(__FILE__), "tmp")
+    end
+
     def config_file_for_tests
-      File.join(File.dirname(__FILE__), "tmp", "config.yml")
+      File.join(test_app_directory, "config.yml")
     end
 
     def config_for_tests(options={})
@@ -62,23 +65,27 @@ module Vanilla
     end
 
     def soup_path
-      File.expand_path(File.join(File.dirname(__FILE__), "tmp", "soup"))
-    end
-
-    def clear_soup
-      FileUtils.rm_rf(soup_path)
+      File.expand_path(File.join(test_app_directory, "soup"))
     end
   end
 end
 
-class Vanilla::TestCase < Test::Unit::TestCase
-  include Vanilla::Test
+Kintama.include Vanilla::Test
+Kintama.setup do
+  setup_clean_environment
+end
 
-  def setup
-    setup_clean_environment
-  end
+Kintama.teardown do
+  FileUtils.rm_rf(test_app_directory)
+end
 
-  def test_nothing
-    # please, please stop complaining.
+Kintama.include Mocha::API
+Kintama.teardown do
+  begin
+    mocha_verify
+  rescue Mocha::ExpectationError => e
+    raise e
+  ensure
+    mocha_teardown
   end
-end
+end

data/test/vanilla_app_test.rb

@@ -1,7 +1,6 @@
 require "test_helper"
 
-class VanillaAppTest < Vanilla::TestCase
-
+describe Vanilla::App do
   context "when behaving as a Rack application" do
     should "return an array of status code, headers and response" do
       create_snip(:name => "test", :content => "content")
@@ -47,6 +46,21 @@ class VanillaAppTest < Vanilla::TestCase
       assert_equal Vanilla::Renderers::Raw, @app.renderer_for(snip)
     end
 
+    context "using the snip extension" do
+      {
+        "markdown" => Vanilla::Renderers::Markdown,
+        "textile" => Vanilla::Renderers::Textile,
+        "erb" => Vanilla::Renderers::Erb,
+        "rb" => Vanilla::Renderers::Ruby,
+        "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)
+          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")
       assert_equal Vanilla::Renderers::Base, @app.renderer_for(snip)
@@ -70,4 +84,4 @@ class VanillaAppTest < Vanilla::TestCase
       assert_equal MyRenderer, @app.renderer_for(snip)
     end
   end
-end
+end

data/test/vanilla_presenting_test.rb

@@ -1,15 +1,14 @@
 require "test_helper"
 
-class VanillaPresentingTest < Vanilla::TestCase
-  def setup
-    super
+context "When presenting" do
+  setup do
     @app.soup << LinkTo.snip_attributes
     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!"
   end
 
-  context "when presenting as HTML" do
+  context "HTML" do
     should "render the snip's content in the system template if no format or part is given" do
       assert_response_body "<tag>blah blah!</tag>", "/test"
     end
@@ -30,7 +29,7 @@ class VanillaPresentingTest < Vanilla::TestCase
     end
   end
 
-  context "when presenting content as text" do
+  context "as text" do
     should "render the snip's content outside of the main template with its default renderer" do
       assert_response_body "blah blah!", "/test.text"
     end
@@ -45,7 +44,7 @@ class VanillaPresentingTest < Vanilla::TestCase
     end
   end
 
-  context "when presenting raw content" do
+  context "raw content" do
     should "render the snips contents exactly as they are" do
       assert_response_body "blah {other_snip}", "/test.raw"
     end
@@ -64,7 +63,7 @@ class VanillaPresentingTest < Vanilla::TestCase
     end
   end
 
-  context "when presenting a snip with a custom layout" 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"
@@ -78,7 +77,7 @@ class VanillaPresentingTest < Vanilla::TestCase
     end
   end
 
-  context "when presenting a snip using a renderer that specifies a template" do
+  context "a snip using a renderer that specifies a template" do
     setup do
       create_snip :name => "custom-layout", :content => "<custom>{current_snip}</custom>"
     end
@@ -95,7 +94,7 @@ class VanillaPresentingTest < Vanilla::TestCase
     end
   end
 
-  context "when a missing snip is requested" do
+  context "and a missing snip is requested" do
     should "render missing snip content in the main template" do
       assert_response_body "<tag>Couldn't find snip #{LinkTo.new(@app).handle("missing_snip")}</tag>", "/missing_snip"
     end
@@ -105,7 +104,7 @@ class VanillaPresentingTest < Vanilla::TestCase
     end
   end
 
-  context "when requesting an unknown format" do
+  context "requesting an unknown format" do
     should "return a 500 status code" do
       assert_equal 500, response_code_for("/test.monkey")
     end

data/test/vanilla_request_test.rb

@@ -1,6 +1,6 @@
 require "test_helper"
 
-class VanillaRequestTest < Vanilla::TestCase
+describe Vanilla::Request do
   context "when requesting the root" do
     setup { @request = Vanilla::Request.new(mock_env_for_url("/"), @app) }
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vanilla
 version: !ruby/object:Gem::Version 
-  hash: 33
+  hash: 39
   prerelease: 
   segments: 
   - 1
   - 13
-  - 1
-  version: 1.13.1
+  - 2
+  version: 1.13.2
 platform: ruby
 authors: 
 - James Adam
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-22 00:00:00 +00:00
+date: 2011-03-01 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,12 +42,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 27
         segments: 
         - 1
         - 0
-        - 3
-        version: 1.0.3
+        - 6
+        version: 1.0.6
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -129,7 +129,7 @@ dependencies:
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: shoulda
+  name: kintama
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
@@ -180,9 +180,6 @@ files:
 - test/snip_reference_parser_test.rb
 - test/snip_reference_test.rb
 - test/test_helper.rb
-- test/tmp/config.yml
-- test/tmp/soup/current_snip.snip
-- test/tmp/soup/layout.snip
 - test/vanilla_app_test.rb
 - test/vanilla_presenting_test.rb
 - test/vanilla_request_test.rb

data/test/tmp/config.yml

@@ -1,2 +0,0 @@
---- 
-:soup: /Users/james/Code/lazyatom/vanilla-rb/test/tmp/soup

data/test/tmp/soup/current_snip.snip

@@ -1,14 +0,0 @@
-CurrentSnip
-
-:usage: |-
-  The current_snip dyna normally returns the result of rendering the snip named by the 
-      'snip' value in the parameters. This way, it can be used in templates to place the currently
-      requested snip, in its rendered form, within the page.
-      
-      It can also be used to determine the name of the current snip in a consistent way:
-      
-        {current_snip name}
-        
-      will output the name of the current snip, or the name of the snip currently being edited.
-:name: current_snip
-:render_as: Ruby

data/test/tmp/soup/layout.snip

@@ -1,3 +0,0 @@
-{current_snip}
-
-:name: layout