cortex-reaver 0.0.9 → 0.1.0

data/lib/cortex_reaver/support/tags.rb

@@ -1,119 +1,128 @@
-module CortexReaver
-  module Model
+module Sequel
+  module Plugins
     module Tags
       # Support for taggable models
-     
-      def self.included(base)
-        base.class_eval do
-          # If tags have changed, make sure to update those tags' counts.
-          after_save(:update_tag_counts) do
-            if @added_tags
-              @added_tags.each do |tag|
-                tag.count += 1
-                tag.save
-              end
-              @removed_tags.each do |tag|
-                tag.count -= 1
-                tag.save
-              end
-            end
+      module ClassMethods
+        # Returns all models with ANY of the following tags
+        def tagged_with_any_of(tags)
+          tagged_with(tags, false)
+        end
+        
+        # Returns all models with ALL the following tags:
+        def tagged_with(tags, all=true)
+          # Find map between this model and tags, e.g. pages_tags
+          map = [table_name.to_s, 'tags'].sort.join('_').to_sym
+          
+          # The name in the mapping table which points to us
+          own_id = (table_name.to_s.singularize + '_id').to_sym
+          
+          # The tag IDs to search for
+          ids = tags.map { |t| t.id }
+          
+          # Now filter this model, finding all ids which appear n times with
+          # the same model_id in the mapping table, which has been filtered
+          # to contain only rows with one of our interesting tags.
+          #
+          # Man, don't you wish MySQL had intersect?
+          if all
+            filter(:id =>
+              CortexReaver.db[map].filter(:tag_id => ids).group(own_id).having(
+                "count(*) = #{ids.size}"
+              ).select(own_id)
+            )
+          else
+            filter(:id => 
+              CortexReaver.db[map].filter(:tag_id => ids).select(own_id)
+            )
           end
+        end
+      end
+   
+      module InstanceMethods 
+        # If tags have changed, make sure to update those tags' counts.
+        def after_save
+          return false if super == false
 
-          # Remove tags on deletion
-          before_destroy(:drop_associated_tags) do
-            tags.each do |tag|
+          if @added_tags
+            @added_tags.each do |tag|
+              tag.count += 1
+              tag.save
+            end
+            @removed_tags.each do |tag|
               tag.count -= 1
-              if tag.count == 0
-                tag.destroy
-              else
-                tag.save
-              end
+              tag.save
             end
-            remove_all_tags
           end
 
-          # Returns all models with ANY of the following tags
-          def self.tagged_with_any_of(tags)
-            tagged_with(tags, false)
-          end
-          
-          # Returns all models with ALL the following tags:
-          def self.tagged_with(tags, all=true)
-            # Find map between this model and tags, e.g. pages_tags
-            map = [table_name.to_s, 'tags'].sort.join('_').to_sym
-            
-            # The name in the mapping table which points to us
-            own_id = (table_name.to_s.singularize + '_id').to_sym
-            
-            # The tag IDs to search for
-            ids = tags.map { |t| t.id }
-            
-            # Now filter this model, finding all ids which appear n times with
-            # the same model_id in the mapping table, which has been filtered
-            # to contain only rows with one of our interesting tags.
-            #
-            # Man, don't you wish MySQL had intersect?
-            if all
-              filter(:id =>
-                CortexReaver.db[map].filter(:tag_id => ids).group(own_id).having(
-                  "count(*) = #{ids.size}"
-                ).select(own_id)
-              )
+          true
+        end
+
+        # Remove tags on deletion
+        def before_destroy
+          Ramaze::Log.debug 'remove tags'
+          return false unless super
+          Ramaze::Log.debug 'removing tags'
+
+          tags.each do |tag|
+            tag.count -= 1
+            if tag.count == 0
+              tag.destroy
             else
-              filter(:id => 
-                CortexReaver.db[map].filter(:tag_id => ids).select(own_id)
-              )
+              tag.save
             end
           end
+          remove_all_tags
+
+
+          true
         end
-      end
 
-      # Set tags from a string, or array of tags. Finds existing tags or
-      # creates new ones. Also updates tag counts.
-      def tags=(tags)
-        if tags.kind_of? String
-          tags = tags.squeeze(',').split(',').map do |title|
-            title.strip!
-            if title.blank?
-              # Do nothing
-              tag = nil
-            else
-              # Look up existing tag
-              tag = Tag[:title => title]
-              # Or create new one
-              tag ||= Tag.create(:title => title, :name => Tag.canonicalize(title))
-              unless tag
-                # Everything failed
-                raise RuntimeError.new("couldn't find or create tag for #{title}")
+        # Set tags from a string, or array of tags. Finds existing tags or
+        # creates new ones. Also updates tag counts.
+        def tags=(tags)
+          if tags.kind_of? String
+            tags = tags.squeeze(',').split(',').map do |title|
+              title.strip!
+              if title.blank?
+                # Do nothing
+                tag = nil
+              else
+                # Look up existing tag
+                tag = CortexReaver::Tag[:title => title]
+                # Or create new one
+                tag ||= CortexReaver::Tag.create(:title => title, :name => CortexReaver::Tag.canonicalize(title))
+                unless tag
+                  # Everything failed
+                  raise RuntimeError.new("couldn't find or create tag for #{title}")
+                end
               end
+              tag
             end
-            tag
           end
-        end
 
-        unless tags.respond_to? :each
-          raise ArgumentError.new("Needed a string or Enumerable of Tags, got #{tags.class}")
-        end
+          unless tags.respond_to? :each
+            raise ArgumentError.new("Needed a string or Enumerable of Tags, got #{tags.class}")
+          end
 
-        # Get rid of empty tags
-        tags.reject do |tag|
-          tag.nil?
-        end
-        tags.uniq!
+          # Get rid of empty tags
+          tags.reject do |tag|
+            tag.nil?
+          end
+          tags.uniq!
 
-        # Find which tags to change. Their counts are updated by an after_save
-        # callback.
-        old_tags = self.tags
-        @removed_tags = old_tags - tags
-        @added_tags = tags - old_tags
+          # Find which tags to change. Their counts are updated by an after_save
+          # callback.
+          old_tags = self.tags
+          @removed_tags = old_tags - tags
+          @added_tags = tags - old_tags
 
-        # Change own tags
-        remove_all_tags
-        tags.each do |tag|
-          add_tag tag
+          # Change own tags
+          remove_all_tags
+          tags.each do |tag|
+            add_tag tag
+          end
         end
       end
-
     end
   end
 end

data/lib/cortex_reaver/support/timestamps.rb

@@ -1,32 +1,38 @@
-module CortexReaver
-  module Model
+module Sequel
+  module Plugins
     # Supports updated_on and created_on behavior
     module Timestamps
-      def self.included(base)
-        base.class_eval do
-          # Create
-          before_create(:init_timestamp) do
-            unless skip_timestamp_update?
-              self.created_on = Time.now
-              self.updated_on = Time.now
-            end
+      module InstanceMethods
+        # Create
+        def before_create
+          return false if super == false
+
+          unless skip_timestamp_update?
+            self.created_on = Time.now
+            self.updated_on = Time.now
           end
 
-          # Update
-          before_update(:update_timestamp) do
-            unless skip_timestamp_update?
-              self.updated_on = Time.now
-            end
+          true
+        end
+
+        # Update
+        def before_update
+          return false if super == false
+
+          unless skip_timestamp_update?
+            self.updated_on = Time.now
           end
+
+          true
         end
-      end
 
-      def skip_timestamp_update=(boolean)
-        @skip_timestamp_update = boolean
-      end
+        def skip_timestamp_update=(boolean)
+          @skip_timestamp_update = boolean
+        end
 
-      def skip_timestamp_update?
-        @skip_timestamp_update
+        def skip_timestamp_update?
+          @skip_timestamp_update
+        end
       end
     end
   end

data/lib/cortex_reaver/support/viewable.rb

@@ -0,0 +1,17 @@
+module Sequel
+  module Plugins
+    module Viewable
+      module DatasetMethods
+        def viewable_by(user)
+          if user.anonymous?
+            self.exclude(:draft => true)
+          elsif user.admin? or user.editor?
+            self
+          else
+            self.exclude(:draft => true).or(:created_by => user.id)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/cortex_reaver/version.rb

@@ -1,8 +1,8 @@
 module CortexReaver
   APP_NAME = 'Cortex Reaver'
-  APP_VERSION = '0.0.9'
-  APP_AUTHOR = 'aphyr'
+  APP_VERSION = '0.1.0'
+  APP_AUTHOR = 'Kyle Kingsbury'
   APP_EMAIL = 'aphyr@aphyr.com'
   APP_URL = 'http://aphyr.com'
-  APP_COPYRIGHT = 'Copyright (c) 2009 aphyr <aphyr@aphyr.com>. All rights reserved.'
+  APP_COPYRIGHT = 'Copyright (c) 2009 Kyle Kingsbury <aphyr@aphyr.com>. All rights reserved.'
 end

data/lib/cortex_reaver/view/admin/index.rhtml

@@ -1,6 +1,6 @@
 <h2>Administration</h2>
 
 <ul>
-  <li><%= A('Update comment counts', :href => Rs(:update_comments)) %></li>
-  <li><%= A('Update tags', :href => Rs(:update_tags)) %></li>
+  <li><%= a('Update comment counts', rs(:update_comments)) %></li>
+  <li><%= a('Update tags', rs(:update_tags)) %></li>
 </ul>

data/lib/cortex_reaver/view/comments/comment.rhtml

@@ -19,7 +19,10 @@
       <% end %>
       <% if user.can_delete? @comment %>
         <li>
-          <%= A '<img src="/images/delete.gif" class="icon" alt="delete" /> Delete', :href => "/comments/delete/#{@comment.id}", :onclick => "return confirm('Are you sure you wish to delete this comment?');" %></li>
+          <a href="<%= CortexReaver::CommentController.r(:delete, @comment.id) %>" onclick="return confirm('Are you sure you want to delete this comment?');">
+            <img src="/images/delete.gif" class="icon" alt="delete" /> Delete
+          </a>
+        </li>
       <% end %>
     </ul>
   </div>

data/lib/cortex_reaver/view/comments/list.rhtml

@@ -1,5 +1,5 @@
 <div class="comments">
   <% @comments.all.each do |comment| %>
-    <%= render_template 'comment.rhtml', 'comment' => comment, 'hide_comments' => true %>
+    <%= CortexReaver::CommentController.render_view 'comment', 'comment' => comment, 'hide_comments' => true %>
   <% end %>
 </div>

data/lib/cortex_reaver/view/comments/post_form.rhtml

@@ -11,7 +11,7 @@
     </div>
   <% end %>
 
-  <form class="comment-form" action="<%= R(CortexReaver::CommentController, :post) %>" method="post">
+  <form class="comment-form" action="<%= CortexReaver::CommentController.r :post %>" method="post">
     <%= form_p :title, :model => @new_comment %>
     <p class="dont-read-me">
       Please avoid writing anything here unless you are a computer:

data/lib/cortex_reaver/view/journals/form.rhtml

@@ -2,12 +2,14 @@
 
 <%= errors_on @journal %>
 
-<form class="edit-form" action="<%= Rs(@form_action) %>" method="post" enctype="multipart/form-data">
+<form class="edit-form" action="<%= rs(@form_action) %>" method="post" enctype="multipart/form-data">
   <%= form_p :title, :model => @journal %>
   <%= live_name_field @journal %>
   <%= live_tags_field @journal %>
 
   <%= form_p :body, :model => @journal, :type => 'textarea', :description => 'Body (<a href="/documentation/formatting" />Formatting Help</a>)' %>
+
   <%= attachment_form @journal %>
+  <%= form_p :draft, :model => @journal, :type => 'checkbox', :description => 'This is a draft' %>
   <input type="submit" name="submit" />
 </form>

data/lib/cortex_reaver/view/journals/journal.rhtml

@@ -1,4 +1,4 @@
-<div class="journal text-entry <%= @journal.tags.map {|t| 'tagged_' + t.name}.join(' ')%>">
+<div class="journal text-entry <%= @journal.tags.map {|t| 'tagged_' + t.name}.join(' ')%> <%= @journal.draft ? 'draft' : ''%>">
   <h2><a id="journal_<%= @journal.name %>" href="<%= @journal.url %>"><%=h @journal.title %></a></h2>
   <div class="byline">
     <%= author_info @journal %>
@@ -21,7 +21,9 @@
       <% end %>
       <% if user.can_delete? @journal %>
         <li>
-          <%= A '<img src="/images/delete.gif" class="icon" alt="delete" /> Delete', :href => "/journals/delete/#{@journal.id}", :onclick => "return confirm('Are you sure you want to delete this journal?');" %>
+          <a href="<%= CortexReaver::JournalController.r(:delete, @journal.id) %>" onclick="return confirm('Are you sure you want to delete this journal?');">
+            <img src="/images/delete.gif" class="icon" alt="delete" /> Delete
+          </a>
         </li>
       <% end %>
     </ul>
@@ -31,10 +33,10 @@
     <div class="comments">
       <a id="comments" />
       <% @journal.comments_dataset.order(:created_on).all.each do |comment| %>
-        <%= render_template '../comments/comment.rhtml', 'comment' => comment %>
+        <%= CortexReaver::CommentController.render_view :comment, 'comment' => comment %>
       <% end %>
     </div>
 
-    <%= render_template '../comments/post_form.rhtml', 'comment' => @new_comment %>
+    <%= CortexReaver::CommentController.render_view :post_form, 'comment' => @new_comment %>
   <% end %>
 </div>

data/lib/cortex_reaver/view/journals/list.rhtml

@@ -20,10 +20,10 @@
 
 <div class="journals">
   <% @journals.all.each do |journal| %>
-    <%= render_template Ramaze::Global.view_root + '/journals/journal.rhtml', 'journal' => journal, 'hide_comments' => true %>
+    <%= CortexReaver::JournalController.render_view :journal, 'journal' => journal, 'hide_comments' => true %>
   <% end %>
 
-  <% if @page.nil? and @journals.size > 0 and @journals.all.last.previous %>
+  <% if @page.nil? and @journals.count > 0 and @journals.all.last.previous %>
     <p><a href="<%= @journals.all.last.previous.absolute_window_url %>">Continue reading on journal page <%= @journals.all.last.previous.absolute_window_index %></a></p>
   <% end %>
 </div>

data/lib/cortex_reaver/view/journals/show.rhtml

@@ -1,5 +1,5 @@
 <%= model_nav @journal %>
 
-<%= render_template 'journal.rhtml', 'journal' => @journal %>
+<%= CortexReaver::JournalController.render_view :journal, 'journal' => @journal %>
 
 <%= model_nav @journal %>

data/lib/cortex_reaver/view/pages/form.rhtml

@@ -2,12 +2,13 @@
 
 <%= errors_on @page %>
 
-<form class="edit-form" action="<%= Rs(@form_action) %>" method="post" enctype="multipart/form-data">
+<form class="edit-form" action="<%= rs(@form_action) %>" method="post" enctype="multipart/form-data">
   <%= page_select 'page_id', :default_id => @page.page_id, :skip_id => @page.id, :description => 'Parent page' %>
   <%= form_p 'title', :model => @page %>
   <%= live_name_field @page %>
   <%= live_tags_field @page %>
   <%= form_p :body, :model => @page, :type => 'textarea' %>
   <%= attachment_form @page %>
+  <%= form_p :draft, :model => @page, :type => 'checkbox', :description => 'This is a draft' %>
   <input type="submit" name="submit" />
 </form>

data/lib/cortex_reaver/view/pages/list.rhtml

@@ -15,13 +15,13 @@
     <tbody>
       <% @pages.all.each do |page| %>
         <tr>
-          <td><%= A(page.name, :href => page.url) %></td>
+          <td><%= a(page.name, page.url) %></td>
           <td><%= page.title %></td>
           <% if user.can_edit? page %>
             <td><a href="/pages/edit/<%= page.id %>">Edit</a></td>
           <% end %>
           <% if user.can_delete? page %>
-            <td><%= A 'Delete', :href => "/pages/delete/#{page.id}", :onclick => "return confirm('Are you sure you want to delete this page?');" %></td>
+            <td><%= a 'Delete', CortexReaver::PageController.r(:delete, :id => page.id), :onclick => "return confirm('Are you sure you want to delete this page?');" %></td>
           <% end %>
         </tr>
       <% end %>