radiant 1.0.1 → 1.1.0.alpha

data/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Change Log
 
-## 1.0.1 (March 6, 2012)
+## Edge
 
 * Ruby 1.9.3 compatibility [Jim Gay]
 * Allow page menus to be overridden by additional modules [Jim Gay]

data/Gemfile

@@ -8,15 +8,25 @@ source :rubygems
 # dependency mentioned in radiant.gemspec.
 
 gem "rails",   "2.3.14"
-gem "sqlite3", "1.3.4", :group => [:development, :test]
+gem "sqlite3", "1.3.4", :group => [:development, :test], :platform => :ruby
 
 # When radiant is installed as a gem you can run all of
 # its tests and specs from an instance. If you're working
 # on radiant itself and you want to run specs from the 
-# radiant root directory, uncomment the line below and 
+# radiant root directory, uncomment the lines below and 
 # run `bundle install`.
 
 # gemspec
+# gem "radiant-archive-extension",             "~> 1.0.7"
+# gem "radiant-clipped-extension",             "~> 1.0.16"
+# gem "radiant-debug-extension",               "~> 1.0.2"
+# gem "radiant-exporter-extension",            "~> 1.1.0"
+# gem "radiant-markdown_filter-extension",     "~> 1.0.2"
+# gem "radiant-sheets-extension",              "~> 1.0.9"
+# gem "radiant-site_templates-extension",      "~> 1.0.4"
+# gem "radiant-smarty_pants_filter-extension", "~> 1.0.2"
+# gem "radiant-snippets-extension",            "~> 1.0.0"
+# gem "radiant-textile_filter-extension",      "~> 1.0.4"
 
 if ENV['TRAVIS']
   gemspec :development_group => :test

data/Gemfile.lock

@@ -23,6 +23,7 @@ GEM
     sqlite3 (1.3.4)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES

data/README.md

@@ -4,7 +4,7 @@ Radiant is a no-fluff, open source content management system designed for
 small teams. It is similar to Textpattern or MovableType, but is a general
 purpose content management system (not just a blogging engine).
 
-[![Build Status](https://secure.travis-ci.org/radiant/radiant.png)](http://travis-ci.org/radiant/radiant)
+[![Build Status](https://secure.travis-ci.org/radiant/radiant.png?branch=version1)](http://travis-ci.org/radiant/radiant)
 
 Radiant features:
 

data/app/models/standard_tags.rb

@@ -832,81 +832,6 @@ module StandardTags
     breadcrumbs.join(separator)
   end
 
-  desc %{
-    Renders the snippet specified in the @name@ attribute within the context of a page.
-
-    *Usage:*
-
-    <pre><code><r:snippet name="snippet_name" /></code></pre>
-
-    When used as a double tag, the part in between both tags may be used within the
-    snippet itself, being substituted in place of @<r:yield/>@.
-
-    *Usage:*
-
-    <pre><code><r:snippet name="snippet_name">Lorem ipsum dolor...</r:snippet></code></pre>
-  }
-  tag 'snippet' do |tag|
-    required_attr(tag, 'name')
-    name = tag['name']
-
-    snippet = snippet_cache(name.strip)
-    
-    if snippet
-      tag.locals.yield = tag.expand if tag.double?
-      tag.globals.page.render_snippet(snippet)
-    else
-      raise TagError.new("snippet '#{name}' not found")
-    end
-  end
-
-  def snippet_cache(name)
-    @snippet_cache ||= {}
-
-    snippet = @snippet_cache[name]
-    unless snippet
-      snippet = Snippet.find_by_name(name)
-      @snippet_cache[name] = snippet
-    end
-    snippet
-  end
-  private :snippet_cache
-
-  desc %{
-    Used within a snippet as a placeholder for substitution of child content, when
-    the snippet is called as a double tag.
-
-    *Usage (within a snippet):*
-    
-    <pre><code>
-    <div id="outer">
-      <p>before</p>
-      <r:yield/>
-      <p>after</p>
-    </div>
-    </code></pre>
-
-    If the above snippet was named "yielding", you could call it from any Page,
-    Layout or Snippet as follows:
-
-    <pre><code><r:snippet name="yielding">Content within</r:snippet></code></pre>
-
-    Which would output the following:
-
-    <pre><code>
-    <div id="outer">
-      <p>before</p>
-      Content within
-      <p>after</p>
-    </div>
-    </code></pre>
-
-    When called in the context of a Page or a Layout, @<r:yield/>@ outputs nothing.
-  }
-  tag 'yield' do |tag|
-    tag.locals.yield
-  end
-
   desc %{
     Inside this tag all page related tags refer to the page found at the @path@ attribute.
     @path@s may be relative or absolute paths.

data/app/models/user_action_observer.rb

@@ -1,5 +1,5 @@
 class UserActionObserver < ActiveRecord::Observer
-  observe User, Page, Layout, Snippet
+  observe User, Page, Layout
   
   def current_user=(user)
     self.class.current_user = user

data/config/locales/en.yml

@@ -51,8 +51,6 @@ en:
         filter: "page filter"
         parts: "page parts"
         status: "page status"
-      snippet:
-        filter: "snippet filter"
     dev:
       host: "dev site domain"
     local:
@@ -81,7 +79,6 @@ en:
       - :day
   delete_layout: 'Delete Layout'
   delete_pages: 'Delete %{pages}'
-  delete_snippet: 'Delete Snippet'
   delete_user: 'Delete User'
   description: 'Description'
   design: 'Design'
@@ -93,7 +90,6 @@ en:
   edit_page:  'Edit Page'   
   edit_preferences: 'Edit Preferences'
   edit_settings: 'Edit Settings'
-  edit_snippet: 'Edit Snippet'
   edit_user: 'Edit User'
   email_address: 'E-mail Address'
   extension: 'Extension'
@@ -116,12 +112,10 @@ en:
   new_layout: 'New Layout'    
   new_page: 'New Page'
   new_password: 'New Password'
-  new_snippet: 'New Snippet'
   new_user: 'New User'  
   'no': 'No'
   no_layouts: 'No Layouts'
   no_pages: 'No Pages'
-  no_snippets: 'No Snippets'
   normal_page: 'Normal Page'
   notes: 'Notes'    
   optional: 'Optional'
@@ -158,7 +152,6 @@ en:
   remove_layout: 'Remove Layout'
   remove_page: 'Remove Page'
   remove_pages: 'Remove %{pages}'
-  remove_snippet: 'Remove Snippet'
   remove_tab: 'Remove Tab'
   remove_user: 'Remove user'
   required: 'Required'  
@@ -182,8 +175,6 @@ en:
   settings: 'Settings'
   show_all: 'Show all'
   slug: 'Slug'
-  snippet: 'Snippet'   
-  snippets: 'Snippets'
   status: 'Status'
     # Warnings and info text:
   testing: Testing
@@ -192,8 +183,6 @@ en:
       remove_warning: 'Are you sure you want to <strong class="warning">permanently remove</strong> the following layout?'   
     pages: 
       remove_warning: 'Are you sure you want to <strong class="warning">permanently remove</strong> the following %{pages}?'
-    snippets:
-      remove_warning: 'Are you sure you want to <strong class="warning">permanently remove</strong> the following snippet?'
     users: 
       remove_warning: 'Are you sure you want to <strong class="warning">permanently remove</strong> the following user?'
   this_file_language: "English" 

data/config/routes.rb

@@ -6,7 +6,6 @@ ActionController::Routing::Routes.draw do |map|
       pages.resources :children, :controller => "pages"
     end
     admin.resources :layouts
-    admin.resources :snippets
     admin.resources :users
   end
   map.preview 'admin/preview', :controller => 'admin/pages', :action => 'preview', :conditions => {:method => [:post, :put]}

data/features/admin/configuration.feature

@@ -18,7 +18,6 @@ Feature: Rich configuration
 		And I should see "Page Parts"
 		And I should see "Page Fields"
 		And I should see "Page Status"
-		And I should see "Snippet Filter"
 		And I should see "Allow Password Reset"
 		
   Scenario: Editing configuration

data/features/admin/layouts_management.feature

@@ -1,4 +1,4 @@
-Feature: Managing snippets
+Feature: Managing layouts
   In order to properly display the content 
   As a designer I want to manage the layouts
   

data/features/admin/user_permissions.feature

@@ -41,26 +41,12 @@ Feature: User authentication and permissions
       | admin     |
       | existing  |
       | designer |
-      
-  Scenario Outline: Admins and designers can see and edit snippets
-    Given I am logged in as "<username>"
-    And I should see "Design"
-    When I follow "Design" within "#navigation"
-    And I follow "Snippets"
-    And I should not see "You must have designer privileges"
-    And I follow "first"
-    Then I should see "Edit Snippet"
-    
-    Examples:
-      | username  |
-      | admin     |
-      | designer |
   
   Scenario Outline: Admins and designers can see and edit layouts
     Given I am logged in as "<username>"
     And I should see "Design"
     When I follow "Design" within "#navigation"
-    And I follow "Layouts"
+    # And I follow "Layouts"
     And I should not see "You must have designer privileges"
     And I follow "Main"
     Then I should see "Edit Layout"
@@ -80,17 +66,6 @@ Feature: User authentication and permissions
       | username  |
       | existing  |
       | another   |
-  
-  Scenario Outline: Ordinary users cannot edit snippets
-    Given I am logged in as "<username>"
-    And I should not see "Design"
-    When I go to the "snippets" admin page
-    Then I should see "You must have designer privileges"
-
-    Examples:
-      | username  |
-      | existing  |
-      | another   |
     
   Scenario: Admins can see and edit users
     Given I am logged in as "admin"
@@ -128,7 +103,7 @@ Feature: User authentication and permissions
     Given I am logged in as "admin"
     When I follow "Settings"
     And I follow "Extensions"
-    Then I should see "Archive"
+    Then I should see "Basic"
   
   Scenario Outline: Non-admin users cannot see extensions
     Given I am logged in as "<username>"
@@ -141,16 +116,4 @@ Feature: User authentication and permissions
       | username  |
       | existing  |
       | another   |
-      | designer |
-  
-  Scenario Outline: Anyone can export YAML
-    Given I am logged in as "<username>"
-    When I go to the export page
-    Then I should see "id:"
-    
-    Examples:
-      | username  |
-      | admin     |
-      | existing  |
-      | another   |
       | designer |

data/features/navigation_rendering.feature

@@ -9,7 +9,7 @@ Feature: Rendering the navigation tag
     And I follow "Main"
     And I fill in the "layout_content" content with the text
     """
-    <r:navigation urls="First: /first | Another: /another | Parent: /parent">
+    <r:navigation paths="First: /first | Another: /another | Parent: /parent">
       <r:normal><a href="<r:path />"><r:title /></a></r:normal>
       <r:here><strong><r:title /></strong></r:here>
       <r:selected><strong><a href="<r:path />"><r:title /></a></strong></r:selected>

data/features/step_definitions/admin/content_negotiation_steps.rb

@@ -8,14 +8,6 @@ When /^I view a page$/ do
   visit "/admin/pages/#{pages(:home).id}"
 end
 
-When /^I view a snippet$/ do
-  visit "/admin/snippets/#{snippets(:first).id}"
-end
-
-When /^I view a filtered snippet$/ do
-  visit "/admin/snippets/#{snippets(:markdown).id}"
-end
-
 When /^I view a layout$/ do
   visit "/admin/layouts/#{layouts(:main).id}"
 end

data/features/step_definitions/admin/pagination_steps.rb

@@ -1,13 +1,3 @@
-Given /^There are many snippets$/ do
-  100.times do |i|
-    Snippet.create(:name => "snippet_#{i}", :content => "This is snippet #{i}")
-  end
-end
-
-Given /^There are few snippets$/ do
-  #
-end
-
 Then /^I should not see pagination controls$/ do
   response.body.should_not have_tag('div.pagination')
 end
@@ -33,12 +23,4 @@ end
 Then /^I should mention the request parameters$/ do
   puts "!!  params: #{request.params.inspect}"
   true
-end
-
-Then /^I should see all the snippets$/ do
-  Snippet.all.each do |snippet|
-    response.body.should have_tag('tr.snippet') do
-      with_tag("a", :text => snippet.name)
-    end
-  end
-end
+end

data/features/support/datasets_loader.rb

@@ -1,3 +1,3 @@
 Cucumber::Rails::World.class_eval do
-  dataset :users, :config, :pages, :layouts, :pages_with_layouts, :snippets, :users_and_pages, :file_not_found, :markup_pages
+  dataset :users, :config, :pages, :layouts, :pages_with_layouts, :users_and_pages, :file_not_found, :markup_pages
 end

data/features/support/paths.rb

@@ -40,8 +40,6 @@ module NavigationHelpers
       login_path(:format => format)
     when /preferences/i
       admin_preferences_path(:format => format)
-    when /snippets/i
-      admin_snippets_path(:format => format)
     when /login/i
       login_path(:format => format)
     when /users/i
@@ -50,16 +48,12 @@ module NavigationHelpers
       admin_pages_path(:format => format)
     when /layouts/i
       admin_layouts_path(:format => format)
-    when /snippets/i
-      admin_snippets_path(:format => format)
     when /users/i
       admin_users_path(:format => format)
     when /configuration/i
       admin_configuration_path(:format => format)
     when /extensions/i
       admin_extensions_path(:format => format)
-    when /export/i
-      export_path(:format => format)
     else
       raise "Can't find mapping from \"#{page_name}\" to a path.\n" +
         "Now, go and add a mapping in #{__FILE__}"

data/lib/generators/instance/templates/instance_environment.rb

@@ -9,6 +9,8 @@ require File.join(File.dirname(__FILE__), 'boot')
 
 require 'radius'
 
+YAML::ENGINE.yamler = 'syck' if RUBY_VERSION =~ /1.9/
+
 Radiant::Initializer.run do |config|
   # Skip frameworks you're not going to use (only works if using vendor/rails).
   # To use Rails without a database, you must remove the Active Record framework

data/lib/generators/instance/templates/instance_gemfile

@@ -32,6 +32,17 @@ gem "radiant", "~> <%= radiant_version %>"
 <%= '# ' unless db == 'sqlserver' %>gem "tiny_tds"
 <%= '# ' unless db == 'sqlserver' %>gem "activerecord-sqlserver-adapter", "~> 3.1.0"
 
+# Default Extensions
+gem "radiant-archive-extension",             "~> 1.0.7"
+gem "radiant-clipped-extension",             "~> 1.0.16"
+gem "radiant-debug-extension",               "~> 1.0.2"
+gem "radiant-exporter-extension",            "~> 1.0.2"
+gem "radiant-markdown_filter-extension",     "~> 1.0.2"
+gem "radiant-sheets-extension",              "~> 1.0.9"
+gem "radiant-site_templates-extension",      "~> 1.0.4"
+gem "radiant-smarty_pants_filter-extension", "~> 1.0.2"
+gem "radiant-textile_filter-extension",      "~> 1.0.4"
+
 # Language packs
 # gem "radiant-dutch_language_pack-extension",    "~> 1.0.0"
 # gem "radiant-french_language_pack-extension",   "~> 1.0.0"

data/lib/radiant.rb

@@ -4,9 +4,9 @@ unless defined? Radiant::Version
   module Radiant
     module Version
       Major = '1'
-      Minor = '0'
-      Tiny  = '1'
-      Patch = nil # set to nil for normal release
+      Minor = '1'
+      Tiny  = '0'
+      Patch = 'alpha' # set to nil for normal release
 
       class << self
         def to_s

data/lib/radiant/admin_ui.rb

@@ -120,7 +120,7 @@ module Radiant
     end
     
     # Region sets
-    %w{page snippet layout user configuration extension}.each do |controller|
+    %w{page layout user configuration extension}.each do |controller|
       attr_accessor controller
       alias_method "#{controller}s", controller
     end
@@ -142,7 +142,6 @@ module Radiant
       
       design = nav_tab("Design")
       design << nav_item("Layouts", "/admin/layouts")
-      design << nav_item("Snippets", "/admin/snippets")
       nav << design
       
       settings = nav_tab("Settings")
@@ -155,7 +154,6 @@ module Radiant
     
     def load_default_regions
       @page = load_default_page_regions
-      @snippet = load_default_snippet_regions
       @layout = load_default_layout_regions
       @user = load_default_user_regions
       @configuration = load_default_configuration_regions
@@ -203,23 +201,6 @@ module Radiant
       end
     end
     
-    def load_default_snippet_regions
-      OpenStruct.new.tap do |snippet|
-        snippet.edit = RegionSet.new do |edit|
-          edit.main.concat %w{edit_header edit_form}
-          edit.form.concat %w{edit_title edit_content edit_filter}
-          edit.form_bottom.concat %w{edit_buttons edit_timestamp}
-        end
-        snippet.index = RegionSet.new do |index|
-          index.top.concat %w{}
-          index.thead.concat %w{title_header actions_header}
-          index.tbody.concat %w{title_cell actions_cell}
-          index.bottom.concat %w{new_button}
-        end
-        snippet.new = snippet.edit
-      end
-    end
-    
     def load_default_layout_regions
       OpenStruct.new.tap do |layout|
         layout.edit = RegionSet.new do |edit|