cortex-reaver 0.0.9 → 0.1.0

data/lib/cortex_reaver/controller/controller.rb

@@ -0,0 +1,22 @@
+module CortexReaver
+  class Controller < Ramaze::Controller
+    trait :app => :cortex_reaver
+    engine :Erubis
+    layout :text
+    helper :form, :auth, :navigation, :template, :workflow, :error
+  end
+end
+
+# Require controllers
+module CortexReaver
+  require File.join(LIB_DIR, 'controller', 'main')
+  require File.join(LIB_DIR, 'controller', 'user')
+  require File.join(LIB_DIR, 'controller', 'page')
+  require File.join(LIB_DIR, 'controller', 'journal')
+  require File.join(LIB_DIR, 'controller', 'photograph')
+  require File.join(LIB_DIR, 'controller', 'project')
+  require File.join(LIB_DIR, 'controller', 'comment')
+  require File.join(LIB_DIR, 'controller', 'tag')
+  require File.join(LIB_DIR, 'controller', 'documentation')
+  require File.join(LIB_DIR, 'controller', 'admin')
+end

data/lib/cortex_reaver/controller/documentation.rb

@@ -1,8 +1,6 @@
 module CortexReaver
-  class DocumentationController < Ramaze::Controller
+  class DocumentationController < Controller
     map '/documentation'
-    layout '/text_layout'
-    engine :Erubis
 
     def formatting
     end

data/lib/cortex_reaver/controller/journal.rb

@@ -1,19 +1,17 @@
 module CortexReaver
-  class JournalController < Ramaze::Controller
+  class JournalController < Controller
     MODEL = Journal
 
     map '/journals'
-    layout '/text_layout'
-    template :edit, :form
-    template :new, :form
-    engine :Erubis
+
+    layout(:text) do |name, wish|
+      !request.xhr? and name != 'atom'
+    end
+
+    alias_view :edit, :form
+    alias_view :new, :form
 
     helper :cache,
-      :error, 
-      :auth, 
-      :form, 
-      :workflow, 
-      :navigation, 
       :date,
       :tags, 
       :canonical,
@@ -21,19 +19,22 @@ module CortexReaver
       :attachments,
       :feeds
 
-    cache :index, :ttl => 60
+    cache_action(:method => :index, :ttl => 120) do
+      user.id.to_i.to_s + flash.inspect
+    end
 
     on_second_save do |journal, request|
       journal.tags = request[:tags]
       add_attachments(journal, request[:attachments])
       journal.body = request[:body]
     
-      MainController.send(:action_cache).clear
+      Ramaze::Cache.action.clear
     end
 
     on_save do |journal, request|
       journal.title = request[:title]
       journal.name = Journal.canonicalize(request[:name], :id => journal.id)
+      journal.draft = request[:draft]
     end
 
     on_create do |journal, request|

data/lib/cortex_reaver/controller/main.rb

@@ -1,23 +1,22 @@
 require 'builder'
 
 module CortexReaver
-  class MainController < Ramaze::Controller
+  class MainController < Controller
     map '/'
-    layout '/text_layout'
+    
+    layout(:text) do |name, wish|
+      !request.xhr? and name != 'atom'
+    end
+
     helper :cache, 
-      :workflow, 
-      :auth, 
-      :error, 
-      :navigation, 
       :date, 
       :tags, 
-      :form,
       :feeds,
       :pages
 
-    engine :Erubis
-
-    cache :index, :ttl => 60
+#    cache_action(:method => :index, :ttl => 120) do
+#      user.id.to_i.to_s + flash.inspect
+#    end
 
     # the index action is called automatically when no other action is specified
     def index(*ids)
@@ -26,45 +25,48 @@ module CortexReaver
         @title = @page.title
        
         if user.can_edit? Page.new
-          workflow "Edit this page", R(PageController, :edit, @page.id)
+          workflow "Edit this page", PageController.r(:edit, @page.id)
         end
         if user.can_delete? Page.new
-          workflow "Delete this page", R(PageController, :delete, @page.id)
+          workflow "Delete this page", PageController.r(:delete, @page.id)
         end
 
-        render_template 'pages/show'
+        PageController.render_view('show')
       elsif not ids.empty?
         # Didn't have that page
         error_404
       else
         # Default welcome page
-        @photographs = Photograph.recent
-        @journals = Journal.recent
-       
-        if @photographs.size > 0
+        @photographs = Photograph.recent.viewable_by(user)
+        @journals = Journal.recent.viewable_by(user)
+      
+        if @photographs.count > 0
+          # Show sidebar
           @sidebar ||= []
-          @sidebar.unshift render_template('photographs/sidebar.rhtml')
+          @sidebar.unshift PhotographController.render_view('sidebar')
         end
 
+        # Workflows
         if user.can_create? Journal.new
-          workflow "New Journal", R(JournalController, :new)
+          workflow "New Journal", JournalController.r(:new)
         end
         if user.can_create? Page.new
-          workflow "New Page", R(PageController, :new)
+          workflow "New Page", PageController.r(:new)
         end
         if user.can_create? Photograph.new
-          workflow "New Photograph", R(PhotographController, :new)
-        end
-        if user.can_create? Project.new
-          workflow "New Project", R(ProjectController, :new)
+          workflow "New Photograph", PhotographController.r(:new)
         end
+#        if user.can_create? Project.new
+#          workflow "New Project", ProjectController.r(:new)
+#        end
 
-        feed 'Photographs', Rs(PhotographController, :atom)
-        feed 'Journals', Rs(JournalController, :atom)
-        feed 'Projects', Rs(ProjectController, :atom)
-        feed 'Comments', Rs(CommentController, :atom)
+        # Feeds
+        feed 'Photographs', PhotographController.r(:atom)
+        feed 'Journals', JournalController.r(:atom)
+#        feed 'Projects', ProjectController.r(:atom)
+        feed 'Comments', CommentController.r(:atom)
 
-        render_template 'journals/list.rhtml'
+        JournalController.render_view('list', :journals => @journals)
       end
     end
 
@@ -73,6 +75,11 @@ module CortexReaver
       error_404
     end
 
+    def clear
+      Ramaze::Cache.action.clear
+      respond "cache cleared"
+    end
+
     private
 
     # the string returned at the end of the function is used as the html body

data/lib/cortex_reaver/controller/page.rb

@@ -1,18 +1,17 @@
 module CortexReaver
-  class PageController < Ramaze::Controller
+  class PageController < Controller
     MODEL = Page
 
     map '/pages'
-    layout '/text_layout'
-    template :edit, :form
-    template :new, :form
-    engine :Erubis
-
-    helper :error,
-      :auth,
-      :form,
-      :workflow,
-      :navigation,
+    
+    layout(:text) do |name, wish|
+      not request.xhr? and name != :atom
+    end
+
+    alias_view :edit, :form
+    alias_view :new, :form
+
+    helper :cache,
       :date,
       :tags,
       :canonical,
@@ -20,6 +19,10 @@ module CortexReaver
       :attachments,
       :pages
 
+    cache_action(:method => :show, :ttl => 120) do
+      user.id.to_i.to_s + flash.inspect
+    end
+
     on_second_save do |page, request|
       page.tags = request[:tags]
       add_attachments(page, request[:attachments])
@@ -29,6 +32,7 @@ module CortexReaver
       page.title = request[:title]
       page.page_id = request[:page_id]
       page.name = Page.canonicalize request[:name], :id => page.id, :page_id => page.page_id
+      page.draft = request[:draft]
       page.body = request[:body]
     end
 

data/lib/cortex_reaver/controller/photograph.rb

@@ -1,23 +1,25 @@
 require 'exifr'
 require 'RMagick'
 module CortexReaver
-  class PhotographController < Ramaze::Controller
+  class PhotographController < Controller
     MODEL = Photograph
 
     map '/photographs'
-    layout '/blank_layout'
-    layout '/text_layout' => [:index, :edit, :new, :page]
-    template_paths << 'view'
-    template :edit, :form
-    template :new, :form
-    engine :Erubis
+
+    layout do |name, wish|
+      if ['index', 'edit', 'new', 'page'].include? name
+        :text
+      elsif request.xhr? or name == 'atom'
+        nil
+      else
+        :blank
+      end
+    end
+
+    alias_view :edit, :form
+    alias_view :new, :form
 
     helper :cache,
-      :error,
-      :auth, 
-      :form, 
-      :workflow, 
-      :navigation, 
       :date,
       :tags, 
       :canonical,
@@ -26,11 +28,14 @@ module CortexReaver
       :photographs,
       :feeds
 
-    cache :index, :ttl => 60
+    cache_action(:method => :index, :ttl => 120) do
+      user.id.to_i.to_s + flash.inspect
+    end
 
     on_save do |photograph, request|
       photograph.title = request[:title]
       photograph.name = Photograph.canonicalize request[:name], :id => photograph.id
+      photograph.draft = request[:draft]
     end
 
     on_second_save do |photograph, request|
@@ -38,7 +43,7 @@ module CortexReaver
       photograph.image = request[:image][:tempfile] if request[:image]
       photograph.infer_date_from_exif! if request[:infer_date]
 
-      MainController.send(:action_cache).clear
+      Ramaze::Cache.action.clear
     end
 
     on_create do |photograph, request|
@@ -52,7 +57,8 @@ module CortexReaver
     for_feed do |photograph, x|
       p photograph
       x.content(
-        render_template('atom_fragment.rhtml', :photograph => photograph), 
+        #render_view('atom_fragment.rhtml', :photograph => photograph), 
+        "a",
         :type => 'html'
       )
     end

data/lib/cortex_reaver/controller/project.rb

@@ -1,19 +1,17 @@
 module CortexReaver
-  class ProjectController < Ramaze::Controller
+  class ProjectController < Controller
     MODEL = Project
 
     map '/projects'
-    layout '/text_layout'
-    template :edit, :form
-    template :new, :form
-    engine :Erubis
+    
+    layout(:text) do |name, wish|
+      !request.xhr? and name != 'atom'
+    end
 
+    alias_view :edit, :form
+    alias_view :new, :form
+    
     helper :cache,
-      :error, 
-      :auth, 
-      :form, 
-      :workflow, 
-      :navigation, 
       :date,
       :tags, 
       :canonical,
@@ -21,18 +19,23 @@ module CortexReaver
       :attachments,
       :feeds
 
-    cache :index, :ttl => 60
+    cache_action(:method => :index, :ttl => 120) do
+      user.id.to_i.to_s + flash.inspect
+    end
 
     on_second_save do |project, request|
       project.tags = request[:tags]
       add_attachments(project, request[:attachments])
+      project.body = request[:body]
+
+      Ramaze::Cache.action.clear
     end
 
     on_save do |project, request|
       project.title = request[:title]
-      project.description = request[:description]
       project.name = Project.canonicalize request[:name], :id => project.id
-      project.body = request[:body]
+      project.description = request[:description]
+      project.draft = request[:draft]
     end
 
     on_create do |project, request|

data/lib/cortex_reaver/controller/tag.rb

@@ -1,24 +1,27 @@
 module CortexReaver
-  class TagController < Ramaze::Controller
+  class TagController < Controller
     MODEL = Tag
 
     map '/tags'
-    layout '/text_layout'
-    template :edit, :form
-    template :new, :form
-    engine :Erubis
+    
+    layout(:text) do |name, wish|
+      !request.xhr?
+    end
 
+    alias_view :index, :list
+    alias_view :edit, :form
+    alias_view :new, :form
+    
     helper :cache,
-      :error,
-      :auth,
-      :form,
-      :workflow,
-      :navigation,
       :canonical,
       :crud
 
-    cache :index, :ttl => 60
-    cache :show, :ttl => 60
+    cache_action(:method => :index, :ttl => 120) do
+      user.id.to_i.to_s + flash.inspect
+    end
+    cache_action(:method => :show, :ttl => 120) do
+      user.id.to_i.to_s + flash.inspect
+    end
 
     on_save do |tag, request|
       tag.title = request[:title]
@@ -27,12 +30,11 @@ module CortexReaver
 
     def index(*ids)
       if ids.size > 0
-        raw_redirect Rs([:show] + ids), :status => 301
+        raw_redirect rs([:show] + ids), :status => 301
       else
         # Index
         @title = "All Tags"
         @tags = Tag.order(:count).reverse
-        render_template :list
       end
     end
 

data/lib/cortex_reaver/controller/user.rb

@@ -1,19 +1,17 @@
 module CortexReaver
-  class UserController < Ramaze::Controller
+  class UserController < Controller
     MODEL = User
 
     map '/users'
-    layout '/text_layout'
-    template :edit, :form
-    template :new, :form
-    engine :Erubis
+    
+    layout(:text) do |name, wish|
+      !request.xhr?
+    end
+    
+    alias_view :edit, :form
+    alias_view :new, :form
 
-    helper :error,
-      :auth,
-      :form,
-      :workflow,
-      :navigation,
-      :date,
+    helper :date,
       :tags,
       :canonical,
       :crud,
@@ -56,12 +54,12 @@ module CortexReaver
             redirect uri
           else
             # Try the main page.
-            redirect R(:/)
+            redirect MainController.r
           end
         else
           # Nope, no login.
           flash[:error] = "Wrong username or password."
-          redirect Rs(:login)
+          redirect rs(:login)
         end
       end
     end