* 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

Author: mattmccray

CHANGELOG

@@ -1,3 +1,9 @@
+- 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

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

README.markdown

@@ -1,6 +1,6 @@
 # Comatose
 
-* Version: 2.0.4 (beta)
+* Version: 2.0.5 (beta)
 * Author:  M@ McCray
 * Website: comatose.rubyforge.org
 * Email: matt at elucidata dot net

Rakefile

@@ -125,6 +125,7 @@ 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)
@@ -139,7 +140,11 @@ task :test_harness do
 
   puts "Creating test harness at #{ target }"
   run_sh "rails -d sqlite3 #{target}"
-  run_sh "cp -r #{ File.dirname(__FILE__) }/ #{ comatose_plugin_path }"
+  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 }"

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.4
+version: 2.0.5
 rails_version: 2+

bin/comatose

@@ -97,6 +97,9 @@ Comatose.configure do |config|
   #  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

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.4"
-  s.date = "2008-10-10" # 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 = "[email protected]"
   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

install.rb

@@ -1,7 +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') )

lib/comatose/configuration.rb

@@ -36,6 +36,7 @@ class Configuration
     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

lib/comatose/version.rb

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

lib/comatose_admin_controller.rb

@@ -141,13 +141,22 @@ def generate_page_cache
   end
 
   def export
-    send_data(page_to_hash(ComatosePage.root).to_yaml, :disposition => 'inline', :type => 'text/yaml', :filename => "comatose-pages.yml")
+    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
-    data = YAML::load(params[:import_file])
-    hash_to_page_tree(data, ComatosePage.root)
-    flash[:notice] = "Pages Imported Successfully"
+    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
 

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 {

views/comatose_admin/index.html.erb

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

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 {