cortex-reaver 0.1.0 → 0.2.0

data/lib/cortex_reaver/controller/main.rb

@@ -1,11 +1,25 @@
-require 'builder'
+require 'libxml'
 
 module CortexReaver
   class MainController < Controller
     map '/'
     
     layout(:text) do |name, wish|
-      !request.xhr? and name != 'atom'
+      if request.xhr? or name == 'atom' or name == 'sitemap'
+        false
+      else
+        true
+      end
+    end
+
+    # We provide an XML sitemap.
+    provide(:xml, :type => 'text/xml') do |action, value|
+      Ramaze::Log.info action
+      if action.method == 'sitemap'
+        value
+      else
+        nil
+      end
     end
 
     helper :cache, 
@@ -14,9 +28,16 @@ module CortexReaver
       :feeds,
       :pages
 
-#    cache_action(:method => :index, :ttl => 120) do
-#      user.id.to_i.to_s + flash.inspect
-#    end
+    cache_action(:method => :index, :ttl => 120) do
+      user.id.to_i.to_s + flash.inspect
+    end
+    cache_action(:method => :sitemap, :ttl => 300) do
+      request.path_info
+    end
+
+    def cache
+      respond Ramaze::Cache.action.stats
+    end
 
     # the index action is called automatically when no other action is specified
     def index(*ids)
@@ -25,10 +46,10 @@ module CortexReaver
         @title = @page.title
        
         if user.can_edit? Page.new
-          workflow "Edit this page", PageController.r(:edit, @page.id)
+          workflow "Edit this page", PageController.r(:edit, @page.id), :edit, :page
         end
         if user.can_delete? Page.new
-          workflow "Delete this page", PageController.r(:delete, @page.id)
+          workflow "Delete this page", PageController.r(:delete, @page.id), :delete, :page
         end
 
         PageController.render_view('show')
@@ -37,33 +58,22 @@ module CortexReaver
         error_404
       else
         # Default welcome page
-        @photographs = Photograph.recent.viewable_by(user)
         @journals = Journal.recent.viewable_by(user)
-      
-        if @photographs.count > 0
-          # Show sidebar
-          @sidebar ||= []
-          @sidebar.unshift PhotographController.render_view('sidebar')
-        end
 
         # Workflows
         if user.can_create? Journal.new
-          workflow "New Journal", JournalController.r(:new)
-        end
-        if user.can_create? Page.new
-          workflow "New Page", PageController.r(:new)
+          workflow "New Journal", JournalController.r(:new), :new, :journal
         end
         if user.can_create? Photograph.new
-          workflow "New Photograph", PhotographController.r(:new)
+          workflow "New Photograph", PhotographController.r(:new), :new, :photograph
+        end
+        if user.can_create? Page.new
+          workflow "New Page", PageController.r(:new), :new, :page
         end
-#        if user.can_create? Project.new
-#          workflow "New Project", ProjectController.r(:new)
-#        end
 
         # Feeds
         feed 'Photographs', PhotographController.r(:atom)
         feed 'Journals', JournalController.r(:atom)
-#        feed 'Projects', ProjectController.r(:atom)
         feed 'Comments', CommentController.r(:atom)
 
         JournalController.render_view('list', :journals => @journals)
@@ -75,9 +85,90 @@ module CortexReaver
       error_404
     end
 
-    def clear
-      Ramaze::Cache.action.clear
-      respond "cache cleared"
+    # XML sitemap.
+    def sitemap
+      error_404 unless request.path_info =~ /\.xml$/
+
+      doc = LibXML::XML::Document.new
+      doc.root = (root = LibXML::XML::Node.new('urlset'))
+      root['xmlns'] = "http://www.sitemaps.org/schemas/sitemap/0.9"
+      
+      # Front page
+      root << (url = LibXML::XML::Node.new('url'))
+        url << (loc = LibXML::XML::Node.new('loc'))
+          loc << full_url('/')
+        url << (lastmod = LibXML::XML::Node.new('lastmod'))
+          lastmod << Time.parse(Journal.dataset.min(:updated_on).to_s).xmlschema
+        url << (changefreq = LibXML::XML::Node.new('changefreq'))
+          changefreq << 'hourly'
+        url << (priority = LibXML::XML::Node.new('priority'))
+          priority << '1.0'
+
+      # Indexes
+      [JournalController, PhotographController].each do |c|
+        root << (url = LibXML::XML::Node.new('url'))
+        url << (loc = LibXML::XML::Node.new('loc'))
+        url << (lastmod = LibXML::XML::Node.new('lastmod'))
+        url << (changefreq = LibXML::XML::Node.new('changefreq'))
+        url << (priority = LibXML::XML::Node.new('priority'))
+        
+        loc << full_url(c.r)
+        lastmod << Time.parse(c::MODEL.dataset.min(:updated_on).to_s).xmlschema
+        changefreq << 'hourly'
+        priority << '0.9'
+      end
+
+      # Comments
+      root << (url = LibXML::XML::Node.new('url'))
+      url << (loc = LibXML::XML::Node.new('loc'))
+      url << (lastmod = LibXML::XML::Node.new('lastmod'))
+      url << (changefreq = LibXML::XML::Node.new('changefreq'))
+      url << (priority = LibXML::XML::Node.new('priority'))
+      
+      loc << full_url('/comments')
+      lastmod << Time.parse(Comment.dataset.min(:updated_on).to_s).xmlschema
+      changefreq << 'always'
+      priority << '0.5'
+
+      # Individual pages
+      Page.all.each do |page|
+        root << (url = LibXML::XML::Node.new('url'))
+        url << (loc = LibXML::XML::Node.new('loc'))
+        url << (lastmod = LibXML::XML::Node.new('lastmod'))
+        url << (changefreq = LibXML::XML::Node.new('changefreq'))
+        url << (priority = LibXML::XML::Node.new('priority'))
+
+        loc << full_url(page.url)
+        lastmod << page.updated_on.xmlschema
+        changefreq << 'weekly'
+        priority << '0.9'
+      end
+      Journal.all.each do |journal|
+        root << (url = LibXML::XML::Node.new('url'))
+        url << (loc = LibXML::XML::Node.new('loc'))
+        url << (lastmod = LibXML::XML::Node.new('lastmod'))
+        url << (changefreq = LibXML::XML::Node.new('changefreq'))
+        url << (priority = LibXML::XML::Node.new('priority'))
+      
+        loc << full_url(journal.url)
+        lastmod << journal.updated_on.xmlschema
+        changefreq << 'weekly'
+        priority << '0.8'
+      end
+      Photograph.all.each do |photograph|
+        root << (url = LibXML::XML::Node.new('url'))
+        url << (loc = LibXML::XML::Node.new('loc'))
+        url << (lastmod = LibXML::XML::Node.new('lastmod'))
+        url << (changefreq = LibXML::XML::Node.new('changefreq'))
+        url << (priority = LibXML::XML::Node.new('priority'))
+          
+        loc << full_url(photograph.url)
+        lastmod << photograph.updated_on.xmlschema
+        changefreq << 'weekly'
+        priority << '0.8'
+      end
+
+      doc
     end
 
     private

data/lib/cortex_reaver/controller/page.rb

@@ -24,6 +24,7 @@ module CortexReaver
     end
 
     on_second_save do |page, request|
+      Ramaze::Log.info request[:tags]
       page.tags = request[:tags]
       add_attachments(page, request[:attachments])
     end
@@ -43,5 +44,11 @@ module CortexReaver
     on_update do |page, request|
       page.updater = session[:user]
     end
+    
+    def index
+      @models = @pages = Page.select(:id, :name, :title)
+      workflow 'New Page', rs(:new), :new, :page
+      render_view :list
+    end
   end
 end

data/lib/cortex_reaver/controller/photograph.rb

@@ -7,12 +7,12 @@ module CortexReaver
     map '/photographs'
 
     layout do |name, wish|
-      if ['index', 'edit', 'new', 'page'].include? name
-        :text
+      if ['show'].include? name
+        :blank
       elsif request.xhr? or name == 'atom'
         nil
       else
-        :blank
+        :text
       end
     end
 
@@ -32,6 +32,10 @@ module CortexReaver
       user.id.to_i.to_s + flash.inspect
     end
 
+    before :index, :show, :page, :list, :tagged do
+      @body_class = "photographs"
+    end
+    
     on_save do |photograph, request|
       photograph.title = request[:title]
       photograph.name = Photograph.canonicalize request[:name], :id => photograph.id
@@ -54,13 +58,11 @@ module CortexReaver
       photograph.updater = session[:user]
     end
 
-    for_feed do |photograph, x|
-      p photograph
-      x.content(
-        #render_view('atom_fragment.rhtml', :photograph => photograph), 
-        "a",
-        :type => 'html'
-      )
+    for_feed do |photograph, entry|
+      entry << (content = LibXML::XML::Node.new('content'))
+      entry << render_view(:atom_fragment, :photograph => photograph)
+      entry['type'] = 'html'
     end
+
   end
 end

data/lib/cortex_reaver/controller/tag.rb

@@ -45,7 +45,7 @@ module CortexReaver
       if q.empty?
         respond ''
       else
-        respond Tag.filter(:title.like(/^#{q}/i)).limit(8).map(:title).join("\n")
+        respond Tag.filter(:title.like(/^#{q}/i)).limit(8).select(:name, :title).map(:title).join("\n")
       end
     end
     

data/lib/cortex_reaver/controller/user.rb

@@ -35,12 +35,17 @@ module CortexReaver
     end
 
     # Listing users outright is a little dodgy.
-    before :index do
+    before(:index, :page) do
       for_auth do |u|
         u.admin?
       end
     end
 
+    def index
+      @models = @users = User.select(:name, :id, :login)
+      render_view :list
+    end
+
     def login
       @title = "Login"
 
@@ -66,7 +71,7 @@ module CortexReaver
 
     def logout
       if user = do_logout
-        flash[:notice] = "Goodbye, #{user.name}"
+        flash[:notice] = "Goodbye, #{user.name}."
       end
       redirect '/'
     end  

data/lib/cortex_reaver/helper/attachments.rb

@@ -26,7 +26,7 @@ module Ramaze
       def delete_attachment(id, name)
         unless @model = model_class.get(id)
           flash[:error] = "No such #{model_class.to_s.downcase} (#{h id}) exists."
-          redirect Rs()
+          redirect rs()
         end
 
         # You need to be able to edit the model before removing attachments!
@@ -57,7 +57,7 @@ module Ramaze
       def attachment_form(model)
        s = "<div id=\"files\" class=\"files\">\n  <ul>\n    "
        model.attachments.each do |attachment|
-         s << "<li><a href=\"#{attachment.public_path}\">#{attachment.name}</a> (#{A('delete', :href => Rs(:delete_attachment, model.name, attachment.name))})</li>\n"
+         s << "<li><a href=\"#{attachment.public_path}\">#{attachment.name}</a> (#{a('delete', :href => rs(:delete_attachment, model.name, attachment.name))})</li>\n"
        end
        s << "</ul>\n</div>\n\n"
 

data/lib/cortex_reaver/helper/crud.rb

@@ -96,7 +96,7 @@ module Ramaze
               u.can_create? model_class.new
             end
 
-            @title = "New #{h model_class.to_s.demodulize.titleize}"
+            @title = "New #{model_class.to_s.demodulize.titleize}"
             @form_action = :new
 
             if request.post?
@@ -221,7 +221,7 @@ module Ramaze
             u.can_edit? @model
           end
         
-          @title = "Edit #{model_class.to_s.demodulize.downcase} #{h @model.to_s}"
+          @title = "Edit #{model_class.to_s.demodulize.downcase} #{@model.to_s}"
           @form_action = "edit/#{@model.id}"
 
           set_singular_model_var @model
@@ -315,7 +315,7 @@ module Ramaze
         set_plural_model_var @models
 
         if user.can_create? model_class.new
-          workflow "New #{model_class.to_s.demodulize}", rs(:new)
+          workflow "New #{model_class.to_s.demodulize}", rs(:new), :new, model_class.to_s.demodulize.downcase
         end
 
         render_view(:list)
@@ -332,7 +332,7 @@ module Ramaze
           # Redirect IDs to names
           raw_redirect(@model.url, :status => 301) if id =~ /^\d+$/
 
-          @title = h @model.to_s
+          @title = @model.to_s
           set_singular_model_var @model
 
           if @model.class.associations.include? :comments
@@ -351,13 +351,13 @@ module Ramaze
           end
           
           if user.can_create? model_class.new
-            workflow "New #{model_class.to_s.demodulize}", rs(:new)
+            workflow "New #{model_class.to_s.demodulize}", rs(:new), :new, model_class.to_s.demodulize.downcase
           end
           if user.can_edit? @model
-            workflow "Edit this #{model_class.to_s.demodulize}", rs(:edit, @model.id)
+            workflow "Edit this #{model_class.to_s.demodulize}", rs(:edit, @model.id), :edit, model_class.to_s.demodulize.downcase
           end
           if user.can_delete? @model
-            workflow "Delete this #{model_class.to_s.demodulize}", rs(:delete, @model.id)
+            workflow "Delete this #{model_class.to_s.demodulize}", rs(:delete, @model.id), :delete, model_class.to_s.demodulize.downcase
           end
         elsif id
           # Didn't find that model

data/lib/cortex_reaver/helper/feeds.rb

@@ -6,7 +6,7 @@ module Ramaze
     #
     # Requires crud. Will attempt to cache feeds if the cache helper is available.
     module Feeds
-      require 'builder'
+      require 'libxml'
 
       Helper::LOOKUP << self
 
@@ -36,9 +36,6 @@ module Ramaze
       def atom_builder(params = {:model_class => self.class.const_get('MODEL')})
         response['Content-Type'] = 'application/atom+xml'
 
-        x = Builder::XmlMarkup.new(:indent => 2)
-        x.instruct!
-
         # Get model class to work with
         model_class = params[:model_class]
 
@@ -52,42 +49,63 @@ module Ramaze
           updated = Time.now.xmlschema
         end
 
-        # Construct URL base
-        port = CortexReaver.config[:port]
-        url_base = "#{request.scheme}://#{request.host}"
-        url_base << ":#{port}" unless port == 80
-
-        x.feed(:xmlns => 'http://www.w3.org/2005/Atom') do
-          x.id url_base + model_class.url
-          x.title "#{CortexReaver.config[:site][:name]} - #{model_class.to_s.demodulize.titleize}"
-          # x.subtitle
-          x.updated updated
-          x.link :href => url_base + model_class.url
-          x.link :href => (url_base + model_class.atom_url), :rel => 'self'
-
-          recent.all do |model|
-            x.entry do
-              x.id url_base + model.url
-              x.title model.title
-              x.published model.created_on.xmlschema
-              x.updated model.updated_on.xmlschema
-              x.link :href => (url_base + model.url), :rel => 'alternate'
-
-              x.author do
-                x.name model.creator.name
-
-                if model.creator.http
-                  x.uri model.creator.http
-                end
-              end
-
-              # Any additional controller-specific info
-              if self.class.for_feed_block
-                self.class.for_feed_block.call(model, x)
-              end
-            end
+        # Doc
+        doc = LibXML::XML::Document.new
+        doc.root = (root = LibXML::XML::Node.new('feed'))
+        root['xmlns'] = 'http://www.w3.org/2005/Atom'
+
+        # Global opts
+        root << (id = LibXML::XML::Node.new('id'))
+        id << CortexReaver.config.site.url.to_s
+
+        root << (title = LibXML::XML::Node.new('title'))
+        title << "#{CortexReaver.config.site.name} - #{model_class.to_s.demodulize.titleize}"
+
+        root << (updated_node = LibXML::XML::Node.new('updated'))
+        updated_node << updated.to_s
+
+        root << (link = LibXML::XML::Node.new('link'))
+        link['href'] = full_url('/')
+
+        root << (link = LibXML::XML::Node.new('link'))
+        link['href'] = full_url(model_class.atom_url)
+        link['rel'] = 'self'
+
+        recent.all do |model|
+          root << (entry = LibXML::XML::Node.new('entry'))
+          
+          entry << (id = LibXML::XML::Node.new('id'))
+          id << full_url(model.url)
+
+          entry << (title = LibXML::XML::Node.new('title'))
+          title << model.title.to_s
+
+          entry << (published = LibXML::XML::Node.new('published'))
+          published << model.created_on.xmlschema
+
+          entry << (updated = LibXML::XML::Node.new('updated'))
+          updated << model.updated_on.xmlschema
+
+          entry << (link = LibXML::XML::Node.new('link'))
+          link['href'] = full_url(model.url)
+          link['rel'] = 'alternate'
+
+          entry << (author = LibXML::XML::Node.new('author'))
+          author << (name = LibXML::XML::Node.new('name'))
+          name << model.creator.name.to_s
+
+          if model.creator.http
+            author << (uri = LibXML::XML::Node.new('uri'))
+            uri << model.creator.http.to_s
+          end
+
+          # Any additional controller-specific info
+          if self.class.for_feed_block
+            self.class.for_feed_block.call(model, entry)
           end
         end
+
+        doc
       end
 
       def feeds