radiant 1.0.1 → 1.1.0.alpha

data/radiant.gemspec

@@ -40,16 +40,6 @@ a general purpose content managment system--not merely a blogging engine.}
   s.add_dependency "will_paginate", "~> 2.3.11"
   s.add_dependency "stringex",      "~> 1.3.0"
 
-  s.add_dependency "radiant-archive-extension",             "~> 1.0.7"
-  s.add_dependency "radiant-clipped-extension",             "~> 1.0.16"
-  s.add_dependency "radiant-debug-extension",               "~> 1.0.2"
-  s.add_dependency "radiant-exporter-extension",            "~> 1.0.2"
-  s.add_dependency "radiant-markdown_filter-extension",     "~> 1.0.2"
-  s.add_dependency "radiant-sheets-extension",              "~> 1.0.9"
-  s.add_dependency "radiant-site_templates-extension",      "~> 1.0.4"
-  s.add_dependency "radiant-smarty_pants_filter-extension", "~> 1.0.2"
-  s.add_dependency "radiant-textile_filter-extension",      "~> 1.0.4"
-
   s.add_development_dependency "cucumber-rails",    "~> 0.3.2"
   s.add_development_dependency "database_cleaner",  "~> 0.6.5"
   s.add_development_dependency "hoe",               "1.5.1"

data/spec/controllers/admin/paginated_controller_spec.rb

@@ -1,10 +1,9 @@
 require File.dirname(__FILE__) + "/../../spec_helper"
 
-describe Admin::SnippetsController do
-  dataset :users, :snippets
+describe Admin::UsersController do
 
   it "should be paginated" do
-    Admin::SnippetsController.paginated.should be_true
+    Admin::UsersController.paginated.should be_true
     controller.paginated?.should be_true
   end
 
@@ -13,7 +12,7 @@ describe Admin::SnippetsController do
   # describe "with pagination settings from paginate_models" do
   #   it "should override defaults" do
   #     Radiant.config['admin.pagination.per_page'] = ""
-  #     Admin::SnippetsController.send :paginate_models, {:per_page => 5, :inner_window => 12}
+  #     Admin::UsersController.send :paginate_models, {:per_page => 5, :inner_window => 12}
   #     controller.pagination_parameters.should == {:page => 1, :per_page => 5}
   #     controller.will_paginate_options.should == {:inner_window => 12, :param_name => :p}
   #   end

data/spec/datasets/markup_pages_dataset.rb

@@ -1,12 +1,24 @@
+class PseudoTextileFilter < TextFilter
+  def filter(text)
+    text + ' - Filtered with TEXTILE!'
+  end
+end
+
+class PseudoMarkdownFilter < TextFilter
+  def filter(text)
+    text + ' - Filtered with MARKDOWN!'
+  end
+end
+
 class MarkupPagesDataset < Dataset::Base
   uses :home_page
   
   def load
     create_page "Textile" do
-      create_page_part :textile_body, :name => "body", :filter_id => "Textile", :content => "Some *Textile* content."
+      create_page_part :textile_body, :name => "body", :filter_id => "Pseudo Textile", :content => "Some *Textile* content."
     end
     create_page "Markdown" do
-      create_page_part :markdown_body, :name => "body", :filter_id => "Markdown", :content => "Some **Markdown** content."
+      create_page_part :markdown_body, :name => "body", :filter_id => "Pseudo Markdown", :content => "Some **Markdown** content."
     end
   end
   

data/spec/helpers/admin/pages_helper_spec.rb

@@ -38,11 +38,6 @@ describe Admin::PagesHelper do
       helper.filter.should be_kind_of(TextFilter)
     end
     
-    it "should render the filter reference" do
-      helper.stub!(:filter).and_return(TextileFilter)
-      helper.filter_reference.should == TextileFilter.description
-    end
-    
     it "should render the filter reference for complex filter names" do
       MarkdownPlusFilter.stub!(:description).and_return("Markdown rocks!")
       helper.stub!(:filter).and_return(MarkdownPlusFilter)

data/spec/helpers/admin/references_helper_spec.rb

@@ -1,6 +1,7 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe Admin::ReferencesHelper do
+  class BasicFilter < TextFilter; end
   class CustomFilter < TextFilter
     filter_name "Really Custom"
   end
@@ -35,8 +36,8 @@ describe Admin::ReferencesHelper do
     end
 
     it "should return the filter object for the named filter" do
-      params[:filter_name] = "Textile"
-      helper.filter.should == TextileFilter
+      params[:filter_name] = "Basic"
+      helper.filter.should == BasicFilter
     end
 
     it "should return the filter object for a custom named filter" do
@@ -58,8 +59,8 @@ describe Admin::ReferencesHelper do
       end
 
       it "should return the name of the set filter" do
-        params[:filter_name] = "Textile"
-        helper._display_name.should == "Textile"
+        params[:filter_name] = "Basic"
+        helper._display_name.should == "Basic"
       end
 
       it "should return <none> when no filter is set" do
@@ -90,16 +91,17 @@ describe Admin::ReferencesHelper do
     before :each do
       helper.send(:instance_variable_set, :@filter, nil)
       params[:type] = 'filters'
-      params[:filter_name] = 'Textile'
+      params[:filter_name] = 'Basic'
     end
 
     it "should render a helpful message when the description is blank" do
-      TextileFilter.should_receive(:description).and_return('')
+      BasicFilter.should_receive(:description).and_return('')
       helper.filter_reference.should == "There is no documentation on this filter."
     end
 
     it "should render the filter's description when available" do
-      helper.filter_reference.should == TextileFilter.description
+      BasicFilter.should_receive(:description).at_least(:once).and_return('This is basic stuff.')
+      helper.filter_reference.should == BasicFilter.description
     end
 
     it "should render a helpful message when no filter is selected" do

data/spec/helpers/application_helper_spec.rb

@@ -94,7 +94,6 @@ describe ApplicationHelper do
     helper.stub!(:request).and_return(request)
     request.stub!(:request_uri).and_return("/admin/pages")
     helper.nav_link_to("Pages", "/admin/pages").should =~ /<strong>/
-    helper.nav_link_to("Snippets", "/admin/snippets").should_not =~ /<strong>/
   end
   
   it "should render an admin link without translation" do
@@ -175,7 +174,7 @@ describe ApplicationHelper do
 
   it "should return filter options for select" do
     helper.filter_options_for_select.should =~ %r{<option value=\"\">&lt;none&gt;</option>}
-    helper.filter_options_for_select.should =~ %r{<option value=\"Markdown\">Markdown</option>}
+    helper.filter_options_for_select.should =~ %r{<option value=\"Basic\">Basic</option>}
   end 
 
   it "should include the regions helper" do

data/spec/lib/radiant/admin_ui/nav_tabs_spec.rb

@@ -30,10 +30,10 @@ describe Radiant::AdminUI::NavTab do
   describe "inserting sub-items in specific places" do
     before :each do
       @pages    = Radiant::AdminUI::NavSubItem.new("Pages",    "/admin/pages")
-      @snippets = Radiant::AdminUI::NavSubItem.new("Snippets", "/admin/snippets")
+      @things   = Radiant::AdminUI::NavSubItem.new("Things",   "/admin/things")
       @comments = Radiant::AdminUI::NavSubItem.new("Comments", "/admin/comments")
       @tab << @pages
-      @tab << @snippets
+      @tab << @things
     end
 
     it "should insert at the end by default" do
@@ -42,7 +42,7 @@ describe Radiant::AdminUI::NavTab do
     end
     
     it "should insert before the specified sub-item" do
-      @tab.add(@comments, :before => :snippets)
+      @tab.add(@comments, :before => :things)
       @tab[1].should == @comments
     end
     

data/spec/lib/radiant/admin_ui_spec.rb

@@ -26,12 +26,12 @@ describe Radiant::AdminUI do
     @admin.initialize_nav
     @admin.nav.should have(3).items
     @admin.nav[:content].should have(1).items
-    @admin.nav[:design].should have(2).items
+    @admin.nav[:design].should have(1).items
     @admin.nav[:settings].should have(4).items
   end
 
   it "should have collections of Region Sets for every controller" do
-    %w{page snippet layout user}.each do |collection|
+    %w{page layout user}.each do |collection|
       @admin.should respond_to(collection)
       @admin.should respond_to(collection.pluralize)
       @admin.send(collection).should_not be_nil
@@ -62,21 +62,6 @@ describe Radiant::AdminUI do
     page.new.should === page.edit
   end
 
-  it "should load the default snippet regions" do
-    snippet = @admin.snippet
-    snippet.edit.should_not be_nil
-    snippet.edit.main.should == %w{edit_header edit_form}
-    snippet.edit.form.should == %w{edit_title edit_content edit_filter}
-    snippet.edit.form_bottom.should == %w{edit_buttons edit_timestamp}
-    snippet.index.should_not be_nil
-    snippet.index.top.should == %w{}
-    snippet.index.thead.should == %w{title_header actions_header}
-    snippet.index.tbody.should == %w{title_cell actions_cell}
-    snippet.index.bottom.should == %w{new_button}
-
-    snippet.new.should == snippet.edit
-  end
-
   it "should load the default layout regions" do
     layout = @admin.layout
     layout.edit.should_not be_nil

data/spec/lib/radiant/initializer_spec.rb

@@ -33,18 +33,18 @@ describe Radiant::Configuration do
   end
   
   it "should expand the extension list" do
-    @configuration.extensions = [:archive, :all, :sheets]
-    @configuration.enabled_extensions.should include(:clipped)
+    @configuration.extensions = [:routed, :all, :basic]
+    @configuration.enabled_extensions.should include(:load_order_blue)
   end
 
   it "should throw a LoadError if configured extensions do not exist" do
-    @configuration.extensions = [:archive, :bogus, :sheets]
+    @configuration.extensions = [:routed, :bogus, :basic]
     lambda {@configuration.enabled_extensions}.should raise_error(LoadError)
   end  
 
   it "should default to the list of all discovered extensions" do
     @configuration.extensions = nil
-    @configuration.enabled_extensions.should include(:clipped)
+    @configuration.enabled_extensions.should include(:routed)
   end  
   
   it "should have access to the AdminUI" do

data/spec/lib/radiant/taggable_spec.rb

@@ -122,7 +122,7 @@ describe Radiant::Taggable, "when included in a module with defined tags" do
 end
 
 describe Radiant::Taggable, "when included in a module with defined tags which is included in the Page model" do
-  dataset :users_and_pages, :file_not_found, :snippets
+  dataset :users_and_pages, :file_not_found
   
   module CustomTags
     include Radiant::Taggable

data/spec/models/page_part_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe PagePart do
   dataset :home_page
@@ -15,16 +15,17 @@ describe PagePart do
   end
   
   it "should take the filter from the default filter" do
-    Radiant::Config['defaults.page.filter'] = "Textile"
+    Radiant::Config['defaults.page.filter'] = "Pseudo Textile"
     part = PagePart.new :name => 'new-part'
-    part.filter_id.should == "Textile"
+    part.filter_id.should == "Pseudo Textile"
   end
 
   it "shouldn't override existing page_parts filters with the default filter" do
     part = PagePart.find(:first, :conditions => {:filter_id => nil})
-    Radiant::Config['defaults.page.filter'] = "Textile"
+    selected_filter_name = TextFilter.descendants.first.filter_name
+    Radiant::Config['defaults.page.filter'] = selected_filter_name
     part.reload
-    part.filter_id.should_not == "Textile"
+    part.filter_id.should_not == selected_filter_name
   end
   
   it 'should validate length of' do
@@ -50,11 +51,11 @@ describe PagePart, 'filter' do
   specify 'getting and setting' do
     @part = page_parts(:textile_body)
     original = @part.filter
-    original.should be_kind_of(TextileFilter)
+    original.should be_kind_of(PseudoTextileFilter)
     
     @part.filter.should equal(original)
     
-    @part.filter_id = 'Markdown'
-    @part.filter.should be_kind_of(MarkdownFilter)
+    @part.filter_id = 'Pseudo Markdown'
+    @part.filter.should be_kind_of(PseudoMarkdownFilter)
   end
 end

data/spec/models/page_spec.rb

@@ -24,6 +24,12 @@ class PageSpecTestPage < Page
   end
 end
 
+class VirtualSpecPage < Page
+  def virtual?
+    true
+  end
+end
+
 describe Page, 'validations' do
   dataset :pages
   test_helper :validations
@@ -82,9 +88,9 @@ describe Page, 'validations' do
   end
 
   it 'should allow mass assignment for class name' do
-    @page.attributes = { :class_name => 'ArchivePage' }
+    @page.attributes = { :class_name => 'PageSpecTestPage' }
     assert_valid @page
-    @page.class_name.should == 'ArchivePage'
+    @page.class_name.should == 'PageSpecTestPage'
   end
 
   it 'should not be valid when class name is not a descendant of page' do
@@ -103,7 +109,7 @@ describe Page, 'validations' do
 
   it 'should be valid when class name is page or empty or nil' do
     [nil, '', 'Page'].each do |value|
-      @page = ArchivePage.new(page_params)
+      @page = PageSpecTestPage.new(page_params)
       @page.class_name = value
       assert_valid @page
       @page.class_name.should == value
@@ -356,8 +362,8 @@ describe Page do
     end
 
     it 'should return a collection containing the default_child and ordered by name Page descendants that are in_menu' do
-      Page.should_receive(:descendants).and_return([ArchivePage, CustomFileNotFoundPage])
-      page.allowed_children_lookup.should == [Page, ArchivePage, CustomFileNotFoundPage]
+      Page.should_receive(:descendants).and_return([PageSpecTestPage, CustomFileNotFoundPage])
+      page.allowed_children_lookup.should == [Page, CustomFileNotFoundPage, PageSpecTestPage]
     end
   end
 end
@@ -366,12 +372,12 @@ describe Page, "before save filter" do
   dataset :home_page
 
   before :each do
-    Page.create(page_params(:title =>"Month Index", :class_name => "ArchiveMonthIndexPage"))
+    Page.create(page_params(:title =>"Month Index", :class_name => "VirtualSpecPage"))
     @page = Page.find_by_title("Month Index")
   end
 
   it 'should set the class name correctly' do
-    @page.should be_kind_of(ArchiveMonthIndexPage)
+    @page.should be_kind_of(VirtualSpecPage)
   end
 
   it 'should set the virtual bit correctly' do
@@ -381,14 +387,14 @@ describe Page, "before save filter" do
 
   it 'should update virtual based on new class name' do
     # turn a regular page into a virtual page
-    @page.class_name = "ArchiveMonthIndexPage"
+    @page.class_name = "VirtualSpecPage"
     @page.save.should == true
     @page.virtual?.should == true
     @page.send(:read_attribute, :virtual).should == true
 
    # turn a virtual page into a non-virtual one
    ["", nil, "Page", "PageSpecTestPage"].each do |value|
-      @page = ArchiveYearIndexPage.create(page_params)
+      @page = PageSpecTestPage.create(page_params)
       @page.class_name = value
       @page.save.should == true
       @page = Page.find @page.id
@@ -400,7 +406,7 @@ describe Page, "before save filter" do
 end
 
 describe Page, "rendering" do
-  dataset :pages, :markup_pages, :snippets, :layouts
+  dataset :pages, :markup_pages, :layouts
   test_helper :render
 
   before :each do
@@ -412,7 +418,7 @@ describe Page, "rendering" do
   end
 
   it 'should render with a filter' do
-    pages(:textile).render.should == '<p>Some <strong>Textile</strong> content.</p>'
+    pages(:textile).render.should == 'Some *Textile* content. - Filtered with TEXTILE!'
   end
 
   it 'should render with tags' do
@@ -432,18 +438,6 @@ describe Page, "rendering" do
     @page.render_part(:empty).should == ''
   end
 
-  it 'should render a snippet' do
-    @page.render_snippet(snippets(:first)).should == 'test'
-  end
-
-  it 'should render a snippet with a filter' do
-    @page.render_snippet(snippets(:markdown)).should match(%r{<p><strong>markdown</strong></p>})
-  end
-
-  it 'should render a snippet with a tag' do
-    @page.render_snippet(snippets(:radius)).should == 'Home'
-  end
-
   it 'should render custom pages with tags' do
     create_page "Test Page", :body => "<r:test1 /> <r:test2 />", :class_name => "PageSpecTestPage"
     pages(:test_page).should render_as('Hello world! Another test. body.')
@@ -614,11 +608,11 @@ end
 
 describe Page, 'loading subclasses after bootstrap' do
   it "should find subclasses in extensions" do
-    defined?(ArchivePage).should_not be_nil
+    defined?(BasicExtensionPage).should_not be_nil
   end
 
   it "should not adjust the display name of subclasses found in extensions" do
-    ArchivePage.display_name.should_not match(/not installed/)
+    BasicExtensionPage.display_name.should_not match(/not installed/)
   end
 end
 

data/spec/models/standard_tags_spec.rb

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe "Standard Tags" do
-  dataset :users_and_pages, :file_not_found, :snippets
+  dataset :users_and_pages, :file_not_found
 
   it '<r:page> should allow access to the current page' do
     page(:home)
@@ -677,65 +677,6 @@ describe "Standard Tags" do
     end
   end
 
-  describe "<r:snippet>" do
-    it "should render the contents of the specified snippet" do
-      page.should render('<r:snippet name="first" />').as('test')
-    end
-
-    it "should render an error when the snippet does not exist" do
-      page.should render('<r:snippet name="non-existant" />').with_error("snippet 'non-existant' not found")
-    end
-
-    it "should render an error when not given a 'name' attribute" do
-      page.should render('<r:snippet />').with_error("`snippet' tag must contain a `name' attribute.")
-    end
-
-    it "should filter the snippet with its assigned filter" do
-      page.should render('<r:page><r:snippet name="markdown" /></r:page>').matching(%r{<p><strong>markdown</strong></p>})
-    end
-
-    it "should maintain the global page inside the snippet" do
-      page(:parent).should render('<r:snippet name="global_page_cascade" />').as("#{@page.title} " * @page.children.count)
-    end
-
-    it "should maintain the global page when the snippet renders recursively" do
-      page(:child).should render('<r:snippet name="recursive" />').as("Great GrandchildGrandchildChild")
-    end
-
-    it "should render the specified snippet when called as an empty double-tag" do
-      page.should render('<r:snippet name="first"></r:snippet>').as('test')
-    end
-
-    it "should capture contents of a double tag, substituting for <r:yield/> in snippet" do
-      page.should render('<r:snippet name="yielding">inner</r:snippet>').
-        as('Before...inner...and after')
-    end
-
-    it "should do nothing with contents of double tag when snippet doesn't yield" do
-      page.should render('<r:snippet name="first">content disappears!</r:snippet>').
-        as('test')
-    end
-
-    it "should render nested yielding snippets" do
-      page.should render('<r:snippet name="div_wrap"><r:snippet name="yielding">Hello, World!</r:snippet></r:snippet>').
-      as('<div>Before...Hello, World!...and after</div>')
-    end
-
-    it "should render double-tag snippets called from within a snippet" do
-      page.should render('<r:snippet name="nested_yields">the content</r:snippet>').
-        as('<snippet name="div_wrap">above the content below</snippet>')
-    end
-
-    it "should render contents each time yield is called" do
-      page.should render('<r:snippet name="yielding_often">French</r:snippet>').
-        as('French is Frencher than French')
-    end
-  end
-
-  it "should do nothing when called from page body" do
-    page.should render('<r:yield/>').as("")
-  end
-
   it '<r:random> should render a randomly selected contained <r:option>' do
     page.should render("<r:random> <r:option>1</r:option> <r:option>2</r:option> <r:option>3</r:option> </r:random>").matching(/^(1|2|3)$/)
   end