cortex-reaver 0.0.9 → 0.1.0

data/lib/cortex_reaver/model/tag.rb

@@ -1,6 +1,6 @@
 module CortexReaver
   class Tag < Sequel::Model(:tags)
-    include CortexReaver::Model::Canonical
+    plugin :canonical
 
     many_to_many :photographs, :class => 'CortexReaver::Photograph'
     many_to_many :journals, :class => 'CortexReaver::Journal'
@@ -9,20 +9,24 @@ module CortexReaver
 
     subset :unused, :count => 0
 
-    validates do
-      uniqueness_of :name
-      presence_of :name
-      length_of :name, :maximum => 255 
-      presence_of :title
-      length_of :title, :maximum => 255
+    def validate
+      validates_unique :name
+      validates_presence :name
+      validates_max_length 255, :name
+      validates_presence :title
+      validates_max_length 255, :title
     end
 
     # When we delete a tag, ensure nothing else is linked to it.
-    before_destroy(:drop_associations) do
+    def before_destroy
+      return false if super == false
+      
       remove_all_photographs
       remove_all_journals
       remove_all_projects
       remove_all_pages
+
+      true
     end
 
     # Autocompletes a tag. Returns an array of matching candidates

data/lib/cortex_reaver/model/user.rb

@@ -2,47 +2,28 @@ require 'digest/sha2'
 
 module CortexReaver
   class User < Sequel::Model(:users)
-    include CortexReaver::Model::Timestamps
-    include CortexReaver::Model::Sequenceable
-
-    has_many :created_comments, :key => 'created_by', :class => 'CortexReaver::Comment'
-    has_many :created_journals, :key => 'created_by', :class => 'CortexReaver::Journal'
-    has_many :created_pages, :key => 'created_by', :class => 'CortexReaver::Page'
-    has_many :created_photographs, :key => 'created_by', :class => 'CortexReaver::Photograph'
-    has_many :created_projects, :key => 'created_by', :class => 'CortexReaver::Project'
-    has_many :updated_comments, :key => 'updated_by', :class => 'CortexReaver::Comment'
-    has_many :updated_journals, :key => 'updated_by', :class => 'CortexReaver::Journal'
-   has_many :updated_pages, :key => 'updated_by', :class => 'CortexReaver::Page'
-    has_many :updated_photographs, :key => 'updated_by', :class => 'CortexReaver::Photograph'
-    has_many :updated_projects, :key => 'updated_by', :class => 'CortexReaver::Project'
-
-    validates do
-      uniqueness_of :login
-      length_of     :login, :with => 5..255, :allow_blank => true
-      format_of     :login, :with => /^[A-Za-z0-9\-_]+$/
-      length_of     :name, :maximum => 255
-      length_of     :http, :allow_blank => true, :maximum => 255
-      uniqueness_of :email
-      length_of     :email, :allow_blank => true, :maximum => 255
-      format_of     :email, 
-        :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/, :allow_blank => true
-      confirmation_of :password, :allow_nil => true#, :allow_false => true
-      each(:password_length, :tag => :password_length) do |object, attribute, value|
-        unless value.nil? or (8..255) === value
-          object.errors['password'] << 'must be between 8 and 255 characters.'
-        end
-      end
-    end
+    plugin :timestamps
+    plugin :sequenceable
+
+    one_to_many :created_comments, :key => 'created_by', :class => 'CortexReaver::Comment'
+    one_to_many :created_journals, :key => 'created_by', :class => 'CortexReaver::Journal'
+    one_to_many :created_pages, :key => 'created_by', :class => 'CortexReaver::Page'
+    one_to_many :created_photographs, :key => 'created_by', :class => 'CortexReaver::Photograph'
+    one_to_many :created_projects, :key => 'created_by', :class => 'CortexReaver::Project'
+    one_to_many :updated_comments, :key => 'updated_by', :class => 'CortexReaver::Comment'
+    one_to_many :updated_journals, :key => 'updated_by', :class => 'CortexReaver::Journal'
+   one_to_many :updated_pages, :key => 'updated_by', :class => 'CortexReaver::Page'
+    one_to_many :updated_photographs, :key => 'updated_by', :class => 'CortexReaver::Photograph'
+    one_to_many :updated_projects, :key => 'updated_by', :class => 'CortexReaver::Project'
 
-    # Ensure an administrator is always available.
-    validates_each :admin do |object, attribute, value|
-      if admins = User.filter(:admin => true) and admins.size == 1 and admins.first.id == self.id and not value
-        object.errors[attribute] << "can't be unset; only one administrator left!"
-      end
-    end
 
     self.window_size = 64
 
+    # Is this the special anonymous user?
+    def anonymous?
+      false
+    end
+
     # Returns an authenticated user by login and password, or nil.
     def self.authenticate(login, password)
       user = self[:login => login]
@@ -60,6 +41,8 @@ module CortexReaver
 
       # Create anonymous user
       @anonymous_user = self.new(:name => "Anonymous")
+
+      # These functions are embedded for speed. Much faster public browsing!
       def @anonymous_user.can_create? other
         false
       end
@@ -69,6 +52,9 @@ module CortexReaver
       def @anonymous_user.can_delete? other
         false
       end
+      def @anonymous_user.anonymous?
+        true
+      end
       
       @anonymous_user
     end
@@ -98,6 +84,16 @@ module CortexReaver
       end
     end
 
+    # Ensure that we don't destroy the only admin.
+    def before_destroy
+      return false if super == false
+
+      if admins = User.filter(:admin => true) and admins.count == 1 and admins.first.id == self.id
+        self.errors.add nil, "Can't destroy the only administrator."
+        return false
+      end
+    end
+
     def can_create?(other)
       if admin?
         # Administrators may create anything
@@ -157,6 +153,22 @@ module CortexReaver
       end
     end
 
+    def can_view?(other)
+      if other.respond_to? :draft and other.draft
+        # Draft
+        if admin? or can_edit? other
+          # User can edit this draft
+          true
+        else
+          # Nope, not yet!
+          false
+        end
+      else
+        # Not a draft
+        true
+      end
+    end
+      
     # Returns true if user is a contributor
     def contributor?
       self.contributor
@@ -172,11 +184,17 @@ module CortexReaver
       self.moderator
     end
 
+    # Name falls back to login if blank
+    def name
+      name = self[:name]
+      name.blank? ? login : name
+    end
+
     # Set user password
     def password=(password)
       self.salt ||= self.class.new_salt
       self[:password] = self.class.crypt(password, self.salt)
-      @password_length = password.length
+      @password_length = '*' * password.length
     end
 
     # Password confirmation
@@ -211,6 +229,25 @@ module CortexReaver
       '/users/show/' + login
     end
 
+    def validate
+      validates_unique(:login, :message => "Already taken.")
+      validates_max_length(255, :login, :message => "Please enter a username shorter than 255 characters.")
+      validates_format(/^[A-Za-z0-9\-_]+$/, :login, :message => "Logins can only contain alphanumeric characters, dashes, and underscores.")
+      validates_max_length(255, :name, :allow_blank => true, :message => "Please enter a name shorter than 255 characters.")
+      validates_max_length(255, :http, :allow_blank => true, :message => "Please enter an HTTP address shorter than 255 characters.")
+      validates_unique(:email, :message => "Already taken.")
+      validates_max_length(255, :email, :message => "Please enter an email address shorter than 255 characters.")
+      validates_format(/^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/, :email, :message => "Please enter a valid email address.")
+      validates_confirmation(:password, :message => "Make sure your passwords match.")
+      validates_min_length(8, :password_length, :message => "Passwords must be at least 8 characters.", :allow_nil => true)
+      validates_max_length(255, :password_length, :message => "Passwords must be at most 255 characters.", :allow_nil => true)
+
+      # Ensure an administrator is always available.
+      if admins = User.filter(:admin => true) and admins.count == 1 and admins.first.id == self.id and not admin?
+        errors[:admin] << "can't be unset; only one administrator left!"
+      end
+    end
+
     private
       # Valid characters for salt
       SALT_CHARS = ('0'..'9').to_a + ('a'..'z').to_a + ('A'..'Z').to_a
@@ -232,14 +269,15 @@ module CortexReaver
     public
 
     # Create default user if none exist
-    if table_exists? and count == 0
+    if dataset.table_exists? and count == 0
       u = User.new(
         :login => 'shodan',
         :name => 'Shodan',
+        :email => 'shodan@localhost.localdomain',
         :admin => true
       )
-      u.password = 'shodan'
-      u.save!
+      u.password = 'citadelstation'
+      u.save
     end
   end
 end

data/lib/cortex_reaver/public/css/main.css

@@ -248,6 +248,10 @@ th {
   display: none;
 }
 
+.draft, .draft h2 a {
+  color: #777;
+}
+
 .current {
   font-weight: bolder;
 }

data/lib/cortex_reaver/snippets/numeric.rb

@@ -0,0 +1,15 @@
+class Numeric
+  # Returns a -th, -nd, ... string
+  def ordinal
+    if (11..13).include?(self.to_i % 100)
+      "#{self}th"
+    else
+      case self.to_i % 10
+        when 1; "#{self}st"
+        when 2; "#{self}nd"
+        when 3; "#{self}rd"
+        else    "#{self}th"
+      end
+    end
+  end
+end

data/lib/cortex_reaver/snippets/ramaze/cache/memcached.rb

@@ -0,0 +1,14 @@
+module Ramaze
+  class MemcachedCache
+    # I can't figure out a good way to specify the parameters Ramaze::Cache
+    # uses when instantiating new caches, so I'm just going to override the
+    # setup here. Innate hardcodes the app name as "pristine". :(
+    def cache_setup(host, user, app, name)
+      app = Ramaze.options.app.name
+      @namespace = [host, user, app, name].compact.join('-')
+      options = {:namespace => @namespace}.merge(OPTIONS)
+      servers = options.delete(:servers)
+      @store = ::MemCache.new(servers, options)
+    end
+  end
+end

data/lib/cortex_reaver/support/attachments.rb

@@ -1,25 +1,12 @@
 require 'fileutils'
 
-module CortexReaver
-  module Model
+module Sequel
+  module Plugins
     module Attachments
-
       # Attachments allows records to manipulate files associated with them.
       #
       # For our purposes, an attachment represents an object that is associated
-      # with a single parent object. A file represents a file on disk. Attachments
-      # closely wrap files, but shouldn't be confused with them.
-
-      def self.included(base)
-        base.class_eval do
-          # When we delete a record with attachments, delete the attachments first.
-          before_delete(:delete_attachments) do
-            attachments.each do |attachment|
-              attachment.delete
-            end
-          end
-        end
-      end
+      # with a single parent object. A file represents a file on disk.
 
       # The separator used for public (e.g. HTTP URL) paths.
       PUBLIC_PATH_SEPARATOR = '/'
@@ -27,8 +14,100 @@ module CortexReaver
       # How many bytes to read at a time when saving files.
       DEFAULT_ATTACHMENT_DIRECTORY_MODE = 0755
 
+      module InstanceMethods
+        # When we delete a record with attachments, delete the attachments
+        # first.
+        def before_delete
+          return false if super == false
+          attachments.each do |attachment|
+            attachment.delete
+          end
+
+          true
+        end
+
+        # Returns a named attachment
+        def attachment(name)
+          Attachment.new(self, name)
+        end
+
+        # Returns the directory which contains attachments for this record.
+        # Forces a save of the record if an ID does not exist.
+        def attachment_path(type = :local, force_save = true)
+          sep = ''
+          case type
+          when :local
+            # We're interested in a local path on disk.
+            sep = File::SEPARATOR
+            path = CortexReaver.config.public_root.dup
+          when :public
+            # We're interested in a public (e.g. HTTP URL) path.
+            sep = PUBLIC_PATH_SEPARATOR
+            path = ''
+          else
+            raise ArgumentError.new('type must be either :local or :public')
+          end
+
+          # If we don't have an ID, save the record to obtain one.
+          if force_save and id.nil?
+            unless save
+              # Save failed!
+              return nil
+            end
+          end
+
+          # Complete the path.
+          path << 
+            sep + 'data' + 
+            sep + self.class.to_s.demodulize.underscore.pluralize + 
+            sep + self.id.to_s
+        end
+
+        # Returns an array of attachments.
+        def attachments
+          # Unsaved new records, naturally, have no attachments.
+          return [] if new?
+
+          attachments = Array.new
+          if path = local_attachment_path and File.directory? path
+            begin
+              attachments = Dir.open(path).reject do |name|
+                # Don't include dotfiles
+                name =~ /^\./
+              end
+              attachments.collect! do |name|
+                Attachment.new self, name
+              end
+            rescue
+              # Couldn't read the directory
+            end
+          end
+          attachments
+        end
+
+        # Ensures the attachment directory exists.
+        def create_attachment_directory
+          path = local_attachment_path
+          unless File.directory? path
+            FileUtils.mkdir_p path, :mode => DEFAULT_ATTACHMENT_DIRECTORY_MODE
+          end
+        end
+
+        # Returns the local directory which contains attachments for this
+        # record.
+        def local_attachment_path
+          attachment_path :local  
+        end
+
+        # Returns the public directory which contains attachments for this
+        # record.
+        def public_attachment_path
+          attachment_path :public
+        end
+      end
+
       class Attachment
-        # Attachable::Attachment wraps a file associated with a parent object.
+        # Wraps a file associated with a parent object.
 
         BUFFER_SIZE = 65536
         DEFAULT_MODE = 0644
@@ -62,8 +141,8 @@ module CortexReaver
         end
 
         # Returns a File object for this attachment. Optionally specify a mode 
-        # string, which is passed to File.new. Creates the attachment directory if
-        # necessary.
+        # string, which is passed to File.new. Creates the attachment directory
+        # if necessary.
         def file(how = 'r', mode = nil)
           @parent.create_attachment_directory
           if mode
@@ -84,9 +163,10 @@ module CortexReaver
         #   :copy copies the file contents using FileUtils.cp
         #   :move moves the file.
         #
-        # Ramaze offers us temporary File objects from form uploads. Creating a hard
-        # link is extremely quick, saves disk space, but also doesn't interfere with
-        # the temporary file in case someone else wants access to it.
+        # Ramaze offers us temporary File objects from form uploads. Creating a
+        # hard link is extremely quick, saves disk space, but also doesn't
+        # interfere with the temporary file in case someone else wants access
+        # to it.
         def file=(readable, mode = :hard_link)
           # Create attachment directory if necessary.
           @parent.create_attachment_directory
@@ -94,11 +174,14 @@ module CortexReaver
           if readable.respond_to? :path
             ret = case mode
             when :hard_link
-              FileUtils.rm local_path if File.exist? local_path
-              FileUtils.ln readable.path, local_path
-            when :soft_link
-              FileUtils.rm local_path if File.exist? local_path
-              FileUtils.ln_s readable.path, local_path
+              begin
+                FileUtils.rm local_path if File.exist? local_path
+                FileUtils.ln readable.path, local_path
+              rescue
+                # Hmm, try copy. Could be a cross-device link, or the FS
+                # doesn't support it.
+                FileUtils.copy readable.path, local_path
+              end
             when :copy
               FileUtils.rm local_path if File.exist? local_path
               FileUtils.copy readable.path, local_path
@@ -106,7 +189,7 @@ module CortexReaver
               FileUtils.rm local_path if File.exist? local_path
               FileUtils.move readable.path, local_path
             else
-              raise RuntimeError.new("mode must be :hard_link, :soft_link, :copy, or :move--got #{mode.inspect}")
+              raise RuntimeError.new("mode must be :hard_link :copy, or :move--got #{mode.inspect}")
             end
             reset_permissions
             ret
@@ -153,83 +236,8 @@ module CortexReaver
           FileUtils.chmod(DEFAULT_MODE, path(:local))
         end
       end
-      
-      # Returns a named attachment
-      def attachment(name)
-        Attachment.new(self, name)
-      end
-
-      # Returns the directory which contains attachments for this record. Forces
-      # a save of the record if an ID does not exist.
-      def attachment_path(type = :local, force_save = true)
-        sep = ''
-        case type
-        when :local
-          # We're interested in a local path on disk.
-          sep = File::SEPARATOR
-          path = CortexReaver.config[:public_root].dup
-        when :public
-          # We're interested in a public (e.g. HTTP URL) path.
-          sep = PUBLIC_PATH_SEPARATOR
-          path = ''
-        else
-          raise ArgumentError.new('type must be either :local or :public')
-        end
-
-        # If we don't have an ID, save the record to obtain one.
-        if force_save and id.nil?
-          unless save
-            # Save failed!
-            return nil
-          end
-        end
-
-        # Complete the path.
-        path << 
-          sep + 'data' + 
-          sep + self.class.to_s.demodulize.underscore.pluralize + 
-          sep + self.id.to_s
-      end
-
-      # Returns an array of attachments.
-      def attachments
-        # Unsaved new records, naturally, have no attachments.
-        return [] if new?
-
-        attachments = Array.new
-        if path = local_attachment_path and File.directory? path
-          begin
-            attachments = Dir.open(path).reject do |name|
-              # Don't include dotfiles
-              name =~ /^\./
-            end
-            attachments.collect! do |name|
-              Attachment.new self, name
-            end
-          rescue
-            # Couldn't read the directory
-          end
-        end
-        attachments
-      end
-
-      # Ensures the attachment directory exists.
-      def create_attachment_directory
-        path = local_attachment_path
-        unless File.directory? path
-          FileUtils.mkdir_p path, :mode => DEFAULT_ATTACHMENT_DIRECTORY_MODE
-        end
-      end
-
-      # Returns the local directory which contains attachments for this record.
-      def local_attachment_path
-        attachment_path :local  
-      end
-
-      # Returns the public directory which contains attachments for this record.
-      def public_attachment_path
-        attachment_path :public
-      end
     end
   end
 end
+
+CortexReaver::Attachment = Sequel::Plugins::Attachments::Attachment