cortex-reaver 0.0.9 → 0.1.0

data/lib/cortex_reaver/model/comment.rb

@@ -1,78 +1,58 @@
 module CortexReaver
     class Comment < Sequel::Model(:comments)
-    include CortexReaver::Model::Timestamps
-    include CortexReaver::Model::CachedRendering
+    plugin :timestamps
+    plugin :cached_rendering
+    plugin :comments
+    plugin :sequenceable
+    
     include CortexReaver::Model::Renderer
-    include CortexReaver::Model::Comments
-    include CortexReaver::Model::Sequenceable
     
-    belongs_to :creator, :class => 'CortexReaver::User', :key => 'created_by'
-    belongs_to :updater, :class => 'CortexReaver::User', :key => 'updated_by'
-    belongs_to :journal, :class => 'CortexReaver::Journal'
-    belongs_to :project, :class => 'CortexReaver::Project'
-    belongs_to :photograph, :class => 'CortexReaver::Photograph'
-    belongs_to :page, :class => 'CortexReaver::Page'
-    belongs_to :comment, :class => 'CortexReaver::Comment'
-    has_many :comments, :class => 'CortexReaver::Comment'
-
-    validates do
-      presence_of :body
-      length_of :title, :maximum => 255, :allow_nil => true
-      length_of :name, :maximum => 255, :allow_nil => true
-      length_of :http, :maximum => 255, :allow_nil => true
-      length_of :email, :maximum => 255, :allow_nil => true
-      format_of :email,
-        :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/, :allow_nil => true
-    end
-
-    # Ensure comments with an email specified do *not* conflict with another user.
-    validates_each :email do |object, attribute, value|
-      if (not value.blank?) and User.filter(:email => value).count > 0
-        object.errors[attribute] << 'conflicts with a registered user'
-      end
-    end
-
-    # Ensures comments belong to exactly one parent.
-    validates_each :page_id do |object, attribute, value|
-      count = 0
-      [:page_id, :project_id, :journal_id, :comment_id, :photograph_id].each do |field|
-        unless object[field].blank?
-          count += 1
-          if count > 1
-            object.errors[attribute] << 'has too many kinds of parents'
-            break
-          end
-        end
-      end
-
-      if count == 0
-        object.errors[attribute] << "doesn't have a parent"
-      end
-    end
+    many_to_one :creator, :class => 'CortexReaver::User', :key => 'created_by'
+    many_to_one :updater, :class => 'CortexReaver::User', :key => 'updated_by'
+    many_to_one :journal, :class => 'CortexReaver::Journal'
+    many_to_one :project, :class => 'CortexReaver::Project'
+    many_to_one :photograph, :class => 'CortexReaver::Photograph'
+    many_to_one :page, :class => 'CortexReaver::Page'
+    many_to_one :comment, :class => 'CortexReaver::Comment'
+    one_to_many :comments, :class => 'CortexReaver::Comment'
 
     # Infer blank titles
-    before_save(:infer_title) do
+    def before_save
+      return false unless super
+
       if title.blank?
         title = 'Re: ' + parent.title.to_s
         title.gsub!(/^(Re: )+/, 'Re: ')
         self.title = title
       end
+
+      true
     end
 
     # Update parent comment counts
-    before_destroy(:decrement_parent_comment_count) do
+    def before_destroy
+      return false unless super
+
       parent = self.parent
       parent.comment_count -= 1
       parent.skip_timestamp_update = true
       parent.save
+
+      true
     end
     
-    after_create(:increment_parent_comment_count) do
-      # WARNING: If we *reparent* comments as opposed to just posting, this will break.
+    # Increment parent comment count
+    # WARNING: If we *reparent* comments as opposed to just posting, this will
+    # break.
+    def after_create
+      super
+
       parent = self.parent
       parent.comment_count += 1
       parent.skip_timestamp_update = true
       parent.save
+
+      true
     end
 
     render :body, :with => :render_comment
@@ -100,12 +80,43 @@ module CortexReaver
       end
     end
 
+    def to_s
+      title || 'comment ' + id.to_s
+    end
+
     def url
       root_parent.url + '#comment_' + id.to_s
     end
 
-    def to_s
-      title || 'comment ' + id.to_s
+    def validate
+      validates_presence :body
+      validates_max_length 255, :title
+      validates_max_length 255, :name
+      validates_max_length 255, :http
+      validates_max_length 255, :email
+      validates_format(/^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/, :email)
+
+      # Ensure comments with an email specified do *not* conflict with another
+      # user.
+      if (not email.blank?) and User.filter(:email => value).count > 0
+        self.errors[:email] << 'conflicts with a registered user'
+      end
+
+      # Ensures comments belong to exactly one parent.
+      count = 0
+      [:page_id, :project_id, :journal_id, :comment_id, :photograph_id].each do |field|
+        unless self[field].blank?
+          count += 1
+          if count > 1
+            self.errors[attribute] << 'has too many kinds of parents'
+            break
+          end
+        end
+      end
+
+      if count == 0
+        self.errors[attribute] << "doesn't have a parent"
+      end
     end
   end
 end

data/lib/cortex_reaver/model/journal.rb

@@ -1,28 +1,26 @@
 module CortexReaver
   class Journal < Sequel::Model(:journals)
-    include CortexReaver::Model::Timestamps
-    include CortexReaver::Model::CachedRendering
+    plugin :timestamps
+    plugin :cached_rendering
+    plugin :canonical
+    plugin :attachments
+    plugin :comments
+    plugin :tags
+    plugin :sequenceable
+    plugin :viewable
     include CortexReaver::Model::Renderer
-    include CortexReaver::Model::Canonical
-    include CortexReaver::Model::Attachments
-    include CortexReaver::Model::Comments
-    include CortexReaver::Model::Tags
-    include CortexReaver::Model::Sequenceable
 
     many_to_many :tags, :class => 'CortexReaver::Tag'
-    belongs_to :creator, :class => 'CortexReaver::User', :key => 'created_by'
-    belongs_to :updater, :class => 'CortexReaver::User', :key => 'updated_by'
-    has_many :comments, :class => 'CortexReaver::Comment'
-
-    validates do
-      uniqueness_of :name
-      presence_of :name
-      length_of :name, :maximum => 255
-      presence_of :title
-    end
+    many_to_one :creator, :class => 'CortexReaver::User', :key => 'created_by'
+    many_to_one :updater, :class => 'CortexReaver::User', :key => 'updated_by'
+    one_to_many :comments, :class => 'CortexReaver::Comment'
 
     render :body
 
+    def self.atom_url
+      '/journals/atom'
+    end
+
     def self.get(id)
       self[:name => id] || self[id]
     end
@@ -35,10 +33,6 @@ module CortexReaver
       '/journals'
     end
 
-    def self.atom_url
-      '/journals/atom'
-    end
-
     def atom_url
       '/journals/atom/' + name
     end
@@ -50,5 +44,13 @@ module CortexReaver
     def to_s
       title || name
     end
+
+    def validate
+      validates_unique :name
+      validates_presence :name
+      validates_max_length 255, :name
+      validates_presence :title
+    end
+ 
   end
 end

data/lib/cortex_reaver/model/model.rb

@@ -0,0 +1,9 @@
+module Sequel
+  class Model
+    plugin :validation_helpers
+    plugin :cortex_reaver_validation_helpers
+  end
+end
+
+# Require models
+Ramaze::acquire File.join(CortexReaver::LIB_DIR, 'model', '*')

data/lib/cortex_reaver/model/page.rb

@@ -1,50 +1,25 @@
 module CortexReaver
   class Page < Sequel::Model(:pages)
-    include CortexReaver::Model::Timestamps
-    include CortexReaver::Model::CachedRendering
+    plugin :timestamps
+    plugin :cached_rendering
+    plugin :canonical
+    plugin :attachments
+    plugin :comments
+    plugin :tags
+    plugin :sequenceable
+    plugin :viewable
     include CortexReaver::Model::Renderer
-    include CortexReaver::Model::Canonical
-    include CortexReaver::Model::Attachments
-    include CortexReaver::Model::Comments
-    include CortexReaver::Model::Tags
-    include CortexReaver::Model::Sequenceable
 
-    belongs_to :page, :class => 'CortexReaver::Page'
-    has_many   :pages, :class => 'CortexReaver::Page'
-    belongs_to :creator, :class => 'CortexReaver::User', :key => 'created_by'
-    belongs_to :updater, :class => 'CortexReaver::User', :key => 'updated_by' 
-    has_many   :comments, :class => 'CortexReaver::Comment'
+    many_to_one :page, :class => 'CortexReaver::Page'
+    one_to_many   :pages, :class => 'CortexReaver::Page'
+    many_to_one :creator, :class => 'CortexReaver::User', :key => 'created_by'
+    many_to_one :updater, :class => 'CortexReaver::User', :key => 'updated_by' 
+    one_to_many   :comments, :class => 'CortexReaver::Comment'
     many_to_many :tags, :class => 'CortexReaver::Tag'
 
     # Top-level pages.
     subset :top, :page_id => nil
 
-    validates do
-      uniqueness_of :name
-      presence_of   :name
-      length_of     :name, :maximum => 255
-      presence_of   :title
-      length_of     :title, :maximum => 255
-
-      each(:name, :tag => :url_conflict) do |object, attributes, value|
-        if controller = Ramaze::Controller.at(object.url)
-          object.errors['name'] << "conflicts with the #{controller}"
-        end
-      end
-    end
-
-    # Reserve names of controllers so we don't conflict.
-    Ramaze::Global.mapping.keys.each do |path|
-      path =~ /\/(.+)(\/|$)/
-      self.reserved_canonical_names << $1 if $1
-    end
-
-    # Also reserve everything in the public directory, as a courtesy.
-    #
-    # I can't stop you from shooting yourself in the foot, but this will help
-    # you aim higher. :)
-    self.reserved_canonical_names += Dir.entries(CortexReaver.config[:public_root]) - ['..', '.']
-
     # Use standard cached renderer
     render :body
 
@@ -88,7 +63,6 @@ module CortexReaver
 
       # Look up ids by nested names.
       ids.inject(nil) do |page, name|
-        puts "Searching for #{name} in #{page.inspect}"
         parent_id = page ? page.id : nil
         self[:page_id => parent_id, :name => name]
       end
@@ -106,6 +80,10 @@ module CortexReaver
       '/pages/atom/' + id.to_s
     end
 
+    def to_s
+      title || name
+    end
+
     def url
       if page
         page.url + '/' + name
@@ -114,8 +92,12 @@ module CortexReaver
       end
     end
 
-    def to_s
-      title || name
+    def validate
+      validates_unique :name
+      validates_presence :name
+      validates_max_length 255, :name
+      validates_presence :title
+      validates_max_length 255, :title
     end
 
     # Returns true if this page is located underneath another page.
@@ -129,7 +111,7 @@ module CortexReaver
     end
 
     # Create a default page if none exists.
-    if table_exists? and Page.count == 0
+    if dataset.table_exists? and Page.count == 0
       Page.new(
         :name => 'about',
         :title => 'About Cortex Reaver',

data/lib/cortex_reaver/model/photograph.rb

@@ -1,12 +1,12 @@
 module CortexReaver
   class Photograph < Sequel::Model(:photographs)
-   
-    include CortexReaver::Model::Timestamps
-    include CortexReaver::Model::Canonical
-    include CortexReaver::Model::Attachments
-    include CortexReaver::Model::Comments
-    include CortexReaver::Model::Tags
-    include CortexReaver::Model::Sequenceable
+    plugin :timestamps
+    plugin :canonical
+    plugin :attachments
+    plugin :comments
+    plugin :tags
+    plugin :sequenceable
+    plugin :viewable
 
     # Target image sizes
     SIZES = {
@@ -18,16 +18,9 @@ module CortexReaver
     }
 
     many_to_many :tags, :class => 'CortexReaver::Tag'
-    belongs_to :creator, :class => 'CortexReaver::User', :key => 'created_by'
-    belongs_to :updater, :class => 'CortexReaver::User', :key => 'updated_by'
-    has_many :comments, :class => 'CortexReaver::Comment'
-
-    validates do
-      uniqueness_of :name
-      presence_of :name
-      length_of :name, :maximum => 255
-      presence_of :title
-    end
+    many_to_one :creator, :class => 'CortexReaver::User', :key => 'created_by'
+    many_to_one :updater, :class => 'CortexReaver::User', :key => 'updated_by'
+    one_to_many :comments, :class => 'CortexReaver::Comment'
 
     def self.atom_url
       '/photographs/atom'
@@ -135,5 +128,12 @@ module CortexReaver
     def url
       '/photographs/show/' + name
     end
+
+    def validate
+      validates_unique :name
+      validates_presence :name
+      validates_max_length 255, :name
+      validates_presence :title
+    end
   end
 end

data/lib/cortex_reaver/model/project.rb

@@ -1,25 +1,20 @@
 module CortexReaver
   class Project < Sequel::Model(:projects)
-    include CortexReaver::Model::Timestamps
-    include CortexReaver::Model::CachedRendering
+    plugin :timestamps
+    plugin :cached_rendering
+    plugin :canonical
+    plugin :attachments
+    plugin :comments
+    plugin :tags
+    plugin :sequenceable
+    plugin :viewable
     include CortexReaver::Model::Renderer
-    include CortexReaver::Model::Canonical
-    include CortexReaver::Model::Attachments
-    include CortexReaver::Model::Comments
-    include CortexReaver::Model::Tags
-    include CortexReaver::Model::Sequenceable
 
     many_to_many :tags, :class => 'CortexReaver::Tag'
-    belongs_to :creator, :class => 'CortexReaver::User', :key => 'created_by'
-    belongs_to :updater, :class => 'CortexReaver::User', :key => 'updated_by'
-    has_many :comments, :class => 'CortexReaver::Comment'
+    many_to_one :creator, :class => 'CortexReaver::User', :key => 'created_by'
+    many_to_one :updater, :class => 'CortexReaver::User', :key => 'updated_by'
+    one_to_many :comments, :class => 'CortexReaver::Comment'
 
-    validates do
-      uniqueness_of :name
-      presence_of :name
-      length_of :name, :maximum => 255
-      presence_of :title
-    end
 
     render :body
 
@@ -43,12 +38,20 @@ module CortexReaver
       '/projects/atom/' + name
     end
 
+    def to_s
+      title || name
+    end
+
     def url
       '/projects/show/' + name
     end
 
-    def to_s
-      title || name
+    def validate
+      validates_unique :name
+      validates_presence :name
+      validates_max_length 255, :name
+      validates_presence :title
     end
+
   end
 end