vanilla 1.12.5 → 1.13.1

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vanilla
 version: !ruby/object:Gem::Version 
-  hash: 45
-  prerelease: false
+  hash: 33
+  prerelease: 
   segments: 
   - 1
-  - 12
-  - 5
-  version: 1.12.5
+  - 13
+  - 1
+  version: 1.13.1
 platform: ruby
 authors: 
 - James Adam
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-19 00:00:00 +00:00
+date: 2011-02-22 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,12 +42,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 17
         segments: 
         - 1
         - 0
-        - 1
-        version: 1.0.1
+        - 3
+        version: 1.0.3
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -115,19 +115,17 @@ dependencies:
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: warden
+  name: haml
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 3
         segments: 
         - 0
-        - 5
-        - 2
-        version: 0.5.2
+        version: "0"
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
@@ -158,20 +156,6 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: haml
-  prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id010
 description: 
 email: james@lazyatom.com.com
 executables: 
@@ -202,24 +186,17 @@ files:
 - test/vanilla_app_test.rb
 - test/vanilla_presenting_test.rb
 - test/vanilla_request_test.rb
-- lib/defensio.rb
 - lib/tasks/vanilla.rake
 - lib/vanilla/app.rb
-- lib/vanilla/authentication/warden.rb
-- lib/vanilla/authentication.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/logout.rb
-- lib/vanilla/dynasnips/new.rb
 - lib/vanilla/dynasnips/pre.rb
 - lib/vanilla/dynasnips/rand.rb
 - lib/vanilla/dynasnips/raw.rb
@@ -238,16 +215,25 @@ files:
 - lib/vanilla/snip_reference.rb
 - lib/vanilla/snip_reference.treetop
 - lib/vanilla/snip_reference_parser.rb
-- lib/vanilla/snips/start.rb
-- lib/vanilla/snips/system.rb
-- lib/vanilla/snips/tutorial.rb
+- lib/vanilla/snips/system/layout.snip
+- lib/vanilla/snips/system/start.snip
+- lib/vanilla/snips/system/system.snip
+- lib/vanilla/snips/tutorial/bad_dynasnip.snip
+- lib/vanilla/snips/tutorial/hello_world.snip
+- lib/vanilla/snips/tutorial/markdown_example.snip
+- lib/vanilla/snips/tutorial/snip.snip
+- lib/vanilla/snips/tutorial/soup.snip
+- lib/vanilla/snips/tutorial/test.snip
+- lib/vanilla/snips/tutorial/textile_example.snip
+- lib/vanilla/snips/tutorial/tutorial-another-snip.snip
+- lib/vanilla/snips/tutorial/tutorial-basic-snip-inclusion.snip
+- lib/vanilla/snips/tutorial/vanilla-rb-tutorial.snip
+- lib/vanilla/snips/tutorial/vanilla-rb.snip
+- lib/vanilla/snips/tutorial/vanilla.snip
 - lib/vanilla/static.rb
 - lib/vanilla.rb
 - bin/vanilla
 - 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: []
@@ -279,7 +265,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: vanilla
-rubygems_version: 1.3.7
+rubygems_version: 1.4.1
 signing_key: 
 specification_version: 3
 summary: A bliki-type web content thing.

data/lib/defensio.rb

@@ -1,59 +0,0 @@
-class Defensio
-  class << self
-    attr_accessor :format
-    attr_accessor :service_type
-    attr_accessor :api_version
-    attr_accessor :api_key
-    attr_accessor :owner_url
-  end
-  
-  self.format = :xml
-  self.service_type = :app # Can be :blog
-  self.api_version = '1.2'
-  
-  def self.configure(confhash)
-    if confhash['test']
-      @mock = true
-      self.owner_url = 'http://www.example.com'
-      return
-    else
-      confhash.each do |prop, val|
-        self.send("#{prop}=", val)
-      end
-    end
-  end
-  
-  def self.method_missing(name, *args)
-    self.post(name.to_s.dasherize, *args)
-  end
-  
-  private
-    def self.connection
-      uri = URI.parse('http://api.defensio.com/')
-      Net::HTTP.start(uri.host, uri.port)
-    end
-  
-    def self.post(action, params = {})
-      resp = connection.post(real_path(action), params_from_hash(params))
-      raise "Problem with request: #{action}" unless resp.code == '200'
-      parse_response(resp.body)
-    end
-  
-    def self.real_path(action)
-      "/#{service_type}/#{api_version}/#{action}/#{api_key}.#{format}"
-    end
-  
-    def self.params_from_hash(params = {})
-      # Thanks Net::HTTPHeader
-      params.stringify_keys.merge('owner-url' => owner_url).map {|k,v| "#{CGI.escape(k.dasherize.to_s)}=#{CGI.escape(v.to_s)}" }.join('&') 
-    end
-  
-    def self.parse_response(body)
-      case format
-      when :yaml
-        YAML.load(body)
-      when :xml
-        Hash.from_xml(body)
-      end
-    end
-end

data/lib/vanilla/authentication/warden.rb

@@ -1,58 +0,0 @@
-require 'warden'
-require 'md5'
-
-module Vanilla
-  module Authentication
-    class Warden < Base
-      def initialize(app)
-        super
-        ::Warden::Strategies.add(:vanilla, Vanilla::Authentication::Warden::Strategy)
-      end
-
-      def authenticated?
-        @app.request.env['warden'].authenticated?
-      end
-
-      def user
-        @app.request.env['warden'].user
-      end
-
-      def authenticate!
-        @app.request.env['warden'].authenticate!
-      end
-
-      def logout
-        @app.request.env['warden'].logout
-      end
-
-      class Strategy < ::Warden::Strategies::Base
-        def valid?
-          params["name"] || params["password"]
-        end
-
-        def authenticate!
-          if env['vanilla.app'].config[:credentials][params["name"]] == MD5.md5(params["password"]).to_s
-            # clear these so they don't interfere with the request
-            env['vanilla.app'].request.params.delete(:name)
-            env['vanilla.app'].request.params.delete(:password)
-            success!(params["name"])
-          else
-            fail! "Sorry, you couldn't be logged in with those details"
-          end
-        end
-      end
-
-      class FailApp
-        def call(env)
-          [401, {"Content-Type" => "text/html"}, [login_form(env)]]
-        end
-
-        private
-
-        def login_form(env)
-          env['vanilla.app'].soup["system"].login_template.gsub("MESSAGE", env['warden'].message || "Please log in")
-        end
-      end
-    end
-  end
-end

data/lib/vanilla/authentication.rb

@@ -1,24 +0,0 @@
-module Vanilla
-  module Authentication
-    # A pass-through authenticator, which never
-    # requires a login
-    class Base
-      def initialize(app)
-        @app = app
-      end
-
-      def authenticated?
-        true
-      end
-
-      def user
-      end
-
-      def authenticate!
-      end
-
-      def logout
-      end
-    end
-  end
-end

data/lib/vanilla/dynasnips/edit.rb

@@ -1,59 +0,0 @@
-require 'vanilla/dynasnip'
-
-# The edit dyna will load the snip given in the 'snip_to_edit' part of the
-# params
-class EditSnip < Dynasnip
-  snip_name "edit"
-
-  def get(snip_name=nil)
-    app.request.authenticate!
-
-    snip = app.soup[snip_name || app.request.params[:name]]
-    edit(snip)
-  end
-
-  def post(*args)
-    app.request.authenticate!
-
-    snip_attributes = cleaned_params
-    snip_attributes.delete(:save_button)
-    return 'no params' if snip_attributes.empty?
-    snip = app.soup[snip_attributes[:name]]
-    snip_attributes.each do |name, value|
-      snip.__send__("#{name}=", value)
-    end
-    snip.save
-    %{Saved snip #{link_to snip_attributes[:name]} ok}
-  rescue Exception => e
-    app.soup << snip_attributes
-    %{Created snip #{link_to snip_attributes[:name]} ok}
-  end
-
-  def edit(snip)
-    renderer = Vanilla::Renderers::Erb.new(app)
-    renderer.instance_eval { @snip_to_edit = snip } # hacky!
-    snip_in_edit_template = renderer.render_without_including_snips(app.soup['edit'], :template)
-    prevent_snip_inclusion(snip_in_edit_template)
-  end
-
-  private
-
-  def prevent_snip_inclusion(content)
-    content.gsub("{", "&#123;").gsub("}" ,"&#125;")
-  end
-
-  attribute :template, %{
-    <form action="<%= url_to 'edit' %>" method="post">
-    <dl class="attributes">
-      <% @snip_to_edit.attributes.each do |name, value| %>
-      <dt><%= name %></dt>
-      <dd><textarea name="<%= name %>" class="<%= name %>"><%=h value %></textarea></dd>
-      <% end %>
-      <dt><input class="attribute_name" type="text"></dt>
-      <dd><textarea></textarea></dd>
-    </dl>
-    <a href="#" id="add">Add</a>
-    <button name='save_button'>Save</button>
-    </form>
-  }
-end

data/lib/vanilla/dynasnips/edit_link.rb

@@ -1,20 +0,0 @@
-require 'vanilla/dynasnip'
-
-class EditLink < Dynasnip
-  usage %|
-You can use the edit_link snip to insert links for editing other snips. For example: 
-
-  &#123;edit_link blah&#125; 
-  
-would insert a link to an editor for the blah snip.
-
-You can also give a custom piece of text for the link, like this:
-
-  &#123;edit_link blah,link-name&#125;|
-  
-  def handle(*args)
-    snip_name = args[0] || app.request.snip_name
-    link_text = args[1] || "Edit"
-    edit_link(snip_name, link_text)
-  end
-end

data/lib/vanilla/dynasnips/logout.rb

@@ -1,8 +0,0 @@
-require 'vanilla/dynasnip'
-
-class Logout < Dynasnip
-  def handle(*args)
-    app.request.logout
-    "Logged out"
-  end
-end

data/lib/vanilla/dynasnips/new.rb

@@ -1,12 +0,0 @@
-require 'vanilla/dynasnip'
-
-class NewSnip < Dynasnip
-  snip_name :new
-
-  def handle(*arg)
-    app.request.authenticate!
-
-    base_params = {:render_as => '', :content => '', :author => current_user}.update(app.request.params)
-    editor = EditSnip.new(app).edit(Soup::Snip.new(base_params))
-  end
-end

data/lib/vanilla/snips/system.rb

@@ -1,84 +0,0 @@
-{:name => "system",
- :content => "You're in the system snip now. You probably want to {edit_link system,edit} it though.",
- :main_template => %^
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html lang="en">
-<head>
-  <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-  <title>{title}</title>
-  <script language="javascript" src="/javascripts/jquery.js"></script>
-  <script language="javascript" src="/javascripts/jquery.autogrow-textarea.js"></script>
-  <script language="javascript" src="/javascripts/vanilla.js"></script>
-  <link rel="stylesheet" type="text/css" media="screen"  href="<%= url_to("system", "css.css") %>" />
-</head>
-<body>
-  <div id="content">
-    <div id="controls">
-      <strong><a href="/">home</a></strong>, 
-      <%= new_link %> ::
-      <strong>{link_to_current_snip}</strong> &rarr; 
-      {edit_link}
-    </div>
-    {current_snip}
-  </div>
-</body>
-</html>^,
- :login_template => %^
-<html>
-  <head><link rel="stylesheet" type="text/css" media="screen" href="/system/css.css" /></head>
-  <body id="login">
-    <form action='' method='post'>
-      <h1>Login</h1><p class="message">MESSAGE</p>
-      <label>Name: <input type="text" name="login[username]"></input></label>
-      <label>Password: <input type="password" name="login[password]"></input></label>
-      <button>login</button>
-    </form>
-  </body>
-</html>^,
- :css => %^
-body {
-  font-family: Helvetica;
-  background-color: #666;
-  margin: 0;
-  padding: 0;
-}
-
-div#content {
-  width: 800px;
-  margin: 0 auto;
-  background-color: #fff;
-  padding: 1em;
-}
-
-div#controls {
-font-size: 80%;
-padding-bottom: 1em;
-margin-bottom: 1em;
-border-bottom: 1px solid #999;
-}
-
-textarea {
-  width: 100%;
-}
-
-textarea.content {
-  min-height: 10em;
-}
-
-pre {
-  background-color: #f6f6f6;
-  border: 1px solid #ccc;
-  padding: 1em;
-}
-
-a.new {
-  background-color: #f0f0f0;
-  text-decoration: none;
-  color: #999;
-  padding: 0.2em;
-}
-
-a.new:hover {
-  text-decoration: underline;
-}^
-}