radiantcms-couchrest_model 0.1.3 → 0.1.4

data/CHANGELOG

@@ -1,21 +1,5 @@
 == Change Log
 
-=== Edge
-
-* Update Haml to 3.0.23 [Jim Gay]
-* Localize <r:date> [Jim Gay]
-* Make any date column a valid value for <r:date /> [Jim Gay]
-* Move url methods to path [Jim Gay]
-* Allow use of custom TextFilter names[Petrik de Heus]
-* Set autocomplete="off" for password fields [Gert Goet]
-* Allow loading of database templates from extensions [Jim Gay]
-* Restore Roasters template styling [Jim Gay]
-* Integrated PageFields extension into core [Josh French]
-* Added the Sheets extension to manage Javascript and Stylesheets [Jim Gay]
-* Page-type select menu moved to Pages#index [Josh French]
-* Allow gem-extensions to override core views [Josh French]
-* Popup.js fix for multiple control instances [Josh French]
-
 === Refraction 0.9.1 (June 27, 2010)
 
 * Added missing i18n translations for aggregate tages [Jim Gay]

data/CONTRIBUTORS

@@ -3,13 +3,6 @@
 The following people have submitted changes which have been applied to the
 core:
 
-=== Edge
-
-* Petrik de Heus
-* Gert Goet
-* Jim Gay
-* Josh French
-
 === 0.9.1 Refraction
 
 * Jim Gay

data/README

@@ -1,3 +1,85 @@
-Based on the original work http://radiantcms.org/
+== Welcome to Radiant
 
-Hosted at https://github.com/radiant/radiant by the Radiant Development Team
+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).
+
+Radiant features:
+
+* An elegant user interface
+* The ability to arrange pages in a hierarchy
+* Flexible templating with layouts, snippets, page parts, and a custom tagging
+  language (Radius: http://radius.rubyforge.org)
+* A simple user management/permissions system
+* Support for Markdown and Textile as well as traditional HTML (it's easy to
+  create other filters)
+* An advanced plugin system
+* Operates in two modes: dev and production depending on the URL
+* A caching system which expires pages every 5 minutes
+* Built using Ruby on Rails
+* And much more...
+
+
+== License
+
+Radiant is released under the MIT license and is copyright (c) 2006-2009
+John W. Long and Sean Cribbs. A copy of the MIT license can be found in the
+LICENSE file.
+
+
+== Installation and Setup
+
+Radiant is a traditional Ruby on Rails application, meaning that you can
+configure and run it the way you would a normal Rails application.
+
+See the INSTALL file for more details.
+
+== Installation of a Prerelease
+
+As Radiant nears newer releases, you can experiment with any prerelease version.
+
+Install the prerelease gem with the following command:
+
+    $ gem install radiant --prerelease
+
+This will install the gem with the prerelease name, for example: ‘radiant-0.9.0.rc2’.
+
+== Upgrading an Existing Project to a newer version
+
+1. Update the Radiant assets from in your project:
+
+    $ rake radiant:update
+
+2. Migrate the database:
+
+    $ rake production db:migrate
+
+3. Restart the web server
+
+== Development Requirements
+
+To run tests you will need to have the following gems installed:
+
+  gem install ZenTest rspec rspec-rails cucumber webrat nokogiri
+
+
+== Support
+
+The best place to get support is on the mailing list:
+
+http://radiantcms.org/mailing-list/
+
+Most of the development for Radiant happens on Github:
+
+http://github.com/radiant/radiant/
+
+The project wiki is here:
+
+http://wiki.github.com/radiant/radiant/
+
+
+Enjoy!
+
+--
+The Radiant Dev Team
+http://radiantcms.org

data/app/controllers/admin/export_controller.rb

@@ -0,0 +1,5 @@
+class Admin::ExportController < ApplicationController
+  def yaml
+    render :text => Radiant::Exporter.export, :content_type => "text/yaml"
+  end
+end

data/app/controllers/admin/pages_controller.rb

@@ -6,7 +6,6 @@ class Admin::PagesController < Admin::ResourceController
     r.plural.js do
       @level = params[:level].to_i
       @template_name = 'index'
-      self.models = Page.find(params[:page_id]).children.all
       response.headers['Content-Type'] = 'text/html;charset=utf-8'
       render :action => 'children.html.haml', :layout => false
     end
@@ -18,19 +17,14 @@ class Admin::PagesController < Admin::ResourceController
   end
 
   def new
-    @page = self.model = model_class.new_with_defaults(config)
-    assign_page_attributes
-    response_for :new
+    self.model = model_class.new_with_defaults(config)
+    if params[:page_id].blank?
+      self.model.slug = '/'
+    end
+    response_for :singular
   end
 
   private
-    def assign_page_attributes
-      if params[:page_id].blank?
-        self.model.slug = '/'
-      end
-      self.model.parent_id = params[:page_id]
-    end
-
     def model_class
       if params[:page_id]
         Page.find(params[:page_id]).children
@@ -48,5 +42,7 @@ class Admin::PagesController < Admin::ResourceController
       @meta ||= []
       @meta << {:field => "slug", :type => "text_field", :args => [{:class => 'textbox', :maxlength => 100}]}
       @meta << {:field => "breadcrumb", :type => "text_field", :args => [{:class => 'textbox', :maxlength => 160}]}
+      @meta << {:field => "description", :type => "text_field", :args => [{:class => 'textbox', :maxlength => 200}]}
+      @meta << {:field => "keywords", :type => "text_field", :args => [{:class => 'textbox', :maxlength => 200}]}
     end
 end

data/app/controllers/admin/preferences_controller.rb

@@ -18,7 +18,7 @@ class Admin::PreferencesController < ApplicationController
   def update
     if valid_params?
       if @user.update_attributes(params[:user])
-        redirect_to admin_configuration_path
+        redirect_to :action => 'show'
       else
         flash[:error] = t('preferences_controller.error_updating')
         render :edit

data/app/controllers/admin/resource_controller.rb

@@ -97,7 +97,7 @@ class Admin::ResourceController < ApplicationController
   # a convenience method that returns true if paginate_models has been called on this controller class
   # and can be used to make display decisions in controller and view
   def paginated?
-    self.class.paginated == true && params[:pp] != 'all'
+    self.class.paginated == true
   end
   helper_method :paginated?
 

data/app/helpers/admin/pages_helper.rb

@@ -24,7 +24,9 @@ module Admin::PagesHelper
   
   def status_to_display
     @page.status_id = 100 if @page.status_id == 90
-    @display_status = Status.selectable.map{ |s| [I18n.translate(s.name.downcase), s.id] }
+    @display_status = []
+    Status.find_all.each { |s| @display_status <<  [t(s.name.downcase), s.id] unless s.name == 'Scheduled' }
+    return @display_status
   end
 
   def page_edit_javascripts

data/app/helpers/admin/preferences_helper.rb

@@ -1,3 +1,2 @@
 module Admin::PreferencesHelper
-
 end

data/app/helpers/admin/references_helper.rb

@@ -34,7 +34,8 @@ module Admin::ReferencesHelper
   
   def filter
     @filter ||= begin
-      TextFilter.find_descendant(params[:filter_name])
+      filter_name = params[:filter_name]
+      (filter_name.gsub(" ", "") + "Filter").constantize unless filter_name.blank?
     end
   end
 

data/app/helpers/application_helper.rb

@@ -158,7 +158,7 @@ module ApplicationHelper
   end
   
   def filter_options_for_select(selected=nil)
-    options_for_select([[t('select.none'), '']] + TextFilter.descendants_names, selected)
+    options_for_select([[t('select.none'), '']] + TextFilter.descendants.map { |s| s.filter_name }.sort, selected)
   end
   
   def body_classes
@@ -228,9 +228,7 @@ module ApplicationHelper
       depagination_limit = options.delete(:max_per_page)                           # supply :max_per_page => false to include the 'show all' link no matter how large the collection
       html = will_paginate(list, will_paginate_options.merge(options))
       if depaginate && list.total_pages > 1 && (!depagination_limit.blank? || list.total_entries <= depagination_limit.to_i)
-        html << content_tag(:div, link_to(t('show_all'), :pp => 'all'), :class => 'depaginate')
-      elsif list.total_entries > depagination_limit.to_i
-        html = content_tag(:div, link_to("paginate", :p => 1), :class => 'pagination')
+        html << content_tag(:div, link_to("show all", :pp => list.total_entries), :class => 'depaginate')
       end
       html
     end

data/app/models/env_dump_page.rb

@@ -0,0 +1,17 @@
+class EnvDumpPage < Page
+  
+  description %{
+    Instead of rendering a page in the normal fashion the Env Dump
+    behavior will output all of the environment variables on the
+    request. This is occasionally useful for debugging.
+  }
+  
+  def render
+    %{<html><body><pre>#{ request.env.collect { |k,v| "#{k} => #{v}\n" } }</pre></body></html>}
+  end
+  
+  def cache?
+    false
+  end
+
+end

data/app/models/file_not_found_page.rb

@@ -1,9 +1,5 @@
 class FileNotFoundPage < Page
   
-  def allowed_children
-    []
-  end
-  
   description %{
     A "File Not Found" page can be used to override the default error
     page in the event that a page is not found among a page's children.

data/app/models/page.rb

@@ -11,8 +11,6 @@ class Page < ActiveRecord::Base
   acts_as_tree :order => 'virtual DESC, title ASC'
   has_many :parts, :class_name => 'PagePart', :order => 'id', :dependent => :destroy
   accepts_nested_attributes_for :parts, :allow_destroy => true
-  has_many :fields, :class_name => 'PageField', :order => 'id', :dependent => :destroy
-  accepts_nested_attributes_for :fields, :allow_destroy => true
   belongs_to :layout
   belongs_to :created_by, :class_name => 'User'
   belongs_to :updated_by, :class_name => 'User'
@@ -32,13 +30,10 @@ class Page < ActiveRecord::Base
 
   include Radiant::Taggable
   include StandardTags
-  include DeprecatedTags
   include Annotatable
 
   annotate :description
   attr_accessor :request, :response, :pagination_parameters
-  class_inheritable_accessor :in_menu
-  self.in_menu = true
 
   set_inheritance_column :class_name
 
@@ -63,10 +58,9 @@ class Page < ActiveRecord::Base
     true
   end
 
-  def child_path(child)
-    clean_path(path + '/' + child.slug)
+  def child_url(child)
+    clean_url(url + '/' + child.slug)
   end
-  alias_method :child_url, :child_path
 
   def headers
     # Return a blank hash that child classes can override or merge
@@ -93,22 +87,10 @@ class Page < ActiveRecord::Base
     !has_part?(name) && self.ancestors.any? { |page| page.has_part?(name) }
   end
 
-  def field(name)
-    if new_record? or fields.any?(&:new_record?)
-      fields.detect { |f| f.name.downcase == name.to_s.downcase }
-    else
-      fields.find_by_name name.to_s
-    end
-  end
-
   def published?
     status == Status[:published]
   end
   
-  def scheduled?
-    status == Status[:scheduled]
-  end
-  
   def status
    Status.find(self.status_id)
   end
@@ -117,14 +99,13 @@ class Page < ActiveRecord::Base
     self.status_id = value.id
   end
 
-  def path
+  def url
     if parent?
-      parent.child_path(self)
+      parent.child_url(self)
     else
-      clean_path(slug)
+      clean_url(slug)
     end
   end
-  alias_method :url, :path
 
   def process(request, response)
     @request, @response = request, response
@@ -162,20 +143,20 @@ class Page < ActiveRecord::Base
     parse_object(snippet)
   end
 
-  def find_by_path(path, live = true, clean = true)
+  def find_by_url(url, live = true, clean = true)
     return nil if virtual?
-    path = clean_path(path) if clean
-    my_path = self.path
-    if (my_path == path) && (not live or published?)
+    url = clean_url(url) if clean
+    my_url = self.url
+    if (my_url == url) && (not live or published?)
       self
-    elsif (path =~ /^#{Regexp.quote(my_path)}([^\/]*)/)
+    elsif (url =~ /^#{Regexp.quote(my_url)}([^\/]*)/)
       slug_child = children.find_by_slug($1)
       if slug_child
-        found = slug_child.find_by_url(path, live, clean) # TODO: set to find_by_path after deprecation
+        found = slug_child.find_by_url(url, live, clean)
         return found if found
       end
       children.each do |child|
-        found = child.find_by_url(path, live, clean) # TODO: set to find_by_path after deprecation
+        found = child.find_by_url(url, live, clean)
         return found if found
       end
       file_not_found_types = ([FileNotFoundPage] + FileNotFoundPage.descendants)
@@ -185,14 +166,13 @@ class Page < ActiveRecord::Base
       children.find(:first, :conditions => [condition] + file_not_found_names)
     end
   end
-  alias_method :find_by_url, :find_by_path
 
   def update_status
-    self.published_at = Time.zone.now if published? && self.published_at == nil
+    self[:published_at] = Time.now if self[:status_id] == Status[:published].id && self[:published_at] == nil
     
-    if self.published_at != nil && (published? || scheduled?)
-      self[:status_id] = Status[:scheduled].id if self.published_at  > Time.zone.now
-      self[:status_id] = Status[:published].id if self.published_at <= Time.zone.now
+    if self[:published_at] != nil && (self[:status_id] == Status[:published].id || self[:status_id] == Status[:scheduled].id)
+      self[:status_id] = Status[:scheduled].id if self[:published_at]  > Time.now
+      self[:status_id] = Status[:published].id if self[:published_at] <= Time.now
     end
 
     true    
@@ -204,21 +184,10 @@ class Page < ActiveRecord::Base
   end
 
   class << self
-    alias_method :in_menu?, :in_menu
-    alias_method :in_menu, :in_menu=
-
-    def find_by_path(path, live = true)
+    def find_by_url(url, live = true)
       root = find_by_parent_id(nil)
       raise MissingRootPageError unless root
-      root.find_by_path(path, live)
-    end
-    def find_by_url(*args)
-      ActiveSupport::Deprecation.warn("`find_by_url' has been deprecated; use `find_by_path' instead.", caller)
-      find_by_path(*args)
-    end
-
-    def date_column_names
-      self.columns.collect{|c| c.name if c.sql_type =~ /(date|time)/}.compact
+      root.find_by_url(url, live)
     end
 
     def display_name(string = nil)
@@ -235,7 +204,6 @@ class Page < ActiveRecord::Base
       @display_name = @display_name + " - not installed" if missing? && @display_name !~ /not installed/
       @display_name
     end
-    
     def display_name=(string)
       display_name(string)
     end
@@ -260,7 +228,6 @@ class Page < ActiveRecord::Base
     def new_with_defaults(config = Radiant::Config)
       page = new
       page.parts.concat default_page_parts(config)
-      page.fields.concat default_page_fields(config)
       default_status = config['defaults.page.status']
       page.status = Status[default_status] if default_status
       page
@@ -291,13 +258,6 @@ class Page < ActiveRecord::Base
           PagePart.new(:name => name, :filter_id => config['defaults.page.filter'])
         end
       end
-
-      def default_page_fields(config = Radiant::Config)
-        default_fields = config['defaults.page.fields'].to_s.strip.split(/\s*,\s*/)
-        default_fields.map do |name|
-          PageField.new(:name => name)
-        end
-      end
   end
 
   private
@@ -322,10 +282,9 @@ class Page < ActiveRecord::Base
       true
     end
 
-    def clean_path(path)
-      "/#{ path.strip }/".gsub(%r{//+}, '/')
+    def clean_url(url)
+      "/#{ url.strip }/".gsub(%r{//+}, '/')
     end
-    alias_method :clean_url, :clean_path
 
     def parent?
       !parent.nil?