vanilla 1.17.9 → 1.17.10

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c3c486da19dbbc056c78f83ba44affb6c6fd5e7e
+  data.tar.gz: cad5d237eed4df207bfcd6b9bc7d8feda1a89714
+SHA512:
+  metadata.gz: 49be8c6d093636fd561742a6da257fb2706d7f8bf8aa383f074cda252a8b9b4be5ea2215084186995ea42f8679579d6f45e6e9b8bd7973df61d122726299bd0c
+  data.tar.gz: 57aa8e6f6ae4979befe5d3282aad9d7db7642dc1c539ff9b9d1b27e7f25f1018ee14dd33c80877bf3db04d175a590e8f0cc42fde31285d2142d04932ee03e479

data/lib/vanilla.rb

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

data/lib/vanilla/app.rb

@@ -27,7 +27,7 @@ module Vanilla
 
     def initialize
       @renderers = Hash.new { config.default_renderer }
-      @soup = prepare_soup
+      @soup = config.soup || prepare_soup
       prepare_renderers
     end
 

data/lib/vanilla/config.rb

@@ -3,7 +3,7 @@ require "vanilla"
 module Vanilla
 
   # Create a new Vanilla application
-  # Configuration options:
+  # Configuration options include:
   #
   #  :soup - provide the path to the soup data
   #  :soups - provide an array of paths to soup data
@@ -17,32 +17,36 @@ module Vanilla
   #  :root_snip - the snip to load for the root ('/') url;
   #               defaults to 'start'
   class Config
-    attr_accessor :root,
-                  :root_snip,
-                  :soups,
-                  :renderers,
-                  :default_layout_snip,
-                  :default_renderer,
-                  :raise_errors
-
     def initialize
-      @root = Dir.pwd
-      @root_snip = "start"
-      @soups = ["soups/base", "soups/system"]
-      @default_layout_snip = "layout"
-      @default_renderer = Vanilla::Renderers::Base
-      @raise_errors = false
-      @renderers = {
-        "base" => Vanilla::Renderers::Base,
-        "markdown" => Vanilla::Renderers::Markdown,
-        "bold" => Vanilla::Renderers::Bold,
-        "erb" => Vanilla::Renderers::Erb,
-        "rb" => Vanilla::Renderers::Ruby,
-        "ruby" => Vanilla::Renderers::Ruby,
-        "haml" => Vanilla::Renderers::Haml,
-        "raw" => Vanilla::Renderers::Raw,
-        "textile" => Vanilla::Renderers::Textile
+      @attributes = {
+        :root => Dir.pwd,
+        :root_snip => "start",
+        :soup => nil,
+        :soups => ["soups/base", "soups/system"],
+        :default_layout_snip => "layout",
+        :default_renderer => Vanilla::Renderers::Base,
+        :raise_errors => false,
+        :renderers => {
+          "base" => Vanilla::Renderers::Base,
+          "markdown" => Vanilla::Renderers::Markdown,
+          "bold" => Vanilla::Renderers::Bold,
+          "erb" => Vanilla::Renderers::Erb,
+          "rb" => Vanilla::Renderers::Ruby,
+          "ruby" => Vanilla::Renderers::Ruby,
+          "haml" => Vanilla::Renderers::Haml,
+          "raw" => Vanilla::Renderers::Raw,
+          "textile" => Vanilla::Renderers::Textile
+        }
       }
     end
+
+    def method_missing(method, value=nil)
+      attribute_name = method.to_s.gsub(/=$/, '').to_sym
+      if method =~ /=$/
+        @attributes[attribute_name] = value
+      else
+        @attributes[attribute_name]
+      end
+    end
   end
-end
+end

data/lib/vanilla/renderers/base.rb

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

data/lib/vanilla/snip_reference_parser.rb

@@ -3,6 +3,8 @@ require "parslet"
 
 module Vanilla
   class SnipReferenceParser
+    class ParseError < RuntimeError; end
+
     class Reference
       def initialize(attributes)
         @attributes = attributes
@@ -20,6 +22,8 @@ module Vanilla
 
     def parse(string)
       Reference.new(SnipTransform.new.apply(SnipParser.new.parse(string)))
+    rescue Parslet::ParseFailed
+      raise ParseError
     end
 
     class SnipParser < Parslet::Parser

data/lib/vanilla/test_helper.rb

@@ -61,4 +61,4 @@ module Vanilla
       app.stubs(:soup).returns(stub_soup(*snips))
     end
   end
-end
+end

data/test/core/atom_feed_test.rb

@@ -132,7 +132,7 @@ context "An atom feed" do
     stub_app_soup({:name => "x", :content => "y", :updated_at => Time.parse("2011-01-01 12:23 +0000").to_s})
 
     feed_xml = app.atom_feed(:domain => "whatever", :snips => [app.soup["x"]]).to_s
-    assert_match %r{2011\-01\-01T12\:23\:00\+00\:00}, feed_xml
+    assert_match %r{2011\-01\-01T\d{2}\:23\:00[\+\-]\d{2}\:\d{2}}, feed_xml
   end
 
   should "work even without any snips" do

data/test/core/configuration_test.rb

@@ -71,6 +71,19 @@ context "Configuring a Vanilla app" do
     end
   end
 
+  context "with a specific soup" do
+    setup do
+      @custom_soup = stub('custom soup')
+      TestConfigurationApp.configure do |c|
+        c.soup = @custom_soup
+      end
+    end
+
+    should "use only the specified soup" do
+      assert_equal @custom_soup, TestConfigurationApp.new.soup
+    end
+  end
+
   context "with new renderers" do
     should "load new renderer constants presented as a string" do
       class ::MyRenderer
@@ -90,4 +103,4 @@ context "Configuring a Vanilla app" do
       assert_equal Vanilla::Renderers::Bold, TestConfigurationApp.new.renderer_for(snip)
     end
   end
-end
+end

data/test/core/snip_inclusion_test.rb

@@ -32,6 +32,11 @@ context "When including snips in other snips" do
     assert_equal "rendering snip content", render("rendering {test1}")
   end
 
+  should "match snips with dots in their arguments" do
+    create_snip :name => "test", :content => "dot arguments"
+    assert_equal %{allow dot arguments}, render(%|allow {test "allow but ignore this argument..."}|)
+  end
+
   should "match snips with ruby 1.9 style hashes" do
     create_snip :name => "test", :content => %{
       class Blah
@@ -63,4 +68,4 @@ context "When including snips in other snips" do
     snip = create_snip :name => "test-content", :content => content
     Vanilla::Renderers::Base.new(app).render(snip)
   end
-end
+end

data/test/core/snip_reference_parser_test.rb

@@ -112,6 +112,12 @@ context "The SnipReference parser" do
     end
   end
 
+  should "raise a ParseError if the snip reference was malformed" do
+    assert_raises Vanilla::SnipReferenceParser::ParseError do
+      @parser.parse('{s "}')
+    end
+  end
+
   private
 
   def assert_parsable_by_vanilla(example, expected)

metadata

@@ -1,222 +1,195 @@
 --- !ruby/object:Gem::Specification
 name: vanilla
 version: !ruby/object:Gem::Version
-  version: 1.17.9
-  prerelease: 
+  version: 1.17.10
 platform: ruby
 authors:
 - James Adam
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-26 00:00:00.000000000 Z
+date: 2014-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: soup
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.11
 - !ruby/object:Gem::Dependency
   name: ratom
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.5
 - !ruby/object:Gem::Dependency
   name: RedCloth
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.1.1
 - !ruby/object:Gem::Dependency
   name: BlueCloth
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: parslet
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.7
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: kintama
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.11
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.11
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -227,40 +200,17 @@ extensions: []
 extra_rdoc_files:
 - README
 files:
-- Rakefile
+- ".gemtest"
 - README
-- .gemtest
-- test/core/atom_feed_test.rb
-- test/core/configuration_test.rb
-- test/core/dynasnip_test.rb
-- test/core/renderers/base_renderer_test.rb
-- test/core/renderers/erb_renderer_test.rb
-- test/core/renderers/haml_renderer_test.rb
-- test/core/renderers/markdown_renderer_test.rb
-- test/core/renderers/raw_renderer_test.rb
-- test/core/renderers/ruby_renderer_test.rb
-- test/core/routing_test.rb
-- test/core/snip_inclusion_test.rb
-- test/core/snip_reference_parser_test.rb
-- test/core/test_helper.rb
-- test/core/vanilla_app_test.rb
-- test/core/vanilla_presenting_test.rb
-- test/core/vanilla_request_test.rb
-- test/pristine_app/current_snip_test.rb
-- test/pristine_app/feed_test.rb
-- test/pristine_app/index_test.rb
-- test/pristine_app/link_to_current_snip_test.rb
-- test/pristine_app/link_to_test.rb
-- test/pristine_app/page_title_test.rb
-- test/pristine_app/raise_errors_test.rb
-- test/pristine_app/raw_test.rb
-- test/pristine_app/site_test.rb
-- test/pristine_app/test_helper.rb
+- Rakefile
+- bin/vanilla
+- lib/vanilla.rb
 - lib/vanilla/app.rb
 - lib/vanilla/atom_feed.rb
 - lib/vanilla/config.rb
 - lib/vanilla/console.rb
 - lib/vanilla/dynasnip.rb
+- lib/vanilla/renderers.rb
 - lib/vanilla/renderers/base.rb
 - lib/vanilla/renderers/bold.rb
 - lib/vanilla/renderers/erb.rb
@@ -269,19 +219,16 @@ files:
 - lib/vanilla/renderers/raw.rb
 - lib/vanilla/renderers/ruby.rb
 - lib/vanilla/renderers/textile.rb
-- lib/vanilla/renderers.rb
 - lib/vanilla/request.rb
 - lib/vanilla/routing.rb
 - lib/vanilla/snip_reference_parser.rb
 - lib/vanilla/static.rb
 - lib/vanilla/test_helper.rb
-- lib/vanilla.rb
-- bin/vanilla
+- pristine_app/Gemfile
+- pristine_app/README
 - pristine_app/application.rb
 - pristine_app/config.ru
-- pristine_app/Gemfile
 - pristine_app/public/vanilla.css
-- pristine_app/README
 - pristine_app/soups/base/feed.rb
 - pristine_app/soups/base/layout.snip
 - pristine_app/soups/base/start.snip
@@ -314,36 +261,55 @@ files:
 - pristine_app/soups/tutorial/tutorial.snip.markdown
 - pristine_app/soups/tutorial/vanilla-rb.snip
 - pristine_app/soups/tutorial/vanilla.snip
+- test/core/atom_feed_test.rb
+- test/core/configuration_test.rb
+- test/core/dynasnip_test.rb
+- test/core/renderers/base_renderer_test.rb
+- test/core/renderers/erb_renderer_test.rb
+- test/core/renderers/haml_renderer_test.rb
+- test/core/renderers/markdown_renderer_test.rb
+- test/core/renderers/raw_renderer_test.rb
+- test/core/renderers/ruby_renderer_test.rb
+- test/core/routing_test.rb
+- test/core/snip_inclusion_test.rb
+- test/core/snip_reference_parser_test.rb
+- test/core/test_helper.rb
+- test/core/vanilla_app_test.rb
+- test/core/vanilla_presenting_test.rb
+- test/core/vanilla_request_test.rb
+- test/pristine_app/current_snip_test.rb
+- test/pristine_app/feed_test.rb
+- test/pristine_app/index_test.rb
+- test/pristine_app/link_to_current_snip_test.rb
+- test/pristine_app/link_to_test.rb
+- test/pristine_app/page_title_test.rb
+- test/pristine_app/raise_errors_test.rb
+- test/pristine_app/raw_test.rb
+- test/pristine_app/site_test.rb
+- test/pristine_app/test_helper.rb
 homepage: http://github.com/lazyatom/vanilla-rb
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
+- "--main"
 - README
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2767395045756442534
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2767395045756442534
 requirements: []
 rubyforge_project: vanilla
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A bliki-type web content thing.
 test_files: []