vanilla 1.16.1 → 1.16.2

data/Rakefile

@@ -36,9 +36,10 @@ if Object.const_defined?(:Gem)
     s.rdoc_options      = %w(--main README)
 
     # Add any extra files to include in the gem
-    s.files             = %w(Rakefile README) + Dir.glob("{test,lib,bin,pristine_app}/**/*")
+    s.files             = %w(Rakefile README .gemtest) + Dir.glob("{lib,bin,pristine_app}/**/*")
     s.executables       = ['vanilla']
     s.require_paths     = ["lib"]
+    s.test_files        = Dir.glob("test/**/*")
 
     # All the other gems we need.
     s.add_dependency("rack", ">= 0.9.1")

data/lib/vanilla.rb

@@ -1,5 +1,5 @@
 module Vanilla
-  VERSION = "1.16.1"
+  VERSION = "1.16.2"
 
   autoload :Renderers, "vanilla/renderers"
   autoload :App, "vanilla/app"

data/lib/vanilla/renderers/base.rb

@@ -55,7 +55,7 @@ module Vanilla
               render_missing_snip(snip_name)
             end
           else
-            "malformed snip reference: #{$1.inspect}"
+            %|<span class="malformed_snip_inclusion">(malformed snip inclusion: #{self.class.escape_curly_braces($1)})</span>|
           end
         end
       end
@@ -63,6 +63,8 @@ module Vanilla
       def parse_snip_reference(string)
         @parser ||= Vanilla::SnipReferenceParser.new
         @parser.parse(string)
+      rescue
+        nil
       end
 
       def render_missing_snip(snip_name)

data/lib/vanilla/snip_reference_parser.rb

@@ -40,7 +40,11 @@ module Vanilla
       rule(:single_quoted_string) do
         squote >> (quotables | dquote).repeat(1).as(:string) >> squote
       end
+      rule(:spaced_string) { (word >> (spaces >> word).repeat).as(:string) }
       rule(:string) do
+        single_quoted_string | double_quoted_string | str("nil").as(:nil) | spaced_string | word.as(:string)
+      end
+      rule(:string_without_spaces) do
         single_quoted_string | double_quoted_string | str("nil").as(:nil) | word.as(:string)
       end
       rule(:symbol) { str(":") >> string }
@@ -62,7 +66,7 @@ module Vanilla
       rule(:further_named_args) { comma_separator >> named_arg.as(:named_arg) }
 
       rule(:arguments) { hash_arg_list | named_arg_list | string_arg_list }
-      rule(:snip_part) { string.as(:snip) >> (dot >> string.as(:attribute)).maybe }
+      rule(:snip_part) { string_without_spaces.as(:snip) >> (dot >> string_without_spaces.as(:attribute)).maybe }
 
       rule(:snip_reference) do
         left_brace >> spaces? >>

data/pristine_app/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/james/Code/lazyatom/vanilla-rb
   specs:
-    vanilla (1.16)
+    vanilla (1.16.1)
       BlueCloth (>= 1.0.0)
       RedCloth (>= 4.1.1)
       haml

data/pristine_app/public/vanilla.css

@@ -12,4 +12,8 @@ pre {
   margin-left: 1em;
   background-color: #ddd;
   padding: 1em;
+}
+
+.malformed_snip_inclusion {
+  background-color: rgba(180,0,0,0.2);
 }

data/pristine_app/soups/tutorial/test.snip

@@ -25,6 +25,8 @@ How about some {link_to debug} information: {debug}
 
 What about a missing snip? Lets try to include one: {monkey}
 
+What about some jibberish snip inclusion? {link_to something !mental}
+
 And an error when running? {bad_dynasnip}
 
 :render_as: Markdown

data/test/snip_inclusion_test.rb

@@ -53,6 +53,12 @@ context "When including snips in other snips" do
     assert_equal "{\nnot a dyna\n}", render("{\nnot a dyna\n}")
   end
 
+  should "render malformed snip inclusions for easier debugging" do
+    create_snip :name => "some_dyna"
+    assert_equal %|this is a <span class="malformed_snip_inclusion">(malformed snip inclusion: &#123;some_dyna blah! blah&#125;)</span>|,
+      render("this is a {some_dyna blah! blah}")
+  end
+
   def render(content)
     snip = create_snip :name => "test-content", :content => content
     Vanilla::Renderers::Base.new(@app).render(snip)

data/test/snip_reference_parser_test.rb

@@ -46,8 +46,8 @@ context "The SnipReference parser" do
     },
 
     :arguments_with_spaces => {
-      # %|{snip arg spaces}|           => {:snip => 'snip', :attribute => nil, :arguments => ['arg spaces']},
-      # %|{snip arg spaces, and this}| => {:snip => 'snip', :attribute => nil, :arguments => ['arg spaces', 'and this']},
+      %|{snip arg spaces}|           => {:snip => 'snip', :attribute => nil, :arguments => ['arg spaces']},
+      %|{snip arg spaces, and this}| => {:snip => 'snip', :attribute => nil, :arguments => ['arg spaces', 'and this']},
       %|{snip "arg spaces"}|         => {:snip => 'snip', :attribute => nil, :arguments => ['arg spaces']},
       %|{snip 'arg spaces'}|         => {:snip => 'snip', :attribute => nil, :arguments => ['arg spaces']},
       %|{snip "arg spaces", arg2}|   => {:snip => 'snip', :attribute => nil, :arguments => ['arg spaces', 'arg2']}
@@ -64,7 +64,7 @@ context "The SnipReference parser" do
       %|{s :key1 => value1, :key2 => value2}| => {:snip => 's', :arguments => {:key1 => 'value1', :key2 => 'value2'}},
       %|{s key1 => "value with spaces"}|      => {:snip => 's', :arguments => {:key1 => "value with spaces"}},
       %|{s.attr key1=>value1}|                => {:snip => 's', :attribute => 'attr', :arguments => {:key1 => 'value1'}},
-      # %|{s "key with spaces" => value}|       => {:snip => 's', :arguments => {:"key with spaces" => "value"}}
+      %|{s "key with spaces" => value}|       => {:snip => 's', :arguments => {:"key with spaces" => "value"}}
     },
 
     :named_arguments => {

data/test/test_helper.rb

@@ -1,7 +1,3 @@
-require 'rubygems'
-require 'bundler/setup'
-$:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
-
 require "kintama"
 require "kintama/mocha"
 require "fileutils"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vanilla
 version: !ruby/object:Gem::Version 
-  hash: 85
-  prerelease: false
+  hash: 83
+  prerelease: 
   segments: 
   - 1
   - 16
-  - 1
-  version: 1.16.1
+  - 2
+  version: 1.16.2
 platform: ruby
 authors: 
 - James Adam
@@ -15,12 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-03 00:00:00 +01:00
+date: 2011-05-04 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
   name: rack
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -33,10 +31,10 @@ dependencies:
         - 9
         - 1
         version: 0.9.1
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :runtime
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
   name: soup
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -49,10 +47,10 @@ dependencies:
         - 0
         - 6
         version: 1.0.6
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :runtime
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
   name: ratom
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -65,10 +63,10 @@ dependencies:
         - 3
         - 5
         version: 0.3.5
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :runtime
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
   name: RedCloth
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -81,10 +79,10 @@ dependencies:
         - 1
         - 1
         version: 4.1.1
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :runtime
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
   name: BlueCloth
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -97,10 +95,10 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :runtime
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
   name: haml
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -111,10 +109,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :runtime
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
   name: parslet
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -127,10 +125,10 @@ dependencies:
         - 2
         - 0
         version: 1.2.0
+  prerelease: false
+  type: :runtime
   requirement: *id007
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :development
   name: kintama
   version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
@@ -143,10 +141,10 @@ dependencies:
         - 1
         - 6
         version: 0.1.6
-  requirement: *id008
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
+  requirement: *id008
+- !ruby/object:Gem::Dependency 
   name: mocha
   version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
@@ -157,6 +155,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :development
   requirement: *id009
 description: 
 email: james@lazyatom.com.com
@@ -169,22 +169,7 @@ extra_rdoc_files:
 files: 
 - Rakefile
 - README
-- test/dynasnip_test.rb
-- test/dynasnips/link_to_current_snip_test.rb
-- test/dynasnips/link_to_test.rb
-- test/dynasnips/page_title_test.rb
-- test/renderers/base_renderer_test.rb
-- test/renderers/erb_renderer_test.rb
-- test/renderers/haml_renderer_test.rb
-- test/renderers/markdown_renderer_test.rb
-- test/renderers/raw_renderer_test.rb
-- test/renderers/ruby_renderer_test.rb
-- test/snip_inclusion_test.rb
-- test/snip_reference_parser_test.rb
-- test/test_helper.rb
-- test/vanilla_app_test.rb
-- test/vanilla_presenting_test.rb
-- test/vanilla_request_test.rb
+- .gemtest
 - lib/vanilla/app.rb
 - lib/vanilla/console.rb
 - lib/vanilla/dynasnip.rb
@@ -239,6 +224,22 @@ files:
 - pristine_app/soups/tutorial/vanilla-rb.snip
 - pristine_app/soups/tutorial/vanilla.snip
 - pristine_app/tmp/restart.txt
+- test/dynasnip_test.rb
+- test/dynasnips/link_to_current_snip_test.rb
+- test/dynasnips/link_to_test.rb
+- test/dynasnips/page_title_test.rb
+- test/renderers/base_renderer_test.rb
+- test/renderers/erb_renderer_test.rb
+- test/renderers/haml_renderer_test.rb
+- test/renderers/markdown_renderer_test.rb
+- test/renderers/raw_renderer_test.rb
+- test/renderers/ruby_renderer_test.rb
+- test/snip_inclusion_test.rb
+- test/snip_reference_parser_test.rb
+- test/test_helper.rb
+- test/vanilla_app_test.rb
+- test/vanilla_presenting_test.rb
+- test/vanilla_request_test.rb
 has_rdoc: true
 homepage: http://github.com/lazyatom/vanilla-rb
 licenses: []
@@ -270,9 +271,24 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: vanilla
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: A bliki-type web content thing.
-test_files: []
-
+test_files: 
+- test/dynasnip_test.rb
+- test/dynasnips/link_to_current_snip_test.rb
+- test/dynasnips/link_to_test.rb
+- test/dynasnips/page_title_test.rb
+- test/renderers/base_renderer_test.rb
+- test/renderers/erb_renderer_test.rb
+- test/renderers/haml_renderer_test.rb
+- test/renderers/markdown_renderer_test.rb
+- test/renderers/raw_renderer_test.rb
+- test/renderers/ruby_renderer_test.rb
+- test/snip_inclusion_test.rb
+- test/snip_reference_parser_test.rb
+- test/test_helper.rb
+- test/vanilla_app_test.rb
+- test/vanilla_presenting_test.rb
+- test/vanilla_request_test.rb