cortex-reaver 0.0.3 → 0.0.4

data/bin/cortex_reaver

@@ -33,6 +33,11 @@ module CortexReaver
       self.config_file = file
     end
 
+    o.on '-d', '--dump file', 'Dump database' do |file|
+      @action = :dump
+      @values[:dump_file] = file
+    end
+
     o.on '-f', '--force', 'Just do it' do
       @values[:force] = true
     end
@@ -49,6 +54,12 @@ module CortexReaver
       @action = :stop
     end
 
+    o.on '-l', '--load file', 'Load database' do |file|
+      @action = :load
+      @values[:load_file] = file
+    end
+
+
     o.on '-m', '--migrate [version]',
       'Migrate the database to schema version, or to the latest version' do |version|
       @action = :migrate
@@ -73,6 +84,70 @@ module CortexReaver
 
   # Main
   case @action
+  when :dump
+    # Dump the database to disk
+    
+    # Connect to current DB
+    reload_config
+    setup_db false
+    current_version = Sequel::Migrator.get_current_migration_version(db)
+
+    puts "Using database #{config[:database][:host]}/#{config[:database][:database]}."
+
+    # Prepare dump file
+    file = @values[:dump_file]
+    if File.file? file
+      exit unless confirm("Overwrite #{File.expand_path(file)} with current Cortex Reaver database?")
+      FileUtils.rm file
+    end
+
+    # Connect to dump DB
+    dump = Sequel.connect "sqlite:////#{File.expand_path(file)}"
+    Sequel::Migrator.apply dump, LIB_DIR/:migrations, current_version
+
+    # Copy tables
+    db.tables.each do |table|
+      puts "Table #{table} (#{db[table].count} rows)..."
+      dump_table = dump[table]
+      db[table].each do |row|
+        dump_table << row
+      end
+    end   
+        
+    puts "Dumped database to #{file}."
+
+  when :load
+    # Load an SQLite database from disk.
+
+    # Connect to dump DB
+    file = @values[:load_file]
+    dump = Sequel.connect "sqlite:////#{File.expand_path(file)}"
+    current_version = Sequel::Migrator.get_current_migration_version(dump)
+
+    # Connect to current DB
+    reload_config
+    setup_db false
+    puts "Using database #{config[:database][:host]}/#{config[:database][:database]}."
+
+    unless confirm("Overwrite current database with #{File.expand_path(file)}?")
+      exit
+    end
+     
+    # Drop current migrations and move to the dump's version
+    system($0, '-f', '-m', '0')
+    Sequel::Migrator.apply db, LIB_DIR/:migrations, current_version
+
+    # Copy tables
+    dump.tables.each do |table|
+      puts "Table #{table} (#{dump[table].count} rows)..."
+      db_table = db[table]
+      dump[table].each do |row|
+        db_table << row
+      end
+    end   
+        
+    puts "Database #{file} loaded."
+
   when :status
     # Make a quick HTTP request to see how we're doing.
     require 'open-uri'

data/lib/cortex_reaver.rb

@@ -46,6 +46,7 @@ module CortexReaver
     # Tell Ramaze where to find public files and views
     Ramaze::Global.public_root = LIB_DIR/:public
     Ramaze::Global.view_root = config[:view_root]
+    Ramaze::Global.compile = config[:compile_views]
 
     # Check directories
     if config[:public_root] and not File.directory? config[:public_root]
@@ -127,7 +128,7 @@ module CortexReaver
     begin
       stop
       # Wait for Cortex Reaver to finish, and for the port to become available.
-      sleep 5
+      sleep 2
     ensure
       start
     end
@@ -144,6 +145,7 @@ module CortexReaver
 
     # Run Ramaze
     Ramaze.startup(
+      :force => true,
       :adapter => config[:adapter],
       :host => config[:host],
       :port => config[:port]
@@ -212,14 +214,14 @@ module CortexReaver
     setup
 
     # Check port availability
-    begin
-      socket = Socket.new(Socket::AF_INET, Socket::SOCK_STREAM, 0)
-      sockaddr = Socket.pack_sockaddr_in(*[config[:port], config[:host]])
-      socket.bind(sockaddr)
-      socket.close
-    rescue => e
-      abort "Unable to bind to port #{config[:host]}:#{config[:port]} (#{e})"
-    end
+#    begin
+#      socket = Socket.new(Socket::AF_INET, Socket::SOCK_STREAM, 0)
+#      sockaddr = Socket.pack_sockaddr_in(*[config[:port], config[:host]])
+#      socket.bind(sockaddr)
+#      socket.close
+#    rescue => e
+#      abort "Unable to bind to port #{config[:host]}:#{config[:port]} (#{e})"
+#    end
 
     if config[:daemon]
       fork do

data/lib/cortex_reaver/config.rb

@@ -14,11 +14,13 @@ module CortexReaver
     # :mode        - Cortex Reaver mode: either :development or :production
     # :daemon      - Whether to daemonize or not. Defaults to :true if :mode
     #                is :production, otherwise nil.
-    # :adapter     - The Ramaze adapter name (default 'mongrel')
+    # :adapter     - The Ramaze adapter name (default 'thin')
     # :host        - Host to bind to 
     # :port        - Port to bind to (default 7000)
     # :pidfile     - Process ID file for this server. Defaults to 
     #                HOME_DIR/cortex_reaver_<host>_<port>.pid
+    # :compile_views - Whether to cache compiled view templates. Defaults to
+    #                  true in production mode.
     #
     # Site configuration options
     # :site = {
@@ -37,7 +39,7 @@ module CortexReaver
       self[:view_root] = File.join(CortexReaver::LIB_DIR, 'view')
       self[:log_root] = File.join(CortexReaver::HOME_DIR, 'log')
       self[:mode] = :production
-      self[:adapter] = 'mongrel'
+      self[:adapter] = 'thin'
       self[:host] = nil
       self[:port] = 7000
 
@@ -62,6 +64,9 @@ module CortexReaver
 
       # Daemon mode
       self[:daemon] ||= true if self[:mode] == :production
+
+      # Compile views
+      self[:compile_views] ||= true if self[:mode] == :production
     end
   end
 end

data/lib/cortex_reaver/controller/comment.rb

@@ -8,7 +8,8 @@ module CortexReaver
     template :new, :form
     engine :Erubis
 
-    helper :error, 
+    helper :cache,
+      :error, 
       :auth, 
       :form, 
       :workflow, 
@@ -18,6 +19,8 @@ module CortexReaver
       :crud,
       :feeds
 
+    cache :index, :ttl => 60
+
     on_save do |comment, request|
       comment.title = request[:title]
       comment.body = request[:body]
@@ -102,6 +105,9 @@ module CortexReaver
           # Save
           raise unless @comment.save
 
+          # Clear action cache
+          action_cache.delete '/index'
+
           flash[:notice] = "Your comment (<a href=\"##{@comment.url.gsub(/.*#/, '')}\">#{h @comment.title}</a>) has been posted."
           redirect @comment.parent.url
         end

data/lib/cortex_reaver/controller/documentation.rb

@@ -0,0 +1,10 @@
+module CortexReaver
+  class DocumentationController < Ramaze::Controller
+    map '/documentation'
+    layout '/text_layout'
+    engine :Erubis
+
+    def formatting
+    end
+  end
+end

data/lib/cortex_reaver/controller/journal.rb

@@ -9,7 +9,8 @@ module CortexReaver
     template :new, :form
     engine :Erubis
 
-    helper :error, 
+    helper :cache,
+      :error, 
       :auth, 
       :form, 
       :workflow, 
@@ -21,6 +22,8 @@ module CortexReaver
       :attachments,
       :feeds
 
+    cache :index, :ttl => 60
+
     on_second_save do |journal, request|
       journal.tags = request[:tags]
       add_attachments(journal, request[:attachments])

data/lib/cortex_reaver/controller/main.rb

@@ -4,9 +4,20 @@ module CortexReaver
   class MainController < Ramaze::Controller
     map '/'
     layout '/text_layout'
-    helper :workflow, :auth, :error, :navigation, :date, :tags, :form, :feeds
+    helper :cache, 
+      :workflow, 
+      :auth, 
+      :error, 
+      :navigation, 
+      :date, 
+      :tags, 
+      :form,
+      :feeds
+
     engine :Erubis
 
+    cache :index, :ttl => 60
+
     # the index action is called automatically when no other action is specified
     def index(id = nil)
       if id and @page = Page.get(id)
@@ -44,6 +55,11 @@ module CortexReaver
       end
     end
 
+    # TODO: We don't implement a collective ATOM feed. Yet.
+    def atom
+      error_404
+    end
+
     private
 
     # the string returned at the end of the function is used as the html body

data/lib/cortex_reaver/controller/photograph.rb

@@ -12,7 +12,8 @@ module CortexReaver
     template :new, :form
     engine :Erubis
 
-    helper :error,
+    helper :cache,
+      :error,
       :auth, 
       :form, 
       :workflow, 
@@ -25,6 +26,7 @@ module CortexReaver
       :photographs,
       :feeds
 
+    cache :index, :ttl => 60
 
     on_save do |photograph, request|
       photograph.title = request[:title]

data/lib/cortex_reaver/controller/project.rb

@@ -8,7 +8,8 @@ module CortexReaver
     template :new, :form
     engine :Erubis
 
-    helper :error, 
+    helper :cache,
+      :error, 
       :auth, 
       :form, 
       :workflow, 
@@ -20,6 +21,8 @@ module CortexReaver
       :attachments,
       :feeds
 
+    cache :index, :ttl => 60
+
     on_second_save do |project, request|
       project.tags = request[:tags]
       add_attachments(project, request[:attachments])

data/lib/cortex_reaver/controller/tag.rb

@@ -8,7 +8,8 @@ module CortexReaver
     template :new, :form
     engine :Erubis
 
-    helper :error,
+    helper :cache,
+      :error,
       :auth,
       :form,
       :workflow,
@@ -16,6 +17,9 @@ module CortexReaver
       :canonical,
       :crud
 
+    cache :index, :ttl => 60
+    cache :show, :ttl => 60
+
     on_save do |tag, request|
       tag.title = request[:title]
       tag.name = Tag.canonicalize request[:name], tag.id

data/lib/cortex_reaver/helper/crud.rb

@@ -224,6 +224,11 @@ module Ramaze
                   raise unless @model.save
                 end
 
+                # Invalidate caches
+                if respond_to? :action_cache
+                  action_cache.clear
+                end
+
                 flash[:notice] = "Updated #{model_class.to_s.demodulize.downcase} #{h @model.to_s}."
                 redirect @model.url
               end

data/lib/cortex_reaver/helper/feeds.rb

@@ -4,7 +4,7 @@ module Ramaze
     # lists that controller's recent elements by yielding a block with
     # each record and a builder object for the feed.
     #
-    # Requires crud.
+    # Requires crud. Will attempt to cache feeds if the cache helper is available.
     module Feeds
       require 'builder'
 
@@ -19,6 +19,10 @@ module Ramaze
           def self.for_feed_block
             @for_feed_block
           end
+
+          if base.respond_to? :cache
+            cache :atom, :ttl => 300
+          end
         end
       end
 
@@ -28,7 +32,7 @@ module Ramaze
 
       private
 
-      def atom_builder(params = {:model_class => self.model_class})
+      def atom_builder(params = {:model_class => self.class.const_get('MODEL')})
         response['Content-Type'] = 'application/atom+xml'
 
         x = Builder::XmlMarkup.new(:indent => 2)
@@ -41,11 +45,15 @@ module Ramaze
         recent = params[:recent] || model_class.recent
 
         # Find update time
-        updated = recent.first.updated_on.xmlschema
+        if first = recent.first
+          updated = first.updated_on.xmlschema
+        else
+          updated = Time.now.xmlschema
+        end
 
         x.feed(:xmlns => 'http://www.w3.org/2005/Atom') do
           x.id = model_class.url
-          x.title CortexReaver.config.name + ' - ' + model_class.to_s.demodulize.titleize
+          x.title "#{CortexReaver.config[:name]} - #{model_class.to_s.demodulize.titleize}"
           # x.subtitle
           x.updated updated
           x.link :href => model_class.url

data/lib/cortex_reaver/model/page.rb

@@ -73,7 +73,7 @@ module CortexReaver
         :title => 'About Cortex Reaver',
         :body => <<EOF
 <p>Cortex Reaver is a blog engine designed for managing photographs, projects,
-journal entries, and more, with support for tags, comments, and ratings. Cortex
+journal entries, and more, with support for tags and comments. Cortex
 Reaver is written in <a href="http://ruby-lang.org">Ruby</a> using <a
 href="http://ramaze.net">Ramaze</a>, uses the <a
 href="http://sequel.rubyforge.org/">Sequel</a> database toolkit and the <a

data/lib/cortex_reaver/model/project.rb

@@ -1,9 +1,5 @@
 module CortexReaver
   class Project < Sequel::Model(:projects)
-    def self.url
-      '/projects'
-    end
-
     include CortexReaver::Model::Timestamps
     include CortexReaver::Model::CachedRendering
     include CortexReaver::Model::Renderer
@@ -26,6 +22,10 @@ module CortexReaver
 
     render :body
 
+    def self.atom_url
+      '/projects/atom'
+    end
+
     def self.get(id)
       self[:name => id] || self[id]
     end
@@ -34,6 +34,10 @@ module CortexReaver
       reverse_order(:updated_on).limit(16)
     end
 
+    def self.url
+      '/projects'
+    end
+
     def atom_url
       '/projects/atom/' + name
     end

data/lib/cortex_reaver/version.rb

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

data/lib/cortex_reaver/view/documentation/formatting.rhtml

@@ -0,0 +1,64 @@
+<div class="documentation">
+  <h2>Cortex Reaver Formatting</h2>
+
+  <p>Cortex Reaver will pass through all HTML in the body of a text. Hence, you
+  can specify paragraphs, block-quotes, insertions and deletions, headings, and
+  so forth using plain HTML. However, there are also some shortcuts for your
+  convenience.</p>
+
+  <h3>Markdown</h3>
+  
+  <p>All posts are automatically formatted with <a
+    href="http://daringfireball.net/projects/markdown/basics">Markdown</a>,
+  which transforms common plain-text conventions to HTML.</p>
+  
+  <ul>
+    <li>Headings are specified by underlining with the equals sign (=) and the dash (-).</li>
+    <li>Paragraphs are delineated by a blank line between blocks of text.</li>
+    <li>Surrounding text with underscores (_) and asterisks (*) denotes emphasis.</li>
+    <li>Asterisks, pluses, and dashes (*, +, -) all create unordered lists.</li>
+    <li>Numbers (no matter what their order) followed by periods, yield ordered lists.</li>
+    <li>Indenting with the right angle bracket (&gt;) gives a blockquote.</li>
+  </ul> 
+
+  <h3>Attachments</h3>
+
+  <p>To reference an attachment hacker.jpg, use a macro like:</p>
+
+  <code>[[hacker.jpg]]</code>
+
+  <p>This will create a link to the attachment with that name. You can give an
+  optional name for the link, which will be shown instead of the filename, used
+  for descriptions of images, and so forth.</p>
+
+  <code>[[hacker.jpg][A pathetic creature of meat and bone.]]</code>
+  
+  <p>A variety of attachment macros are available.</p>
+
+  <code>
+    [[link:hacker.jpg]]&nbsp;&nbsp;=&gt; An HTML link to the attachment.<br />
+    [[image:hacker.jpg]]&nbsp;=&gt; An inline image.<br />
+    [[url:hacker.jpg]]&nbsp;&nbsp;=&gt; The URL for the attachment.
+  </code>
+
+  <p>The url macro is especially useful when you want additional control:</p>
+
+  <code>
+    &lt;img src="[[url:hacker.jpg]]" style="width: 40%; float: left;" /&gt;
+  </code>
+
+  <h3>Code</h3>
+
+  <p>Cortex Reaver escapes code using HTML entities, and if you specify a
+  language, can use <a href="http://coderay.rubychan.de/">CodeRay</a> to format
+  syntax.</p>
+
+  <code>
+    &lt;cr:code lang="ruby"&gt;
+    &nbsp;&nbsp;class &lt;&lt; self
+    &lt;/cr:code&gt;
+  </code>
+
+  <p>Cortex Reaver won't do anything to ordinary &lt;code&gt; tags, however, it
+  will avoid applying Markdown to anything inside them.</p>
+</div>

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

@@ -6,7 +6,7 @@
   <%= form_p :title, :model => @journal %>
   <%= live_name_field @journal %>
   <%= live_tags_field @journal %>
-  <%= form_p :body, :model => @journal, :type => 'textarea' %>
+  <%= form_p :body, :model => @journal, :type => 'textarea', :description => 'Body (<a href="/documentation/formatting" />Formatting Help</a>)' %>
   <%= attachment_form @journal %>
   <input type="submit" name="submit" />
 </form>

data/lib/proto/cortex_reaver.yaml

@@ -38,10 +38,9 @@
 # Defaults to true in production mode, false in development mode.
 #  :daemon: true
 
-# Ramaze host, port, and adapter. Defaults to nil (listens on all interfaces), mongrel,
-# and port 7000.
+# Ramaze host, port, and adapter. Defaults to nil (listens on all interfaces), htin, and port 7000.
 #  :host: 127.0.0.1
-#  :adapter: 'mongrel'
+#  :adapter: 'thin'
 #  :port: 7000
 
 # Process ID file: stores each Cortex Reaver's process ID, so you can control it later.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cortex-reaver
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - aphyr
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-18 00:00:00 -08:00
+date: 2008-12-21 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -73,14 +73,14 @@ dependencies:
         version: 2.7.1
     version: 
 - !ruby/object:Gem::Dependency 
-  name: mongrel
+  name: thin
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.1.5
+        version: 1.0.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: exifr
@@ -137,6 +137,7 @@ files:
 - lib/cortex_reaver/controller/user.rb
 - lib/cortex_reaver/controller/main.rb
 - lib/cortex_reaver/controller/journal.rb
+- lib/cortex_reaver/controller/documentation.rb
 - lib/cortex_reaver/controller/photograph.rb
 - lib/cortex_reaver/controller/page.rb
 - lib/cortex_reaver/controller/tag.rb
@@ -149,6 +150,7 @@ files:
 - lib/cortex_reaver/support/timestamps.rb
 - lib/cortex_reaver/support/renderer.rb
 - lib/cortex_reaver/support/canonical.rb
+- lib/cortex_reaver/support/renderers
 - lib/cortex_reaver/support/pagination.rb
 - lib/cortex_reaver/view
 - lib/cortex_reaver/view/users
@@ -195,6 +197,8 @@ files:
 - lib/cortex_reaver/view/journals/short.rhtml
 - lib/cortex_reaver/view/journals/form.rhtml
 - lib/cortex_reaver/view/blank_layout.rhtml
+- lib/cortex_reaver/view/documentation
+- lib/cortex_reaver/view/documentation/formatting.rhtml
 - lib/cortex_reaver/model
 - lib/cortex_reaver/model/comment.rb
 - lib/cortex_reaver/model/project.rb