cortex-reaver 0.0.6 → 0.0.7

data/bin/cortex_reaver

@@ -75,6 +75,11 @@ module CortexReaver
       @action = :start
     end
 
+    o.on '-t', '--test',
+      'Run tests' do
+      @action = :test
+    end
+
     o.on '--status', 'Check Cortex Reaver status' do
       @action = :status
     end
@@ -162,7 +167,7 @@ module CortexReaver
     puts "Using database #{config[:database][:host]}/#{config[:database][:database]}."
 
     current_version = Sequel::Migrator.get_current_migration_version(db)
-    latest_version = Sequel::Migrator.latest_migration_version(LIB_DIR/:migrations)
+    latest_version = Sequel::Migrator.latest_migration_version(File.join(LIB_DIR, 'migrations'))
 
     if version == current_version and current_version == latest_version
       puts "The database is already at the latest version (#{latest_version})."
@@ -182,7 +187,7 @@ module CortexReaver
 
     if confirm message
       puts "Migrating database from version #{current_version} to version #{version}..."
-      Sequel::Migrator.apply(db, LIB_DIR/:migrations, version)
+      Sequel::Migrator.apply(db, File.join(LIB_DIR, 'migrations'), version)
       puts "Done."
     else
       exit
@@ -223,6 +228,8 @@ module CortexReaver
   when :stop
     stop
 
+  when :test
+    require File.join(DIR, '..', 'spec', 'main.rb')
   else
     abort("Unknown action: #{@action}")
   end

data/lib/cortex_reaver.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/ruby
 
 begin
+  require 'find'
   require 'rubygems'
   require 'ramaze'
   require 'sequel'
@@ -10,19 +11,19 @@ rescue LoadError => e
   puts e
   puts "You probably need to install some packages Cortex Reaver needs. Try: 
 apt-get install librmagick-ruby libmysql-ruby;
-gem install mongrel ramaze sequel yaml erubis BlueCloth rmagick exifr hpricot builder syntax;"
+gem install thin mongrel ramaze sequel yaml erubis BlueCloth rmagick exifr hpricot builder coderay;"
   exit 255
 end
 
 module CortexReaver
   # Paths
-  ROOT = File.expand_path(__DIR__/'..')
-  LIB_DIR = ROOT/:lib/:cortex_reaver
+  ROOT = File.expand_path(File.join(__DIR__, '..'))
+  LIB_DIR = File.join(ROOT, 'lib', 'cortex_reaver')
   HOME_DIR = Dir.pwd
   
   # Some basic initial requirements
-  require LIB_DIR/:version
-  require LIB_DIR/:config
+  require File.join(LIB_DIR, 'version')
+  require File.join(LIB_DIR, 'config')
 
   # Returns the site configuration
   def self.config
@@ -44,8 +45,8 @@ module CortexReaver
   # Prepare Ramaze, create directories, etc.
   def self.init
     # Tell Ramaze where to find public files and views
-    Ramaze::Global.public_root = LIB_DIR/:public
-    Ramaze::Global.view_root = config[:view_root]
+    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]
 
     # Check directories
@@ -111,17 +112,51 @@ module CortexReaver
     else
       raise ArgumentError.new("unknown Cortex Reaver mode #{config[:mode].inspect}. Expected one of [:production, :development].")
     end
+
+    # Prepare view directory
+    if config[:view_root]
+      if not File.directory? config[:view_root]
+        # Try to create a view directory
+        begin
+          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
+    config[:plugins].each do |plugin|
+      Ramaze::Log.info "Loading plugin #{plugin}"
+      require File.join(config[:plugin_root], plugin)
+    end
   end
 
   # Load libraries
   def self.load
     # Load controllers and models
-    acquire LIB_DIR/:snippets/'**'/'*'
-    acquire LIB_DIR/:support/'*'
-    acquire LIB_DIR/:model/'*'
-    acquire LIB_DIR/:helper/'*'
-    acquire LIB_DIR/:controller/'*'
-    acquire LIB_DIR/'**'/'*'
+    Ramaze::acquire File.join(LIB_DIR, 'snippets', '**', '*')
+    Ramaze::acquire File.join(LIB_DIR, 'support', '*')
+    Ramaze::acquire File.join(LIB_DIR, 'model', '*')
+    Ramaze::acquire File.join(LIB_DIR, 'helper', '*')
+    Ramaze::acquire File.join(LIB_DIR, 'controller', '*')
+    Ramaze::acquire File.join(LIB_DIR, '**', '*')
   end
 
   # Reloads the site configuration
@@ -144,6 +179,18 @@ module CortexReaver
   def self.run
     # Shutdown callback
     at_exit do
+      # Unlink templates
+      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
+
+      # Remove pidfile
       FileUtils.rm(config[:pidfile]) if File.exist? config[:pidfile]
     end
 
@@ -195,7 +242,7 @@ module CortexReaver
     # Check schema
     if check_schema and
        Sequel::Migrator.get_current_migration_version(@db) !=
-       Sequel::Migrator.latest_migration_version(LIB_DIR/:migrations)
+       Sequel::Migrator.latest_migration_version(File.join(LIB_DIR, 'migrations'))
 
       raise RuntimeError.new("database schema missing or out of date. Please run `cortex_reaver --migrate`.")
     end

data/lib/cortex_reaver/config.rb

@@ -11,6 +11,8 @@ module CortexReaver
     #                Cortex Reaver's builtin templates.
     # :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
+    #                to HOME_DIR/plugins.
     # :mode        - Cortex Reaver mode: either :development or :production
     # :daemon      - Whether to daemonize or not. Defaults to :true if :mode
     #                is :production, otherwise nil.
@@ -21,6 +23,7 @@ module CortexReaver
     #                HOME_DIR/cortex_reaver_<host>_<port>.pid
     # :compile_views - Whether to cache compiled view templates. Defaults to
     #                  true in production mode.
+    # :plugins     - Which plugins to enable. Defaults to [].
     #
     # Site configuration options
     # :site = {
@@ -36,12 +39,14 @@ module CortexReaver
        'cortex_reaver.db'
       )
       self[:public_root] = File.join(CortexReaver::HOME_DIR, 'public')
-      self[:view_root] = File.join(CortexReaver::LIB_DIR, 'view')
+      self[:view_root] = nil
       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[:host] = nil
       self[:port] = 7000
+      self[:plugins] = []
 
       self[:site] = {
         :name => 'Cortex Reaver',

data/lib/cortex_reaver/controller/journal.rb

@@ -27,11 +27,13 @@ module CortexReaver
       journal.tags = request[:tags]
       add_attachments(journal, request[:attachments])
       journal.body = request[:body]
+    
+      MainController.send(:action_cache).clear
     end
 
     on_save do |journal, request|
       journal.title = request[:title]
-      journal.name = Journal.canonicalize request[:name], journal.id
+      journal.name = Journal.canonicalize(request[:name], :id => journal.id)
       journal.user = session[:user]
     end
 

data/lib/cortex_reaver/controller/main.rb

@@ -12,23 +12,24 @@ module CortexReaver
       :date, 
       :tags, 
       :form,
-      :feeds
+      :feeds,
+      :pages
 
     engine :Erubis
 
     cache :index, :ttl => 60
 
     # the index action is called automatically when no other action is specified
-    def index(id = nil)
-      if id and @page = Page.get(id)
+    def index(*ids)
+      if not ids.empty? and @page = Page.get(ids)
         # Render that page.
         @title = @page.title
         
-        workflow "Edit this page", R(PageController, :edit, @page.name)
-        workflow "Delete this page", R(PageController, :delete, @page.name)
+        workflow "Edit this page", R(PageController, :edit, @page.id)
+        workflow "Delete this page", R(PageController, :delete, @page.id)
 
         render_template 'pages/show'
-      elsif id
+      elsif not ids.empty?
         # Didn't have that page
         error_404
       else
@@ -41,10 +42,10 @@ module CortexReaver
           @sidebar.unshift render_template('photographs/sidebar.rhtml')
         end
 
-        workflow "New Page", R(JournalController, :new)
-        workflow "New Project", R(JournalController, :new)
         workflow "New Journal", R(JournalController, :new)
-        workflow "New Photograph", R(JournalController, :new)
+        workflow "New Page", R(PageController, :new)
+        workflow "New Photograph", R(PhotographController, :new)
+        workflow "New Project", R(ProjectController, :new)
 
         feed 'Photographs', Rs(PhotographController, :atom)
         feed 'Journals', Rs(JournalController, :atom)

data/lib/cortex_reaver/controller/page.rb

@@ -17,7 +17,8 @@ module CortexReaver
       :tags,
       :canonical,
       :crud,
-      :attachments
+      :attachments,
+      :pages
 
     on_second_save do |page, request|
       page.tags = request[:tags]
@@ -26,7 +27,8 @@ module CortexReaver
 
     on_save do |page, request|
       page.title = request[:title]
-      page.name = Page.canonicalize request[:name], page.id
+      page.page_id = request[:page_id]
+      page.name = Page.canonicalize request[:name], :id => page.id, :page_id => page.page_id
       page.body = request[:body]
       page.user = session[:user]
     end

data/lib/cortex_reaver/controller/photograph.rb

@@ -30,7 +30,7 @@ module CortexReaver
 
     on_save do |photograph, request|
       photograph.title = request[:title]
-      photograph.name = Photograph.canonicalize request[:name], photograph.id
+      photograph.name = Photograph.canonicalize request[:name], :id => photograph.id
       photograph.user = session[:user]
     end
 
@@ -38,6 +38,8 @@ module CortexReaver
       photograph.tags = request[:tags]
       photograph.image = request[:image][:tempfile] if request[:image]
       photograph.infer_date_from_exif! if request[:infer_date]
+
+      MainController.action_cache.clear
     end
 
     for_feed do |photograph, x|

data/lib/cortex_reaver/controller/project.rb

@@ -31,7 +31,7 @@ module CortexReaver
     on_save do |project, request|
       project.title = request[:title]
       project.description = request[:description]
-      project.name = Project.canonicalize request[:name], project.id
+      project.name = Project.canonicalize request[:name], :id => project.id
       project.body = request[:body]
       project.user = session[:user]
     end

data/lib/cortex_reaver/controller/tag.rb

@@ -22,7 +22,7 @@ module CortexReaver
 
     on_save do |tag, request|
       tag.title = request[:title]
-      tag.name = Tag.canonicalize request[:name], tag.id
+      tag.name = Tag.canonicalize request[:name], :id => tag.id
     end
 
     def index(*ids)

data/lib/cortex_reaver/helper/canonical.rb

@@ -7,7 +7,7 @@ module Ramaze
       def canonicalize
         respond self.class.const_get('MODEL').canonicalize(
           request[:new],
-          request[:id]
+          :id => request[:id]
         )
       end
 

data/lib/cortex_reaver/helper/crud.rb

@@ -176,7 +176,7 @@ module Ramaze
       def delete(id)
         require_admin
 
-        if @model = model_class.get(id)
+        if @model = model_class[id]
           if @model.destroy
             flash[:notice] = "#{model_class.to_s.demodulize.downcase} #{h @model.to_s} deleted."
             redirect Rs()
@@ -193,13 +193,9 @@ module Ramaze
       def edit(id = nil)
         require_admin
 
-        if @model = model_class.get(id)
+        if @model = model_class[id]
           @title = "Edit #{model_class.to_s.demodulize.downcase} #{h @model.to_s}"
-          if @model.class.respond_to? :canonical_name_attr
-            @form_action = "edit/#{@model.send(@model.class.canonical_name_attr)}"
-          else
-            @form_action = "edit/#{@model.id}"
-          end
+          @form_action = "edit/#{@model.id}"
 
           set_singular_model_var @model
 
@@ -245,7 +241,6 @@ module Ramaze
       end
 
       def page(page)
-
         page = case page
         when Symbol
           page
@@ -303,14 +298,11 @@ module Ramaze
           end
           
           # ID component of edit/delete links
-          if @model.class.respond_to? :canonical_name_attr
-            id = @model.send(@model.class.canonical_name_attr)
-          else
-            id = @model.id
-          end
 
-          workflow "Edit this #{model_class.to_s.demodulize}", Rs(:edit, id)
-          workflow "Delete this #{model_class.to_s.demodulize}", Rs(:delete, id)
+          workflow "New #{model_class.to_s.demodulize}", Rs(:new)
+          workflow "Edit this #{model_class.to_s.demodulize}", Rs(:edit, @model.id)
+          workflow "Delete this #{model_class.to_s.demodulize}", Rs(:delete, @model.id)
+          
           render_template :show
         elsif id
           # Didn't find that model

data/lib/cortex_reaver/helper/navigation.rb

@@ -104,6 +104,22 @@ module Ramaze
         links << '</ol>'
       end
 
+      # Produces a section navigation list from an array of titles to urls.
+      def section_nav(sections)
+        s = "<ul>\n"
+        sections.each do |section|
+          title = section.first
+          url = section.last
+          klass = url.gsub(/\//, '').gsub(/_/, '-')
+          s << '<li><a class="' + klass
+          s << ' selected' if request.request_uri == url 
+          s << '" href="' + attr_h(url) + '">'
+          s << title
+          s << "</a></li>\n"
+        end
+        s << "\n</ul>"
+      end
+
       # Returns a link to a user.
       def user_link(x)
         case x

data/lib/cortex_reaver/helper/pages.rb

@@ -0,0 +1,62 @@
+module Ramaze
+  module Helper
+    module Pages
+      # Gives a list of lists showing page heirarchy navigation. Expands to show
+      # the current page if given.
+      def page_navigation(current=nil)
+        l = "<ol>\n"
+        CortexReaver::Page.top.all.each do |page|
+          l << page_navigation_helper(page, current)
+        end
+        l << '</ol>'
+      end
+
+      def page_navigation_helper(page, current=nil)
+        l = '<li' + (page == current ? ' class="selected"' : '') + '>'
+        l << "<a href=\"#{page.url}\">#{h page.title}</a>"
+        if page.pages and current.within? page
+          l << "\n<ol>"
+          page.pages.each do |page| 
+            l << page_navigation_helper(page, current)
+          end
+          l << "</ol>\n"
+        end
+        l << "</li>\n"
+      end
+
+      # Returns a page selector
+      def page_select(id, params={})
+        type = params[:type]
+        p_class = params[:p_class]
+        description = params[:description] || id.to_s.titleize
+        model = params[:model]
+        default_id = params[:default_id]
+        skip_id = params[:skip_id]
+
+        f = "<p #{p_class.nil? ? '' : 'class="' + attr_h(p_class) + '"'}>"
+        f << "<label for=\"#{id}\">#{description}</label>"
+        f << "<select name=\"#{id}\" id=\"#{id}\">"
+        f << "<option value="">/</option>"
+        CortexReaver::Page.top.order(:title).all.each do |page|
+          f << page_select_helper(page, default_id, skip_id)
+        end
+        f << "</select></p>"
+      end
+
+      private
+
+      def page_select_helper(page, default_id=nil, skip_id=nil, depth=0)
+        s = '<option' +
+            (page.id == default_id ? ' selected="selected"' : '') +
+            (page.id == skip_id ? ' disabled="disabled"' : '') +
+            " value=\"#{page.id}\">" +
+            '&nbsp;&nbsp;' * depth +
+            "#{h page.title}</option>\n"
+        page.pages_dataset.order(:title).all.each do |page|
+          s << page_select_helper(page, default_id, skip_id, depth + 1)
+        end
+        s
+      end
+    end
+  end
+end