@@ -5,4 +5,5 @@ pkg *~ tmp config.yml -rdoc \ No newline at end of file +rdoc +spec/tmp \ No newline at end of file .gitignore @@ -1,5 +1,6 @@ --- :filename: config.example.yml +:soup: soup :secret: a6bc097eff86cabd92ee72ba4687c3f057b7556deaa3e4a6b284460871056b87ba3e91548c37dcc44fbc10241cee5b386556e6bcc2946fd9b609dc3bc1b24488 :credentials: admin: 5f4dcc3b5aa765d61d8327deb882cf99 config.example.yml @@ -1,5 +1,5 @@ $:.unshift File.join(File.dirname(__FILE__), *%w[lib]) -require 'vanilla/app' +require 'vanilla' app = Vanilla::App.new(ENV['VANILLA_CONFIG']) use Rack::Session::Cookie, :key => 'vanilla.session', config.ru @@ -12,20 +12,15 @@ namespace :vanilla do FileUtils.rm "soup.db" if File.exist?("soup.db") end - task :prepare do - Soup.prepare - end - - task :load_snips => :prepare do - Dynasnip.persist_all!(overwrite=true) + task :load_snips do + app = Vanilla::App.new(ENV['VANILLA_CONFIG']) + Dynasnip.all.each { |ds| app.soup << ds.snip_attributes } Dir[File.join(File.dirname(__FILE__), '..', 'vanilla', 'snips', '*.rb')].each do |f| load f end - load File.join(File.dirname(__FILE__), *%w[.. vanilla test_snips.rb]) - - puts "The soup is simmering. Loaded #{Soup.tuple_class.count} tuples" + puts "The soup is simmering." end desc 'Resets the soup to contain the base snips only. Dangerous!' @@ -33,19 +28,20 @@ namespace :vanilla do namespace :upgrade do desc 'Upgrade the dynasnips' - task :dynasnips => :prepare do + task :dynasnips do + app = Vanilla::App.new(ENV['VANILLA_CONFIG']) Dynasnip.all.each do |dynasnip| print "Upgrading #{dynasnip.snip_name}... " # TODO: our confused Soup interface might return an array. - snip = Soup[dynasnip.snip_name] + snip = app.soup[dynasnip.snip_name] if snip.empty? || snip.nil? # it's a new dyna - Soup << dynasnip.snip_attributes + app.soup << dynasnip.snip_attributes puts "(new)" elsif snip.created_at == snip.updated_at # it's not been changed, let's upgrade snip.destroy - Soup << dynasnip.snip_attributes + app.soup << dynasnip.snip_attributes puts "(unedited)" else # the dyna exists and has been changed lib/tasks/vanilla.rake @@ -1,15 +1,8 @@ -require 'vanilla/snip_handling' - -module Vanilla - include SnipHandling -end +require 'vanilla/app' # Load all the other renderer subclasses Dir[File.join(File.dirname(__FILE__), 'vanilla', 'renderers', '*.rb')].each { |f| require f } -# Load the routing information -require 'vanilla/routes' - # Load all the base dynasnip classes Dir[File.join(File.dirname(__FILE__), 'vanilla', 'dynasnips', '*.rb')].each do |dynasnip| require dynasnip lib/vanilla.rb @@ -1,19 +1,29 @@ -require 'vanilla' require 'vanilla/request' +require 'vanilla/routes' + +# Require the base set of renderers +require 'vanilla/renderers/base' +require 'vanilla/renderers/raw' +require 'vanilla/renderers/erb' + +# Require the data store +require 'soup' + module Vanilla class App + include Routes - attr_reader :request, :response, :config + attr_reader :request, :response, :config, :soup def initialize(config_file=nil) prepare_configuration(config_file) - Soup.prepare + @soup = Soup.new(config[:soup]) end # Returns a Rack-appropriate 3-element array (via Rack::Response#finish) def call(env) - @request = Vanilla::Request.new(env) + @request = Vanilla::Request.new(env, self) @response = Rack::Response.new begin @@ -32,7 +42,7 @@ module Vanilla def formatted_render(snip, part=nil, format=nil) case format when 'html', nil - Renderers::Erb.new(self).render(Vanilla.snip('system'), :main_template) + Renderers::Erb.new(self).render(soup['system'], :main_template) when 'raw', 'css', 'js' Renderers::Raw.new(self).render(snip, part || :content) when 'text', 'atom', 'xml' @@ -73,6 +83,10 @@ module Vanilla "[snip '#{snip_name}' cannot be found]" end + def snip(attributes) + Snip.new(attributes, soup) + end + private def prepare_configuration(config_file) lib/vanilla/app.rb @@ -1,3 +1,4 @@ require 'vanilla' -Soup.prepare +app = Vanilla::App.new(ENV['VANILLA_CONFIG']) +soup = app.soup puts "The Soup is simmering." \ No newline at end of file lib/vanilla/console.rb @@ -29,50 +29,16 @@ class Dynasnip < Vanilla::Renderers::Base attribute :usage, escape_curly_braces(str).strip end - def self.persist_all!(overwrite=false) - all.each do |dynasnip| - dynasnip.persist!(overwrite) - end - end - - def self.build_snip - Snip.new(snip_attributes) - end - def self.snip_attributes full_snip_attributes = {:name => snip_name, :content => self.name, :render_as => "Ruby"} @attributes ? full_snip_attributes.merge!(@attributes) : full_snip_attributes end - def self.persist!(overwrite=false) - if overwrite - snip = Soup[snip_name] - if snip - if snip.is_a?(Array) - snip.each { |s| s.destroy } - else - snip.destroy - end - end - end - snip = Soup[snip_name] - snip = snip[0] if snip.is_a?(Array) - if snip - snip_attributes.each do |name, value| - snip.set_value(name, value) - end - else - snip = build_snip - end - snip.save - snip - end - attr_accessor :enclosing_snip def method_missing(method, *args) - if snip = Vanilla.snip(snip_name) - snip.get_value(method) + if snip + snip.__send__(method) elsif part = self.class.attribute(method) part else @@ -90,7 +56,7 @@ class Dynasnip < Vanilla::Renderers::Base end def snip - Snip[snip_name] + app.soup[snip_name] end def show_usage lib/vanilla/dynasnip.rb @@ -16,20 +16,20 @@ class Comments < Dynasnip def get(snip_name=nil, disable_new_comments=false) snip_name = snip_name || app.request.params[:snip] return usage if self.class.snip_name == snip_name - comments = Soup.sieve(:commenting_on => snip_name) + comments = app.soup.sieve(:commenting_on => snip_name) comments_html = if app.request.snip_name == snip_name rendered_comments = render_comments(comments) rendered_comments += comment_form.gsub('SNIP_NAME', snip_name) unless disable_new_comments rendered_comments else - %{<a href="#{Vanilla::Routes.url_to(snip_name)}">#{comments.length} comments for #{snip_name}</a>} + %{<a href="#{url_to(snip_name)}">#{comments.length} comments for #{snip_name}</a>} end return comments_html end def post(*args) snip_name = app.request.params[:snip] - existing_comments = Soup.sieve(:commenting_on => snip_name) + existing_comments = app.soup.sieve(:commenting_on => snip_name) comment = app.request.params.reject { |k,v| ![:author, :email, :website, :content].include?(k) } return "You need to add some details!" if comment.empty? @@ -40,7 +40,7 @@ class Comments < Dynasnip "Sorry - your comment looks like spam, according to Defensio :(" else return "No spam today, thanks anyway" unless app.request.params[:human] == 'human' - Soup << comment.merge({ + app.soup << comment.merge({ :name => "#{snip_name}-comment-#{existing_comments.length + 1}", :commenting_on => snip_name, :created_at => Time.now @@ -65,7 +65,7 @@ class Comments < Dynasnip end def check_for_spam(comment) - snip_date = Date.parse(Soup[app.request.params[:snip]].updated_at) + snip_date = Date.parse(app.soup[app.request.params[:snip]].updated_at) Defensio.configure(app.config[:defensio]) defensio_params = { :comment_author_email => comment[:email], lib/vanilla/dynasnips/comments.rb @@ -10,7 +10,7 @@ class EditSnip < Dynasnip def get(snip_name=nil) return login_required unless logged_in? - snip = Vanilla.snip(snip_name || app.request.params[:name]) + snip = app.soup[snip_name || app.request.params[:name]] edit(snip) end @@ -19,23 +19,23 @@ class EditSnip < Dynasnip snip_attributes = cleaned_params snip_attributes.delete(:save_button) return 'no params' if snip_attributes.empty? - snip = Vanilla.snip(snip_attributes[:name]) + snip = app.soup[snip_attributes[:name]] snip_attributes[:updated_at] = Time.now snip_attributes.each do |name, value| snip.__send__(:set_value, name, value) end snip.save - %{Saved snip #{Vanilla::Routes.link_to snip_attributes[:name]} ok} + %{Saved snip #{link_to snip_attributes[:name]} ok} rescue Exception => e snip_attributes[:created_at] ||= Time.now - Soup << snip_attributes - %{Created snip #{Vanilla::Routes.link_to snip_attributes[:name]} ok} + 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(Vanilla.snip('edit'), :template) + snip_in_edit_template = renderer.render_without_including_snips(app.soup['edit'], :template) prevent_snip_inclusion(snip_in_edit_template) end @@ -46,7 +46,7 @@ class EditSnip < Dynasnip end attribute :template, %{ - <form action="<%= Vanilla::Routes.url_to 'edit' %>" method="post"> + <form action="<%= url_to 'edit' %>" method="post"> <dl class="attributes"> <% @snip_to_edit.attributes.each do |name, value| %> <dt><%= name %></dt> lib/vanilla/dynasnips/edit.rb @@ -15,6 +15,6 @@ You can also give a custom piece of text for the link, like this: def handle(*args) snip_name = args[0] || app.request.snip_name link_text = args[1] || "Edit" - Vanilla::Routes.edit_link(snip_name, link_text) + edit_link(snip_name, link_text) end end \ No newline at end of file lib/vanilla/dynasnips/edit_link.rb @@ -2,10 +2,9 @@ require 'vanilla/dynasnip' class Index < Dynasnip def get(*args) - # TODO: figure out a way around calling Soup/AR methods directly. - list = Soup.tuple_class.find_all_by_name('name', :order => 'updated_at DESC').map { |tuple| - "<li>#{Vanilla::Routes.link_to tuple.value}</li>" + list = app.soup.all_snips.sort { |a,b| a.updated_at > b.updated_at }.map { |snip| + "<li>#{link_to snip.name}</li>" } "<ol>#{list}</ol>" end -end \ No newline at end of file +end lib/vanilla/dynasnips/index.rb @@ -5,7 +5,7 @@ require 'date' class Kind < Dynasnip def handle(kind, limit=10, as=:html) as = as.to_sym - snips = Soup.sieve(:kind => kind) + snips = app.soup.sieve(:kind => kind) entries = snips.sort_by { |s| s.created_at || '' }.reverse[0...limit.to_i].map do |snip| render_entry_in_template(snip, as, kind) end @@ -28,7 +28,7 @@ class Kind < Dynasnip e.content = Atom::Content::Html.new(rendered_contents) e.title = snip.name e.authors = [Atom::Person.new(:name => snip.author || domain)] - e.links << Atom::Link.new(:href => "http://#{domain}#{Vanilla::Routes.url_to(snip.name)}") + e.links << Atom::Link.new(:href => "http://#{domain}#{url_to(snip.name)}") e.id = "tag:#{domain},#{(snip.created_at || Date.today.to_s).split[0]}:/#{snip.name}" end end @@ -59,7 +59,7 @@ class Kind < Dynasnip attribute :snip_template, %{ <div class="snip SNIP_KIND"> <div class="details"> - #{Vanilla::Routes.existing_link '#', 'SNIP_NAME'} + {link_to_current_snip} <p class="created_at">CREATED_AT</p> </div> <div class="content"> lib/vanilla/dynasnips/kind.rb @@ -9,6 +9,6 @@ The link_to dyna lets you create links between snips: would insert a link to the blah snip.| def handle(snip_name, link_text=snip_name, part=nil) - Vanilla::Routes.link_to(link_text, snip_name, part) + link_to(link_text, snip_name, part) end end \ No newline at end of file lib/vanilla/dynasnips/link_to.rb @@ -8,9 +8,9 @@ class LinkToCurrentSnip < Dynasnip def handle(*args) if app.request.snip_name == 'edit' # we're editing so don't use this name - Vanilla::Routes.link_to app.request.params[:snip_to_edit] + link_to app.request.params[:name] else - Vanilla::Routes.link_to app.request.snip_name + link_to app.request.snip_name end end end \ No newline at end of file lib/vanilla/dynasnips/link_to_current_snip.rb @@ -30,7 +30,7 @@ class Notes < Dynasnip end def render_note(note) - note_link = Vanilla::Routes.link_to(note.name) + note_link = link_to(note.name) note_content = Vanilla.render(note.name, nil, context, []) snip.note_template.gsub('[note]', note_content).gsub('[link]', note_link) end lib/vanilla/dynasnips/notes.rb @@ -14,6 +14,6 @@ class ShowContentInPreTag < Dynasnip | def handle(snip_name, part=:content) - %{<pre>#{Vanilla.snip(snip_name).__send__(part || :content)}</pre>} + %{<pre>#{app.soup[snip_name].__send__(part || :content)}</pre>} end end \ No newline at end of file lib/vanilla/dynasnips/pre.rb @@ -14,6 +14,6 @@ class ShowRawContent < Dynasnip | def handle(snip_name, part=:content) - %{<pre>#{Dynasnip.escape_curly_braces(Vanilla.snip(snip_name).__send__(part || :content))}</pre>} + %{<pre>#{Dynasnip.escape_curly_braces(app.soup[snip_name].__send__(part || :content))}</pre>} end end \ No newline at end of file lib/vanilla/dynasnips/raw.rb @@ -2,6 +2,6 @@ require 'vanilla/dynasnip' class UrlTo < Dynasnip def handle(snip_name) - Snip[snip_name] ? Vanilla::Routes.url_to(snip_name) : "[Snip '#{snip_name}' not found]" + app.soup[snip_name] ? url_to(snip_name) : "[Snip '#{snip_name}' not found]" end end \ No newline at end of file lib/vanilla/dynasnips/url_to.rb @@ -4,6 +4,7 @@ require 'vanilla/snip_reference_parser' module Vanilla module Renderers class Base + include Routes # Render a snip. def self.render(snip, part=:content) @@ -20,6 +21,11 @@ module Vanilla @app = app end + # defined for the routes + def soup + @app.soup + end + def self.snip_regexp %r{(\{[^\}.]+\})} end @@ -36,7 +42,7 @@ module Vanilla # Render the snip or snip part with the given args, and the current # context, but with the default renderer for that snip. We dispatch # *back* out to the root Vanilla.render method to do this. - snip = Vanilla.snip(snip_name) + snip = soup[snip_name] if snip app.render(snip, snip_attribute, snip_args, enclosing_snip) else lib/vanilla/renderers/base.rb @@ -6,8 +6,9 @@ module Vanilla class Request attr_reader :snip_name, :part, :format, :method - def initialize(env) + def initialize(env, app) @rack_request = Rack::Request.new(env) + @app = app determine_request_uri_parts end @@ -19,7 +20,7 @@ module Vanilla # Returns the snip referenced by the request's URL. Performs no exception # handling, so if the snip does not exist, an exception will be thrown. def snip - Vanilla.snip(snip_name) + @app.soup[snip_name] end def cookies lib/vanilla/request.rb @@ -1,7 +1,8 @@ module Vanilla + # Expects to be able to call 'soup' on whatever it is included into module Routes def link_to(link_text, snip_name=link_text, part=nil) - Vanilla.snip_exists?(snip_name) ? Vanilla::Routes.existing_link(link_text, snip_name, part) : Vanilla::Routes.new_link(snip_name) + soup[snip_name] ? existing_link(link_text, snip_name, part) : new_link(snip_name) end def url_to(snip_name, part=nil) @@ -11,12 +12,12 @@ module Vanilla end def url_to_raw(snip_name, part=nil) - url = Vanilla::Routes.url_to(snip_name, part) + url = url_to(snip_name, part) url += ".raw" end def existing_link(link_text, snip_name=link_text, part=nil) - %{<a href="#{Vanilla::Routes.url_to(snip_name, part)}">#{link_text}</a>} + %{<a href="#{url_to(snip_name, part)}">#{link_text}</a>} end def edit_link(snip_name, link_text) @@ -26,7 +27,5 @@ module Vanilla def new_link(snip_name="New") %[<a href="/new?name=#{snip_name ? snip_name.gsub(" ", "+") : nil}" class="new">#{snip_name}</a>] end - - extend self end end lib/vanilla/routes.rb @@ -1,4 +1,5 @@ -start = Snip.new(:name => 'start') +app = Vanilla::App.new(ENV['VANILLA_CONFIG']) +start = app.snip(:name => 'start') start.content = <<-START Welcome to Vanilla.rb ============= lib/vanilla/snips/start.rb @@ -1,4 +1,5 @@ -system = Snip.new(:name => "system") +app = Vanilla::App.new(ENV['VANILLA_CONFIG']) +system = app.snip(:name => "system") system.content = "You're in the system snip now. You probably want to {edit_link system,edit} it though." system.main_template = <<-HTML @@ -9,13 +10,13 @@ system.main_template = <<-HTML <title>{current_snip name}</title> <script language="javascript" src="/public/javascripts/jquery.js"></script> <script language="javascript" src="/public/javascripts/vanilla.js"></script> - <link rel="stylesheet" type="text/css" media="screen" href="<%= Vanilla::Routes.url_to("system", "css.css") %>" /> + <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>, - <%= Vanilla::Routes.new_link %> :: + <%= new_link %> :: <strong>{link_to_current_snip}</strong> &rarr; {edit_link} </div> lib/vanilla/snips/system.rb @@ -1,4 +1,5 @@ -tutorial = Snip.new(:name => 'vanilla-rb-tutorial') +app = Vanilla::App.new(ENV['VANILLA_CONFIG']) +tutorial = app.snip(:name => 'vanilla-rb-tutorial') tutorial.render_as = "Markdown" tutorial.content = <<-END_OF_TUTORIAL Basic Concepts @@ -73,17 +74,17 @@ END_OF_TUTORIAL tutorial.save -tutorial_basic_snip_inclusion = Snip.new(:name => 'tutorial-basic-snip-inclusion') +tutorial_basic_snip_inclusion = app.snip(:name => 'tutorial-basic-snip-inclusion') tutorial_basic_snip_inclusion.content = <<-EOS This is a snip, which includes another {link_to snip}: {tutorial-another-snip} EOS tutorial_basic_snip_inclusion.save -tutorial_another_snip = Snip.new(:name => 'tutorial-another-snip') +tutorial_another_snip = app.snip(:name => 'tutorial-another-snip') tutorial_another_snip.content = "this is another snip!" tutorial_another_snip.save -hello_world = Snip.new(:name => 'hello_world', :render_as => "Ruby") +hello_world = app.snip(:name => 'hello_world', :render_as => "Ruby") hello_world.content = <<-END_OF_RUBY class HelloWorld # although the name doesn't need to match the snip name, @@ -106,7 +107,7 @@ HelloWorld END_OF_RUBY hello_world.save -snip = Snip.new(:name => 'snip', :render_as => "Markdown") +snip = app.snip(:name => 'snip', :render_as => "Markdown") snip.content = <<-EOS A snip is the basic building block of information for {link_to vanilla-rb}. Essentially, it is a piece of content with arbitrary attributes. Vanilla anticipates the presence of some key attributes: @@ -118,7 +119,7 @@ One implementation of the snip store is {link_to soup}. EOS snip.save -soup = Snip.new(:name => 'soup') +soup = app.snip(:name => 'soup') soup.content = <<-EOS Soup is a data store supporting the {link_to snip}-space that {link_to vanilla-rb} expects. @@ -126,7 +127,7 @@ It's hosted on github <a href="http://github.com/lazyatom/soup">here</a>. EOS soup.save -vanilla_rb = Snip.new(:name => 'vanilla-rb', :render_as => "Markdown") +vanilla_rb = app.snip(:name => 'vanilla-rb', :render_as => "Markdown") vanilla_rb.content = <<-EOS Vanilla.rb is the software powering this site. It's a sort-of wiki/bliki thing, based on {link_to vanilla}. @@ -143,9 +144,9 @@ Here's the tutorial (helpfully included from {link_to vanilla-rb-tutorial}). [2]: http://lazyatom.lighthouseapp.com/projects/11797-vanilla/tickets [3]: http://interblah.net/introducing-vanilla-rb EOS -vanilla_rb. +vanilla_rb.save -vanilla = Snip.new(:name => 'vanilla', :render_as => "Markdown") +vanilla = app.snip(:name => 'vanilla', :render_as => "Markdown") vanilla.content = <<-EOS The bliki upon which {link_to vanilla-rb} is based, writen by [Christian Langreiter][1] @@ -154,4 +155,90 @@ The bliki upon which {link_to vanilla-rb} is based, writen by [Christian Langrei [1]: http://www.langreiter.com [2]: http://www.vanillasite.at EOS -vanilla.save \ No newline at end of file +vanilla.save + +test = app.snip(:name => "test") +test.content =<<EOF +Linking is good: {link_to bold} +Here's a bold snip: {bold} + +- Here's a random number between 5 and 15: {rand 5,15} +- Here's a random number between 1 and 90 (the default min): {rand 90} +- Here's a random number between 1 and 100 (the default range): {rand} + +And lets include some textile: + +{textile_example} + +The source for that was + +{pre textile_example} + +And lets include some markdown!: + +{markdown_example} + +The source for that was + +{pre markdown_example} + +How about some {link_to debug} information: {debug} + +What about a missing snip? Lets try to include one: {monkey} + +And an error when running? {bad_dynasnip} + +EOF +test.render_as = "Markdown" +test.save + +bold = app.snip(:name => "bold") +bold.content =<<EOF +Snip2 in da house! +EOF +bold.render_as = "Bold" +bold.save + +textile = app.snip(:name => "textile_example") +textile.content =<<EOF + +# testing lists +# because lists are common things + +monkey + +what the *hell* are __you__ looking at? + +"Beyotch":http://example.com + +EOF +textile.render_as = "Textile" +textile.save + +textile = app.snip(:name => "markdown_example") +textile.content =<<EOF + +# testing header + +so, how are you? + +- item one +- item two +- item three + + +what the *hell* are looking at, [beyotch](http://example.com)? +EOF +textile.render_as = "Markdown" +textile.save + +bad_dynasnip = app.snip(:name => "bad_dynasnip", :render_as => "Ruby") +bad_dynasnip.content = <<EOF +class BadDynasnip + def get(*args) + raise "Oh no" + end +end +BadDynasnip +EOF +bad_dynasnip.save \ No newline at end of file lib/vanilla/snips/tutorial.rb @@ -6,26 +6,23 @@ describe Dynasnip, "when storing attributes" do attribute :test_attribute, "test attribute content" end - before(:each) do - @fake_app = nil - end - it "should make the attribute available as an instance method" do - TestDyna.new(@fake_app).test_attribute.should == "test attribute content" + p TestDyna.new(@app).test_attribute + TestDyna.new(@app).test_attribute.should == "test attribute content" end it "should store the attribute in the soup" do - TestDyna.persist! - Soup['test_dyna'].test_attribute.should == "test attribute content" + @app.soup << TestDyna.snip_attributes + @app.soup['test_dyna'].test_attribute.should == "test attribute content" end it "should allow the attribute to be overriden by the soup contents" do - TestDyna.persist! - snip = Soup['test_dyna'] + @app.soup << TestDyna.snip_attributes + snip = @app.soup['test_dyna'] snip.test_attribute = "altered content" snip.save - TestDyna.new(@fake_app).test_attribute.should == "altered content" + TestDyna.new(@app).test_attribute.should == "altered content" end end \ No newline at end of file spec/dynasnip_spec.rb @@ -9,11 +9,11 @@ describe Vanilla::Renderers::Ruby do end before(:each) do - @test_dyna = TestDyna.persist! + @app.soup << TestDyna.snip_attributes end it "should render the result of the handle method" do - Vanilla::Test.response_body_for("/test_dyna").should == 'handle called' + response_body_for("/test_dyna").should == 'handle called' end end @@ -28,15 +28,15 @@ describe Vanilla::Renderers::Ruby do end before(:each) do - @dyna = RestishDyna.persist! + @app.soup << RestishDyna.snip_attributes end it "should render the result of the get method on GET requests" do - Vanilla::Test.response_body_for("/restish_dyna").should == 'get called' + response_body_for("/restish_dyna").should == 'get called' end it "should render the result of the post method on POST requests" do - Vanilla::Test.response_body_for("/restish_dyna?_method=post") == 'post called' + response_body_for("/restish_dyna?_method=post") == 'post called' end end @@ -48,12 +48,12 @@ describe Vanilla::Renderers::Ruby do end before(:each) do - @dyna = Encloser.persist! + @app.soup << Encloser.snip_attributes create_snip(:name => "test", :content => "{encloser}") end it "should know about the snip that called this dynasnip" do - Vanilla::Test.response_body_for("/test").should == 'enclosing snip is test' + response_body_for("/test").should == 'enclosing snip is test' end end end \ No newline at end of file spec/renderers/ruby_renderer_spec.rb @@ -6,7 +6,7 @@ describe "when detecting the snip renderer" do end it "should return the constant refered to in the render_as property of the snip" do - snip = create_snip(:render_as => "Raw") + snip = create_snip(:name => "blah", :render_as => "Raw") @app.renderer_for(snip).should == Vanilla::Renderers::Raw end @@ -21,7 +21,7 @@ describe "when detecting the snip renderer" do end it "should raise an error if the specified renderer doesn't exist" do - snip = create_snip(:render_as => "NonExistentClass") + snip = create_snip(:name => "blah", :render_as => "NonExistentClass") lambda { @app.renderer_for(snip) }.should raise_error end @@ -29,7 +29,7 @@ describe "when detecting the snip renderer" do class ::MyRenderer end - snip = create_snip(:render_as => "MyRenderer") + snip = create_snip(:name => "blah", :render_as => "MyRenderer") @app.renderer_for(snip).should == MyRenderer end end \ No newline at end of file spec/renderers/vanilla_app_detecting_renderer_spec.rb @@ -7,22 +7,18 @@ require "rack/mock" module Vanilla module Test def setup_clean_environment - test_soup_config = { :database => File.join(File.dirname(__FILE__), "soup_test.db")} - FileUtils.rm(test_soup_config[:database]) if File.exist?(test_soup_config[:database]) - Soup.base = test_soup_config + FileUtils.mkdir_p(File.dirname(test_config_file)) + clear_soup + File.open(test_config_file, 'w') { |f| f.write({:soup => soup_path}.to_yaml) } + @app = Vanilla::App.new(test_config_file) - # TODO: this is hard-coded for the AR implementation - require "active_record" - ActiveRecord::Migration.verbose = false - - Soup.prepare require "vanilla/dynasnips/current_snip" - CurrentSnip.persist! + @app.soup << CurrentSnip.snip_attributes create_snip :name => "system", :main_template => "{current_snip}" end def response_for(url) - Vanilla::App.new.call(mock_env_for_url(url)) + @app.call(mock_env_for_url(url)) end def response_body_for(url) @@ -34,13 +30,13 @@ module Vanilla end def set_main_template(template_content) - system = Vanilla.snip("system") || Snip.new(:name => "system") + system = @app.soup["system"] || Snip.new({:name => "system"}, @app.soup) system.main_template = template_content system.save end def create_snip(params) - s = Snip.new(params) + s = Snip.new(params, @app.soup) s.save s end @@ -53,12 +49,22 @@ module Vanilla Rack::Request.new(mock_env_for_url(url)) end - extend self + def test_config_file + File.join(File.dirname(__FILE__), "tmp", "config.yml") + end + + def soup_path + File.expand_path(File.join(File.dirname(__FILE__), "tmp", "soup")) + end + + def clear_soup + FileUtils.rm_rf(soup_path) + end end end Spec::Runner.configure do |config| config.include(Vanilla::Test) - config.before { Vanilla::Test.setup_clean_environment } + config.before { setup_clean_environment } end spec/spec_helper.rb @@ -4,7 +4,7 @@ describe Vanilla::App do describe "when behaving as a Rack application" do it "should return an array of status code, headers and response" do create_snip(:name => "test", :content => "content") - result = Vanilla::App.new.call(mock_env_for_url("/test.text")) + result = @app.call(mock_env_for_url("/test.text")) result.should be_a_kind_of(Array) result[0].should == 200 result[1].should be_a_kind_of(Hash) @@ -14,19 +14,19 @@ describe Vanilla::App do describe "when being configured" do it "should load a config file from the current working directory by default" do - File.should_receive(:open).with("config.yml").and_return(StringIO.new({}.to_yaml)) + File.should_receive(:open).with("config.yml").and_return(StringIO.new({:soup => soup_path}.to_yaml)) Vanilla::App.new end it "should load a config file given" do - File.open("/tmp/vanilla_config.yml", "w") { |f| f.write({:hello => true}.to_yaml) } + File.open("/tmp/vanilla_config.yml", "w") { |f| f.write({:soup => soup_path, :hello => true}.to_yaml) } app = Vanilla::App.new("/tmp/vanilla_config.yml") app.config[:hello].should be_true end it "should allow saving of configuration to the same file it was loaded from" do config_file = "/tmp/vanilla_config.yml" - File.open(config_file, "w") { |f| f.write({:hello => true}.to_yaml) } + File.open(config_file, "w") { |f| f.write({:soup => soup_path, :hello => true}.to_yaml) } app = Vanilla::App.new(config_file) app.config[:saved] = true app.config.save! spec/vanilla_app_spec.rb @@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), "spec_helper") describe Vanilla::App do before(:each) do - LinkTo.persist! + @app.soup << LinkTo.snip_attributes set_main_template "<tag>{current_snip}</tag>" create_snip :name => "test", :content => "blah {other_snip}", :part => 'part content' create_snip :name => "other_snip", :content => "blah!" @@ -67,7 +67,7 @@ describe Vanilla::App do describe "when a missing snip is requested" do it "should render missing snip content in the main template" do - response_body_for("/missing_snip").should == "<tag>Couldn't find snip #{LinkTo.new(nil).handle("missing_snip")}</tag>" + response_body_for("/missing_snip").should == "<tag>Couldn't find snip #{LinkTo.new(@app).handle("missing_snip")}</tag>" end it "should have a 404 response code" do spec/vanilla_presenting_spec.rb @@ -1,14 +1,14 @@ 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")) } + 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 - Vanilla.should_receive(:snip).with('snip').and_return(:snip) + @app.soup.should_receive(:[]).with('snip').and_return(:snip) @request.snip.should == :snip end @@ -26,7 +26,7 @@ describe Vanilla::Request, "when requesting urls" do end describe Vanilla::Request, "when requesting a snip part" do - before(:each) { @request = Vanilla::Request.new(mock_env_for_url("/snip/part")) } + 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" @@ -39,7 +39,7 @@ describe Vanilla::Request, "when requesting a snip part" do end describe Vanilla::Request, "when requesting a snip with a format" do - before(:each) { @request = Vanilla::Request.new(mock_env_for_url("/snip.raw")) } + 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" @@ -51,7 +51,7 @@ describe Vanilla::Request, "when requesting a snip with a format" do 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")) } + 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" @@ -68,6 +68,6 @@ 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")).method.should == 'put' + Vanilla::Request.new(mock_env_for_url("/snip?_method=put"), @app).method.should == 'put' end end \ No newline at end of file spec/vanilla_request_spec.rb @@ -6,12 +6,12 @@ Gem::Specification.new do |s| s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["James Adam"] - s.date = %q{2009-08-28} + s.date = %q{2009-09-25} s.default_executable = %q{vanilla} s.email = %q{james@lazyatom.com.com} s.executables = ["vanilla"] s.extra_rdoc_files = ["README"] - s.files = ["config.example.yml", "config.ru", "Rakefile", "README", "spec/dynasnip_spec.rb", "spec/renderers", "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/soup_test.db", "spec/spec_helper.rb", "spec/vanilla_app_spec.rb", "spec/vanilla_presenting_spec.rb", "spec/vanilla_request_spec.rb", "spec/vanilla_snip_finding_spec.rb", "lib/defensio.rb", "lib/tasks", "lib/tasks/vanilla.rake", "lib/vanilla", "lib/vanilla/app.rb", "lib/vanilla/console.rb", "lib/vanilla/dynasnip.rb", "lib/vanilla/dynasnips", "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", "lib/vanilla/renderers/base.rb", "lib/vanilla/renderers/bold.rb", "lib/vanilla/renderers/erb.rb", "lib/vanilla/renderers/markdown.rb", "lib/vanilla/renderers/raw.rb", "lib/vanilla/renderers/ruby.rb", "lib/vanilla/renderers/textile.rb", "lib/vanilla/request.rb", "lib/vanilla/routes.rb", "lib/vanilla/snip_handling.rb", "lib/vanilla/snip_reference.rb", "lib/vanilla/snip_reference.treetop", "lib/vanilla/snip_reference_parser.rb", "lib/vanilla/snips", "lib/vanilla/snips/start.rb", "lib/vanilla/snips/system.rb", "lib/vanilla/snips/tutorial.rb", "lib/vanilla/test_snips.rb", "lib/vanilla.rb", "bin/vanilla", "public/hatch.png", "public/javascripts", "public/javascripts/jquery.autogrow-textarea.js", "public/javascripts/jquery.js", "public/javascripts/vanilla.js"] + s.files = ["config.example.yml", "config.ru", "Rakefile", "README", "spec/dynasnip_spec.rb", "spec/renderers", "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", "spec/tmp/config.yml", "spec/tmp/soup", "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", "lib/tasks/vanilla.rake", "lib/vanilla", "lib/vanilla/app.rb", "lib/vanilla/console.rb", "lib/vanilla/dynasnip.rb", "lib/vanilla/dynasnips", "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", "lib/vanilla/renderers/base.rb", "lib/vanilla/renderers/bold.rb", "lib/vanilla/renderers/erb.rb", "lib/vanilla/renderers/markdown.rb", "lib/vanilla/renderers/raw.rb", "lib/vanilla/renderers/ruby.rb", "lib/vanilla/renderers/textile.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/snips", "lib/vanilla/snips/start.rb", "lib/vanilla/snips/system.rb", "lib/vanilla/snips/tutorial.rb", "lib/vanilla.rb", "bin/vanilla", "public/hatch.png", "public/javascripts", "public/javascripts/jquery.autogrow-textarea.js", "public/javascripts/jquery.js", "public/javascripts/vanilla.js"] s.homepage = %q{http://github.com/lazyatom/vanilla-rb} s.rdoc_options = ["--main", "README"] s.require_paths = ["lib"] vanilla.gemspec lib/vanilla/snip_handling.rb lib/vanilla/test_snips.rb spec/vanilla_snip_finding_spec.rb edf0bb6a9d0a84cbedc115d66efdbb4cf24d4b2d James Adam james@lazyatom.com http://github.com/lazyatom/vanilla-rb/commit/b3b44e2bffea809675c230bdfb09ac184c1f1500 b3b44e2bffea809675c230bdfb09ac184c1f1500 2009-09-27T05:21:13-07:00 2009-09-25T10:26:29-07:00 Sweeping changes which co-incide with switching soup to a file-based store. Most notably: * Routing methods are no longer static module methods, but included in the renderers (e.g. link_to, url_for, etc) * The interface to the soup is consistent - Vanilla::App#soup returns the soup instance, and is available via the app attribute of renderers and dynasnips * Some direct accesses to private Soup implementations have been 'fixed'. 4adb6dd25c8fd4a4c2ee405b4b354c27eaa74a64 James Adam james@lazyatom.com