cortex-reaver 0.0.2 → 0.0.3

data/bin/cortex_reaver

@@ -24,6 +24,11 @@ module CortexReaver
   # Parse options
   @values = {}
   parser = OptionParser.new do |o|
+    o.on '-b', '--blank',
+      'Wipes the database and sets up a clean copy of the latest version.' do
+      @action = :blank
+    end
+
     o.on '-c', '--config file', 'Configuration file' do |file|
       self.config_file = file
     end
@@ -36,38 +41,36 @@ module CortexReaver
       @action = :help
     end
 
-    o.on '-s', '--start',
-      'Start the CortexReaver server.' do
-      @action = :start
+    o.on '-i', '--irb', 'Start an IRB session' do
+      @action = :irb
+    end
+
+    o.on '-k', '--stop', 'Stop Cortex Reaver' do
+      @action = :stop
     end
 
     o.on '-m', '--migrate [version]',
-      'Migrate the database to schema version, or to the latest version.' do |version|
+      'Migrate the database to schema version, or to the latest version' do |version|
       @action = :migrate
       @values[:schema_version] = version ? version.to_i : nil
     end
 
-    o.on '-b', '--blank',
-      'Wipes the database and sets up a clean copy of the latest version.' do
-      @action = :blank
-    end
-
-    o.on '-r', '--restart', 'Restart CortexReaver' do
+    o.on '-r', '--restart', 'Restart Cortex Reaver' do
       @action = :restart
     end
 
-    o.on '-k', '--stop', 'Stop CortexReaver' do
-      @action = :stop
+    o.on '-s', '--start',
+      'Start the Cortex Reaver server' do
+      @action = :start
     end
 
-    o.on '--status', 'Check CortexReaver status.' do
+    o.on '--status', 'Check Cortex Reaver status' do
       @action = :status
     end
   end
 
   parser.parse! ARGV
 
-
   # Main
   case @action
   when :status
@@ -112,11 +115,30 @@ module CortexReaver
 
   when :blank
     if confirm "Are you sure you wish to wipe the database?"
-      # Strangely, calling Migrator.apply to go down and then up doesn't seem to work. :-/
+      # Strangely, calling Migrator.apply to go down and then up doesn't seem
+      # to work. :-/
       system($0, '-f', '-m', '0')
       system($0, '-f', '-m')
     end
 
+  when :help
+    puts "Cortex Reaver #{APP_VERSION}: A dangerous Ruby blog engine, with a photographic memory."
+    puts parser.help
+
+  when :irb
+    # Start an IRB session
+    reload_config
+    setup
+    Ramaze::Global.console = true
+
+    # Don't let IRB try to interpret our command line
+    ARGV.clear
+
+    require 'irb'
+    require 'irb/completion'
+
+    IRB.start
+
   when :restart
     restart
 

data/lib/cortex_reaver.rb

@@ -15,11 +15,13 @@ gem install mongrel ramaze sequel yaml erubis BlueCloth rmagick exifr hpricot bu
 end
 
 module CortexReaver
+  # Paths
   ROOT = File.expand_path(__DIR__/'..')
   LIB_DIR = ROOT/:lib/:cortex_reaver
   HOME_DIR = Dir.pwd
   
-  # We need the configuration class before everything.
+  # Some basic initial requirements
+  require LIB_DIR/:version
   require LIB_DIR/:config
 
   # Returns the site configuration
@@ -124,6 +126,7 @@ module CortexReaver
   def self.restart
     begin
       stop
+      # Wait for Cortex Reaver to finish, and for the port to become available.
       sleep 5
     ensure
       start

data/lib/cortex_reaver/controller/comment.rb

@@ -52,12 +52,21 @@ module CortexReaver
       render_template :list
     end
 
+    # This action is referenced by public comment-posting forms.
     def post
       unless request.post?
         flash[:error] = "No comment to post!"
         redirect_to R(:/)
       end
-      
+     
+      # Check for robots
+      unless request[:captcha].blank? and
+             request[:comment].blank?
+        # Robot!?
+        flash[:error] = "Cortex Reaver is immune to your drivel, spambot."
+        redirect R(:/)
+      end 
+
       begin
         # Create comment
         CortexReaver.db.transaction do

data/lib/cortex_reaver/controller/tag.rb

@@ -55,7 +55,7 @@ module CortexReaver
       else
         # Specific tags
         @tags = tags
-        @title = "Tags: #{h tags.join(', ')}"
+        @title = "Tags: #{tags.join(', ')}"
       end
     end
 

data/lib/cortex_reaver/helper/form.rb

@@ -56,12 +56,14 @@ module Ramaze
       #   :description => The label for the field (inferred from id by default)
       #   :model => The model to query for fields
       #   :default => The default value for the field (inferred from model and id)
+      #   :p_class => Class attached to the paragraph
       def form_p(id, params = {})
         type = params[:type]
+        p_class = params[:p_class]
         description = params[:description] || id.to_s.titleize
         model = params[:model]
         default = params[:default]
-        if model and not default
+        if model and not default and model.respond_to? id
           default = model.send(id)
         end
 
@@ -76,7 +78,7 @@ module Ramaze
           end
         end
 
-        f = '<p>'
+        f = "<p #{p_class.nil? ? '' : 'class="' + attr_h(p_class) + '"'}>"
         unless type == 'checkbox' or type == 'hidden'
           f << "<label for=\"#{id}\">#{description}</label>"
         end

data/lib/cortex_reaver/public/css/admin.css

@@ -1,7 +1,7 @@
 #adminbox {
   display: none;
   padding: 0.5em;
-  margin: 0 0 1em 0;
+  margin: -1px 0 1em 0;
   background-color: #eaeaea;
   border: 1px solid #aaa;
   border-top: none;
@@ -9,7 +9,7 @@
 }
 
 #main #adminbox {
-  margin: -0.8em 0em 1em 0em;
+  margin: -1em 0em 1em 0em;
 }
 
 #adminbox .actions-table {

data/lib/cortex_reaver/public/css/code.css

@@ -0,0 +1,24 @@
+code {
+  display: block;
+  margin: 1em 0;
+  padding: 4pt;
+  color: #fff;
+  background: #000;
+/*  white-space: pre */
+}
+
+code .r { color: #FCE94F; font-weight: bolder; }
+code .cl { color: #8AE234; font-weight: bolder;}
+code .c { color: #34E2E2; }
+code .dl { color: #EF2929; font-weight: bolder; }
+code .k { color: #AD7FA8; font-weight: bolder; }
+code .i { color: #AD7FA8; font-weight: bolder; }
+code .fu { color: #729FCF; font-weight: bolder; }
+code .co { color: #8AE234; font-weight: bolder; }
+code .ch { color: #AD7FA8; font-weight: bolder; }
+code .idl { color: #EF2929; }
+code .gv { color: #34E2E2; font-weight: bolder; }
+code .pc { color: #AD7FA8; font-weight: bolder; }
+code .sy { color: #AD7FA8; font-weight: bolder; }
+code .fl { color: #AD7FA8; font-weight: bolder; }
+

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

@@ -244,6 +244,10 @@ th {
   clear: both;
 }
 
+.dont-read-me {
+  display: none;
+}
+
 .current {
   font-weight: bolder;
 }

data/lib/cortex_reaver/support/renderer.rb

@@ -1,15 +1,16 @@
 module CortexReaver
   module Model
-    # Some common rendering methods, wrapped up for your convenience. Use in your model
-    # with something like:
+    # Some common rendering methods, wrapped up for your convenience. Use in
+    # your model with something like:
     #
     # render :body, :with => :render_comment
     #
     # See CortexReaver::Model::CachedRendering for more details.
     module Renderer
+
       require 'bluecloth'
       require 'hpricot'
-      require 'syntax'
+      require 'coderay'
 
       # Elements to allow in sanitized HTML.
       ELEMENTS = [
@@ -35,11 +36,44 @@ module CortexReaver
       PROTOCOLS = ['ftp', 'http', 'https', 'mailto']
 
       
-      # Renders plain text and html to html.
-      def bluecloth(text)
+      # Renders plain text and html to html. If parse_code isn't true, only
+      # runs bluecloth on text *outside* any <code>...</code> blocks.
+      def bluecloth(text, parse_code = true)
         return text if text.nil?
 
-        BlueCloth::new(text).to_html
+        if parse_code
+          return BlueCloth::new(text).to_html
+        end
+
+        text = text.dup
+        out = ''
+        level = 0
+        until text.empty? do
+          if level < 1
+            # Find start of code block
+            j = text.index('<code>') || text.length
+            j -= 1 if j != 0
+            level += 1
+           
+            if j != 0
+              # Convert to bluecloth
+              out << BlueCloth::new(text[0..j]).to_html
+            end
+          else
+            # Find end of code block
+            j = text.index('</code>') || text.length
+            level -= 1
+            j += 6
+
+            # Output as is
+            out << text[0..j]
+          end
+
+          # Excise parsed string
+          text.slice! 0..j unless j == 0
+        end
+
+        out
       end
 
       # Replace <% and %> to prevent Erubis injection.
@@ -54,7 +88,9 @@ module CortexReaver
 
       # Macro substitutions
       #
-      # Expands [[type:resource][name]] macros. Right now, resource is just an attachment.
+      # Expands [[type:resource][name]] macros. Right now, resource is just an
+      # attachment.
+      #
       # Included types are:
       #
       # url: returns the URL to an attachment
@@ -113,10 +149,25 @@ module CortexReaver
       def syntax_highlight(text)
         return text if text.nil?
 
-        h = Hpricot(text)
+        text.gsub(/<cr:code\s.*?(lang="(.*?)").*?>(.*?)<\/cr:code>/m) do |match|
+          lang = $2
+          code = $3
+
+          # Replace entities
+          code.gsub!('&', '&quot;')
 
-        h.search('cr:code').replace do |code|
-          code[:lang]
+          unless lang.empty?
+            # Parse with CodeRay.
+            code = '<div class="code"><code>' + CodeRay.scan(code, lang.to_sym).html.strip + '</code></div>'
+          end
+
+          # Using white-space: pre is a nice option, but I haven't figured out
+          # how to make it work with fluid layouts. So, I'm going with line
+          # wrapping and explicit HTML entities; since we're already marking
+          # up the code for syntax, might as well go all the way. Plus, 
+          # this still pastes cleanly, but displays like a terminal.
+          code.gsub!("\n", '<br />')
+          code.gsub!(/( {2})/) { |match| '&nbsp;' * $1.length }
         end
       end
 
@@ -175,9 +226,11 @@ module CortexReaver
         bluecloth(
           macro(
             erubis_filter(
-              text
+              syntax_highlight(
+                text
+              )
             )
-          )
+          ), false
         ) # (((Feeling) LISPish yet)?)
       end
 

data/lib/cortex_reaver/version.rb

@@ -1,6 +1,6 @@
 module CortexReaver
   APP_NAME = 'Cortex Reaver'
-  APP_VERSION = '0.0.2'
+  APP_VERSION = '0.0.3'
   APP_AUTHOR = 'aphyr'
   APP_EMAIL = 'aphyr@aphyr.com'
   APP_URL = 'http://aphyr.com'

data/lib/cortex_reaver/view/blank_layout.rhtml

@@ -18,6 +18,7 @@
     <link rel="stylesheet" type="text/css" href="/css/photo.css" />
     <link rel="stylesheet" type="text/css" href="/css/text.css" />
     <link rel="stylesheet" type="text/css" href="/css/form.css" />
+    <link rel="stylesheet" type="text/css" href="/css/code.css" />
     <link rel="stylesheet" type="text/css" href="/css/custom.css" />
     <% if defined? feeds %>
       <% feeds.each do |title, feed| %>

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

@@ -11,26 +11,32 @@
     </div>
   <% end %>
 
-  <% if @new_comment.user %>
-    <%= form_for @new_comment, R(CortexReaver::CommentController, :post), [
-      :title,
-      [:body, {:type => 'textarea'}],
-      [:comment_id, {:type => 'hidden'}],
-      [:journal_id, {:type => 'hidden'}],
-      [:photograph_id, {:type => 'hidden'}],
-      [:project_id, {:type => 'hidden'}]
-  ] %>
-  <% else %>
-    <%= form_for @new_comment, R(CortexReaver::CommentController, :post), [
-      :title,
-      :name,
-      :email,
-      :http,
-      [:body, {:type => 'textarea'}],
-      [:comment_id, {:type => 'hidden'}],
-      [:journal_id, {:type => 'hidden'}],
-      [:photograph_id, {:type => 'hidden'}],
-      [:project_id, {:type => 'hidden'}]
-  ] %>
-  <% end %>
+  <form class="comment-form" action="<%= R(CortexReaver::CommentController, :post) %>" method="post">
+    <%= form_p :title, :model => @new_comment %>
+    <p class="dont-read-me">
+      Please avoid writing anything here unless you are a computer:
+      <label for="captcha">Captcha</label>
+      <input type="text" name="captcha" id="captcha" />
+
+      <br />
+      <br />
+      
+      This is also a trap:
+      <label for="comment">Comment</label>
+      <textarea name="comment" id="comment"></textarea>
+    </p>
+    
+    <% unless @new_comment.user %>
+      <%= form_p :name, :model => @new_comment %>
+      <%= form_p :email, :model => @new_comment %>
+      <%= form_p :http, :model => @new_comment %>
+    <% end %>
+    <%= form_p :body, :type => 'textarea', :model => @new_comment %>
+    <%= form_p :comment_id, :type => 'hidden', :model => @new_comment %>
+    <%= form_p :journal_id, :type => 'hidden', :model => @new_comment %>
+    <%= form_p :photograph_id, :type => 'hidden', :model => @new_comment %>
+    <%= form_p :project_id, :type => 'hidden', :model => @new_comment %>
+    <%= form_p :page_id, :type => 'hidden', :model => @new_comment %>
+    <input type="submit" value="Post Comment" />
+  </form>
 </div>

data/lib/cortex_reaver/view/text_layout.rhtml

@@ -18,6 +18,7 @@
     <link rel="stylesheet" type="text/css" href="/css/photo.css" />
     <link rel="stylesheet" type="text/css" href="/css/text.css" />
     <link rel="stylesheet" type="text/css" href="/css/form.css" />
+    <link rel="stylesheet" type="text/css" href="/css/code.css" />
     <link rel="stylesheet" type="text/css" href="/css/custom.css" />
     <% if @feeds %>
       <% @feeds.each do |title, feed| %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cortex-reaver
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - aphyr
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-16 00:00:00 -08:00
+date: 2008-12-18 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -92,18 +92,25 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.10.7
     version: 
+- !ruby/object:Gem::Dependency 
+  name: coderay
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.8.260
+    version: 
 description: 
 email: aphyr@aphyr.com
 executables: 
 - cortex_reaver
-- console
 extensions: []
 
 extra_rdoc_files: []
 
 files: 
-- bin/import.rb
-- bin/console
 - bin/cortex_reaver
 - lib/proto
 - lib/proto/cortex_reaver.yaml
@@ -230,6 +237,7 @@ files:
 - lib/cortex_reaver/public/css/form.css
 - lib/cortex_reaver/public/css/ramaze_error.css
 - lib/cortex_reaver/public/css/custom.css
+- lib/cortex_reaver/public/css/code.css
 - lib/cortex_reaver/public/css/photo.css
 - lib/cortex_reaver/public/css/admin.css
 - lib/cortex_reaver/public/css/main.css

data/bin/console

@@ -1,11 +0,0 @@
-#!/usr/bin/ruby
-
-require File.dirname(__FILE__) + '/../lib/cortex_reaver'
-require 'irb'
-
-CortexReaver.setup ARGV.first
-include CortexReaver
-
-# Don't let ARGV hit IRB, or it will try to run it!
-ARGV.clear
-IRB.start

data/bin/import.rb

@@ -1,78 +0,0 @@
-#!/usr/bin/ruby
-
-puts `#{File.dirname(__FILE__)}/cortex_reaver -rf #{ARGV.first}`
-
-require File.dirname(__FILE__) + '/../lib/cortex_reaver'
-
-CortexReaver.setup ARGV.first
-
-c = Sequel.connect('mysql://cortex_reaver:RyReajOuc7@localhost/cortex_reaver')
-f = Sequel.connect('mysql://cortex_reaver:RyReajOuc7@localhost/fiachran')
-
-# Journals
-puts "Journals..."
-f[:journals].each do |journal|
-  journal[:user_id] = journal.delete :author_id
-  journal[:name] = Journal.canonicalize journal[:title]
-  c[:journals] << journal
-end
-
-# Projects
-puts "Projects..."
-f[:projects].each do |project|
-  project[:user_id] = project.delete :author_id
-  project[:name] = Project.canonicalize project[:title]
-  c[:projects] << project
-end
-
-# Photos
-puts "Photographs..."
-f[:photographs].each do |photograph|
-  photograph[:user_id] = photograph.delete :author_id
-  photograph[:name] = Photograph.canonicalize photograph[:title]
-  c[:photographs] << photograph
-end
-
-# Comments
-puts "Comments..."
-f[:comments].each do |comment|
-  if comment[:email] == 'aphyr@aphyr.com'
-    comment[:user_id] = 1
-  end
-  comment[:name] = comment.delete :author
-  c[:comments] << comment
-end
-
-# Tags
-puts "Tags..."
-f[:tags].each do |tag|
-  tag[:title] = tag[:name]
-  tag[:name] = Tag.canonicalize tag[:name]
-  c[:tags] << tag
-end
-
-[:journals_tags, :projects_tags, :photographs_tags].each do |t|
-  f[t].each do |r|
-    c[t] << r
-  end
-end
-
-
-puts "Fixing blank comment titles"
-Comment.infer_blank_titles
-
-puts "Fixing tag counts"
-Tag.filter({:name => ''} | {:title => ''}).all.each do |tag|
-  tag.delete
-end
-Tag.refresh_counts
-
-puts "Refreshing comment counts..."
-Journal.refresh_comment_counts
-Photograph.refresh_comment_counts
-Project.refresh_comment_counts
-
-puts "Refreshing cached render fields..."
-Journal.refresh_render_caches
-Project.refresh_render_caches
-Comment.refresh_render_caches