Merge branch 'cache_test'

Gemfile

@@ -15,6 +15,9 @@ gem 'jquery-ui-rails'
 
 gem 'kaminari', :git => 'git://github.com/amatsuda/kaminari.git'
 
+gem "memcached", "~> 1.4.3"
+gem "memcache-client"
+
 gem 'mini_magick'
 gem 'mongoid'
 gem 'mongoid-tree', :require => 'mongoid/tree'

Gemfile.lock

@@ -115,6 +115,8 @@ GEM
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
+    memcache-client (1.8.5)
+    memcached (1.4.3)
     mime-types (1.17.2)
     mini_magick (3.4)
       subexec (~> 0.2.1)
@@ -308,6 +310,8 @@ DEPENDENCIES
   jquery-rails
   jquery-ui-rails
   kaminari!
+  memcache-client
+  memcached (~> 1.4.3)
   mini_magick
   mongo_session_store-rails3
   mongoid

app/controllers/admin/module_apps_new_interface_controller.rb

@@ -6,7 +6,7 @@ class Admin::ModuleAppsNewInterfaceController < OrbitBackendController
   layout "new_admin"
   
   def setting
-    @sys_users = User.all(conditions: {admin: false}).includes(:avatar)
+    @sys_users =  User.all(conditions: {admin: false}).includes(:avatar)
     @module_app = ModuleApp.find(params[:module_app_id])
     @options_from_collection_for_select_bulletin_categorys = [@module_app].collect{|ma| [ma.title,ma.id] }
     # if params.has_key? :category

app/controllers/admin/page_parts_controller.rb

@@ -48,6 +48,12 @@ class Admin::PagePartsController < ApplicationController
     if @part.update_attributes(params[:page_part])
       set_children_sub_menu(@part) if @part.public_r_tag && @part.public_r_tag.eql?('sub_menu')
       flash.now[:notice] = t('admin.update_success_content')
+
+      if @part.page.name == 'home'
+        expire_page '/'
+      else
+        expire_page page_path(@part.page.name)
+      end
       respond_to do |format|
         format.html { 
           redirect_to admin_page_url( @part.page )

app/controllers/pages_controller.rb

@@ -3,9 +3,10 @@ class PagesController < ApplicationController
   include ApplicationHelper
 
   before_filter :get_item, :only => [:index_from_link, :show_from_link]
-  
+  caches_page :index
   def index
     @item = Page.find_by_name('home')
+
     if @item
       impressionist(@item)
       render_page

app/models/i18n_variable.rb

@@ -3,10 +3,13 @@ class I18nVariable
   include Mongoid::Document
   include Mongoid::Timestamps
  
-  field :key
+  field :key, :index => true
-  field :document_class, :type => String
+  field :document_class, :type => String, :index => true
   field :parent_id, :type => BSON::ObjectId, :index => true
   
+  
+
+
   belongs_to :language_value, polymorphic: true
   
   def method_missing(*field)

app/views/layouts/_users_checkbox_ary.html.erb

@@ -1,3 +1,3 @@
 <%= content_tag :div ,:id => "users_checkbox_ary",:class => 'clear' do %>
-  <%= render :partial => "shared/privilege_user",:collection =>@sys_users,:as=>:user  ,:locals =>{ :chosen_users=> @users_array }  %>
+    <%= render :partial => "shared/privilege_user",:collection =>@sys_users,:as=>:user  ,:locals =>{ :chosen_users=> @users_array }  %>
 <%end -%>

config/environments/development.rb

@@ -12,7 +12,7 @@ Orbit::Application.configure do
   # Show full error reports and disable caching
   config.consider_all_requests_local       = false
   #config.action_view.debug_rjs             = true
-  config.action_controller.perform_caching = false
+  config.action_controller.perform_caching = true
 
   # Don't care if the mailer can't send
   config.action_mailer.raise_delivery_errors = false
@@ -23,6 +23,8 @@ Orbit::Application.configure do
   # Only use best-standards-support built into browsers
   config.action_dispatch.best_standards_support = :builtin  
 
+  config.cache_store = :mem_cache_store
+
 
   config.assets.debug = true
 

lib/tasks/mid_site_sync.rake

@@ -78,7 +78,8 @@ namespace :mid_site do
       
       local_user.save!
     end   
-
+    sys_users = User.all(conditions: {admin: false}).includes(:avatar).to_a
+    Rails.cache.write('user_setting', sys_users)
   end
   
 

vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb

@@ -144,6 +144,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
 
 		respond_to do |format|
 		  if @bulletin.save
+                  
 			format.html { redirect_to(panel_announcement_back_end_bulletins_url, :notice => t('bulletin.create_bulletin_success')) }
 			format.xml  { render :xml => @bulletin, :status => :created, :location => @bulletin }
 			format.js
@@ -223,6 +224,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
   		@link_url = panel_announcement_back_end_bulletin_path(@bulletin_link)
 
   		respond_to do |format|
+            
   		  if @bulletin_link.update_attributes(params[:bulletin_link])
   			# format.html { redirect_to(panel_announcement_back_end_bulletins_url) }
   			format.js { render 'update_bulletin_link' }
@@ -236,6 +238,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
   		@file_url = panel_announcement_back_end_bulletin_path(@bulletin_file)
 
   		respond_to do |format|
+            
   		  if @bulletin_file.update_attributes(params[:bulletin_file])
   			# format.html { redirect_to(panel_announcement_back_end_bulletins_url) }
   			format.js { render 'update_bulletin_file' }
@@ -257,6 +260,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
 
             delete_out_invalid_date_from_params
   		respond_to do |format|
+            
   		  if @bulletin.update_attributes(params[:bulletin])
                 # if (params[:bulletin][:is_checked] == "false")
                 #   @bulletin.is_rejected = true
@@ -290,6 +294,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
     @bulletin.destroy
 
     respond_to do |format|
+     
       format.html { redirect_to(panel_announcement_back_end_bulletins_url) }
       # format.xml  { head :ok }
       format.js

vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb

@@ -1,5 +1,4 @@
 class Panel::Announcement::Widget::BulletinsController < OrbitWidgetController
-
   def initialize
     super
     @app_title = 'announcement'

vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletin_categorys_controller.rb

@@ -114,6 +114,7 @@ class Panel::News::BackEnd::NewsBulletinCategorysController < OrbitBackendContro
     @news_bulletin_category.disable = @news_bulletin_category.disable ? false : true
 
     if @news_bulletin_category.save! 
+      expire_page(:controller=>'panel/news/widget/news_bulletins' , :action=>'home_banner')
       respond_to do |format|
         flash[:notice] = t("bulletin_category.update_success")
         # flash[:error] +=  @bulletin_category.disable ?  t("bulletin_category.disable_change_to_true") : t("bulletin_category.disable_change_to_false")

vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletins_controller.rb

@@ -134,6 +134,7 @@ class Panel::News::BackEnd::NewsBulletinsController < OrbitBackendController
 
 		respond_to do |format|
 		  if @news_bulletin_file.save
+                  expire_page(:controller=>'panel/news/widget/news_bulletins' , :action=>'home_banner')
 			format.js { render 'create_news_bulletin_file' }
 		  end
 		end
@@ -148,6 +149,7 @@ class Panel::News::BackEnd::NewsBulletinsController < OrbitBackendController
 
 		respond_to do |format|
 		  if @news_bulletin.save
+                  expire_page(:controller=>'panel/news/widget/news_bulletins' , :action=>'home_banner')
 			format.html { redirect_to(panel_news_back_end_news_bulletins_url, :notice => t('news_bulletin.create_news_bulletin_success')) }
 			format.xml  { render :xml => @news_bulletin, :status => :created, :location => @news_bulletin }
 			format.js
@@ -228,6 +230,7 @@ class Panel::News::BackEnd::NewsBulletinsController < OrbitBackendController
 
   		respond_to do |format|
   		  if @news_bulletin_link.update_attributes(params[:news_bulletin_link])
+                  expire_page(:controller=>'panel/news/widget/news_bulletins' , :action=>'home_banner')
   			# format.html { redirect_to(panel_news_back_end_news_bulletins_url) }
   			format.js { render 'update_news_bulletin_link' }
   		  end
@@ -241,6 +244,7 @@ class Panel::News::BackEnd::NewsBulletinsController < OrbitBackendController
 
   		respond_to do |format|
   		  if @news_bulletin_file.update_attributes(params[:news_bulletin_file])
+                  expire_page(:controller=>'panel/news/widget/news_bulletins' , :action=>'home_banner')
   			# format.html { redirect_to(panel_news_back_end_news_bulletins_url) }
   			format.js { render 'update_news_bulletin_file' }
   		  end
@@ -262,6 +266,7 @@ class Panel::News::BackEnd::NewsBulletinsController < OrbitBackendController
 
   		respond_to do |format|
   		  if @news_bulletin.update_attributes(params[:news_bulletin])
+                  expire_page(:controller=>'panel/news/widget/news_bulletins' , :action=>'home_banner')
   			# format.html { redirect_to(panel_news_back_end_news_bulletin_url(@news_bulletin), :notice => t('news_bulletin.update_news_bulletin_success')) }
   			format.html { redirect_to(panel_news_back_end_news_bulletins_url, :notice => t('news_bulletin.update_success')) }
   			format.js  { render 'toggle_enable' }
@@ -286,6 +291,7 @@ class Panel::News::BackEnd::NewsBulletinsController < OrbitBackendController
     @news_bulletin.destroy
 
     respond_to do |format|
+      expire_page(:controller=>'panel/news/widget/news_bulletins' , :action=>'home_banner')
       format.html { redirect_to(panel_news_back_end_news_bulletins_url) }
       # format.xml  { head :ok }
       format.js

vendor/built_in_modules/news/app/controllers/panel/news/widget/news_bulletins_controller.rb

@@ -1,4 +1,5 @@
 class Panel::News::Widget::NewsBulletinsController < OrbitWidgetController
+caches_page :home_banner
 
   def initialize
     super