vanilla 1.11.4 → 1.12.1

data/Rakefile

@@ -24,7 +24,7 @@ if Object.const_defined?(:Gem)
 
     # Change these as appropriate
     s.name              = "vanilla"
-    s.version           = "1.11.4"
+    s.version           = "1.12.1"
     s.summary           = "A bliki-type web content thing."
     s.author            = "James Adam"
     s.email             = "james@lazyatom.com.com"
@@ -57,18 +57,37 @@ if Object.const_defined?(:Gem)
     s.rubyforge_project = "vanilla"
   end
 
-  # This task actually builds the gem. We also regenerate a static 
+  # This task actually builds the gem. We also regenerate a static
   # .gemspec file, which is useful if something (i.e. GitHub) will
   # be automatically building a gem for this project. If you're not
   # using GitHub, edit as appropriate.
+  #
+  # To publish your gem online, install the 'gemcutter' gem; Read more 
+  # about that here: http://gemcutter.org/pages/gem_docs
   Rake::GemPackageTask.new(spec) do |pkg|
     pkg.gem_spec = spec
+  end
 
-    # Generate the gemspec file for github.
-    file = File.dirname(__FILE__) + "/#{spec.name}.gemspec"
-    File.open(file, "w") {|f| f << spec.to_ruby }
+  # Stolen from jeweler
+  def prettyify_array(gemspec_ruby, array_name)
+    gemspec_ruby.gsub(/s\.#{array_name.to_s} = \[.+?\]/) do |match|
+      leadin, files = match[0..-2].split("[")
+      leadin + "[\n    #{files.split(",").join(",\n   ")}\n  ]"
+    end
   end
 
+  task :gemspec do
+    output = spec.to_ruby
+    output = prettyify_array(output, :files)
+    output = prettyify_array(output, :test_files)
+    output = prettyify_array(output, :extra_rdoc_files)
+
+    file = File.expand_path("../#{spec.name}.gemspec", __FILE__)
+    File.open(file, "w") {|f| f << output }
+  end
+
+  task :package => :gemspec
+
   # Generate documentation
   Rake::RDocTask.new do |rd|
     rd.main = "README"
@@ -81,47 +100,20 @@ if Object.const_defined?(:Gem)
     rm "#{spec.name}.gemspec"
   end
 
-  # If you want to publish to RubyForge automatically, here's a simple 
-  # task to help do that. If you don't, just get rid of this.
-  # Be sure to set up your Rubyforge account details with the Rubyforge
-  # gem; you'll need to run `rubyforge setup` and `rubyforge config` at
-  # the very least.
-  begin
-    require "rake/contrib/sshpublisher"
-    namespace :rubyforge do
-  
-      desc "Release gem and RDoc documentation to RubyForge"
-      task :release => ["rubyforge:release:gem", "rubyforge:release:docs"]
-  
-      namespace :release do
-        desc "Release a new version of this gem"
-        task :gem => [:package] do
-          require 'rubyforge'
-          rubyforge = RubyForge.new
-          rubyforge.configure
-          rubyforge.login
-          rubyforge.userconfig['release_notes'] = spec.summary
-          path_to_gem = File.join(File.dirname(__FILE__), "pkg", "#{spec.name}-#{spec.version}.gem")
-          puts "Publishing #{spec.name}-#{spec.version.to_s} to Rubyforge..."
-          rubyforge.add_release(spec.rubyforge_project, spec.name, spec.version.to_s, path_to_gem)
-        end
-  
-        desc "Publish RDoc to RubyForge."
-        task :docs => [:rdoc] do
-          config = YAML.load(
-              File.read(File.expand_path('~/.rubyforge/user-config.yml'))
-          )
-
-          host = "#{config['username']}@rubyforge.org"
-          remote_dir = "/var/www/gforge-projects/vanilla-rb/" # Should be the same as the rubyforge project name
-          local_dir = 'rdoc'
-
-          Rake::SshDirPublisher.new(host, remote_dir, local_dir).upload
-        end
+  desc 'Tag the repository in git with gem version number'
+  task :tag => [:gemspec, :package] do
+    if `git diff --cached`.empty?
+      if `git tag`.split("\n").include?("v#{spec.version}")
+        raise "Version #{spec.version} has already been released"
       end
+      `git add #{File.expand_path("../#{spec.name}.gemspec", __FILE__)}`
+      `git commit -m "Released version #{spec.version}"`
+      `git tag v#{spec.version}`
+      `git push --tags`
+      `git push`
+    else
+      raise "Unstaged changes still waiting to be committed"
     end
-  rescue LoadError
-    puts "Rake SshDirPublisher is unavailable or your rubyforge environment is not configured."
   end
 else
   puts "Gem management tasks unavailable, as rubygems was not fully loaded."

data/config.ru

@@ -1,4 +1,7 @@
+require 'rubygems'
+require 'bundler/setup'
 $:.unshift File.join(File.dirname(__FILE__), *%w[lib])
+
 require 'vanilla'
 require 'vanilla/static'
 

data/lib/vanilla/app.rb

@@ -1,14 +1,13 @@
+require 'soup'
 require 'vanilla/request'
 require 'vanilla/authentication'
 require 'vanilla/routes'
-require 'vanilla/soup/timestamp_backend'
 
 # Require the base set of renderers
 require 'vanilla/renderers/base'
 require 'vanilla/renderers/raw'
 require 'vanilla/renderers/erb'
 
-
 module Vanilla
   class App
     include Routes
@@ -32,7 +31,7 @@ module Vanilla
         output = formatted_render(request.snip, request.part, request.format)
       rescue => e
         @response.status = 500
-        output = e.to_s
+        output = e.to_s + e.backtrace.join("\n")
       end
       response_format = request.format
       response_format = 'plain' if response_format == 'raw'
@@ -44,7 +43,7 @@ module Vanilla
     def formatted_render(snip, part=nil, format=nil)
       case format
       when 'html', nil
-        Renderers::Erb.new(self).render(soup['system'], :main_template)
+        render(layout_for(snip))
       when 'raw', 'css', 'js'
         Renderers::Raw.new(self).render(snip, part || :content)
       when 'text', 'atom', 'xml'
@@ -69,15 +68,31 @@ module Vanilla
       renderer_instance = renderer_for(snip).new(self)
       yield renderer_instance
     rescue Exception => e
-      "<pre>[Error rendering '#{snip.name}' - \"" +
+      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)
-      return Renderers::Base unless snip.render_as && !snip.render_as.empty?
-      Vanilla::Renderers.const_get(snip.render_as)
+      if snip && snip.render_as && !snip.render_as.empty?
+        Vanilla::Renderers.const_get(snip.render_as)
+      else
+        Vanilla::Renderers::Base
+      end
+    end
+
+    def default_layout_snip
+      soup[config[:default_layout_snip] || 'layout']
+    end
+
+    def layout_for(snip)
+      if snip
+        renderer_for(snip).new(self).layout_for(snip)
+      else
+        default_layout_snip
+      end
     end
 
     # Other things can call this when a snip cannot be loaded.

data/lib/vanilla/renderers/base.rb

@@ -30,6 +30,14 @@ module Vanilla
         %r{(\{[\w\-_\d]+(\s+[^\}.]+)?\})}
       end
 
+      def default_layout_snip
+        app.default_layout_snip
+      end
+
+      def layout_for(snip)
+        layout_snip = (snip && snip.layout) ? soup[snip.layout] : default_layout_snip
+      end
+
       # Default behaviour to include a snip's content
       def include_snips(content, enclosing_snip)
         content.gsub(Vanilla::Renderers::Base.snip_regexp) do

data/test/test_helper.rb

@@ -1,3 +1,7 @@
+require 'rubygems'
+require 'bundler/setup'
+$:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
+
 require "shoulda"
 require "mocha"
 require "fileutils"
@@ -14,7 +18,7 @@ module Vanilla
 
       require "vanilla/dynasnips/current_snip"
       @app.soup << CurrentSnip.snip_attributes
-      create_snip :name => "system", :main_template => "{current_snip}"
+      create_snip :name => "layout", :content => "{current_snip}"
     end
 
     def response_for(url)
@@ -34,9 +38,7 @@ module Vanilla
     end
 
     def set_main_template(template_content)
-      system = @app.soup["system"] || Soup::Snip.new({:name => "system"}, @app.soup)
-      system.main_template = template_content
-      system.save
+      @app.soup << {:name => "layout", :content => template_content}
     end
 
     def create_snip(params)

data/test/tmp/config.yml

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

data/test/tmp/soup/{current_snip.yml → current_snip.snip}

@@ -1,4 +1,5 @@
-CurrentSnip--- # Soup attributes
+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
@@ -9,7 +10,5 @@ CurrentSnip--- # Soup attributes
         {current_snip name}
         
       will output the name of the current snip, or the name of the snip currently being edited.
-:created_at: 2010-07-14 13:45:49.767720 +01:00
 :name: current_snip
-:updated_at: 2010-07-14 13:45:49.767722 +01:00
 :render_as: Ruby

data/test/tmp/soup/layout.snip

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

data/test/vanilla_presenting_test.rb

@@ -64,6 +64,37 @@ class VanillaPresentingTest < Vanilla::TestCase
     end
   end
 
+  context "when presenting 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"
+      assert_response_body "<custom>this is a test</custom>", "/test"
+    end
+  end
+
+  class ::Vanilla::Renderers::Custom < ::Vanilla::Renderers::Base
+    def default_layout_snip
+      soup['custom-layout']
+    end
+  end
+
+  context "when presenting a snip using a renderer that specifies a template" do
+    setup do
+      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"
+      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"
+      assert_response_body "<snipcustom>this is a test</snipcustom>", "/test"
+    end
+  end
+
   context "when 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"

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vanilla
 version: !ruby/object:Gem::Version 
+  hash: 37
   prerelease: false
   segments: 
   - 1
-  - 11
-  - 4
-  version: 1.11.4
+  - 12
+  - 1
+  version: 1.12.1
 platform: ruby
 authors: 
 - James Adam
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-08 00:00:00 +01:00
+date: 2010-11-18 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 57
         segments: 
         - 0
         - 9
@@ -35,9 +38,11 @@ dependencies:
   name: soup
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 0
@@ -49,9 +54,11 @@ dependencies:
   name: ratom
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
         segments: 
         - 0
         - 3
@@ -63,9 +70,11 @@ dependencies:
   name: RedCloth
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 57
         segments: 
         - 4
         - 1
@@ -77,9 +86,11 @@ dependencies:
   name: BlueCloth
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 0
@@ -91,9 +102,11 @@ dependencies:
   name: treetop
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 5
         segments: 
         - 1
         - 4
@@ -105,9 +118,11 @@ dependencies:
   name: warden
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 0
         - 5
@@ -119,9 +134,11 @@ dependencies:
   name: shoulda
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -131,9 +148,11 @@ dependencies:
   name: mocha
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -143,9 +162,11 @@ dependencies:
   name: haml
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -176,12 +197,11 @@ files:
 - test/snip_reference_test.rb
 - test/test_helper.rb
 - test/tmp/config.yml
-- test/tmp/soup/current_snip.yml
-- test/tmp/soup/system.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
-- test/vanilla_soup_test.rb
 - lib/defensio.rb
 - lib/tasks/vanilla.rake
 - lib/vanilla/app.rb
@@ -221,7 +241,6 @@ files:
 - lib/vanilla/snips/start.rb
 - lib/vanilla/snips/system.rb
 - lib/vanilla/snips/tutorial.rb
-- lib/vanilla/soup/timestamp_backend.rb
 - lib/vanilla/static.rb
 - lib/vanilla.rb
 - bin/vanilla
@@ -240,23 +259,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: vanilla
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A bliki-type web content thing.

data/lib/vanilla/soup/timestamp_backend.rb

@@ -1,22 +0,0 @@
-require 'soup'
-
-module Vanilla
-  module Soup
-    class TimestampBackend
-      def initialize(backend)
-        @backend = backend
-      end
-
-      def save_snip(attributes)
-        attributes[:created_at] ||= Time.now
-        attributes[:created_at] = Time.parse(attributes[:created_at]) if attributes[:created_at].is_a?(String)
-        attributes[:updated_at] = Time.now
-        @backend.save_snip(attributes)
-      end
-
-      def method_missing(*args)
-        @backend.__send__(*args)
-      end
-    end
-  end
-end

data/test/tmp/soup/system.yml

@@ -1,5 +0,0 @@
---- # Soup attributes
-:created_at: 2010-07-14 13:45:49.768201 +01:00
-:name: system
-:updated_at: 2010-07-14 13:45:49.768203 +01:00
-:main_template: "{current_snip}"

data/test/vanilla_soup_test.rb

@@ -1,8 +0,0 @@
-require "test_helper"
-
-class VanillaSoupTest < Vanilla::TestCase
-  should "convert timestamps to times" do
-    snip = create_snip(:name => "temp", :created_at => Time.now.to_s)
-    assert_kind_of Time, @app.soup["temp"].created_at
-  end
-end