comatose 2.0.1 → 2.0.5

data/CHANGELOG

@@ -1,3 +1,22 @@
+- version: 2.0.5 (beta)
+    - Added configuration option for importing/exporting pages from admin: `config.allow_import_export = true|false`, `true` is the default at the moment
+    - Reworked the UI for import/export a little bit
+    - Added LINK option to `test_harness` rake task to symlink the comatose plugin directory instead of copying it
+    - Updated manifest and gemspec
+
+- version: 2.0.4 (beta)
+    - Added a rake task to generate a test_harness (for use in development). From the comatose directory, run: `rake test_harness TARGET=../comatose_test_harness`. This will create an empty rails app, copy this working folder over to vendor/plugins/comatose, install acts_as_list and acts_as_tree, and run any setup needed, like script/generate comatose_migration and rake db:migrate.
+    - Bugfix in tasks/comatose.rake
+    - Comatose migration generator now adds the default comatose routes (`map.comatose_admin` and `map.comatose_root ''`) to the top of the routes.rb file. POSSIBLE GOTCHA: `map.comatose_root` should be moved to the bottom of the routes file!
+
+- version: 2.0.3 (beta)
+    - Moving from alpha to beta!
+    - staugaard: Added import and export of pages in admin controller
+
+- version: 2.0.2 (alpha)
+    - staugaard: Added "unloadable" to ComatoseController (problems with ActsAsAuthenticated-integration similar to http://tinyurl.com/6caz5r)
+    - jcnetdev: Tweaking gemspec
+
 - version: 2.0.1 (alpha)
     - Merged changes from andreas (http://github.com/andreas)...
     - andreas: Fixed comatose:admin:customize raketask (seems plugin_path was wrong, and made use of mkdir_p to avoid "File exists"-errors.) 

data/INSTALL

@@ -3,17 +3,18 @@
  Welcome to Comatose!
 ======================
 
+Be sure and install the acts_as_tree and acts_as_list plugins!
+
 From here you'll want to run:
 
   $ ./script/generate comatose_migration
+  
+NOTE: The generator will add the default comatose routes to the top of your routes.rb file. You'll want to move `map.comatose_root ''` to the bottom of your routes block.
 
 When that's finished, run:
 
   $ rake db:migrate
 
-That's it for the Comatose setup! Now just add the following line to the bottom of your config/routes.rb file:
-
-  map.comatose_admin
-  map.comatose_root ''
+That's it for the Comatose setup! 
 
 Be sure to read the README file, and the 'Getting Started' guide. They are located at vendor/plugins/comatose/README and http://comatose.rubyforge.org/getting-started-guide respectively.

data/MANIFEST

@@ -55,7 +55,7 @@ LICENSE
 MANIFEST
 rails/init.rb
 Rakefile
-README.rdoc
+README.markdown
 resources/layouts/comatose_admin_template.html.erb
 resources/public/images/collapsed.gif
 resources/public/images/expanded.gif

data/README.markdown

@@ -0,0 +1,159 @@
+# Comatose
+
+* Version: 2.0.5 (beta)
+* Author:  M@ McCray
+* Website: comatose.rubyforge.org
+* Email: matt at elucidata dot net
+
+
+*Comatose* is a micro CMS designed for being embedded into existing Rails 
+applications.
+
+It's intended for simple CMS support. Comatose supports 
+
+ * Nested pages
+ * Versioning
+ * Page markup in Textile, Markdown, RDoc, or easily add your own 
+ * Page processing through Liquid or ERb
+ * Generators for easy installation/migration
+ * Completely self-contained within plugin folder
+
+It's meant to be lean, mean, easily embedded, and easy to re-skin for 
+existing applications. If you need something more, I would recommend 
+looking into Radiant.
+
+For more information, see the [Getting Started][] guide.
+
+### Requirements
+
+ * Rails 2+ (2.1)
+ * `acts_as_list` and `acts_as_tree` plugins are required (at the moment)
+
+
+### Development Notes
+
+*NOTE*: This is an active branch of Comatose that is built specifically for Rails 2.1.
+        I will *probably* remove any legacy support.
+
+ * Make comatose fully self-contained, which means removing `acts_as_(tree|list)`
+ * Improve `ComatoseAdminController` to reduce number of DB calls for building the page tree
+ * Move to gem plugin
+ * `Comatose.configure` needs to be an initializer (update docs)
+ * Go through bugs on 1x branch from google code and ensure they are fixed
+ * Give access to all the default rails helpers to Comatose Pages by default?
+ * UI refresh (nothing major, just some cleanup).
+ * RESTful goodness.
+ * Support XML/JSON responses from `ComatoseController` and `ComatoseAdminController`.
+ * Support for static rendering (for generating sites like this blog).
+
+### Installation
+
+*Note*: See the 'Upgrading' section if you already have an older version of 
+        the comatose plugin installed.
+
+    $ ./script/plugin install git://github.com/darthapo/comatose.git
+    $ ./script/generate comatose_migration
+    $ rake db:migrate
+
+Open your `routes.rb` and move the following comatose route to the 
+bottom:
+
+    map.comatose_root ''
+
+That's it, you're ready to go! You should be able to browse to 
+http://127.0.0.1:3000/**comatose_admin** and start adding pages to your CMS. 
+Browsing to http://127.0.0.1:3000/ will render your comatose pages if 
+routing doesn't match any of your controllers. 
+
+
+### Upgrading
+
+*NOTE*: This is an experimental 2.0 branch, so upgrading is possible at
+        the moment, but these instructions may not work for much longer.
+
+If you are upgrading from an older version of Comatose (version 0.3, 
+0.4, 0.5, or 0.6), then you will need to re-install the comatose 
+plugin and run:
+
+    $ ./script/plugin remove comatose
+    $ ./script/plugin install comatose
+    $ ./script/generate comatose_migration --upgrade --from=VERSION
+    $ rake migrate
+
+*Note*: Be sure to set the `--from` parameter to the version of
+Comatose you last had installed. Also, you only need to first two digits,
+including the dot, of the version you are upgrading from. For example, if
+you're upgrading from version 0.6.9 you can use:
+
+    $ ./script/generate comatose_migration --upgrade --from=0.6
+
+This will create the upgrade migration(s) for you. It just adds the new 
+fields, so you can keep the original migration comatose created.
+
+
+### Configuration
+
+You configure Comatose in your `config/environment.rb` file. Here is an example
+configuration block:
+
+    Comatose.configure do |config|
+      # Sets the text in the Admin UI's title area
+      config.admin_title = "Site Content"
+      config.admin_sub_title = "Content for the rest of us..."
+    end
+
+Here's an example that uses the `AuthenticationSystem` as generated by the
+`restful_authentication` plugin:
+
+    Comatose.configure do |config|
+      # Includes AuthenticationSystem in the ComatoseController
+      config.includes << :authenticated_system
+
+      # admin 
+      config.admin_title = "Comatose - TESTING"
+      config.admin_sub_title = "Content for the rest of us..."
+
+      # Includes AuthenticationSystem in the ComatoseAdminController
+      config.admin_includes << :authenticated_system
+  
+      # Calls :login_required as a before_filter
+      config.admin_authorization = :login_required
+      # Returns the author name (login, in this case) for the current user
+      config.admin_get_author do
+        current_user.login
+      end
+    end
+
+
+### Extra Credit
+
+This plugin includes the work of many wonderful contributors to the Railsphere. 
+Following are the specific libraries that are distributed with Comatose. If I've 
+missed someone/something please let me know.
+
+ * [Liquid][] by [Tobias Luetke][] 
+ * [RedCloth][] by [_why][]
+ * [Acts as Versioned][]  by [Rick Olsen][]
+ * [Behaviors][] by Atomic Object LLC -- very nice BDD-like testing library
+
+### Feedback
+
+I’ve released Comatose under the MIT license. Which basically means you 
+can use it however you want.
+
+Don't forget to read the [Getting Started][] guide located on the RubyForge
+project site.
+
+If you like it, hate it, or have some ideas for new features, let me know!
+
+matt at elucidata dot net
+
+
+[Getting Started]: http://comatose.rubyforge.org/getting-started-guide
+[Liquid]: http://home.leetsoft.com/liquid
+[Tobias Luetke]: http://blog.leetsoft.com
+[RedCloth]: http://whytheluckystiff.net/ruby/redcloth
+[_why]: http://whytheluckystiff.net
+[Acts as Versioned]: http://ar-versioned.rubyforge.org
+[Rick Olsen]: http://weblog.techno-weenie.net
+[Behaviors]: http://behaviors.rubyforge.org

data/Rakefile

@@ -77,7 +77,7 @@ EOGS
   puts "Update GEMSPEC"
 end
 
-desc "Builds the admin costumizable layout, the embedded layout have the JS and CSS inlined"
+desc "Builds the admin customizable layout, the embedded layout have the JS and CSS inlined"
 task :build do
   require 'erb'
 
@@ -120,3 +120,57 @@ task :build do
   # That's it -- we're done.
   puts "Finished."
 end
+
+
+desc "Creates an empty rails application for use as a test harness"
+task :test_harness do
+  target = ENV['TARGET']
+  sym_link = (ENV['LINK'].to_s == 'true')
+  if target.nil?
+    puts "You must specify a TARGET for the test harness"
+    exit(1)
+  else
+    target = File.expand_path target
+    if target == File.expand_path(File.dirname(__FILE__))
+      puts "You must specify a folder other than this one."
+      exit(1)
+    end
+  end
+  comatose_plugin_path = target / 'vendor' / 'plugins' / 'comatose'
+
+  puts "Creating test harness at #{ target }"
+  run_sh "rails -d sqlite3 #{target}"
+  if sym_link
+    run_sh "ln -s #{ File.dirname(__FILE__) } #{ comatose_plugin_path }"
+  else
+    run_sh "cp -r #{ File.dirname(__FILE__) }/ #{ comatose_plugin_path }"
+  end
+  run_sh "ruby #{ comatose_plugin_path / 'install.rb' }"
+  run_sh "ruby #{ target / 'script' / 'generate' } comatose_migration"
+  run_sh "ruby #{ comatose_plugin_path / 'bin' / 'comatose' } --plugin #{ target }"
+  run_sh "cd #{ target } && rake db:migrate"
+
+  run_sh "cp #{ target / 'db' / 'development.sqlite3' } #{target / 'db' / 'test.sqlite3'}"
+  run_sh "rm #{ target / 'public' / 'index.html' }"
+  run_sh "cp #{ comatose_plugin_path / 'views' / 'layouts' / 'comatose_content.html.erb' } #{ target / 'app' / 'views' / 'layouts' / 'comatose_content.html.erb' }"
+  
+  # Remove me soon!
+  run_sh "cd #{ target } && ruby #{ target / 'script' / 'plugin' } install acts_as_tree"
+  run_sh "cd #{ target } && ruby #{ target / 'script' / 'plugin' } install acts_as_list"
+
+  puts "Done."
+end
+
+class String
+  def /(str)
+    File.join(self, str)
+  end
+end
+
+def run_sh(command)
+  puts "-------------------------------------------------------------------------------"
+  puts "Running `#{command}`:"
+  sh command
+  puts
+  puts
+end

data/about.yml

@@ -3,5 +3,5 @@ summary: A micro CMS for embedding in Rails applications.
 homepage: http://comatose.rubyforge.org
 plugin: git://github.com/darthapo/comatose.git
 license: MIT
-version: 2.0.1
+version: 2.0.5
 rails_version: 2+

data/bin/comatose

@@ -13,21 +13,21 @@ begin
     
     opts.on("-g", "--gem", "Initialize to run from gem (DEFAULT)") do |s| 
       options[:action] = :gem
-      puts "GEM"
+      puts "Configuring to run from GEM..."
     end
 
     opts.on("-p", "--plugin", "Install as plugin") do |s| 
       options[:action] = :plugin
-      puts "PLUGIN"
+      puts "Configuring to run from PLUGIN..."
     end
 
-    opts.on("-u", "--update", "Update current installation (CURRENTLY UNIMPLEMENTED)") do |s| 
-      options[:action] = :update
-      puts "UPDATE"
-    end
+    # opts.on("-u", "--update", "Update current installation (CURRENTLY UNIMPLEMENTED)") do |s| 
+    #   options[:action] = :update
+    #   puts "UPDATE"
+    # end
 
     opts.separator ""
-            opts.separator "Common options:"
+    opts.separator "Common options:"
 
     # No argument, shows at tail.  This will print an options summary.
     # Try it and see!
@@ -71,34 +71,37 @@ comatose_initializer_path = RAILS_ROOT / 'config' / 'initializers' / 'comatose.r
 unless File.exists?( comatose_initializer_path )
   File.open(comatose_initializer_path, 'w') do |f|
     f.write <<-EOT
-    require 'comatose'
-    
-    # 1.) You should add the following snippet to your environment.rb too, probably...
-    #
-    #        gem 'comatose' 
-    #
-    # 2.) Following is an example configuration block for Comatose:    
-    #
-    Comatose.configure do |config|
-      # Includes AuthenticationSystem in the ComatoseController
-      #config.includes << :authenticated_system
-
-      # admin 
-      #config.admin_title = "My Content"
-      #config.admin_sub_title = "Content for the rest of us..."
-
-      # Includes AuthenticationSystem in the ComatoseAdminController
-      #config.admin_includes << :authenticated_system
-
-      # Calls :login_required as a before_filter
-      #config.admin_authorization = :login_required
-      # Returns the author name (login, in this case) for the current user
-      #config.admin_get_author do
-      #  current_user.login
-      #end
-      
-      # See the getting started guide at http://comatose.rubyforge.org for more...
-    end
+require 'comatose'
+
+# 1.) You should add the following snippet to your environment.rb too, probably...
+#
+#        gem 'comatose' 
+#
+# 2.) Following is an example configuration block for Comatose:    
+#
+Comatose.configure do |config|
+  # Includes AuthenticationSystem in the ComatoseController
+  #config.includes << :authenticated_system
+
+  # admin 
+  #config.admin_title = "My Content"
+  #config.admin_sub_title = "Content for the rest of us..."
+
+  # Includes AuthenticationSystem in the ComatoseAdminController
+  #config.admin_includes << :authenticated_system
+
+  # Calls :login_required as a before_filter
+  #config.admin_authorization = :login_required
+  # Returns the author name (login, in this case) for the current user
+  #config.admin_get_author do
+  #  current_user.login
+  #end
+  
+  # Allows users to import and export pages (in YAML format)
+  #config.allow_import_export = true
+  
+  # See the getting started guide at http://comatose.rubyforge.org for more...
+end
 EOT
   end
 else

data/comatose.gemspec

@@ -1,8 +1,8 @@
 # Generated on Tue May 20 20:13:12 -0500 2008
 Gem::Specification.new do |s|
   s.name = "comatose"
-  s.version = "2.0.1"
-  s.date = "2008-09-15" # 2008-05-20
+  s.version = "2.0.5"
+  s.date = "2008-10-31" # 2008-05-20
   s.summary = "Micro CMS designed for being embedded into existing Rails applications"
   s.email = "matt@elucidata.net"
   s.rubyforge_project = 'comatose'
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
              "INSTALL",
              "LICENSE",
              "MANIFEST",
-             "README.rdoc",
+             "README.markdown",
              "Rakefile",
              "SPECS",
              "about.yml",
@@ -107,7 +107,7 @@ Gem::Specification.new do |s|
                   "test/unit/processing_context_test.rb",
                   "test/unit/text_filters_test.rb"]
   
-  s.rdoc_options = ["--main", "README.rdoc"]
-  s.extra_rdoc_files = %w(README.rdoc CHANGELOG SPECS LICENSE)
+  s.rdoc_options = ["--main", "README.markdown"]
+  s.extra_rdoc_files = %w(README.markdown CHANGELOG SPECS LICENSE)
   #s.add_dependency("mime-types", ["> 0.0.0"])
 end

data/generators/comatose_migration/comatose_migration_generator.rb

@@ -1,3 +1,15 @@
+class Rails::Generator::Commands::Create
+  def new_route(name, options='')
+    sentinel = 'ActionController::Routing::Routes.draw do |map|'
+    logger.route "map.#{name} #{options}"
+    unless options[:pretend]
+      gsub_file 'config/routes.rb', /(#{Regexp.escape(sentinel)})/mi do |match|
+        "#{match}\n  map.#{name} #{options}\n"
+      end
+    end
+  end
+end
+
 class ComatoseMigrationGenerator < Rails::Generator::Base
 
 
@@ -38,6 +50,8 @@ class ComatoseMigrationGenerator < Rails::Generator::Base
       case @mode
       when :new
         m.migration_template 'migration.rb', 'db/migrate', :migration_file_name=>'add_comatose_support', :assigns=>{:class_name=>'AddComatoseSupport'}
+        m.new_route 'comatose_root', "''"
+        m.new_route 'comatose_admin'
         
       when :upgrade
         from = @upgrade_from
@@ -57,3 +71,4 @@ class ComatoseMigrationGenerator < Rails::Generator::Base
     end
   end
 end
+

data/install.rb

@@ -1,5 +1,7 @@
+require 'fileutils'
+
 # Copy the images (*.gif) into RAILS_ROOT/public/images/comatose
-RAILS_ROOT = File.join(File.dirname(__FILE__), '../../../')
+RAILS_ROOT = File.expand_path( File.join(File.dirname(__FILE__), '../../../') )
 
 unless FileTest.exist? File.join(RAILS_ROOT, 'public', 'images', 'comatose')
   FileUtils.mkdir( File.join(RAILS_ROOT, 'public', 'images', 'comatose') )

data/lib/comatose/configuration.rb

@@ -36,6 +36,7 @@ module Comatose
     attr_accessor_with_default :hidden_meta_fields,   []
     attr_accessor_with_default :helpers,              []
     attr_accessor_with_default :includes,             []
+    attr_accessor_with_default :allow_import_export,  true
 
     # 'Blockable' setters
     blockable_attr_accessor    :authorization

data/lib/comatose/version.rb

@@ -1,4 +1,4 @@
 module Comatose
-  VERSION = "2.0"
-  VERSION_STRING = "#{VERSION}  (uber-alpha)"
+  VERSION = "2.0.5"
+  VERSION_STRING = "#{VERSION}  (beta)"
 end

data/lib/comatose_admin_controller.rb

@@ -140,6 +140,25 @@ class ComatoseAdminController < ActionController::Base
     redirect_to :controller=>self.controller_name, :action=>'index'
   end
 
+  def export
+    if Comatose.config.allow_import_export
+      send_data(page_to_hash(ComatosePage.root).to_yaml, :disposition => 'attachment', :type => 'text/yaml', :filename => "comatose-pages.yml")
+    else
+      flash[:notice] = "Export is not allowed"
+      redirect_to :controller=>self.controller_name, :action=>'index'
+    end
+  end
+
+  def import
+    if Comatose.config.allow_import_export
+      data = YAML::load(params[:import_file])
+      hash_to_page_tree(data, ComatosePage.root)
+      flash[:notice] = "Pages Imported Successfully"
+    else
+      flash[:notice] = "Import isn't allowed"
+    end
+    redirect_to :controller=>self.controller_name, :action=>'index'
+  end
 
 protected
 
@@ -345,5 +364,32 @@ protected
     end
   end
 
+  private
+  
+  def page_to_hash(page)
+    data = page.attributes.clone
+    # Pull out the specific, or unnecessary fields
+    %w(id parent_id updated_on author position version created_on full_path).each {|key| data.delete(key)}
+    if !page.children.empty?
+      data['children'] = []
+      page.children.each do |child|
+        data['children'] << page_to_hash(child)
+      end
+    end
+    data
+  end
 
+  def hash_to_page_tree(hsh, page)
+    child_ary = hsh.delete 'children'
+    page.update_attributes(hsh)
+    page.save
+    child_ary.each do |child_hsh|
+      if child_pg = page.children.find_by_slug( child_hsh['slug'] )
+        hash_to_page_tree( child_hsh, child_pg )
+      else
+        hash_to_page_tree( child_hsh, page.children.create )      
+      end
+    end if child_ary
+  end
+  
 end

data/lib/comatose_controller.rb

@@ -1,5 +1,6 @@
 # The controller for serving cms content...
 class ComatoseController < ActionController::Base 
+  unloadable
   
   before_filter :handle_authorization, :set_content_type
   after_filter :cache_cms_page
@@ -83,11 +84,7 @@ protected
   # Returns a path to plugin layout, if it's unspecified, otherwise
   # a path to an application layout...
   def get_page_layout
-    if params[:layout] == 'comatose_content'
-      File.join(plugin_layout_path, params[:layout])
-    else
-      params[:layout]
-    end
+    params[:layout]
   end
 
   # An after_filter implementing page caching if it's enabled, globally, 
@@ -111,8 +108,8 @@ protected
     response.headers["Content-Type"] = "text/html; charset=#{Comatose.config.content_type}" unless Comatose.config.content_type.nil? or response.headers['Status'] == '404 Not Found'
   end
 
-  # Path to layouts within the plugin... Assumes the plugin directory name is 'comatose'
-  define_option :plugin_layout_path, File.join( '..', '..', '..', 'vendor', 'plugins', 'comatose', 'views', 'layouts'  )
+  COMATOSE_VIEW_PATH = File.join(RAILS_ROOT, 'vendor', 'plugins', 'comatose', 'views')
+  ActionController::Base.append_view_path(COMATOSE_VIEW_PATH) unless ActionController::Base.view_paths.include?(COMATOSE_VIEW_PATH)
 
   # Include any, well, includes...
   Comatose.config.includes.each do |mod|

data/resources/public/stylesheets/comatose_admin.css

@@ -60,8 +60,9 @@ BODY {
 #content .action A {
   font-weight: bold;
   text-decoration: none;
-  color: darkgreen;
-  border-bottom: 1px solid black;
+  color: navy;
+  border-bottom: 1px solid blue;
+  margin-left: 15px;
 }
 #content .action A:hover {
   color: red;
@@ -70,6 +71,28 @@ BODY {
 #content .page-header {
   color: gray;
 }
+#import_form {
+  position: fixed;
+  right: 75px;
+  border: 3px solid gray !important;
+  -webkit-border-radius: 10px;
+  -moz-border-radius: 10px;
+  background: #FFF;
+  padding: 15px;
+}
+#import_form FORM {
+  display: inline;
+  margin: 0px;
+  padding: 0px;
+}
+#import_form A {
+  color: maroon !important;
+  border-bottom: 1px solid gray !important;
+}
+#import_form A:hover {
+  color: red !important;
+  border-bottom: 1px solid red !important;
+}
 
 /* Page Listing */
 #content .tree-controller {

data/tasks/comatose.rake

@@ -1,5 +1,5 @@
 begin 
-  require 'comatose'
+  require 'comatose/version'
 rescue LoadError
   $: << File.join(File.dirname(__FILE__), '..', 'lib')
 end

data/test/functional/comatose_admin_controller_test.rb

@@ -16,6 +16,8 @@ class ComatoseAdminControllerTest < Test::Unit::TestCase
     @controller = ComatoseAdminController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
+    Comatose.config.admin_get_author = nil
+    Comatose.config.admin_authorization = nil
   end
   
   should "show the index action" do

data/views/comatose_admin/index.html.erb

@@ -1,5 +1,16 @@
 <div class="action">
   <%= link_to 'Clear Page Cache', :controller=>controller.controller_name, :action=>'expire_page_cache' %>
+<% if Comatose.config.allow_import_export %>
+  <%= link_to 'Import', '#', :id => 'import_link2', :onclick => "$('import_form').setStyle({display: 'inline'}); return false;" %>
+  <%= link_to 'Export', :controller=>controller.controller_name, :action=>'export' %>
+  <div id="import_form" style="display: none;">
+  <% form_tag(url_for(:action => 'import'), :multipart => true) do %>
+    <%= file_field_tag 'import_file' %>
+    <%= submit_tag 'Upload and Import' %>
+    <a href="#" onclick="$('import_form').hide(); return false;">Cancel</a>
+  <% end %>
+  </div>
+<% end %>
 </div>
   
 <h1>

data/views/layouts/comatose_admin.html.erb

@@ -67,8 +67,9 @@ BODY {
 #content .action A {
   font-weight: bold;
   text-decoration: none;
-  color: darkgreen;
-  border-bottom: 1px solid black;
+  color: navy;
+  border-bottom: 1px solid blue;
+  margin-left: 15px;
 }
 #content .action A:hover {
   color: red;
@@ -77,6 +78,28 @@ BODY {
 #content .page-header {
   color: gray;
 }
+#import_form {
+  position: fixed;
+  right: 75px;
+  border: 3px solid gray !important;
+  -webkit-border-radius: 10px;
+  -moz-border-radius: 10px;
+  background: #FFF;
+  padding: 15px;
+}
+#import_form FORM {
+  display: inline;
+  margin: 0px;
+  padding: 0px;
+}
+#import_form A {
+  color: maroon !important;
+  border-bottom: 1px solid gray !important;
+}
+#import_form A:hover {
+  color: red !important;
+  border-bottom: 1px solid red !important;
+}
 
 /* Page Listing */
 #content .tree-controller {

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 0
-  - 1
-  version: 2.0.1
+  - 5
+  version: 2.0.5
 platform: ruby
 authors: 
 - M@ McCray
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-15 00:00:00 +10:00
+date: 2008-10-31 00:00:00 +11:00
 default_executable: 
 dependencies: []
 
@@ -25,7 +25,7 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
-- README.rdoc
+- README.markdown
 - CHANGELOG
 - SPECS
 - LICENSE
@@ -34,7 +34,7 @@ files:
 - INSTALL
 - LICENSE
 - MANIFEST
-- README.rdoc
+- README.markdown
 - Rakefile
 - SPECS
 - about.yml
@@ -118,7 +118,7 @@ licenses: []
 post_install_message: 
 rdoc_options: 
 - --main
-- README.rdoc
+- README.markdown
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 

data/README.rdoc

@@ -1,148 +0,0 @@
-= Comatose
-
-Version:: 2.0 (uber-alpha)
-Author::  M@ McCray
-Website:: comatose.rubyforge.org
-Email::   matt at elucidata dot net
-
-
-*Comatose* is a micro CMS designed for being embedded into existing Rails 
-applications.
-
-It's intended for simple CMS support. Comatose supports 
-
- * Nested pages
- * Versioning
- * Page markup in Textile, Markdown, RDoc, or easily add your own 
- * Page processing through Liquid or ERb
- * Generators for easy installation/migration
- * Completely self-contained within plugin folder
-
-It's meant to be lean, mean, easily embedded, and easy to re-skin for 
-existing applications. If you need something more, I would recommend 
-looking into Radiant.
-
-For more information, see the 'Getting Started' guide: http://comatose.rubyforge.org
-
-=== Requirements
-
- * Rails 2+ (2.1)
- * <tt>acts_as_list</tt> and <tt>acts_as_tree</tt> plugins are required
-
-
-=== Development Notes
-
-*NOTE*: This is an active branch of Comatose that is built specifically for Rails 2.1.
-        I will *probably* remove any legacy support.
-
- * Make comatose fully self-contained, which means removing acts_as_(tree|list)
- * Move to gem plugin
- * Comatose.configure needs to be an initializer (update docs)
- * Go through bugs on 1x branch from google code and ensure they are fixed
- * Give access to all the default rails helpers to Comatose Pages by default?
-
-
-== Installation
-
-*Note*: See the 'Upgrading' section if you already have an older version of 
-        the comatose plugin installed.
-
-  $ ./script/plugin source http://mattmccray.com/svn/rails/plugins
-  $ ./script/plugin install comatose
-  $ ./script/generate comatose_migration
-  $ rake migrate
-
-Open your <tt>routes.rb</tt> and add the comatose root route at the 
-bottom:
-
-  map.comatose_admin
-  map.comatose_root ''
-
-That's it, you're ready to go! You should be able to browse to 
-http://127.0.0.1:3000/comatose_admin and start adding pages to your CMS. 
-Browsing to http://127.0.0.1:3000/ will render your comatose pages if 
-routing doesn't match any of your controllers. 
-
-
-== Upgrading
-
-*NOTE*: This is an experimental 2.0 branch, so upgrading is possible at
-        the moment, but these instructions may not work for much longer.
-
-If you are upgrading from an older version of Comatose (version 0.3, 
-0.4, 0.5, or 0.6), then you will need to re-install the comatose 
-plugin and run:
-
-  $ ./script/plugin remove comatose
-  $ ./script/plugin install comatose
-  $ ./script/generate comatose_migration --upgrade --from=VERSION
-  $ rake migrate
-
-*Note*: Be sure to set the <tt>--from</tt> parameter to the version of
-Comatose you last had installed. Also, you only need to first two digits,
-including the dot, of the version you are upgrading from. For example, if
-you're upgrading from version 0.6.9 you can use:
-
-  $ ./script/generate comatose_migration --upgrade --from=0.6
-
-This will create the upgrade migration(s) for you. It just adds the new 
-fields, so you can keep the original migration comatose created.
-
-
-== Configuration
-
-You configure Comatose in your `config/environment.rb` file. Here is an example
-configuration block:
-
-	Comatose.configure do |config|
-	  # Sets the text in the Admin UI's title area
-	  config.admin_title = "Site Content"
-	  config.admin_sub_title = "Content for the rest of us..."
-	end
-
-Here's an example that uses the AuthentiationSystem as generated by the
-restful_authentication plugin:
-
-	Comatose.configure do |config|
-	  # Includes AuthenticationSystem in the ComatoseController
-	  config.includes << :authenticated_system
-
-	  # admin 
-	  config.admin_title = "Comatose - TESTING"
-	  config.admin_sub_title = "Content for the rest of us..."
-	
-	  # Includes AuthenticationSystem in the ComatoseAdminController
-	  config.admin_includes << :authenticated_system
-	  
-	  # Calls :login_required as a before_filter
-	  config.admin_authorization = :login_required
-	  # Returns the author name (login, in this case) for the current user
-	  config.admin_get_author do
-	    current_user.login
-	  end
-	end
-
-
-== Extra Credit
-
-This plugin includes the work of many wonderful contributors to the Railsphere. 
-Following are the specific libraries that are distributed with Comatose. If I've 
-missed someone/something please let me know.
-
- * Liquid (http://home.leetsoft.com/liquid) by Tobias Luetke (http://blog.leetsoft.com) 
- * RedCloth (http://whytheluckystiff.net/ruby/redcloth) by why the lucky stiff (http://whytheluckystiff.net)
- * Acts as Versioned (http://ar-versioned.rubyforge.org) by Rick Olsen (http://weblog.techno-weenie.net)
- * Behaviors (http://behaviors.rubyforge.org) by Atomic Object LLC -- very nice BDD-like testing library
-
-== Feedback
-
-I’ve released Comatose under the MIT license. Which basically means you 
-can use it however you want.
-
-Don't forget to read the 'Getting Started' guide located on the RubyForge
-project site: http://comatose.rubyforge.org/getting-started-guide
-
-If you like it, hate it, or have some ideas for new features, let me know!
-
-darthapo at gmail dot com
-