vanilla 1.11.0 → 1.11.1

data/Rakefile

@@ -24,7 +24,7 @@ if Object.const_defined?(:Gem)
 
     # Change these as appropriate
     s.name              = "vanilla"
-    s.version           = "1.11.0"
+    s.version           = "1.11.1"
     s.summary           = "A bliki-type web content thing."
     s.author            = "James Adam"
     s.email             = "james@lazyatom.com.com"
@@ -41,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.10")
+    s.add_dependency("soup", ">= 0.9.12")
     s.add_dependency("ratom", ">= 0.3.5")
     s.add_dependency("RedCloth", ">= 4.1.1")
     s.add_dependency("BlueCloth", ">= 1.0.0")

data/lib/vanilla/renderers/base.rb

@@ -5,31 +5,31 @@ module Vanilla
   module Renderers
     class Base
       include Routes
-      
+
       # Render a snip.
       def self.render(snip, part=:content)
         new(app).render(snip, part)
       end
-      
+
       def self.escape_curly_braces(str)
         str.gsub("{", "{").gsub("}", "}")
       end
-      
+
       attr_reader :app
-    
+
       def initialize(app)
         @app = app
       end
-      
+
       # defined for the routes
       def soup
         @app.soup
       end
-      
+
       def self.snip_regexp
         %r{(\{[\w\-_\d]+(\s+[^\}.]+)?\})}
       end
-    
+
       # Default behaviour to include a snip's content
       def include_snips(content, enclosing_snip)
         content.gsub(Vanilla::Renderers::Base.snip_regexp) do
@@ -38,7 +38,7 @@ module Vanilla
             snip_name = snip_tree.snip
             snip_attribute = snip_tree.attribute
             snip_args = snip_tree.arguments
-          
+
             # 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.
@@ -53,36 +53,36 @@ module Vanilla
           end
         end
       end
-      
+
       def parse_snip_reference(string)
         @parser ||= SnipReferenceParser.new
         @parser.parse(string)
       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)
         processed_text = render_without_including_snips(snip, part)
         include_snips(processed_text, snip)
       end
-      
+
       # Subclasses should override this to perform any actions required before
       # rendering
       def prepare(snip, part, args, enclosing_snip)
         # do nothing, by default
       end
-      
+
       def render_without_including_snips(snip, part=:content)
         process_text(raw_content(snip, part))
       end
-      
-      # Handles processing the text of the content. 
-      # Subclasses should override this method to do fancy text processing 
+
+      # Handles processing the text of the content.
+      # Subclasses should override this method to do fancy text processing
       # like markdown, or loading the content as Ruby code.
       def process_text(content)
         content
       end
-      
+
       # Returns the raw content for the selected part of the selected snip
       def raw_content(snip, part)
         snip.__send__((part || :content).to_sym)

data/test/snip_reference_test.rb

@@ -5,41 +5,41 @@ class SnipReferenceTest < Vanilla::TestCase
     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)

data/test/test_helper.rb

@@ -75,4 +75,8 @@ class Vanilla::TestCase < Test::Unit::TestCase
   def setup
     setup_clean_environment
   end
+
+  def test_nothing
+    # please, please stop complaining.
+  end
 end

data/test/tmp/soup/current_snip.yml

@@ -9,7 +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
+:updated_at: 2010-07-14 12:51:59.809435 +01:00
 :name: current_snip
-:created_at: 2010-06-10 15:00:13.119621 +01:00
+:created_at: 2010-07-14 12:51:59.809433 +01:00
+:render_as: Ruby

data/test/tmp/soup/system.yml

@@ -1,5 +1,5 @@
 --- # Soup attributes
-:updated_at: 2010-06-10 15:00:13.120125 +01:00
+:updated_at: 2010-07-14 12:51:59.809910 +01:00
 :name: system
+:created_at: 2010-07-14 12:51:59.809908 +01:00
 :main_template: "{current_snip}"
-:created_at: 2010-06-10 15:00:13.120123 +01:00

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 11
-  - 0
-  version: 1.11.0
+  - 1
+  version: 1.11.1
 platform: ruby
 authors: 
 - James Adam
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-10 00:00:00 +01:00
+date: 2010-07-14 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,8 +41,8 @@ dependencies:
         segments: 
         - 0
         - 9
-        - 10
-        version: 0.9.10
+        - 12
+        version: 0.9.12
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -174,12 +174,10 @@ files:
 - 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

data/test/soup/whatwhat.yml

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

data/test/tmp/soup/temp.yml

@@ -1,4 +0,0 @@
---- # 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