vanilla 1.12.4 → 1.12.5

data/Rakefile

@@ -24,7 +24,7 @@ if Object.const_defined?(:Gem)
 
     # Change these as appropriate
     s.name              = "vanilla"
-    s.version           = "1.12.4"
+    s.version           = "1.12.5"
     s.summary           = "A bliki-type web content thing."
     s.author            = "James Adam"
     s.email             = "james@lazyatom.com.com"
@@ -115,6 +115,11 @@ if Object.const_defined?(:Gem)
       raise "Unstaged changes still waiting to be committed"
     end
   end
+
+  desc "Tag and publish the gem to rubygems.org"
+  task :publish => :tag do
+    `gem push pkg/#{spec.name}-#{spec.version}.gem`
+  end
 else
   puts "Gem management tasks unavailable, as rubygems was not fully loaded."
 end

data/lib/vanilla/renderers/ruby.rb

@@ -27,10 +27,16 @@ module Vanilla::Renderers
         handler_klass.new
       end
       instance.enclosing_snip = @enclosing_snip if instance.respond_to?(:enclosing_snip)
-      if (method = app.request.method) && instance.respond_to?(method)
-        instance.send(method, *@args).to_s
+
+      if app.request && (method = app.request.method) && instance.respond_to?(method)
+        message = method
+      else
+        message = :handle
+      end
+      if @args.is_a?(Array)
+        instance.send(message, *@args).to_s
       else
-        instance.handle(*@args).to_s
+        instance.send(message, @args).to_s
       end
     end
   end

data/test/snip_reference_test.rb

@@ -34,8 +34,15 @@ class SnipReferenceTest < Vanilla::TestCase
   end
 
   should "match snips with ruby 1.9 style hashes" do
-    create_snip :name => "test", :content => "snip content"
-    assert_equal "rendering snip content", render("rendering {test x:1}")
+    create_snip :name => "test", :content => %{
+      class Blah
+        def handle(args)
+          args.inspect
+        end
+        self
+      end
+    }, :render_as => "Ruby"
+    assert_equal %{rendering {:x=>"1"}}, render("rendering {test x:1}")
   end
 
   should "ignore references that are rubyish" do

data/test/tmp/soup/current_snip.snip

@@ -1,6 +1,7 @@
 CurrentSnip
 
 :render_as: Ruby
+:name: current_snip
 :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
@@ -11,4 +12,3 @@ CurrentSnip
         {current_snip name}
         
       will output the name of the current snip, or the name of the snip currently being edited.
-:name: current_snip

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vanilla
 version: !ruby/object:Gem::Version 
-  hash: 47
+  hash: 45
   prerelease: false
   segments: 
   - 1
   - 12
-  - 4
-  version: 1.12.4
+  - 5
+  version: 1.12.5
 platform: ruby
 authors: 
 - James Adam