cortex-reaver 0.2.4 → 0.2.5

data/bin/cortex_reaver

@@ -223,6 +223,17 @@ module CortexReaver
     require 'irb'
     require 'irb/completion'
 
+    # IRB monkeypatch to let us load a custom context object
+    class IRB::Irb
+      alias initialize_orig initialize
+      def initialize(workspace = nil, *args)
+        default = IRB.conf[:DEFAULT_OBJECT]
+        workspace ||= IRB::WorkSpace.new default if default
+        initialize_orig(workspace, *args)
+      end
+    end
+
+    IRB.conf[:DEFAULT_OBJECT] = CortexReaver
     IRB.start
 
   when :restart

data/lib/cortex_reaver.rb

@@ -41,9 +41,9 @@ module CortexReaver
     files = Dir.entries(stock_dir) | Dir.entries(custom_dir)
 
     # Reorder files if necessary.
-    if order = opts[:order]
-      files = (order & files) + (files - order)
-    end
+    first = (opts[:first] || []) & files
+    last = (opts[:last] || []) & files
+    files = first + (files - first - last) + last
 
     # Read files
     files.each do |file|
@@ -69,7 +69,13 @@ module CortexReaver
 
     # Get CSS files
     FileUtils.mkdir_p(custom_dir)
-    css = collect_files(stock_dir, custom_dir, /^((?!style).)*\.css$/, :order => config.css)
+    css = collect_files(
+      stock_dir, 
+      custom_dir, 
+      /^((?!style).)*\.css$/, 
+      :first => config.css.first,
+      :last => config.css.last
+    )
 
     # Write minified CSS
     File.open(File.join(custom_dir, 'style.css'), 'w') do |file|
@@ -85,7 +91,13 @@ module CortexReaver
 
     # Get JS files
     FileUtils.mkdir_p(custom_dir)
-    js = collect_files(stock_dir, custom_dir, /^((?!site).)*\.js$/, :order => config.js)
+    js = collect_files(
+      stock_dir, 
+      custom_dir, 
+      /^((?!site).)*\.js$/, 
+      :first => config.js.first,
+      :last => config.js.last
+    )
 
     # Write minified JS
     File.open(File.join(custom_dir, 'site.js'), 'w') do |file|

data/lib/cortex_reaver/config.rb

@@ -155,10 +155,16 @@ You can also just provide a regex for the path, in which case it is matched dire
           ['/', 'photographs']
         ]
 
-      define :css,
+      define :css, :default => Construct.new
+      css.define :first,
         :desc => "An array of CSS files to load first, in order.",
         :default => []
-      define :js,
+      css.define :last,
+        :desc => "An array of CSS files to load last, in order.",
+        :default => ['custom.css']
+      
+      define :js, :default => Construct.new
+      js.define :first,
         :desc => "An array of Javascript files to load first, in order.",
         :default => [
           'jquery.js',
@@ -167,6 +173,10 @@ You can also just provide a regex for the path, in which case it is matched dire
           'jquery.hotkeys-0.7.9.js',
           'cookie.js'
         ]
+      js.define :last,
+        :desc => "An Array of Javascript files to load last, in order.",
+        :default => []
+
 
       define :photographs,
         :desc => "Photograph configuration options.",

data/lib/cortex_reaver/controller/main.rb

@@ -3,7 +3,7 @@ require 'libxml'
 module CortexReaver
   class MainController < Controller
     map '/'
-    
+   
     layout(:text) do |name, wish|
       if request.xhr? or name == 'atom' or name == 'sitemap'
         false
@@ -14,7 +14,6 @@ module CortexReaver
 
     # We provide an XML sitemap.
     provide(:xml, :type => 'text/xml') do |action, value|
-      Ramaze::Log.info action
       if action.method == 'sitemap'
         value
       else
@@ -29,16 +28,12 @@ module CortexReaver
       :pages
 
     cache_action(:method => :index, :ttl => 120) do
-      user.id.to_i.to_s + flash.inspect
+      user.id.to_i.to_s + flash.inspect + request.path_info
     end
     cache_action(:method => :sitemap, :ttl => 300) do
       request.path_info
     end
 
-    def cache
-      respond Ramaze::Cache.action.stats
-    end
-
     # the index action is called automatically when no other action is specified
     def index(*ids)
       if not ids.empty? and @page = Page.get(ids)

data/lib/cortex_reaver/version.rb

@@ -1,8 +1,8 @@
 module CortexReaver
   APP_NAME = 'Cortex Reaver'
-  APP_VERSION = '0.2.4'
+  APP_VERSION = '0.2.5'
   APP_AUTHOR = 'Kyle Kingsbury'
   APP_EMAIL = 'aphyr@aphyr.com'
   APP_URL = 'http://aphyr.com'
-  APP_COPYRIGHT = 'Copyright (c) 2009 Kyle Kingsbury <aphyr@aphyr.com>. All rights reserved.'
+  APP_COPYRIGHT = 'Copyright (c) 2009--2010 Kyle Kingsbury <aphyr@aphyr.com>. All rights reserved.'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cortex-reaver
 version: !ruby/object:Gem::Version 
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors: 
 - Kyle Kingsbury
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-13 00:00:00 -08:00
+date: 2010-01-01 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency