cortex-reaver 0.0.6 → 0.0.7

data/lib/cortex_reaver/helper/tags.rb

@@ -7,15 +7,13 @@ module Ramaze
         title = opts[:title] || name.to_s.titleize
         
         s = "<p><label for=\"#{name}\">#{title}</label>"
-        s << "<input name=\"#{name}\" id=\"#{name}\" type=\"text\" class=\"autobox\" value=\"#{attr_h(tags_on(model, false))}\" />"
+        s << "<input name=\"#{name}\" id=\"#{name}\" type=\"text\" class=\"acfb-input\" value=\"#{attr_h(tags_on(model, false))}\" />"
         s << "</p>"
 
         s << <<EOF
 
 <script type="text/javascript">
 /* <![CDATA[ */
-
-
 /* ]]> */
 </script>
 EOF
@@ -25,6 +23,7 @@ EOF
       def tags_on(model, html=true)
         begin
           if html
+            #t = '<img src="/images/tag.gif" alt="Tags" />'
             t = '<ul class="tags">'
             model.tags.each do |tag|
               t << "<li><a href=\"#{tag.url}\">#{tag.title}</a></li>"

data/lib/cortex_reaver/migrations/009_mysql.rb

@@ -7,11 +7,15 @@ module CortexReaver
    
     def up
       db = CortexReaver.db
-      if db.is_a? Sequel::MySQL::Database
-        # Use InnoDB storage for everything
-        db.tables.each do |table|
-          db << "ALTER TABLE `#{table.to_s}` ENGINE = InnoDB;"
+      begin
+        if db.is_a? Sequel::MySQL::Database
+          # Use InnoDB storage for everything
+          db.tables.each do |table|
+            db << "ALTER TABLE `#{table.to_s}` ENGINE = InnoDB;"
+          end
         end
+      rescue NameError
+        # Not mysql!
       end
     end
   end

data/lib/cortex_reaver/migrations/010_pageparents.rb

@@ -0,0 +1,17 @@
+module CortexReaver
+  class PageparentsSchema < Sequel::Migration
+    def down
+      alter_table :pages do
+        drop_index :page_id
+        drop_column :page_id
+      end
+    end
+
+    def up
+      alter_table :pages do
+        add_foreign_key :page_id, :pages, :key => :id
+        add_index :page_id
+      end
+    end
+  end
+end

data/lib/cortex_reaver/model/page.rb

@@ -9,10 +9,15 @@ module CortexReaver
     include CortexReaver::Model::Tags
     include CortexReaver::Model::Sequenceable
 
+    belongs_to :page, :class => 'CortexReaver::Page'
+    has_many   :pages, :class => 'CortexReaver::Page'
     belongs_to :user, :class => 'CortexReaver::User'
-    has_many :comments, :class => 'CortexReaver::Comment'
+    has_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
@@ -35,15 +40,57 @@ module CortexReaver
 
     # 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. :)
+    # 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
 
-    def self.get(id)
-      self[:name => id] || self[id]
+    def render(text)
+      bluecloth(
+        macro(
+          erubis_filter(
+            syntax_highlight(
+              text
+            )
+          )
+        ), false, false
+      )
+    end
+
+    # Canonicalize only in the context of our parent's namespace.
+    # Arguments:
+    # - A proper canonical name to check for conflicts with
+    # - :id => An optional id to ignore conflicts with
+    # - :page_id => A parent page_id to use as the namespace for conflict checking.
+    def self.similar_canonical_names(proper, opts={})
+      id = opts[:id]
+      page_id = opts[:page_id]
+
+      similar = []
+      # Get parent page id for the current context.
+      if filter(canonical_name_attr => proper, :page_id => page_id).exclude(:id => id).limit(1).count > 0
+        # This name already exists, and it's not ours.
+        similar << proper
+        similar += filter(canonical_name_attr.like(/^#{proper}\-[0-9]+$/)).filter(:page_id => page_id).map(canonical_name_attr)
+      end
+      similar
+    end
+    
+    # get('foo', 'bar', 'baz')
+    # get('foo/bar/baz')
+    def self.get(ids)
+      unless ids.is_a? Array
+        ids = ids.split('/')
+      end
+
+      # 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
     end
 
     def self.url
@@ -55,17 +102,31 @@ module CortexReaver
     end
 
     def atom_url
-      '/pages/atom/' + name
+      '/pages/atom/' + id.to_s
     end
 
     def url
-      '/' + name
+      if page
+        page.url + '/' + name
+      else
+        '/' + name
+      end
     end
 
     def to_s
       title || name
     end
 
+    # Returns true if this page is located underneath another page.
+    # within?(self) => true.
+    def within?(other)
+      if parent = page
+        self == other or parent.within?(other)
+      else
+        self == other
+      end
+    end
+
     # Create a default page if none exists.
     if table_exists? and Page.count == 0
       Page.new(

data/lib/cortex_reaver/plugin.rb

@@ -0,0 +1,4 @@
+module CortexReaver
+  module Plugin
+  end
+end

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

@@ -256,9 +256,12 @@ th {
   font-size: 75%;
 }
 
-.tags {
+ul.tags {
   margin: 0px;
   padding: 0px;
+  background: url(/images/tag.gif) no-repeat;
+  background-position: 0px 3px;
+  padding-left: 12px;
 }
 
 .tags li {

data/lib/cortex_reaver/public/js/autocompletefb.js

@@ -0,0 +1,125 @@
+/*
+ * jQuery plugin: autoCompletefb(AutoComplete Facebook)
+ * @requires jQuery v1.2.2 or later
+ * using plugin:jquery.autocomplete.js
+ *
+ * Credits:
+ * - Idea: Facebook
+ * - Guillermo Rauch: Original MooTools script
+ * - InteRiders <http://interiders.com/> 
+ *
+ * Modified by Michael 'manveru' Fellinger <m.fellinger@gmail.com>
+ *
+ * Copyright (c) 2008 Widi Harsojo <wharsojo@gmail.com>, http://wharsojo.wordpress.com/
+ * Dual licensed under the MIT and GPL licenses:
+ *   http://www.opensource.org/licenses/mit-license.php
+ *   http://www.gnu.org/licenses/gpl.html
+ */
+
+jQuery.fn.autoCompletefb = function(options) {
+  var tmp = this;
+  var root = tmp[0];
+  if(!root){ return; } // fail fast if this is called on empty jquery collection
+
+  var settings = {
+    ul         : tmp,
+    urlLookup  : [""],
+    foundClass : ".acfb-data",
+    inputClass : ".acfb-input",
+    removeImg  : "/theme/light/media/delete.gif"
+  }
+
+  if(options){ jQuery.extend(settings, options); }
+  
+  var acfb = {
+    params  : settings,
+    getData : function(){
+      var result = '';
+      $(settings.foundClass, tmp).each(
+        function(i) {
+          if(i > 0){ result += ','; }
+          result += $('span', this).html();
+          result += $('input', this).html();
+        });
+      return result;
+    },
+    clearData : function(){
+      $(settings.foundClass, tmp).remove();
+      $(settings.inputClass, tmp).focus();
+      return tmp.acfb;
+    },
+    removeFind : function(o, d){
+      var without = [];
+
+      for(i in root.acfb_data){
+        var val = root.acfb_data[i];
+        if(val !== d){ without.push(val); }
+      }
+
+      root.acfb_data = without;
+      acfb.updateStore([]);
+
+      $(o).unbind('click').parent().remove();
+      $(settings.inputClass, tmp).focus();
+      return tmp.acfb;
+    },
+    updateStore : function(d){
+      for(i in d){ root.acfb_data.push(d[i]); }
+      var input = $('.acfb-store', root);
+      input.val(root.acfb_data.join(","));
+    },
+    addLi : function(data, value){
+      if(value.length == 0){ return; }
+      for(i in root.acfb_data){ if(root.acfb_data[i] == value){ return } }
+      acfb.updateStore(data);
+
+      var klass = settings.foundClass.replace(/\./,'');
+      var li_tag = '<li class="' + klass + '"><span>' + data + '</span> <img class="p" src="' + settings.removeImg + '"/></li>';
+      var li = $(settings.inputClass, tmp).before(li_tag);
+
+      $('.p', li[0].previousSibling).click(function(){
+        acfb.removeFind(this, data[0]);
+      });
+    },
+    addLis : function(arr){
+      for(i in arr){ acfb.addLi([arr[i]], arr[i]); }
+    }
+  }
+
+  // using an array so we can easily join
+  root.acfb_data = [];
+
+  // add hidden input tag in the ul
+  var orig_input = $(settings.inputClass, tmp)[0];
+  var input_name = orig_input.name;
+  var input_tag = '<input type="hidden" class="acfb-store" name="' + input_name + '" />';
+  var input = $(settings.inputClass, tmp).before(input_tag)[0];
+
+  var orig_values = orig_input.value.split(",");
+  acfb.addLis(orig_values);
+
+  // remove name from original input tag so it won't show up in the request and
+  // reset the value so it is ready to take further input
+  $(orig_input).removeAttr("name");
+  orig_input.value = '';
+
+  // add an add button... enter doesn't seem to work?
+  var add_tag = '<span class="acfb-add">+</a>'
+  $(settings.inputClass, tmp).after(add_tag);
+  var add = $('.acfb-add', tmp);
+  add.click(function(){
+    var words = orig_input.value.split(/,+/);
+    acfb.addLis(words);
+    $(settings.inputClass, tmp).val('').focus();
+    return false;
+  });
+
+  // $(settings.foundClass + " img.p").click(function(){ acfb.removeFind(this); });
+  $(settings.inputClass, tmp).autocomplete(settings.urlLookup);
+  $(settings.inputClass, tmp).result(function(ev, data, value) {
+    acfb.addLi(data, value);
+    $(settings.inputClass, tmp).val('').focus();
+  });
+  return acfb;
+}
+

data/lib/cortex_reaver/snippets/ramaze/dispatcher/file.rb

@@ -25,7 +25,7 @@ module Ramaze
           end
  
           if ::File.directory?(joined)
-            Dir[joined/"{#{INDICES.join(',')}}"].first || joined
+            Dir[::File.join(joined, "{#{INDICES.join(',')}}")].first || joined
           else
             joined
           end

data/lib/cortex_reaver/support/canonical.rb

@@ -9,6 +9,11 @@ module CortexReaver
       # The attribute we infer the canonical name from, if not set.
       CANONICAL_INFERENCE_ATTR = :title
 
+      # Lower case, remove special chars, and replace with hyphens.
+      def self.formalize(string)
+        string.downcase.gsub(/[^a-z0-9_]/, '-').squeeze('-')[0..250].sub(/-$/, '')
+      end
+
       def self.included(base)
         base.class_eval do
           # Canonical names which cannot be reserved.
@@ -21,10 +26,10 @@ module CortexReaver
           end
 
           # Canonicalize a string. Optionally, ignore conflicts with the record
-          # with id.
-          def self.canonicalize(string, id = nil)
+          # with opts[:id]
+          def self.canonicalize(string, opts={})
             # Lower case, remove special chars, and replace with hyphens.
-            proper = string.downcase.gsub(/[^a-z0-9_]/, '-').squeeze('-')[0..250].sub(/-$/, '')
+            proper = Canonical.formalize string
 
             # If proper is blank, just return it at this point.
             if proper.blank?
@@ -34,47 +39,32 @@ module CortexReaver
             # Numeric suffix to append
             suffix = nil
 
-            if proper != filter(:id => id).map(canonical_name_attr).first
-              # We don't already have this name.
-
-              similar = []
+            # Get similar names from the class
+            similar = similar_canonical_names(proper, opts)
 
-              if filter(canonical_name_attr => proper).limit(1).count > 0
-                similar << proper
-                # This name already exists, and it's not ours!
-                similar += filter(canonical_name_attr.like(/^#{proper}\-[0-9]+$/)).map(canonical_name_attr)
+            # Get reserved names from the class
+            reserved_canonical_names.each do |name|
+              if name =~ /^#{proper}(-\d+)?$/
+                similar << name
               end
+            end
 
-              # Check for reserved names
-              reserved_canonical_names.each do |name|
-                if name =~ /^#{proper}(-\d+)?$/
-                  similar << name
-                end
-              end
-
-              # Find possible conflicting names from actions on this model's controller.
-#              if self.respond_to? :url and controller = Ramaze::Controller.at(self.url)
-#                similar += controller.action_methods.select do |action|
-#                  action =~ /^#{proper}(-\d+)?$/
-#                end
-#              end
-
-              # Extract numeric suffices
-              suffices = {}
-              similar.each do |name|
-                suffices[name[/\d$/].to_i] = true
-              end
+            # Extract numeric suffices
+            suffices = {}
+            similar.each do |name|
+              suffices[name[/\d$/].to_i] = true
+            end
 
-              # Compute suffix
-              unless suffices.empty?
-                i = 1
-                while suffices.include? i
-                  i += 1
-                end
-                suffix = i
+            # Compute suffix
+            unless suffices.empty?
+              i = 1
+              while suffices.include? i
+                i += 1
               end
+              suffix = i
             end
-
+           
+            # Apply suffix
             if suffix
               proper + '-' + suffix.to_s
             else
@@ -100,6 +90,20 @@ module CortexReaver
               @canonical_name_attr || CANONICAL_NAME_ATTR
             end
           end
+
+          # Canonicalize only in the context of our parent's namespace.
+          # Takes a proper canonical name to check for conflicts with, and an optional
+          # id to ignore conflicts with
+          def self.similar_canonical_names(proper, opts={})
+            id = opts[:id]
+            similar = []
+            if filter(canonical_name_attr => proper).exclude(:id => id).limit(1).count > 0
+              # This name already exists, and it's not ours.
+              similar << proper
+              similar += filter(canonical_name_attr.like(/^#{proper}\-[0-9]+$/)).map(canonical_name_attr)
+            end
+            similar
+          end 
         end
       end
     end