typo 4.0.3 → 4.1

data/app/controllers/admin/pages_controller.rb

@@ -1,3 +1,5 @@
+require 'base64'
+
 class Admin::PagesController < Admin::BaseController
   def index
     list
@@ -42,9 +44,11 @@ class Admin::PagesController < Admin::BaseController
   end
 
   def preview
-    @headers["Content-Type"] = "text/html; charset=utf-8"
+    headers["Content-Type"] = "text/html; charset=utf-8"
     @page = this_blog.pages.build(params[:page])
-    render :layout => false
+    data = render_to_string(:layout => "minimal")
+    data = Base64.encode64(data).gsub("\n", '')
+    data = "data:text/html;charset=utf-8;base64,#{data}"
+    render :text => data
   end
-
 end

data/app/controllers/admin/sidebar_controller.rb

@@ -1,35 +1,30 @@
 class Admin::SidebarController < Admin::BaseController
   def index
-    @sidebars = ::SidebarController.available_sidebars.inject({}) do |hash,sb|
-      hash.merge({ sb.short_name => sb })
-    end
+    @available = available
     # Reset the staged position based on the active position.
-    Sidebar.delete_all('active_position is null')
-    @active = Sidebar.find(:all, :order => 'active_position').select do |sb|
-      @sidebars[sb.controller]
-    end
+    Sidebar.delete_all(['blog_id = ? and active_position is null',
+                         this_blog.id])
+    @active = this_blog.sidebars
     flash[:sidebars] = @active.map {|sb| sb.id }
-    @available = @sidebars.values.sort { |a,b| a.name <=> b.name }
   end
 
   def set_active
     # Get all available plugins
 
-    defaults_for = available.inject({}) do |hash, item|
-      hash.merge({ item.short_name => item.default_config })
+    klass_for = available.inject({}) do |hash, klass|
+      hash.merge({ klass.short_name => klass })
     end
     # Get all already active plugins
     activemap = flash[:sidebars].inject({}) do |h, sb_id|
       sb = Sidebar.find(sb_id.to_i)
-      sb ? h.merge({ sb.html_id => sb_id }) : h
+      sb ? h.merge(sb.html_id => sb_id) : h
     end
 
     # Figure out which plugins are referenced by the params[:active] array and
     # lay them out in a easy accessible sequential array
     flash[:sidebars] = params[:active].inject([]) do |array, name|
-      if defaults_for.has_key?(name)
-        @new_item = Sidebar.create!(:controller => name,
-                                    :config => defaults_for[name])
+      if klass_for.has_key?(name)
+        @new_item = klass_for[name].create!(:blog => this_blog)
         @target = name
         array << @new_item.id
       elsif activemap.has_key?(name)
@@ -50,25 +45,23 @@ class Admin::SidebarController < Admin::BaseController
   def publish
     Sidebar.transaction do
       position = 0
-      params[:configure] ||= []
-      Sidebar.update_all('active_position = null')
+      params[:configure] ||= { }
+      this_blog.sidebars.update_all('active_position = null')
       flash[:sidebars].each do |id|
         sidebar = Sidebar.find(id)
-
+        sb_attribs = params[:configure][id.to_s] || {}
         # If it's a checkbox and unchecked, convert the 0 to false
         # This is ugly.  Anyone have an improvement?
-        params[:configure][id.to_s].each do |k,v|
-          field = sidebar.sidebar_controller.fields.detect { |f| f.key == k }
-          if v == "0" && field.is_a?(Sidebars::Field::CheckBoxField)
-            params[:configure][id.to_s][k] = false
-          end
+        sidebar.fields.each do |field|
+          sb_attribs[field.key] = field.canonicalize(sb_attribs[field.key])
         end
-          
-        sidebar.update_attributes(:config => params[:configure][id.to_s],
+
+        sidebar.update_attributes(:config => sb_attribs,
                                   :active_position => position)
         position += 1
       end
-      Sidebar.delete_all('active_position is null')
+      Sidebar.delete_all(['blog_id = ? and active_position is null',
+                          this_blog.id])
     end
     index
   end
@@ -79,7 +72,7 @@ class Admin::SidebarController < Admin::BaseController
   end
 
   def available
-    ::SidebarController.available_sidebars.sort { |a,b| a.name <=> b.name }
+    ::Sidebar.available_sidebars
   end
   helper_method :available
 end

data/app/controllers/admin/textfilters_controller.rb

@@ -72,7 +72,7 @@ class Admin::TextfiltersController < Admin::BaseController
   end
 
   def preview
-    @headers["Content-Type"] = "text/html; charset=utf-8"
+    headers["Content-Type"] = "text/html; charset=utf-8"
     @textfilter = params[:textfilter]
     render :layout => false
   end
@@ -90,12 +90,14 @@ class Admin::TextfiltersController < Admin::BaseController
     @filterparams = Hash.new
     @filterdescriptions = Hash.new
     @filterhelp = Hash.new
+    @filteroptions = Hash.new
 
     (types['macropre']+types['macropost']+types['postprocess']).each do |f|
       f.default_config.each do |key,value|
         @filterparams[key] = value[:default]
         @filterdescriptions[key] = value[:description]
         @filterhelp[key] = value[:help]
+        @filteroptions[key] = value[:options]
       end
     end
 

data/app/controllers/admin/themes_controller.rb

@@ -3,7 +3,7 @@ class Admin::ThemesController < Admin::BaseController
   def index
     @themes = Theme.find_all
     @themes.each do |theme|
-      theme.description_html = TextFilter.filter_text(theme.description, self, nil, [:markdown,:smartypants])
+      theme.description_html = TextFilter.filter_text(this_blog, theme.description, nil, [:markdown,:smartypants])
     end
     @active = this_blog.current_theme
   end

data/app/controllers/admin/users_controller.rb

@@ -6,7 +6,7 @@ class Admin::UsersController < Admin::BaseController
   end
 
   def list
-    @users = User.find_all
+    @users = User.find :all
   end
 
   def show

data/app/controllers/application.rb

@@ -2,12 +2,9 @@
 # Likewise will all the methods added be available for all controllers.
 class ApplicationController < ActionController::Base
   include LoginSystem
+  before_filter :reset_local_cache, :fire_triggers
+  after_filter :reset_local_cache
 
-  before_filter :get_the_blog_object
-  before_filter :fire_triggers
-  after_filter :flush_the_blog_object
-
-  around_filter Blog
 
   protected
 
@@ -15,42 +12,43 @@ class ApplicationController < ActionController::Base
     Trigger.fire
   end
 
-  def with_blog_scoped_classes(klasses=[Content, Article, Comment, Page, Trackback], &block)
-    default_id = this_blog.id
-    scope_hash = { :find => { :conditions => "blog_id = #{default_id}"},
-                   :create => { :blog_id => default_id } }
-    klasses.inject(block) do |blk, klass|
-      lambda { klass.with_scope(scope_hash, &blk) }
-    end.call
-  end
-
-  def article_url(article, only_path = true, anchor = nil)
-    article.location(anchor, only_path)
+  def reset_local_cache
+    CachedModel.cache_reset
+    session[:user].reload if session[:user]
   end
 
+  # Axe?
   def server_url
-    this_blog.server_url
+    this_blog.base_url
   end
 
   def cache
     $cache ||= SimpleCache.new 1.hour
   end
 
-  def get_the_blog_object
-    @blog = Blog.default || Blog.create!
-    true
-  end
-
-  def flush_the_blog_object
-    @blog = nil
-    true
-  end
+  @@blog_id_for = Hash.new
 
+  # The Blog object for the blog that matches the current request.  This is looked
+  # up using Blog.find_blog and cached for the lifetime of the controller instance;
+  # generally one request.
   def this_blog
-    @blog || Blog.default || Blog.new
+    @blog ||= if @@blog_id_for[blog_base_url]
+                Blog.find(@@blog_id_for[blog_base_url])
+              else
+                returning(Blog.find_blog(blog_base_url)) do |blog|
+                  @@blog_id_for[blog_base_url] = blog.id
+                end
+              end
   end
   helper_method :this_blog
 
+  # The base URL for this request, calculated by looking up the URL for the main
+  # blog index page.  This is matched with Blog#base_url to determine which Blog
+  # is supposed to handle this URL
+  def blog_base_url
+    url_for(:controller => '/articles').gsub(%r{/$},'')
+  end
+
   def self.include_protected(*modules)
     modules.reverse.each do |mod|
       included_methods = mod.public_instance_methods.reject do |meth|

data/app/controllers/articles_controller.rb

@@ -9,7 +9,7 @@ class ArticlesController < ContentController
   # If you're really memory-constrained, then consider replacing
   # caches_action_with_params with caches_page
   caches_action_with_params *cached_pages
-  session :off, :only => cached_pages
+  session :new_session => false
 
   verify(:only => [:nuke_comment, :nuke_trackback],
          :session => :user, :method => :post,
@@ -21,18 +21,14 @@ class ArticlesController < ContentController
     #
     # So, we're going to use the older Paginator class and manually provide a count.
     # This is a 100x speedup on my box.
-    count = Article.count(:conditions => ['published = ? AND contents.published_at < ? AND blog_id = ?',
-      true, Time.now, this_blog.id])
-    @pages = Paginator.new self, count, this_blog.limit_article_display, @params[:page]
-    @articles = Article.find( :all,
-      :offset => @pages.current.offset,
-      :limit => @pages.items_per_page,
-      :order => "contents.published_at DESC",
-      :include => [:categories, :tags, :user, :blog],
-      :conditions =>
-         ['published = ? AND contents.published_at < ? AND blog_id = ?',
-          true, Time.now, this_blog.id]
-    )
+    now = Time.now
+    count = this_blog.articles.count(:conditions => ['published = ? AND contents.published_at < ?',
+                                                     true, now])
+    @pages = Paginator.new self, count, this_blog.limit_article_display, params[:page]
+    @articles = this_blog.published_articles.find( :all,
+                                                   :offset => @pages.current.offset,
+                                                   :limit => @pages.items_per_page,
+                                                   :conditions => ['contents.published_at < ?', now] )
   end
 
   def search
@@ -87,7 +83,7 @@ class ArticlesController < ContentController
 
   # Receive comments to articles
   def comment
-    unless @request.xhr? || this_blog.sp_allow_non_ajax_comments
+    unless request.xhr? || this_blog.sp_allow_non_ajax_comments
       render_error("non-ajax commenting is disabled")
       return
     end
@@ -100,7 +96,7 @@ class ArticlesController < ContentController
                                 :user => session[:user],
                                 :user_agent => request.env['HTTP_USER_AGENT'],
                                 :referrer => request.env['HTTP_REFERER'],
-                                :permalink => this_blog.article_url(@article, false)})
+                                :permalink => @article.permalink_url})
         @comment = @article.comments.build(params[:comment])
         @comment.author ||= 'Anonymous'
         @comment.save!
@@ -199,7 +195,7 @@ class ArticlesController < ContentController
   end
 
   def set_headers
-    @headers["Content-Type"] = "text/html; charset=utf-8"
+    headers["Content-Type"] = "text/html; charset=utf-8"
   end
 
   def list_groupings(klass)
@@ -211,7 +207,7 @@ class ArticlesController < ContentController
   def render_grouping(klass)
     return list_groupings(klass) unless params[:id]
 
-    @page_title = "#{this_blog.blog_name} - #{klass.to_s.underscore} #{params[:id]}"
+    @page_title = "#{klass.to_s.underscore} #{params[:id]}"
     @articles = klass.find_by_permalink(params[:id]).articles.find_already_published rescue []
     auto_discovery_feed :type => klass.to_s.underscore, :id => params[:id]
     render_paginated_index("Can't find posts with #{klass.to_prefix} '#{h(params[:id])}'")
@@ -220,7 +216,7 @@ class ArticlesController < ContentController
   def render_paginated_index(on_empty = "No posts found...")
     return error(on_empty) if @articles.empty?
 
-    @pages = Paginator.new self, @articles.size, this_blog.limit_article_display, @params[:page]
+    @pages = Paginator.new self, @articles.size, this_blog.limit_article_display, params[:page]
     start = @pages.current.offset
     stop  = (@pages.current.next.offset - 1) rescue @articles.size
     # Why won't this work? @articles.slice!(start..stop)

data/app/controllers/content_controller.rb

@@ -19,7 +19,7 @@ class ContentController < ApplicationController
   end
 
   include LoginSystem
-  model :user
+#  model :user
   helper :theme
   before_filter :auto_discovery_defaults
 
@@ -48,15 +48,15 @@ class ContentController < ApplicationController
 
   def auto_discovery_defaults
     @auto_discovery_url_rss =
-        @request.instance_variable_get(:@auto_discovery_url_rss)
+      request.instance_variable_get(:@auto_discovery_url_rss)
     @auto_discovery_url_atom =
-         @request.instance_variable_get(:@auto_discovery_url_atom)
+         request.instance_variable_get(:@auto_discovery_url_atom)
     unless @auto_discovery_url_rss && @auto_discovery_url_atom
       auto_discovery_feed(:type => 'feed')
-      @request.instance_variable_set(:@auto_discovery_url_rss,
-                                      @auto_discovery_url_rss)
-      @request.instance_variable_set(:@auto_discovery_url_atom,
-                                      @auto_discovery_url_atom)
+      request.instance_variable_set(:@auto_discovery_url_rss,
+                                    @auto_discovery_url_rss)
+      request.instance_variable_set(:@auto_discovery_url_atom,
+                                    @auto_discovery_url_atom)
     end
   end
 

data/app/controllers/live_controller.rb

@@ -4,7 +4,7 @@ class LiveController < ContentController
   def search
     @search = params[:q]
     @articles = Article.search(@search)
-    @headers["Content-Type"] = "text/html; charset=utf-8"
+    headers["Content-Type"] = "text/html; charset=utf-8"
   end
 
 end

data/app/controllers/redirect_controller.rb

@@ -1,4 +1,6 @@
 class RedirectController < ContentController
+  session :off
+
   def redirect
     r = Redirect.find_by_from_path(params[:from])
 

data/app/controllers/textfilter_controller.rb

@@ -17,6 +17,3 @@ class TextfilterController < ApplicationController
   end
 end
 
-Dir["#{RAILS_ROOT}/components/plugins/textfilters/[_a-z]*.rb"].each do |f|
-  require_dependency f
-end

data/app/controllers/theme_controller.rb

@@ -3,11 +3,11 @@ class ThemeController < ContentController
   session :off
 
   def stylesheets
-    render_theme_item(:stylesheets, params[:filename], 'text/css')
+    render_theme_item(:stylesheets, params[:filename], 'text/css; charset=utf-8')
   end
 
   def javascript
-    render_theme_item(:javascript, params[:filename], 'text/javascript')
+    render_theme_item(:javascript, params[:filename], 'text/javascript; charset=utf-8')
   end
 
   def images
@@ -23,9 +23,14 @@ class ThemeController < ContentController
 
   private
 
-  def render_theme_item(type, file, mime = mime_for(file))
-    render :text => "Not Found", :status => 404 and return if file.split(%r{[\\/]}).include?("..")
-    send_file this_blog.current_theme_path + "/#{type}/#{file}", :type => mime, :disposition => 'inline', :stream => false
+  def render_theme_item(type, file, mime = nil)
+    mime ||= mime_for(file)
+    if file.split(%r{[\\/]}).include?("..")
+      render :text => "Not Found", :status => 404
+      return
+    end
+    send_file(this_blog.current_theme.path + "/#{type}/#{file}",
+              :type => mime, :disposition => 'inline', :stream => false)
   end
 
   def mime_for(filename)

data/app/controllers/xml_controller.rb

@@ -14,14 +14,15 @@ class XmlController < ContentController
   def feed
     @items = Array.new
     @format = params[:format]
+    @blog = this_blog
 
     if @format == 'atom03'
-      @headers["Status"] = "301 Moved Permanently"
+      headers["Status"] = "301 Moved Permanently"
       return redirect_to(:format=>'atom')
     end
 
     @feed_title = this_blog.blog_name
-    @link = url_for({:controller => "articles"},{:only_path => false})
+    @link = this_blog.base_url
 
     @format = NORMALIZED_FORMAT_FOR[@format]
 
@@ -30,7 +31,7 @@ class XmlController < ContentController
       return
     end
 
-    @headers["Content-Type"] = "#{CONTENT_TYPE_FOR[@format]}; charset=utf-8"
+    headers["Content-Type"] = "#{CONTENT_TYPE_FOR[@format]}; charset=utf-8"
 
     if respond_to?("prep_#{params[:type]}")
       self.send("prep_#{params[:type]}")
@@ -92,23 +93,21 @@ class XmlController < ContentController
     fetch_items(article.comments, 'published_at DESC', 25)
     @items.unshift(article)
     @feed_title << ": #{article.title}"
-    @link = article_url(article, false)
+    @link = article.permalink_url
   end
 
   def prep_category
     category = Category.find_by_permalink(params[:id])
     fetch_items(category.articles)
     @feed_title << ": Category #{category.name}"
-    @link = url_for({:controller => "articles", :action => "category", :id => category.permalink},
-                    {:only_path => false})
+    @link = category.permalink_url
   end
 
   def prep_tag
     tag = Tag.find_by_name(params[:id])
     fetch_items(tag.articles)
     @feed_title << ": Tag #{tag.display_name}"
-    @link = url_for({:controller => "articles", :action => 'tag', :tag => tag.name},
-                    {:only_path => false})
+    @link = tag.permalink_url
   end
 
   def prep_sitemap
@@ -117,5 +116,4 @@ class XmlController < ContentController
     @items += Category.find_all_with_article_counters(1000)
     @items += Tag.find_all_with_article_counters(1000)
   end
-
 end