vanilla 1.16 → 1.16.1

data/bin/vanilla

@@ -12,26 +12,48 @@ def create(new_app_dir)
   puts File.readlines(File.join(new_app_dir, "README"))[0..16].join
 end
 
+def upgrade
+  require 'fileutils'
+  confirm("Upgrade system snips?") do
+    pristine_system = File.expand_path("../../pristine_app/soups/system", __FILE__)
+    copy(pristine_system, File.join(Dir.pwd, "soups"))
+  end
+  confirm("Upgrade tutorial snips?") do
+    pristine_system = File.expand_path("../../pristine_app/soups/tutorial", __FILE__)
+    copy(pristine_system, File.join(Dir.pwd, "soups"))
+  end
+end
+
+def confirm(message)
+  print(message + " [y/n]: ")
+  if gets.strip =~ /^[yY]$/
+    yield
+  else
+    puts "skipping."
+  end
+end
+
+def copy(source, destination)
+  puts "Copying: #{source} => #{destination}"
+  FileUtils.cp_r(source, destination)
+end
+
 def console
   $LOAD_PATH << "lib"
   require "rubygems"
   require "bundler/setup"
   require "irb"
   require "vanilla/console"
-  ARGV.clear
   puts "The Soup is simmering."
   IRB.start 
 end
 
-def upgrade
-  # TODO
-  puts "TODO, but should be easier thanks to multi-space soup."
-end
-
 case ARGV[0]
 when "console"
+  ARGV.clear
   console
 when "upgrade"
+  ARGV.clear
   upgrade
 else
   create(ARGV[0])

data/lib/vanilla.rb

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

data/lib/vanilla/renderers/base.rb

@@ -26,7 +26,7 @@ module Vanilla
       end
 
       def self.snip_regexp
-        %r{(\{[\w\-_\d\.\"\'\s]+(\s+[^\}.]+)?\})}
+        %r{(\{[\w\-_\d\.\"\' ]+( +[^\}.]+)?\})}
       end
 
       def default_layout_snip

data/pristine_app/Gemfile.lock

@@ -1,29 +1,29 @@
 PATH
   remote: /Users/james/Code/lazyatom/vanilla-rb
   specs:
-    vanilla (1.14.1)
+    vanilla (1.16)
       BlueCloth (>= 1.0.0)
       RedCloth (>= 4.1.1)
       haml
+      parslet (>= 1.2.0)
       rack (>= 0.9.1)
       ratom (>= 0.3.5)
       soup (>= 1.0.6)
-      treetop (>= 1.4.1)
 
 GEM
   remote: http://rubygems.org/
   specs:
     BlueCloth (1.0.1)
     RedCloth (4.2.7)
+    blankslate (2.1.2.4)
     haml (3.1.1)
-    libxml-ruby (2.0.2)
-    polyglot (0.3.1)
+    libxml-ruby (2.0.4)
+    parslet (1.2.0)
+      blankslate (~> 2.0)
     rack (1.2.2)
-    ratom (0.6.7)
+    ratom (0.6.8)
       libxml-ruby (>= 1.1.2)
     soup (1.0.6)
-    treetop (1.4.9)
-      polyglot (>= 0.3.1)
 
 PLATFORMS
   ruby

data/pristine_app/config.ru

@@ -8,7 +8,7 @@ require 'vanilla'
 # doesn't affect their URL structure on the site (everything is flat).
 soups = [
   "soups/base",
-  "soups/dynasnips"
+  "soups/system"
 ]
 
 # If you don't want the tutorial on your site, remove this and delete the directory

data/pristine_app/soups/tutorial/tutorial-links.snip

@@ -1,4 +1,4 @@
-{link_to tutorial}
-{link_to tutorial-layout}
-{link_to tutorial-renderers}
-{link_to tutorial-dynasnips}
+{link_to tutorial, "Basics"}
+{link_to tutorial-layout, "Learn about Layouts"}
+{link_to tutorial-renderers, "Renderer fun"}
+{link_to tutorial-dynasnips, "More about Dynasnips"}

data/pristine_app/soups/tutorial/tutorial-renderers.snip.markdown

@@ -9,7 +9,7 @@ In its simplest form, this means that some content can be written in one format
 
 This is one of the principle drivers behind {link_to vanilla-rb}; you shouldn't have to make an upfront decision about how best to structure your all of your content.
 
-This has been covered generally in the {link_to tutorial, main tutorial}, but here we'll go into a bit more detail.
+This has been covered generally in the {link_to tutorial, "main tutorial"}, but here we'll go into a bit more detail.
 
 Defining a renderer for a snip
 -------------------

data/test/dynasnips/link_to_current_snip_test.rb

@@ -1,5 +1,5 @@
 require "test_helper"
-$LOAD_PATH.unshift File.expand_path("../../../pristine_app/soups/dynasnips", __FILE__)
+$LOAD_PATH.unshift File.expand_path("../../../pristine_app/soups/system", __FILE__)
 require "link_to_current_snip"
 
 context "The link_to_current_snip dynasnip" do

data/test/dynasnips/link_to_test.rb

@@ -1,5 +1,5 @@
 require "test_helper"
-$LOAD_PATH.unshift File.expand_path("../../../pristine_app/soups/dynasnips", __FILE__)
+$LOAD_PATH.unshift File.expand_path("../../../pristine_app/soups/system", __FILE__)
 require "link_to"
 
 context "The link_to dynasnip" do

data/test/dynasnips/page_title_test.rb

@@ -1,5 +1,5 @@
 require "test_helper"
-$LOAD_PATH.unshift File.expand_path("../../../pristine_app/soups/dynasnips", __FILE__)
+$LOAD_PATH.unshift File.expand_path("../../../pristine_app/soups/system", __FILE__)
 require "page_title"
 
 context "The page_title dynasnip" do

data/test/snip_inclusion_test.rb

@@ -49,6 +49,10 @@ context "When including snips in other snips" do
     assert_equal "10.times {|x| puts x }", render("10.times {|x| puts x }")
   end
 
+  should "ignore references that contain newlines" do
+    assert_equal "{\nnot a dyna\n}", render("{\nnot a dyna\n}")
+  end
+
   def render(content)
     snip = create_snip :name => "test-content", :content => content
     Vanilla::Renderers::Base.new(@app).render(snip)

data/test/test_helper.rb

@@ -14,7 +14,7 @@ module Vanilla
       clean_environment
       @app = Vanilla::App.new(:soup => soup_path)
 
-      require File.expand_path("../../pristine_app/soups/dynasnips/current_snip", __FILE__)
+      require File.expand_path("../../pristine_app/soups/system/current_snip", __FILE__)
       @app.soup << CurrentSnip.snip_attributes
       create_snip :name => "layout", :content => "{current_snip}"
     end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vanilla
 version: !ruby/object:Gem::Version 
-  hash: 47
+  hash: 85
   prerelease: false
   segments: 
   - 1
   - 16
-  version: "1.16"
+  - 1
+  version: 1.16.1
 platform: ruby
 authors: 
 - James Adam
@@ -209,18 +210,18 @@ files:
 - pristine_app/README
 - pristine_app/soups/base/layout.snip
 - pristine_app/soups/base/start.snip
-- pristine_app/soups/dynasnips/current_snip.rb
-- pristine_app/soups/dynasnips/debug.rb
-- pristine_app/soups/dynasnips/index.rb
-- pristine_app/soups/dynasnips/link_to.rb
-- pristine_app/soups/dynasnips/link_to_current_snip.rb
-- pristine_app/soups/dynasnips/page_title.rb
-- pristine_app/soups/dynasnips/pre.rb
-- pristine_app/soups/dynasnips/raw.rb
 - pristine_app/soups/extras/comments.rb
 - pristine_app/soups/extras/kind.rb
 - pristine_app/soups/extras/rand.rb
 - pristine_app/soups/extras/url_to.rb
+- pristine_app/soups/system/current_snip.rb
+- pristine_app/soups/system/debug.rb
+- pristine_app/soups/system/index.rb
+- pristine_app/soups/system/link_to.rb
+- pristine_app/soups/system/link_to_current_snip.rb
+- pristine_app/soups/system/page_title.rb
+- pristine_app/soups/system/pre.rb
+- pristine_app/soups/system/raw.rb
 - pristine_app/soups/tutorial/bad_dynasnip.snip
 - pristine_app/soups/tutorial/hello_world.snip
 - pristine_app/soups/tutorial/markdown_example.snip
@@ -237,6 +238,7 @@ files:
 - pristine_app/soups/tutorial/tutorial.snip.markdown
 - pristine_app/soups/tutorial/vanilla-rb.snip
 - pristine_app/soups/tutorial/vanilla.snip
+- pristine_app/tmp/restart.txt
 has_rdoc: true
 homepage: http://github.com/lazyatom/vanilla-rb
 licenses: []