vanilla 1.9.14.1 → 1.9.14.3

data/Rakefile

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

data/lib/vanilla/dynasnips/comments.rb

@@ -6,23 +6,22 @@ class Comments < Dynasnip
   usage %|
     Embed comments within snips!
     
-    {comments <snip-name>}
+    {comments <false>}
     
     This will embed a list of comments, and a comment form, in a snip
     If the snip is being rendered within another snip, it will show a link to the snip,
-    with the number of comments.
+    with the number of comments. Add a parameter to disable new comments.
   |
 
-  def get(snip_name=nil, disable_new_comments=false)
-    snip_name = snip_name || app.request.params[:snip]
-    return usage if self.class.snip_name == snip_name
-    comments = app.soup.sieve(:commenting_on => snip_name)
-    comments_html = if app.request.snip_name == snip_name
+  def get(disable_new_comments=false)
+    return usage if self.class.snip_name == app.request.snip_name
+    comments = app.soup.sieve(:commenting_on => enclosing_snip.name)
+    comments_html = if app.request.snip_name == enclosing_snip.name
       rendered_comments = render_comments(comments)
-      rendered_comments += comment_form.gsub('SNIP_NAME', snip_name) unless disable_new_comments
+      rendered_comments += comment_form.gsub('SNIP_NAME', enclosing_snip.name) unless disable_new_comments
       rendered_comments
     else
-     %{<a href="#{url_to(snip_name)}">#{comments.length} comments for #{snip_name}</a>}
+     %{<a href="#{url_to(enclosing_snip.name)}">#{comments.length} comments for #{enclosing_snip.name}</a>}
     end
     return comments_html
   end
@@ -52,7 +51,7 @@ class Comments < Dynasnip
   def render_comments(comments)
     "<h2>Comments</h2><ol class='comments'>" + comments.map do |comment|
       rendered_comment = comment_template.gsub('COMMENT_CONTENT', app.render(comment)).
-                                          gsub('COMMENT_DATE', comment.created_at)
+                                          gsub('COMMENT_DATE', comment.created_at.to_s)
       author = comment.author
       author = "Anonymous" unless author && author != ""
       if comment.website && comment.website != ""

data/test/tmp/soup/current_snip.yml

@@ -1,5 +1,5 @@
 CurrentSnip--- # Soup attributes
-:updated_at: 2009-11-23 22:39:21.358609 +00:00
+:updated_at: 2009-11-24 10:47:54.395720 +00:00
 :name: current_snip
 :render_as: Ruby
 :usage: |-
@@ -12,4 +12,4 @@ 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-23 22:39:21.358607 +00:00
+:created_at: 2009-11-24 10:47:54.395718 +00:00

data/test/tmp/soup/system.yml

@@ -1,5 +1,5 @@
 --- # Soup attributes
-:updated_at: 2009-11-23 22:39:21.359623 +00:00
+:updated_at: 2009-11-24 10:47:54.396490 +00:00
 :name: system
 :main_template: "{current_snip}"
-:created_at: 2009-11-23 22:39:21.359619 +00:00
+:created_at: 2009-11-24 10:47:54.396487 +00:00

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: vanilla
 version: !ruby/object:Gem::Version 
-  version: 1.9.14.1
+  version: 1.9.14.3
 platform: ruby
 authors: 
 - James Adam
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-23 00:00:00 +00:00
+date: 2009-11-24 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency