vanilla 1.9.17 → 1.11.0

data/Rakefile

@@ -1,5 +1,7 @@
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), 'lib')
-require 'vanilla'
+require "rubygems"
+require "rake/gempackagetask"
+require "rake/rdoctask"
+
 load File.join(File.dirname(__FILE__), *%w[lib tasks vanilla.rake])
 
 task :default => :test
@@ -7,14 +9,11 @@ task :default => :test
 require "rake/testtask"
 Rake::TestTask.new do |t|
   t.libs << "test"
+  t.ruby_opts << "-rubygems"
   t.test_files = FileList["test/**/*_test.rb"]
   t.verbose = true
 end
 
-require "rubygems"
-require "rake/gempackagetask"
-require "rake/rdoctask"
-
 if Object.const_defined?(:Gem)
   # This builds the actual gem. For details of what all these options
   # mean, and other ones you can add, check the documentation here:
@@ -25,7 +24,7 @@ if Object.const_defined?(:Gem)
 
     # Change these as appropriate
     s.name              = "vanilla"
-    s.version           = "1.9.17"
+    s.version           = "1.11.0"
     s.summary           = "A bliki-type web content thing."
     s.author            = "James Adam"
     s.email             = "james@lazyatom.com.com"
@@ -42,7 +41,7 @@ if Object.const_defined?(:Gem)
 
     # All the other gems we need.
     s.add_dependency("rack", ">= 0.9.1")
-    s.add_dependency("soup", ">= 0.9.9")
+    s.add_dependency("soup", ">= 0.9.10")
     s.add_dependency("ratom", ">= 0.3.5")
     s.add_dependency("RedCloth", ">= 4.1.1")
     s.add_dependency("BlueCloth", ">= 1.0.0")
@@ -51,6 +50,7 @@ if Object.const_defined?(:Gem)
 
     s.add_development_dependency("shoulda") # add any other gems for testing/development
     s.add_development_dependency("mocha")
+    s.add_development_dependency("haml")
 
     # If you want to publish automatically to rubyforge, you'll may need
     # to tweak this, and the publishing task below too.

data/lib/vanilla/app.rb

@@ -1,7 +1,7 @@
 require 'vanilla/request'
 require 'vanilla/authentication'
 require 'vanilla/routes'
-require 'vanilla/soup_with_timestamps'
+require 'vanilla/soup/timestamp_backend'
 
 # Require the base set of renderers
 require 'vanilla/renderers/base'
@@ -18,7 +18,7 @@ module Vanilla
 
     def initialize(config_file=nil)
       prepare_configuration(config_file)
-      @soup = SoupWithTimestamps.new(config[:soup])
+      @soup = prepare_soup(config)
       @authenticator = Vanilla::Authentication::Base.new(self)
     end
 
@@ -99,5 +99,14 @@ module Vanilla
         File.open(self[:filename], 'w') { |f| f.puts self.to_yaml }
       end
     end
+
+    def prepare_soup(config)
+      if config[:soups]
+        backends = [config[:soups]].flatten.map { |path| Vanilla::Soup::TimestampBackend.new(::Soup::Backends::YAMLBackend.new(path)) }
+        ::Soup.new(::Soup::Backends::MultiSoup.new(*backends))
+      else
+        ::Soup.new(Vanilla::Soup::TimestampBackend.new(::Soup::Backends::YAMLBackend.new(config[:soup])))
+      end
+    end
   end
 end

data/lib/vanilla/dynasnips/new.rb

@@ -7,6 +7,6 @@ class NewSnip < Dynasnip
     app.request.authenticate!
 
     base_params = {:render_as => '', :content => '', :author => current_user}.update(app.request.params)
-    editor = EditSnip.new(app).edit(Snip.new(base_params))
+    editor = EditSnip.new(app).edit(Soup::Snip.new(base_params))
   end
 end

data/lib/vanilla/renderers/haml.rb

@@ -0,0 +1,15 @@
+require 'vanilla/renderers/base'
+
+require 'haml'
+
+module Vanilla::Renderers
+  class Haml < Base
+    def prepare(snip, part=:content, args=[], enclosing_snip=snip)
+      @snip = snip
+    end
+    
+    def process_text(content)
+      ::Haml::Engine.new(content).render(binding)
+    end
+  end
+end

data/lib/vanilla/soup/timestamp_backend.rb

@@ -0,0 +1,22 @@
+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/base_renderer_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "test_helper")
+require "test_helper"
 
 class BaseRendererTest < Vanilla::TestCase
   context "in general" do

data/test/dynasnip_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "test_helper")
+require "test_helper"
 require 'vanilla/dynasnip'
 
 class DynasnipTest < Vanilla::TestCase

data/test/erb_renderer_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "test_helper")
+require "test_helper"
 
 class ErbRendererTest < Vanilla::TestCase
   context "when rendering" do

data/test/haml_renderer_test.rb

@@ -0,0 +1,37 @@
+require 'haml'
+require 'test_helper'
+
+class HamlRendererTest < Vanilla::TestCase
+  context "when rendering" do
+    should "render Haml into HTML" do
+      haml_snip(:name => "test", :content => "#hello\n  stuff")
+      assert_response_body %{<div id='hello'>\n  stuff\n</div>}, "/test"
+    end
+
+    should "insert evaluated Haml content into the snip" do
+      haml_snip(:name => "test", :content => "= 1 + 2")
+      assert_response_body "3", "/test"
+    end
+
+    should "evaluate Erb content in the snip" do
+      haml_snip(:name => "test", :content => "- if false\n  monkey\n- else\n  donkey")
+      assert_response_body "donkey", "/test"
+    end
+
+    should "expose the snip as an instance variable" do
+      haml_snip(:name => "test", :content => "= @snip.name")
+      assert_response_body "test", "/test"
+    end
+
+    should "expose the app as an instance variable" do
+      haml_snip(:name => "test", :content => "= @app.class.name")
+      assert_response_body "Vanilla::App", "/test"
+    end
+  end
+
+  private
+
+  def haml_snip(params)
+    create_snip(params.merge(:render_as => "Haml"))
+  end
+end

data/test/markdown_renderer_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "test_helper")
+require "test_helper"
 
 class MarkdownRendererTest < Vanilla::TestCase
   context "when rendering" do

data/test/raw_renderer_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "test_helper")
+require "test_helper"
 
 class RawRendererTest < Vanilla::TestCase
   context "when rendering" do

data/test/ruby_renderer_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "test_helper")
+require "test_helper"
 
 class RubyRendererTest < Vanilla::TestCase
   context "when rendering normally" do

data/test/snip_reference_parser_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), *%w[test_helper])
+require "test_helper"
 Treetop.load File.join(File.dirname(__FILE__), *%w[.. lib vanilla snip_reference])
 
 class SnipReferenceParserTest < Test::Unit::TestCase

data/test/snip_reference_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), *%w[test_helper])
+require "test_helper"
 
 class SnipReferenceTest < Vanilla::TestCase
   def setup

data/test/soup/whatwhat.yml

@@ -0,0 +1,2 @@
+--- # Soup attributes
+:name: whatwhat

data/test/test_helper.rb

@@ -1,19 +1,16 @@
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
-require "rubygems"
-require "vanilla"
-require "test/unit"
 require "shoulda"
 require "mocha"
 require "fileutils"
 require "rack/mock"
+require "vanilla"
 
 module Vanilla
   module Test
     def setup_clean_environment
-      FileUtils.mkdir_p(File.dirname(test_config_file))
+      FileUtils.mkdir_p(File.dirname(config_file_for_tests))
       clear_soup
-      File.open(test_config_file, 'w') { |f| f.write({:soup => soup_path}.to_yaml) }
-      @app = Vanilla::App.new(test_config_file)
+      File.open(config_file_for_tests, 'w') { |f| f.write({:soup => soup_path}.to_yaml) }
+      @app = Vanilla::App.new(config_file_for_tests)
 
       require "vanilla/dynasnips/current_snip"
       @app.soup << CurrentSnip.snip_attributes
@@ -33,19 +30,17 @@ module Vanilla
     end
 
     def assert_response_body(expected, uri)
-      assert_equal expected, response_body_for(uri)
+      assert_equal expected.strip, response_body_for(uri).strip
     end
 
     def set_main_template(template_content)
-      system = @app.soup["system"] || Snip.new({:name => "system"}, @app.soup)
+      system = @app.soup["system"] || Soup::Snip.new({:name => "system"}, @app.soup)
       system.main_template = template_content
       system.save
     end
 
     def create_snip(params)
-      s = Snip.new(params, @app.soup)
-      s.save
-      s
+      @app.soup << params
     end
 
     def mock_env_for_url(url)
@@ -56,12 +51,12 @@ module Vanilla
       Rack::Request.new(mock_env_for_url(url))
     end
 
-    def test_config_file
+    def config_file_for_tests
       File.join(File.dirname(__FILE__), "tmp", "config.yml")
     end
 
-    def test_config(options={})
-      File.open(test_config_file, 'w') { |f| f.write({:soup => soup_path}.update(options).to_yaml) }
+    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

data/test/tmp/soup/current_snip.yml

@@ -1,8 +1,4 @@
 CurrentSnip--- # Soup attributes
-:created_at: 2010-01-04 13:54:23.700595 +00:00
-:updated_at: 2010-01-04 13:54:23.700596 +00:00
-:name: current_snip
-:render_as: Ruby
 :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
@@ -13,3 +9,7 @@ CurrentSnip--- # Soup attributes
         {current_snip name}
         
       will output the name of the current snip, or the name of the snip currently being edited.
+:updated_at: 2010-06-10 15:00:13.119623 +01:00
+:render_as: Ruby
+:name: current_snip
+:created_at: 2010-06-10 15:00:13.119621 +01:00

data/test/tmp/soup/system.yml

@@ -1,5 +1,5 @@
 --- # Soup attributes
-:created_at: 2010-01-04 13:54:23.701146 +00:00
-:updated_at: 2010-01-04 13:54:23.701148 +00:00
+:updated_at: 2010-06-10 15:00:13.120125 +01:00
 :name: system
 :main_template: "{current_snip}"
+:created_at: 2010-06-10 15:00:13.120123 +01:00

data/test/tmp/soup/temp.yml

@@ -0,0 +1,4 @@
+--- # Soup attributes
+:updated_at: 2010-06-10 15:00:13.120894 +01:00
+:name: temp
+:created_at: 2010-06-10 15:00:13 +01:00

data/test/vanilla_app_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'test_helper')
+require "test_helper"
 
 class VanillaAppTest < Vanilla::TestCase
 
@@ -39,7 +39,7 @@ class VanillaAppTest < Vanilla::TestCase
 
   context "when detecting the snip renderer" do
     setup do
-      @app = Vanilla::App.new(test_config_file)
+      @app = Vanilla::App.new(config_file_for_tests)
     end
 
     should "return the constant refered to in the render_as property of the snip" do

data/test/vanilla_presenting_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "test_helper")
+require "test_helper"
 
 class VanillaPresentingTest < Vanilla::TestCase
   def setup

data/test/vanilla_request_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "test_helper")
+require "test_helper"
 
 class VanillaRequestTest < Vanilla::TestCase
   context "when requesting the root" do
@@ -14,8 +14,8 @@ class VanillaRequestTest < Vanilla::TestCase
 
     context "with a start snip configuration set" do
       setup do
-        test_config(:root_snip => "custom")
-        @app = Vanilla::App.new(test_config_file)
+        config_for_tests(:root_snip => "custom")
+        @app = Vanilla::App.new(config_file_for_tests)
       end
 
       should "use specified snip as default" do

data/test/vanilla_soup_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), *%w[test_helper])
+require "test_helper"
 
 class VanillaSoupTest < Vanilla::TestCase
   should "convert timestamps to times" do

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: vanilla
 version: !ruby/object:Gem::Version 
-  version: 1.9.17
+  prerelease: false
+  segments: 
+  - 1
+  - 11
+  - 0
+  version: 1.11.0
 platform: ruby
 authors: 
 - James Adam
@@ -9,99 +14,143 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-04 00:00:00 +00:00
+date: 2010-06-10 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 1
         version: 0.9.1
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: soup
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.9
-    version: 
+        segments: 
+        - 0
+        - 9
+        - 10
+        version: 0.9.10
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: ratom
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 3
+        - 5
         version: 0.3.5
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: RedCloth
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 4
+        - 1
+        - 1
         version: 4.1.1
-    version: 
+  type: :runtime
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: BlueCloth
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
-    version: 
+  type: :runtime
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: treetop
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 4
+        - 1
         version: 1.4.1
-    version: 
+  type: :runtime
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: warden
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 5
+        - 2
         version: 0.5.2
-    version: 
+  type: :runtime
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: shoulda
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: mocha
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: haml
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id010
 description: 
 email: james@lazyatom.com.com
 executables: 
@@ -119,15 +168,18 @@ files:
 - test/base_renderer_test.rb
 - test/dynasnip_test.rb
 - test/erb_renderer_test.rb
+- test/haml_renderer_test.rb
 - test/markdown_renderer_test.rb
 - test/raw_renderer_test.rb
 - test/ruby_renderer_test.rb
 - test/snip_reference_parser_test.rb
 - test/snip_reference_test.rb
+- test/soup/whatwhat.yml
 - test/test_helper.rb
 - test/tmp/config.yml
 - test/tmp/soup/current_snip.yml
 - test/tmp/soup/system.yml
+- test/tmp/soup/temp.yml
 - test/vanilla_app_test.rb
 - test/vanilla_presenting_test.rb
 - test/vanilla_request_test.rb
@@ -150,7 +202,6 @@ files:
 - lib/vanilla/dynasnips/link_to_current_snip.rb
 - lib/vanilla/dynasnips/logout.rb
 - lib/vanilla/dynasnips/new.rb
-- lib/vanilla/dynasnips/notes.rb
 - lib/vanilla/dynasnips/pre.rb
 - lib/vanilla/dynasnips/rand.rb
 - lib/vanilla/dynasnips/raw.rb
@@ -158,6 +209,7 @@ files:
 - lib/vanilla/renderers/base.rb
 - lib/vanilla/renderers/bold.rb
 - lib/vanilla/renderers/erb.rb
+- lib/vanilla/renderers/haml.rb
 - lib/vanilla/renderers/markdown.rb
 - lib/vanilla/renderers/raw.rb
 - lib/vanilla/renderers/ruby.rb
@@ -170,7 +222,7 @@ files:
 - lib/vanilla/snips/start.rb
 - lib/vanilla/snips/system.rb
 - lib/vanilla/snips/tutorial.rb
-- lib/vanilla/soup_with_timestamps.rb
+- lib/vanilla/soup/timestamp_backend.rb
 - lib/vanilla/static.rb
 - lib/vanilla.rb
 - bin/vanilla
@@ -192,18 +244,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: vanilla
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A bliki-type web content thing.

data/lib/vanilla/dynasnips/notes.rb

@@ -1,42 +0,0 @@
-require 'vanilla/dynasnip'
-
-class Notes < Dynasnip
-  def get(*args)
-    all_notes_content = all_notes.map { |snip| 
-      render_note(snip) 
-    }.join("")
-    snip.main_template.gsub('[notes]', all_notes_content)
-  end
-
-  def post(*args)
-    new_note = Snip.new(cleaned_params)
-    new_note.name = "note_#{snip.next_note_id}"
-    new_note.kind = "note"
-    new_note.save
-    increment_next_id
-    get(*args)
-  end
-  
-  private 
-  
-  def all_notes
-    Snip.with(:kind, "= 'note'")
-  end
-  
-  def increment_next_id
-    s = snip
-    s.next_note_id = s.next_note_id.to_i + 1
-    s.save
-  end
-
-  def render_note(note)
-    note_link = link_to(note.name)
-    note_content = Vanilla.render(note.name, nil, context, [])
-    snip.note_template.gsub('[note]', note_content).gsub('[link]', note_link)
-  end
-  
-  attribute :next_note_id, 1
-  
-  attribute :note_template, %{<dt>[link]</dt><dd>[note]</dd>}
-  attribute :main_template, %{<dl>[notes]</dl>}
-end

data/lib/vanilla/soup_with_timestamps.rb

@@ -1,22 +0,0 @@
-require 'soup'
-require 'delegate'
-
-module Vanilla
-  class SoupWithTimestamps < DelegateClass(Soup)
-    def initialize(config)
-      super(Soup.new(config))
-    end
-    
-    def <<(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
-      super
-    end
-    
-    def new_snip(attributes)
-      Snip.new(attributes, self)
-    end
-  end
-end
-