vanilla 1.12.3 → 1.12.4

data/Rakefile

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

data/lib/vanilla/snip_reference.rb

@@ -1,8 +1,11 @@
+# Autogenerated from a Treetop grammar. Edits may be lost.
+
+
 module SnipReference
   include Treetop::Runtime
 
   def root
-    @root || :snip_call
+    @root ||= :snip_call
   end
 
   module SnipCall0
@@ -22,7 +25,10 @@ module SnipReference
     start_index = index
     if node_cache[:snip_call].has_key?(index)
       cached = node_cache[:snip_call][index]
-      @index = cached.interval.end if cached
+      if cached
+        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
       return cached
     end
 
@@ -85,11 +91,11 @@ module SnipReference
   end
 
   module SnipName0
-    def word
+    def word1
       elements[0]
     end
 
-    def word
+    def word2
       elements[2]
     end
   end
@@ -98,7 +104,10 @@ module SnipReference
     start_index = index
     if node_cache[:snip_name].has_key?(index)
       cached = node_cache[:snip_name][index]
-      @index = cached.interval.end if cached
+      if cached
+        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
       return cached
     end
 
@@ -166,7 +175,10 @@ module SnipReference
     start_index = index
     if node_cache[:argument_list].has_key?(index)
       cached = node_cache[:argument_list][index]
-      @index = cached.interval.end if cached
+      if cached
+        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
       return cached
     end
 
@@ -212,23 +224,38 @@ module SnipReference
     start_index = index
     if node_cache[:argument].has_key?(index)
       cached = node_cache[:argument][index]
-      @index = cached.interval.end if cached
+      if cached
+        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
       return cached
     end
 
     i0 = index
-    r1 = _nt_unquoted_words
-    r1.extend(NormalArgument)
+    r1 = _nt_hash_argument
+    r1.extend(HashArgument)
     if r1
       r0 = r1
     else
-      r2 = _nt_quoted_word
+      r2 = _nt_unquoted_words
       r2.extend(NormalArgument)
       if r2
         r0 = r2
       else
-        @index = i0
-        r0 = nil
+        r3 = _nt_quoted_word
+        r3.extend(NormalArgument)
+        if r3
+          r0 = r3
+        else
+          r4 = _nt_empty_argument
+          r4.extend(EmptyArgument)
+          if r4
+            r0 = r4
+          else
+            @index = i0
+            r0 = nil
+          end
+        end
       end
     end
 
@@ -247,7 +274,10 @@ module SnipReference
     start_index = index
     if node_cache[:argument_separator].has_key?(index)
       cached = node_cache[:argument_separator][index]
-      @index = cached.interval.end if cached
+      if cached
+        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
       return cached
     end
 
@@ -277,11 +307,186 @@ module SnipReference
     r0
   end
 
+  module HashArgument0
+    def word_or_symbol
+      elements[0]
+    end
+
+    def optional_spaces1
+      elements[1]
+    end
+
+    def hash_argument_separator
+      elements[2]
+    end
+
+    def optional_spaces2
+      elements[3]
+    end
+
+    def word
+      elements[4]
+    end
+  end
+
+  def _nt_hash_argument
+    start_index = index
+    if node_cache[:hash_argument].has_key?(index)
+      cached = node_cache[:hash_argument][index]
+      if cached
+        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    i0, s0 = index, []
+    r1 = _nt_word_or_symbol
+    s0 << r1
+    if r1
+      r2 = _nt_optional_spaces
+      s0 << r2
+      if r2
+        r3 = _nt_hash_argument_separator
+        s0 << r3
+        if r3
+          r4 = _nt_optional_spaces
+          s0 << r4
+          if r4
+            r5 = _nt_word
+            s0 << r5
+          end
+        end
+      end
+    end
+    if s0.last
+      r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+      r0.extend(HashArgument0)
+    else
+      @index = i0
+      r0 = nil
+    end
+
+    node_cache[:hash_argument][start_index] = r0
+
+    r0
+  end
+
+  def _nt_hash_argument_separator
+    start_index = index
+    if node_cache[:hash_argument_separator].has_key?(index)
+      cached = node_cache[:hash_argument_separator][index]
+      if cached
+        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    i0 = index
+    if has_terminal?("=>", false, index)
+      r1 = instantiate_node(SyntaxNode,input, index...(index + 2))
+      @index += 2
+    else
+      terminal_parse_failure("=>")
+      r1 = nil
+    end
+    if r1
+      r0 = r1
+    else
+      if has_terminal?(":", false, index)
+        r2 = instantiate_node(SyntaxNode,input, index...(index + 1))
+        @index += 1
+      else
+        terminal_parse_failure(":")
+        r2 = nil
+      end
+      if r2
+        r0 = r2
+      else
+        @index = i0
+        r0 = nil
+      end
+    end
+
+    node_cache[:hash_argument_separator][start_index] = r0
+
+    r0
+  end
+
+  def _nt_empty_argument
+    start_index = index
+    if node_cache[:empty_argument].has_key?(index)
+      cached = node_cache[:empty_argument][index]
+      if cached
+        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    r0 = _nt_optional_spaces
+
+    node_cache[:empty_argument][start_index] = r0
+
+    r0
+  end
+
+  module WordOrSymbol0
+    def word
+      elements[1]
+    end
+  end
+
+  def _nt_word_or_symbol
+    start_index = index
+    if node_cache[:word_or_symbol].has_key?(index)
+      cached = node_cache[:word_or_symbol][index]
+      if cached
+        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    i0, s0 = index, []
+    if has_terminal?('\G[:]', true, index)
+      r2 = true
+      @index += 1
+    else
+      r2 = nil
+    end
+    if r2
+      r1 = r2
+    else
+      r1 = instantiate_node(SyntaxNode,input, index...index)
+    end
+    s0 << r1
+    if r1
+      r3 = _nt_word
+      s0 << r3
+    end
+    if s0.last
+      r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+      r0.extend(WordOrSymbol0)
+    else
+      @index = i0
+      r0 = nil
+    end
+
+    node_cache[:word_or_symbol][start_index] = r0
+
+    r0
+  end
+
   def _nt_word
     start_index = index
     if node_cache[:word].has_key?(index)
       cached = node_cache[:word][index]
-      @index = cached.interval.end if cached
+      if cached
+        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
       return cached
     end
 
@@ -308,14 +513,17 @@ module SnipReference
     start_index = index
     if node_cache[:unquoted_word].has_key?(index)
       cached = node_cache[:unquoted_word][index]
-      @index = cached.interval.end if cached
+      if cached
+        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
       return cached
     end
 
     s0, i0 = [], index
     loop do
       if has_terminal?('\G[a-zA-Z0-9_\\-]', true, index)
-        r1 = instantiate_node(SyntaxNode,input, index...(index + 1))
+        r1 = true
         @index += 1
       else
         r1 = nil
@@ -348,7 +556,10 @@ module SnipReference
     start_index = index
     if node_cache[:quoted_word].has_key?(index)
       cached = node_cache[:quoted_word][index]
-      @index = cached.interval.end if cached
+      if cached
+        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
       return cached
     end
 
@@ -433,14 +644,17 @@ module SnipReference
     start_index = index
     if node_cache[:unquoted_words].has_key?(index)
       cached = node_cache[:unquoted_words][index]
-      @index = cached.interval.end if cached
+      if cached
+        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
       return cached
     end
 
     s0, i0 = [], index
     loop do
       if has_terminal?('\G[a-zA-Z0-9_\\- ]', true, index)
-        r1 = instantiate_node(SyntaxNode,input, index...(index + 1))
+        r1 = true
         @index += 1
       else
         r1 = nil
@@ -467,14 +681,17 @@ module SnipReference
     start_index = index
     if node_cache[:optional_spaces].has_key?(index)
       cached = node_cache[:optional_spaces][index]
-      @index = cached.interval.end if cached
+      if cached
+        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
       return cached
     end
 
     s0, i0 = [], index
     loop do
       if has_terminal?('\G[ ]', true, index)
-        r1 = instantiate_node(SyntaxNode,input, index...(index + 1))
+        r1 = true
         @index += 1
       else
         r1 = nil
@@ -496,14 +713,17 @@ module SnipReference
     start_index = index
     if node_cache[:spaces].has_key?(index)
       cached = node_cache[:spaces][index]
-      @index = cached.interval.end if cached
+      if cached
+        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
       return cached
     end
 
     s0, i0 = [], index
     loop do
       if has_terminal?('\G[ ]', true, index)
-        r1 = instantiate_node(SyntaxNode,input, index...(index + 1))
+        r1 = true
         @index += 1
       else
         r1 = nil

data/lib/vanilla/snip_reference.treetop

@@ -15,7 +15,8 @@ grammar SnipReference
   rule argument
     hash_argument <HashArgument> /
     unquoted_words <NormalArgument> /
-    quoted_word <NormalArgument>
+    quoted_word <NormalArgument> /
+    empty_argument <EmptyArgument>
   end
 
   rule argument_separator
@@ -31,6 +32,10 @@ grammar SnipReference
     ":"
   end
 
+  rule empty_argument
+    optional_spaces
+  end
+
   rule word_or_symbol
    [:]? word
   end

data/lib/vanilla/snip_reference_parser.rb

@@ -60,6 +60,11 @@ module SnipReference
       [text_value]
     end
   end
+  module EmptyArgument
+    def to_arguments
+      [nil]
+    end
+  end
 end
 
 require 'treetop'

data/test/snip_reference_parser_test.rb

@@ -16,6 +16,8 @@ class SnipReferenceParserTest < Test::Unit::TestCase
     %|{snip arg1, arg2}|                       => {:snip => 'snip', :attribute => nil, :arguments => ['arg1', 'arg2']},
     %|{snip "argument with spaces", arg2}|     => {:snip => 'snip', :attribute => nil, :arguments => ['argument with spaces', 'arg2']},
     %|{"snip with spaces" arg1, arg2}|         => {:snip => 'snip with spaces', :attribute => nil, :arguments => ['arg1', 'arg2']},
+    %|{snip arg1,,arg3}|                       => {:snip => 'snip', :attribute => nil, :arguments => ['arg1', nil, 'arg3']},
+    %|{snip arg1, ,arg3}|                      => {:snip => 'snip', :attribute => nil, :arguments => ['arg1', nil, 'arg3']},
     %|{snip.snip_attribute}|                   => {:snip => 'snip', :attribute => 'snip_attribute', :arguments => []},
     %|{snip."spaced attribute"}|               => {:snip => 'snip', :attribute => 'spaced attribute', :arguments => []},
     %|{"snip with spaces".attribute}|          => {:snip => 'snip with spaces', :attribute => 'attribute', :arguments => []},

data/test/snip_reference_test.rb

@@ -33,6 +33,11 @@ class SnipReferenceTest < Vanilla::TestCase
     assert_equal "rendering snip content", render("rendering {test1}")
   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}")
+  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 }")

data/test/tmp/soup/current_snip.snip

@@ -1,7 +1,6 @@
 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
@@ -12,3 +11,4 @@ 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: 33
+  hash: 47
   prerelease: false
   segments: 
   - 1
   - 12
-  - 3
-  version: 1.12.3
+  - 4
+  version: 1.12.4
 platform: ruby
 authors: 
 - James Adam