vanilla 1.13.3 → 1.14.1

data/config.ru

@@ -5,7 +5,7 @@ $:.unshift File.join(File.dirname(__FILE__), *%w[lib])
 require 'vanilla'
 require 'vanilla/static'
 
-config = YAML.parse_file(ENV['VANILLA_CONFIG'])
+config = YAML.parse_file(ENV['VANILLA_CONFIG']) rescue {}
 app = Vanilla::App.new(config)
 use Vanilla::Static, File.join(File.dirname(__FILE__), 'public')
 run app

data/lib/vanilla.rb

@@ -1,11 +1,13 @@
-require 'vanilla/app'
-
 module Vanilla
-  VERSION = "1.13.3"
-end
+  VERSION = "1.14.1"
 
-# Load all the other renderer subclasses
-Dir[File.join(File.dirname(__FILE__), 'vanilla', 'renderers', '*.rb')].each { |f| require f }  
+  autoload :Renderers, "vanilla/renderers"
+  autoload :App, "vanilla/app"
+  autoload :Dynasnip, "vanilla/dynasnip"
+  autoload :Request, "vanilla/request"
+  autoload :Routes, "vanilla/routes"
+  autoload :Static, "vanilla/static"
+end
 
 # Load all the base dynasnip classes
 Dir[File.join(File.dirname(__FILE__), 'vanilla', 'dynasnips', '*.rb')].each do |dynasnip|

data/lib/vanilla/app.rb

@@ -1,24 +1,30 @@
 require 'soup'
-require 'vanilla/request'
-require 'vanilla/routes'
-
-# Require the base set of renderers
-require 'vanilla/renderers/base'
-require 'vanilla/renderers/raw'
-require 'vanilla/renderers/erb'
 
 module Vanilla
   class App
-    include Routes
+    include Vanilla::Routes
 
     attr_reader :request, :response, :config, :soup
 
+    # Create a new Vanilla application
+    # Configuration options:
+    #
+    #  :soup - provide the path to the soup data
+    #  :soups - provide an array of paths to soup data
+    #  :renderers - a hash of names to classes
+    #  :default_renderer - the class to use when no renderer is provided;
+    #                      defaults to 'Vanilla::Renderers::Base'
+    #  :default_layout_snip - the snip to use as a layout when rendering to HTML;
+    #                         defaults to 'layout'
+    #  :root_snip - the snip to load for the root ('/') url;
+    #               defaults to 'start'
     def initialize(config={})
       @config = config
       if @config[:soup].nil? && @config[:soups].nil?
         @config.merge!(:soup => File.expand_path("soup"))
       end
       @soup = prepare_soup(config)
+      prepare_renderers(config[:renderers])
     end
 
     # Returns a Rack-appropriate 3-element array (via Rack::Response#finish)
@@ -62,24 +68,10 @@ module Vanilla
       end
     end
 
-    # Given the snip and parameters, yield an instance of the appropriate
-    # Vanilla::Render::Base subclass
-    def rendering(snip)
-      renderer_instance = renderer_for(snip).new(self)
-      yield renderer_instance
-    rescue Exception => e
-      snip_name = snip ? snip.name : nil
-      "<pre>[Error rendering '#{snip_name}' - \"" +
-        e.message.gsub("<", "&lt;").gsub(">", "&gt;") + "\"]\n" +
-        e.backtrace.join("\n").gsub("<", "&lt;").gsub(">", "&gt;") + "</pre>"
-    end
-
     # Returns the renderer class for a given snip
     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))
+      if snip
+        find_renderer(snip.render_as || snip.extension)
       else
         default_renderer
       end
@@ -89,10 +81,6 @@ module Vanilla
       soup[config[:default_layout_snip] || 'layout']
     end
 
-    def default_renderer
-      config[:default_renderer] || Vanilla::Renderers::Base
-    end
-
     def layout_for(snip)
       if snip
         renderer_for(snip).new(self).layout_for(snip)
@@ -105,19 +93,49 @@ module Vanilla
       @soup << attributes
     end
 
+    def register_renderer(klass, *types)
+      types.each do |type|
+        if klass.is_a?(String)
+          klass = klass.split("::").inject(Object) { |o, name| o.const_get(name) }
+        end
+        @renderers[type.to_s] = klass
+      end
+    end
+
     private
 
-    DEFAULT_EXTENSION_RENDERERS = Hash.new("Base").merge({
-      "markdown" => "Markdown",
-      "textile" => "Textile",
-      "erb" => "Erb",
-      "rb" => "Ruby",
-      "haml" => "Haml"
-    })
-
-    def renderer_for_extension(extension)
-      @renderer_mapping ||= DEFAULT_EXTENSION_RENDERERS.merge(@config[:extensions] || {})
-      @renderer_mapping[extension]
+    def prepare_renderers(additional_renderers={})
+      @renderers = Hash.new(config[:default_renderer] || Vanilla::Renderers::Base)
+      @renderers.merge!({
+        "base" => Vanilla::Renderers::Base,
+        "markdown" => Vanilla::Renderers::Markdown,
+        "bold" => Vanilla::Renderers::Bold,
+        "erb" => Vanilla::Renderers::Erb,
+        "rb" => Vanilla::Renderers::Ruby,
+        "ruby" => Vanilla::Renderers::Ruby,
+        "haml" => Vanilla::Renderers::Haml,
+        "raw" => Vanilla::Renderers::Raw,
+        "textile" => Vanilla::Renderers::Textile
+      })
+      additional_renderers.each { |name, klass| register_renderer(klass, name) } if additional_renderers
+    end
+
+    def find_renderer(name)
+      @renderers[(name ? name.downcase : nil)]
+    end
+
+    def default_renderer
+      @renderers[nil]
+    end
+
+    def rendering(snip)
+      renderer_instance = renderer_for(snip).new(self)
+      yield renderer_instance
+    rescue Exception => e
+      snip_name = snip ? snip.name : nil
+      "<pre>[Error rendering '#{snip_name}' - \"" +
+        e.message.gsub("<", "&lt;").gsub(">", "&gt;") + "\"]\n" +
+        e.backtrace.join("\n").gsub("<", "&lt;").gsub(">", "&gt;") + "</pre>"
     end
 
     def prepare_soup(config)

data/lib/vanilla/console.rb

@@ -2,8 +2,11 @@ require 'vanilla'
 require 'irb'
 
 def app(reload=false)
-  @__vanilla_console_app = nil if reload
-  @__vanilla_console_app ||= Vanilla::App.new(ENV['VANILLA_CONFIG'])
+  if !@__vanilla_console_app || reload
+    config = YAML.parse_file(ENV['VANILLA_CONFIG']) rescue {}
+    @__vanilla_console_app = Vanilla::App.new(config)
+  end
+  @__vanilla_console_app
 end
 
 puts "The Soup is simmering."

data/lib/vanilla/renderers.rb

@@ -0,0 +1,12 @@
+module Vanilla
+  module Renderers
+    autoload :Base, "vanilla/renderers/base"
+    autoload :Bold, "vanilla/renderers/bold"
+    autoload :Erb, "vanilla/renderers/erb"
+    autoload :Haml, "vanilla/renderers/haml"
+    autoload :Markdown, "vanilla/renderers/markdown"
+    autoload :Raw, "vanilla/renderers/raw"
+    autoload :Ruby, "vanilla/renderers/ruby"
+    autoload :Textile, "vanilla/renderers/textile"
+  end
+end

data/lib/vanilla/renderers/base.rb

@@ -1,4 +1,3 @@
-require 'vanilla/app'
 require 'vanilla/snip_reference_parser'
 
 module Vanilla
@@ -27,7 +26,7 @@ module Vanilla
       end
 
       def self.snip_regexp
-        %r{(\{[\w\-_\d]+(\s+[^\}.]+)?\})}
+        %r{(\{[\w\-_\d\.\"]+(\s+[^\}.]+)?\})}
       end
 
       def default_layout_snip

data/lib/vanilla/renderers/bold.rb

@@ -1,5 +1,3 @@
-require 'vanilla/renderers/base'
-
 module Vanilla::Renderers
   class Bold < Base
     def process_text(content)

data/lib/vanilla/renderers/erb.rb

@@ -1,5 +1,3 @@
-require 'vanilla/renderers/base'
-
 require 'erb'
 include ERB::Util
 

data/lib/vanilla/renderers/haml.rb

@@ -1,5 +1,3 @@
-require 'vanilla/renderers/base'
-
 require 'haml'
 
 module Vanilla::Renderers

data/lib/vanilla/renderers/markdown.rb

@@ -1,5 +1,3 @@
-require 'vanilla/renderers/base'
-
 require 'rubygems'
 gem 'BlueCloth' # from http://www.deveiate.org/projects/BlueCloth
 require 'bluecloth'

data/lib/vanilla/renderers/raw.rb

@@ -1,5 +1,3 @@
-require 'vanilla/renderers/base'
-
 module Vanilla::Renderers
   class Raw < Base
     def render(snip, part=:content)

data/lib/vanilla/renderers/ruby.rb

@@ -1,5 +1,3 @@
-require 'vanilla/renderers/base'
-
 module Vanilla::Renderers
   # Snips that render_as "Ruby" should define a class.
   # The class should have instance methods for any HTTP request methods that the dynasnip

data/lib/vanilla/renderers/textile.rb

@@ -1,5 +1,3 @@
-require 'vanilla/renderers/base'
-
 require 'rubygems'
 gem 'RedCloth'
 require 'redcloth'

data/test/base_renderer_test.rb

@@ -18,6 +18,11 @@ describe Vanilla::Renderers::Base do
     assert_response_body "loading content content", "/snip_with_inclusions"
   end
 
+  should "be able to render a snip attribute" do
+    create_snip(:name => "snip_with_inclusions", :content => "loading {test.part}")
+    assert_response_body "loading part 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"

data/test/vanilla_app_test.rb

@@ -51,8 +51,8 @@ describe Vanilla::App do
       end
     end
 
-    should "respect snip extensions pass in the config" do
-      app = Vanilla::App.new(:extensions => {"markdown" => "Bold"})
+    should "respect snip renderers passed in the config" do
+      app = Vanilla::App.new(:renderers => {"markdown" => "Vanilla::Renderers::Bold"})
       snip = create_snip(:name => "blah", :extension => "markdown")
       assert_equal Vanilla::Renderers::Bold, app.renderer_for(snip)
     end
@@ -72,12 +72,12 @@ describe Vanilla::App do
       assert_raises(NameError) { @app.renderer_for(snip) }
     end
 
-    should "load constants outside of the Vanilla::Renderers module" do
+    should "load constants presented as a string" do
       class ::MyRenderer
       end
-
-      snip = create_snip(:name => "blah", :render_as => "MyRenderer")
-      assert_equal MyRenderer, @app.renderer_for(snip)
+      app = Vanilla::App.new(:renderers => {"my_renderer" => "MyRenderer"})
+      snip = create_snip(:name => "blah", :render_as => "my_renderer")
+      assert_equal MyRenderer, app.renderer_for(snip)
     end
   end
 end

data/test/vanilla_presenting_test.rb

@@ -71,7 +71,7 @@ context "When presenting" do
     end
   end
 
-  class ::Vanilla::Renderers::Custom < ::Vanilla::Renderers::Base
+  class CustomRenderer < ::Vanilla::Renderers::Base
     def default_layout_snip
       soup['custom-layout']
     end
@@ -79,17 +79,18 @@ 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>"
     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 => "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
@@ -97,7 +98,7 @@ context "When presenting" do
   context "and a custom default renderer has been provided" do
     should "use that renderer" do
       @app = Vanilla::App.new(:default_renderer => ::Vanilla::Renderers::Bold)
-      create_snip :name => "layout", :content => "{current_snip}", :render_as => "Base"
+      create_snip :name => "layout", :content => "{current_snip}", :render_as => "base"
       create_snip :name => "test", :content => "test"
       assert_response_body "<b>test</b>", "/test"
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vanilla
 version: !ruby/object:Gem::Version 
-  hash: 37
+  hash: 45
   prerelease: 
   segments: 
   - 1
-  - 13
-  - 3
-  version: 1.13.3
+  - 14
+  - 1
+  version: 1.14.1
 platform: ruby
 authors: 
 - James Adam
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-20 00:00:00 +01:00
+date: 2011-04-26 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -219,6 +219,7 @@ files:
 - lib/vanilla/renderers/raw.rb
 - lib/vanilla/renderers/ruby.rb
 - lib/vanilla/renderers/textile.rb
+- lib/vanilla/renderers.rb
 - lib/vanilla/request.rb
 - lib/vanilla/routes.rb
 - lib/vanilla/snip_reference.rb