cortex-reaver 0.0.9 → 0.1.0

data/bin/cortex_reaver

@@ -95,6 +95,7 @@ module CortexReaver
     # Connect to current DB
     reload_config
     setup_db false
+    require 'sequel/extensions/migration'
     current_version = Sequel::Migrator.get_current_migration_version(db)
 
     puts "Using database #{config[:database][:host]}/#{config[:database][:database]}."
@@ -108,7 +109,7 @@ module CortexReaver
 
     # Connect to dump DB
     dump = Sequel.connect "sqlite:////#{File.expand_path(file)}"
-    Sequel::Migrator.apply dump, LIB_DIR/:migrations, current_version
+    Sequel::Migrator.apply dump, File.join(LIB_DIR,:migrations), current_version
 
     # Copy tables
     db.tables.each do |table|
@@ -127,6 +128,7 @@ module CortexReaver
     # Connect to dump DB
     file = @values[:load_file]
     dump = Sequel.connect "sqlite:////#{File.expand_path(file)}"
+    require 'sequel/extensions/migration'
     current_version = Sequel::Migrator.get_current_migration_version(dump)
 
     # Connect to current DB
@@ -159,16 +161,19 @@ module CortexReaver
     reload_config
     response = open("http://#{config[:host] || 'localhost'}:#{config[:port]}/")
     puts response.status.join(' ');
+
   when :migrate
     version = @values[:schema_version]
 
     # Get ready
     reload_config
     setup_db false
+    self.load
     init
 
     puts "Using database #{config[:database][:host]}/#{config[:database][:database]}."
 
+    require 'sequel/extensions/migration'
     current_version = Sequel::Migrator.get_current_migration_version(db)
     latest_version = Sequel::Migrator.latest_migration_version(File.join(LIB_DIR, 'migrations'))
 
@@ -212,7 +217,6 @@ module CortexReaver
     # Start an IRB session
     reload_config
     setup
-    Ramaze::Global.console = true
 
     # Don't let IRB try to interpret our command line
     ARGV.clear
@@ -233,6 +237,7 @@ module CortexReaver
 
   when :test
     require File.join(DIR, '..', 'spec', 'main.rb')
+
   else
     abort("Unknown action: #{@action}")
   end

data/lib/cortex_reaver.rb

@@ -7,6 +7,10 @@ begin
   require 'sequel'
   require 'yaml'
   require 'socket'
+
+  require 'sequel/extensions/migration'
+  require 'sequel/extensions/inflector'
+  require 'sequel/extensions/blank'
 rescue LoadError => e
   puts e
   puts "You probably need to install some packages Cortex Reaver needs. Try: 
@@ -18,8 +22,8 @@ end
 module CortexReaver
   # Paths
   ROOT = File.expand_path(File.join(__DIR__, '..'))
-  LIB_DIR = File.join(ROOT, 'lib', 'cortex_reaver')
-  HOME_DIR = Dir.pwd
+  LIB_DIR = File.expand_path(File.join(ROOT, 'lib', 'cortex_reaver'))
+  HOME_DIR = File.expand_path(Dir.pwd)
   
   # Some basic initial requirements
   require File.join(LIB_DIR, 'version')
@@ -44,18 +48,27 @@ module CortexReaver
 
   # Prepare Ramaze, create directories, etc.
   def self.init
-    # Tell Ramaze where to find public files and views
-    Ramaze::Global.public_root = File.join(LIB_DIR, 'public')
-    Ramaze::Global.view_root = config[:view_root] || File.join(CortexReaver::LIB_DIR, 'view')
-    Ramaze::Global.compile = config[:compile_views]
+    # App
+    Ramaze.options.app.name = :cortex_reaver
+    
+    # Root directory
+    Ramaze::App[:cortex_reaver].options.roots = [LIB_DIR]
+    if config[:root]
+      Ramaze::App[:cortex_reaver].options.roots.unshift(config[:root])
+    end
+
+    # Server options
+    Ramaze.options.adapter.handler = config[:adapter]
+    Ramaze.options.adapter.host = config[:host]
+    Ramaze.options.adapter.port = config[:port]
 
     # Check directories
-    if config[:public_root] and not File.directory? config[:public_root]
+    if config[:root] and not File.directory? config.public_root
       # Try to create a public directory
       begin
         FileUtils.mkdir_p config[:public_root]
       rescue => e
-        Ramaze::Log.warn "Unable to create a public directory at #{config[:public_root]}: #{e}."
+        Ramaze::Log.warn "Unable to create a public directory at #{config.public_root}: #{e}."
       end
     end
     if config[:log_root] and not File.directory? config[:log_root]
@@ -75,36 +88,37 @@ module CortexReaver
 
     unless config[:daemon]
       # Log to console
-      Ramaze::Log.loggers << Ramaze::Logger::Informer.new
+      Ramaze::Log.loggers << Logger.new(STDOUT)
     end 
 
     case config[:mode]
     when :production
+      Ramaze.options.mode = :live
+      
+      # Set up cache
+      case config[:cache]
+        when :memcache
+        Ramaze::Cache.options.default = Ramaze::Cache::MemCache
+      end
+
       if config[:log_root]
         # Log to file
-        Ramaze::Log.loggers << Ramaze::Logger::Informer.new(
-          File.join(config[:log_root], 'production.log'),
-          [:error, :info, :notice]
+        Ramaze::Log.loggers << Logger.new(
+          File.join(config[:log_root], 'production.log')
         )
+        Ramaze::Log.level = Logger::Severity::INFO
       end
-
-      # Don't reload source code
-      Ramaze::Global.sourcereload = false
-
-      # Don't expose errors
-      Ramaze::Dispatcher::Error::HANDLE_ERROR.update({
-        ArgumentError => [404, 'error_404'],
-        Exception     => [500, 'error_500']
-      })
     when :development
+      Ramaze.options.mode = :dev
+
       if config[:log_root]
         # Log to file
-        Ramaze::Log.loggers << Ramaze::Logger::Informer.new(
+        Ramaze::Log.loggers << Logger.new(
           File.join(config[:log_root], 'development.log')
         )
+        Ramaze::Log.level = Logger::Severity::DEBUG
 
         # Also use SQL log
-        require 'logger'
         db.logger = Logger.new(
           File.join(config[:log_root], 'sql.log')
         )
@@ -114,31 +128,15 @@ module CortexReaver
     end
 
     # Prepare view directory
-    if config[:view_root]
-      if not File.directory? config[:view_root]
+    if config.view_root
+      if not File.directory? config.view_root
         # Try to create a view directory
         begin
-          FileUtils.mkdir_p config[:view_root]
+          FileUtils.mkdir_p config.view_root
         rescue => e
           Ramaze::Log.warn "Unable to create a view directory at #{config[:view_root]}: #{e}."
         end
       end
-
-      if File.directory? config[:view_root]
-        # Link in default views
-        source = File.join(LIB_DIR, 'view')
-        dest = config[:view_root].sub(/\/$/, '')
-        Find.find(source) do |path|
-          dest_path = path.sub(source, dest)
-          if File.directory? path and not File.exists? dest_path
-            # Link this directory
-            FileUtils.ln_s path, dest_path
-            Find.prune
-          elsif File.file? path and not File.exists? dest_path
-            FileUtils.ln_s path, dest_path
-          end
-        end
-      end
     end
 
     # Load plugins
@@ -151,12 +149,14 @@ module CortexReaver
   # Load libraries
   def self.load
     # Load controllers and models
+    require File.join(LIB_DIR, 'config')
+    require File.join(LIB_DIR, 'plugin')
+    require File.join(LIB_DIR, 'version')
     Ramaze::acquire File.join(LIB_DIR, 'snippets', '**', '*')
     Ramaze::acquire File.join(LIB_DIR, 'support', '*')
-    Ramaze::acquire File.join(LIB_DIR, 'model', '*')
+    require File.join(LIB_DIR, 'model', 'model')
     Ramaze::acquire File.join(LIB_DIR, 'helper', '*')
-    Ramaze::acquire File.join(LIB_DIR, 'controller', '*')
-    Ramaze::acquire File.join(LIB_DIR, '**', '*')
+    require File.join(LIB_DIR, 'controller', 'controller')
   end
 
   # Reloads the site configuration
@@ -179,23 +179,6 @@ module CortexReaver
   def self.run
     # Shutdown callback
     at_exit do
-      # Unlink templates
-      begin
-        if config[:view_root]
-          Find.find(config[:view_root]) do |path|
-            if File.symlink? path # TODO: identify link target
-              begin
-                File.delete path
-              rescue => e
-                Ramaze::Log.error "Unable to unlink symlinked view #{path}: #{e}"
-              end
-            end
-          end
-        end
-      rescue => e2
-        Ramaze::Log.error "Unable to unlink symlinked views in #{config[:view_root]}: #{e}"
-      end
-
       # Remove pidfile
       FileUtils.rm(config[:pidfile]) if File.exist? config[:pidfile]
     end
@@ -203,12 +186,8 @@ module CortexReaver
     Ramaze::Log.info "Cortex Reaver #{Process.pid} stalking victims."
 
     # Run Ramaze
-    Ramaze.startup(
-      :force => true,
-      :adapter => config[:adapter],
-      :host => config[:host],
-      :port => config[:port]
-    )
+#    Ramaze.start :root => [config[:root], LIB_DIR]
+    Ramaze.start :root => LIB_DIR
 
     puts "Cortex Reaver finished."
   end
@@ -218,11 +197,11 @@ module CortexReaver
     # Connect to DB
     setup_db
 
-    # Prepare Ramaze, check directories, etc.
-    init
-
     # Load library
     self.load
+
+    # Prepare Ramaze, check directories, etc.
+    init
   end
 
   # Connect to DB. If check_schema is false, doesn't check to see that the schema
@@ -238,6 +217,7 @@ module CortexReaver
       string = "#{d[:driver]}://#{d[:user]}:#{d[:password]}@#{d[:host]}/#{d[:database]}"
     end
 
+    # Connect
     begin
       @db = Sequel.connect(string)
     rescue => e

data/lib/cortex_reaver/config.rb

@@ -4,11 +4,8 @@ module CortexReaver
     # Pass a YAML file with configuration options. At a minimum, it should specify
     # :database = {:proto, :username, :pasword, :host, :database}
     # or :database = "sequel_connect_string"
-    #
-    # :public_root - The directory public files are hosted from. Defaults to
-    #                HOME_DIR/public.
-    # :view_root   - The directory containing erubis view templates. Defaults to
-    #                Cortex Reaver's builtin templates.
+    # :root        - The directory containing public/, layout/, and view/. 
+    #                Defaults to HOME_DIR.
     # :log_root    - The directory that Cortex Reaver should log to. Defaults to
     #                HOME_DIR/log. If nil, file logging disabled.
     # :plugin_root - The directory that Cortex Reaver plugins live in. Defaults
@@ -17,6 +14,7 @@ module CortexReaver
     # :daemon      - Whether to daemonize or not. Defaults to :true if :mode
     #                is :production, otherwise nil.
     # :adapter     - The Ramaze adapter name (default 'thin')
+    # :cache       - The Ramaze cache to use (default: :memory)
     # :host        - Host to bind to 
     # :port        - Port to bind to (default 7000)
     # :pidfile     - Process ID file for this server. Defaults to 
@@ -38,12 +36,12 @@ module CortexReaver
         File.expand_path(CortexReaver::HOME_DIR),
        'cortex_reaver.db'
       )
-      self[:public_root] = File.join(CortexReaver::HOME_DIR, 'public')
-      self[:view_root] = nil
+      self[:root] = CortexReaver::HOME_DIR
       self[:log_root] = File.join(CortexReaver::HOME_DIR, 'log')
       self[:plugin_root] = File.join(CortexReaver::HOME_DIR, 'plugins')
       self[:mode] = :production
       self[:adapter] = 'thin'
+      self[:cache] = :memory
       self[:host] = nil
       self[:port] = 7000
       self[:plugins] = []
@@ -73,5 +71,23 @@ module CortexReaver
       # Compile views
       self[:compile_views] ||= true if self[:mode] == :production
     end
+    
+    def public_root
+      if self[:root]
+        File.join(self[:root], 'public')
+      end
+    end
+
+    def view_root
+      if self[:root]
+        File.join(self[:root], 'view')
+      end
+    end
+
+    def layout_root
+      if self[:root]
+        File.join(self[:root], 'layout')
+      end
+    end
   end
 end

data/lib/cortex_reaver/controller/admin.rb

@@ -1,15 +1,13 @@
 module CortexReaver
-  class AdminController < Ramaze::Controller
+  class AdminController < Controller
     
     map '/admin'
-    layout '/text_layout'
-    engine :Erubis
 
-    helper :error,
-      :auth,
-      :form,
-      :workflow,
-      :aspect
+    layout(:text) do
+      not request.xhr?
+    end
+
+    helper :aspect
     
     before_all do
       require_roles :admin

data/lib/cortex_reaver/controller/comment.rb

@@ -1,25 +1,27 @@
 module CortexReaver
-  class CommentController < Ramaze::Controller
+  class CommentController < Controller
     MODEL = Comment
 
     map '/comments'
-    layout '/text_layout'
-    template :edit, :form
-    template :new, :form
-    engine :Erubis
+    
+    layout(:text) do |name, wish|
+      not request.xhr? and name != 'atom'
+    end
+
+    alias_view :edit, :form
+    alias_view :new, :form
+    alias_view :page, :list
+    alias_view :index, :list
 
     helper :cache,
-      :error, 
-      :auth, 
-      :form, 
-      :workflow, 
-      :navigation,
       :date,
       :canonical,
       :crud,
       :feeds
 
-    cache :index, :ttl => 60
+    cache_action(:method => :index, :ttl => 120) do
+      user.id.to_i.to_s + flash.inspect
+    end
 
     on_save do |comment, request|
       comment.title = request[:title]
@@ -55,15 +57,13 @@ module CortexReaver
     def page(page)
       @title = "Recent Comments"
       @comments = Comment.order(:created_on).reverse.limit(16)
-
-      render_template :list
     end
 
     # This action is referenced by public comment-posting forms.
     def post
       unless request.post?
         flash[:error] = "No comment to post!"
-        redirect_to R(:/)
+        redirect_to MainController.r
       end
      
       # Check for robots
@@ -71,7 +71,7 @@ module CortexReaver
              request[:comment].blank?
         # Robot!?
         flash[:error] = "Cortex Reaver is immune to your drivel, spambot."
-        redirect R(:/)
+        redirect MainController.r
       end 
 
       begin
@@ -110,7 +110,7 @@ module CortexReaver
           raise unless @comment.save
 
           # Clear action cache
-          action_cache.delete '/index'
+          Ramaze::Cache.action.clear
 
           flash[:notice] = "Your comment (<a href=\"##{@comment.url.gsub(/.*#/, '')}\">#{h @comment.title}</a>) has been posted."
           redirect @comment.parent.url
@@ -124,7 +124,7 @@ module CortexReaver
           session[:pending_comment] = @comment
           redirect @comment.parent.url + '#post-comment'
         else
-          redirect R(:/)
+          redirect MainController.r
         end
       end
     end 

data/lib/cortex_reaver/controller/config.rb

@@ -1,8 +1,9 @@
 module CortexReaver
   class ConfigController < Ramaze::Controller
     map '/config'
-    layout '/text_layout'
-    template :edit, :form
+    layout(:text_layout)
+
+    alias_view :edit, :form
     engine :Erubis
 
     helper :error,