vanilla 1.2 → 1.9.9

data/spec/vanilla_request_spec.rb

@@ -0,0 +1,73 @@
+require File.join(File.dirname(__FILE__), "spec_helper")
+
+describe Vanilla::Request, "when requesting urls" do
+  before(:each) { @request = Vanilla::Request.new(mock_env_for_url("/snip"), @app) }
+  
+  it "should use the first segement as the snip name" do
+    @request.snip_name.should == "snip"
+  end
+  
+  it "should try to load the snip based on the snip name" do
+    @app.soup.should_receive(:[]).with('snip').and_return(:snip)
+    @request.snip.should == :snip
+  end
+  
+  it "should have no part if the url contains only a single segment" do
+    @request.part.should == nil    
+  end
+  
+  it "should have a default format of html" do
+    @request.format.should == 'html'
+  end
+  
+  it "should determine the request method" do
+    @request.method.should == 'get'
+  end
+end
+
+describe Vanilla::Request, "when requesting a snip part" do
+  before(:each) { @request = Vanilla::Request.new(mock_env_for_url("/snip/part"), @app) }
+  
+  it "should use the first segment as the snip, and the second segment as the part" do
+    @request.snip_name.should == "snip"
+    @request.part.should == "part"
+  end
+  
+  it "should have a default format of html" do
+    @request.format.should == "html"
+  end
+end
+
+describe Vanilla::Request, "when requesting a snip with a format" do
+  before(:each) { @request = Vanilla::Request.new(mock_env_for_url("/snip.raw"), @app) }
+  
+  it "should use the extension as the format" do
+    @request.format.should == "raw"
+  end
+  
+  it "should retain the filename part of the path as the snip" do
+    @request.snip_name.should == "snip"
+  end
+end
+
+describe Vanilla::Request, "when requesting a snip part with a format" do
+  before(:each) { @request = Vanilla::Request.new(mock_env_for_url("/snip/part.raw"), @app) }
+  
+  it "should use the extension as the format" do
+    @request.format.should == "raw"
+  end
+  
+  it "should retain the first segment of the path as the snip" do
+    @request.snip_name.should == "snip"
+  end
+  
+  it "should use the filename part of the second segment as the snip part" do
+    @request.part.should == "part"
+  end
+end
+
+describe Vanilla::Request, "when requested with a _method paramter" do
+  it "should return the method using the parameter" do
+    Vanilla::Request.new(mock_env_for_url("/snip?_method=put"), @app).method.should == 'put'
+  end
+end

metadata

@@ -1,12 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: vanilla
 version: !ruby/object:Gem::Version 
-  hash: 11
-  prerelease: false
-  segments: 
-  - 1
-  - 2
-  version: "1.2"
+  version: 1.9.9
 platform: ruby
 authors: 
 - James Adam
@@ -14,149 +9,79 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-03 00:00:00 +01:00
+date: 2009-10-12 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
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 57
-        segments: 
-        - 0
-        - 9
-        - 1
         version: 0.9.1
-  requirement: *id001
+    version: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
   name: soup
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 0
-        - 6
-        version: 1.0.6
-  requirement: *id002
+        version: 0.9.9
+    version: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
   name: ratom
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 3
-        - 5
         version: 0.3.5
-  requirement: *id003
+    version: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
   name: RedCloth
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 57
-        segments: 
-        - 4
-        - 1
-        - 1
         version: 4.1.1
-  requirement: *id004
+    version: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
   name: BlueCloth
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
-  prerelease: false
   type: :runtime
-  name: haml
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
-    none: false
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id006
+        version: 1.0.0
+    version: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
+  name: treetop
   type: :runtime
-  name: parslet
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 2
-        - 0
-        version: 1.2.0
-  requirement: *id007
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :development
-  name: kintama
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
-    none: false
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 0
-        - 1
-        - 6
-        version: 0.1.6
-  requirement: *id008
+        version: 1.4.1
+    version: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
+  name: rspec
   type: :development
-  name: mocha
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
-    none: false
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  requirement: *id009
+    version: 
 description: 
 email: james@lazyatom.com.com
 executables: 
@@ -166,77 +91,67 @@ extensions: []
 extra_rdoc_files: 
 - README
 files: 
+- config.example.yml
+- config.ru
 - 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
+- spec/dynasnip_spec.rb
+- spec/renderers/base_renderer_spec.rb
+- spec/renderers/erb_renderer_spec.rb
+- spec/renderers/markdown_renderer_spec.rb
+- spec/renderers/raw_renderer_spec.rb
+- spec/renderers/ruby_renderer_spec.rb
+- spec/renderers/vanilla_app_detecting_renderer_spec.rb
+- spec/spec_helper.rb
+- spec/tmp/config.yml
+- spec/tmp/soup/current_snip.yml
+- spec/tmp/soup/system.yml
+- spec/vanilla_app_spec.rb
+- spec/vanilla_presenting_spec.rb
+- spec/vanilla_request_spec.rb
+- lib/defensio.rb
+- lib/tasks/vanilla.rake
 - lib/vanilla/app.rb
 - lib/vanilla/console.rb
 - lib/vanilla/dynasnip.rb
+- lib/vanilla/dynasnips/comments.rb
+- lib/vanilla/dynasnips/current_snip.rb
+- lib/vanilla/dynasnips/debug.rb
+- lib/vanilla/dynasnips/edit.rb
+- lib/vanilla/dynasnips/edit_link.rb
+- lib/vanilla/dynasnips/index.rb
+- lib/vanilla/dynasnips/kind.rb
+- lib/vanilla/dynasnips/link_to.rb
+- lib/vanilla/dynasnips/link_to_current_snip.rb
+- lib/vanilla/dynasnips/login.rb
+- lib/vanilla/dynasnips/new.rb
+- lib/vanilla/dynasnips/notes.rb
+- lib/vanilla/dynasnips/pre.rb
+- lib/vanilla/dynasnips/rand.rb
+- lib/vanilla/dynasnips/raw.rb
+- lib/vanilla/dynasnips/url_to.rb
 - lib/vanilla/renderers/base.rb
 - lib/vanilla/renderers/bold.rb
 - lib/vanilla/renderers/erb.rb
-- lib/vanilla/renderers/haml.rb
 - lib/vanilla/renderers/markdown.rb
 - 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/routes.rb
+- lib/vanilla/snip_reference.rb
+- lib/vanilla/snip_reference.treetop
 - lib/vanilla/snip_reference_parser.rb
-- lib/vanilla/static.rb
+- lib/vanilla/snips/start.rb
+- lib/vanilla/snips/system.rb
+- lib/vanilla/snips/tutorial.rb
+- lib/vanilla/soup_with_timestamps.rb
 - lib/vanilla.rb
 - bin/vanilla
-- pristine_app/config.ru
-- pristine_app/Gemfile
-- pristine_app/Gemfile.lock
-- pristine_app/public/vanilla.css
-- 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/tutorial/bad_dynasnip.snip
-- pristine_app/soups/tutorial/hello_world.snip
-- pristine_app/soups/tutorial/markdown_example.snip
-- pristine_app/soups/tutorial/snip.snip
-- pristine_app/soups/tutorial/soup.snip
-- pristine_app/soups/tutorial/test.snip
-- pristine_app/soups/tutorial/textile_example.snip
-- pristine_app/soups/tutorial/tutorial-another-snip.snip
-- pristine_app/soups/tutorial/tutorial-basic-snip-inclusion.snip
-- pristine_app/soups/tutorial/tutorial-dynasnips.snip.markdown
-- pristine_app/soups/tutorial/tutorial-layout.snip
-- pristine_app/soups/tutorial/tutorial-links.snip
-- pristine_app/soups/tutorial/tutorial-renderers.snip.markdown
-- pristine_app/soups/tutorial/tutorial.snip.markdown
-- pristine_app/soups/tutorial/vanilla-rb.snip
-- pristine_app/soups/tutorial/vanilla.snip
+- public/hatch.png
+- public/javascripts/jquery.autogrow-textarea.js
+- public/javascripts/jquery.js
+- public/javascripts/vanilla.js
 has_rdoc: true
 homepage: http://github.com/lazyatom/vanilla-rb
 licenses: []
@@ -248,27 +163,21 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: vanilla
-rubygems_version: 1.3.7
+rubygems_version: 1.3.3
 signing_key: 
 specification_version: 3
 summary: A bliki-type web content thing.

data/lib/vanilla/renderers.rb

@@ -1,12 +0,0 @@
-module Vanilla
-  module Renderers
-    autoload :Base, "vanilla/renderers/base"
-    autoload :Bold, "vanilla/renderers/bold"
-    autoload :Erb, "vanilla/renderers/erb"
-    autoload :Haml, "vanilla/renderers/haml"
-    autoload :Markdown, "vanilla/renderers/markdown"
-    autoload :Raw, "vanilla/renderers/raw"
-    autoload :Ruby, "vanilla/renderers/ruby"
-    autoload :Textile, "vanilla/renderers/textile"
-  end
-end

data/lib/vanilla/renderers/haml.rb

@@ -1,13 +0,0 @@
-require 'haml'
-
-module Vanilla::Renderers
-  class Haml < Base
-    def prepare(snip, part=:content, args=[], enclosing_snip=snip)
-      @snip = snip
-    end
-    
-    def process_text(content)
-      ::Haml::Engine.new(content).render(binding)
-    end
-  end
-end

data/lib/vanilla/static.rb

@@ -1,28 +0,0 @@
-require 'rack/utils'
-
-# Heavily based on ActionDispatch::Static
-module Vanilla
-  class Static
-    def initialize(app, root)
-      @app = app
-      @file_server = ::Rack::File.new(root)
-    end
-
-    def call(env)
-      path   = env['PATH_INFO'].chomp('/')
-      method = env['REQUEST_METHOD']
-
-      if %w(GET HEAD).include?(method) && file_exist?(path)
-        @file_server.call(env)
-      else
-        @app.call(env)
-      end
-    end
-
-    private
-      def file_exist?(path)
-        full_path = File.join(@file_server.root, ::Rack::Utils.unescape(path))
-        File.file?(full_path) && File.readable?(full_path)
-      end
-  end
-end