minor update

Author: robbin

TODO

@@ -1,4 +1,4 @@
-* file upload bug
+* file upload enhancement
 * EpicEditor
 * ajax tag suggestion
 * model validation

app/controllers/admin.rb

@@ -12,7 +12,7 @@
 
   get :new_blog, :map => '/admin/blog/new' do
     @blog = Blog.new
-    @attachments = current_account.attachments.where(:blog_id => nil)
+    @attachments = current_account.attachments.orphan
     render 'admin/new_blog'
   end
 
@@ -21,7 +21,6 @@
     @blog.account = current_account
     if @blog.save
       @blog.attach!(current_account)
-      flash[:notice] = "创建成功"
       ping_search_engine(@blog) if APP_CONFIG['blog_search_ping'] # only ping search engine in production environment
       redirect url(:blog, :show, :id => @blog.id)
     else
@@ -39,7 +38,6 @@
     @blog = Blog.find params[:id].to_i
     if @blog.update_blog(params[:blog])
       @blog.attach!(current_account)
-      flash[:notice] = '更新成功'
       redirect url(:blog, :show, :id => @blog.id)
     else
       render 'admin/edit_blog'
@@ -49,7 +47,6 @@
   delete :blog, :map => '/admin/blog/:id' do
     @blog = Blog.find params[:id].to_i
     @blog.destroy
-    flash[:notice] = "删除成功"
     redirect url(:blog, :index)
   end
 

app/controllers/home.rb

@@ -20,12 +20,11 @@
   end
 
   get :search do
-    
     render 'home/search'
   end
 
   get :rss do
-    content_type :xml
+    content_type :rss
     @blogs = Blog.order('id DESC').limit(10)
     APP_CACHE.fetch("#{CACHE_PREFIX}/rss/all") { render 'home/rss' }
   end

app/views/admin/_attachment.erb

@@ -1,5 +1,5 @@
 <div id="attachment_<%= attachment.id %>">
   <%= attachment.file.url %>
   <%= link_to '删除', url(:admin, :attachment, :id => attachment.id), :method => :delete, :remote => true, :confirm => '是否删除附件' %>
-  <a href="#" onclick="$('#blog_content').insertAtCaret('\n![](<%= attachment.file.url %>)\n');return false;">插入</a>
+  <a href="#" onclick="window.parent.$('#blog_content').insertAtCaret('\n![](<%= attachment.file.url %>)\n');return false;">插入</a>
 </div>

app/views/admin/_form.erb

@@ -12,7 +12,7 @@
     <td>
       <%= form.text_field :tag_list, :placeholder => '用逗号分开，不超过5个' %>
       <div class="tag">
-        <% Blog.tag_counts.each do |tag| %>
+        <% Blog.cached_tag_cloud.each do |tag| %>
         <a href="#" class="tag" rel="tag"><span><%= tag %></span></a>
         <% end %>
       </div>

config/app_config.example.yml

@@ -3,10 +3,13 @@ development: &default
   site_url: 'http://localhost:3000'
   site_title: 'robbin的自言自语'
   site_description: '范凯个人网站，记录一些个人博客文章和学习笔记'
+  blog_search_ping: false
+  google_cse: '009432631322478558153:qih9evvtgy0'
 
 test: 
   <<: *default
 
 production:
   <<: *default
   site_url: 'http://robbinfan.com'
+  blog_search_ping: true

models/attachment.rb

@@ -4,4 +4,5 @@ class Attachment < ActiveRecord::Base
 
   belongs_to :account
   belongs_to :blog
+  scope :orphan, where(:blog_id => nil)
 end

models/blog.rb

@@ -37,7 +37,7 @@ def update_blog(param_hash)
 
   def attach!(owner)
     self.transaction do
-      owner.attachments.where(:blog_id => nil).each {|attachment| attachment.update_attribute(:blog_id, self.id) }
+      owner.attachments.orphan.each {|attachment| attachment.update_attribute(:blog_id, self.id) }
     end
   end
 
@@ -63,10 +63,8 @@ def content_cache_key
     "#{CACHE_PREFIX}/blog_content/#{self.id}/#{content_updated_at.to_i}"
   end
 
-  def md_content(mode = :gfm)
-    APP_CACHE.fetch(content_cache_key) do
-      GitHub::Markdown.to_html(content, mode)
-    end
+  def md_content(mode = :gfm)  # cached markdown format blog content
+    APP_CACHE.fetch(content_cache_key) { GitHub::Markdown.to_html(content, mode) }
   end
 
   def self.cached_tag_cloud