darthapo-comatose 2.0 → 2.0.3

data/CHANGELOG

@@ -1,3 +1,16 @@
+- 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.) 
+    - andreas: Added "unloadable" to ComatoseAdminController (problems with ActsAsAuthenticated-integration similar to http://tinyurl.com/6caz5r)
+
 - version: 2.0 (uber alpha)
     - Removed controllers, models, and helpers from Comatose module. It was causing odd issues
     - Initial support for Rails 2.1(ish)

data/INSTALL

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

data/README.rdoc

@@ -1,6 +1,6 @@
 = Comatose
 
-Version:: 2.0 (uber-alpha)
+Version:: 2.0.3 (beta)
 Author::  M@ McCray
 Website:: comatose.rubyforge.org
 Email::   matt at elucidata dot net
@@ -144,5 +144,5 @@ 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
+matt at elucidata dot net
 

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
+version: 2.0.3
 rails_version: 2+

data/bin/comatose

@@ -1,20 +1,109 @@
 #!/usr/bin/env ruby
-# Command line
-
-puts "It's still early, so this doesn't really do anything -- yet."
-puts
-puts "Soon, you will be able to initialize comatose support in your app by running:"
-puts
-puts "  $> comatose --rails ."
-puts
-puts "Or, upgrade you're current install:"
-puts
-puts "  $> comatose --update ."
-puts
-puts "Or, freeze as plugin:"
-puts
-puts "  $> comatose --freeze ."
-puts
-puts "And maybe other wacky things too... Not sure yet. :-)"
-puts
+require 'rubygems'
+require 'optparse'
+
+args = ARGV
+options = {
+  :action => :gem
+}
+
+begin
+  OptionParser.new do |opts|
+    opts.banner = "Usage: comatose [options] RAILS_ROOT"
+    
+    opts.on("-g", "--gem", "Initialize to run from gem (DEFAULT)") do |s| 
+      options[:action] = :gem
+      puts "GEM"
+    end
+
+    opts.on("-p", "--plugin", "Install as plugin") do |s| 
+      options[:action] = :plugin
+      puts "PLUGIN"
+    end
+
+    opts.on("-u", "--update", "Update current installation (CURRENTLY UNIMPLEMENTED)") do |s| 
+      options[:action] = :update
+      puts "UPDATE"
+    end
+
+    opts.separator ""
+            opts.separator "Common options:"
+
+    # No argument, shows at tail.  This will print an options summary.
+    # Try it and see!
+    opts.on_tail("-h", "--help", "Show this message") do
+      puts opts
+      exit
+    end
+
+    # Another typical switch to print the version.
+    opts.on_tail("--version", "Show version") do
+      require 'comatose/version'
+      puts Comatose::VERSION_STRING
+      exit
+    end
+
+  end.parse!(args)
+rescue OptionParser::ParseError => e
+  puts e
+end
+
+if args.length == 0
+  puts "No action taken."
+  exit 
+end
+
+RAILS_ROOT = File.expand_path( args.last )
+
+class String
+  def /(string)
+    File.join(self, string)
+  end
+end
+
+unless File.directory?(RAILS_ROOT) and File.exists?( RAILS_ROOT / 'config'/ 'boot.rb' )
+  puts "Not a valid rails application path."
+  exit
+end
+
+comatose_initializer_path = RAILS_ROOT / 'config' / 'initializers' / 'comatose.rb'
+
+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
+EOT
+  end
+else
+  puts "Comatose initializer already exists (at #{comatose_initializer_path})"
+end
+
+puts "Done."
 

data/comatose.gemspec

@@ -0,0 +1,113 @@
+# Generated on Tue May 20 20:13:12 -0500 2008
+Gem::Specification.new do |s|
+  s.name = "comatose"
+  s.version = "2.0.3"
+  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"
+  s.rubyforge_project = 'comatose'
+  s.homepage = "http://comatose.rubyforge.org"
+  s.description = "Comatose is a micro CMS designed for being embedded into existing Rails applications."
+  s.has_rdoc = true
+  s.authors = ["M@ McCray"]
+  s.bindir = 'bin'
+  s.executables = ['comatose']
+  
+  s.files = ["CHANGELOG",
+             "INSTALL",
+             "LICENSE",
+             "MANIFEST",
+             "README.rdoc",
+             "Rakefile",
+             "SPECS",
+             "about.yml",
+             "bin/comatose",
+             "comatose.gemspec",
+             "generators/comatose_migration/comatose_migration_generator.rb",
+             "generators/comatose_migration/templates/migration.rb",
+             "generators/comatose_migration/templates/v4_upgrade.rb",
+             "generators/comatose_migration/templates/v6_upgrade.rb",
+             "generators/comatose_migration/templates/v7_upgrade.rb",
+             "generators/comatose_migration/USAGE",
+             "init.rb",
+             "install.rb",
+             "lib/acts_as_versioned.rb",
+             "lib/comatose/comatose_drop.rb",
+             "lib/comatose/configuration.rb",
+             "lib/comatose/page_wrapper.rb",
+             "lib/comatose/processing_context.rb",
+             "lib/comatose/tasks/admin.rb",
+             "lib/comatose/tasks/data.rb",
+             "lib/comatose/tasks/setup.rb",
+             "lib/comatose/version.rb",
+             "lib/comatose.rb",
+             "lib/comatose_admin_controller.rb",
+             "lib/comatose_admin_helper.rb",
+             "lib/comatose_controller.rb",
+             "lib/comatose_helper.rb",
+             "lib/comatose_page.rb",
+             "lib/liquid/block.rb",
+             "lib/liquid/context.rb",
+             "lib/liquid/document.rb",
+             "lib/liquid/drop.rb",
+             "lib/liquid/errors.rb",
+             "lib/liquid/extensions.rb",
+             "lib/liquid/file_system.rb",
+             "lib/liquid/htmltags.rb",
+             "lib/liquid/standardfilters.rb",
+             "lib/liquid/standardtags.rb",
+             "lib/liquid/strainer.rb",
+             "lib/liquid/tag.rb",
+             "lib/liquid/template.rb",
+             "lib/liquid/variable.rb",
+             "lib/liquid.rb",
+             "lib/redcloth.rb",
+             "lib/support/class_options.rb",
+             "lib/support/inline_rendering.rb",
+             "lib/support/route_mapper.rb",
+             "lib/text_filters/markdown.rb",
+             "lib/text_filters/markdown_smartypants.rb",
+             "lib/text_filters/none.rb",
+             "lib/text_filters/rdoc.rb",
+             "lib/text_filters/simple.rb",
+             "lib/text_filters/textile.rb",
+             "lib/text_filters.rb",
+             "rails/init.rb",
+             "resources/layouts/comatose_admin_template.html.erb",
+             "resources/public/images/collapsed.gif",
+             "resources/public/images/expanded.gif",
+             "resources/public/images/no-children.gif",
+             "resources/public/images/page.gif",
+             "resources/public/images/spinner.gif",
+             "resources/public/images/title-hover-bg.gif",
+             "resources/public/javascripts/comatose_admin.js",
+             "resources/public/stylesheets/comatose_admin.css",
+             "tasks/comatose.rake",
+             "views/comatose_admin/_form.html.erb",
+             "views/comatose_admin/_page_list_item.html.erb",
+             "views/comatose_admin/delete.html.erb",
+             "views/comatose_admin/edit.html.erb",
+             "views/comatose_admin/index.html.erb",
+             "views/comatose_admin/new.html.erb",
+             "views/comatose_admin/reorder.html.erb",
+             "views/comatose_admin/versions.html.erb",
+             "views/layouts/comatose_admin.html.erb",
+             "views/layouts/comatose_admin_customize.html.erb",
+             "views/layouts/comatose_content.html.erb"]
+  
+  s.test_files = ["test/behaviors.rb",
+                  "test/fixtures/comatose_pages.yml",
+                  "test/functional/comatose_admin_controller_test.rb",
+                  "test/functional/comatose_controller_test.rb",
+                  "test/javascripts/test.html",
+                  "test/javascripts/test_runner.js",
+                  "test/test_helper.rb",
+                  "test/unit/class_options_test.rb",
+                  "test/unit/comatose_page_test.rb",
+                  "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.add_dependency("mime-types", ["> 0.0.0"])
+end

data/init.rb

@@ -1,10 +1,2 @@
-require 'support/class_options'
-require 'acts_as_versioned'
-require 'redcloth' unless defined?(RedCloth)
-require 'liquid' unless defined?(Liquid)
-
 require 'comatose'
-require 'text_filters'
 
-require 'support/inline_rendering'
-require 'support/route_mapper'

data/lib/comatose/comatose_drop.rb

@@ -1,6 +1,6 @@
 module Comatose
 
-  class ComatoseDrop < Liquid::Drop
+  class ComatoseDrop < ::Liquid::Drop
 
     private :initialize
     

data/lib/comatose/configuration.rb

@@ -55,9 +55,9 @@ module Comatose
     
     def validate!
       # Rips through the config and validates it's, er, valid
-      raise ConfigurationError.new "admin_get_author must be a Proc or Symbol" unless @admin_get_author.is_a? Proc or @admin_get_author.is_a? Symbol
-      raise ConfigurationError.new "admin_authorization must be a Proc or Symbol" unless @admin_authorization.is_a? Proc or @admin_authorization.is_a? Symbol
-      raise ConfigurationError.new "authorization must be a Proc or Symbol" unless @authorization.is_a? Proc or @authorization.is_a? Symbol
+      raise ConfigurationError.new( "admin_get_author must be a Proc or Symbol" ) unless @admin_get_author.is_a? Proc or @admin_get_author.is_a? Symbol
+      raise ConfigurationError.new( "admin_authorization must be a Proc or Symbol" ) unless @admin_authorization.is_a? Proc or @admin_authorization.is_a? Symbol
+      raise ConfigurationError.new( "authorization must be a Proc or Symbol" ) unless @authorization.is_a? Proc or @authorization.is_a? Symbol
       true
     end
     

data/lib/comatose/tasks/admin.rb

@@ -10,7 +10,7 @@ namespace :comatose do
     desc "Create Comatose views, layouts, and public files..."
     task :customize do
       puts "Copying public files..."
-      plugin_dir = File.join(File.dirname(__FILE__), '..')
+      plugin_dir = File.join(File.dirname(__FILE__), '../../..')
       FileUtils.cp( 
         Dir[File.join(plugin_dir, 'resources', 'public', 'stylesheets', '*.css')], 
         File.join(RAILS_ROOT, 'public', 'stylesheets'),
@@ -22,7 +22,7 @@ namespace :comatose do
         :verbose => true
       )
       puts "Copying application views..."
-      FileUtils.mkdir(File.join(RAILS_ROOT, 'app', 'views', 'comatose_admin'))
+      FileUtils.mkdir_p(File.join(RAILS_ROOT, 'app', 'views', 'comatose_admin'))
       FileUtils.cp( 
         Dir[File.join(plugin_dir, 'views', 'comatose_admin', '*.html.erb')], 
         File.join(RAILS_ROOT, 'app', 'views', 'comatose_admin'),
@@ -57,4 +57,4 @@ namespace :comatose do
       )
     end
   end
-end
+end

data/lib/comatose.rb

@@ -11,12 +11,22 @@ module Comatose
 
 end
 
+require 'acts_as_versioned'
+require 'redcloth' unless defined?(RedCloth)
+require 'liquid' unless defined?(Liquid)
+
+require 'support/class_options'
+require 'text_filters'
+
 require 'comatose/configuration'
 require 'comatose/comatose_drop'
 require 'comatose/processing_context'
 require 'comatose/page_wrapper'
 require 'comatose/version'
 
+require 'support/inline_rendering'
+require 'support/route_mapper'
+
 require 'dispatcher' unless defined?(::Dispatcher)
 ::Dispatcher.to_prepare :comatose do
     Comatose.config.after_setup.call

data/lib/comatose_admin_controller.rb

@@ -1,5 +1,6 @@
 # The controller for serving cms content...
 class ComatoseAdminController < ActionController::Base
+  unloadable
     
   define_option :original_template_root, nil
   define_option :plugin_layout_path, File.join( '..', '..', '..', 'vendor', 'plugins', 'comatose', 'views', 'layouts' )
@@ -139,6 +140,16 @@ class ComatoseAdminController < ActionController::Base
     redirect_to :controller=>self.controller_name, :action=>'index'
   end
 
+  def export
+    send_data(page_to_hash(ComatosePage.root).to_yaml, :disposition => 'inline', :type => 'text/yaml', :filename => "comatose-pages.yml")
+  end
+
+  def import
+    data = YAML::load(params[:import_file])
+    hash_to_page_tree(data, ComatosePage.root)
+    flash[:notice] = "Pages Imported Successfully"
+    redirect_to :controller=>self.controller_name, :action=>'index'
+  end
 
 protected
 
@@ -344,5 +355,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

data/rails/init.rb

@@ -1,12 +1,3 @@
 # Init for gem version of Comatose
 
-require 'support/class_options'
-require 'acts_as_versioned'
-require 'redcloth' unless defined?(RedCloth)
-require 'liquid' unless defined?(Liquid)
-
 require 'comatose'
-require 'text_filters'
-
-require 'support/inline_rendering'
-require 'support/route_mapper'

data/views/comatose_admin/index.html.erb

@@ -1,4 +1,11 @@
 <div class="action">
+  <% form_tag(url_for(:action => 'import'), :multipart => true, :style => 'display: none;', :id => 'import_form') do %>
+    <%= file_field_tag 'import_file' %>
+    <%= submit_tag 'Import' %>
+  <% 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>
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: darthapo-comatose
 version: !ruby/object:Gem::Version 
-  version: "2.0"
+  version: 2.0.3
 platform: ruby
 authors: 
 - M@ McCray
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-20 00:00:00 -07:00
+date: 2008-10-10 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -25,9 +25,16 @@ extra_rdoc_files:
 - SPECS
 - LICENSE
 files: 
+- CHANGELOG
+- INSTALL
+- LICENSE
+- MANIFEST
+- README.rdoc
+- Rakefile
+- SPECS
 - about.yml
 - bin/comatose
-- CHANGELOG
+- comatose.gemspec
 - generators/comatose_migration/comatose_migration_generator.rb
 - generators/comatose_migration/templates/migration.rb
 - generators/comatose_migration/templates/v4_upgrade.rb
@@ -35,7 +42,6 @@ files:
 - generators/comatose_migration/templates/v7_upgrade.rb
 - generators/comatose_migration/USAGE
 - init.rb
-- INSTALL
 - install.rb
 - lib/acts_as_versioned.rb
 - lib/comatose/comatose_drop.rb
@@ -78,11 +84,7 @@ files:
 - lib/text_filters/simple.rb
 - lib/text_filters/textile.rb
 - lib/text_filters.rb
-- LICENSE
-- MANIFEST
 - rails/init.rb
-- Rakefile
-- README.rdoc
 - resources/layouts/comatose_admin_template.html.erb
 - resources/public/images/collapsed.gif
 - resources/public/images/expanded.gif
@@ -92,19 +94,7 @@ files:
 - resources/public/images/title-hover-bg.gif
 - resources/public/javascripts/comatose_admin.js
 - resources/public/stylesheets/comatose_admin.css
-- SPECS
 - tasks/comatose.rake
-- test/behaviors.rb
-- test/fixtures/comatose_pages.yml
-- test/functional/comatose_admin_controller_test.rb
-- test/functional/comatose_controller_test.rb
-- test/javascripts/test.html
-- test/javascripts/test_runner.js
-- test/test_helper.rb
-- test/unit/class_options_test.rb
-- test/unit/comatose_page_test.rb
-- test/unit/processing_context_test.rb
-- test/unit/text_filters_test.rb
 - views/comatose_admin/_form.html.erb
 - views/comatose_admin/_page_list_item.html.erb
 - views/comatose_admin/delete.html.erb
@@ -139,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: comatose
-rubygems_version: 1.0.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Micro CMS designed for being embedded into existing Rails applications