vanilla 1.9.15.1 → 1.9.15.2

data/Rakefile

@@ -25,7 +25,7 @@ if Object.const_defined?(:Gem)
 
     # Change these as appropriate
     s.name              = "vanilla"
-    s.version           = "1.9.15.1"
+    s.version           = "1.9.15.2"
     s.summary           = "A bliki-type web content thing."
     s.author            = "James Adam"
     s.email             = "james@lazyatom.com.com"

data/lib/vanilla/renderers/base.rb

@@ -27,7 +27,7 @@ module Vanilla
       end
       
       def self.snip_regexp
-        %r{(\{[^\}.]+\})}
+        %r{(\{[\w\-_\d]+(\s+[^\}.]+)?\})}
       end
     
       # Default behaviour to include a snip's content

data/test/snip_reference_test.rb

@@ -0,0 +1,47 @@
+require File.join(File.dirname(__FILE__), *%w[test_helper])
+
+class SnipReferenceTest < Vanilla::TestCase
+  def setup
+    super
+    create_snip :name => "test", :content => "snip content"
+  end
+  
+  should "match simple snips" do
+    assert_equal "rendering snip content", render("rendering {test}")
+  end
+  
+  should "match snips with an argument" do
+    assert_equal "rendering snip content", render("rendering {test arg1}")
+  end
+  
+  should "match snips with several arguments" do
+    assert_equal "rendering snip content", render("rendering {test arg1, arg2}")
+  end
+  
+  should "match snips with hyphens" do
+    create_snip :name => "test-snip", :content => "snip content"
+    assert_equal "rendering snip content", render("rendering {test-snip}")
+  end
+  
+  should "match snips with underscores" do
+    create_snip :name => "test_snip", :content => "snip content"
+    assert_equal "rendering snip content", render("rendering {test_snip}")
+  end
+  
+  should "match snips with numbers" do
+    create_snip :name => "test1", :content => "snip content"
+    assert_equal "rendering snip content", render("rendering {test1}")
+  end
+  
+  should "ignore references that are rubyish" do
+    assert_equal "10.times { |x| puts x }", render("10.times { |x| puts x }")
+    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)
+  end
+end

data/test/tmp/soup/current_snip.yml

@@ -1,6 +1,7 @@
 CurrentSnip--- # Soup attributes
-:updated_at: 2009-11-24 11:25:40.019881 +00:00
+:created_at: 2009-11-30 23:14:12.070423 +00:00
 :name: current_snip
+:updated_at: 2009-11-30 23:14:12.070425 +00:00
 :render_as: Ruby
 :usage: |-
   The current_snip dyna normally returns the result of rendering the snip named by the 
@@ -12,4 +13,3 @@ 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: 2009-11-24 11:25:40.019878 +00:00

data/test/tmp/soup/system.yml

@@ -1,5 +1,5 @@
 --- # Soup attributes
-:updated_at: 2009-11-24 11:25:40.020545 +00:00
+:created_at: 2009-11-30 23:14:12.071138 +00:00
 :name: system
+:updated_at: 2009-11-30 23:14:12.071141 +00:00
 :main_template: "{current_snip}"
-:created_at: 2009-11-24 11:25:40.020543 +00:00

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: vanilla
 version: !ruby/object:Gem::Version 
-  version: 1.9.15.1
+  version: 1.9.15.2
 platform: ruby
 authors: 
 - James Adam
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-24 00:00:00 +00:00
+date: 2009-11-30 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -122,7 +122,8 @@ files:
 - test/markdown_renderer_test.rb
 - test/raw_renderer_test.rb
 - test/ruby_renderer_test.rb
-- test/snip_parser_test.rb
+- test/snip_reference_parser_test.rb
+- test/snip_reference_test.rb
 - test/test_helper.rb
 - test/tmp/config.yml
 - test/tmp/soup/current_snip.yml