vanilla 1.9.14.3 → 1.9.15.1

data/Rakefile

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

data/lib/vanilla/snip_reference.treetop

@@ -13,6 +13,7 @@ grammar SnipReference
   end
 
   rule argument
+    hash_argument <HashArgument> /
     unquoted_words <NormalArgument> /
     quoted_word <NormalArgument>
   end
@@ -21,6 +22,19 @@ grammar SnipReference
     "," optional_spaces
   end
 
+  rule hash_argument
+    word_or_symbol optional_spaces hash_argument_separator optional_spaces word
+  end
+
+  rule hash_argument_separator
+    "=>" /
+    ":"
+  end
+
+  rule word_or_symbol
+   [:]? word
+  end
+
   rule word
     unquoted_word / quoted_word
   end

data/lib/vanilla/snip_reference_parser.rb

@@ -40,10 +40,21 @@ module SnipReference
   module ArgumentList
     def to_arguments
       args = elements[0].to_arguments
-      args << elements[1].elements[1].to_arguments if elements[1].elements
+      if args.is_a?(Array)
+        args << elements[1].elements[1].to_arguments if elements[1].elements
+      elsif args.is_a?(Hash)
+        args.merge!(elements[1].elements[1].to_arguments) if elements[1].elements
+      end
       args
     end
   end
+  module HashArgument
+    def to_arguments
+      key = elements[0].text_value
+      key = $1 if key =~ /\A:(.*)\Z/
+      {key.to_sym => elements[4].text_value}
+    end
+  end
   module NormalArgument
     def to_arguments
       [text_value]
@@ -52,60 +63,4 @@ module SnipReference
 end
 
 require 'treetop'
-require 'vanilla/snip_reference'
-
-
-if __FILE__ == $0
-
-Treetop.load "vanilla/snip_reference"
-require 'test/unit'
-
-class SnipReferenceParserTest < Test::Unit::TestCase
-  examples = {
-    %|{snip}|                               => {:snip => 'snip', :attribute => nil, :arguments => []},
-    %|{snip argument}|                      => {:snip => 'snip', :attribute => nil, :arguments => ["argument"]},
-    %|{"snip with spaces"}|                 => {:snip => 'snip with spaces', :attribute => nil, :arguments => []},
-    %|{snip-with-dashes}|                   => {:snip => 'snip-with-dashes', :attribute => nil, :arguments => []},
-    %|{snip_with_underscores}|              => {:snip => 'snip_with_underscores', :attribute => nil, :arguments => []},
-    %|{"snip with spaces" argument}|        => {:snip => 'snip with spaces', :attribute => nil, :arguments => ['argument']},
-    %|{'snip with spaces' argument}|        => {:snip => 'snip with spaces', :attribute => nil, :arguments => ['argument']},
-    %|{snip "argument with spaces"}|        => {:snip => 'snip', :attribute => nil, :arguments => ['argument with spaces']},
-    %|{snip 'argument with spaces'}|        => {:snip => 'snip', :attribute => nil, :arguments => ['argument with spaces']},
-    %|{snip arg1,arg2}|                     => {:snip => 'snip', :attribute => nil, :arguments => ['arg1', 'arg2']},
-    %|{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.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 => []},
-    %|{snip.snip_attribute arg}|            => {:snip => 'snip', :attribute => 'snip_attribute', :arguments => ['arg']},
-    %|{snip arg with spaces}|               => {:snip => 'snip', :attribute => nil, :arguments => ['arg with spaces']},
-    %|{snip arg with spaces, another arg}|  => {:snip => 'snip', :attribute => nil, :arguments => ['arg with spaces', 'another arg']},
-    # %|{snip key1:value1,key2:value2}| => {:snip => 'snip', :arguments => {:key1 => 'value1', :key2 => 'value2'}},
-    # %|{snip key1:value1, key2:value2}| => {:snip => 'snip', :arguments => {:key}},
-    # %|{snip key1: value1, key2: value2}|,
-    # %|{snip key1 => value1, key2 => value2}|,
-    # %|{snip :key1 => value1, :key2 => value2}|,
-    # %|{snip key1:"value with spaces"}|,
-    # %|{snip key1 => "value with spaces"}|   => {:snip => 'snip', :arguments => {:key1 => "value with spaces"}}
-  }
-  
-  def setup
-    @parser = SnipReferenceParser.new
-  end
-  
-  examples.each do |example, expected|
-    define_method :"test_parsing_#{example}" do
-      reference = @parser.parse(example)
-      if reference
-        assert_equal expected[:snip],      reference.snip
-        assert_equal expected[:attribute], reference.attribute
-        assert_equal expected[:arguments], reference.arguments
-      else
-        flunk "failed to parse: #{example}"
-      end
-    end
-  end
-end
-
-end
+require 'vanilla/snip_reference'

data/test/snip_parser_test.rb

@@ -0,0 +1,53 @@
+require File.join(File.dirname(__FILE__), *%w[test_helper])
+Treetop.load File.join(File.dirname(__FILE__), *%w[.. lib vanilla snip_reference])
+
+class SnipReferenceParserTest < Test::Unit::TestCase
+  examples = {
+    %|{snip}|                                  => {:snip => 'snip', :attribute => nil, :arguments => []},
+    %|{snip argument}|                         => {:snip => 'snip', :attribute => nil, :arguments => ["argument"]},
+    %|{"snip with spaces"}|                    => {:snip => 'snip with spaces', :attribute => nil, :arguments => []},
+    %|{snip-with-dashes}|                      => {:snip => 'snip-with-dashes', :attribute => nil, :arguments => []},
+    %|{snip_with_underscores}|                 => {:snip => 'snip_with_underscores', :attribute => nil, :arguments => []},
+    %|{"snip with spaces" argument}|           => {:snip => 'snip with spaces', :attribute => nil, :arguments => ['argument']},
+    %|{'snip with spaces' argument}|           => {:snip => 'snip with spaces', :attribute => nil, :arguments => ['argument']},
+    %|{snip "argument with spaces"}|           => {:snip => 'snip', :attribute => nil, :arguments => ['argument with spaces']},
+    %|{snip 'argument with spaces'}|           => {:snip => 'snip', :attribute => nil, :arguments => ['argument with spaces']},
+    %|{snip arg1,arg2}|                        => {:snip => 'snip', :attribute => nil, :arguments => ['arg1', 'arg2']},
+    %|{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.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 => []},
+    %|{snip.snip_attribute arg}|               => {:snip => 'snip', :attribute => 'snip_attribute', :arguments => ['arg']},
+    %|{snip arg with spaces}|                  => {:snip => 'snip', :attribute => nil, :arguments => ['arg with spaces']},
+    %|{snip arg with spaces, another arg}|     => {:snip => 'snip', :attribute => nil, :arguments => ['arg with spaces', 'another arg']},
+    %|{snip key1=>value1, key2 => value2}|     => {:snip => 'snip', :arguments => {:key1 => 'value1', :key2 => 'value2'}},
+    %|{snip.attribute key1=>value1}|           => {:snip => 'snip', :attribute => 'attribute', :arguments => {:key1 => 'value1'}},
+    %|{snip key1 => value1, key2 => value2}|   => {:snip => 'snip', :arguments => {:key1 => 'value1', :key2 => 'value2'}},
+    %|{snip :key1 => value1, :key2 => value2}| => {:snip => 'snip', :arguments => {:key1 => 'value1', :key2 => 'value2'}},
+    %|{snip key1 => "value with spaces"}|      => {:snip => 'snip', :arguments => {:key1 => "value with spaces"}},
+    # %|{snip "key with spaces" => value} |      => {:snip => 'snip', :arguments => {:"key with spaces" => "value"}},
+    %|{snip key1:value1,key2:value2}|          => {:snip => 'snip', :arguments => {:key1 => 'value1', :key2 => 'value2'}},
+    %|{snip key1:value1, key2:value2}|         => {:snip => 'snip', :arguments => {:key1 => 'value1', :key2 => 'value2'}},
+    %|{snip key1: value1, key2: value2}|       => {:snip => 'snip', :arguments => {:key1 => 'value1', :key2 => 'value2'}},
+    %|{snip key1:"value with spaces"}|         => {:snip => 'snip', :arguments => {:key1 => 'value with spaces'}}
+  }
+  
+  def setup
+    @parser = SnipReferenceParser.new
+  end
+  
+  examples.each do |example, expected|
+    define_method :"test_parsing_#{example}" do
+      reference = @parser.parse(example)
+      if reference
+        assert_equal expected[:snip],      reference.snip
+        assert_equal expected[:attribute], reference.attribute
+        assert_equal expected[:arguments], reference.arguments
+      else
+        flunk "failed to parse: #{example}"
+      end
+    end
+  end
+end

data/test/tmp/soup/current_snip.yml

@@ -1,5 +1,5 @@
 CurrentSnip--- # Soup attributes
-:updated_at: 2009-11-24 10:47:54.395720 +00:00
+:updated_at: 2009-11-24 11:25:40.019881 +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-24 10:47:54.395718 +00:00
+: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 10:47:54.396490 +00:00
+:updated_at: 2009-11-24 11:25:40.020545 +00:00
 :name: system
 :main_template: "{current_snip}"
-:created_at: 2009-11-24 10:47:54.396487 +00:00
+: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.14.3
+  version: 1.9.15.1
 platform: ruby
 authors: 
 - James Adam
@@ -122,6 +122,7 @@ files:
 - test/markdown_renderer_test.rb
 - test/raw_renderer_test.rb
 - test/ruby_renderer_test.rb
+- test/snip_parser_test.rb
 - test/test_helper.rb
 - test/tmp/config.yml
 - test/tmp/soup/current_snip.yml