darthapo-comatose 2.0.3 → 2.0.4

data/CHANGELOG

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

data/INSTALL

@@ -8,14 +8,13 @@ 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/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,52 @@ 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']
+  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}"
+  run_sh "cp -r #{ File.dirname(__FILE__) }/ #{ comatose_plugin_path }"
+  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.3
+version: 2.0.4
 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,34 @@ 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
+  
+  # See the getting started guide at http://comatose.rubyforge.org for more...
+end
 EOT
   end
 else

data/comatose.gemspec

@@ -1,7 +1,7 @@
 # Generated on Tue May 20 20:13:12 -0500 2008
 Gem::Specification.new do |s|
   s.name = "comatose"
-  s.version = "2.0.3"
+  s.version = "2.0.4"
   s.date = "2008-10-10" # 2008-05-20
   s.summary = "Micro CMS designed for being embedded into existing Rails applications"
   s.email = "matt@elucidata.net"

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,3 +1,5 @@
+require 'fileutils'
+
 # Copy the images (*.gif) into RAILS_ROOT/public/images/comatose
 RAILS_ROOT = File.join(File.dirname(__FILE__), '../../../')
 

data/lib/comatose/version.rb

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

data/tasks/comatose.rake

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: darthapo-comatose
 version: !ruby/object:Gem::Version 
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors: 
 - M@ McCray

data/README.rdoc

@@ -1,148 +0,0 @@
-= Comatose
-
-Version:: 2.0.3 (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: 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!
-
-matt at elucidata dot net
-