vanilla 1.13.2 → 1.13.3

data/README_FOR_APP

@@ -7,7 +7,7 @@ What you've got:
   config.ru  - this is the rack configuration, which is used to start
                the application by your webserver
   config.yml - the configuration; by default it specifies the directory
-               which contains the soup, and a cookie secret
+               which contains the soup(s)
   soup/      - the default soup directory, where your snips are stored
   
 
@@ -16,32 +16,23 @@ For an overview of vanilla, start your site and look at the tutorial:
   $ rackup   # then open http://localhost:9292/vanilla-rb-tutorial
 
 
-By default, you won't be able to edit anything on the site, because
-you can't log in. If you want to edit snips on the site, you'll need
-to create a user.
-
-  $ rake vanilla:add_user
-
-Your other option is to edit the soup directly; you can edit any file
-in the soup directory using your favourite editor, and the changes
-will be reflected automatically. The snip files are slightly modified
-YAML files. Here's one describing Soup itself, in soup/soup.yml:
+You can edit any file in the soup directory using your favourite editor, 
+and the changes will be reflected automatically. The snip files are
+slightly modified YAML files. Here's one describing Soup itself, in 
+soup/system/tutorial/soup.snip:
 
   Soup is a data store supporting the {link_to snip}-space that {link_to vanilla-rb} expects.
 
   It's hosted on github [here][github].
   
   [github]: http://github.com/lazyatom/soup
-  --- # Soup attributes
+
   :name: soup
   :created_at: 2009-09-27 14:14:16.096231 +01:00
   :updated_at: 2009-09-27 14:14:16.096232 +01:00
   :render_as: Markdown
 
-The 'content' of the snip is at the top of the file, followed by
-
-  --- # Soup attributes
-  
-which starts the rest of the snip attributes. Again, see the online
-tutorial for information about what each attribute signifies.
+The 'content' of the snip is at the top of the file, followed by the
+rest of the snip attributes. Again, see the online tutorial for information
+about what each attribute signifies.
   

data/Rakefile

@@ -48,7 +48,7 @@ if Object.const_defined?(:Gem)
     s.add_dependency("treetop", ">= 1.4.1")
     s.add_dependency("haml")
 
-    s.add_development_dependency("kintama") # add any other gems for testing/development
+    s.add_development_dependency("kintama", ">= 0.1.5") # 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/config.ru

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

data/lib/vanilla.rb

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

data/lib/vanilla/app.rb

@@ -13,8 +13,11 @@ module Vanilla
 
     attr_reader :request, :response, :config, :soup
 
-    def initialize(config_file=nil)
-      prepare_configuration(config_file)
+    def initialize(config={})
+      @config = config
+      if @config[:soup].nil? && @config[:soups].nil?
+        @config.merge!(:soup => File.expand_path("soup"))
+      end
       @soup = prepare_soup(config)
     end
 
@@ -42,9 +45,9 @@ module Vanilla
       when 'html', nil
         render(layout_for(snip))
       when 'raw', 'css', 'js'
-        Renderers::Raw.new(self).render(snip, part || :content)
+        Renderers::Raw.new(self).render(snip, part)
       when 'text', 'atom', 'xml'
-        render(snip, part || :content)
+        render(snip, part)
       else
         raise "Unknown format '#{format}'"
       end
@@ -78,7 +81,7 @@ module Vanilla
       elsif snip && snip.extension && !snip.extension.empty?
         Vanilla::Renderers.const_get(renderer_for_extension(snip.extension))
       else
-        Vanilla::Renderers::Base
+        default_renderer
       end
     end
 
@@ -86,6 +89,10 @@ 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)
@@ -94,34 +101,23 @@ module Vanilla
       end
     end
 
-    # Other things can call this when a snip cannot be loaded.
-    def render_missing_snip(snip_name)
-      "[snip '#{snip_name}' cannot be found]"
-    end
-
     def snip(attributes)
       @soup << attributes
     end
 
     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
+    DEFAULT_EXTENSION_RENDERERS = Hash.new("Base").merge({
+      "markdown" => "Markdown",
+      "textile" => "Textile",
+      "erb" => "Erb",
+      "rb" => "Ruby",
+      "haml" => "Haml"
+    })
 
-    def prepare_configuration(config_file)
-      config_file ||= "config.yml"
-      @config = YAML.load(File.open(config_file)) rescue {}
-      @config[:filename] = config_file
-      def @config.save!
-        File.open(self[:filename], 'w') { |f| f.puts self.to_yaml }
-      end
+    def renderer_for_extension(extension)
+      @renderer_mapping ||= DEFAULT_EXTENSION_RENDERERS.merge(@config[:extensions] || {})
+      @renderer_mapping[extension]
     end
 
     def prepare_soup(config)

data/lib/vanilla/renderers/base.rb

@@ -50,11 +50,10 @@ module Vanilla
             # Render the snip or snip part with the given args, and the current
             # context, but with the default renderer for that snip. We dispatch
             # *back* out to the root Vanilla.render method to do this.
-            snip = soup[snip_name]
-            if snip
+            if snip = soup[snip_name]
               app.render(snip, snip_attribute, snip_args, enclosing_snip)
             else
-              app.render_missing_snip(snip_name)
+              render_missing_snip(snip_name)
             end
           else
             "malformed snip reference: #{$1.inspect}"
@@ -67,6 +66,10 @@ module Vanilla
         @parser.parse(string)
       end
 
+      def render_missing_snip(snip_name)
+        "[snip '#{snip_name}' cannot be found]"
+      end
+
       # Default rendering behaviour. Subclasses shouldn't really need to touch this.
       def render(snip, part=:content, args=[], enclosing_snip=snip)
         prepare(snip, part, args, enclosing_snip)

data/lib/vanilla/request.rb

@@ -48,7 +48,7 @@ module Vanilla
       request.path_info
     end
 
-    URL_ROOT          = /\A\/\Z/                                  # i.e. /
+    URL_ROOT          = /\A\/?\Z/                                  # i.e. / or nothing
     URL_SNIP          = /\A\/([\w\-\s]+)(\/|\.(\w+))?\Z/            # i.e. /start, /start.html
     URL_SNIP_AND_PART = /\A\/([\w\-\s]+)\/([\w\-\s]+)(\/|\.(\w+))?\Z/ # i.e. /blah/part, /blah/part.raw
 

data/test/soup/blah.snip

@@ -0,0 +1,4 @@
+
+
+:name: blah
+:render_as: Raw

data/test/soup/blah.snip.erb

@@ -0,0 +1,4 @@
+
+
+:extension: erb
+:name: blah

data/test/soup/blah.snip.haml

@@ -0,0 +1,4 @@
+
+
+:extension: haml
+:name: blah

data/test/soup/blah.snip.markdown

@@ -0,0 +1,4 @@
+
+
+:extension: markdown
+:name: blah

data/test/soup/blah.snip.rb

@@ -0,0 +1,4 @@
+
+
+:extension: rb
+:name: blah

data/test/soup/blah.snip.textile

@@ -0,0 +1,4 @@
+
+
+:extension: textile
+:name: blah

data/test/soup/current_snip.snip

@@ -0,0 +1,14 @@
+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.
+:render_as: Ruby
+:name: current_snip

data/test/soup/layout.snip

@@ -0,0 +1,4 @@
+{current_snip}
+
+:render_as: Base
+:name: layout

data/test/soup/test.snip

@@ -0,0 +1,3 @@
+test
+
+:name: test

data/test/soup/test_dyna.snip

@@ -0,0 +1,7 @@
+TestDyna
+
+:render_as: Ruby
+:created_at: 2011-04-16 21:49:54 +01:00
+:updated_at: 2011-04-16 21:49:54 +01:00
+:test_attribute: altered content
+:name: test_dyna

data/test/test_helper.rb

@@ -3,7 +3,7 @@ require 'bundler/setup'
 $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
 require "kintama"
-require "mocha"
+require "kintama/mocha"
 require "fileutils"
 require "rack/mock"
 require "vanilla"
@@ -11,9 +11,8 @@ require "vanilla"
 module Vanilla
   module Test
     def setup_clean_environment
-      FileUtils.mkdir_p(File.dirname(config_file_for_tests))
-      File.open(config_file_for_tests, 'w') { |f| f.write({:soup => soup_path}.to_yaml) }
-      @app = Vanilla::App.new(config_file_for_tests)
+      clean_environment
+      @app = Vanilla::App.new(:soup => soup_path)
 
       require "vanilla/dynasnips/current_snip"
       @app.soup << CurrentSnip.snip_attributes
@@ -56,17 +55,13 @@ module Vanilla
       File.join(File.dirname(__FILE__), "tmp")
     end
 
-    def config_file_for_tests
-      File.join(test_app_directory, "config.yml")
-    end
-
-    def config_for_tests(options={})
-      File.open(config_file_for_tests, 'w') { |f| f.write({:soup => soup_path}.update(options).to_yaml) }
-    end
-
     def soup_path
       File.expand_path(File.join(test_app_directory, "soup"))
     end
+
+    def clean_environment
+      FileUtils.rm_rf(test_app_directory)
+    end
   end
 end
 
@@ -76,16 +71,5 @@ Kintama.setup do
 end
 
 Kintama.teardown do
-  FileUtils.rm_rf(test_app_directory)
-end
-
-Kintama.include Mocha::API
-Kintama.teardown do
-  begin
-    mocha_verify
-  rescue Mocha::ExpectationError => e
-    raise e
-  ensure
-    mocha_teardown
-  end
+  clean_environment
 end

data/test/vanilla_app_test.rb

@@ -13,32 +13,22 @@ describe Vanilla::App do
   end
 
   context "when being configured" do
-    should "load a config file from the current working directory by default" do
-      File.expects(:open).with("config.yml").returns(StringIO.new({:soup => soup_path}.to_yaml))
-      Vanilla::App.new
+    should "default the root snip to 'start'" do
+      create_snip :name => "start", :content => "default"
+      assert_response_body "default", "/"
     end
 
-    should "load a config file given" do
-      File.open("/tmp/vanilla_config.yml", "w") { |f| f.write({:soup => soup_path, :hello => true}.to_yaml) }
-      app = Vanilla::App.new("/tmp/vanilla_config.yml")
-      assert app.config[:hello]
-    end
-
-    should "allow saving of configuration to the same file it was loaded from" do
-      config_file = "/tmp/vanilla_config.yml"
-      File.open(config_file, "w") { |f| f.write({:soup => soup_path, :hello => true}.to_yaml) }
-      app = Vanilla::App.new(config_file)
-      app.config[:saved] = true
-      app.config.save!
-
-      config = YAML.load(File.open(config_file))
-      assert config[:saved]
+    should "allow a customised root snip" do
+      create_snip :name => "start", :content => "default"
+      create_snip :name => "custom", :content => "custom"
+      @app = Vanilla::App.new(:soup => soup_path, :root_snip => "custom")
+      assert_response_body "custom", "/"
     end
   end
 
   context "when detecting the snip renderer" do
     setup do
-      @app = Vanilla::App.new(config_file_for_tests)
+      @app = Vanilla::App.new
     end
 
     should "return the constant refered to in the render_as property of the snip" do
@@ -61,6 +51,12 @@ describe Vanilla::App do
       end
     end
 
+    should "respect snip extensions pass in the config" do
+      app = Vanilla::App.new(:extensions => {"markdown" => "Bold"})
+      snip = create_snip(:name => "blah", :extension => "markdown")
+      assert_equal Vanilla::Renderers::Bold, app.renderer_for(snip)
+    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)

data/test/vanilla_presenting_test.rb

@@ -94,6 +94,15 @@ context "When presenting" do
     end
   end
 
+  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 => "test", :content => "test"
+      assert_response_body "<b>test</b>", "/test"
+    end
+  end
+
   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"

data/test/vanilla_request_test.rb

@@ -11,17 +11,6 @@ describe Vanilla::Request do
     should "set format to 'html'" do
       assert_equal "html", @request.format
     end
-
-    context "with a start snip configuration set" do
-      setup do
-        config_for_tests(:root_snip => "custom")
-        @app = Vanilla::App.new(config_file_for_tests)
-      end
-
-      should "use specified snip as default" do
-        assert_equal "custom", Vanilla::Request.new(mock_env_for_url("/"), @app).snip_name
-      end
-    end
   end
 
   context "when requesting urls" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vanilla
 version: !ruby/object:Gem::Version 
-  hash: 39
+  hash: 37
   prerelease: 
   segments: 
   - 1
   - 13
-  - 2
-  version: 1.13.2
+  - 3
+  version: 1.13.3
 platform: ruby
 authors: 
 - James Adam
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-01 00:00:00 +00:00
+date: 2011-04-20 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -136,10 +136,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 17
         segments: 
         - 0
-        version: "0"
+        - 1
+        - 5
+        version: 0.1.5
   type: :development
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
@@ -179,6 +181,16 @@ files:
 - test/ruby_renderer_test.rb
 - test/snip_reference_parser_test.rb
 - test/snip_reference_test.rb
+- test/soup/blah.snip
+- test/soup/blah.snip.erb
+- test/soup/blah.snip.haml
+- test/soup/blah.snip.markdown
+- test/soup/blah.snip.rb
+- test/soup/blah.snip.textile
+- test/soup/current_snip.snip
+- test/soup/layout.snip
+- test/soup/test.snip
+- test/soup/test_dyna.snip
 - test/test_helper.rb
 - test/vanilla_app_test.rb
 - test/vanilla_presenting_test.rb