From 48cb0e0450334f23d629e59b1ba0c54d639e19a6 Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Sat, 31 Jan 2015 15:04:48 +0800
Subject: [PATCH 01/22] email verify

---
 Gemfile               | 2 +-
 Gemfile.lock          | 9 +++++++++
 app/models/user.rb    | 2 +-
 config/application.rb | 6 +++---
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 037c606c8..f59c92077 100644
--- a/Gemfile
+++ b/Gemfile
@@ -20,7 +20,7 @@ gem "builder", "3.0.0"
 gem 'acts-as-taggable-on', '2.4.1'
 gem 'spreadsheet'
 gem 'ruby-ole'
-#gem 'email_verifier', path: 'lib/email_verifier'
+gem 'email_verifier', path: 'lib/email_verifier'
 
 group :development do
   gem 'grape-swagger'
diff --git a/Gemfile.lock b/Gemfile.lock
index 355ca422d..8c5816e13 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -12,6 +12,13 @@ PATH
       coderay (>= 1.0.0)
       erubis (>= 2.6.6)
 
+PATH
+  remote: lib/email_verifier
+  specs:
+    email_verifier (0.0.7)
+      dnsruby (>= 1.5)
+      rails (>= 3.0.0)
+
 PATH
   remote: lib/rack-mini-profiler
   specs:
@@ -91,6 +98,7 @@ GEM
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
+    dnsruby (1.57.0)
     equalizer (0.0.9)
     erubis (2.7.0)
     execjs (2.2.1)
@@ -315,6 +323,7 @@ DEPENDENCIES
   capybara (~> 2.4.1)
   coderay (~> 1.0.6)
   coffee-rails (~> 3.2.1)
+  email_verifier!
   factory_girl (~> 4.4.0)
   faker
   fastercsv (~> 1.5.0)
diff --git a/app/models/user.rb b/app/models/user.rb
index 06f59c764..bef65fe54 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -188,7 +188,7 @@ class User < Principal
   validates_confirmation_of :password, :allow_nil => true
   validates_inclusion_of :mail_notification, :in => MAIL_NOTIFICATION_OPTIONS.collect(&:first), :allow_blank => true
   validate :validate_password_length
-  #validates_email_realness_of :mail
+  validates_email_realness_of :mail
   before_create :set_mail_notification
   before_save   :update_hashed_password
   before_destroy :remove_references_before_destroy
diff --git a/config/application.rb b/config/application.rb
index c7f2f3ea5..647675784 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -17,9 +17,9 @@ module RedmineApp
     # -- all .rb files in that directory are automatically loaded.
 
     #verifier if email is real
-    # EmailVerifier.config do |config|
-    #   config.verifier_email = "lizanle521@126.com"
-    # end
+    EmailVerifier.config do |config|
+      config.verifier_email = "alanlong9278@126.com"
+    end
 
     config.generators do |g|
          g.test_framework :rspec,

From d61199f66b4182d0b7c8f476cab5270408ee210d Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Sat, 31 Jan 2015 16:43:10 +0800
Subject: [PATCH 02/22] merge szzh

---
 Gemfile.lock       | 4 ----
 lib/email_verifier | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 8c5816e13..b26f17113 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -170,8 +170,6 @@ GEM
       metaclass (~> 0.0.1)
     multi_json (1.10.1)
     multi_xml (0.5.5)
-    mysql2 (0.3.11)
-    mysql2 (0.3.11-x86-mingw32)
     nenv (0.2.0)
     net-ldap (0.3.1)
     nokogiri (1.6.3)
@@ -316,7 +314,6 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord-jdbc-adapter (= 1.2.5)
-  activerecord-jdbcmysql-adapter
   acts-as-taggable-on (= 2.4.1)
   better_errors!
   builder (= 3.0.0)
@@ -337,7 +334,6 @@ DEPENDENCIES
   jquery-rails (~> 2.0.2)
   kaminari
   mocha (~> 1.1.0)
-  mysql2 (= 0.3.11)
   net-ldap (~> 0.3.1)
   nokogiri (~> 1.6.3)
   paperclip (~> 3.5.4)
diff --git a/lib/email_verifier b/lib/email_verifier
index 3cabcc643..222a9bdd7 160000
--- a/lib/email_verifier
+++ b/lib/email_verifier
@@ -1 +1 @@
-Subproject commit 3cabcc643f36939939685e6f55273dfbf89da545
+Subproject commit 222a9bdd72014f197baf2131ab71cc41660111ed

From 7391f3b5cffac583ffdd43ce94ef7d1eb23cbc12 Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Mon, 2 Feb 2015 09:52:05 +0800
Subject: [PATCH 03/22] Merge branch 'szzh' of
 http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh

Conflicts:
	config/locales/zh.yml

Signed-off-by: alan <547533434@qq.com>
---
 config/database.yml.example | 52 -------------------------------------
 1 file changed, 52 deletions(-)
 delete mode 100644 config/database.yml.example

diff --git a/config/database.yml.example b/config/database.yml.example
deleted file mode 100644
index 2ff6231d4..000000000
--- a/config/database.yml.example
+++ /dev/null
@@ -1,52 +0,0 @@
-# Default setup is given for MySQL with ruby1.9. If you're running Redmine
-# with MySQL and ruby1.8, replace the adapter name with `mysql`.
-# Examples for PostgreSQL, SQLite3 and SQL Server can be found at the end.
-# Line indentation must be 2 spaces (no tabs).
-
-production:
-  adapter: mysql2
-  database: redmine
-  host: localhost
-  username: root
-  password: ""
-  encoding: utf8
-
-development:
-  adapter: mysql2
-  database: redmine_development
-  host: 10.107.17.20
-  username: root
-  password: "1234"
-  encoding: utf8
-
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
-test:
-  adapter: mysql2
-  database: redmine_test
-  host: 10.107.17.20
-  username: root
-  password: "1234"
-  encoding: utf8
-
-# PostgreSQL configuration example
-#production:
-#  adapter: postgresql
-#  database: redmine
-#  host: localhost
-#  username: postgres
-#  password: "postgres"
-
-# SQLite3 configuration example
-#production:
-#  adapter: sqlite3
-#  database: db/redmine.sqlite3
-
-# SQL Server configuration example
-#production:
-#  adapter: sqlserver
-#  database: redmine
-#  host: localhost
-#  username: jenkins
-#  password: jenkins

From aa2590d4519d3924dea381da112b266f166e7403 Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Tue, 3 Feb 2015 10:16:46 +0800
Subject: [PATCH 04/22] Signed-off-by: alan <547533434@qq.com>

---
 app/models/forum.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/forum.rb b/app/models/forum.rb
index e47d18b02..f5581b232 100644
--- a/app/models/forum.rb
+++ b/app/models/forum.rb
@@ -5,7 +5,7 @@ class Forum < ActiveRecord::Base
   has_many :memos, :dependent => :destroy, conditions: "parent_id IS NULL"
   belongs_to :creator, :class_name => "User", :foreign_key => 'creator_id'
 
-  after_create :expire_forum_cache
+  after_create :expire_forum_cache, :send_email
   after_update :expire_forum_cache
   before_destroy :expire_forum_cache
   safe_attributes 'name',
@@ -23,7 +23,7 @@ class Forum < ActiveRecord::Base
   
   acts_as_taggable
   scope :by_join_date, order("created_at DESC")
-  after_create :send_email
+  #after_create :send_email
   def reset_counters!
     self.class.reset_counters!(id)
   end

From 6f9e2bad63584cdf8301bc32e507aea330632c9f Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Fri, 6 Feb 2015 18:15:08 +0800
Subject: [PATCH 05/22] mail weekly

---
 Gemfile                                       |   2 +-
 Gemfile.lock                                  |   3 +
 app/controllers/courses_controller.rb         |   1 +
 app/controllers/messages_controller.rb        |   1 +
 app/controllers/news_controller.rb            |   1 +
 app/controllers/projects_controller.rb        |   2 +-
 app/models/journals_for_message.rb            |   4 +-
 app/models/mailer.rb                          |  75 +++-
 app/models/user.rb                            |   4 +-
 .../mailer/send_for_user_activities.html.erb  | 337 ++++++++++++++++++
 .../mailer/send_for_user_activities.text.erb  | 253 +++++++++++++
 config/initializers/send_mail.rb              |  23 ++
 config/locales/zh.yml                         |  20 +-
 13 files changed, 718 insertions(+), 8 deletions(-)
 create mode 100644 app/views/mailer/send_for_user_activities.html.erb
 create mode 100644 app/views/mailer/send_for_user_activities.text.erb
 create mode 100644 config/initializers/send_mail.rb

diff --git a/Gemfile b/Gemfile
index 037c606c8..1bc9e6629 100644
--- a/Gemfile
+++ b/Gemfile
@@ -21,7 +21,7 @@ gem 'acts-as-taggable-on', '2.4.1'
 gem 'spreadsheet'
 gem 'ruby-ole'
 #gem 'email_verifier', path: 'lib/email_verifier'
-
+gem 'rufus-scheduler'
 group :development do
   gem 'grape-swagger'
   gem 'grape-swagger-ui', git: 'https://github.com/guange2015/grape-swagger-ui.git'
diff --git a/Gemfile.lock b/Gemfile.lock
index 355ca422d..861c49754 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -252,6 +252,8 @@ GEM
     ruby-ole (1.2.11.7)
     ruby-openid (2.1.8)
     rubyzip (1.1.6)
+    rufus-scheduler (3.0.8)
+      tzinfo
     sass (3.3.10)
     sass-rails (3.2.6)
       railties (~> 3.2.0)
@@ -339,6 +341,7 @@ DEPENDENCIES
   rspec-rails (= 2.13.1)
   ruby-ole
   ruby-openid (~> 2.1.4)
+  rufus-scheduler
   sass-rails (~> 3.2.3)
   seems_rateable!
   selenium-webdriver (~> 2.42.0)
diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 61944ca2c..a55abd123 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -5,6 +5,7 @@ class CoursesController < ApplicationController
   helper :members
   helper :words
 
+  before_filter :authorize1, :only => [:show, :feedback]
   menu_item :overview
   menu_item :feedback, :only => :feedback
   menu_item :homework, :only => :homework
diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index 8d6943f02..d2a253c2a 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -17,6 +17,7 @@
 
 class MessagesController < ApplicationController
   include ApplicationHelper
+  before_filter :authorize1, :only => [:show]
   menu_item :boards
   default_search_scope :messages
   before_filter :find_board, :only => [:new, :preview,:edit]
diff --git a/app/controllers/news_controller.rb b/app/controllers/news_controller.rb
index 2df17d73f..b44e8a348 100644
--- a/app/controllers/news_controller.rb
+++ b/app/controllers/news_controller.rb
@@ -17,6 +17,7 @@
 
 class NewsController < ApplicationController
   layout 'base_projects'# by young
+  before_filter :authorize1, :only => [:show]
   default_search_scope :news
   model_object News
   before_filter :find_model_object, :except => [:new, :create, :index]
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 02bfc9e19..5054fd5c1 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -19,7 +19,7 @@
 # Description 封装代码,简化代码，格式化代码，
 class ProjectsController < ApplicationController
   layout :select_project_layout
-
+  before_filter :authorize1, :only => [:show]
   menu_item :overview, :only => :show
   menu_item :roadmap, :only => :roadmap
   menu_item :settings, :only => :settings
diff --git a/app/models/journals_for_message.rb b/app/models/journals_for_message.rb
index c71fbaf47..39618e43b 100644
--- a/app/models/journals_for_message.rb
+++ b/app/models/journals_for_message.rb
@@ -22,8 +22,8 @@ class JournalsForMessage < ActiveRecord::Base
              :foreign_key => 'jour_id',
              :conditions => "#{self.table_name}.jour_type = 'Project' "
   belongs_to :course,
-             :foreign_key => 'jour_id',
-             :conditions => "#{self.table_name}.jour_type = 'Course' "
+             :foreign_key => 'jour_id'
+
 
   belongs_to :jour, :polymorphic => true
   belongs_to :user
diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index 2cae982a7..85ce46e8b 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -27,6 +27,80 @@ class Mailer < ActionMailer::Base
     { :host => Setting.host_name, :protocol => Setting.protocol }
   end
 
+  # author: alan
+  # 根据用户选择发送个人日报或周报
+  # 发送内容： 项目【缺陷，讨论区，新闻】，课程【通知，留言，新闻】， 贴吧， 个人留言
+  def send_for_user_activities(user, date_to, days)
+    date_from = date_to - days.days
+
+    # 生成token用于直接点击登录
+    token = Token.new(:user =>user , :action => 'autologin')
+    token.save
+    @token = token
+
+    @user_url = url_for(my_account_url(user,:token => @token.value))
+    # 查询user参加的项目及课程
+    projects = user.projects
+    courses = user.courses
+    project_ids = projects.map{|project| project.id}.join(",")
+    course_ids = courses.map {|course| course.id}.join(",")
+
+    # 查询user的缺陷，包括发布的，跟踪的以及被指派的缺陷
+    @issues = Issue.find_by_sql("select DISTINCT i.* from issues i, watchers w
+                        where (i.assigned_to_id = #{user.id} or i.author_id = #{user.id}
+                                or (w.watchable_type = 'Issue' and w.watchable_id = i.id and w.user_id = #{user.id}))
+                            and (i.created_on between #{date_from} and #{date_to}) order by i.created_on desc")
+
+    # 查询课程作业，包括老师发布的作业，以及user提交作业
+    @bids ||= []  # 老师发布的作业
+    courses.each do |course|
+      @bids << course.homeworks.where("created_at between #{date_from} and #{date_to} order by i.created_on desc")
+    end
+    # user 提交的作业
+    @homeworks = HomeworkAttach.where("user_id=#{user.id} and (created_at between #{date_from} and #{date_to})")
+
+    # 查询user在课程。项目中发布的讨论帖子
+    messages = Message.find_by_sql("select DISTINCT * from messages where author_id = #{user.id} and (created_on between #{date_from} and #{date_to}) order by i.created_on desc")
+    @course_messages ||= []
+    @project_messages ||= []
+    messages.each do |msg|
+      if msg.project
+        @project_messages << msg
+      elsif msg.course
+        @course_messages << msg
+      end
+    end
+
+    #  查询user在课程中发布的通知，项目中发的新闻
+    @course_news = News.find_by_sql("select DISTINCT n.*  from news n
+                                                where n.course_id in (#{course_ids})
+                                                    and (created_on between #{date_from} and #{date_to}) order by i.created_on desc")
+    @project_news = News.find_by_sql("select DISTINCT n.* from news n where  n.project_id in (#{project_ids})
+                                                     and (created_on between #{date_from} and #{date_to}) order by i.created_on desc")
+
+    # 查询user在课程及个人中留言
+    @course_journal_messages = JournalsForMessage.find_by_sql("select DISTINCT * from journals_for_messages where
+                                                  jour_type='Course' and user_id = #{user.id}
+                                                  and (created_on between #{date_from} and #{date_to}) order by i.created_on desc")
+    @user_journal_messages = user.journals_for_messages.where("m_parent_id IS NULL and (created_on between #{date_from} and #{date_to})").order('created_on DESC')
+
+    # 查询课程课件更新
+    @attachments ||= []
+    courses.each do |course|
+      @attachments << course.attachments.where("created_on between #{date_from} and #{date_to}").order('created_at DESC')
+    end
+    # 查询user新建贴吧或发布帖子
+    @forums = Forum.find_by_sql("select  DISTINCT * from forums where creator_id = #{user.id} and (created_at between #{date_from} and #{date_to}) order by i.created_on desc")
+    @memos = Memo.find_by_sql("select DISTINCT m.* from memos m, forums f where (m.author_id = #{user.id} or (m.forum_id = f.id and f.creator_id = #{user.id}))
+                           and (created_at between #{date_from} and #{date_to})  order by i.created_on desc")
+    if days == 1
+      subject = "[ #{user.show_name} : #{date_from} - #{l(:label_day_mail)}]"
+    else
+      subject = "[ #{user.show_name} :  #{l(:label_week_mail)}]"
+    end
+    mail :to => user.mail,:subject => "[ #{user.show_name} :  #{l(:notice_successful_create)}]"
+
+  end
   # 贴吧新建贴吧发送邮件
   # example Mailer.forum(forum).deliver
   def forum_add(forum)
@@ -140,7 +214,6 @@ class Mailer < ActionMailer::Base
     @author = issue.author
     @issue = issue
     user = User.find_by_mail(recipients)
-
     token = Token.new(:user =>user , :action => 'autologin')
     token.save
      @token = token
diff --git a/app/models/user.rb b/app/models/user.rb
index 06f59c764..dd06db838 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -24,7 +24,7 @@ class User < Principal
   DEVELOPER = 3
   
   include Redmine::SafeAttributes
-
+  seems_rateable_rater
   # Different ways of displaying/sorting users
   USER_FORMATS = {
     :firstname_lastname => {
@@ -149,7 +149,7 @@ class User < Principal
   scope :by_join_date, order("created_on DESC")
   #############################  added by liuping  关注
   acts_as_watchable 
-  seems_rateable_rater
+
   has_one :user_extensions,:dependent => :destroy
   ## end
 
diff --git a/app/views/mailer/send_for_user_activities.html.erb b/app/views/mailer/send_for_user_activities.html.erb
new file mode 100644
index 000000000..22b071a1f
--- /dev/null
+++ b/app/views/mailer/send_for_user_activities.html.erb
@@ -0,0 +1,337 @@
+
+  <style>
+      body{ font-size:12px; font-family:"微软雅黑","宋体"; line-height:1.9; background:#fff; font-style:normal;}
+      div,html,img,ul,li,p,body,h1,h2,h3,h4,p,a,table,tr,td,fieldset,input,span,ol{ margin:0; padding:0;}
+      ul,li{ list-style-type:none;}
+      div,img,tr,td,table{ border:0;}
+      .cl{ clear:both; overflow:hidden; }
+      a{ text-decoration:none; }
+      .fl{ float: left;}
+      .fr{ float:right;}
+
+
+      .wmail_main{ padding:20px 10px 0px;}
+      .wmail_main ul li{ clear: both;}
+      .wmail_h2{ color:#15bccf;  }
+      .wmail_h4{ color:#474646; font-size:14px; margin-bottom:5px;}
+      .wmail_num{ color:#fe3f0c; margin-left:5px; font-weight:normal;}
+      .wmail_column{ width:90px; font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
+      .wmail_b{color:#1b55a7; font-weight:bold; float:left;}
+      .wmail_name{ color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px; width:50px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
+      .wmail_info{color:#5a5a5a; float:left;  width:400px; margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
+      .wmail_date{ color:#6e6e6e; float:right;display:block; margin-left:10px;}
+      .wmail_txt{ float:left; margin-right:5px;color:#6e6e6e;}
+      .wmail_column:hover{ color:#07397f; }
+      .wmail_name:hover{ color:#d03106;}
+      .wmail_info:hover{ color:#07397f;}
+      .wmail_dis{ float:left; color:#000000; margin-right:5px;}
+      .wmail_ul{ margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:720px; margin-bottom:15px;}
+      .wmail_foot{ margin-top:20px;color:#2775d2; margin-left:10px;}
+      .wmail_foot:hover{color:#0b53a7;}
+
+  </style>
+
+
+
+<div class="content">
+  <div class="wmail_main" style="padding:20px 10px 0px;">
+    <h2 class="wmail_h2" style="color:#15bccf; "><%= l(:label_course_overview)%></h2>
+    <% unless @course_news.first.nil? %>
+    <ul class="wmail_ul" style=" list-style-type:none;clear: both;margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:720px; margin-bottom:15px;">
+
+      <h4 class="wmail_h4" style="color:#474646; font-size:14px; margin-bottom:5px;" >
+        <%= l(:label_course_news) %>
+        <span class="wmail_num" style="color:#fe3f0c; margin-left:5px; font-weight:normal;">(<%= @course_news.count %>)</span>
+      </h4>
+
+      <% @course_news.each do |course_new|%>
+          <li style="clear: both;">
+            <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
+            <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">[</span>
+
+            <%= link_to course_new.course.name, [:controller  => 'courses', :action => 'show', :id => course_new.course_id, :token => @token.value],
+                                :class=> "wmail_column",
+                                :style=> "width:90px; font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+            <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">]</span>
+
+            <%= link_to course_new.author, user_activities_url(course_new.author,:token => @token.value), :class => "wmail_name",
+                    :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px; width:50px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
+            <span class="wmail_txt" style="float:left; margin-right:5px;color:#6e6e6e;"><%= l(:label_project_notice) %></span>
+
+            <%= link_to course_new.title, [:controller => 'news', :action => 'show', :id => course_new.id,:token => @token.value],
+                        :class => 'wmail_info',
+                        :style => "color:#5a5a5a; float:left;  width:400px; margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+                %>
+            <span class="wmail_date" style="color:#6e6e6e; float:right;display:block; margin-left:10px;"><%= course_new.created_on %></span>
+          </li>
+      <% end %>
+
+      <div class="cl"></div>
+    </ul><!--课程动态 end-->
+    <% end %>
+    <% if  !@bids.first.nil?  || !@homeworks.first.nil? %>
+    <ul class="wmail_ul" style="clear: both;margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:720px; margin-bottom:15px;">
+
+      <h4 class="wmail_h4" style="color:#474646; font-size:14px; margin-bottom:5px;"><%= l(:label_homework_overview) %>><span class="wmail_num" style="color:#fe3f0c; margin-left:5px; font-weight:normal;">(<%= @bids.count %>)</span></h4>
+      <% unless @bids.first.nil?%>
+      <% @bids.each do |bid| %>
+           <li style="clear: both;">
+            <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
+            <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">[</span>
+
+            <%= link_to bid.courses.first.name, [:controller  => 'courses', :action => 'show', :id => bid.courses.first.id, :token => @token.value],
+                        :class=> "wmail_column",
+                        :style=> "width:90px; font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+            <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">]</span>
+
+            <%= link_to bid.author, user_activities_url(bid.author,:token => @token.value), :class => "wmail_name",
+                        :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px; width:50px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
+            <span class="wmail_txt" style="float:left; margin-right:5px;color:#6e6e6e;"><%= l(:label_course_homework) %></span>
+
+            <%= link_to bid.name, course_for_bid(:id => bid.id,:token => @token.value),
+                        :class => 'wmail_info',
+                        :style => "color:#5a5a5a; float:left;  width:400px; margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+            %>
+            <span class="wmail_date" style="color:#6e6e6e; float:right;display:block; margin-left:10px;"><%= bid.created_on %></span>
+          </li>
+      <% end %>
+      <% end %>
+      <% unless @homeworks.first.nil? %>
+      <% @homeworks.each do |homework| %>
+          <li style="clear: both;">
+            <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
+            <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">[</span>
+
+            <%= link_to homework.bid.courses.first.name, [:controller  => 'courses', :action => 'show', :id => homework.bid.courses.first.id, :token => @token.value],
+                        :class=> "wmail_column",
+                        :style=> "width:90px; font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+            <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">]</span>
+
+            <%= link_to homework.user, user_activities_url(homework.user,:token => @token.value), :class => "wmail_name",
+                        :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px; width:50px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
+            <span class="wmail_txt" style="float:left; margin-right:5px;color:#6e6e6e;"><%= l(:label_course_submit_homework) %></span>
+
+            <%= link_to homework.name, course_for_bid(:id => homework.bid.id,:token => @token.value),
+                        :class => 'wmail_info',
+                        :style => "color:#5a5a5a; float:left;  width:400px; margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+            %>
+            <span class="wmail_date" style="color:#6e6e6e; float:right;display:block; margin-left:10px;"><%= homework.created_on %></span>
+          </li>
+      <% end %>
+      <% end %>
+
+      <div class="cl"></div>
+    </ul><!--作业动态 end-->
+    <% end %>
+
+    <% unless @course_journal_messages.first.nil? %>
+    <ul class="wmail_ul" style="clear: both;margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:720px; margin-bottom:15px;">
+
+          <h4 class="wmail_h4" style="color:#474646; font-size:14px; margin-bottom:5px;" >
+            <%= l(:view_course_journals_for_messages) %>
+            <span class="wmail_num" style="color:#fe3f0c; margin-left:5px; font-weight:normal;">(<%= @course_journal_messages.count %>)</span>
+          </h4>
+
+          <% @course_journal_messages.each do |course_journal_message|%>
+              <li style="clear: both;">
+                <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
+                <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">[</span>
+
+                <%= link_to course_journal_message.course.name, [:controller  => 'courses', :action => 'show', :id => course_journal_message.jour_id, :token => @token.value],
+                            :class=> "wmail_column",
+                            :style=> "width:90px; font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+                <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">]</span>
+
+                <%= link_to course_journal_message.user, user_activities_url(course_journal_message.user,:token => @token.value), :class => "wmail_name",
+                            :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px; width:50px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
+                <span class="wmail_txt" style="float:left; margin-right:5px;color:#6e6e6e;"><%= l(:label_send_course_journals_for_messages) %></span>
+
+                <%= link_to course_journal_message.notes, [:controller => 'courses', :action => 'feedback', :id => course_journal_message.jour_id,:token => @token.value],
+                            :class => 'wmail_info',
+                            :style => "color:#5a5a5a; float:left;  width:400px; margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+                %>
+                <span class="wmail_date" style="color:#6e6e6e; float:right;display:block; margin-left:10px;"><%= course_journal_message.created_on %></span>
+              </li>
+          <% end %>
+
+      <div class="cl"></div>
+    </ul><!--课程留言 end-->
+    <% end %>
+
+    <% unless @course_messages.first.nil? %>
+    <ul class="wmail_ul" style="margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:720px; margin-bottom:15px;">
+
+          <h4 class="wmail_h4" style="color:#474646; font-size:14px; margin-bottom:5px;" >
+            <%= l(:view_borad_course) %>
+            <span class="wmail_num" style="color:#fe3f0c; margin-left:5px; font-weight:normal;">(<%= @course_journal_messages.count %>)</span>
+          </h4>
+
+          <% @course_messages.each do |course_message|%>
+              <li style="clear: both;">
+                <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
+                <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">[</span>
+
+                <%= link_to course_message.course.name, [:controller  => 'courses', :action => 'show', :id => course_message.course.id, :token => @token.value],
+                            :class=> "wmail_column",
+                            :style=> "width:90px; font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+                <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">]</span>
+
+                <%= link_to course_message.author, user_activities_url(course_message.author,:token => @token.value), :class => "wmail_name",
+                            :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px; width:50px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
+                <span class="wmail_txt" style="float:left; margin-right:5px;color:#6e6e6e;"><%= l(:label_send_course_messages) %></span>
+
+                <%= link_to course_message.subject,url_for(course_message.event_url(:token => @token.value)),
+                            :class => 'wmail_info',
+                            :style => "color:#5a5a5a; float:left;  width:400px; margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+                %>
+                <span class="wmail_date" style="color:#6e6e6e; float:right;display:block; margin-left:10px;"><%= course_message.created_on %></span>
+              </li>
+          <% end %>
+
+      <div class="cl"></div>
+    </ul><!--课程讨论  end-->
+    <% end %>
+
+    <% unless @attachments.first.nil? %>
+    <ul class="wmail_ul" style="margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:720px; margin-bottom:15px;">
+          <h4 class="wmail_h4" style="color:#474646; font-size:14px; margin-bottom:5px;" >
+            <%= l(:label_course_attendingcontestwork_download) %>
+            <span class="wmail_num" style="color:#fe3f0c; margin-left:5px; font-weight:normal;">(<%= @attachments.count %>)</span>
+          </h4>
+
+          <% @attachments.each do |attachment|%>
+              <li style="clear: both;">
+                <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
+                <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">[</span>
+
+                <%= link_to attachment.course.name, [:controller  => 'courses', :action => 'show', :id => attachment.course.id, :token => @token.value],
+                            :class=> "wmail_column",
+                            :style=> "width:90px; font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+                <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">]</span>
+
+                <%= link_to attachment.author, user_activities_url(attachment.author,:token => @token.value), :class => "wmail_name",
+                            :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px; width:50px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
+                <span class="wmail_txt" style="float:left; margin-right:5px;color:#6e6e6e;"><%= l(:label_course_file_upload) %></span>
+
+                <%= link_to attachment.filename,course_files_path(@course,:token => @token.value),
+                            :class => 'wmail_info',
+                            :style => "color:#5a5a5a; float:left;  width:400px; margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+                %>
+                <span class="wmail_date" style="color:#6e6e6e; float:right;display:block; margin-left:10px;"><%= course_message.created_on %></span>
+              </li>
+          <% end %>
+
+    </ul><!--课件下载  end-->
+    <% end %>
+  </div><!--课程动态  end-->
+
+
+  <div class="wmail_main" style="padding:20px 10px 0px;">
+    <h2 class="wmail_h2" style="color:#15bccf; "><%= l(:label_project_overview)%></h2>
+    <% unless @issues.first.nil? %>
+    <ul class="wmail_ul" style="margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:720px; margin-bottom:15px;">
+          <h4 class="wmail_h4" style="color:#474646; font-size:14px; margin-bottom:5px;" >
+            <%= l(:label_issue_tracking) %>
+            <span class="wmail_num" style="color:#fe3f0c; margin-left:5px; font-weight:normal;">(<%= @issues.count %>)</span>
+          </h4>
+
+          <% @issues.each do |issue|%>
+              <li style="clear: both;">
+                <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
+                <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">[</span>
+
+                <%= link_to issue.project.name, [:controller  => 'projects', :action => 'show', :id => issue.project.id, :token => @token.value],
+                            :class=> "wmail_column",
+                            :style=> "width:90px; font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+                <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">]</span>
+
+                <%= link_to issue.author, user_activities_url(issue.author,:token => @token.value), :class => "wmail_name",
+                            :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px; width:50px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
+                <span class="wmail_txt" style="float:left; margin-right:5px;color:#6e6e6e;"><%= l(:label_project_issue) %></span>
+
+                <%= link_to issue.subject,url_for(:controller  => 'issues', :action => 'show', :id => issue.id,  :token => @token.value),
+                            :class => 'wmail_info',
+                            :style => "color:#5a5a5a; float:left;  width:400px; margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+                %>
+                <span class="wmail_date" style="color:#6e6e6e; float:right;display:block; margin-left:10px;"><%= issue.created_on %></span>
+              </li>
+          <% end %>
+
+      <div class="cl"></div>
+    </ul><!--问题跟踪 end-->
+    <% end %>
+
+    <% unless @project_messages.first.nil? %>
+    <ul class="wmail_ul" style="margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:720px; margin-bottom:15px;">
+          <h4 class="wmail_h4" style="color:#474646; font-size:14px; margin-bottom:5px;" >
+            <%= l(:project_moule_boards_show) %>
+            <span class="wmail_num" style="color:#fe3f0c; margin-left:5px; font-weight:normal;">(<%= @course_journal_messages.count %>)</span>
+          </h4>
+
+          <% @project_messages.each do |project_message|%>
+              <li style="clear: both;">
+                <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
+                <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">[</span>
+
+                <%= link_to project_message.project.name, [:controller  => 'projects', :action => 'show', :id => project_message.project.id, :token => @token.value],
+                            :class=> "wmail_column",
+                            :style=> "width:90px; font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+                <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">]</span>
+
+                <%= link_to project_message.author, user_activities_url(project_message.author,:token => @token.value), :class => "wmail_name",
+                            :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px; width:50px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
+                <span class="wmail_txt" style="float:left; margin-right:5px;color:#6e6e6e;"><%= l(:label_send_course_messages) %></span>
+
+                <%= link_to project_message.subject,url_for(project_message.event_url(:token => @token.value)),
+                            :class => 'wmail_info',
+                            :style => "color:#5a5a5a; float:left;  width:400px; margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+                %>
+                <span class="wmail_date" style="color:#6e6e6e; float:right;display:block; margin-left:10px;"><%= project_message.created_on %></span>
+              </li>
+          <% end %>
+
+      <div class="cl"></div>
+    </ul><!--项目论坛 end-->
+    <% end %>
+
+
+
+  </div><!--项目动态  end-->
+
+  <div class="wmail_main" style="padding:20px 10px 0px;">
+    <h2 class="wmail_h2" style="color:#15bccf; "><%= l(:label_activities) %></h2>
+    <% unless @user_journal_messages.first.nil? %>
+    <ul class="wmail_ul" style="margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:720px; margin-bottom:15px;">
+          <h4 class="wmail_h4" style="color:#474646; font-size:14px; margin-bottom:5px;" >
+            <%= l(:label_user_message) %>
+            <span class="wmail_num" style="color:#fe3f0c; margin-left:5px; font-weight:normal;">(<%= @user_journal_messages.count %>)</span>
+          </h4>
+
+          <% @user_journal_messages.each do |user_journal_message|%>
+              <li>
+                <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
+
+                <%= link_to user_journal_message.user, user_activities_url(course_journal_message.user,:token => @token.value),
+                :class => "wmail_name",
+                :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px; width:50px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+                <span class="wmail_txt" style="float:left; margin-right:5px;color:#6e6e6e;"><%= l(:label_show_your_message) %></span>
+
+                <%= link_to user_journal_message.notes, [:controller => 'courses', :action => 'feedback', :id => course_journal_message.jour_id,:token => @token.value],
+                :class => 'wmail_info',
+                :style => "color:#5a5a5a; float:left;  width:400px; margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+                %>
+              <span class="wmail_date" style="color:#6e6e6e; float:right;display:block; margin-left:10px;"><%= user_journal_message.created_on %></span></li>
+
+        <% end %>
+
+      <div class="cl"></div>
+    </ul><!--课程动态 end-->
+    <% end %>
+  </div><!--个人动态  end-->
+  <div class="wmail_foot" style="margin-top:20px;color:#2775d2; margin-left:10px;">
+    <%= link_to l(:mail_footer), @user_url, :style => "margin-top:20px;color:#2775d2; margin-left:10px;" %>
+  </div>
+
+
+</div>
+
diff --git a/app/views/mailer/send_for_user_activities.text.erb b/app/views/mailer/send_for_user_activities.text.erb
new file mode 100644
index 000000000..03ea31ec3
--- /dev/null
+++ b/app/views/mailer/send_for_user_activities.text.erb
@@ -0,0 +1,253 @@
+<%= l(:label_course_overview)%>
+  <% unless @course_news.first.nil? %>
+         <%= l(:label_course_news) %>
+          (<%= @course_news.count %>)
+
+
+        <% @course_news.each do |course_new|%>
+
+           ▪
+             [
+
+              <%= link_to course_new.course.name, [:controller  => 'courses', :action => 'show', :id => course_new.course_id, :token => @token.value],
+                          :class=> "wmail_column",
+                          :style=> "width:90px; font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+             ]
+
+              <%= link_to course_new.author, user_activities_url(course_new.author,:token => @token.value), :class => "wmail_name",
+                          :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px; width:50px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
+             <%= l(:label_project_notice) %>
+
+              <%= link_to course_new.title, [:controller => 'news', :action => 'show', :id => course_new.id,:token => @token.value],
+                          :class => 'wmail_info',
+                          :style => "color:#5a5a5a; float:left;  width:400px; margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+              %> <%= course_new.created_on %>
+
+        <% end %>
+
+  <% end %>
+  <% if  !@bids.first.nil?  || !@homeworks.first.nil? %>
+    <%= l(:label_homework_overview) %><%= @bids.count %>
+        <% unless @bids.first.nil?%>
+            <% @bids.each do |bid| %>
+               ▪
+                [
+
+                  <%= link_to bid.courses.first.name, [:controller  => 'courses', :action => 'show', :id => bid.courses.first.id, :token => @token.value],
+                              :class=> "wmail_column",
+                              :style=> "width:90px; font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+                 ]
+
+                  <%= link_to bid.author, user_activities_url(bid.author,:token => @token.value), :class => "wmail_name",
+                              :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px; width:50px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
+               <%= l(:label_course_homework) %>
+
+                  <%= link_to bid.name, course_for_bid(:id => bid.id,:token => @token.value),
+                              :class => 'wmail_info',
+                              :style => "color:#5a5a5a; float:left;  width:400px; margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+                  %>
+                 <%= bid.created_on %>
+
+            <% end %>
+        <% end %>
+        <% unless @homeworks.first.nil? %>
+            <% @homeworks.each do |homework| %>
+                ▪[
+
+                  <%= link_to homework.bid.courses.first.name, [:controller  => 'courses', :action => 'show', :id => homework.bid.courses.first.id, :token => @token.value],
+                              :class=> "wmail_column",
+                              :style=> "width:90px; font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+                  ]
+
+                  <%= link_to homework.user, user_activities_url(homework.user,:token => @token.value), :class => "wmail_name",
+                              :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px; width:50px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
+               <%= l(:label_course_submit_homework) %>
+
+                  <%= link_to homework.name, course_for_bid(:id => homework.bid.id,:token => @token.value),
+                              :class => 'wmail_info',
+                              :style => "color:#5a5a5a; float:left;  width:400px; margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+                  %>
+               <%= homework.created_on %>  </li>
+            <% end %>
+        <% end %>
+
+
+     <!--作业动态 end-->
+  <% end %>
+
+  <% unless @course_journal_messages.first.nil? %>
+
+          <%= l(:view_course_journals_for_messages) %> (<%= @course_journal_messages.count %>)
+
+
+        <% @course_journal_messages.each do |course_journal_message|%>
+
+              [
+
+              <%= link_to course_journal_message.course.name, [:controller  => 'courses', :action => 'show', :id => course_journal_message.jour_id, :token => @token.value],
+                          :class=> "wmail_column",
+                          :style=> "width:90px; font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+             ]
+
+              <%= link_to course_journal_message.user, user_activities_url(course_journal_message.user,:token => @token.value), :class => "wmail_name",
+                          :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px; width:50px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
+            <%= l(:label_send_course_journals_for_messages) %>
+
+              <%= link_to course_journal_message.notes, [:controller => 'courses', :action => 'feedback', :id => course_journal_message.jour_id,:token => @token.value],
+                          :class => 'wmail_info',
+                          :style => "color:#5a5a5a; float:left;  width:400px; margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+              %>
+              <%= course_journal_message.created_on %>
+
+        <% end %>
+
+
+  <% end %>
+
+  <% unless @course_messages.first.nil? %>
+
+          <%= l(:view_borad_course) %>
+          (<%= @course_journal_messages.count %>)
+
+
+        <% @course_messages.each do |course_message|%>
+
+              ▪
+              [
+
+              <%= link_to course_message.course.name, [:controller  => 'courses', :action => 'show', :id => course_message.course.id, :token => @token.value],
+                          :class=> "wmail_column",
+                          :style=> "width:90px; font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+              ]
+
+              <%= link_to course_message.author, user_activities_url(course_message.author,:token => @token.value), :class => "wmail_name",
+                          :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px; width:50px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
+              <%= l(:label_send_course_messages) %>
+
+              <%= link_to course_message.subject,url_for(course_message.event_url(:token => @token.value)),
+                          :class => 'wmail_info',
+                          :style => "color:#5a5a5a; float:left;  width:400px; margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+              %>
+              <%= course_message.created_on %>
+
+        <% end %>
+
+
+  <% end %>
+
+  <% unless @attachments.first.nil? %>
+
+          <%= l(:label_course_attendingcontestwork_download) %>
+         (<%= @attachments.count %>)
+
+
+        <% @attachments.each do |attachment|%>
+            ▪[
+
+              <%= link_to attachment.course.name, [:controller  => 'courses', :action => 'show', :id => attachment.course.id, :token => @token.value],
+                          :class=> "wmail_column",
+                          :style=> "width:90px; font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+              ]
+
+              <%= link_to attachment.author, user_activities_url(attachment.author,:token => @token.value), :class => "wmail_name",
+                          :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px; width:50px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
+              <%= l(:label_course_file_upload) %>
+
+              <%= link_to attachment.filename,course_files_path(@course,:token => @token.value),
+                          :class => 'wmail_info',
+                          :style => "color:#5a5a5a; float:left;  width:400px; margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+              %>
+              <%= course_message.created_on %>
+            </li>
+        <% end %>
+
+      </ul><!--课件下载  end-->
+  <% end %>
+</div><!--课程动态  end-->
+
+
+<%= l(:label_project_overview)%>
+  <% unless @issues.first.nil? %>
+
+          <%= l(:label_issue_tracking) %>
+          (<%= @issues.count %>)
+
+        <% @issues.each do |issue|%>
+            ▪
+             [
+
+              <%= link_to issue.project.name, [:controller  => 'projects', :action => 'show', :id => issue.project.id, :token => @token.value],
+                          :class=> "wmail_column",
+                          :style=> "width:90px; font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+              ]
+
+              <%= link_to issue.author, user_activities_url(issue.author,:token => @token.value), :class => "wmail_name",
+                          :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px; width:50px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
+             <%= l(:label_project_issue) %>
+
+              <%= link_to issue.subject,url_for(:controller  => 'issues', :action => 'show', :id => issue.id,  :token => @token.value),
+                          :class => 'wmail_info',
+                          :style => "color:#5a5a5a; float:left;  width:400px; margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+              %>
+              <%= issue.created_on %>
+        <% end %>
+
+
+  <% end %>
+
+  <% unless @project_messages.first.nil? %>
+
+          <%= l(:project_moule_boards_show) %>
+         (<%= @course_journal_messages.count %>)
+
+        <% @project_messages.each do |project_message|%>
+          ▪[
+
+              <%= link_to project_message.project.name, [:controller  => 'projects', :action => 'show', :id => project_message.project.id, :token => @token.value],
+                          :class=> "wmail_column",
+                          :style=> "width:90px; font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+              ]
+
+              <%= link_to project_message.author, user_activities_url(project_message.author,:token => @token.value), :class => "wmail_name",
+                          :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px; width:50px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
+              <%= l(:label_send_course_messages) %>
+
+              <%= link_to project_message.subject,url_for(project_message.event_url(:token => @token.value)),
+                          :class => 'wmail_info',
+                          :style => "color:#5a5a5a; float:left;  width:400px; margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+              %>
+              <%= project_message.created_on %>
+        <% end %>
+
+
+  <% end %>
+
+
+
+<%= l(:label_activities) %>
+  <% unless @user_journal_messages.first.nil? %>
+
+          <%= l(:label_user_message) %>
+          (<%= @user_journal_messages.count %>)
+
+        <% @user_journal_messages.each do |user_journal_message|%>
+           ▪
+
+              <%= link_to user_journal_message.user, user_activities_url(course_journal_message.user,:token => @token.value),
+                          :class => "wmail_name",
+                          :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px; width:50px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+              <%= l(:label_show_your_message) %>
+
+              <%= link_to user_journal_message.notes, [:controller => 'courses', :action => 'feedback', :id => course_journal_message.jour_id,:token => @token.value],
+                          :class => 'wmail_info',
+                          :style => "color:#5a5a5a; float:left;  width:400px; margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+              %>
+             <%= user_journal_message.created_on %>
+
+        <% end %>
+
+
+  <% end %>
+<
+
+  <%= link_to l(:mail_footer), @user_url, :style => "margin-top:20px;color:#2775d2; margin-left:10px;" %>
diff --git a/config/initializers/send_mail.rb b/config/initializers/send_mail.rb
new file mode 100644
index 000000000..4cfd3cc03
--- /dev/null
+++ b/config/initializers/send_mail.rb
@@ -0,0 +1,23 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'rufus-scheduler'
+
+#users = User.where("mail_notification = 'week' or mail_notification = 'day'")
+
+scheduler = Rufus::Scheduler.new
+scheduler.cron('*/1 * * * *') do
+  users = User.where("login like '%alan%'")
+  users.each do |user|
+    # if user.mail_notification == "week"
+    #     cycle = '*/1 * * * *'
+    # else
+    #   cycle = '*/2 * * * *'
+    # end
+    Rails.logger.info "send mail to #{user.show_name}(#{user.mail}) at #{Time.now}"
+    Thread.start do
+      Mailer.send_for_user_activities(user, Date.today, 7).deliver
+    end
+  end
+end
+
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 42a1143ec..8899256a9 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -248,6 +248,9 @@ zh:
   # end 
   field_name: 名称
   field_enterprise_name: 组织名称
+
+  label_week_mail: 一周动态
+  label_day_mail: 一日动态
   #added by huang
   field_tea_name: 教师
   field_couurse_time: 学时
@@ -497,6 +500,9 @@ zh:
   permission_paret_in_homework: 加入作业
   permission_view_homework_attaches: 查看作业附件
   permission_view_course_journals_for_messages: 查看课程留言
+  view_course_journals_for_messages: 课程留言
+  label_send_course_journals_for_messages: 发布了留言
+  label_send_course_messages: 发布了讨论
   permission_select_course_modules: 选择课程模块
   permission_view_course_files: 查看课程资源
   permission_add_course: 新建课程
@@ -511,6 +517,7 @@ zh:
   permission_upload_attachments: 资源上传
 
   project_module_issue_tracking: 问题跟踪
+  project_moule_boards_show: 项目论坛
   project_module_time_tracking: 时间跟踪
   project_module_news: 新闻
   project_module_documents: 文档
@@ -657,6 +664,8 @@ zh:
   label_user_login_attending_contest: 您还没有登录，请登录后参赛
   label_user_login_score_and_comment: 您还没有登录，请登录后对作品进行打分评价
   label_user_login_notificationcomment: 您还没有登录，请登录后参加评论
+  label_user_message: 您的留言
+  label_show_your_message: 给您的留言
   #end
   #by huang    # modified by bai
   label_college: 高校进入
@@ -727,6 +736,7 @@ zh:
   label_attachment: 文件
   label_attachment_new: 新建文件
   label_file_upload: 上传资料
+  label_course_file_upload: 上传了课件
   label_attachment_delete: 删除文件
   label_attachment_plural: 文件
   label_file_added: 文件已添加
@@ -745,6 +755,8 @@ zh:
   label_settings: 配置
   label_overview: 近期动态
   label_course_overview: "课程动态"
+  label_project_overview: "项目动态"
+  label_homework_overview: 作业动态
   label_question_student: 作业交流 #bai
   label_homework_commit: 提交作业 #huang
   label_homework_info: 提交情况  #huang
@@ -992,6 +1004,7 @@ zh:
   label_project_newother: "查看其他评论"
   label_project_newshare: "分享了"
   label_project_notice: "发布了通知："
+  label_project_issue: "发布了问题:"
   label_project_newadd: "添加了"
   label_project_unadd: "暂无项目，赶快去创建吧！"
   label_project_un: "该用户暂未参与任何项目！"
@@ -1591,6 +1604,7 @@ zh:
   label_exist_repository_path: 定义已有版本库URL路径，定义格式file://, http://, https://, svn://
   label_project_no_activity: 该项目暂无动态！
   label_course_homework_un: 暂未发布任何作业
+  label_course_homework: 发布了作业
   label_follow_no_requirement: 暂未关注任何需求！
   label_no_user_respond_you: 暂无任何用户对您进行反馈！
   label_tags_issue: 问题名称：
@@ -1662,6 +1676,7 @@ zh:
   label_project_no_follow: 该项目暂未被关注！
   label_no_bid_project: 暂无参与项目
   label_no_course_project: 暂无已提交的作业！
+  label_course_submit_homework: 提交了作业
   label_bids_reward_method: 奖励方式 ：
   label_bids_reward_what: 输入奖励内容
   label_call_bonus: 奖金
@@ -1769,6 +1784,7 @@ zh:
   label_wiki_number: wiki的数量
   label_message_number: 留言的数量
   label_activity_number: 个人动态数量
+  label_activities: 个人动态
   label_issue_message_number: 对issue的留言数量
   label_code_submit_number: 代码提交次数
   label_topic_number: 讨论区发言数量
@@ -1954,6 +1970,7 @@ zh:
   label_hot_project: '热门项目'
   label_borad_project: 项目讨论区
   label_borad_course: 课程讨论区
+  view_borad_course: 课程讨论
   label_memo_create_succ: 发布成功
   label_memo_create_fail: 发布失败
   label_forum_create_succ: 贴吧新建成功
@@ -2117,6 +2134,7 @@ zh:
   label_attendingcontestwork_release_person: 发布人员
   label_attendingcontestwork_adaptive_system: 系统支持
   label_attendingcontestwork_download: 作品下载
+  label_course_attendingcontestwork_download: 课件下载
   label_attendingcontestwork_developers: 开发人员
   label_attendingcontestwork_average_scores: 平均评分
   label_attendingcontestwork_release_time: 发布时间
@@ -2370,7 +2388,7 @@ zh:
   mail_issue_from_project: "项目问题跟踪"
   mail_issue_attachments: "附件："
   mail_issue_reply: "我要回复"
-  
+  mail_footer: "退订Trustie社区任务提醒？"
   # 课程资源上传
   #    edit by meng 
   #    课程资源上传>

From 1166a1463bd10802a6af7b9c65027d3241e0b557 Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Sat, 7 Feb 2015 09:33:54 +0800
Subject: [PATCH 06/22] Signed-off-by: alan <547533434@qq.com>

---
 app/models/forum.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/forum.rb b/app/models/forum.rb
index f5581b232..baa8e6260 100644
--- a/app/models/forum.rb
+++ b/app/models/forum.rb
@@ -5,7 +5,7 @@ class Forum < ActiveRecord::Base
   has_many :memos, :dependent => :destroy, conditions: "parent_id IS NULL"
   belongs_to :creator, :class_name => "User", :foreign_key => 'creator_id'
 
-  after_create :expire_forum_cache, :send_email
+  after_create :expire_forum_cache
   after_update :expire_forum_cache
   before_destroy :expire_forum_cache
   safe_attributes 'name',

From 4bfc4493ebb3ba305f0991c3cb2bbbc5a96be8d3 Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Wed, 11 Feb 2015 20:23:50 +0800
Subject: [PATCH 07/22] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E3=80=8A=E9=82=AE?=
 =?UTF-8?q?=E4=BB=B6=E5=91=A8=E6=97=A5=E5=8F=91=E9=80=81=E3=80=8B=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=EF=BC=8C=E4=BF=AE=E6=94=B9=E3=80=8A=E8=B4=B4=E5=90=A7?=
 =?UTF-8?q?=E3=80=8B=E9=82=AE=E4=BB=B6=E5=8F=91=E9=80=81=E7=AD=96=E7=95=A5?=
 =?UTF-8?q?=20Signed-off-by:=20alan=20<547533434@qq.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Gemfile                                       |   5 -
 app/controllers/bids_controller.rb            |   2 +-
 app/controllers/courses_controller.rb         |   2 +-
 app/controllers/files_controller.rb           |   2 +-
 app/controllers/users_controller.rb           |   2 +-
 app/models/forum_observer.rb                  |  12 +-
 app/models/mailer.rb                          | 123 ++++-----
 app/models/memo_observer.rb                   |   1 +
 app/models/user.rb                            |   8 +-
 .../mailer/send_for_user_activities.html.erb  | 242 ++++++++++--------
 .../mailer/send_for_user_activities.text.erb  | 219 +++++++++-------
 config/application.rb                         |   4 +-
 config/initializers/send_mail.rb              |  20 +-
 config/locales/en.yml                         |   6 +-
 config/locales/zh.yml                         |  11 +-
 lib/redmine/notifiable.rb                     |   4 +-
 16 files changed, 372 insertions(+), 291 deletions(-)

diff --git a/Gemfile b/Gemfile
index b14c25664..1bc9e6629 100644
--- a/Gemfile
+++ b/Gemfile
@@ -20,13 +20,8 @@ gem "builder", "3.0.0"
 gem 'acts-as-taggable-on', '2.4.1'
 gem 'spreadsheet'
 gem 'ruby-ole'
-<<<<<<< HEAD
-gem 'email_verifier', path: 'lib/email_verifier'
-
-=======
 #gem 'email_verifier', path: 'lib/email_verifier'
 gem 'rufus-scheduler'
->>>>>>> szzh
 group :development do
   gem 'grape-swagger'
   gem 'grape-swagger-ui', git: 'https://github.com/guange2015/grape-swagger-ui.git'
diff --git a/app/controllers/bids_controller.rb b/app/controllers/bids_controller.rb
index 7e5894b83..a22012390 100644
--- a/app/controllers/bids_controller.rb
+++ b/app/controllers/bids_controller.rb
@@ -9,7 +9,7 @@ class BidsController < ApplicationController
   menu_item :homework_statistics, :only => :homework_statistics
   menu_item :edit, :only => :edit
 
-
+  before_filter :auth_login1, :only => [:show_courseEx]
 
   before_filter :can_show_course,only: []
   before_filter :can_show_contest,only: []
diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index a55abd123..3cf69c777 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -5,7 +5,7 @@ class CoursesController < ApplicationController
   helper :members
   helper :words
 
-  before_filter :authorize1, :only => [:show, :feedback]
+  before_filter :auth_login1, :only => [:show, :feedback]
   menu_item :overview
   menu_item :feedback, :only => :feedback
   menu_item :homework, :only => :homework
diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb
index 56f760e13..5336ab54d 100644
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@@ -20,7 +20,7 @@ class FilesController < ApplicationController
     layout 'base_projects' #by young
 
   menu_item :files
-
+  before_filter :auth_login1, :only => [:index]
   before_filter :find_project_by_project_id#, :except => [:getattachtype]
   before_filter :authorize, :except => [:getattachtype,:quote_resource_show,:search]
 
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index a2933c577..8ef6f6b53 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -18,7 +18,7 @@ class UsersController < ApplicationController
 
   layout :setting_layout
   #Added by young
-  before_filter :auth_login1, :only => [:show, :user_activities]
+  before_filter :auth_login1, :only => [:show, :user_activities, :user_newfeedback]
   menu_item :activity
   menu_item :user_information, :only => :info
   menu_item :user_course, :only => :user_courses
diff --git a/app/models/forum_observer.rb b/app/models/forum_observer.rb
index 1c514d6ab..6afcac824 100644
--- a/app/models/forum_observer.rb
+++ b/app/models/forum_observer.rb
@@ -1,8 +1,8 @@
 class ForumObserver < ActiveRecord::Observer
-  def after_create(forum)
-    Thread.start do
-      Mailer.forum_add(forum).deliver if Setting.notified_events.include?('forum_add')
-    end
-
-  end
+  # def after_create(forum)
+  #   Thread.start do
+  #     Mailer.forum_add(forum).deliver if Setting.notified_events.include?('forum_add')
+  #   end
+  #
+  # end
 end
diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index 85ce46e8b..e8af704d8 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -34,6 +34,7 @@ class Mailer < ActionMailer::Base
     date_from = date_to - days.days
 
     # 生成token用于直接点击登录
+    @user = user
     token = Token.new(:user =>user , :action => 'autologin')
     token.save
     @token = token
@@ -49,72 +50,69 @@ class Mailer < ActionMailer::Base
     @issues = Issue.find_by_sql("select DISTINCT i.* from issues i, watchers w
                         where (i.assigned_to_id = #{user.id} or i.author_id = #{user.id}
                                 or (w.watchable_type = 'Issue' and w.watchable_id = i.id and w.user_id = #{user.id}))
-                            and (i.created_on between #{date_from} and #{date_to}) order by i.created_on desc")
+                            and (i.created_on between '#{date_from}' and '#{date_to}') order by i.created_on desc")
+
+    # @bids 查询课程作业，包括老师发布的作业，以及user提交作业
+    # @attachments查询课程课件更新
+    @attachments ||= []
 
-    # 查询课程作业，包括老师发布的作业，以及user提交作业
     @bids ||= []  # 老师发布的作业
-    courses.each do |course|
-      @bids << course.homeworks.where("created_at between #{date_from} and #{date_to} order by i.created_on desc")
-    end
-    # user 提交的作业
-    @homeworks = HomeworkAttach.where("user_id=#{user.id} and (created_at between #{date_from} and #{date_to})")
 
-    # 查询user在课程。项目中发布的讨论帖子
-    messages = Message.find_by_sql("select DISTINCT * from messages where author_id = #{user.id} and (created_on between #{date_from} and #{date_to}) order by i.created_on desc")
-    @course_messages ||= []
-    @project_messages ||= []
-    messages.each do |msg|
-      if msg.project
-        @project_messages << msg
-      elsif msg.course
-        @course_messages << msg
+    unless courses.first.nil?
+      count = courses.count
+      count = count - 1
+      for i in 0..count do
+        bids =  courses[i].homeworks.where("bids.created_on between '#{date_from}' and '#{date_to}'").order("bids.created_on desc")
+        attachments = courses[i].attachments.where("attachments.created_on between '#{date_from}' and '#{date_to}'").order('attachments.created_on DESC')
+        @bids += bids if bids.count > 0 
+        @attachments += attachments if attachments.count > 0 
       end
     end
+    # user 提交的作业
+    @homeworks = HomeworkAttach.where("user_id=#{user.id} and (created_at between '#{date_from}' and '#{date_to}')").order("created_at desc")
 
+    # 查询user在课程。项目中发布的讨论帖子
+    messages = Message.find_by_sql("select DISTINCT * from messages where author_id = #{user.id} and (created_on between '#{date_from}' and '#{date_to}') order by created_on desc")
+    @course_messages ||= []
+    @project_messages ||= []
+    unless messages.first.nil?
+      messages.each do |msg|
+        if msg.project
+          @project_messages << msg
+        elsif msg.course
+          @course_messages << msg
+        end
+      end
+    end
     #  查询user在课程中发布的通知，项目中发的新闻
     @course_news = News.find_by_sql("select DISTINCT n.*  from news n
                                                 where n.course_id in (#{course_ids})
-                                                    and (created_on between #{date_from} and #{date_to}) order by i.created_on desc")
+                                                    and (created_on between '#{date_from}' and '#{date_to}') order by created_on desc")
     @project_news = News.find_by_sql("select DISTINCT n.* from news n where  n.project_id in (#{project_ids})
-                                                     and (created_on between #{date_from} and #{date_to}) order by i.created_on desc")
+                                                     and (created_on between '#{date_from}' and '#{date_to}') order by created_on desc")
 
     # 查询user在课程及个人中留言
     @course_journal_messages = JournalsForMessage.find_by_sql("select DISTINCT * from journals_for_messages where
                                                   jour_type='Course' and user_id = #{user.id}
-                                                  and (created_on between #{date_from} and #{date_to}) order by i.created_on desc")
-    @user_journal_messages = user.journals_for_messages.where("m_parent_id IS NULL and (created_on between #{date_from} and #{date_to})").order('created_on DESC')
+                                                  and (created_on between '#{date_from}' and '#{date_to}') order by created_on desc")
+    @user_journal_messages = user.journals_for_messages.where("m_parent_id IS NULL and (created_on between '#{date_from}' and '#{date_to}')").order('created_on DESC')
+
 
-    # 查询课程课件更新
-    @attachments ||= []
-    courses.each do |course|
-      @attachments << course.attachments.where("created_on between #{date_from} and #{date_to}").order('created_at DESC')
-    end
     # 查询user新建贴吧或发布帖子
-    @forums = Forum.find_by_sql("select  DISTINCT * from forums where creator_id = #{user.id} and (created_at between #{date_from} and #{date_to}) order by i.created_on desc")
+    @forums = Forum.find_by_sql("select  DISTINCT * from forums where creator_id = #{user.id} and (created_at between '#{date_from}' and '#{date_to}') order by created_at desc")
     @memos = Memo.find_by_sql("select DISTINCT m.* from memos m, forums f where (m.author_id = #{user.id} or (m.forum_id = f.id and f.creator_id = #{user.id}))
-                           and (created_at between #{date_from} and #{date_to})  order by i.created_on desc")
+                           and (m.created_at between '#{date_from}' and '#{date_to}')  order by m.created_at desc")
     if days == 1
-      subject = "[ #{user.show_name} : #{date_from} - #{l(:label_day_mail)}]"
+      subject = "[ #{user.show_name} : #{l(:label_day_mail)}]"
+      @subject = " #{user.show_name} : #{date_to - 1.days}  #{l(:label_day_mail)}"
     else
       subject = "[ #{user.show_name} :  #{l(:label_week_mail)}]"
+      @subject = "#{user.show_name} : #{l(:label_week_mail)}"
     end
-    mail :to => user.mail,:subject => "[ #{user.show_name} :  #{l(:notice_successful_create)}]"
+    mail :to => user.mail,:subject => subject
 
   end
-  # 贴吧新建贴吧发送邮件
-  # example Mailer.forum(forum).deliver
-  def forum_add(forum)
 
-    redmine_headers 'Forum' => forum.id
-    @forum = forum
-    @author = forum.creator
-    recipients = forum.creator.mail
-    # cc = wiki_content.page.wiki.watcher_recipients - recipients
-    @issue_author_url = url_for(user_activities_url(@author))
-    @forum_url = url_for(:controller => 'forums', :action => 'show', :id => forum.id)
-    mail :to => recipients,:subject => "[ #{l(:label_forum)} : #{forum.name} #{l(:notice_successful_create)}]"
-
-  end
 
   def forum_message_added(memo)
     @memo = memo
@@ -124,15 +122,12 @@ class Mailer < ActionMailer::Base
     @forum_url = url_for(:controller => 'forums', :action => 'show', :id => @forum.id)
     @issue_author_url = url_for(user_activities_url(@author))
     recipients ||= []
-    # if !memo.parent_id.nil?
-    #   mems = memo.self_and_siblings
-    #   mems.each do |mem|
-    #     recipients << mem.author.mail unless recipients.include? mem.author.mail
-    #   end
-    # else
-    #   recipients << memo.author.mail
-    # end
-    recipients << @author.mail
+    if @forum.author.mail_notification != 'day' && @forum.author.mail_notification != 'week'
+      recipients << @forum.author.mail
+    end
+    if @author.mail_notification != 'day' && @author.mail_notification != 'week'
+      recipients << @author.mail
+    end
     # cc = wiki_content.page.wiki.watcher_recipients - recipients
 
     @memo_url = url_for(forum_memo_url(@forum, (@memo.parent_id.nil? ? @memo : @memo.parent_id)))
@@ -167,6 +162,17 @@ class Mailer < ActionMailer::Base
                Rails.logger.error "[Builds a Mail::Message ERROR] journalsForMessage's jour is unkown type, journalsForMessage.id = #{journals_for_message.id}"
                return -1
            end
+
+    # 验证用户的收取邮件的方式
+    recipients ||= []
+    recipients1 ||= []
+    if @mail.mail_notification != 'week' && @mail.mail_notification != 'day'
+      recipients1 = @mail.mail
+    end
+    if journals_for_message.jour.author.mail_notification != 'week' && journals_for_message.jour.author.mail_notification != 'day'
+      recipients = journals_for_message.jour.author.mail
+    end
+
     # modify by nwb
     #如果是直接留言并且留言对象是课程
     if !journals_for_message.at_user && journals_for_message.jour.class.to_s.to_sym == :Course
@@ -177,7 +183,9 @@ class Mailer < ActionMailer::Base
       #收件人邮箱
       @recipients ||= []
       @members.each do |teacher|
+        if teacher.user.mail_notification != 'week' && teacher.user.mail_notification != 'day'
           @recipients << teacher.user.mail
+        end
       end
       mail :to => @recipients,
            :subject => "#{l(:label_your_course)}#{journals_for_message.jour.name}#{l(:label_have_message)} "
@@ -185,14 +193,15 @@ class Mailer < ActionMailer::Base
       if !journals_for_message.jour.author.notify_about? journals_for_message
         return -1
       end
-        mail :to => journals_for_message.jour.author.mail, :subject => @title
+
+      mail :to => recipients, :subject => @title
     elsif journals_for_message.jour.class.to_s.to_sym == :Contest
       if !journals_for_message.jour.author.notify_about? journals_for_message
         return -1
       end
-      mail :to => journals_for_message.jour.author.mail, :subject => @title
+      mail :to => recipients, :subject => @title
     else
-      mail :to => @mail.mail, :subject => @title
+      mail :to => recipients1, :subject => @title
     end
 
 
@@ -269,12 +278,6 @@ class Mailer < ActionMailer::Base
     @user_url = url_for(my_account_url(user,:token => @token.value))
 
       @issue_url = url_for(:controller  => 'issues', :action => 'show', :id => issue.id, :anchor => "change-#{journal.id}", :token => @token.value)
-
-
-
-
-
-
     s = "[#{issue.project.name} - #{issue.tracker.name} ##{issue_id}] "
     s << "(#{issue.status.name}) " if journal.new_value_for('status_id')
     s << issue.subject
diff --git a/app/models/memo_observer.rb b/app/models/memo_observer.rb
index 66cabe923..e50bcf5a2 100644
--- a/app/models/memo_observer.rb
+++ b/app/models/memo_observer.rb
@@ -3,6 +3,7 @@ class MemoObserver < ActiveRecord::Observer
 
     thread1=Thread.new do
       Mailer.forum_message_added(memo).deliver if Setting.notified_events.include?('forum_message_added')
+
     end
   end
 end
diff --git a/app/models/user.rb b/app/models/user.rb
index cdda07c54..83e08254c 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -66,10 +66,8 @@ class User < Principal
 
   MAIL_NOTIFICATION_OPTIONS = [
     ['all', :label_user_mail_option_all],
-    ['selected', :label_user_mail_option_selected],
-    ['only_my_events', :label_user_mail_option_only_my_events],
-    ['only_assigned', :label_user_mail_option_only_assigned],
-    ['only_owner', :label_user_mail_option_only_owner],
+    ['week', :label_user_mail_option_week],
+    ['day', :label_user_mail_option_day],
     ['none', :label_user_mail_option_none]
   ]
 
@@ -188,7 +186,7 @@ class User < Principal
   validates_confirmation_of :password, :allow_nil => true
   validates_inclusion_of :mail_notification, :in => MAIL_NOTIFICATION_OPTIONS.collect(&:first), :allow_blank => true
   validate :validate_password_length
-  validates_email_realness_of :mail
+  # validates_email_realness_of :mail
   before_create :set_mail_notification
   before_save   :update_hashed_password
   before_destroy :remove_references_before_destroy
diff --git a/app/views/mailer/send_for_user_activities.html.erb b/app/views/mailer/send_for_user_activities.html.erb
index 22b071a1f..ed7877360 100644
--- a/app/views/mailer/send_for_user_activities.html.erb
+++ b/app/views/mailer/send_for_user_activities.html.erb
@@ -1,40 +1,15 @@
 
-  <style>
-      body{ font-size:12px; font-family:"微软雅黑","宋体"; line-height:1.9; background:#fff; font-style:normal;}
-      div,html,img,ul,li,p,body,h1,h2,h3,h4,p,a,table,tr,td,fieldset,input,span,ol{ margin:0; padding:0;}
-      ul,li{ list-style-type:none;}
-      div,img,tr,td,table{ border:0;}
-      .cl{ clear:both; overflow:hidden; }
-      a{ text-decoration:none; }
-      .fl{ float: left;}
-      .fr{ float:right;}
-
 
-      .wmail_main{ padding:20px 10px 0px;}
-      .wmail_main ul li{ clear: both;}
-      .wmail_h2{ color:#15bccf;  }
-      .wmail_h4{ color:#474646; font-size:14px; margin-bottom:5px;}
-      .wmail_num{ color:#fe3f0c; margin-left:5px; font-weight:normal;}
-      .wmail_column{ width:90px; font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
-      .wmail_b{color:#1b55a7; font-weight:bold; float:left;}
-      .wmail_name{ color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px; width:50px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
-      .wmail_info{color:#5a5a5a; float:left;  width:400px; margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
-      .wmail_date{ color:#6e6e6e; float:right;display:block; margin-left:10px;}
-      .wmail_txt{ float:left; margin-right:5px;color:#6e6e6e;}
-      .wmail_column:hover{ color:#07397f; }
-      .wmail_name:hover{ color:#d03106;}
-      .wmail_info:hover{ color:#07397f;}
-      .wmail_dis{ float:left; color:#000000; margin-right:5px;}
-      .wmail_ul{ margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:720px; margin-bottom:15px;}
-      .wmail_foot{ margin-top:20px;color:#2775d2; margin-left:10px;}
-      .wmail_foot:hover{color:#0b53a7;}
-
-  </style>
 
 
 
 <div class="content">
-  <div class="wmail_main" style="padding:20px 10px 0px;">
+<h4 class="wmail_h4" style="color:#474646; font-size:14px; margin-bottom:5px;" >
+<%= @subject %>
+</h4>
+<% if @attachments.first || @course_news.first || @bids.first ||
+        @homeworks.first || @course_journal_messages.first|| @course_messages.first %>
+   <div class="wmail_main" style="padding:20px 10px 0px;">
     <h2 class="wmail_h2" style="color:#15bccf; "><%= l(:label_course_overview)%></h2>
     <% unless @course_news.first.nil? %>
     <ul class="wmail_ul" style=" list-style-type:none;clear: both;margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:720px; margin-bottom:15px;">
@@ -45,24 +20,24 @@
       </h4>
 
       <% @course_news.each do |course_new|%>
-          <li style="clear: both;">
+          <li style="clear: both; list-style: none;">
             <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
             <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">[</span>
-
-            <%= link_to course_new.course.name, [:controller  => 'courses', :action => 'show', :id => course_new.course_id, :token => @token.value],
+          
+            <%= link_to truncate(course_new.course.name,length: 30,omission: '...'), course_url(course_new.course, :token => @token.value),
                                 :class=> "wmail_column",
-                                :style=> "width:90px; font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+                                :style=> " font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
             <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">]</span>
 
             <%= link_to course_new.author, user_activities_url(course_new.author,:token => @token.value), :class => "wmail_name",
-                    :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px; width:50px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
+                    :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
             <span class="wmail_txt" style="float:left; margin-right:5px;color:#6e6e6e;"><%= l(:label_project_notice) %></span>
 
-            <%= link_to course_new.title, [:controller => 'news', :action => 'show', :id => course_new.id,:token => @token.value],
+            <%= link_to truncate(course_new.title,length: 30,omission: '...'), news_url(course_new,:token => @token.value),
                         :class => 'wmail_info',
-                        :style => "color:#5a5a5a; float:left;  width:400px; margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+                        :style => "color:#5a5a5a; float:left;   margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
                 %>
-            <span class="wmail_date" style="color:#6e6e6e; float:right;display:block; margin-left:10px;"><%= course_new.created_on %></span>
+            <span class="wmail_date" style="color:#6e6e6e; float:right;display:block; margin-left:10px;"><%= format_time(course_new.created_on) %></span>
           </li>
       <% end %>
 
@@ -72,50 +47,50 @@
     <% if  !@bids.first.nil?  || !@homeworks.first.nil? %>
     <ul class="wmail_ul" style="clear: both;margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:720px; margin-bottom:15px;">
 
-      <h4 class="wmail_h4" style="color:#474646; font-size:14px; margin-bottom:5px;"><%= l(:label_homework_overview) %>><span class="wmail_num" style="color:#fe3f0c; margin-left:5px; font-weight:normal;">(<%= @bids.count %>)</span></h4>
+      <h4 class="wmail_h4" style="color:#474646; font-size:14px; margin-bottom:5px;"><%= l(:label_homework_overview) %><span class="wmail_num" style="color:#fe3f0c; margin-left:5px; font-weight:normal;">(<%= @bids.count %>)</span></h4>
       <% unless @bids.first.nil?%>
       <% @bids.each do |bid| %>
-           <li style="clear: both;">
+           <li style="clear: both; list-style: none;">
             <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
             <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">[</span>
 
-            <%= link_to bid.courses.first.name, [:controller  => 'courses', :action => 'show', :id => bid.courses.first.id, :token => @token.value],
+            <%= link_to truncate(bid.courses.first.name,length: 30,omission: '...'), course_url(bid.courses.first, :token => @token.value),
                         :class=> "wmail_column",
-                        :style=> "width:90px; font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+                        :style=> " font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
             <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">]</span>
 
             <%= link_to bid.author, user_activities_url(bid.author,:token => @token.value), :class => "wmail_name",
-                        :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px; width:50px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
+                        :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
             <span class="wmail_txt" style="float:left; margin-right:5px;color:#6e6e6e;"><%= l(:label_course_homework) %></span>
 
-            <%= link_to bid.name, course_for_bid(:id => bid.id,:token => @token.value),
+            <%= link_to truncate(bid.name,length: 30,omission: '...'), course_for_bid_url(:id => bid.id,:token => @token.value),
                         :class => 'wmail_info',
-                        :style => "color:#5a5a5a; float:left;  width:400px; margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+                        :style => "color:#5a5a5a; float:left;   margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
             %>
-            <span class="wmail_date" style="color:#6e6e6e; float:right;display:block; margin-left:10px;"><%= bid.created_on %></span>
+            <span class="wmail_date" style="color:#6e6e6e; float:right;display:block; margin-left:10px;"><%= format_time(bid.created_on) %></span>
           </li>
       <% end %>
       <% end %>
       <% unless @homeworks.first.nil? %>
       <% @homeworks.each do |homework| %>
-          <li style="clear: both;">
+          <li style="clear: both; list-style: none;">
             <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
             <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">[</span>
 
-            <%= link_to homework.bid.courses.first.name, [:controller  => 'courses', :action => 'show', :id => homework.bid.courses.first.id, :token => @token.value],
+            <%= link_to truncate(homework.bid.courses.first.name,length: 30,omission: '...'), course_url(homework.bid.courses.first, :token => @token.value),
                         :class=> "wmail_column",
-                        :style=> "width:90px; font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+                        :style=> " font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
             <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">]</span>
 
             <%= link_to homework.user, user_activities_url(homework.user,:token => @token.value), :class => "wmail_name",
-                        :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px; width:50px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
+                        :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
             <span class="wmail_txt" style="float:left; margin-right:5px;color:#6e6e6e;"><%= l(:label_course_submit_homework) %></span>
 
-            <%= link_to homework.name, course_for_bid(:id => homework.bid.id,:token => @token.value),
+            <%= link_to truncate(homework.name,length: 30,omission: '...'), course_for_bid_url(:id => homework.bid.id,:token => @token.value),
                         :class => 'wmail_info',
-                        :style => "color:#5a5a5a; float:left;  width:400px; margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+                        :style => "color:#5a5a5a; float:left;   margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
             %>
-            <span class="wmail_date" style="color:#6e6e6e; float:right;display:block; margin-left:10px;"><%= homework.created_on %></span>
+            <span class="wmail_date" style="color:#6e6e6e; float:right;display:block; margin-left:10px;"><%= format_time(homework.created_on) %></span>
           </li>
       <% end %>
       <% end %>
@@ -133,24 +108,24 @@
           </h4>
 
           <% @course_journal_messages.each do |course_journal_message|%>
-              <li style="clear: both;">
+              <li style="clear: both; list-style: none;">
                 <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
                 <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">[</span>
 
-                <%= link_to course_journal_message.course.name, [:controller  => 'courses', :action => 'show', :id => course_journal_message.jour_id, :token => @token.value],
+                <%= link_to truncate(course_journal_message.course.name,length: 30,omission: '...'), course_url(course_journal_message.course, :token => @token.value),
                             :class=> "wmail_column",
-                            :style=> "width:90px; font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+                            :style=> " font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
                 <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">]</span>
 
                 <%= link_to course_journal_message.user, user_activities_url(course_journal_message.user,:token => @token.value), :class => "wmail_name",
-                            :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px; width:50px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
+                            :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
                 <span class="wmail_txt" style="float:left; margin-right:5px;color:#6e6e6e;"><%= l(:label_send_course_journals_for_messages) %></span>
 
-                <%= link_to course_journal_message.notes, [:controller => 'courses', :action => 'feedback', :id => course_journal_message.jour_id,:token => @token.value],
+                <%= link_to truncate(course_journal_message.notes,length: 30,omission: '...'), course_feedback_url(course_journal_message.course,:token => @token.value),
                             :class => 'wmail_info',
-                            :style => "color:#5a5a5a; float:left;  width:400px; margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+                            :style => "color:#5a5a5a; float:left;   margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
                 %>
-                <span class="wmail_date" style="color:#6e6e6e; float:right;display:block; margin-left:10px;"><%= course_journal_message.created_on %></span>
+                <span class="wmail_date" style="color:#6e6e6e; float:right;display:block; margin-left:10px;"><%= format_time(course_journal_message.created_on) %></span>
               </li>
           <% end %>
 
@@ -167,24 +142,24 @@
           </h4>
 
           <% @course_messages.each do |course_message|%>
-              <li style="clear: both;">
+              <li style="clear: both; list-style: none;">
                 <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
                 <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">[</span>
 
-                <%= link_to course_message.course.name, [:controller  => 'courses', :action => 'show', :id => course_message.course.id, :token => @token.value],
+                <%= link_to truncate(course_message.course.name,length: 30,omission: '...'), course_url(course_message.course.id, :token => @token.value),
                             :class=> "wmail_column",
-                            :style=> "width:90px; font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+                            :style=> " font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
                 <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">]</span>
 
                 <%= link_to course_message.author, user_activities_url(course_message.author,:token => @token.value), :class => "wmail_name",
-                            :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px; width:50px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
+                            :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
                 <span class="wmail_txt" style="float:left; margin-right:5px;color:#6e6e6e;"><%= l(:label_send_course_messages) %></span>
 
-                <%= link_to course_message.subject,url_for(course_message.event_url(:token => @token.value)),
+                <%= link_to truncate(course_message.subject,length: 30,omission: '...'),board_message_url(course_message, :board_id => course_message.board_id,:token => @token.value),
                             :class => 'wmail_info',
-                            :style => "color:#5a5a5a; float:left;  width:400px; margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+                            :style => "color:#5a5a5a; float:left;   margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
                 %>
-                <span class="wmail_date" style="color:#6e6e6e; float:right;display:block; margin-left:10px;"><%= course_message.created_on %></span>
+                <span class="wmail_date" style="color:#6e6e6e; float:right;display:block; margin-left:10px;"><%= format_time(course_message.created_on) %></span>
               </li>
           <% end %>
 
@@ -200,34 +175,34 @@
           </h4>
 
           <% @attachments.each do |attachment|%>
-              <li style="clear: both;">
+              <li style="clear: both; list-style: none;">
                 <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
                 <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">[</span>
 
-                <%= link_to attachment.course.name, [:controller  => 'courses', :action => 'show', :id => attachment.course.id, :token => @token.value],
+                <%= link_to truncate(attachment.course.name,length: 30,omission: '...'), course_url(attachment.course, :token => @token.value),
                             :class=> "wmail_column",
-                            :style=> "width:90px; font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+                            :style=> " font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
                 <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">]</span>
 
                 <%= link_to attachment.author, user_activities_url(attachment.author,:token => @token.value), :class => "wmail_name",
-                            :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px; width:50px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
+                            :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
                 <span class="wmail_txt" style="float:left; margin-right:5px;color:#6e6e6e;"><%= l(:label_course_file_upload) %></span>
 
-                <%= link_to attachment.filename,course_files_path(@course,:token => @token.value),
+                <%= link_to truncate(attachment.filename,length: 30,omission: '...'),course_files_url(attachment.course,:token => @token.value),
                             :class => 'wmail_info',
-                            :style => "color:#5a5a5a; float:left;  width:400px; margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+                            :style => "color:#5a5a5a; float:left;   margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
                 %>
-                <span class="wmail_date" style="color:#6e6e6e; float:right;display:block; margin-left:10px;"><%= course_message.created_on %></span>
+                <span class="wmail_date" style="color:#6e6e6e; float:right;display:block; margin-left:10px;"><%= format_time(attachment.created_on) %></span>
               </li>
           <% end %>
-
+      <div class="cl"></div>
     </ul><!--课件下载  end-->
     <% end %>
   </div><!--课程动态  end-->
-
-
+  <% end %>
+  <% if @issues.first || @project_messages.first %>
   <div class="wmail_main" style="padding:20px 10px 0px;">
-    <h2 class="wmail_h2" style="color:#15bccf; "><%= l(:label_project_overview)%></h2>
+    <h2 class="wmail_h2" style="color:#15bccf; "><%= l(:label_project_overview_new)%></h2>
     <% unless @issues.first.nil? %>
     <ul class="wmail_ul" style="margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:720px; margin-bottom:15px;">
           <h4 class="wmail_h4" style="color:#474646; font-size:14px; margin-bottom:5px;" >
@@ -236,24 +211,24 @@
           </h4>
 
           <% @issues.each do |issue|%>
-              <li style="clear: both;">
+              <li style="clear: both; list-style: none;">
                 <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
                 <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">[</span>
 
-                <%= link_to issue.project.name, [:controller  => 'projects', :action => 'show', :id => issue.project.id, :token => @token.value],
+                <%= link_to truncate(issue.project.name,length: 30,omission: '...'), project_url(issue.project, :token => @token.value),
                             :class=> "wmail_column",
-                            :style=> "width:90px; font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+                            :style=> " font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
                 <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">]</span>
 
                 <%= link_to issue.author, user_activities_url(issue.author,:token => @token.value), :class => "wmail_name",
-                            :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px; width:50px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
+                            :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
                 <span class="wmail_txt" style="float:left; margin-right:5px;color:#6e6e6e;"><%= l(:label_project_issue) %></span>
 
-                <%= link_to issue.subject,url_for(:controller  => 'issues', :action => 'show', :id => issue.id,  :token => @token.value),
+                <%= link_to truncate(issue.subject,length: 30,omission: '...'),issue_url(issue,  :token => @token.value),
                             :class => 'wmail_info',
-                            :style => "color:#5a5a5a; float:left;  width:400px; margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+                            :style => "color:#5a5a5a; float:left;   margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
                 %>
-                <span class="wmail_date" style="color:#6e6e6e; float:right;display:block; margin-left:10px;"><%= issue.created_on %></span>
+                <span class="wmail_date" style="color:#6e6e6e; float:right;display:block; margin-left:10px;"><%= format_time(issue.created_on) %></span>
               </li>
           <% end %>
 
@@ -265,28 +240,28 @@
     <ul class="wmail_ul" style="margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:720px; margin-bottom:15px;">
           <h4 class="wmail_h4" style="color:#474646; font-size:14px; margin-bottom:5px;" >
             <%= l(:project_moule_boards_show) %>
-            <span class="wmail_num" style="color:#fe3f0c; margin-left:5px; font-weight:normal;">(<%= @course_journal_messages.count %>)</span>
+            <span class="wmail_num" style="color:#fe3f0c; margin-left:5px; font-weight:normal;">(<%= @project_messages.count %>)</span>
           </h4>
 
           <% @project_messages.each do |project_message|%>
-              <li style="clear: both;">
+              <li style="clear: both; list-style: none;">
                 <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
                 <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">[</span>
 
-                <%= link_to project_message.project.name, [:controller  => 'projects', :action => 'show', :id => project_message.project.id, :token => @token.value],
+                <%= link_to truncate(project_message.project.name,length: 30,omission: '...'), project_url(project_message.project, :token => @token.value),
                             :class=> "wmail_column",
-                            :style=> "width:90px; font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+                            :style=> " font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
                 <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">]</span>
 
                 <%= link_to project_message.author, user_activities_url(project_message.author,:token => @token.value), :class => "wmail_name",
-                            :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px; width:50px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
+                            :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
                 <span class="wmail_txt" style="float:left; margin-right:5px;color:#6e6e6e;"><%= l(:label_send_course_messages) %></span>
 
-                <%= link_to project_message.subject,url_for(project_message.event_url(:token => @token.value)),
+                <%= link_to truncate(project_message.subject,length: 30,omission: '...'),board_message_url(project_message, :board_id => project_message.board_id,:token => @token.value),
                             :class => 'wmail_info',
-                            :style => "color:#5a5a5a; float:left;  width:400px; margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+                            :style => "color:#5a5a5a; float:left;   margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
                 %>
-                <span class="wmail_date" style="color:#6e6e6e; float:right;display:block; margin-left:10px;"><%= project_message.created_on %></span>
+                <span class="wmail_date" style="color:#6e6e6e; float:right;display:block; margin-left:10px;"><%= format_time(project_message.created_on) %></span>
               </li>
           <% end %>
 
@@ -297,10 +272,11 @@
 
 
   </div><!--项目动态  end-->
-
+ <% end %>
+ <% unless @user_journal_messages.first.nil? %>
   <div class="wmail_main" style="padding:20px 10px 0px;">
     <h2 class="wmail_h2" style="color:#15bccf; "><%= l(:label_activities) %></h2>
-    <% unless @user_journal_messages.first.nil? %>
+
     <ul class="wmail_ul" style="margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:720px; margin-bottom:15px;">
           <h4 class="wmail_h4" style="color:#474646; font-size:14px; margin-bottom:5px;" >
             <%= l(:label_user_message) %>
@@ -308,26 +284,86 @@
           </h4>
 
           <% @user_journal_messages.each do |user_journal_message|%>
-              <li>
+              <li  style="clear: both; list-style: none;">
                 <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
 
-                <%= link_to user_journal_message.user, user_activities_url(course_journal_message.user,:token => @token.value),
+                <%= link_to user_journal_message.user, user_activities_url(user_journal_message.user,:token => @token.value),
                 :class => "wmail_name",
-                :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px; width:50px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+                :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
                 <span class="wmail_txt" style="float:left; margin-right:5px;color:#6e6e6e;"><%= l(:label_show_your_message) %></span>
 
-                <%= link_to user_journal_message.notes, [:controller => 'courses', :action => 'feedback', :id => course_journal_message.jour_id,:token => @token.value],
+                <%= link_to truncate(user_journal_message.notes,length: 30,omission: '...'),feedback_url(@user,:token => @token.value),
                 :class => 'wmail_info',
-                :style => "color:#5a5a5a; float:left;  width:400px; margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+                :style => "color:#5a5a5a; float:left;   margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
                 %>
-              <span class="wmail_date" style="color:#6e6e6e; float:right;display:block; margin-left:10px;"><%= user_journal_message.created_on %></span></li>
+              <span class="wmail_date" style="color:#6e6e6e; float:right;display:block; margin-left:10px;"><%= format_time(user_journal_message.created_on) %></span></li>
 
         <% end %>
 
       <div class="cl"></div>
     </ul><!--课程动态 end-->
-    <% end %>
+
   </div><!--个人动态  end-->
+  <% end %>
+  <% if @forums.first || @memos.first %>
+    <div class="wmail_main" style="padding:20px 10px 0px;">
+      <h2 class="wmail_h2" style="color:#15bccf; "><%= l(:lable_bar_active) %></h2>
+      <% unless @forums.first.nil? %>
+      <ul class="wmail_ul" style="margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:720px; margin-bottom:15px;">
+        <h4 class="wmail_h4" style="color:#474646; font-size:14px; margin-bottom:5px;" >
+          <%= l(:label_user_forum) %>
+          <span class="wmail_num" style="color:#fe3f0c; margin-left:5px; font-weight:normal;">(<%= @forums.count %>)</span>
+        </h4>
+
+        <% @forums.each do |forum|%>
+            <li  style="clear: both; list-style: none;">
+              <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
+
+              <%= link_to forum.author, user_activities_url(forum.author,:token => @token.value),
+                          :class => "wmail_name",
+                          :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+              <span class="wmail_txt" style="float:left; margin-right:5px;color:#6e6e6e;"><%= l(:label_forum_new) %></span>
+
+              <%= link_to truncate(forum.name,length: 30,omission: '...'),forum_url(forum,:token => @token.value),
+                          :class => 'wmail_info',
+                          :style => "color:#5a5a5a; float:left;   margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+              %>
+              <span class="wmail_date" style="color:#6e6e6e; float:right;display:block; margin-left:10px;"><%= format_time(forum.created_at) %></span></li>
+
+        <% end %>
+
+        <div class="cl"></div>
+      </ul><!-- 新建贴吧 end-->
+      <% end %>
+      <% unless @memos.first.nil? %>
+          <ul class="wmail_ul" style="margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:720px; margin-bottom:15px;">
+            <h4 class="wmail_h4" style="color:#474646; font-size:14px; margin-bottom:5px;" >
+              <%= l(:label_user_message_forum) %>
+              <span class="wmail_num" style="color:#fe3f0c; margin-left:5px; font-weight:normal;">(<%= @memos.count %>)</span>
+            </h4>
+
+            <% @memos.each do |memo|%>
+                <li  style="clear: both; list-style: none;">
+                  <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
+
+                  <%= link_to memo.author, user_activities_url(memo.author,:token => @token.value),
+                              :class => "wmail_name",
+                              :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+                  <span class="wmail_txt" style="float:left; margin-right:5px;color:#6e6e6e;"><%= l(:label_memo_new_from_forum) %></span>
+
+                  <%= link_to truncate(memo.subject,length: 30,omission: '...'),forum_memo_url(memo.forum, (memo.parent_id.nil? ? memo : memo.parent_id)),
+                              :class => 'wmail_info',
+                              :style => "color:#5a5a5a; float:left;   margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+                  %>
+                  <span class="wmail_date" style="color:#6e6e6e; float:right;display:block; margin-left:10px;"><%= format_time(memo.created_at) %></span></li>
+
+            <% end %>
+
+            <div class="cl"></div>
+          </ul><!-- 新建贴吧 end-->
+      <% end %>
+    </div><!--贴吧动态 end-->
+<% end %>
   <div class="wmail_foot" style="margin-top:20px;color:#2775d2; margin-left:10px;">
     <%= link_to l(:mail_footer), @user_url, :style => "margin-top:20px;color:#2775d2; margin-left:10px;" %>
   </div>
diff --git a/app/views/mailer/send_for_user_activities.text.erb b/app/views/mailer/send_for_user_activities.text.erb
index 03ea31ec3..b7d0553e3 100644
--- a/app/views/mailer/send_for_user_activities.text.erb
+++ b/app/views/mailer/send_for_user_activities.text.erb
@@ -1,3 +1,6 @@
+<%= @subject %>
+<% if @attachments.first || @course_news.first || @bids.first ||
+        @homeworks.first || @course_journal_messages.first|| @course_messages.first %>
 <%= l(:label_course_overview)%>
   <% unless @course_news.first.nil? %>
          <%= l(:label_course_news) %>
@@ -9,19 +12,17 @@
            ▪
              [
 
-              <%= link_to course_new.course.name, [:controller  => 'courses', :action => 'show', :id => course_new.course_id, :token => @token.value],
-                          :class=> "wmail_column",
-                          :style=> "width:90px; font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+              <%= link_to truncate(course_new.course.name,length: 30,omission: '...'), course_url(course_new.course, :token => @token.value)%>
              ]
 
-              <%= link_to course_new.author, user_activities_url(course_new.author,:token => @token.value), :class => "wmail_name",
-                          :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px; width:50px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
+              <%= link_to course_new.author, user_activities_url(course_new.author,:token => @token.value)  
+                           %>
              <%= l(:label_project_notice) %>
 
-              <%= link_to course_new.title, [:controller => 'news', :action => 'show', :id => course_new.id,:token => @token.value],
-                          :class => 'wmail_info',
-                          :style => "color:#5a5a5a; float:left;  width:400px; margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
-              %> <%= course_new.created_on %>
+              <%= link_to truncate(course_new.title,length: 30,omission: '...'), news_url(course_new,:token => @token.value)
+                           
+                           
+              %> <%= format_time(course_new.created_on) %>
 
         <% end %>
 
@@ -33,20 +34,20 @@
                ▪
                 [
 
-                  <%= link_to bid.courses.first.name, [:controller  => 'courses', :action => 'show', :id => bid.courses.first.id, :token => @token.value],
-                              :class=> "wmail_column",
-                              :style=> "width:90px; font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+                  <%= link_to truncate(bid.courses.first.name,length: 30,omission: '...'),course_url(bid.courses.first, :token => @token.value)
+                               
+                                %>
                  ]
 
-                  <%= link_to bid.author, user_activities_url(bid.author,:token => @token.value), :class => "wmail_name",
-                              :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px; width:50px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
+                  <%= link_to bid.author, user_activities_url(bid.author,:token => @token.value)  
+                               %>
                <%= l(:label_course_homework) %>
 
-                  <%= link_to bid.name, course_for_bid(:id => bid.id,:token => @token.value),
-                              :class => 'wmail_info',
-                              :style => "color:#5a5a5a; float:left;  width:400px; margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+                  <%= link_to truncate(bid.name,length: 30,omission: '...'), course_for_bid_url(bid,:token => @token.value)
+                               
+                               
                   %>
-                 <%= bid.created_on %>
+                 <%= format_time(bid.created_on) %>
 
             <% end %>
         <% end %>
@@ -54,20 +55,20 @@
             <% @homeworks.each do |homework| %>
                 ▪[
 
-                  <%= link_to homework.bid.courses.first.name, [:controller  => 'courses', :action => 'show', :id => homework.bid.courses.first.id, :token => @token.value],
-                              :class=> "wmail_column",
-                              :style=> "width:90px; font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+                  <%= link_to truncate(homework.bid.courses.first.name,length: 30,omission: '...'), course_url(homework.bid.courses.first, :token => @token.value)
+                               
+                                %>
                   ]
 
-                  <%= link_to homework.user, user_activities_url(homework.user,:token => @token.value), :class => "wmail_name",
-                              :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px; width:50px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
+                  <%= link_to homework.user, user_activities_url(homework.user,:token => @token.value)  
+                               %>
                <%= l(:label_course_submit_homework) %>
 
-                  <%= link_to homework.name, course_for_bid(:id => homework.bid.id,:token => @token.value),
-                              :class => 'wmail_info',
-                              :style => "color:#5a5a5a; float:left;  width:400px; margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+                  <%= link_to truncate(homework.name,length: 30,omission: '...'), course_for_bid_url(homework.bid,:token => @token.value)
+                               
+                               
                   %>
-               <%= homework.created_on %>  </li>
+               <%= format_time(homework.created_at) %>  
             <% end %>
         <% end %>
 
@@ -84,20 +85,20 @@
 
               [
 
-              <%= link_to course_journal_message.course.name, [:controller  => 'courses', :action => 'show', :id => course_journal_message.jour_id, :token => @token.value],
-                          :class=> "wmail_column",
-                          :style=> "width:90px; font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+              <%= link_to truncate(course_journal_message.course.name,length: 30,omission: '...'), course_url(course_journal_message.course, :token => @token.value)
+                           
+                            %>
              ]
 
-              <%= link_to course_journal_message.user, user_activities_url(course_journal_message.user,:token => @token.value), :class => "wmail_name",
-                          :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px; width:50px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
+              <%= link_to course_journal_message.user, user_activities_url(course_journal_message.user,:token => @token.value)  
+                           %>
             <%= l(:label_send_course_journals_for_messages) %>
 
-              <%= link_to course_journal_message.notes, [:controller => 'courses', :action => 'feedback', :id => course_journal_message.jour_id,:token => @token.value],
-                          :class => 'wmail_info',
-                          :style => "color:#5a5a5a; float:left;  width:400px; margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+              <%= link_to truncate(course_journal_message.notes,length: 30,omission: '...'), course_feedback_url(course_journal_message.course,:token => @token.value)
+                           
+                           
               %>
-              <%= course_journal_message.created_on %>
+              <%= format_time(course_journal_message.created_on) %>
 
         <% end %>
 
@@ -115,20 +116,20 @@
               ▪
               [
 
-              <%= link_to course_message.course.name, [:controller  => 'courses', :action => 'show', :id => course_message.course.id, :token => @token.value],
-                          :class=> "wmail_column",
-                          :style=> "width:90px; font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+              <%= link_to truncate(course_message.course.name,length: 30,omission: '...'), course_url(course_message.course, :token => @token.value)
+                           
+                            %>
               ]
 
-              <%= link_to course_message.author, user_activities_url(course_message.author,:token => @token.value), :class => "wmail_name",
-                          :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px; width:50px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
+              <%= link_to course_message.author, user_activities_url(course_message.author,:token => @token.value)
+                           %>
               <%= l(:label_send_course_messages) %>
 
-              <%= link_to course_message.subject,url_for(course_message.event_url(:token => @token.value)),
-                          :class => 'wmail_info',
-                          :style => "color:#5a5a5a; float:left;  width:400px; margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+              <%= link_to truncate(course_message.subject,length: 30,omission: '...'),board_message_url(course_message, :board_id => course_message.board_id,:token => @token.value)
+                           
+                           
               %>
-              <%= course_message.created_on %>
+              <%= format_time(course_message.created_on) %>
 
         <% end %>
 
@@ -144,29 +145,29 @@
         <% @attachments.each do |attachment|%>
             ▪[
 
-              <%= link_to attachment.course.name, [:controller  => 'courses', :action => 'show', :id => attachment.course.id, :token => @token.value],
-                          :class=> "wmail_column",
-                          :style=> "width:90px; font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+              <%= link_to truncate(attachment.course.name,length: 30,omission: '...'), course_url(attachment.course, :token => @token.value)
+                           
+                            %>
               ]
 
-              <%= link_to attachment.author, user_activities_url(attachment.author,:token => @token.value), :class => "wmail_name",
-                          :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px; width:50px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
+              <%= link_to attachment.author, user_activities_url(attachment.author,:token => @token.value)
+                           %>
               <%= l(:label_course_file_upload) %>
 
-              <%= link_to attachment.filename,course_files_path(@course,:token => @token.value),
-                          :class => 'wmail_info',
-                          :style => "color:#5a5a5a; float:left;  width:400px; margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+              <%= link_to truncate(attachment.filename,length: 30,omission: '...'),course_files_url(attachment.course,:token => @token.value)
+                           
+                           
               %>
-              <%= course_message.created_on %>
+              <%= format_time(attachment.created_on) %>
             </li>
         <% end %>
 
       </ul><!--课件下载  end-->
   <% end %>
-</div><!--课程动态  end-->
+<% end %><!--课程动态  end-->
 
-
-<%= l(:label_project_overview)%>
+<% @issues.first || @project_messages.first %>
+<%= l(:label_project_overview_new)%>
   <% unless @issues.first.nil? %>
 
           <%= l(:label_issue_tracking) %>
@@ -176,20 +177,20 @@
             ▪
              [
 
-              <%= link_to issue.project.name, [:controller  => 'projects', :action => 'show', :id => issue.project.id, :token => @token.value],
-                          :class=> "wmail_column",
-                          :style=> "width:90px; font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+              <%= link_to truncate(issue.project.name,length: 30,omission: '...'), project_url(issue.project, :token => @token.value)
+                           
+                            %>
               ]
 
-              <%= link_to issue.author, user_activities_url(issue.author,:token => @token.value), :class => "wmail_name",
-                          :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px; width:50px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
+              <%= link_to issue.author, user_activities_url(issue.author,:token => @token.value)
+                           %>
              <%= l(:label_project_issue) %>
 
-              <%= link_to issue.subject,url_for(:controller  => 'issues', :action => 'show', :id => issue.id,  :token => @token.value),
-                          :class => 'wmail_info',
-                          :style => "color:#5a5a5a; float:left;  width:400px; margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+              <%= link_to truncate(issue. subject,length: 30,omission: '...'),issue_url(issue,  :token => @token.value)
+                           
+                           
               %>
-              <%= issue.created_on %>
+              <%= format_time(issue.created_on) %>
         <% end %>
 
 
@@ -198,34 +199,34 @@
   <% unless @project_messages.first.nil? %>
 
           <%= l(:project_moule_boards_show) %>
-         (<%= @course_journal_messages.count %>)
+         (<%= @project_messages.count %>)
 
         <% @project_messages.each do |project_message|%>
           ▪[
 
-              <%= link_to project_message.project.name, [:controller  => 'projects', :action => 'show', :id => project_message.project.id, :token => @token.value],
-                          :class=> "wmail_column",
-                          :style=> "width:90px; font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
-              ]
+              <%= link_to truncate(project_message.project.name,length: 30,omission: '...'), project_url(project_message.project, :token => @token.value)
+                           
+                          %>
+        ]
 
-              <%= link_to project_message.author, user_activities_url(project_message.author,:token => @token.value), :class => "wmail_name",
-                          :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px; width:50px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
+              <%= link_to project_message.author, board_message_url(project_message, :board_id => project_message.board_id,:token => @token.value)
+                           %>
               <%= l(:label_send_course_messages) %>
 
-              <%= link_to project_message.subject,url_for(project_message.event_url(:token => @token.value)),
-                          :class => 'wmail_info',
-                          :style => "color:#5a5a5a; float:left;  width:400px; margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+              <%= link_to truncate(project_message. subject,length: 30,omission: '...'),board_message_url(project_message, :board_id => project_message.board_id,:token => @token.value)
+                           
+                           
               %>
-              <%= project_message.created_on %>
+              <%= format_time(project_message.created_on) %>
         <% end %>
 
 
   <% end %>
 
 
-
+<% unless @user_journal_messages.first.nil? %>
 <%= l(:label_activities) %>
-  <% unless @user_journal_messages.first.nil? %>
+
 
           <%= l(:label_user_message) %>
           (<%= @user_journal_messages.count %>)
@@ -233,21 +234,63 @@
         <% @user_journal_messages.each do |user_journal_message|%>
            ▪
 
-              <%= link_to user_journal_message.user, user_activities_url(course_journal_message.user,:token => @token.value),
-                          :class => "wmail_name",
-                          :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px; width:50px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+              <%= link_to user_journal_message.user, user_activities_url(user_journal_message.user,:token => @token.value)
+                           
+                            %>
               <%= l(:label_show_your_message) %>
 
-              <%= link_to user_journal_message.notes, [:controller => 'courses', :action => 'feedback', :id => course_journal_message.jour_id,:token => @token.value],
-                          :class => 'wmail_info',
-                          :style => "color:#5a5a5a; float:left;  width:400px; margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+              <%= link_to truncate(user_journal_message.notes,length: 30,omission: '...'), feedback_url(@user,:token => @token.value)
+                           
+                           
               %>
-             <%= user_journal_message.created_on %>
+             <%= format_time(user_journal_message.created_on) %>
 
         <% end %>
 
 
-  <% end %>
-<
+<% end %>
+<% if @forums.first || @memos.first %>
+    <%= l(:lable_bar_active) %>
+      <% unless @forums.first.nil? %>
+
+              <%= l(:label_user_forum) %>
+             (<%= @forums.count %>)
+
+            <% @forums.each do |forum|%>
+                ▪
+
+                  <%= link_to forum.author, user_activities_url(forum.author,:token => @token.value) %>
+                  <%= l(:label_forum_new) %>
+
+                  <%= link_to truncate(forum.name,length: 30,omission: '...'),forum_url(forum,:token => @token.value)
+                             %>
+                  <%= format_time(forum.created_at) %>
+
+            <% end %>
+
+          <!-- 新建贴吧 end-->
+      <% end %>
+      <% unless @memos.first.nil? %>
+
+              <%= l(:label_user_message_forum) %>
+              (<%= @memos.count %>)
+
+            <% @memos.each do |memo|%>
+                ▪
+
+                  <%= link_to memo.author, user_activities_url(memo.author,:token => @token.value)%>
+                  <%= l(:label_memo_new_from_forum) %>
+
+                  <%= link_to truncate(memo.subject,length: 30,omission: '...'),forum_memo_url(memo.forum, (memo.parent_id.nil? ? memo : memo.parent_id))
+                              %>
+                  <%= format_time(memo.created_at) %>
+
+            <% end %>
+
+
+         <!-- 新建贴吧 end-->
+      <% end %>
+    <!--贴吧动态 end-->
+<% end %>
 
   <%= link_to l(:mail_footer), @user_url, :style => "margin-top:20px;color:#2775d2; margin-left:10px;" %>
diff --git a/config/application.rb b/config/application.rb
index 100beb93c..3b36d7cb7 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -17,9 +17,7 @@ module RedmineApp
     # -- all .rb files in that directory are automatically loaded.
 
     #verifier if email is real
-    EmailVerifier.config do |config|
-      config.verifier_email = "alanlong9278@126.com"
-    end
+   
 
     config.generators do |g|
          g.test_framework :rspec,
diff --git a/config/initializers/send_mail.rb b/config/initializers/send_mail.rb
index 4cfd3cc03..86b3a53fd 100644
--- a/config/initializers/send_mail.rb
+++ b/config/initializers/send_mail.rb
@@ -6,18 +6,22 @@ require 'rufus-scheduler'
 #users = User.where("mail_notification = 'week' or mail_notification = 'day'")
 
 scheduler = Rufus::Scheduler.new
-scheduler.cron('*/1 * * * *') do
-  users = User.where("login like '%alan%'")
+scheduler.cron('0 0 * * 1') do
+  users = User.where("mail_notification = 'week'")
   users.each do |user|
-    # if user.mail_notification == "week"
-    #     cycle = '*/1 * * * *'
-    # else
-    #   cycle = '*/2 * * * *'
-    # end
-    Rails.logger.info "send mail to #{user.show_name}(#{user.mail}) at #{Time.now}"
+  #Rails.logger.info "send mail to #{user.show_name}(#{user.mail}) at #{Time.now}"
     Thread.start do
       Mailer.send_for_user_activities(user, Date.today, 7).deliver
     end
   end
 end
+scheduler.cron('0 0 * * *') do
+  users = User.where("mail_notification = 'day'")
+  users.each do |user|
+    #Rails.logger.info "send mail to #{user.show_name}(#{user.mail}) at #{Time.now}"
+    Thread.start do
+      Mailer.send_for_user_activities(user, Date.today, 1).deliver
+    end
+  end
+end
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 9d6172f23..db5d698ef 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -616,8 +616,8 @@ en:
   label_document_new: New document
   label_document_plural: Documents
   label_document_added: Document added
-  label_forum_message_added: Message added
-  label_forum_add: Forum added
+  label_forum_message_added: Forum's message added
+  #label_forum_add: Forum added
   label_document_public_info: "If you don't choose public, only the project's members can see the document."
   label_role: Role
   label_role_plural: Roles
@@ -2089,4 +2089,4 @@ en:
   label_anonymous: Anonymous
   label_submit_comments: Submit_comments
   label_course_empty_select: You have not selected course！
-  label_enterprise_page_made: enterprise_page
+  label_enterprise_page_made: enterprise_page
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 472bf6fe2..ac35990fa 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -573,7 +573,7 @@ zh:
   label_document_new: 新建文档
   label_document_plural: 文档
   label_document_added: 文档已添加
-  label_forum_message_added: 发帖成功
+  label_forum_message_added: 贴吧发帖成功
   label_forum_add: 贴吧创建成功
   label_message_reply: 回帖人
   label_document_public_info: （打钩为公开，不打钩则不公开，若不公开，仅项目成员可见该文档。）
@@ -664,6 +664,8 @@ zh:
   label_user_login_attending_contest: 您还没有登录，请登录后参赛
   label_user_login_score_and_comment: 您还没有登录，请登录后对作品进行打分评价
   label_user_login_notificationcomment: 您还没有登录，请登录后参加评论
+  label_user_forum: 您的贴吧
+  label_user_message_forum: 您的帖子
   label_user_message: 您的留言
   label_show_your_message: 给您的留言
   #end
@@ -755,7 +757,8 @@ zh:
   label_settings: 配置
   label_overview: 近期动态
   label_course_overview: "课程动态"
-  label_project_overview: "项目动态"
+  label_project_overview_new: "项目动态"
+  label_forums_overview: "贴吧动态"
   label_homework_overview: 作业动态
   label_question_student: 作业交流 #bai
   label_homework_commit: 提交作业 #huang
@@ -968,7 +971,9 @@ zh:
   label_theme: 主题
   label_default: 默认
   label_search_titles_only: 仅在标题中搜索
-  label_user_mail_option_all: "收取我的项目的所有通知"
+  label_user_mail_option_all: "收取我的所有通知"
+  label_user_mail_option_week: "按周收取我的所有通知"
+  label_user_mail_option_day: "按天收取我的所有通知"
   label_must_answer: "必答"
   label_poll_title: 问卷调查_问卷页面
   #huang
diff --git a/lib/redmine/notifiable.rb b/lib/redmine/notifiable.rb
index 42a81980f..26ad31966 100644
--- a/lib/redmine/notifiable.rb
+++ b/lib/redmine/notifiable.rb
@@ -20,9 +20,7 @@ module Redmine
       notifications << Notifiable.new('message_posted')
       notifications << Notifiable.new('wiki_content_added')
       notifications << Notifiable.new('wiki_content_updated')
-      notifications << Notifiable.new('forum_add')
-      notifications << Notifiable.new('forum_message_added', 'forum_add')
-      notifications
+      notifications << Notifiable.new('forum_message_added')
     end
   end
 end

From aa8f58530cd7a641ae8bec96805fbe9e58b058ad Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Wed, 11 Feb 2015 23:34:10 +0800
Subject: [PATCH 08/22] =?UTF-8?q?=E7=BB=99=E9=BB=84=E6=80=BB=E6=8F=90?=
 =?UTF-8?q?=E4=BE=9B=E6=8E=A5=E5=8F=A3=20Signed-off-by:=20alan=20<54753343?=
 =?UTF-8?q?4@qq.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/projects_controller.rb        | 11 +++++++++
 app/models/mailer.rb                          | 20 ++++++++++++++++
 app/models/memo_observer.rb                   |  1 -
 app/services/users_service.rb                 | 24 +++++++++++++++++++
 .../mailer/send_invite_in_project.html.erb    | 17 +++++++++++++
 .../mailer/send_invite_in_project.text.erb    |  2 ++
 config/locales/zh.yml                         |  1 +
 7 files changed, 75 insertions(+), 1 deletion(-)
 create mode 100644 app/views/mailer/send_invite_in_project.html.erb
 create mode 100644 app/views/mailer/send_invite_in_project.text.erb

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 5054fd5c1..41ec5fbf4 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -249,6 +249,17 @@ class ProjectsController < ApplicationController
   # Description  项目动态展示方法，删除了不必要的代码
   def show
     # 试图跳转到请求的按钮
+    if params[:login]
+      login = params[:login]
+      login = login.sub(/%40/,'@')
+      mail = params[:login]
+      password = params[:password]
+      us = UsersService.new
+      user = us.register_auto(login,mail, password)
+      Member.create(:role_ids => [4], :user_id => user.id,:project_id => @project.id)
+      UserGrade.create(:user_id => user.id, :project_id => @project.id)
+      User.current = user unless User.current.nil?
+    end
     if params[:jump] && redirect_to_project_menu_item(@project, params[:jump])
       return
     end
diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index e8af704d8..4da1f9b42 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -27,6 +27,17 @@ class Mailer < ActionMailer::Base
     { :host => Setting.host_name, :protocol => Setting.protocol }
   end
 
+  # author: alan
+  # 发送邀请未注册用户加入项目邮件
+  # 功能： 在加入项目的同时自动注册用户
+  def  send_invite_in_project(email, project, invitor)
+    @subject = "#{invitor.name} #{l(:label_invite_project)} #{project.name} "
+    password = newpass(6)
+    @project_url = url_for(:controller => 'projects', :action => 'show', :id => project.id,
+                           :password => password,  :login => email)
+    mail :to => email, :subject => @subject
+  end
+
   # author: alan
   # 根据用户选择发送个人日报或周报
   # 发送内容： 项目【缺陷，讨论区，新闻】，课程【通知，留言，新闻】， 贴吧， 个人留言
@@ -828,4 +839,13 @@ class Mailer < ActionMailer::Base
       end
     end
   end
+
+  # author: alan
+  # 功能： 生成len位随机字符串
+  def newpass(len)
+    chars = ("a".."z").to_a + ("A".."Z").to_a + ("0".."9").to_a
+    newpass = ""
+    1.upto(len) { |i| newpass << chars[rand(chars.size-1)] }
+    return newpass
+  end
 end
diff --git a/app/models/memo_observer.rb b/app/models/memo_observer.rb
index e50bcf5a2..66cabe923 100644
--- a/app/models/memo_observer.rb
+++ b/app/models/memo_observer.rb
@@ -3,7 +3,6 @@ class MemoObserver < ActiveRecord::Observer
 
     thread1=Thread.new do
       Mailer.forum_message_added(memo).deliver if Setting.notified_events.include?('forum_message_added')
-
     end
   end
 end
diff --git a/app/services/users_service.rb b/app/services/users_service.rb
index 897171b55..b9962a2a8 100644
--- a/app/services/users_service.rb
+++ b/app/services/users_service.rb
@@ -44,7 +44,31 @@ class UsersService
     #location = get_user_location @user
     #{:id => @user.id, :img_url => img_url, :nickname => @user.login, :gender => gender, :work_unit => work_unit, :mail => @user.mail, :location => location, :brief_introduction => @user.user_extensions.brief_introduction}
   end
+  def register_auto(login,mail,password)
+    @user = User.new
+    @user.admin = false
+    @user.register
+    @user.login = login
+    @user.mail =mail
+    password_confirmation = password
+    should_confirmation_password = true
+    if !password.blank? && !password_confirmation.blank? && should_confirmation_password
+      @user.password, @user.password_confirmation = password, password_confirmation
+    elsif !password.blank? && !should_confirmation_password
+      @user.password = password
+    else
+      @user.password = ""
+    end
 
+    @user = automatically_register(@user)
+
+    if @user.id != nil
+      ue = @user.user_extensions ||= UserExtensions.new
+      ue.user_id = @user.id
+      ue.save
+    end
+    @user
+  end
   #显示用户
   #id用户id
   def show_user(params)
diff --git a/app/views/mailer/send_invite_in_project.html.erb b/app/views/mailer/send_invite_in_project.html.erb
new file mode 100644
index 000000000..980adc12d
--- /dev/null
+++ b/app/views/mailer/send_invite_in_project.html.erb
@@ -0,0 +1,17 @@
+
+<div class="mail_box" style="border:1px solid #c8c8c8; width:570px; height: auto; padding:15px; margin-top:10px; margin-bottom:10px;">
+  <ul style="list-style-type:none; margin:0; padding:0;">
+
+    <li style="list-style-type:none; margin:0; padding:0;"><span style="float: left;"><strong><%= l(:mail_issue_content)%></strong></span>
+		<span style="float: left; width: 526px">
+        	<p><%= @subject %> </p>
+           <p> <%= link_to @project_url, @project_url%></p>
+        </span>
+    </li>
+
+  </ul>
+
+  <div class="cl" style="margin-top: 30px; clear:both; overflow:hidden;"></div>
+</div>
+
+
diff --git a/app/views/mailer/send_invite_in_project.text.erb b/app/views/mailer/send_invite_in_project.text.erb
new file mode 100644
index 000000000..6ee038055
--- /dev/null
+++ b/app/views/mailer/send_invite_in_project.text.erb
@@ -0,0 +1,2 @@
+<%= @subject %>
+<%= link_to @project_url, @project_url%>
\ No newline at end of file
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index ac35990fa..2d132d92f 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1917,6 +1917,7 @@ zh:
     
   label_bids_task_list: 作业列表
   label_join_course: 加入
+  label_invite_project: 邀请您加入项目
   label_exit_course: 退出
   label_exit_group: 退出当前分班
   label_new_join: 加入

From c00deabf7507739edd242f3cb83bbd6b413e61f8 Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Thu, 12 Feb 2015 00:15:10 +0800
Subject: [PATCH 09/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=8A=E9=82=AE?=
 =?UTF-8?q?=E4=BB=B6=E6=A0=B7=E5=BC=8F=E3=80=8B=20Signed-off-by:=20alan=20?=
 =?UTF-8?q?<547533434@qq.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/mailer.rb                               | 2 +-
 app/views/mailer/send_for_user_activities.html.erb | 4 ++--
 app/views/mailer/send_for_user_activities.text.erb | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index 4da1f9b42..14c01b93d 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -134,7 +134,7 @@ class Mailer < ActionMailer::Base
     @issue_author_url = url_for(user_activities_url(@author))
     recipients ||= []
     if @forum.author.mail_notification != 'day' && @forum.author.mail_notification != 'week'
-      recipients << @forum.author.mail
+      recipients << @forum.creator.mail
     end
     if @author.mail_notification != 'day' && @author.mail_notification != 'week'
       recipients << @author.mail
diff --git a/app/views/mailer/send_for_user_activities.html.erb b/app/views/mailer/send_for_user_activities.html.erb
index ed7877360..1735bd899 100644
--- a/app/views/mailer/send_for_user_activities.html.erb
+++ b/app/views/mailer/send_for_user_activities.html.erb
@@ -319,7 +319,7 @@
             <li  style="clear: both; list-style: none;">
               <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
 
-              <%= link_to forum.author, user_activities_url(forum.author,:token => @token.value),
+              <%= link_to forum.creator, user_activities_url(forum.creator,:token => @token.value),
                           :class => "wmail_name",
                           :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
               <span class="wmail_txt" style="float:left; margin-right:5px;color:#6e6e6e;"><%= l(:label_forum_new) %></span>
@@ -349,7 +349,7 @@
                   <%= link_to memo.author, user_activities_url(memo.author,:token => @token.value),
                               :class => "wmail_name",
                               :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
-                  <span class="wmail_txt" style="float:left; margin-right:5px;color:#6e6e6e;"><%= l(:label_memo_new_from_forum) %></span>
+                  <span class="wmail_txt" style="float:left; margin-right:5px;color:#6e6e6e;"><%= memo.parent_id.nil? ? l(:label_memo_new_from_forum) : l(:label_reply)  %></span>
 
                   <%= link_to truncate(memo.subject,length: 30,omission: '...'),forum_memo_url(memo.forum, (memo.parent_id.nil? ? memo : memo.parent_id)),
                               :class => 'wmail_info',
diff --git a/app/views/mailer/send_for_user_activities.text.erb b/app/views/mailer/send_for_user_activities.text.erb
index b7d0553e3..4de42b8aa 100644
--- a/app/views/mailer/send_for_user_activities.text.erb
+++ b/app/views/mailer/send_for_user_activities.text.erb
@@ -259,7 +259,7 @@
             <% @forums.each do |forum|%>
                 ▪
 
-                  <%= link_to forum.author, user_activities_url(forum.author,:token => @token.value) %>
+                  <%= link_to forum.creator, user_activities_url(forum.creator,:token => @token.value) %>
                   <%= l(:label_forum_new) %>
 
                   <%= link_to truncate(forum.name,length: 30,omission: '...'),forum_url(forum,:token => @token.value)
@@ -279,7 +279,7 @@
                 ▪
 
                   <%= link_to memo.author, user_activities_url(memo.author,:token => @token.value)%>
-                  <%= l(:label_memo_new_from_forum) %>
+                  <%= memo.parent_id.nil? ? l(:label_memo_new_from_forum) : l(:label_reply) %>
 
                   <%= link_to truncate(memo.subject,length: 30,omission: '...'),forum_memo_url(memo.forum, (memo.parent_id.nil? ? memo : memo.parent_id))
                               %>

From 196ceff138478718051aa639d25885ca7a21e1c7 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Thu, 12 Feb 2015 15:51:52 +0800
Subject: [PATCH 10/22] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E7=9A=84=E6=8E=A5=E5=8F=A3=E8=A1=A5=E4=B8=8A=E5=BD=93=E5=89=8D?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=98=AF=E5=90=A6=E4=B8=BA=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E6=88=90=E5=91=98=EF=BC=8C=E8=AF=BE=E7=A8=8B=E8=80=81=E5=B8=88?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/courses_service.rb  | 4 ++--
 app/services/homework_service.rb | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb
index 0304722de..7fa78b635 100644
--- a/app/services/courses_service.rb
+++ b/app/services/courses_service.rb
@@ -211,7 +211,7 @@ class CoursesService
       @course.members << m
       @course.course_infos << course
     end
-    @course
+    {:course => @course,:img_url => url_to_avatar(@course),:current_user_is_member => current_user.member_of_course?(@course),:current_user_is_teacher => is_course_teacher(current_user,@course)}
   end
 
   #验证编辑课程的权限
@@ -248,7 +248,7 @@ class CoursesService
         course_status = CourseStatus.create(:course_id => course.id,  :grade => 0)
       end
     end
-    course
+    {:course => course,:img_url => url_to_avatar(course),:current_user_is_member => current_user.member_of_course?(course),:current_user_is_teacher => is_course_teacher(current_user,course)}
   end
 
   #退出课程
diff --git a/app/services/homework_service.rb b/app/services/homework_service.rb
index b468e1110..dd2d2356e 100644
--- a/app/services/homework_service.rb
+++ b/app/services/homework_service.rb
@@ -6,6 +6,7 @@ class HomeworkService
    include WordsHelper
    include ApiHelper
    include HomeworkAttachHelper
+   include CoursesHelper
    
   # 作业详情（老师才显示启动匿评，学生不显示 ）
   # many_times 第几次（作业）
@@ -276,7 +277,7 @@ class HomeworkService
         hw = bid.homeworks.where("user_id = #{current_user.id}")
         my_homeworks << hw[0] unless (hw.nil? || hw[0].nil?)
       end
-      course_list << {:course => mp.course,:img_url => url_to_avatar(mp.course),:my_homework => my_homeworks}
+      course_list << {:course => mp.course,:img_url => url_to_avatar(mp.course),:my_homework => my_homeworks,:current_user_is_member => current_user.member_of_course?(mp.course),:current_user_is_teacher => is_course_teacher(current_user,mp.course)}
     end
     course_list
   end

From 2f762973b46fd3d1fedcd156fdd51538e0c57532 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Sun, 1 Mar 2015 16:32:10 +0800
Subject: [PATCH 11/22] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E=E6=95=B0=E6=8D=AE=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/mobile/entities/course_dynamic.rb | 9 ++++-----
 app/services/courses_service.rb           | 8 +++++++-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/api/mobile/entities/course_dynamic.rb b/app/api/mobile/entities/course_dynamic.rb
index 11f8c2682..5e22e3df7 100644
--- a/app/api/mobile/entities/course_dynamic.rb
+++ b/app/api/mobile/entities/course_dynamic.rb
@@ -6,12 +6,11 @@ module Mobile
           c[field] if (c.is_a?(Hash) && c.key?(field))
         end
       end
-
+      course_dynamic_expose :type
+      course_dynamic_expose :count
       course_dynamic_expose :course_name
-      course_dynamic_expose :need_anonymous_comments_count
-      course_dynamic_expose :student_commit_number
-      course_dynamic_expose :news_count
-      course_dynamic_expose :message_count
+      course_dynamic_expose :course_id
+      course_dynamic_expose :course_img_url
     end
   end
 end
\ No newline at end of file
diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb
index 7fa78b635..ab0a53744 100644
--- a/app/services/courses_service.rb
+++ b/app/services/courses_service.rb
@@ -345,7 +345,13 @@ class CoursesService
     end
     news_count = course.news.count
     message_count = course.journals_for_messages.count
-    {:course_name => course.name,:need_anonymous_comments_count=>need_anonymous_comments_count,:student_commit_number=>student_commit_number,:news_count=> news_count,:message_count=>message_count}
+    result = []
+    result << {:course_name => course.name,:course_id => course.id,:course_img_url => url_to_avatar(course),:type => 1,:count => message_count}
+    result << {:course_name => course.name,:course_id => course.id,:course_img_url => url_to_avatar(course),:type => 2,:count => need_anonymous_comments_count}
+    result << {:course_name => course.name,:course_id => course.id,:course_img_url => url_to_avatar(course),:type => 3,:count => student_commit_number}
+    result << {:course_name => course.name,:course_id => course.id,:course_img_url => url_to_avatar(course),:type => 4,:count => news_count}
+    #{:course_name => course.name,:need_anonymous_comments_count=>need_anonymous_comments_count,:student_commit_number=>student_commit_number,:news_count=> news_count,:message_count=>message_count}
+    result
   end
 
   private

From 18271946d79c68971267e644d3770551b6d880c8 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Sun, 1 Mar 2015 17:31:38 +0800
Subject: [PATCH 12/22] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=EF=BC=8C=E8=AF=BE=E7=A8=8B=E4=BD=9C=E4=B8=9A=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E=E6=95=B0=E6=8D=AE=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9=EF=BC=88=E5=A2=9E=E5=8A=A0=E4=BA=86?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E4=BD=9C=E8=80=85=E7=9B=B8=E5=85=B3=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/mobile/entities/homework.rb   | 10 ++++++++--
 app/controllers/courses_controller.rb |  3 ++-
 app/services/courses_service.rb       |  6 +++---
 app/services/homework_service.rb      |  2 +-
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/app/api/mobile/entities/homework.rb b/app/api/mobile/entities/homework.rb
index 9be9bc53e..5b996c1af 100644
--- a/app/api/mobile/entities/homework.rb
+++ b/app/api/mobile/entities/homework.rb
@@ -18,8 +18,14 @@ module Mobile
       homework_expose :id
       #课程名称
       homework_expose :course_name
-      #课程老师
-      homework_expose :course_teacher
+      #作业发布者
+      expose :author,using: Mobile::Entities::User  do |f, opt|
+         f[:author]
+      end
+
+      #作业发布者真名
+      homework_expose :author_real_name
+
       #作业次数
       homework_expose :homework_times
       #作业名称
diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 19f9c0fa2..b6fc21bf9 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -98,7 +98,8 @@ class CoursesController < ApplicationController
   #更新课程信息
   def update
     cs = CoursesService.new
-    @course = cs.edit_course params,@course,User.current
+    c = cs.edit_course params,@course,User.current
+    @course = c[:course]
     if @course.errors.full_messages.count <= 0
         respond_to do |format|
           format.html {
diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb
index ab0a53744..1f5ca7894 100644
--- a/app/services/courses_service.rb
+++ b/app/services/courses_service.rb
@@ -3,7 +3,7 @@ class CoursesService
   include CoursesHelper
   include HomeworkAttachHelper
   include ApiHelper
-  #TODO:尚未整合权限系统
+
   #参数school_id为0或不传时返回所有课程，否则返回对应学校的课程
   #参数per_page_count分页功能，每页显示的课程数
   #参数page分页功能，当前页码
@@ -356,7 +356,7 @@ class CoursesService
 
   private
   def show_homework_info course,bid,current_user,is_course_teacher
-    author = bid.author.lastname + bid.author.firstname
+    author_real_name = bid.author.lastname + bid.author.firstname
     many_times = course.homeworks.index(bid) + 1
     name = bid.name
     homework_count = bid.homeworks.count  #已提交的作业数量
@@ -369,7 +369,7 @@ class CoursesService
     end
     #end
     open_anonymous_evaluation = bid.open_anonymous_evaluation
-    {:course_name => course.name,:id => bid.id, :course_teacher => author, :homework_times => many_times, :homework_name => name, :homework_count => homework_count,:student_questions_count => student_questions_count,
+    {:course_name => course.name,:id => bid.id, :author => bid.author,:author_real_name => author_real_name, :homework_times => many_times, :homework_name => name, :homework_count => homework_count,:student_questions_count => student_questions_count,
      :description => description, :homework_state => state,:open_anonymous_evaluation => open_anonymous_evaluation,:homework_for_anonymous_comments => homework_for_anonymous_comments}
   end
 
diff --git a/app/services/homework_service.rb b/app/services/homework_service.rb
index dd2d2356e..c5a333125 100644
--- a/app/services/homework_service.rb
+++ b/app/services/homework_service.rb
@@ -26,7 +26,7 @@ class HomeworkService
     state = @bid.comment_status
     #end
     open_anonymous_evaluation = @bid.open_anonymous_evaluation
-    {:course_name => course.name,:id => @bid.id, :course_teacher => author, :homework_times => many_times, :homework_name => name, :homework_count => homework_count,:student_questions_count => student_questions_count,
+    {:course_name => course.name,:id => @bid.id, :author => @bid.author,:author_real_name =>author,  :homework_times => many_times, :homework_name => name, :homework_count => homework_count,:student_questions_count => student_questions_count,
      :description => description, :homework_state => state,:open_anonymous_evaluation => open_anonymous_evaluation}
   end
   

From d999a9f4a64bc74b532029fd65a4fa0497bbd1e2 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 2 Mar 2015 14:33:35 +0800
Subject: [PATCH 13/22] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=96=B0=E5=BB=BA?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E6=97=B6=E6=8A=A5=E9=94=99=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/courses_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index b6fc21bf9..3c755ac41 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -499,7 +499,7 @@ class CoursesController < ApplicationController
 
   def create
     cs = CoursesService.new
-    @course = cs.create_course params,User.current
+    @course = cs.create_course(params,User.current)[:course]
     if @course.new_record?
       respond_to do |format|
         format.html { render :action => 'new', :layout => 'base' } #Added by young

From f374bfd7e22acc466e1000ec6d014c2d25c668db Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Mon, 2 Mar 2015 14:47:50 +0800
Subject: [PATCH 14/22] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E3=80=8A=E7=AA=97?=
 =?UTF-8?q?=E5=8F=A3=E8=B7=B3=E8=BD=AC=E9=97=AE=E9=A2=98=E3=80=8B=20Signed?=
 =?UTF-8?q?-off-by:=20alan=20<547533434@qq.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Gemfile                                       |   1 +
 app/controllers/account_controller.rb         |   2 +-
 config/environments/development.rb            |   6 +-
 config/environments/production.rb             |   2 +-
 config/initializers/session_store.rb          |   1 +
 lib/dalli-2.7.2/.yardoc/checksums             |  13 +
 lib/dalli-2.7.2/.yardoc/object_types          | Bin 0 -> 7548 bytes
 lib/dalli-2.7.2/.yardoc/objects/root.dat      | Bin 0 -> 121591 bytes
 lib/dalli-2.7.2/.yardoc/proxy_types           | Bin 0 -> 4 bytes
 lib/dalli-2.7.2/Gemfile                       |  12 +
 lib/dalli-2.7.2/History.md                    | 412 +++++++++++
 lib/dalli-2.7.2/LICENSE                       |  20 +
 lib/dalli-2.7.2/Performance.md                |  42 ++
 lib/dalli-2.7.2/README.md                     | 224 ++++++
 lib/dalli-2.7.2/Rakefile                      |  42 ++
 lib/dalli-2.7.2/dalli.gemspec                 |  29 +
 .../middleware/session/dalli_store.rb         |  81 ++
 .../lib/active_support/cache/dalli_store.rb   | 363 +++++++++
 lib/dalli-2.7.2/lib/dalli.rb                  |  46 ++
 lib/dalli-2.7.2/lib/dalli/cas/client.rb       |  58 ++
 lib/dalli-2.7.2/lib/dalli/client.rb           | 439 +++++++++++
 lib/dalli-2.7.2/lib/dalli/compressor.rb       |  29 +
 lib/dalli-2.7.2/lib/dalli/options.rb          |  64 ++
 lib/dalli-2.7.2/lib/dalli/railtie.rb          |   7 +
 lib/dalli-2.7.2/lib/dalli/ring.rb             | 142 ++++
 lib/dalli-2.7.2/lib/dalli/server.rb           | 696 ++++++++++++++++++
 lib/dalli-2.7.2/lib/dalli/socket.rb           | 108 +++
 lib/dalli-2.7.2/lib/dalli/version.rb          |   3 +
 lib/dalli-2.7.2/lib/rack/session/dalli.rb     |  75 ++
 lib/dalli-2.7.2/test/benchmark_test.rb        | 242 ++++++
 lib/dalli-2.7.2/test/helper.rb                |  55 ++
 lib/dalli-2.7.2/test/memcached_mock.rb        | 121 +++
 lib/dalli-2.7.2/test/sasldb                   |   1 +
 lib/dalli-2.7.2/test/test_active_support.rb   | 439 +++++++++++
 lib/dalli-2.7.2/test/test_cas_client.rb       | 107 +++
 lib/dalli-2.7.2/test/test_compressor.rb       |  53 ++
 lib/dalli-2.7.2/test/test_dalli.rb            | 625 ++++++++++++++++
 lib/dalli-2.7.2/test/test_encoding.rb         |  32 +
 lib/dalli-2.7.2/test/test_failover.rb         | 128 ++++
 lib/dalli-2.7.2/test/test_network.rb          |  54 ++
 lib/dalli-2.7.2/test/test_rack_session.rb     | 341 +++++++++
 lib/dalli-2.7.2/test/test_ring.rb             |  85 +++
 lib/dalli-2.7.2/test/test_sasl.rb             | 110 +++
 lib/dalli-2.7.2/test/test_serializer.rb       |  30 +
 lib/dalli-2.7.2/test/test_server.rb           |  80 ++
 45 files changed, 5416 insertions(+), 4 deletions(-)
 create mode 100644 config/initializers/session_store.rb
 create mode 100644 lib/dalli-2.7.2/.yardoc/checksums
 create mode 100644 lib/dalli-2.7.2/.yardoc/object_types
 create mode 100644 lib/dalli-2.7.2/.yardoc/objects/root.dat
 create mode 100644 lib/dalli-2.7.2/.yardoc/proxy_types
 create mode 100644 lib/dalli-2.7.2/Gemfile
 create mode 100644 lib/dalli-2.7.2/History.md
 create mode 100644 lib/dalli-2.7.2/LICENSE
 create mode 100644 lib/dalli-2.7.2/Performance.md
 create mode 100644 lib/dalli-2.7.2/README.md
 create mode 100644 lib/dalli-2.7.2/Rakefile
 create mode 100644 lib/dalli-2.7.2/dalli.gemspec
 create mode 100644 lib/dalli-2.7.2/lib/action_dispatch/middleware/session/dalli_store.rb
 create mode 100644 lib/dalli-2.7.2/lib/active_support/cache/dalli_store.rb
 create mode 100644 lib/dalli-2.7.2/lib/dalli.rb
 create mode 100644 lib/dalli-2.7.2/lib/dalli/cas/client.rb
 create mode 100644 lib/dalli-2.7.2/lib/dalli/client.rb
 create mode 100644 lib/dalli-2.7.2/lib/dalli/compressor.rb
 create mode 100644 lib/dalli-2.7.2/lib/dalli/options.rb
 create mode 100644 lib/dalli-2.7.2/lib/dalli/railtie.rb
 create mode 100644 lib/dalli-2.7.2/lib/dalli/ring.rb
 create mode 100644 lib/dalli-2.7.2/lib/dalli/server.rb
 create mode 100644 lib/dalli-2.7.2/lib/dalli/socket.rb
 create mode 100644 lib/dalli-2.7.2/lib/dalli/version.rb
 create mode 100644 lib/dalli-2.7.2/lib/rack/session/dalli.rb
 create mode 100644 lib/dalli-2.7.2/test/benchmark_test.rb
 create mode 100644 lib/dalli-2.7.2/test/helper.rb
 create mode 100644 lib/dalli-2.7.2/test/memcached_mock.rb
 create mode 100644 lib/dalli-2.7.2/test/sasldb
 create mode 100644 lib/dalli-2.7.2/test/test_active_support.rb
 create mode 100644 lib/dalli-2.7.2/test/test_cas_client.rb
 create mode 100644 lib/dalli-2.7.2/test/test_compressor.rb
 create mode 100644 lib/dalli-2.7.2/test/test_dalli.rb
 create mode 100644 lib/dalli-2.7.2/test/test_encoding.rb
 create mode 100644 lib/dalli-2.7.2/test/test_failover.rb
 create mode 100644 lib/dalli-2.7.2/test/test_network.rb
 create mode 100644 lib/dalli-2.7.2/test/test_rack_session.rb
 create mode 100644 lib/dalli-2.7.2/test/test_ring.rb
 create mode 100644 lib/dalli-2.7.2/test/test_sasl.rb
 create mode 100644 lib/dalli-2.7.2/test/test_serializer.rb
 create mode 100644 lib/dalli-2.7.2/test/test_server.rb

diff --git a/Gemfile b/Gemfile
index 1bc9e6629..3f07ad408 100644
--- a/Gemfile
+++ b/Gemfile
@@ -22,6 +22,7 @@ gem 'spreadsheet'
 gem 'ruby-ole'
 #gem 'email_verifier', path: 'lib/email_verifier'
 gem 'rufus-scheduler'
+gem 'dalli', path: 'lib/dalli-2.7.2'
 group :development do
   gem 'grape-swagger'
   gem 'grape-swagger-ui', git: 'https://github.com/guange2015/grape-swagger-ui.git'
diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index ff66b8d46..87c028354 100644
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -315,7 +315,7 @@ class AccountController < ApplicationController
     code = /\d*/
     #根据home_url生产正则表达式
     eval("code = " + "/^" + home_url.gsub(/\//,"\\\/") + "\\\/*(welcome)?\\\/*(\\\/index\\\/*.*)?\$/")
-    if code=~params[:back_url] && last_login_on != ''
+    if (code=~params[:back_url] || params[:back_url].to_s.include?('lost_password')) && last_login_on != ''
       redirect_to user_activities_path(user)
     else
       if last_login_on == ''
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 3b894d207..80d1c9db8 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -8,10 +8,12 @@ RedmineApp::Application.configure do
   # Log error messages when you accidentally call methods on nil.
   config.whiny_nils        = true
   config.logger = Logger.new('log/development.log', 'daily') # daily, weekly or monthly
+
+
   # Show full error reports and disable caching
   config.consider_all_requests_local = true
-  config.action_controller.perform_caching             = false
-  config.cache_store = :file_store,  "#{Rails.root }/public/tmp/"
+  config.action_controller.perform_caching             = true
+  config.cache_store = :dalli_store
   # Don't care if the mailer can't send
   config.action_mailer.raise_delivery_errors = true
 
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 48b2514cf..0b61ed132 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -3,7 +3,7 @@ RedmineApp::Application.configure do
   # The production environment is meant for finished, "live" apps.
   # Code is not reloaded between requests
   config.cache_classes = true
-
+  config.cache_store = :dalli_store
   #####
   # Customize the default logger (http://ruby-doc.org/core/classes/Logger.html)
   #
diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
new file mode 100644
index 000000000..603b22a9f
--- /dev/null
+++ b/config/initializers/session_store.rb
@@ -0,0 +1 @@
+Rails.application.config.session_store ActionDispatch::Session::CacheStore, :expire_after => 20.minutes
\ No newline at end of file
diff --git a/lib/dalli-2.7.2/.yardoc/checksums b/lib/dalli-2.7.2/.yardoc/checksums
new file mode 100644
index 000000000..10e718cb2
--- /dev/null
+++ b/lib/dalli-2.7.2/.yardoc/checksums
@@ -0,0 +1,13 @@
+lib/dalli.rb b1fd9d39df06608fcae5bcf46e9940f95b186d22
+lib/dalli/ring.rb e2cd42d8b963e669e2c8a83791fa56ec94f9ec55
+lib/dalli/server.rb a42d734f9b3d654886c86f04fb4f0352e7147b1e
+lib/dalli/client.rb 11afa0d702c68a151c87ea6e7ccdc863cf03884f
+lib/dalli/socket.rb 18b7243332ec2dafa9a17c195944e321b684e67e
+lib/dalli/options.rb d7ecb4c52b4ae2b222f319813234297e0951f82a
+lib/dalli/version.rb fff3231b7f52d7fa1dabb78bf1f67dcef95c5378
+lib/dalli/railtie.rb 63dc0fe85790a10225e867774f2c611d1c1ac46c
+lib/dalli/compressor.rb 13b0cf3f607bd8bc9f969679b0b6e9dcb0a059d7
+lib/dalli/cas/client.rb 983ded7ec738ed4502658150123e9c5ad7e3faa1
+lib/rack/session/dalli.rb 2696ad72e8f9d7f5ceb232db0c8d9a8916192edb
+lib/active_support/cache/dalli_store.rb 010d880e0f297d92b26c8f44e446add9d4fedfa2
+lib/action_dispatch/middleware/session/dalli_store.rb 62236273ea28a91502871f31aa600e038358931a
diff --git a/lib/dalli-2.7.2/.yardoc/object_types b/lib/dalli-2.7.2/.yardoc/object_types
new file mode 100644
index 0000000000000000000000000000000000000000..81127d629334e414b5938c25e1ed54a68043afbc
GIT binary patch
literal 7548
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
Y*T&Vq!puj*sV|=Se~Qu5;jC8t4{6(|>Hq)$

literal 0
HcmV?d00001

diff --git a/lib/dalli-2.7.2/.yardoc/objects/root.dat b/lib/dalli-2.7.2/.yardoc/objects/root.dat
new file mode 100644
index 0000000000000000000000000000000000000000..9e329595266921d3866db8cfbe420e10d2bfb28b
GIT binary patch
literal 121591
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

literal 0
HcmV?d00001

diff --git a/lib/dalli-2.7.2/.yardoc/proxy_types b/lib/dalli-2.7.2/.yardoc/proxy_types
new file mode 100644
index 0000000000000000000000000000000000000000..beefda1ae32c2cef8eb53a4f3c8407a532a22b51
GIT binary patch
literal 4
LcmZSKsAd2F0U`j1

literal 0
HcmV?d00001

diff --git a/lib/dalli-2.7.2/Gemfile b/lib/dalli-2.7.2/Gemfile
new file mode 100644
index 000000000..aeb2bb358
--- /dev/null
+++ b/lib/dalli-2.7.2/Gemfile
@@ -0,0 +1,12 @@
+source 'https://rubygems.org'
+
+gemspec
+
+gem 'rake'
+gem 'kgio', :platform => :mri
+gem 'appraisal'
+gem 'connection_pool'
+
+group :test do
+  gem 'simplecov'
+end
diff --git a/lib/dalli-2.7.2/History.md b/lib/dalli-2.7.2/History.md
new file mode 100644
index 000000000..3ba705502
--- /dev/null
+++ b/lib/dalli-2.7.2/History.md
@@ -0,0 +1,412 @@
+Dalli Changelog
+=====================
+
+2.7.2
+==========
+
+- The fix for #423 didn't make it into the released 2.7.1 gem somehow.
+
+2.7.1
+==========
+
+- Rack session will check if servers are up on initialization (arthurnn, #423)
+- Add support for IPv6 addresses in hex form, ie: "[::1]:11211" (dplummer, #428)
+- Add symbol support for namespace (jingkai #431)
+- Support expiration intervals longer than 30 days (leonid-shevtsov #436)
+
+2.7.0
+==========
+
+- BREAKING CHANGE:
+  Dalli::Client#add and #replace now return a truthy value, not boolean true or false.
+- Multithreading support with dalli\_store:
+  Use :pool\_size to create a pool of shared, threadsafe Dalli clients in Rails:
+```ruby
+    config.cache_store = :dalli_store, "cache-1.example.com", "cache-2.example.com", :compress => true, :pool_size => 5, :expires_in => 300
+```
+  This will ensure the Rails.cache singleton does not become a source of contention.
+  **PLEASE NOTE** Rails's :mem\_cache\_store does not support pooling as of
+Rails 4.0.  You must use :dalli\_store.
+
+- Implement `version` for retrieving version of connected servers [dterei, #384]
+- Implement `fetch_multi` for batched read/write [sorentwo, #380]
+- Add more support for safe updates with multiple writers: [philipmw, #395]
+  `require 'dalli/cas/client'` augments Dalli::Client with the following methods:
+  * Get value with CAS:            `[value, cas] = get_cas(key)`
+                                   `get_cas(key) {|value, cas| ...}`
+  * Get multiple values with CAS:  `get_multi_cas(k1, k2, ...) {|value, metadata| cas = metadata[:cas]}`
+  * Set value with CAS:            `new_cas = set_cas(key, value, cas, ttl, options)`
+  * Replace value with CAS:        `replace_cas(key, new_value, cas, ttl, options)`
+  * Delete value with CAS:         `delete_cas(key, cas)`
+- Fix bug with get key with "Not found" value [uzzz, #375]
+
+2.6.4
+=======
+
+- Fix ADD command, aka `write(unless_exist: true)` (pitr, #365)
+- Upgrade test suite from mini\_shoulda to minitest.
+- Even more performance improvements for get\_multi (xaop, #331)
+
+2.6.3
+=======
+
+- Support specific stats by passing `:items` or `:slabs` to `stats` method [bukhamseen]
+- Fix 'can't modify frozen String' errors in `ActiveSupport::Cache::DalliStore` [dblock]
+- Protect against objects with custom equality checking [theron17]
+- Warn if value for key is too large to store [locriani]
+
+2.6.2
+=======
+
+- Properly handle missing RubyInline
+
+2.6.1
+=======
+
+- Add optional native C binary search for ring, add:
+
+gem 'RubyInline'
+
+  to your Gemfile to get a 10% speedup when using many servers.
+  You will see no improvement if you are only using one server.
+
+- More get_multi performance optimization [xaop, #315]
+- Add lambda support for cache namespaces [joshwlewis, #311]
+
+2.6.0
+=======
+
+- read_multi optimization, now checks local_cache [chendo, #306]
+- Re-implement get_multi to be non-blocking [tmm1, #295]
+- Add `dalli` accessor to dalli_store to access the underlying
+Dalli::Client, for things like `get_multi`.
+- Add `Dalli::GzipCompressor`, primarily for compatibility with nginx's HttpMemcachedModule using `memcached_gzip_flag`
+
+2.5.0
+=======
+
+- Don't escape non-ASCII keys, memcached binary protocol doesn't care. [#257]
+- :dalli_store now implements LocalCache [#236]
+- Removed lots of old session_store test code, tests now all run without a default memcached server [#275]
+- Changed Dalli ActiveSupport adapter to always attempt instrumentation [brianmario, #284]
+- Change write operations (add/set/replace) to return false when value is too large to store [brianmario, #283]
+- Allowing different compressors per client [naseem]
+
+2.4.0
+=======
+- Added the ability to swap out the compressed used to [de]compress cache data [brianmario, #276]
+- Fix get\_multi performance issues with lots of memcached servers [tmm1]
+- Throw more specific exceptions [tmm1]
+- Allowing different types of serialization per client [naseem]
+
+2.3.0
+=======
+- Added the ability to swap out the serializer used to [de]serialize cache data [brianmario, #274]
+
+2.2.1
+=======
+
+- Fix issues with ENV-based connections. [#266]
+- Fix problem with SessionStore in Rails 4.0 [#265]
+
+2.2.0
+=======
+
+- Add Rack session with\_lock helper, for Rails 4.0 support [#264]
+- Accept connection string in the form of a URL (e.g., memcached://user:pass@hostname:port) [glenngillen]
+- Add touch operation [#228, uzzz]
+
+2.1.0
+=======
+
+- Add Railtie to auto-configure Dalli when included in Gemfile [#217, steveklabnik]
+
+2.0.5
+=======
+
+- Create proper keys for arrays of objects passed as keys [twinturbo, #211]
+- Handle long key with namespace [#212]
+- Add NODELAY to TCP socket options [#206]
+
+2.0.4
+=======
+
+- Dalli no longer needs to be reset after Unicorn/Passenger fork [#208]
+- Add option to re-raise errors rescued in the session and cache stores. [pitr, #200]
+- DalliStore#fetch called the block if the cached value == false [#205]
+- DalliStore should have accessible options [#195]
+- Add silence and mute support for DalliStore [#207]
+- Tracked down and fixed socket corruption due to Timeout [#146]
+
+2.0.3
+=======
+
+- Allow proper retrieval of stored `false` values [laserlemon, #197]
+- Allow non-ascii and whitespace keys, only the text protocol has those restrictions [#145]
+- Fix DalliStore#delete error-handling [#196]
+
+2.0.2
+=======
+
+- Fix all dalli\_store operations to handle nil options [#190]
+- Increment and decrement with :initial => nil now return nil (lawrencepit, #112)
+
+2.0.1
+=======
+
+- Fix nil option handling in dalli\_store#write [#188]
+
+2.0.0
+=======
+
+- Reimplemented the Rails' dalli\_store to remove use of
+  ActiveSupport::Cache::Entry which added 109 bytes overhead to every
+  value stored, was a performance bottleneck and duplicated a lot of
+  functionality already in Dalli.  One benchmark went from 4.0 sec to 3.0
+  sec with the new dalli\_store. [#173]
+- Added reset\_stats operation [#155]
+- Added support for configuring keepalive on TCP connections to memcached servers (@bianster, #180)
+
+Notes:
+
+  * data stored with dalli\_store 2.x is NOT backwards compatible with 1.x.
+    Upgraders are advised to namespace their keys and roll out the 2.x
+    upgrade slowly so keys do not clash and caches are warmed.
+    `config.cache_store = :dalli_store, :expires_in => 24.hours.to_i, :namespace => 'myapp2'`
+  * data stored with plain Dalli::Client API is unchanged.
+  * removed support for dalli\_store's race\_condition\_ttl option.
+  * removed support for em-synchrony and unix socket connection options.
+  * removed support for Ruby 1.8.6
+  * removed memcache-client compability layer and upgrade documentation.
+
+
+1.1.5
+=======
+
+- Coerce input to incr/decr to integer via #to\_i [#165]
+- Convert test suite to minitest/spec (crigor, #166)
+- Fix encoding issue with keys [#162]
+- Fix double namespacing with Rails and dalli\_store. [#160]
+
+1.1.4
+=======
+
+- Use 127.0.0.1 instead of localhost as default to avoid IPv6 issues
+- Extend DalliStore's :expires\_in when :race\_condition\_ttl is also used.
+- Fix :expires\_in option not propogating from DalliStore to Client, GH-136
+- Added support for native Rack session store.  Until now, Dalli's
+  session store has required Rails.  Now you can use Dalli to store
+  sessions for any Rack application.
+
+    require 'rack/session/dalli'
+    use Rack::Session::Dalli, :memcache_server => 'localhost:11211', :compression => true
+
+1.1.3
+=======
+
+- Support Rails's autoloading hack for loading sessions with objects
+  whose classes have not be required yet, GH-129
+- Support Unix sockets for connectivity.  Shows a 2x performance
+  increase but keep in mind they only work on localhost. (dfens)
+
+1.1.2
+=======
+
+- Fix incompatibility with latest Rack session API when destroying
+  sessions, thanks @twinge!
+
+1.1.1
+=======
+
+v1.1.0 was a bad release.  Yanked.
+
+1.1.0
+=======
+
+- Remove support for Rails 2.3, add support for Rails 3.1
+- Fix socket failure retry logic, now you can restart memcached and Dalli won't complain!
+- Add support for fibered operation via em-synchrony (eliaslevy)
+- Gracefully handle write timeouts, GH-99
+- Only issue bug warning for unexpected StandardErrors, GH-102
+- Add travis-ci build support (ryanlecompte)
+- Gracefully handle errors in get_multi (michaelfairley)
+- Misc fixes from crash2burn, fphilipe, igreg, raggi
+
+1.0.5
+=======
+
+- Fix socket failure retry logic, now you can restart memcached and Dalli won't complain!
+
+1.0.4
+=======
+
+- Handle non-ASCII key content in dalli_store
+- Accept key array for read_multi in dalli_store
+- Fix multithreaded race condition in creation of mutex
+
+1.0.3
+=======
+
+- Better handling of application marshalling errors
+- Work around jruby IO#sysread compatibility issue
+
+
+1.0.2
+=======
+
+ - Allow browser session cookies (blindsey)
+ - Compatibility fixes (mwynholds)
+ - Add backwards compatibility module for memcache-client, require 'dalli/memcache-client'.  It makes
+   Dalli more compatible with memcache-client and prints out a warning any time you do something that
+   is no longer supported so you can fix your code.
+
+1.0.1
+=======
+
+ - Explicitly handle application marshalling bugs, GH-56
+ - Add support for username/password as options, to allow multiple bucket access
+   from the same Ruby process, GH-52
+ - Add support for >1MB values with :value_max_bytes option, GH-54 (r-stu31)
+ - Add support for default TTL, :expires_in, in Rails 2.3. (Steven Novotny)
+   config.cache_store = :dalli_store, 'localhost:11211', {:expires_in => 4.hours}
+
+
+1.0.0
+=======
+
+Welcome gucki as a Dalli committer!
+
+ - Fix network and namespace issues in get_multi (gucki)
+ - Better handling of unmarshalling errors (mperham)
+
+0.11.2
+=======
+
+ - Major reworking of socket error and failover handling (gucki)
+ - Add basic JRuby support (mperham)
+
+0.11.1
+======
+
+ - Minor fixes, doc updates.
+ - Add optional support for kgio sockets, gives a 10-15% performance boost.
+
+0.11.0
+======
+
+Warning: this release changes how Dalli marshals data.  I do not guarantee compatibility until 1.0 but I will increment the minor version every time a release breaks compatibility until 1.0.
+
+IT IS HIGHLY RECOMMENDED YOU FLUSH YOUR CACHE BEFORE UPGRADING.
+
+ - multi() now works reentrantly.
+ - Added new Dalli::Client option for default TTLs, :expires_in, defaults to 0 (aka forever).
+ - Added new Dalli::Client option, :compression, to enable auto-compression of values.
+ - Refactor how Dalli stores data on the server.  Values are now tagged
+   as "marshalled" or "compressed" so they can be automatically deserialized
+   without the client having to know how they were stored.
+
+0.10.1
+======
+
+ - Prefer server config from environment, fixes Heroku session store issues (thanks JoshMcKin)
+ - Better handling of non-ASCII values (size -> bytesize)
+ - Assert that keys are ASCII only
+
+0.10.0
+======
+
+Warning: this release changed how Rails marshals data with Dalli.  Unfortunately previous versions double marshalled values.  It is possible that data stored with previous versions of Dalli will not work with this version.
+
+IT IS HIGHLY RECOMMENDED YOU FLUSH YOUR CACHE BEFORE UPGRADING.
+
+ - Rework how the Rails cache store does value marshalling.
+ - Rework old server version detection to avoid a socket read hang.
+ - Refactor the Rails 2.3 :dalli\_store to be closer to :mem\_cache\_store.
+ - Better documentation for session store config (plukevdh)
+
+0.9.10
+----
+
+ - Better server retry logic (next2you)
+ - Rails 3.1 compatibility (gucki)
+
+
+0.9.9
+----
+
+ - Add support for *_multi operations for add, set, replace and delete.  This implements
+   pipelined network operations; Dalli disables network replies so we're not limited by
+   latency, allowing for much higher throughput.
+
+    dc = Dalli::Client.new
+    dc.multi do
+      dc.set 'a', 1
+      dc.set 'b', 2
+      dc.set 'c', 3
+      dc.delete 'd'
+    end
+ - Minor fix to set the continuum sorted by value (kangster)
+ - Implement session store with Rails 2.3.  Update docs.
+
+0.9.8
+-----
+
+ - Implement namespace support
+ - Misc fixes
+
+
+0.9.7
+-----
+
+ - Small fix for NewRelic integration.
+ - Detect and fail on older memcached servers (pre-1.4).
+
+0.9.6
+-----
+
+ - Patches for Rails 3.0.1 integration.
+
+0.9.5
+-----
+
+ - Major design change - raw support is back to maximize compatibility with Rails
+ and the increment/decrement operations.  You can now pass :raw => true to most methods
+ to bypass (un)marshalling.
+ - Support symbols as keys (ddollar)
+ - Rails 2.3 bug fixes
+
+
+0.9.4
+-----
+
+ - Dalli support now in rack-bug (http://github.com/brynary/rack-bug), give it a try!
+ - Namespace support for Rails 2.3 (bpardee)
+ - Bug fixes
+
+
+0.9.3
+-----
+
+ - Rails 2.3 support (beanieboi)
+ - Rails SessionStore support
+ - Passenger integration
+ - memcache-client upgrade docs, see Upgrade.md
+
+
+0.9.2
+----
+
+ - Verify proper operation in Heroku.
+
+
+0.9.1
+----
+
+ - Add fetch and cas operations (mperham)
+ - Add incr and decr operations (mperham)
+ - Initial support for SASL authentication via the MEMCACHE_{USERNAME,PASSWORD} environment variables, needed for Heroku (mperham)
+
+0.9.0
+-----
+
+ - Initial gem release.
diff --git a/lib/dalli-2.7.2/LICENSE b/lib/dalli-2.7.2/LICENSE
new file mode 100644
index 000000000..c9f5cacab
--- /dev/null
+++ b/lib/dalli-2.7.2/LICENSE
@@ -0,0 +1,20 @@
+Copyright (c) Mike Perham
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/lib/dalli-2.7.2/Performance.md b/lib/dalli-2.7.2/Performance.md
new file mode 100644
index 000000000..1079be259
--- /dev/null
+++ b/lib/dalli-2.7.2/Performance.md
@@ -0,0 +1,42 @@
+Performance
+====================
+
+Caching is all about performance, so I carefully track Dalli performance to ensure no regressions.
+You can optionally use kgio to give Dalli a 10-20% performance boost: `gem install kgio`.
+
+Note I've added some benchmarks over time to Dalli that the other libraries don't necessarily have.
+
+memcache-client
+---------------
+
+Testing 1.8.5 with ruby 1.9.3p0 (2011-10-30 revision 33570) [x86_64-darwin11.2.0]
+
+                                          user     system      total        real
+    set:plain:memcache-client         1.860000   0.310000   2.170000 (  2.188030)
+    set:ruby:memcache-client          1.830000   0.290000   2.120000 (  2.130212)
+    get:plain:memcache-client         1.830000   0.340000   2.170000 (  2.176156)
+    get:ruby:memcache-client          1.900000   0.330000   2.230000 (  2.235045)
+    multiget:ruby:memcache-client     0.860000   0.120000   0.980000 (  0.987348)
+    missing:ruby:memcache-client      1.630000   0.320000   1.950000 (  1.954867)
+    mixed:ruby:memcache-client        3.690000   0.670000   4.360000 (  4.364469)
+
+
+dalli
+-----
+
+Testing with Rails 3.2.1
+Using kgio socket IO
+Testing 2.0.0 with ruby 1.9.3p125 (2012-02-16 revision 34643) [x86_64-darwin11.3.0]
+
+                                          user     system      total        real
+    mixed:rails:dalli                 1.580000   0.570000   2.150000 (  3.008839)
+    set:plain:dalli                   0.730000   0.300000   1.030000 (  1.567098)
+    setq:plain:dalli                  0.520000   0.120000   0.640000 (  0.634402)
+    set:ruby:dalli                    0.800000   0.300000   1.100000 (  1.640348)
+    get:plain:dalli                   0.840000   0.330000   1.170000 (  1.668425)
+    get:ruby:dalli                    0.850000   0.330000   1.180000 (  1.665716)
+    multiget:ruby:dalli               0.700000   0.260000   0.960000 (  0.965423)
+    missing:ruby:dalli                0.720000   0.320000   1.040000 (  1.511720)
+    mixed:ruby:dalli                  1.660000   0.640000   2.300000 (  3.320743)
+    mixedq:ruby:dalli                 1.630000   0.510000   2.140000 (  2.629734)
+    incr:ruby:dalli                   0.270000   0.100000   0.370000 (  0.547618)
diff --git a/lib/dalli-2.7.2/README.md b/lib/dalli-2.7.2/README.md
new file mode 100644
index 000000000..d53093c4d
--- /dev/null
+++ b/lib/dalli-2.7.2/README.md
@@ -0,0 +1,224 @@
+Dalli [![Build Status](https://secure.travis-ci.org/mperham/dalli.png)](http://travis-ci.org/mperham/dalli) [![Dependency Status](https://gemnasium.com/mperham/dalli.png)](https://gemnasium.com/mperham/dalli) [![Code Climate](https://codeclimate.com/github/mperham/dalli.png)](https://codeclimate.com/github/mperham/dalli)
+=====
+
+Dalli is a high performance pure Ruby client for accessing memcached servers.  It works with memcached 1.4+ only as it uses the newer binary protocol.  It should be considered a replacement for the memcache-client gem.
+
+The name is a variant of Salvador Dali for his famous painting [The Persistence of Memory](http://en.wikipedia.org/wiki/The_Persistence_of_Memory).
+
+![Persistence of Memory](http://www.virtualdali.com/assets/paintings/31PersistenceOfMemory.jpg)
+
+Dalli's initial development was sponsored by [CouchBase](http://www.couchbase.com/).  Many thanks to them!
+
+
+Design
+------------
+
+I decided to write Dalli after maintaining memcache-client for two years for a few specific reasons:
+
+ 0. The code is mostly old and gross.  The bulk of the code is a single 1000 line .rb file.
+ 1. It has a lot of options that are infrequently used which complicate the codebase.
+ 2. The implementation has no single point to attach monitoring hooks.
+ 3. Uses the old text protocol, which hurts raw performance.
+
+So a few notes.  Dalli:
+
+ 0. uses the exact same algorithm to choose a server so existing memcached clusters with TBs of data will work identically to memcache-client.
+ 1. is approximately 20% faster than memcache-client (which itself was heavily optimized) in Ruby 1.9.2.
+ 2. contains explicit "chokepoint" methods which handle all requests; these can be hooked into by monitoring tools (NewRelic, Rack::Bug, etc) to track memcached usage.
+ 3. supports SASL for use in managed environments, e.g. Heroku.
+ 4. provides proper failover with recovery and adjustable timeouts
+
+
+Supported Ruby versions and implementations
+------------------------------------------------
+
+Dalli should work identically on:
+
+ * JRuby 1.6+
+ * Ruby 1.9.3+
+ * Rubinius 2.0
+
+If you have problems, please enter an issue.
+
+
+Installation and Usage
+------------------------
+
+Remember, Dalli **requires** memcached 1.4+. You can check the version with `memcached -h`. Please note that memcached that Mac OS X Snow Leopard ships with is 1.2.8 and won't work. Install 1.4.x using Homebrew with
+
+    brew install memcached
+
+On Ubuntu you can install it by running:
+
+    apt-get install memcached
+
+You can verify your installation using this piece of code:
+
+```bash
+gem install dalli
+```
+
+```ruby
+require 'dalli'
+options = { :namespace => "app_v1", :compress => true }
+dc = Dalli::Client.new('localhost:11211', options)
+dc.set('abc', 123)
+value = dc.get('abc')
+```
+
+The test suite requires memcached 1.4.3+ with SASL enabled (brew install memcached --enable-sasl ; mv /usr/bin/memcached /usr/bin/memcached.old).  Currently only supports the PLAIN mechanism.
+
+Dalli has no runtime dependencies and never will.  You can optionally install the 'kgio' gem to
+give Dalli a 20-30% performance boost.
+
+
+Usage with Rails 3.x and 4.x
+---------------------------
+
+In your Gemfile:
+
+```ruby
+gem 'dalli'
+```
+
+In `config/environments/production.rb`:
+
+```ruby
+config.cache_store = :dalli_store
+```
+
+Here's a more comprehensive example that sets a reasonable default for maximum cache entry lifetime (one day), enables compression for large values and namespaces all entries for this rails app.  Remove the namespace if you have multiple apps which share cached values.
+
+```ruby
+config.cache_store = :dalli_store, 'cache-1.example.com', 'cache-2.example.com',
+  { :namespace => NAME_OF_RAILS_APP, :expires_in => 1.day, :compress => true }
+```
+
+If your servers are specified in `ENV["MEMCACHE_SERVERS"]` (e.g. on Heroku when using a third-party hosted addon), simply provide `nil` for the servers:
+
+```ruby
+config.cache_store = :dalli_store, nil, { :namespace => NAME_OF_RAILS_APP, :expires_in => 1.day, :compress => true }
+```
+
+To use Dalli for Rails session storage that times out after 20 minutes, in `config/initializers/session_store.rb`:
+
+For Rails >= 3.2.4:
+
+```ruby
+Rails.application.config.session_store ActionDispatch::Session::CacheStore, :expire_after => 20.minutes
+```
+
+For Rails 3.x:
+
+```ruby
+require 'action_dispatch/middleware/session/dalli_store'
+Rails.application.config.session_store :dalli_store, :memcache_server => ['host1', 'host2'], :namespace => 'sessions', :key => '_foundation_session', :expire_after => 20.minutes
+```
+
+Dalli does not support Rails 2.x.
+
+
+Multithreading and Rails
+--------------------------
+
+If you use Puma or another threaded app server, as of Dalli 2.7, you can use a pool
+of Dalli clients with Rails to ensure the `Rails.cache` singleton does not become a
+source of thread contention.  You must add `gem 'connection_pool'` to your Gemfile and
+add :pool\_size to your `dalli_store` config:
+
+```ruby
+config.cache_store = :dalli_store, 'cache-1.example.com', { :pool_size => 5 }
+```
+
+You can then use the Rails cache as normal or check out a Dalli client directly from the pool:
+
+```ruby
+Rails.cache.fetch('foo', :expires_in => 300) do
+  'bar'
+end
+
+Rails.cache.dalli.with do |client|
+  # client is a Dalli::Client instance which you can
+  # use ONLY within this block
+end
+```
+
+
+Configuration
+------------------------
+
+Dalli::Client accepts the following options. All times are in seconds.
+
+**expires_in**: Global default for key TTL.  Default is 0, which means no expiry.
+
+**failover**: Boolean, if true Dalli will failover to another server if the main server for a key is down.
+
+**compress**: Boolean, if true Dalli will gzip-compress values larger than 1K.
+
+**compression_min_size**: Minimum value byte size for which to attempt compression. Default is 1K.
+
+**compression_max_size**: Maximum value byte size for which to attempt compression. Default is unlimited.
+
+**serializer**: The serializer to use for objects being stored (ex. JSON).
+Default is Marshal.
+
+**socket_timeout**: Timeout for all socket operations (connect, read, write). Default is 0.5.
+
+**socket_max_failures**: When a socket operation fails after socket_timeout, the same operation is retried. This is to not immediately mark a server down when there's a very slight network problem. Default is 2.
+
+**socket_failure_delay**: Before retrying a socket operation, the process sleeps for this amount of time. Default is 0.01.  Set to nil for no delay.
+
+**down_retry_delay**: When a server has been marked down due to many failures, the server will be checked again for being alive only after this amount of time. Don't set this value to low, otherwise each request which tries the failed server might hang for the maximum **socket_timeout**. Default is 1 second.
+
+**value_max_bytes**: The maximum size of a value in memcached.  Defaults to 1MB, this can be increased with memcached's -I parameter.  You must also configure Dalli to allow the larger size here.
+
+**username**: The username to use for authenticating this client instance against a SASL-enabled memcached server.  Heroku users should not need to use this normally.
+
+**password**: The password to use for authenticating this client instance against a SASL-enabled memcached server.  Heroku users should not need to use this normally.
+
+**keepalive**: Boolean. If true, Dalli will enable keep-alive for socket connections.  Default is true.
+
+**compressor**: The compressor to use for objects being stored.
+Default is zlib, implemented under `Dalli::Compressor`.
+If serving compressed data using nginx's HttpMemcachedModule, set `memcached_gzip_flag 2` and use `Dalli::GzipCompressor`
+
+Features and Changes
+------------------------
+
+By default, Dalli is thread-safe.  Disable thread-safety at your own peril.
+
+Dalli does not need anything special in Unicorn/Passenger since 2.0.4.
+It will detect sockets shared with child processes and gracefully reopen the
+socket.
+
+Note that Dalli does not require ActiveSupport or Rails.  You can safely use it in your own Ruby projects.
+
+[View the Client API](http://www.rubydoc.info/github/mperham/dalli/Dalli/Client)
+
+Helping Out
+-------------
+
+If you have a fix you wish to provide, please fork the code, fix in your local project and then send a pull request on github.  Please ensure that you include a test which verifies your fix and update History.md with a one sentence description of your fix so you get credit as a contributor.
+
+We're not accepting new compressors. They are trivial to add in an initializer. See #385 (LZ4), #406 (Snappy)
+
+Thanks
+------------
+
+Eric Wong - for help using his [kgio](http://unicorn.bogomips.org/kgio/index.html) library.
+
+Brian Mitchell - for his remix-stash project which was helpful when implementing and testing the binary protocol support.
+
+[CouchBase](http://couchbase.com) - for their project sponsorship
+
+
+Author
+----------
+
+Mike Perham, [mikeperham.com](http://mikeperham.com), [@mperham](http://twitter.com/mperham)
+
+
+Copyright
+-----------
+
+Copyright (c) Mike Perham. See LICENSE for details.
diff --git a/lib/dalli-2.7.2/Rakefile b/lib/dalli-2.7.2/Rakefile
new file mode 100644
index 000000000..61752a9a8
--- /dev/null
+++ b/lib/dalli-2.7.2/Rakefile
@@ -0,0 +1,42 @@
+require 'appraisal'
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'test'
+  test.pattern = 'test/**/test_*.rb'
+  test.warning = true
+  test.verbose = true
+end
+
+Rake::TestTask.new(:bench) do |test|
+  test.libs << 'test'
+  test.pattern = 'test/benchmark_test.rb'
+end
+
+begin
+  require 'metric_fu'
+  MetricFu::Configuration.run do |config|
+    config.rcov[:rcov_opts] << "-Itest:lib"
+  end
+rescue LoadError
+end
+
+task :default => :test
+
+task :test_all do
+  system('rake test RAILS_VERSION="~> 3.0.0"')
+  system('rake test RAILS_VERSION=">= 3.0.0"')
+end
+
+# 'gem install rdoc' to upgrade RDoc if this is giving you errors
+begin
+  require 'rdoc/task'
+  RDoc::Task.new do |rd|
+    rd.rdoc_files.include("lib/**/*.rb")
+  end
+rescue LoadError
+  puts "Unable to load rdoc, run 'gem install rdoc' to fix this."
+end
+
+require 'rake/clean'
+CLEAN.include "**/*.rbc"
+CLEAN.include "**/.DS_Store"
diff --git a/lib/dalli-2.7.2/dalli.gemspec b/lib/dalli-2.7.2/dalli.gemspec
new file mode 100644
index 000000000..3d4cf537f
--- /dev/null
+++ b/lib/dalli-2.7.2/dalli.gemspec
@@ -0,0 +1,29 @@
+require './lib/dalli/version'
+
+Gem::Specification.new do |s|
+  s.name = %q{dalli}
+  s.version = Dalli::VERSION
+  s.license = "MIT"
+
+  s.authors = ["Mike Perham"]
+  s.description = %q{High performance memcached client for Ruby}
+  s.email = %q{mperham@gmail.com}
+  s.files = Dir.glob("lib/**/*") + [
+     "LICENSE",
+     "README.md",
+     "History.md",
+     "Rakefile",
+     "Gemfile",
+     "dalli.gemspec",
+     "Performance.md",
+  ]
+  s.homepage = %q{http://github.com/mperham/dalli}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.summary = %q{High performance memcached client for Ruby}
+  s.test_files = Dir.glob("test/**/*")
+  s.add_development_dependency(%q<minitest>, [">= 4.2.0"])
+  s.add_development_dependency(%q<mocha>, [">= 0"])
+  s.add_development_dependency(%q<rails>, ["~> 4"])
+end
+
diff --git a/lib/dalli-2.7.2/lib/action_dispatch/middleware/session/dalli_store.rb b/lib/dalli-2.7.2/lib/action_dispatch/middleware/session/dalli_store.rb
new file mode 100644
index 000000000..abbbaa290
--- /dev/null
+++ b/lib/dalli-2.7.2/lib/action_dispatch/middleware/session/dalli_store.rb
@@ -0,0 +1,81 @@
+require 'active_support/cache'
+require 'action_dispatch/middleware/session/abstract_store'
+require 'dalli'
+
+# Dalli-based session store for Rails 3.0.
+module ActionDispatch
+  module Session
+    class DalliStore < AbstractStore
+      def initialize(app, options = {})
+        # Support old :expires option
+        options[:expire_after] ||= options[:expires]
+
+        super
+
+        @default_options = { :namespace => 'rack:session' }.merge(@default_options)
+
+        @pool = options[:cache] || begin
+          Dalli::Client.new(
+              @default_options[:memcache_server], @default_options)
+        end
+        @namespace = @default_options[:namespace]
+
+        @raise_errors = !!@default_options[:raise_errors]
+
+        super
+      end
+
+      def reset
+        @pool.reset
+      end
+
+      private
+
+      def get_session(env, sid)
+        sid = generate_sid unless sid and !sid.empty?
+        begin
+          session = @pool.get(sid) || {}
+        rescue Dalli::DalliError => ex
+          # re-raise ArgumentError so Rails' session abstract_store.rb can autoload any missing models
+          raise ArgumentError, ex.message if ex.message =~ /unmarshal/
+          Rails.logger.warn("Session::DalliStore#get: #{ex.message}")
+          session = {}
+        end
+        [sid, session]
+      end
+
+      def set_session(env, sid, session_data, options = nil)
+        options ||= env[ENV_SESSION_OPTIONS_KEY]
+        expiry  = options[:expire_after]
+        @pool.set(sid, session_data, expiry)
+        sid
+      rescue Dalli::DalliError
+        Rails.logger.warn("Session::DalliStore#set: #{$!.message}")
+        raise if @raise_errors
+        false
+      end
+
+      def destroy_session(env, session_id, options)
+        begin
+          @pool.delete(session_id)
+        rescue Dalli::DalliError
+          Rails.logger.warn("Session::DalliStore#destroy_session: #{$!.message}")
+          raise if @raise_errors
+        end
+        return nil if options[:drop]
+        generate_sid
+      end
+
+      def destroy(env)
+        if sid = current_session_id(env)
+          @pool.delete(sid)
+        end
+      rescue Dalli::DalliError
+        Rails.logger.warn("Session::DalliStore#destroy: #{$!.message}")
+        raise if @raise_errors
+        false
+      end
+
+    end
+  end
+end
diff --git a/lib/dalli-2.7.2/lib/active_support/cache/dalli_store.rb b/lib/dalli-2.7.2/lib/active_support/cache/dalli_store.rb
new file mode 100644
index 000000000..fe4b80e3c
--- /dev/null
+++ b/lib/dalli-2.7.2/lib/active_support/cache/dalli_store.rb
@@ -0,0 +1,363 @@
+# encoding: ascii
+require 'dalli'
+
+module ActiveSupport
+  module Cache
+    class DalliStore
+
+      attr_reader :silence, :options
+      alias_method :silence?, :silence
+
+      # Silence the logger.
+      def silence!
+        @silence = true
+        self
+      end
+
+      # Silence the logger within a block.
+      def mute
+        previous_silence, @silence = defined?(@silence) && @silence, true
+        yield
+      ensure
+        @silence = previous_silence
+      end
+
+      ESCAPE_KEY_CHARS = /[\x00-\x20%\x7F-\xFF]/
+
+      # Creates a new DalliStore object, with the given memcached server
+      # addresses. Each address is either a host name, or a host-with-port string
+      # in the form of "host_name:port". For example:
+      #
+      #   ActiveSupport::Cache::DalliStore.new("localhost", "server-downstairs.localnetwork:8229")
+      #
+      # If no addresses are specified, then DalliStore will connect to
+      # localhost port 11211 (the default memcached port).
+      #
+      # Connection Pool support
+      #
+      # If you are using multithreaded Rails, the Rails.cache singleton can become a source
+      # of contention.  You can use a connection pool of Dalli clients with Rails.cache by
+      # passing :pool_size and/or :pool_timeout:
+      #
+      # config.cache_store = :dalli_store, 'localhost:11211', :pool_size => 10
+      #
+      # Both pool options default to 5.  You must include the `connection_pool` gem if you
+      # wish to use pool support.
+      #
+      def initialize(*addresses)
+        addresses = addresses.flatten
+        options = addresses.extract_options!
+        @options = options.dup
+
+        pool_options = {}
+        pool_options[:size] = options[:pool_size] if options[:pool_size]
+        pool_options[:timeout] = options[:pool_timeout] if options[:pool_timeout]
+
+        @options[:compress] ||= @options[:compression]
+
+        addresses.compact!
+        servers = if addresses.empty?
+                    nil # use the default from Dalli::Client
+                  else
+                    addresses
+                  end
+        if pool_options.empty?
+          @data = Dalli::Client.new(servers, @options)
+        else
+          @data = ::ConnectionPool.new(pool_options) { Dalli::Client.new(servers, @options.merge(:threadsafe => false)) }
+        end
+
+        extend Strategy::LocalCache
+      end
+
+      ##
+      # Access the underlying Dalli::Client or ConnectionPool instance for
+      # access to get_multi, etc.
+      def dalli
+        @data
+      end
+
+      def with(&block)
+        @data.with(&block)
+      end
+
+      def fetch(name, options=nil)
+        options ||= {}
+        name = expanded_key name
+
+        if block_given?
+          unless options[:force]
+            entry = instrument(:read, name, options) do |payload|
+              read_entry(name, options).tap do |result|
+                if payload
+                  payload[:super_operation] = :fetch
+                  payload[:hit] = !!result
+                end
+              end
+            end
+          end
+
+          if !entry.nil?
+            instrument(:fetch_hit, name, options) { |payload| }
+            entry
+          else
+            result = instrument(:generate, name, options) do |payload|
+              yield
+            end
+            write(name, result, options)
+            result
+          end
+        else
+          read(name, options)
+        end
+      end
+
+      def read(name, options=nil)
+        options ||= {}
+        name = expanded_key name
+
+        instrument(:read, name, options) do |payload|
+          entry = read_entry(name, options)
+          payload[:hit] = !!entry if payload
+          entry
+        end
+      end
+
+      def write(name, value, options=nil)
+        options ||= {}
+        name = expanded_key name
+
+        instrument(:write, name, options) do |payload|
+          with do |connection|
+            options = options.merge(:connection => connection)
+            write_entry(name, value, options)
+          end
+        end
+      end
+
+      def exist?(name, options=nil)
+        options ||= {}
+        name = expanded_key name
+
+        log(:exist, name, options)
+        !read_entry(name, options).nil?
+      end
+
+      def delete(name, options=nil)
+        options ||= {}
+        name = expanded_key name
+
+        instrument(:delete, name, options) do |payload|
+          delete_entry(name, options)
+        end
+      end
+
+      # Reads multiple keys from the cache using a single call to the
+      # servers for all keys. Keys must be Strings.
+      def read_multi(*names)
+        names.extract_options!
+        mapping = names.inject({}) { |memo, name| memo[expanded_key(name)] = name; memo }
+        instrument(:read_multi, names) do
+          results = {}
+          if local_cache
+            mapping.keys.each do |key|
+              if value = local_cache.read_entry(key, options)
+                results[key] = value
+              end
+            end
+          end
+
+          data = with { |c| c.get_multi(mapping.keys - results.keys) }
+          results.merge!(data)
+          results.inject({}) do |memo, (inner, _)|
+            entry = results[inner]
+            # NB Backwards data compatibility, to be removed at some point
+            value = (entry.is_a?(ActiveSupport::Cache::Entry) ? entry.value : entry)
+            memo[mapping[inner]] = value
+            local_cache.write_entry(inner, value, options) if local_cache
+            memo
+          end
+        end
+      end
+
+      # Fetches data from the cache, using the given keys. If there is data in
+      # the cache with the given keys, then that data is returned. Otherwise,
+      # the supplied block is called for each key for which there was no data,
+      # and the result will be written to the cache and returned.
+      def fetch_multi(*names)
+        options = names.extract_options!
+        mapping = names.inject({}) { |memo, name| memo[expanded_key(name)] = name; memo }
+
+        instrument(:fetch_multi, names) do
+          with do |connection|
+            results = connection.get_multi(mapping.keys)
+
+            connection.multi do
+              mapping.inject({}) do |memo, (expanded, name)|
+                memo[name] = results[expanded]
+                if memo[name].nil?
+                  value = yield(name)
+                  memo[name] = value
+                  options = options.merge(:connection => connection)
+                  write_entry(expanded, value, options)
+                end
+
+                memo
+              end
+            end
+          end
+        end
+      end
+
+      # Increment a cached value. This method uses the memcached incr atomic
+      # operator and can only be used on values written with the :raw option.
+      # Calling it on a value not stored with :raw will fail.
+      # :initial defaults to the amount passed in, as if the counter was initially zero.
+      # memcached counters cannot hold negative values.
+      def increment(name, amount = 1, options=nil)
+        options ||= {}
+        name = expanded_key name
+        initial = options.has_key?(:initial) ? options[:initial] : amount
+        expires_in = options[:expires_in]
+        instrument(:increment, name, :amount => amount) do
+          with { |c| c.incr(name, amount, expires_in, initial) }
+        end
+      rescue Dalli::DalliError => e
+        logger.error("DalliError: #{e.message}") if logger
+        raise if raise_errors?
+        nil
+      end
+
+      # Decrement a cached value. This method uses the memcached decr atomic
+      # operator and can only be used on values written with the :raw option.
+      # Calling it on a value not stored with :raw will fail.
+      # :initial defaults to zero, as if the counter was initially zero.
+      # memcached counters cannot hold negative values.
+      def decrement(name, amount = 1, options=nil)
+        options ||= {}
+        name = expanded_key name
+        initial = options.has_key?(:initial) ? options[:initial] : 0
+        expires_in = options[:expires_in]
+        instrument(:decrement, name, :amount => amount) do
+          with { |c| c.decr(name, amount, expires_in, initial) }
+        end
+      rescue Dalli::DalliError => e
+        logger.error("DalliError: #{e.message}") if logger
+        raise if raise_errors?
+        nil
+      end
+
+      # Clear the entire cache on all memcached servers. This method should
+      # be used with care when using a shared cache.
+      def clear(options=nil)
+        instrument(:clear, 'flushing all keys') do
+          with { |c| c.flush_all }
+        end
+      rescue Dalli::DalliError => e
+        logger.error("DalliError: #{e.message}") if logger
+        raise if raise_errors?
+        nil
+      end
+
+      # Clear any local cache
+      def cleanup(options=nil)
+      end
+
+      # Get the statistics from the memcached servers.
+      def stats
+        with { |c| c.stats }
+      end
+
+      def reset
+        with { |c| c.reset }
+      end
+
+      def logger
+        Dalli.logger
+      end
+
+      def logger=(new_logger)
+        Dalli.logger = new_logger
+      end
+
+      protected
+
+      # Read an entry from the cache.
+      def read_entry(key, options) # :nodoc:
+        entry = with { |c| c.get(key, options) }
+        # NB Backwards data compatibility, to be removed at some point
+        entry.is_a?(ActiveSupport::Cache::Entry) ? entry.value : entry
+      rescue Dalli::DalliError => e
+        logger.error("DalliError: #{e.message}") if logger
+        raise if raise_errors?
+        nil
+      end
+
+      # Write an entry to the cache.
+      def write_entry(key, value, options) # :nodoc:
+        # cleanup LocalCache
+        cleanup if options[:unless_exist]
+        method = options[:unless_exist] ? :add : :set
+        expires_in = options[:expires_in]
+        connection = options.delete(:connection)
+        connection.send(method, key, value, expires_in, options)
+      rescue Dalli::DalliError => e
+        logger.error("DalliError: #{e.message}") if logger
+        raise if raise_errors?
+        false
+      end
+
+      # Delete an entry from the cache.
+      def delete_entry(key, options) # :nodoc:
+        with { |c| c.delete(key) }
+      rescue Dalli::DalliError => e
+        logger.error("DalliError: #{e.message}") if logger
+        raise if raise_errors?
+        false
+      end
+
+      private
+      # Expand key to be a consistent string value. Invoke +cache_key+ if
+      # object responds to +cache_key+. Otherwise, to_param method will be
+      # called. If the key is a Hash, then keys will be sorted alphabetically.
+      def expanded_key(key) # :nodoc:
+        return key.cache_key.to_s if key.respond_to?(:cache_key)
+
+        case key
+        when Array
+          if key.size > 1
+            key = key.collect{|element| expanded_key(element)}
+          else
+            key = key.first
+          end
+        when Hash
+          key = key.sort_by { |k,_| k.to_s }.collect{|k,v| "#{k}=#{v}"}
+        end
+
+        key = key.to_param
+        if key.respond_to? :force_encoding
+          key = key.dup
+          key.force_encoding('binary')
+        end
+        key
+      end
+
+      def instrument(operation, key, options=nil)
+        log(operation, key, options)
+
+        payload = { :key => key }
+        payload.merge!(options) if options.is_a?(Hash)
+        ActiveSupport::Notifications.instrument("cache_#{operation}.active_support", payload){ yield(payload) }
+      end
+
+      def log(operation, key, options=nil)
+        return unless logger && logger.debug? && !silence?
+        logger.debug("Cache #{operation}: #{key}#{options.blank? ? "" : " (#{options.inspect})"}")
+      end
+
+      def raise_errors?
+        !!@options[:raise_errors]
+      end
+    end
+  end
+end
diff --git a/lib/dalli-2.7.2/lib/dalli.rb b/lib/dalli-2.7.2/lib/dalli.rb
new file mode 100644
index 000000000..62e3b42fe
--- /dev/null
+++ b/lib/dalli-2.7.2/lib/dalli.rb
@@ -0,0 +1,46 @@
+require 'dalli/compressor'
+require 'dalli/client'
+require 'dalli/ring'
+require 'dalli/server'
+require 'dalli/socket'
+require 'dalli/version'
+require 'dalli/options'
+require 'dalli/railtie' if defined?(::Rails::Railtie)
+
+module Dalli
+  # generic error
+  class DalliError < RuntimeError; end
+  # socket/server communication error
+  class NetworkError < DalliError; end
+  # no server available/alive error
+  class RingError < DalliError; end
+  # application error in marshalling serialization
+  class MarshalError < DalliError; end
+  # application error in marshalling deserialization or decompression
+  class UnmarshalError < DalliError; end
+
+  def self.logger
+    @logger ||= (rails_logger || default_logger)
+  end
+
+  def self.rails_logger
+    (defined?(Rails) && Rails.respond_to?(:logger) && Rails.logger) ||
+    (defined?(RAILS_DEFAULT_LOGGER) && RAILS_DEFAULT_LOGGER.respond_to?(:debug) && RAILS_DEFAULT_LOGGER)
+  end
+
+  def self.default_logger
+    require 'logger'
+    l = Logger.new(STDOUT)
+    l.level = Logger::INFO
+    l
+  end
+
+  def self.logger=(logger)
+    @logger = logger
+  end
+
+end
+
+if defined?(RAILS_VERSION) && RAILS_VERSION < '3'
+  raise Dalli::DalliError, "Dalli #{Dalli::VERSION} does not support Rails version < 3.0"
+end
diff --git a/lib/dalli-2.7.2/lib/dalli/cas/client.rb b/lib/dalli-2.7.2/lib/dalli/cas/client.rb
new file mode 100644
index 000000000..33295b474
--- /dev/null
+++ b/lib/dalli-2.7.2/lib/dalli/cas/client.rb
@@ -0,0 +1,58 @@
+require 'dalli/client'
+
+module Dalli
+  class Client
+    ##
+    # Get the value and CAS ID associated with the key.  If a block is provided,
+    # value and CAS will be passed to the block.
+    def get_cas(key)
+      (value, cas) = perform(:cas, key)
+      value = (!value || value == 'Not found') ? nil : value
+      if block_given?
+        yield value, cas
+      else
+        [value, cas]
+      end
+    end
+
+    ##
+    # Fetch multiple keys efficiently, including available metadata such as CAS.
+    # If a block is given, yields key/data pairs one a time.  Data is an array:
+    # [value, cas_id]
+    # If no block is given, returns a hash of
+    #   { 'key' => [value, cas_id] }
+    def get_multi_cas(*keys)
+      if block_given?
+        get_multi_yielder(keys) {|*args| yield(*args)}
+      else
+        Hash.new.tap do |hash|
+          get_multi_yielder(keys) {|k, data| hash[k] = data}
+        end
+      end
+    end
+
+    ##
+    # Set the key-value pair, verifying existing CAS.
+    # Returns the resulting CAS value if succeeded, and falsy otherwise.
+    def set_cas(key, value, cas, ttl=nil, options=nil)
+      ttl ||= @options[:expires_in].to_i
+      perform(:set, key, value, ttl, cas, options)
+    end
+
+    ##
+    # Conditionally add a key/value pair, verifying existing CAS, only if the
+    # key already exists on the server.  Returns the new CAS value if the
+    # operation succeeded, or falsy otherwise.
+    def replace_cas(key, value, cas, ttl=nil, options=nil)
+      ttl ||= @options[:expires_in].to_i
+      perform(:replace, key, value, ttl, cas, options)
+    end
+
+    # Delete a key/value pair, verifying existing CAS.
+    # Returns true if succeeded, and falsy otherwise.
+    def delete_cas(key, cas=0)
+      perform(:delete, key, cas)
+    end
+
+  end
+end
diff --git a/lib/dalli-2.7.2/lib/dalli/client.rb b/lib/dalli-2.7.2/lib/dalli/client.rb
new file mode 100644
index 000000000..6d65b61b2
--- /dev/null
+++ b/lib/dalli-2.7.2/lib/dalli/client.rb
@@ -0,0 +1,439 @@
+require 'digest/md5'
+require 'set'
+
+# encoding: ascii
+module Dalli
+  class Client
+
+    ##
+    # Dalli::Client is the main class which developers will use to interact with
+    # the memcached server.  Usage:
+    #
+    #   Dalli::Client.new(['localhost:11211:10', 'cache-2.example.com:11211:5', '192.168.0.1:22122:5'],
+    #                   :threadsafe => true, :failover => true, :expires_in => 300)
+    #
+    # servers is an Array of "host:port:weight" where weight allows you to distribute cache unevenly.
+    # Both weight and port are optional.  If you pass in nil, Dalli will use the <tt>MEMCACHE_SERVERS</tt>
+    # environment variable or default to 'localhost:11211' if it is not present.
+    #
+    # Options:
+    # - :namespace - prepend each key with this value to provide simple namespacing.
+    # - :failover - if a server is down, look for and store values on another server in the ring.  Default: true.
+    # - :threadsafe - ensure that only one thread is actively using a socket at a time. Default: true.
+    # - :expires_in - default TTL in seconds if you do not pass TTL as a parameter to an individual operation, defaults to 0 or forever
+    # - :compress - defaults to false, if true Dalli will compress values larger than 1024 bytes before sending them to memcached.
+    # - :serializer - defaults to Marshal
+    # - :compressor - defaults to zlib
+    #
+    def initialize(servers=nil, options={})
+      @servers = normalize_servers(servers || ENV["MEMCACHE_SERVERS"] || '127.0.0.1:11211')
+      @options = normalize_options(options)
+      @ring = nil
+    end
+
+    #
+    # The standard memcached instruction set
+    #
+
+    ##
+    # Turn on quiet aka noreply support.
+    # All relevant operations within this block will be effectively
+    # pipelined as Dalli will use 'quiet' operations where possible.
+    # Currently supports the set, add, replace and delete operations.
+    def multi
+      old, Thread.current[:dalli_multi] = Thread.current[:dalli_multi], true
+      yield
+    ensure
+      Thread.current[:dalli_multi] = old
+    end
+
+    ##
+    # Get the value associated with the key.
+    def get(key, options=nil)
+      perform(:get, key)
+    end
+
+    ##
+    # Fetch multiple keys efficiently.
+    # If a block is given, yields key/value pairs one at a time.
+    # Otherwise returns a hash of { 'key' => 'value', 'key2' => 'value1' }
+    def get_multi(*keys)
+      if block_given?
+        get_multi_yielder(keys) {|k, data| yield k, data.first}
+      else
+         Hash.new.tap do |hash|
+          get_multi_yielder(keys) {|k, data| hash[k] = data.first}
+        end
+      end
+    end
+
+    def fetch(key, ttl=nil, options=nil)
+      ttl ||= @options[:expires_in].to_i
+      val = get(key, options)
+      if val.nil? && block_given?
+        val = yield
+        add(key, val, ttl, options)
+      end
+      val
+    end
+
+    ##
+    # compare and swap values using optimistic locking.
+    # Fetch the existing value for key.
+    # If it exists, yield the value to the block.
+    # Add the block's return value as the new value for the key.
+    # Add will fail if someone else changed the value.
+    #
+    # Returns:
+    # - nil if the key did not exist.
+    # - false if the value was changed by someone else.
+    # - true if the value was successfully updated.
+    def cas(key, ttl=nil, options=nil, &block)
+      ttl ||= @options[:expires_in].to_i
+      (value, cas) = perform(:cas, key)
+      value = (!value || value == 'Not found') ? nil : value
+      if value
+        newvalue = block.call(value)
+        perform(:set, key, newvalue, ttl, cas, options)
+      end
+    end
+
+    def set(key, value, ttl=nil, options=nil)
+      ttl ||= @options[:expires_in].to_i
+      perform(:set, key, value, ttl, 0, options)
+    end
+
+    ##
+    # Conditionally add a key/value pair, if the key does not already exist
+    # on the server.  Returns truthy if the operation succeeded.
+    def add(key, value, ttl=nil, options=nil)
+      ttl ||= @options[:expires_in].to_i
+      perform(:add, key, value, ttl, options)
+    end
+
+    ##
+    # Conditionally add a key/value pair, only if the key already exists
+    # on the server.  Returns truthy if the operation succeeded.
+    def replace(key, value, ttl=nil, options=nil)
+      ttl ||= @options[:expires_in].to_i
+      perform(:replace, key, value, ttl, 0, options)
+    end
+
+    def delete(key)
+      perform(:delete, key, 0)
+    end
+
+    ##
+    # Append value to the value already stored on the server for 'key'.
+    # Appending only works for values stored with :raw => true.
+    def append(key, value)
+      perform(:append, key, value.to_s)
+    end
+
+    ##
+    # Prepend value to the value already stored on the server for 'key'.
+    # Prepending only works for values stored with :raw => true.
+    def prepend(key, value)
+      perform(:prepend, key, value.to_s)
+    end
+
+    def flush(delay=0)
+      time = -delay
+      ring.servers.map { |s| s.request(:flush, time += delay) }
+    end
+
+    alias_method :flush_all, :flush
+
+    ##
+    # Incr adds the given amount to the counter on the memcached server.
+    # Amt must be a positive integer value.
+    #
+    # If default is nil, the counter must already exist or the operation
+    # will fail and will return nil.  Otherwise this method will return
+    # the new value for the counter.
+    #
+    # Note that the ttl will only apply if the counter does not already
+    # exist.  To increase an existing counter and update its TTL, use
+    # #cas.
+    def incr(key, amt=1, ttl=nil, default=nil)
+      raise ArgumentError, "Positive values only: #{amt}" if amt < 0
+      ttl ||= @options[:expires_in].to_i
+      perform(:incr, key, amt.to_i, ttl, default)
+    end
+
+    ##
+    # Decr subtracts the given amount from the counter on the memcached server.
+    # Amt must be a positive integer value.
+    #
+    # memcached counters are unsigned and cannot hold negative values.  Calling
+    # decr on a counter which is 0 will just return 0.
+    #
+    # If default is nil, the counter must already exist or the operation
+    # will fail and will return nil.  Otherwise this method will return
+    # the new value for the counter.
+    #
+    # Note that the ttl will only apply if the counter does not already
+    # exist.  To decrease an existing counter and update its TTL, use
+    # #cas.
+    def decr(key, amt=1, ttl=nil, default=nil)
+      raise ArgumentError, "Positive values only: #{amt}" if amt < 0
+      ttl ||= @options[:expires_in].to_i
+      perform(:decr, key, amt.to_i, ttl, default)
+    end
+
+    ##
+    # Touch updates expiration time for a given key.
+    #
+    # Returns true if key exists, otherwise nil.
+    def touch(key, ttl=nil)
+      ttl ||= @options[:expires_in].to_i
+      resp = perform(:touch, key, ttl)
+      resp.nil? ? nil : true
+    end
+
+    ##
+    # Collect the stats for each server.
+    # You can optionally pass a type including :items or :slabs to get specific stats
+    # Returns a hash like { 'hostname:port' => { 'stat1' => 'value1', ... }, 'hostname2:port' => { ... } }
+    def stats(type=nil)
+      type = nil if ![nil, :items,:slabs].include? type
+      values = {}
+      ring.servers.each do |server|
+        values["#{server.hostname}:#{server.port}"] = server.alive? ? server.request(:stats,type.to_s) : nil
+      end
+      values
+    end
+
+    ##
+    # Reset stats for each server.
+    def reset_stats
+      ring.servers.map do |server|
+        server.alive? ? server.request(:reset_stats) : nil
+      end
+    end
+
+    ##
+    ## Make sure memcache servers are alive, or raise an Dalli::RingError
+    def alive!
+      ring.server_for_key("")
+    end
+
+    ##
+    ## Version of the memcache servers.
+    def version
+      values = {}
+      ring.servers.each do |server|
+        values["#{server.hostname}:#{server.port}"] = server.alive? ? server.request(:version) : nil
+      end
+      values
+    end
+
+    ##
+    # Close our connection to each server.
+    # If you perform another operation after this, the connections will be re-established.
+    def close
+      if @ring
+        @ring.servers.each { |s| s.close }
+        @ring = nil
+      end
+    end
+    alias_method :reset, :close
+
+    # Stub method so a bare Dalli client can pretend to be a connection pool.
+    def with
+      yield self
+    end
+
+    private
+
+    def groups_for_keys(*keys)
+      groups = mapped_keys(keys).flatten.group_by do |key|
+        begin
+          ring.server_for_key(key)
+        rescue Dalli::RingError
+          Dalli.logger.debug { "unable to get key #{key}" }
+          nil
+        end
+      end
+      return groups
+    end
+
+    def mapped_keys(keys)
+      keys.flatten.map {|a| validate_key(a.to_s)}
+    end
+
+    def make_multi_get_requests(groups)
+      groups.each do |server, keys_for_server|
+        begin
+          # TODO: do this with the perform chokepoint?
+          # But given the fact that fetching the response doesn't take place
+          # in that slot it's misleading anyway. Need to move all of this method
+          # into perform to be meaningful
+          server.request(:send_multiget, keys_for_server)
+        rescue DalliError, NetworkError => e
+          Dalli.logger.debug { e.inspect }
+          Dalli.logger.debug { "unable to get keys for server #{server.hostname}:#{server.port}" }
+        end
+      end
+    end
+
+    def perform_multi_response_start(servers)
+      servers.each do |server|
+        next unless server.alive?
+        begin
+          server.multi_response_start
+        rescue DalliError, NetworkError => e
+          Dalli.logger.debug { e.inspect }
+          Dalli.logger.debug { "results from this server will be missing" }
+          servers.delete(server)
+        end
+      end
+      servers
+    end
+
+    ##
+    # Normalizes the argument into an array of servers. If the argument is a string, it's expected to be of
+    # the format "memcache1.example.com:11211[,memcache2.example.com:11211[,memcache3.example.com:11211[...]]]
+    def normalize_servers(servers)
+      if servers.is_a? String
+        return servers.split(",")
+      else
+        return servers
+      end
+    end
+
+    def ring
+      @ring ||= Dalli::Ring.new(
+        @servers.map do |s|
+         server_options = {}
+          if s =~ %r{\Amemcached://}
+            uri = URI.parse(s)
+            server_options[:username] = uri.user
+            server_options[:password] = uri.password
+            s = "#{uri.host}:#{uri.port}"
+          end
+          Dalli::Server.new(s, @options.merge(server_options))
+        end, @options
+      )
+    end
+
+    # Chokepoint method for instrumentation
+    def perform(*all_args, &blk)
+      return blk.call if blk
+      op, key, *args = *all_args
+
+      key = key.to_s
+      key = validate_key(key)
+      begin
+        server = ring.server_for_key(key)
+        ret = server.request(op, key, *args)
+        ret
+      rescue NetworkError => e
+        Dalli.logger.debug { e.inspect }
+        Dalli.logger.debug { "retrying request with new server" }
+        retry
+      end
+    end
+
+    def validate_key(key)
+      raise ArgumentError, "key cannot be blank" if !key || key.length == 0
+      key = key_with_namespace(key)
+      if key.length > 250
+        max_length_before_namespace = 212 - (namespace || '').size
+        key = "#{key[0, max_length_before_namespace]}:md5:#{Digest::MD5.hexdigest(key)}"
+      end
+      return key
+    end
+
+    def key_with_namespace(key)
+      (ns = namespace) ? "#{ns}:#{key}" : key
+    end
+
+    def key_without_namespace(key)
+      (ns = namespace) ? key.sub(%r(\A#{ns}:), '') : key
+    end
+
+    def namespace
+      return nil unless @options[:namespace]
+      @options[:namespace].is_a?(Proc) ? @options[:namespace].call.to_s : @options[:namespace].to_s
+    end
+
+    def normalize_options(opts)
+      if opts[:compression]
+        Dalli.logger.warn "DEPRECATED: Dalli's :compression option is now just :compress => true.  Please update your configuration."
+        opts[:compress] = opts.delete(:compression)
+      end
+      begin
+        opts[:expires_in] = opts[:expires_in].to_i if opts[:expires_in]
+      rescue NoMethodError
+        raise ArgumentError, "cannot convert :expires_in => #{opts[:expires_in].inspect} to an integer"
+      end
+      opts
+    end
+
+    ##
+    # Yields, one at a time, keys and their values+attributes.
+    def get_multi_yielder(keys)
+      perform do
+        return {} if keys.empty?
+        ring.lock do
+          begin
+            groups = groups_for_keys(keys)
+            if unfound_keys = groups.delete(nil)
+              Dalli.logger.debug { "unable to get keys for #{unfound_keys.length} keys because no matching server was found" }
+            end
+            make_multi_get_requests(groups)
+
+            servers = groups.keys
+            return if servers.empty?
+            servers = perform_multi_response_start(servers)
+
+            start = Time.now
+            loop do
+              # remove any dead servers
+              servers.delete_if { |s| s.sock.nil? }
+              break if servers.empty?
+
+              # calculate remaining timeout
+              elapsed = Time.now - start
+              timeout = servers.first.options[:socket_timeout]
+              if elapsed > timeout
+                readable = nil
+              else
+                sockets = servers.map(&:sock)
+                readable, _ = IO.select(sockets, nil, nil, timeout - elapsed)
+              end
+
+              if readable.nil?
+                # no response within timeout; abort pending connections
+                servers.each do |server|
+                  Dalli.logger.debug { "memcached at #{server.name} did not response within timeout" }
+                  server.multi_response_abort
+                end
+                break
+
+              else
+                readable.each do |sock|
+                  server = sock.server
+
+                  begin
+                    server.multi_response_nonblock.each_pair do |key, value_list|
+                      yield key_without_namespace(key), value_list
+                    end
+
+                    if server.multi_response_completed?
+                      servers.delete(server)
+                    end
+                  rescue NetworkError
+                    servers.delete(server)
+                  end
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+
+  end
+end
diff --git a/lib/dalli-2.7.2/lib/dalli/compressor.rb b/lib/dalli-2.7.2/lib/dalli/compressor.rb
new file mode 100644
index 000000000..353593ab9
--- /dev/null
+++ b/lib/dalli-2.7.2/lib/dalli/compressor.rb
@@ -0,0 +1,29 @@
+require 'zlib'
+require 'stringio'
+
+module Dalli
+  class Compressor
+    def self.compress(data)
+      Zlib::Deflate.deflate(data)
+    end
+
+    def self.decompress(data)
+      Zlib::Inflate.inflate(data)
+    end
+  end
+
+  class GzipCompressor
+    def self.compress(data)
+      io = StringIO.new("w")
+      gz = Zlib::GzipWriter.new(io)
+      gz.write(data)
+      gz.close
+      io.string
+    end
+
+    def self.decompress(data)
+      io = StringIO.new(data, "rb")
+      Zlib::GzipReader.new(io).read
+    end
+  end
+end
diff --git a/lib/dalli-2.7.2/lib/dalli/options.rb b/lib/dalli-2.7.2/lib/dalli/options.rb
new file mode 100644
index 000000000..b3c405203
--- /dev/null
+++ b/lib/dalli-2.7.2/lib/dalli/options.rb
@@ -0,0 +1,64 @@
+require 'thread'
+require 'monitor'
+
+module Dalli
+
+  # Make Dalli threadsafe by using a lock around all
+  # public server methods.
+  #
+  # Dalli::Server.extend(Dalli::Threadsafe)
+  #
+  module Threadsafe
+    def self.extended(obj)
+      obj.init_threadsafe
+    end
+
+    def request(op, *args)
+      @lock.synchronize do
+        super
+      end
+    end
+
+    def alive?
+      @lock.synchronize do
+        super
+      end
+    end
+
+    def close
+      @lock.synchronize do
+        super
+      end
+    end
+
+    def multi_response_start
+      @lock.synchronize do
+        super
+      end
+    end
+
+    def multi_response_nonblock
+      @lock.synchronize do
+        super
+      end
+    end
+
+    def multi_response_abort
+      @lock.synchronize do
+        super
+      end
+    end
+
+    def lock!
+      @lock.mon_enter
+    end
+
+    def unlock!
+      @lock.mon_exit
+    end
+
+    def init_threadsafe
+      @lock = Monitor.new
+    end
+  end
+end
diff --git a/lib/dalli-2.7.2/lib/dalli/railtie.rb b/lib/dalli-2.7.2/lib/dalli/railtie.rb
new file mode 100644
index 000000000..9c5d5d2b9
--- /dev/null
+++ b/lib/dalli-2.7.2/lib/dalli/railtie.rb
@@ -0,0 +1,7 @@
+module Dalli
+  class Railtie < ::Rails::Railtie
+    config.before_configuration do
+      config.cache_store = :dalli_store
+    end
+  end
+end
diff --git a/lib/dalli-2.7.2/lib/dalli/ring.rb b/lib/dalli-2.7.2/lib/dalli/ring.rb
new file mode 100644
index 000000000..11c234021
--- /dev/null
+++ b/lib/dalli-2.7.2/lib/dalli/ring.rb
@@ -0,0 +1,142 @@
+require 'digest/sha1'
+require 'zlib'
+
+module Dalli
+  class Ring
+    POINTS_PER_SERVER = 160 # this is the default in libmemcached
+
+    attr_accessor :servers, :continuum
+
+    def initialize(servers, options)
+      @servers = servers
+      @continuum = nil
+      if servers.size > 1
+        total_weight = servers.inject(0) { |memo, srv| memo + srv.weight }
+        continuum = []
+        servers.each do |server|
+          entry_count_for(server, servers.size, total_weight).times do |idx|
+            hash = Digest::SHA1.hexdigest("#{server.hostname}:#{server.port}:#{idx}")
+            value = Integer("0x#{hash[0..7]}")
+            continuum << Dalli::Ring::Entry.new(value, server)
+          end
+        end
+        @continuum = continuum.sort { |a, b| a.value <=> b.value }
+      end
+
+      threadsafe! unless options[:threadsafe] == false
+      @failover = options[:failover] != false
+    end
+
+    def server_for_key(key)
+      if @continuum
+        hkey = hash_for(key)
+        20.times do |try|
+          entryidx = binary_search(@continuum, hkey)
+          server = @continuum[entryidx].server
+          return server if server.alive?
+          break unless @failover
+          hkey = hash_for("#{try}#{key}")
+        end
+      else
+        server = @servers.first
+        return server if server && server.alive?
+      end
+
+      raise Dalli::RingError, "No server available"
+    end
+
+    def lock
+      @servers.each { |s| s.lock! }
+      begin
+        return yield
+      ensure
+        @servers.each { |s| s.unlock! }
+      end
+    end
+
+    private
+
+    def threadsafe!
+      @servers.each do |s|
+        s.extend(Dalli::Threadsafe)
+      end
+    end
+
+    def hash_for(key)
+      Zlib.crc32(key)
+    end
+
+    def entry_count_for(server, total_servers, total_weight)
+      ((total_servers * POINTS_PER_SERVER * server.weight) / Float(total_weight)).floor
+    end
+
+    # Native extension to perform the binary search within the continuum
+    # space.  Fallback to a pure Ruby version if the compilation doesn't work.
+    # optional for performance and only necessary if you are using multiple
+    # memcached servers.
+    begin
+      require 'inline'
+      inline do |builder|
+        builder.c <<-EOM
+        int binary_search(VALUE ary, unsigned int r) {
+            long upper = RARRAY_LEN(ary) - 1;
+            long lower = 0;
+            long idx = 0;
+            ID value = rb_intern("value");
+            VALUE continuumValue;
+            unsigned int l;
+
+            while (lower <= upper) {
+                idx = (lower + upper) / 2;
+
+                continuumValue = rb_funcall(RARRAY_PTR(ary)[idx], value, 0);
+                l = NUM2UINT(continuumValue);
+                if (l == r) {
+                    return idx;
+                }
+                else if (l > r) {
+                    upper = idx - 1;
+                }
+                else {
+                    lower = idx + 1;
+                }
+            }
+            return upper;
+        }
+        EOM
+      end
+    rescue LoadError
+      # Find the closest index in the Ring with value <= the given value
+      def binary_search(ary, value)
+        upper = ary.size - 1
+        lower = 0
+        idx = 0
+
+        while (lower <= upper) do
+          idx = (lower + upper) / 2
+          comp = ary[idx].value <=> value
+
+          if comp == 0
+            return idx
+          elsif comp > 0
+            upper = idx - 1
+          else
+            lower = idx + 1
+          end
+        end
+        return upper
+      end
+    end
+
+    class Entry
+      attr_reader :value
+      attr_reader :server
+
+      def initialize(val, srv)
+        @value = val
+        @server = srv
+      end
+    end
+
+  end
+end
diff --git a/lib/dalli-2.7.2/lib/dalli/server.rb b/lib/dalli-2.7.2/lib/dalli/server.rb
new file mode 100644
index 000000000..38a4fb62d
--- /dev/null
+++ b/lib/dalli-2.7.2/lib/dalli/server.rb
@@ -0,0 +1,696 @@
+require 'socket'
+require 'timeout'
+
+module Dalli
+  class Server
+    attr_accessor :hostname
+    attr_accessor :port
+    attr_accessor :weight
+    attr_accessor :options
+    attr_reader :sock
+
+    DEFAULTS = {
+      # seconds between trying to contact a remote server
+      :down_retry_delay => 1,
+      # connect/read/write timeout for socket operations
+      :socket_timeout => 0.5,
+      # times a socket operation may fail before considering the server dead
+      :socket_max_failures => 2,
+      # amount of time to sleep between retries when a failure occurs
+      :socket_failure_delay => 0.01,
+      # max size of value in bytes (default is 1 MB, can be overriden with "memcached -I <size>")
+      :value_max_bytes => 1024 * 1024,
+      :compressor => Compressor,
+      # min byte size to attempt compression
+      :compression_min_size => 1024,
+      # max byte size for compression
+      :compression_max_size => false,
+      :serializer => Marshal,
+      :username => nil,
+      :password => nil,
+      :keepalive => true
+    }
+
+    def initialize(attribs, options = {})
+      (@hostname, @port, @weight) = parse_hostname(attribs)
+      @port ||= 11211
+      @port = Integer(@port)
+      @weight ||= 1
+      @weight = Integer(@weight)
+      @fail_count = 0
+      @down_at = nil
+      @last_down_at = nil
+      @options = DEFAULTS.merge(options)
+      @sock = nil
+      @msg = nil
+      @error = nil
+      @pid = nil
+      @inprogress = nil
+    end
+
+    def name
+      "#{@hostname}:#{@port}"
+    end
+
+    # Chokepoint method for instrumentation
+    def request(op, *args)
+      verify_state
+      raise Dalli::NetworkError, "#{hostname}:#{port} is down: #{@error} #{@msg}. If you are sure it is running, ensure memcached version is > 1.4." unless alive?
+      begin
+        send(op, *args)
+      rescue Dalli::NetworkError
+        raise
+      rescue Dalli::MarshalError => ex
+        Dalli.logger.error "Marshalling error for key '#{args.first}': #{ex.message}"
+        Dalli.logger.error "You are trying to cache a Ruby object which cannot be serialized to memcached."
+        Dalli.logger.error ex.backtrace.join("\n\t")
+        false
+      rescue Dalli::DalliError
+        raise
+      rescue => ex
+        Dalli.logger.error "Unexpected exception in Dalli: #{ex.class.name}: #{ex.message}"
+        Dalli.logger.error "This is a bug in Dalli, please enter an issue in Github if it does not already exist."
+        Dalli.logger.error ex.backtrace.join("\n\t")
+        down!
+      end
+    end
+
+    def alive?
+      return true if @sock
+
+      if @last_down_at && @last_down_at + options[:down_retry_delay] >= Time.now
+        time = @last_down_at + options[:down_retry_delay] - Time.now
+        Dalli.logger.debug { "down_retry_delay not reached for #{hostname}:#{port} (%.3f seconds left)" % time }
+        return false
+      end
+
+      connect
+      !!@sock
+    rescue Dalli::NetworkError
+      false
+    end
+
+    def close
+      return unless @sock
+      @sock.close rescue nil
+      @sock = nil
+      @pid = nil
+      @inprogress = false
+    end
+
+    def lock!
+    end
+
+    def unlock!
+    end
+
+    def serializer
+      @options[:serializer]
+    end
+
+    def compressor
+      @options[:compressor]
+    end
+
+    # Start reading key/value pairs from this connection. This is usually called
+    # after a series of GETKQ commands. A NOOP is sent, and the server begins
+    # flushing responses for kv pairs that were found.
+    #
+    # Returns nothing.
+    def multi_response_start
+      verify_state
+      write_noop
+      @multi_buffer = ''
+      @position = 0
+      @inprogress = true
+    end
+
+    # Did the last call to #multi_response_start complete successfully?
+    def multi_response_completed?
+      @multi_buffer.nil?
+    end
+
+    # Attempt to receive and parse as many key/value pairs as possible
+    # from this server. After #multi_response_start, this should be invoked
+    # repeatedly whenever this server's socket is readable until
+    # #multi_response_completed?.
+    #
+    # Returns a Hash of kv pairs received.
+    def multi_response_nonblock
+      raise 'multi_response has completed' if @multi_buffer.nil?
+
+      @multi_buffer << @sock.read_available
+      buf = @multi_buffer
+      pos = @position
+      values = {}
+
+      while buf.bytesize - pos >= 24
+        header = buf.slice(pos, 24)
+        (key_length, _, body_length, cas) = header.unpack(KV_HEADER)
+
+        if key_length == 0
+          # all done!
+          @multi_buffer = nil
+          @position = nil
+          @inprogress = false
+          break
+
+        elsif buf.bytesize - pos >= 24 + body_length
+          flags = buf.slice(pos + 24, 4).unpack('N')[0]
+          key = buf.slice(pos + 24 + 4, key_length)
+          value = buf.slice(pos + 24 + 4 + key_length, body_length - key_length - 4) if body_length - key_length - 4 > 0
+
+          pos = pos + 24 + body_length
+
+          begin
+            values[key] = [deserialize(value, flags), cas]
+          rescue DalliError
+          end
+
+        else
+          # not enough data yet, wait for more
+          break
+        end
+      end
+      @position = pos
+
+      values
+    rescue SystemCallError, Timeout::Error, EOFError => e
+      failure!(e)
+    end
+
+    # Abort an earlier #multi_response_start. Used to signal an external
+    # timeout. The underlying socket is disconnected, and the exception is
+    # swallowed.
+    #
+    # Returns nothing.
+    def multi_response_abort
+      @multi_buffer = nil
+      @position = nil
+      @inprogress = false
+      failure!(RuntimeError.new('External timeout'))
+    rescue NetworkError
+      true
+    end
+
+    # NOTE: Additional public methods should be overridden in Dalli::Threadsafe
+
+    private
+
+    def verify_state
+      failure!(RuntimeError.new('Already writing to socket')) if @inprogress
+      failure!(RuntimeError.new('Cannot share client between multiple processes')) if @pid && @pid != Process.pid
+    end
+
+    def failure!(exception)
+      message = "#{hostname}:#{port} failed (count: #{@fail_count}) #{exception.class}: #{exception.message}"
+      Dalli.logger.info { message }
+
+      @fail_count += 1
+      if @fail_count >= options[:socket_max_failures]
+        down!
+      else
+        close
+        sleep(options[:socket_failure_delay]) if options[:socket_failure_delay]
+        raise Dalli::NetworkError, "Socket operation failed, retrying..."
+      end
+    end
+
+    def down!
+      close
+
+      @last_down_at = Time.now
+
+      if @down_at
+        time = Time.now - @down_at
+        Dalli.logger.debug { "#{hostname}:#{port} is still down (for %.3f seconds now)" % time }
+      else
+        @down_at = @last_down_at
+        Dalli.logger.warn { "#{hostname}:#{port} is down" }
+      end
+
+      @error = $! && $!.class.name
+      @msg = @msg || ($! && $!.message && !$!.message.empty? && $!.message)
+      raise Dalli::NetworkError, "#{hostname}:#{port} is down: #{@error} #{@msg}"
+    end
+
+    def up!
+      if @down_at
+        time = Time.now - @down_at
+        Dalli.logger.warn { "#{hostname}:#{port} is back (downtime was %.3f seconds)" % time }
+      end
+
+      @fail_count = 0
+      @down_at = nil
+      @last_down_at = nil
+      @msg = nil
+      @error = nil
+    end
+
+    def multi?
+      Thread.current[:dalli_multi]
+    end
+
+    def get(key)
+      req = [REQUEST, OPCODES[:get], key.bytesize, 0, 0, 0, key.bytesize, 0, 0, key].pack(FORMAT[:get])
+      write(req)
+      generic_response(true)
+    end
+
+    def send_multiget(keys)
+      req = ""
+      keys.each do |key|
+        req << [REQUEST, OPCODES[:getkq], key.bytesize, 0, 0, 0, key.bytesize, 0, 0, key].pack(FORMAT[:getkq])
+      end
+      # Could send noop here instead of in multi_response_start
+      write(req)
+    end
+
+    def set(key, value, ttl, cas, options)
+      (value, flags) = serialize(key, value, options)
+      ttl = sanitize_ttl(ttl)
+
+      guard_max_value(key, value) do
+        req = [REQUEST, OPCODES[multi? ? :setq : :set], key.bytesize, 8, 0, 0, value.bytesize + key.bytesize + 8, 0, cas, flags, ttl, key, value].pack(FORMAT[:set])
+        write(req)
+        cas_response unless multi?
+      end
+    end
+
+    def add(key, value, ttl, options)
+      (value, flags) = serialize(key, value, options)
+      ttl = sanitize_ttl(ttl)
+
+      guard_max_value(key, value) do
+        req = [REQUEST, OPCODES[multi? ? :addq : :add], key.bytesize, 8, 0, 0, value.bytesize + key.bytesize + 8, 0, 0, flags, ttl, key, value].pack(FORMAT[:add])
+        write(req)
+        cas_response unless multi?
+      end
+    end
+
+    def replace(key, value, ttl, cas, options)
+      (value, flags) = serialize(key, value, options)
+      ttl = sanitize_ttl(ttl)
+
+      guard_max_value(key, value) do
+        req = [REQUEST, OPCODES[multi? ? :replaceq : :replace], key.bytesize, 8, 0, 0, value.bytesize + key.bytesize + 8, 0, cas, flags, ttl, key, value].pack(FORMAT[:replace])
+        write(req)
+        cas_response unless multi?
+      end
+    end
+
+    def delete(key, cas)
+      req = [REQUEST, OPCODES[multi? ? :deleteq : :delete], key.bytesize, 0, 0, 0, key.bytesize, 0, cas, key].pack(FORMAT[:delete])
+      write(req)
+      generic_response unless multi?
+    end
+
+    def flush(ttl)
+      req = [REQUEST, OPCODES[:flush], 0, 4, 0, 0, 4, 0, 0, 0].pack(FORMAT[:flush])
+      write(req)
+      generic_response
+    end
+
+    def decr_incr(opcode, key, count, ttl, default)
+      expiry = default ? sanitize_ttl(ttl) : 0xFFFFFFFF
+      default ||= 0
+      (h, l) = split(count)
+      (dh, dl) = split(default)
+      req = [REQUEST, OPCODES[opcode], key.bytesize, 20, 0, 0, key.bytesize + 20, 0, 0, h, l, dh, dl, expiry, key].pack(FORMAT[opcode])
+      write(req)
+      body = generic_response
+      body ? body.unpack('Q>').first : body
+    end
+
+    def decr(key, count, ttl, default)
+      decr_incr :decr, key, count, ttl, default
+    end
+
+    def incr(key, count, ttl, default)
+      decr_incr :incr, key, count, ttl, default
+    end
+
+    def write_append_prepend(opcode, key, value)
+      write_generic [REQUEST, OPCODES[opcode], key.bytesize, 0, 0, 0, value.bytesize + key.bytesize, 0, 0, key, value].pack(FORMAT[opcode])
+    end
+
+    def write_generic(bytes)
+      write(bytes)
+      generic_response
+    end
+
+    def write_noop
+      req = [REQUEST, OPCODES[:noop], 0, 0, 0, 0, 0, 0, 0].pack(FORMAT[:noop])
+      write(req)
+    end
+
+    # Noop is a keepalive operation but also used to demarcate the end of a set of pipelined commands.
+    # We need to read all the responses at once.
+    def noop
+      write_noop
+      multi_response
+    end
+
+    def append(key, value)
+      write_append_prepend :append, key, value
+    end
+
+    def prepend(key, value)
+      write_append_prepend :prepend, key, value
+    end
+
+    def stats(info='')
+      req = [REQUEST, OPCODES[:stat], info.bytesize, 0, 0, 0, info.bytesize, 0, 0, info].pack(FORMAT[:stat])
+      write(req)
+      keyvalue_response
+    end
+
+    def reset_stats
+      write_generic [REQUEST, OPCODES[:stat], 'reset'.bytesize, 0, 0, 0, 'reset'.bytesize, 0, 0, 'reset'].pack(FORMAT[:stat])
+    end
+
+    def cas(key)
+      req = [REQUEST, OPCODES[:get], key.bytesize, 0, 0, 0, key.bytesize, 0, 0, key].pack(FORMAT[:get])
+      write(req)
+      data_cas_response
+    end
+
+    def version
+      write_generic [REQUEST, OPCODES[:version], 0, 0, 0, 0, 0, 0, 0].pack(FORMAT[:noop])
+    end
+
+    def touch(key, ttl)
+      ttl = sanitize_ttl(ttl)
+      write_generic [REQUEST, OPCODES[:touch], key.bytesize, 4, 0, 0, key.bytesize + 4, 0, 0, ttl, key].pack(FORMAT[:touch])
+    end
+
+    # http://www.hjp.at/zettel/m/memcached_flags.rxml
+    # Looks like most clients use bit 0 to indicate native language serialization
+    # and bit 1 to indicate gzip compression.
+    FLAG_SERIALIZED = 0x1
+    FLAG_COMPRESSED = 0x2
+
+    def serialize(key, value, options=nil)
+      marshalled = false
+      value = unless options && options[:raw]
+        marshalled = true
+        begin
+          self.serializer.dump(value)
+        rescue => ex
+          # Marshalling can throw several different types of generic Ruby exceptions.
+          # Convert to a specific exception so we can special case it higher up the stack.
+          exc = Dalli::MarshalError.new(ex.message)
+          exc.set_backtrace ex.backtrace
+          raise exc
+        end
+      else
+        value.to_s
+      end
+      compressed = false
+      if @options[:compress] && value.bytesize >= @options[:compression_min_size] &&
+        (!@options[:compression_max_size] || value.bytesize <= @options[:compression_max_size])
+        value = self.compressor.compress(value)
+        compressed = true
+      end
+
+      flags = 0
+      flags |= FLAG_COMPRESSED if compressed
+      flags |= FLAG_SERIALIZED if marshalled
+      [value, flags]
+    end
+
+    def deserialize(value, flags)
+      value = self.compressor.decompress(value) if (flags & FLAG_COMPRESSED) != 0
+      value = self.serializer.load(value) if (flags & FLAG_SERIALIZED) != 0
+      value
+    rescue TypeError
+      raise if $!.message !~ /needs to have method `_load'|exception class\/object expected|instance of IO needed|incompatible marshal file format/
+      raise UnmarshalError, "Unable to unmarshal value: #{$!.message}"
+    rescue ArgumentError
+      raise if $!.message !~ /undefined class|marshal data too short/
+      raise UnmarshalError, "Unable to unmarshal value: #{$!.message}"
+    rescue Zlib::Error
+      raise UnmarshalError, "Unable to uncompress value: #{$!.message}"
+    end
+
+    def data_cas_response
+      (extras, _, status, count, _, cas) = read_header.unpack(CAS_HEADER)
+      data = read(count) if count > 0
+      if status == 1
+        nil
+      elsif status != 0
+        raise Dalli::DalliError, "Response error #{status}: #{RESPONSE_CODES[status]}"
+      elsif data
+        flags = data[0...extras].unpack('N')[0]
+        value = data[extras..-1]
+        data = deserialize(value, flags)
+      end
+      [data, cas]
+    end
+
+    CAS_HEADER = '@4CCnNNQ'
+    NORMAL_HEADER = '@4CCnN'
+    KV_HEADER = '@2n@6nN@16Q'
+
+    def guard_max_value(key, value)
+      if value.bytesize <= @options[:value_max_bytes]
+        yield
+      else
+        Dalli.logger.warn "Value for #{key} over max size: #{@options[:value_max_bytes]} <= #{value.bytesize}"
+        false
+      end
+    end
+
+    # https://code.google.com/p/memcached/wiki/NewCommands#Standard_Protocol
+    # > An expiration time, in seconds. Can be up to 30 days. After 30 days, is treated as a unix timestamp of an exact date.
+    MAX_ACCEPTABLE_EXPIRATION_INTERVAL = 30*24*60*60 # 30 days
+    def sanitize_ttl(ttl)
+      if ttl > MAX_ACCEPTABLE_EXPIRATION_INTERVAL
+        Dalli.logger.debug "Expiration interval too long for Memcached, converting to an expiration timestamp"
+        Time.now.to_i + ttl
+      else
+        ttl
+      end
+    end
+
+    def generic_response(unpack=false)
+      (extras, _, status, count) = read_header.unpack(NORMAL_HEADER)
+      data = read(count) if count > 0
+      if status == 1
+        nil
+      elsif status == 2 || status == 5
+        false # Not stored, normal status for add operation
+      elsif status != 0
+        raise Dalli::DalliError, "Response error #{status}: #{RESPONSE_CODES[status]}"
+      elsif data
+        flags = data[0...extras].unpack('N')[0]
+        value = data[extras..-1]
+        unpack ? deserialize(value, flags) : value
+      else
+        true
+      end
+    end
+
+    def cas_response
+      (_, _, status, count, _, cas) = read_header.unpack(CAS_HEADER)
+      read(count) if count > 0  # this is potential data that we don't care about
+      if status == 1
+        nil
+      elsif status == 2 || status == 5
+        false # Not stored, normal status for add operation
+      elsif status != 0
+        raise Dalli::DalliError, "Response error #{status}: #{RESPONSE_CODES[status]}"
+      else
+        cas
+      end
+    end
+
+    def keyvalue_response
+      hash = {}
+      loop do
+        (key_length, _, body_length, _) = read_header.unpack(KV_HEADER)
+        return hash if key_length == 0
+        key = read(key_length)
+        value = read(body_length - key_length) if body_length - key_length > 0
+        hash[key] = value
+      end
+    end
+
+    def multi_response
+      hash = {}
+      loop do
+        (key_length, _, body_length, _) = read_header.unpack(KV_HEADER)
+        return hash if key_length == 0
+        flags = read(4).unpack('N')[0]
+        key = read(key_length)
+        value = read(body_length - key_length - 4) if body_length - key_length - 4 > 0
+        hash[key] = deserialize(value, flags)
+      end
+    end
+
+    def write(bytes)
+      begin
+        @inprogress = true
+        result = @sock.write(bytes)
+        @inprogress = false
+        result
+      rescue SystemCallError, Timeout::Error => e
+        failure!(e)
+      end
+    end
+
+    def read(count)
+      begin
+        @inprogress = true
+        data = @sock.readfull(count)
+        @inprogress = false
+        data
+      rescue SystemCallError, Timeout::Error, EOFError => e
+        failure!(e)
+      end
+    end
+
+    def read_header
+      read(24) || raise(Dalli::NetworkError, 'No response')
+    end
+
+    def connect
+      Dalli.logger.debug { "Dalli::Server#connect #{hostname}:#{port}" }
+
+      begin
+        @pid = Process.pid
+        @sock = KSocket.open(hostname, port, self, options)
+        @version = version # trigger actual connect
+        sasl_authentication if need_auth?
+        up!
+      rescue Dalli::DalliError # SASL auth failure
+        raise
+      rescue SystemCallError, Timeout::Error, EOFError, SocketError => e
+        # SocketError = DNS resolution failure
+        failure!(e)
+      end
+    end
+
+    def split(n)
+      [n >> 32, 0xFFFFFFFF & n]
+    end
+
+    REQUEST = 0x80
+    RESPONSE = 0x81
+
+    RESPONSE_CODES = {
+      0 => 'No error',
+      1 => 'Key not found',
+      2 => 'Key exists',
+      3 => 'Value too large',
+      4 => 'Invalid arguments',
+      5 => 'Item not stored',
+      6 => 'Incr/decr on a non-numeric value',
+      0x20 => 'Authentication required',
+      0x81 => 'Unknown command',
+      0x82 => 'Out of memory',
+    }
+
+    OPCODES = {
+      :get => 0x00,
+      :set => 0x01,
+      :add => 0x02,
+      :replace => 0x03,
+      :delete => 0x04,
+      :incr => 0x05,
+      :decr => 0x06,
+      :flush => 0x08,
+      :noop => 0x0A,
+      :version => 0x0B,
+      :getkq => 0x0D,
+      :append => 0x0E,
+      :prepend => 0x0F,
+      :stat => 0x10,
+      :setq => 0x11,
+      :addq => 0x12,
+      :replaceq => 0x13,
+      :deleteq => 0x14,
+      :incrq => 0x15,
+      :decrq => 0x16,
+      :auth_negotiation => 0x20,
+      :auth_request => 0x21,
+      :auth_continue => 0x22,
+      :touch => 0x1C,
+    }
+
+    HEADER = "CCnCCnNNQ"
+    OP_FORMAT = {
+      :get => 'a*',
+      :set => 'NNa*a*',
+      :add => 'NNa*a*',
+      :replace => 'NNa*a*',
+      :delete => 'a*',
+      :incr => 'NNNNNa*',
+      :decr => 'NNNNNa*',
+      :flush => 'N',
+      :noop => '',
+      :getkq => 'a*',
+      :version => '',
+      :stat => 'a*',
+      :append => 'a*a*',
+      :prepend => 'a*a*',
+      :auth_request => 'a*a*',
+      :auth_continue => 'a*a*',
+      :touch => 'Na*',
+    }
+    FORMAT = OP_FORMAT.inject({}) { |memo, (k, v)| memo[k] = HEADER + v; memo }
+
+
+    #######
+    # SASL authentication support for NorthScale
+    #######
+
+    def need_auth?
+      @options[:username] || ENV['MEMCACHE_USERNAME']
+    end
+
+    def username
+      @options[:username] || ENV['MEMCACHE_USERNAME']
+    end
+
+    def password
+      @options[:password] || ENV['MEMCACHE_PASSWORD']
+    end
+
+    def sasl_authentication
+      Dalli.logger.info { "Dalli/SASL authenticating as #{username}" }
+
+      # negotiate
+      req = [REQUEST, OPCODES[:auth_negotiation], 0, 0, 0, 0, 0, 0, 0].pack(FORMAT[:noop])
+      write(req)
+
+      (extras, type, status, count) = read_header.unpack(NORMAL_HEADER)
+      raise Dalli::NetworkError, "Unexpected message format: #{extras} #{count}" unless extras == 0 && count > 0
+      content = read(count)
+      return (Dalli.logger.debug("Authentication not required/supported by server")) if status == 0x81
+      mechanisms = content.split(' ')
+      raise NotImplementedError, "Dalli only supports the PLAIN authentication mechanism" if !mechanisms.include?('PLAIN')
+
+      # request
+      mechanism = 'PLAIN'
+      msg = "\x0#{username}\x0#{password}"
+      req = [REQUEST, OPCODES[:auth_request], mechanism.bytesize, 0, 0, 0, mechanism.bytesize + msg.bytesize, 0, 0, mechanism, msg].pack(FORMAT[:auth_request])
+      write(req)
+
+      (extras, type, status, count) = read_header.unpack(NORMAL_HEADER)
+      raise Dalli::NetworkError, "Unexpected message format: #{extras} #{count}" unless extras == 0 && count > 0
+      content = read(count)
+      return Dalli.logger.info("Dalli/SASL: #{content}") if status == 0
+
+      raise Dalli::DalliError, "Error authenticating: #{status}" unless status == 0x21
+      raise NotImplementedError, "No two-step authentication mechanisms supported"
+      # (step, msg) = sasl.receive('challenge', content)
+      # raise Dalli::NetworkError, "Authentication failed" if sasl.failed? || step != 'response'
+    end
+
+    def parse_hostname(str)
+      res = str.match(/\A(\[([\h:]+)\]|[^:]+)(:(\d+))?(:(\d+))?\z/)
+      return res[2] || res[1], res[4], res[6]
+    end
+  end
+end
diff --git a/lib/dalli-2.7.2/lib/dalli/socket.rb b/lib/dalli-2.7.2/lib/dalli/socket.rb
new file mode 100644
index 000000000..54b321a4d
--- /dev/null
+++ b/lib/dalli-2.7.2/lib/dalli/socket.rb
@@ -0,0 +1,108 @@
+begin
+  require 'kgio'
+  puts "Using kgio socket IO" if defined?($TESTING) && $TESTING
+
+  class Dalli::Server::KSocket < Kgio::Socket
+    attr_accessor :options, :server
+
+    def kgio_wait_readable
+      IO.select([self], nil, nil, options[:socket_timeout]) || raise(Timeout::Error, "IO timeout")
+    end
+
+    def kgio_wait_writable
+      IO.select(nil, [self], nil, options[:socket_timeout]) || raise(Timeout::Error, "IO timeout")
+    end
+
+    def self.open(host, port, server, options = {})
+      addr = Socket.pack_sockaddr_in(port, host)
+      sock = start(addr)
+      sock.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, true)
+      sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_KEEPALIVE, true) if options[:keepalive]
+      sock.options = options
+      sock.server = server
+      sock.kgio_wait_writable
+      sock
+    end
+
+    alias :write :kgio_write
+
+    def readfull(count)
+      value = ''
+      loop do
+        value << kgio_read!(count - value.bytesize)
+        break if value.bytesize == count
+      end
+      value
+    end
+
+    def read_available
+      value = ''
+      loop do
+        ret = kgio_tryread(8196)
+        case ret
+        when nil
+          raise EOFError, 'end of stream'
+        when :wait_readable
+          break
+        else
+          value << ret
+        end
+      end
+      value
+    end
+
+  end
+
+  if ::Kgio.respond_to?(:wait_readable=)
+    ::Kgio.wait_readable = :kgio_wait_readable
+    ::Kgio.wait_writable = :kgio_wait_writable
+  end
+
+rescue LoadError
+
+  puts "Using standard socket IO (#{RUBY_DESCRIPTION})" if defined?($TESTING) && $TESTING
+  class Dalli::Server::KSocket < TCPSocket
+    attr_accessor :options, :server
+
+    def self.open(host, port, server, options = {})
+      Timeout.timeout(options[:socket_timeout]) do
+        sock = new(host, port)
+        sock.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, true)
+        sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_KEEPALIVE, true) if options[:keepalive]
+        sock.options = { :host => host, :port => port }.merge(options)
+        sock.server = server
+        sock
+      end
+    end
+
+    def readfull(count)
+      value = ''
+      begin
+        loop do
+          value << read_nonblock(count - value.bytesize)
+          break if value.bytesize == count
+        end
+      rescue Errno::EAGAIN, Errno::EWOULDBLOCK
+        if IO.select([self], nil, nil, options[:socket_timeout])
+          retry
+        else
+          raise Timeout::Error, "IO timeout: #{options.inspect}"
+        end
+      end
+      value
+    end
+
+    def read_available
+      value = ''
+      loop do
+        begin
+          value << read_nonblock(8196)
+        rescue Errno::EAGAIN, Errno::EWOULDBLOCK
+          break
+        end
+      end
+      value
+    end
+
+  end
+end
diff --git a/lib/dalli-2.7.2/lib/dalli/version.rb b/lib/dalli-2.7.2/lib/dalli/version.rb
new file mode 100644
index 000000000..5b5dfddaf
--- /dev/null
+++ b/lib/dalli-2.7.2/lib/dalli/version.rb
@@ -0,0 +1,3 @@
+module Dalli
+  VERSION = '2.7.2'
+end
diff --git a/lib/dalli-2.7.2/lib/rack/session/dalli.rb b/lib/dalli-2.7.2/lib/rack/session/dalli.rb
new file mode 100644
index 000000000..70940cb09
--- /dev/null
+++ b/lib/dalli-2.7.2/lib/rack/session/dalli.rb
@@ -0,0 +1,75 @@
+require 'rack/session/abstract/id'
+require 'dalli'
+
+module Rack
+  module Session
+    class Dalli < Abstract::ID
+      attr_reader :pool, :mutex
+
+      DEFAULT_OPTIONS = Abstract::ID::DEFAULT_OPTIONS.merge \
+        :namespace => 'rack:session',
+        :memcache_server => 'localhost:11211'
+
+      def initialize(app, options={})
+        super
+        @mutex = Mutex.new
+        mserv = @default_options[:memcache_server]
+        mopts = @default_options.reject{|k,v| !DEFAULT_OPTIONS.include? k }
+        @pool = options[:cache] || ::Dalli::Client.new(mserv, mopts)
+        @pool.alive!
+      end
+
+      def generate_sid
+        loop do
+          sid = super
+          break sid unless @pool.get(sid)
+        end
+      end
+
+      def get_session(env, sid)
+        with_lock(env, [nil, {}]) do
+          unless sid and !sid.empty? and session = @pool.get(sid)
+            sid, session = generate_sid, {}
+            unless @pool.add(sid, session)
+              raise "Session collision on '#{sid.inspect}'"
+            end
+          end
+          [sid, session]
+        end
+      end
+
+      def set_session(env, session_id, new_session, options)
+        return false unless session_id
+        expiry = options[:expire_after]
+        expiry = expiry.nil? ? 0 : expiry + 1
+
+        with_lock(env, false) do
+          @pool.set session_id, new_session, expiry
+          session_id
+        end
+      end
+
+      def destroy_session(env, session_id, options)
+        with_lock(env) do
+          @pool.delete(session_id)
+          generate_sid unless options[:drop]
+        end
+      end
+
+      def with_lock(env, default=nil)
+        @mutex.lock if env['rack.multithread']
+        yield
+      rescue ::Dalli::DalliError, Errno::ECONNREFUSED
+        raise if $!.message =~ /undefined class/
+        if $VERBOSE
+          warn "#{self} is unable to find memcached server."
+          warn $!.inspect
+        end
+        default
+      ensure
+        @mutex.unlock if @mutex.locked?
+      end
+
+    end
+  end
+end
diff --git a/lib/dalli-2.7.2/test/benchmark_test.rb b/lib/dalli-2.7.2/test/benchmark_test.rb
new file mode 100644
index 000000000..783a8b475
--- /dev/null
+++ b/lib/dalli-2.7.2/test/benchmark_test.rb
@@ -0,0 +1,242 @@
+require 'helper'
+require 'benchmark'
+require 'active_support/cache/dalli_store'
+
+describe 'performance' do
+  before do
+    puts "Testing #{Dalli::VERSION} with #{RUBY_DESCRIPTION}"
+    # We'll use a simple @value to try to avoid spending time in Marshal,
+    # which is a constant penalty that both clients have to pay
+    @value = []
+    @marshalled = Marshal.dump(@value)
+
+    @servers = ['127.0.0.1:19122', 'localhost:19122']
+    @key1 = "Short"
+    @key2 = "Sym1-2-3::45"*8
+    @key3 = "Long"*40
+    @key4 = "Medium"*8
+    # 5 and 6 are only used for multiget miss test
+    @key5 = "Medium2"*8
+    @key6 = "Long3"*40
+    @counter = 'counter'
+  end
+
+  it 'runs benchmarks' do
+    memcached do
+
+      Benchmark.bm(37) do |x|
+
+        n = 2500
+
+        @ds = ActiveSupport::Cache::DalliStore.new(@servers)
+        x.report("mixed:rails:dalli") do
+          n.times do
+            @ds.read @key1
+            @ds.write @key2, @value
+            @ds.fetch(@key3) { @value }
+            @ds.fetch(@key2) { @value }
+            @ds.fetch(@key1) { @value }
+            @ds.write @key2, @value, :unless_exists => true
+            @ds.delete @key2
+            @ds.increment @counter, 1, :initial => 100
+            @ds.increment @counter, 1, :expires_in => 12
+            @ds.decrement @counter, 1
+          end
+        end
+
+        x.report("mixed:rails-localcache:dalli") do
+          n.times do
+            @ds.with_local_cache do
+              @ds.read @key1
+              @ds.write @key2, @value
+              @ds.fetch(@key3) { @value }
+              @ds.fetch(@key2) { @value }
+              @ds.fetch(@key1) { @value }
+              @ds.write @key2, @value, :unless_exists => true
+              @ds.delete @key2
+              @ds.increment @counter, 1, :initial => 100
+              @ds.increment @counter, 1, :expires_in => 12
+              @ds.decrement @counter, 1
+            end
+          end
+        end
+
+        @ds.clear
+        sizeable_data = "<marquee>some view partial data</marquee>" * 50
+        [@key1, @key2, @key3, @key4, @key5, @key6].each do |key|
+          @ds.write(key, sizeable_data)
+        end
+
+        x.report("read_multi_big:rails:dalli") do
+          n.times do
+            @ds.read_multi @key1, @key2, @key3, @key4
+            @ds.read @key1
+            @ds.read @key2
+            @ds.read @key3
+            @ds.read @key4
+            @ds.read @key1
+            @ds.read @key2
+            @ds.read @key3
+            @ds.read_multi @key1, @key2, @key3
+          end
+        end
+
+        x.report("read_multi_big:rails-localcache:dalli") do
+          n.times do
+            @ds.with_local_cache do
+              @ds.read_multi @key1, @key2, @key3, @key4
+              @ds.read @key1
+              @ds.read @key2
+              @ds.read @key3
+              @ds.read @key4
+            end
+            @ds.with_local_cache do
+              @ds.read @key1
+              @ds.read @key2
+              @ds.read @key3
+              @ds.read_multi @key1, @key2, @key3
+            end
+          end
+        end
+
+        @m = Dalli::Client.new(@servers)
+        x.report("set:plain:dalli") do
+          n.times do
+            @m.set @key1, @marshalled, 0, :raw => true
+            @m.set @key2, @marshalled, 0, :raw => true
+            @m.set @key3, @marshalled, 0, :raw => true
+            @m.set @key1, @marshalled, 0, :raw => true
+            @m.set @key2, @marshalled, 0, :raw => true
+            @m.set @key3, @marshalled, 0, :raw => true
+          end
+        end
+
+        @m = Dalli::Client.new(@servers)
+        x.report("setq:plain:dalli") do
+          @m.multi do
+            n.times do
+              @m.set @key1, @marshalled, 0, :raw => true
+              @m.set @key2, @marshalled, 0, :raw => true
+              @m.set @key3, @marshalled, 0, :raw => true
+              @m.set @key1, @marshalled, 0, :raw => true
+              @m.set @key2, @marshalled, 0, :raw => true
+              @m.set @key3, @marshalled, 0, :raw => true
+            end
+          end
+        end
+
+        @m = Dalli::Client.new(@servers)
+        x.report("set:ruby:dalli") do
+          n.times do
+            @m.set @key1, @value
+            @m.set @key2, @value
+            @m.set @key3, @value
+            @m.set @key1, @value
+            @m.set @key2, @value
+            @m.set @key3, @value
+          end
+        end
+
+        @m = Dalli::Client.new(@servers)
+        x.report("get:plain:dalli") do
+          n.times do
+            @m.get @key1, :raw => true
+            @m.get @key2, :raw => true
+            @m.get @key3, :raw => true
+            @m.get @key1, :raw => true
+            @m.get @key2, :raw => true
+            @m.get @key3, :raw => true
+          end
+        end
+
+        @m = Dalli::Client.new(@servers)
+        x.report("get:ruby:dalli") do
+          n.times do
+            @m.get @key1
+            @m.get @key2
+            @m.get @key3
+            @m.get @key1
+            @m.get @key2
+            @m.get @key3
+          end
+        end
+
+        @m = Dalli::Client.new(@servers)
+        x.report("multiget:ruby:dalli") do
+          n.times do
+            # We don't use the keys array because splat is slow
+            @m.get_multi @key1, @key2, @key3, @key4, @key5, @key6
+          end
+        end
+
+        @m = Dalli::Client.new(@servers)
+        x.report("missing:ruby:dalli") do
+          n.times do
+            begin @m.delete @key1; rescue; end
+            begin @m.get @key1; rescue; end
+            begin @m.delete @key2; rescue; end
+            begin @m.get @key2; rescue; end
+            begin @m.delete @key3; rescue; end
+            begin @m.get @key3; rescue; end
+          end
+        end
+
+        @m = Dalli::Client.new(@servers)
+        x.report("mixed:ruby:dalli") do
+          n.times do
+            @m.set @key1, @value
+            @m.set @key2, @value
+            @m.set @key3, @value
+            @m.get @key1
+            @m.get @key2
+            @m.get @key3
+            @m.set @key1, @value
+            @m.get @key1
+            @m.set @key2, @value
+            @m.get @key2
+            @m.set @key3, @value
+            @m.get @key3
+          end
+        end
+
+        @m = Dalli::Client.new(@servers)
+        x.report("mixedq:ruby:dalli") do
+          @m.multi do
+            n.times do
+              @m.set @key1, @value
+              @m.set @key2, @value
+              @m.set @key3, @value
+              @m.get @key1
+              @m.get @key2
+              @m.get @key3
+              @m.set @key1, @value
+              @m.get @key1
+              @m.set @key2, @value
+              @m.replace @key2, @value
+              @m.delete @key3
+              @m.add @key3, @value
+              @m.get @key2
+              @m.set @key3, @value
+              @m.get @key3
+            end
+          end
+        end
+
+        @m = Dalli::Client.new(@servers)
+        x.report("incr:ruby:dalli") do
+          counter = 'foocount'
+          n.times do
+            @m.incr counter, 1, 0, 1
+          end
+          n.times do
+            @m.decr counter, 1
+          end
+
+          assert_equal 0, @m.incr(counter, 0)
+        end
+
+      end
+    end
+
+  end
+end
diff --git a/lib/dalli-2.7.2/test/helper.rb b/lib/dalli-2.7.2/test/helper.rb
new file mode 100644
index 000000000..9f72ec5e9
--- /dev/null
+++ b/lib/dalli-2.7.2/test/helper.rb
@@ -0,0 +1,55 @@
+$TESTING = true
+require 'rubygems'
+# require 'simplecov'
+# SimpleCov.start
+require 'minitest/pride'
+require 'minitest/autorun'
+require 'mocha/setup'
+require 'memcached_mock'
+
+ENV['MEMCACHED_SASL_PWDB'] = "#{File.dirname(__FILE__)}/sasldb"
+
+WANT_RAILS_VERSION = ENV['RAILS_VERSION'] || '>= 3.0.0'
+gem 'rails', WANT_RAILS_VERSION
+require 'rails'
+puts "Testing with Rails #{Rails.version}"
+
+require 'dalli'
+require 'logger'
+
+Dalli.logger = Logger.new(STDOUT)
+Dalli.logger.level = Logger::ERROR
+
+class MiniTest::Spec
+  include MemcachedMock::Helper
+
+  def assert_error(error, regexp=nil, &block)
+    ex = assert_raises(error, &block)
+    assert_match(regexp, ex.message, "#{ex.class.name}: #{ex.message}\n#{ex.backtrace.join("\n\t")}")
+  end
+
+  def op_cas_succeeds(rsp)
+    rsp.is_a?(Integer) && rsp > 0
+  end
+
+  def op_replace_succeeds(rsp)
+    rsp.is_a?(Integer) && rsp > 0
+  end
+
+  # add and set must have the same return value because of DalliStore#write_entry
+  def op_addset_succeeds(rsp)
+    rsp.is_a?(Integer) && rsp > 0
+  end
+
+  def with_activesupport
+    require 'active_support/all'
+    require 'active_support/cache/dalli_store'
+    yield
+  end
+
+  def with_actionpack
+    require 'action_dispatch'
+    require 'action_controller'
+    yield
+  end
+end
diff --git a/lib/dalli-2.7.2/test/memcached_mock.rb b/lib/dalli-2.7.2/test/memcached_mock.rb
new file mode 100644
index 000000000..7fdd8c1a8
--- /dev/null
+++ b/lib/dalli-2.7.2/test/memcached_mock.rb
@@ -0,0 +1,121 @@
+require "socket"
+
+$started = {}
+
+module MemcachedMock
+  def self.start(port=19123, &block)
+    server = TCPServer.new("localhost", port)
+    session = server.accept
+    block.call session
+  end
+
+  def self.delayed_start(port=19123, wait=1, &block)
+    server = TCPServer.new("localhost", port)
+    sleep wait
+    block.call server
+  end
+
+  module Helper
+    # Forks the current process and starts a new mock Memcached server on
+    # port 22122.
+    #
+    #     memcached_mock(lambda {|sock| socket.write('123') }) do
+    #       assert_equal "PONG", Dalli::Client.new('localhost:22122').get('abc')
+    #     end
+    #
+    def memcached_mock(proc, meth = :start)
+      return unless supports_fork?
+      begin
+        pid = fork do
+          trap("TERM") { exit }
+
+          MemcachedMock.send(meth) do |*args|
+            proc.call(*args)
+          end
+        end
+
+        sleep 0.3 # Give time for the socket to start listening.
+        yield
+      ensure
+        if pid
+          Process.kill("TERM", pid)
+          Process.wait(pid)
+        end
+      end
+    end
+
+    PATHS = %w(
+      /usr/local/bin/
+      /opt/local/bin/
+      /usr/bin/
+    )
+
+    def find_memcached
+      output = `memcached -h | head -1`.strip
+      if output && output =~ /^memcached (\d.\d.\d+)/ && $1 > '1.4'
+        return (puts "Found #{output} in PATH"; '')
+      end
+      PATHS.each do |path|
+        output = `memcached -h | head -1`.strip
+        if output && output =~ /^memcached (\d\.\d\.\d+)/ && $1 > '1.4'
+          return (puts "Found #{output} in #{path}"; path)
+        end
+      end
+
+      raise Errno::ENOENT, "Unable to find memcached 1.4+ locally"
+    end
+
+    def memcached(port=19122, args='', options={})
+      memcached_server(port, args)
+      yield Dalli::Client.new(["localhost:#{port}", "127.0.0.1:#{port}"], options)
+    end
+
+    def memcached_cas(port=19122, args='', options={})
+      memcached_server(port, args)
+      require 'dalli/cas/client'
+      yield Dalli::Client.new(["localhost:#{port}", "127.0.0.1:#{port}"], options)
+    end
+
+    def memcached_server(port=19122, args='')
+      Memcached.path ||= find_memcached
+
+      cmd = "#{Memcached.path}memcached #{args} -p #{port}"
+
+      $started[port] ||= begin
+        #puts "Starting: #{cmd}..."
+        pid = IO.popen(cmd).pid
+        at_exit do
+          begin
+            Process.kill("TERM", pid)
+            Process.wait(pid)
+          rescue Errno::ECHILD, Errno::ESRCH
+          end
+        end
+        sleep 0.1
+        pid
+      end
+    end
+
+    def supports_fork?
+      !defined?(RUBY_ENGINE) || RUBY_ENGINE != 'jruby'
+    end
+
+    def memcached_kill(port)
+      pid = $started.delete(port)
+      if pid
+        begin
+          Process.kill("TERM", pid)
+          Process.wait(pid)
+        rescue Errno::ECHILD, Errno::ESRCH
+        end
+      end
+    end
+
+  end
+end
+
+module Memcached
+  class << self
+    attr_accessor :path
+  end
+end
diff --git a/lib/dalli-2.7.2/test/sasldb b/lib/dalli-2.7.2/test/sasldb
new file mode 100644
index 000000000..26cb137aa
--- /dev/null
+++ b/lib/dalli-2.7.2/test/sasldb
@@ -0,0 +1 @@
+testuser:testtest:::::::
diff --git a/lib/dalli-2.7.2/test/test_active_support.rb b/lib/dalli-2.7.2/test/test_active_support.rb
new file mode 100644
index 000000000..4af18163f
--- /dev/null
+++ b/lib/dalli-2.7.2/test/test_active_support.rb
@@ -0,0 +1,439 @@
+# encoding: utf-8
+require 'helper'
+require 'connection_pool'
+
+class MockUser
+  def cache_key
+    "users/1/21348793847982314"
+  end
+end
+
+describe 'ActiveSupport' do
+  describe 'active_support caching' do
+
+    it 'has accessible options' do
+      @dalli = ActiveSupport::Cache.lookup_store(:dalli_store, 'localhost:19122', :expires_in => 5.minutes, :frob => 'baz')
+      assert_equal 'baz', @dalli.options[:frob]
+    end
+
+    it 'allow mute and silence' do
+      @dalli = ActiveSupport::Cache.lookup_store(:dalli_store, 'localhost:19122')
+      @dalli.mute do
+        assert op_addset_succeeds(@dalli.write('foo', 'bar', nil))
+        assert_equal 'bar', @dalli.read('foo', nil)
+      end
+      refute @dalli.silence?
+      @dalli.silence!
+      assert_equal true, @dalli.silence?
+    end
+
+    it 'handle nil options' do
+      @dalli = ActiveSupport::Cache.lookup_store(:dalli_store, 'localhost:19122')
+      assert op_addset_succeeds(@dalli.write('foo', 'bar', nil))
+      assert_equal 'bar', @dalli.read('foo', nil)
+      assert_equal 18, @dalli.fetch('lkjsadlfk', nil) { 18 }
+      assert_equal 18, @dalli.fetch('lkjsadlfk', nil) { 18 }
+      assert_equal 1, @dalli.increment('lkjsa', 1, nil)
+      assert_equal 2, @dalli.increment('lkjsa', 1, nil)
+      assert_equal 1, @dalli.decrement('lkjsa', 1, nil)
+      assert_equal true, @dalli.delete('lkjsa')
+    end
+
+    it 'support fetch' do
+      with_activesupport do
+        memcached do
+          connect
+          dvalue = @dalli.fetch('someotherkeywithoutspaces', :expires_in => 1.second) { 123 }
+          assert_equal 123, dvalue
+
+          o = Object.new
+          o.instance_variable_set :@foo, 'bar'
+          dvalue = @dalli.fetch(rand_key, :raw => true) { o }
+          assert_equal o, dvalue
+
+          dvalue = @dalli.fetch(rand_key) { o }
+          assert_equal o, dvalue
+
+          @dalli.write('false', false)
+          dvalue = @dalli.fetch('false') { flunk }
+          assert_equal false, dvalue
+
+          user = MockUser.new
+          @dalli.write(user.cache_key, false)
+          dvalue = @dalli.fetch(user) { flunk }
+          assert_equal false, dvalue
+        end
+      end
+    end
+
+    it 'support keys with spaces on Rails3' do
+      with_activesupport do
+        memcached do
+          connect
+          dvalue = @dalli.fetch('some key with spaces', :expires_in => 1.second) { 123 }
+          assert_equal 123, dvalue
+        end
+      end
+    end
+
+    it 'support read_multi' do
+      with_activesupport do
+        memcached do
+          connect
+          x = rand_key
+          y = rand_key
+          assert_equal({}, @dalli.read_multi(x, y))
+          @dalli.write(x, '123')
+          @dalli.write(y, 123)
+          assert_equal({ x => '123', y => 123 }, @dalli.read_multi(x, y))
+        end
+      end
+    end
+
+    it 'support read_multi with an array' do
+      with_activesupport do
+        memcached do
+          connect
+          x = rand_key
+          y = rand_key
+          assert_equal({}, @dalli.read_multi([x, y]))
+          @dalli.write(x, '123')
+          @dalli.write(y, 123)
+          assert_equal({}, @dalli.read_multi([x, y]))
+          @dalli.write([x, y], '123')
+          assert_equal({ [x, y] => '123' }, @dalli.read_multi([x, y]))
+        end
+      end
+    end
+
+    it 'support raw read_multi' do
+      with_activesupport do
+        memcached do
+          connect
+          @dalli.write("abc", 5, :raw => true)
+          @dalli.write("cba", 5, :raw => true)
+          assert_equal({'abc' => '5', 'cba' => '5' }, @dalli.read_multi("abc", "cba"))
+        end
+      end
+    end
+
+    it 'support read_multi with LocalCache' do
+      with_activesupport do
+        memcached do
+          connect
+          x = rand_key
+          y = rand_key
+          assert_equal({}, @dalli.read_multi(x, y))
+          @dalli.write(x, '123')
+          @dalli.write(y, 456)
+
+          @dalli.with_local_cache do
+            assert_equal({ x => '123', y => 456 }, @dalli.read_multi(x, y))
+            Dalli::Client.any_instance.expects(:get).with(any_parameters).never
+
+            dres = @dalli.read(x)
+            assert_equal dres, '123'
+          end
+
+          Dalli::Client.any_instance.unstub(:get)
+
+          # Fresh LocalStore
+          @dalli.with_local_cache do
+            @dalli.read(x)
+            Dalli::Client.any_instance.expects(:get_multi).with([y.to_s]).returns(y.to_s => 456)
+
+            assert_equal({ x => '123', y => 456}, @dalli.read_multi(x, y))
+          end
+        end
+      end
+    end
+
+    it 'supports fetch_multi' do
+      with_activesupport do
+        memcached do
+          connect
+
+          x = rand_key.to_s
+          y = rand_key
+          hash = { x => 'ABC', y => 'DEF' }
+
+          @dalli.write(y, '123')
+
+          results = @dalli.fetch_multi(x, y) { |key| hash[key] }
+
+          assert_equal({ x => 'ABC', y => '123' }, results)
+          assert_equal('ABC', @dalli.read(x))
+          assert_equal('123', @dalli.read(y))
+        end
+      end
+    end
+
+    it 'support read, write and delete' do
+      with_activesupport do
+        memcached do
+          connect
+          y = rand_key
+          assert_nil @dalli.read(y)
+          dres = @dalli.write(y, 123)
+          assert op_addset_succeeds(dres)
+
+          dres = @dalli.read(y)
+          assert_equal 123, dres
+
+          dres = @dalli.delete(y)
+          assert_equal true, dres
+
+          user = MockUser.new
+          dres = @dalli.write(user.cache_key, "foo")
+          assert op_addset_succeeds(dres)
+
+          dres = @dalli.read(user)
+          assert_equal "foo", dres
+
+          dres = @dalli.delete(user)
+          assert_equal true, dres
+
+          bigkey = '１２３４５６７８９０１２３４５６７８９０１２３４５６７８９０'
+          @dalli.write(bigkey, 'double width')
+          assert_equal 'double width', @dalli.read(bigkey)
+          assert_equal({bigkey => "double width"}, @dalli.read_multi(bigkey))
+        end
+      end
+    end
+
+    it 'support read, write and delete with LocalCache' do
+      with_activesupport do
+        memcached do
+          connect
+          y = rand_key.to_s
+          @dalli.with_local_cache do
+            Dalli::Client.any_instance.expects(:get).with(y, {}).once.returns(123)
+            dres = @dalli.read(y)
+            assert_equal 123, dres
+
+            Dalli::Client.any_instance.expects(:get).with(y, {}).never
+
+            dres = @dalli.read(y)
+            assert_equal 123, dres
+
+            @dalli.write(y, 456)
+            dres = @dalli.read(y)
+            assert_equal 456, dres
+
+            @dalli.delete(y)
+            Dalli::Client.any_instance.expects(:get).with(y, {}).once.returns(nil)
+            dres = @dalli.read(y)
+            assert_equal nil, dres
+          end
+        end
+      end
+    end
+
+    it 'support unless_exist with LocalCache' do
+      with_activesupport do
+        memcached do
+          connect
+          y = rand_key.to_s
+          @dalli.with_local_cache do
+            Dalli::Client.any_instance.expects(:add).with(y, 123, nil, {:unless_exist => true}).once.returns(true)
+            dres = @dalli.write(y, 123, :unless_exist => true)
+            assert_equal true, dres
+
+            Dalli::Client.any_instance.expects(:add).with(y, 321, nil, {:unless_exist => true}).once.returns(false)
+
+            dres = @dalli.write(y, 321, :unless_exist => true)
+            assert_equal false, dres
+
+            Dalli::Client.any_instance.expects(:get).with(y, {}).once.returns(123)
+
+            dres = @dalli.read(y)
+            assert_equal 123, dres
+          end
+        end
+      end
+    end
+
+    it 'support increment/decrement commands' do
+      with_activesupport do
+        memcached do
+          connect
+          assert op_addset_succeeds(@dalli.write('counter', 0, :raw => true))
+          assert_equal 1, @dalli.increment('counter')
+          assert_equal 2, @dalli.increment('counter')
+          assert_equal 1, @dalli.decrement('counter')
+          assert_equal "1", @dalli.read('counter', :raw => true)
+
+          assert_equal 1, @dalli.increment('counterX')
+          assert_equal 2, @dalli.increment('counterX')
+          assert_equal 2, @dalli.read('counterX', :raw => true).to_i
+
+          assert_equal 5, @dalli.increment('counterY1', 1, :initial => 5)
+          assert_equal 6, @dalli.increment('counterY1', 1, :initial => 5)
+          assert_equal 6, @dalli.read('counterY1', :raw => true).to_i
+
+          assert_equal nil, @dalli.increment('counterZ1', 1, :initial => nil)
+          assert_equal nil, @dalli.read('counterZ1')
+
+          assert_equal 5, @dalli.decrement('counterY2', 1, :initial => 5)
+          assert_equal 4, @dalli.decrement('counterY2', 1, :initial => 5)
+          assert_equal 4, @dalli.read('counterY2', :raw => true).to_i
+
+          assert_equal nil, @dalli.decrement('counterZ2', 1, :initial => nil)
+          assert_equal nil, @dalli.read('counterZ2')
+
+          user = MockUser.new
+          assert op_addset_succeeds(@dalli.write(user, 0, :raw => true))
+          assert_equal 1, @dalli.increment(user)
+          assert_equal 2, @dalli.increment(user)
+          assert_equal 1, @dalli.decrement(user)
+          assert_equal "1", @dalli.read(user, :raw => true)
+        end
+      end
+    end
+
+    it 'support exist command' do
+      with_activesupport do
+        memcached do
+          connect
+          @dalli.write(:foo, 'a')
+          @dalli.write(:false_value, false)
+
+          assert_equal true, @dalli.exist?(:foo)
+          assert_equal true, @dalli.exist?(:false_value)
+
+          assert_equal false, @dalli.exist?(:bar)
+
+          user = MockUser.new
+          @dalli.write(user, 'foo')
+          assert_equal true, @dalli.exist?(user)
+        end
+      end
+    end
+
+    it 'support other esoteric commands' do
+      with_activesupport do
+        memcached do
+          connect
+          ds = @dalli.stats
+          assert_equal 1, ds.keys.size
+          assert ds[ds.keys.first].keys.size > 0
+
+          @dalli.reset
+        end
+      end
+    end
+
+    it 'respect "raise_errors" option' do
+      with_activesupport do
+        memcached(29125) do
+          @dalli = ActiveSupport::Cache.lookup_store(:dalli_store, 'localhost:29125')
+          @dalli.write 'foo', 'bar'
+          assert_equal @dalli.read('foo'), 'bar'
+
+          memcached_kill(29125)
+
+          assert_equal @dalli.read('foo'), nil
+
+          @dalli = ActiveSupport::Cache.lookup_store(:dalli_store, 'localhost:29125', :raise_errors => true)
+
+          exception = [Dalli::RingError, { :message => "No server available" }]
+
+          assert_raises(*exception) { @dalli.read 'foo' }
+          assert_raises(*exception) { @dalli.read 'foo', :raw => true }
+          assert_raises(*exception) { @dalli.write 'foo', 'bar' }
+          assert_raises(*exception) { @dalli.exist? 'foo' }
+          assert_raises(*exception) { @dalli.increment 'foo' }
+          assert_raises(*exception) { @dalli.decrement 'foo' }
+          assert_raises(*exception) { @dalli.delete 'foo' }
+          assert_equal @dalli.read_multi('foo', 'bar'), {}
+          assert_raises(*exception) { @dalli.delete 'foo' }
+          assert_raises(*exception) { @dalli.fetch('foo') { 42 } }
+        end
+      end
+    end
+  end
+
+  it 'handle crazy characters from far-away lands' do
+    with_activesupport do
+      memcached do
+        connect
+        key = "fooƒ"
+        value = 'bafƒ'
+        assert op_addset_succeeds(@dalli.write(key, value))
+        assert_equal value, @dalli.read(key)
+      end
+    end
+  end
+
+  it 'normalize options as expected' do
+    with_activesupport do
+      memcached do
+        @dalli = ActiveSupport::Cache::DalliStore.new('localhost:19122', :expires_in => 1, :namespace => 'foo', :compress => true)
+        assert_equal 1, @dalli.instance_variable_get(:@data).instance_variable_get(:@options)[:expires_in]
+        assert_equal 'foo', @dalli.instance_variable_get(:@data).instance_variable_get(:@options)[:namespace]
+        assert_equal ["localhost:19122"], @dalli.instance_variable_get(:@data).instance_variable_get(:@servers)
+      end
+    end
+  end
+
+  it 'handles nil server with additional options' do
+    with_activesupport do
+      memcached do
+        @dalli = ActiveSupport::Cache::DalliStore.new(nil, :expires_in => 1, :namespace => 'foo', :compress => true)
+        assert_equal 1, @dalli.instance_variable_get(:@data).instance_variable_get(:@options)[:expires_in]
+        assert_equal 'foo', @dalli.instance_variable_get(:@data).instance_variable_get(:@options)[:namespace]
+        assert_equal ["127.0.0.1:11211"], @dalli.instance_variable_get(:@data).instance_variable_get(:@servers)
+      end
+    end
+  end
+
+  it 'supports connection pooling' do
+    with_activesupport do
+      memcached do
+        @dalli = ActiveSupport::Cache::DalliStore.new('localhost:19122', :expires_in => 1, :namespace => 'foo', :compress => true, :pool_size => 3)
+        assert_equal nil, @dalli.read('foo')
+        assert @dalli.write('foo', 1)
+        assert_equal 1, @dalli.fetch('foo') { raise 'boom' }
+        assert_equal true, @dalli.dalli.is_a?(ConnectionPool)
+        assert_equal 1, @dalli.increment('bar')
+        assert_equal 0, @dalli.decrement('bar')
+        assert_equal true, @dalli.delete('bar')
+        assert_equal [true], @dalli.clear
+        assert_equal 1, @dalli.stats.size
+      end
+    end
+  end
+
+  it 'allow keys to be frozen' do
+    with_activesupport do
+      memcached do
+        connect
+        key = "foo"
+        key.freeze
+        assert op_addset_succeeds(@dalli.write(key, "value"))
+      end
+    end
+  end
+
+  it 'allow keys from a hash' do
+    with_activesupport do
+      memcached do
+        connect
+        map = { "one" => "one", "two" => "two" }
+        map.each_pair do |k, v|
+          assert op_addset_succeeds(@dalli.write(k, v))
+        end
+        assert_equal map, @dalli.read_multi(*(map.keys))
+      end
+    end
+  end
+
+  def connect
+    @dalli = ActiveSupport::Cache.lookup_store(:dalli_store, 'localhost:19122', :expires_in => 10.seconds, :namespace => lambda{33.to_s(36)})
+    @dalli.clear
+  end
+
+  def rand_key
+    rand(1_000_000_000)
+  end
+end
diff --git a/lib/dalli-2.7.2/test/test_cas_client.rb b/lib/dalli-2.7.2/test/test_cas_client.rb
new file mode 100644
index 000000000..423e36022
--- /dev/null
+++ b/lib/dalli-2.7.2/test/test_cas_client.rb
@@ -0,0 +1,107 @@
+require 'helper'
+require 'memcached_mock'
+
+describe 'Dalli::Cas::Client' do
+  describe 'using a live server' do
+    it 'supports get with CAS' do
+      memcached_cas do |dc|
+        dc.flush
+
+        expected = { 'blah' => 'blerg!' }
+        get_block_called = false
+        stored_value = stored_cas = nil
+        # Validate call-with-block
+        dc.get_cas('gets_key') do |v, cas|
+          get_block_called = true
+          stored_value = v
+          stored_cas = cas
+        end
+        assert get_block_called
+        assert_nil stored_value
+
+        dc.set('gets_key', expected)
+
+        # Validate call-with-return-value
+        stored_value, stored_cas = dc.get_cas('gets_key')
+        assert_equal stored_value, expected
+        assert(stored_cas != 0)
+      end
+    end
+
+    it 'supports multi-get with CAS' do
+      memcached_cas do |dc|
+        dc.close
+        dc.flush
+
+        expected_hash = {'a' => 'foo', 'b' => 123}
+        expected_hash.each_pair do |k, v|
+          dc.set(k, v)
+        end
+
+        # Invocation without block
+        resp = dc.get_multi_cas(%w(a b c d e f))
+        resp.each_pair do |k, data|
+          value, cas = [data.first, data.second]
+          assert_equal expected_hash[k], value
+          assert(cas && cas != 0)
+        end
+
+        # Invocation with block
+        dc.get_multi_cas(%w(a b c d e f)) do |k, data|
+          value, cas = [data.first, data.second]
+          assert_equal expected_hash[k], value
+          assert(cas && cas != 0)
+        end
+      end
+    end
+
+    it 'supports replace-with-CAS operation' do
+      memcached_cas do |dc|
+        dc.flush
+        cas = dc.set('key', 'value')
+
+        # Accepts CAS, replaces, and returns new CAS
+        cas = dc.replace_cas('key', 'value2', cas)
+        assert cas.is_a?(Integer)
+
+        assert_equal 'value2', dc.get('key')
+      end
+    end
+
+    it 'supports delete with CAS' do
+      memcached_cas do |dc|
+        cas = dc.set('some_key', 'some_value')
+        dc.delete_cas('some_key', cas)
+        assert_nil dc.get('some_key')
+      end
+    end
+
+    it 'handles CAS round-trip operations' do
+      memcached_cas do |dc|
+        dc.flush
+
+        expected = {'blah' => 'blerg!'}
+        dc.set('some_key', expected)
+
+        value, cas = dc.get_cas('some_key')
+        assert_equal value, expected
+        assert(!cas.nil? && cas != 0)
+
+        # Set operation, first with wrong then with correct CAS
+        expected = {'blah' => 'set succeeded'}
+        assert(dc.set_cas('some_key', expected, cas+1) == false)
+        assert op_addset_succeeds(cas = dc.set_cas('some_key', expected, cas))
+
+        # Replace operation, first with wrong then with correct CAS
+        expected = {'blah' => 'replace succeeded'}
+        assert(dc.replace_cas('some_key', expected, cas+1) == false)
+        assert op_addset_succeeds(cas = dc.replace_cas('some_key', expected, cas))
+
+        # Delete operation, first with wrong then with correct CAS
+        assert(dc.delete_cas('some_key', cas+1) == false)
+        assert dc.delete_cas('some_key', cas)
+      end
+    end
+
+  end
+end
diff --git a/lib/dalli-2.7.2/test/test_compressor.rb b/lib/dalli-2.7.2/test/test_compressor.rb
new file mode 100644
index 000000000..8b024862b
--- /dev/null
+++ b/lib/dalli-2.7.2/test/test_compressor.rb
@@ -0,0 +1,53 @@
+# encoding: utf-8
+require 'helper'
+require 'json'
+require 'memcached_mock'
+
+class NoopCompressor
+  def self.compress(data)
+    data
+  end
+
+  def self.decompress(data)
+    data
+  end
+end
+
+describe 'Compressor' do
+
+  it 'default to Dalli::Compressor' do
+    memcached_kill(29199) do |dc|
+      memcache = Dalli::Client.new('127.0.0.1:29199')
+      memcache.set 1,2
+      assert_equal Dalli::Compressor, memcache.instance_variable_get('@ring').servers.first.compressor
+    end
+  end
+
+  it 'support a custom compressor' do
+    memcached_kill(29199) do |dc|
+      memcache = Dalli::Client.new('127.0.0.1:29199', :compressor => NoopCompressor)
+      memcache.set 1,2
+      begin
+        assert_equal NoopCompressor, memcache.instance_variable_get('@ring').servers.first.compressor
+
+        memcached(19127) do |newdc|
+          assert newdc.set("string-test", "a test string")
+          assert_equal("a test string", newdc.get("string-test"))
+        end
+      end
+    end
+  end
+end
+
+describe 'GzipCompressor' do
+
+  it 'compress and uncompress data using Zlib::GzipWriter/Reader' do
+    memcached(19127,nil,{:compress=>true,:compressor=>Dalli::GzipCompressor}) do |dc|
+      data = (0...1025).map{65.+(rand(26)).chr}.join
+      assert dc.set("test", data)
+      assert_equal Dalli::GzipCompressor, dc.instance_variable_get('@ring').servers.first.compressor
+      assert_equal(data, dc.get("test"))
+    end
+  end
+
+end
diff --git a/lib/dalli-2.7.2/test/test_dalli.rb b/lib/dalli-2.7.2/test/test_dalli.rb
new file mode 100644
index 000000000..fb6799184
--- /dev/null
+++ b/lib/dalli-2.7.2/test/test_dalli.rb
@@ -0,0 +1,625 @@
+require 'helper'
+require 'memcached_mock'
+
+describe 'Dalli' do
+  describe 'options parsing' do
+    it 'handle deprecated options' do
+      dc = Dalli::Client.new('foo', :compression => true)
+      assert dc.instance_variable_get(:@options)[:compress]
+      refute dc.instance_variable_get(:@options)[:compression]
+    end
+
+    it 'not warn about valid options' do
+      dc = Dalli::Client.new('foo', :compress => true)
+      # Rails.logger.expects :warn
+      assert dc.instance_variable_get(:@options)[:compress]
+    end
+
+    it 'raises error with invalid expires_in' do
+      bad_data = [{:bad => 'expires in data'}, Hash, [1,2,3]]
+      bad_data.each do |bad|
+        assert_raises ArgumentError do
+          Dalli::Client.new('foo', {:expires_in => bad})
+        end
+      end
+    end
+
+    it 'return string type for namespace attribute' do
+      dc = Dalli::Client.new('foo', :namespace => :wunderschoen)
+      assert_equal "wunderschoen", dc.send(:namespace)
+      dc.close
+
+      dc = Dalli::Client.new('foo', :namespace => Proc.new{:wunderschoen})
+      assert_equal "wunderschoen", dc.send(:namespace)
+      dc.close
+    end
+  end
+
+  describe 'key validation' do
+    it 'not allow blanks' do
+      memcached do |dc|
+        dc.set '   ', 1
+        assert_equal 1, dc.get('   ')
+        dc.set "\t", 1
+        assert_equal 1, dc.get("\t")
+        dc.set "\n", 1
+        assert_equal 1, dc.get("\n")
+        assert_raises ArgumentError do
+          dc.set "", 1
+        end
+        assert_raises ArgumentError do
+          dc.set nil, 1
+        end
+      end
+    end
+
+    it 'allow namespace to be a symbol' do
+      memcached(19122, '', :namespace => :wunderschoen) do |dc|
+        dc.set "x" * 251, 1
+        assert 1, dc.get("#{'x' * 200}:md5:#{Digest::MD5.hexdigest('x' * 251)}")
+      end
+    end
+  end
+
+  it "default to localhost:11211" do
+    dc = Dalli::Client.new
+    ring = dc.send(:ring)
+    s1 = ring.servers.first.hostname
+    assert_equal 1, ring.servers.size
+    dc.close
+
+    dc = Dalli::Client.new('localhost:11211')
+    ring = dc.send(:ring)
+    s2 = ring.servers.first.hostname
+    assert_equal 1, ring.servers.size
+    dc.close
+
+    dc = Dalli::Client.new(['localhost:11211'])
+    ring = dc.send(:ring)
+    s3 = ring.servers.first.hostname
+    assert_equal 1, ring.servers.size
+    dc.close
+
+    assert_equal '127.0.0.1', s1
+    assert_equal s2, s3
+  end
+
+  it "accept comma separated string" do
+    dc = Dalli::Client.new("server1.example.com:11211,server2.example.com:11211")
+    ring = dc.send(:ring)
+    assert_equal 2, ring.servers.size
+    s1,s2 = ring.servers.map(&:hostname)
+    assert_equal "server1.example.com", s1
+    assert_equal "server2.example.com", s2
+  end
+
+  it "accept array of servers" do
+    dc = Dalli::Client.new(["server1.example.com:11211","server2.example.com:11211"])
+    ring = dc.send(:ring)
+    assert_equal 2, ring.servers.size
+    s1,s2 = ring.servers.map(&:hostname)
+    assert_equal "server1.example.com", s1
+    assert_equal "server2.example.com", s2
+  end
+
+  describe 'using a live server' do
+
+    it "support get/set" do
+      memcached do |dc|
+        dc.flush
+
+        val1 = "1234567890"*105000
+        assert_equal false, dc.set('a', val1)
+
+        val1 = "1234567890"*100000
+        dc.set('a', val1)
+        val2 = dc.get('a')
+        assert_equal val1, val2
+
+        assert op_addset_succeeds(dc.set('a', nil))
+        assert_nil dc.get('a')
+      end
+    end
+
+    it 'supports delete' do
+      memcached do |dc|
+        dc.set('some_key', 'some_value')
+        assert_equal 'some_value', dc.get('some_key')
+
+        dc.delete('some_key')
+        assert_nil dc.get('some_key')
+      end
+    end
+
+    it 'returns nil for nonexist key' do
+      memcached do |dc|
+        assert_equal nil, dc.get('notexist')
+      end
+    end
+
+    it 'allows "Not found" as value' do
+      memcached do |dc|
+        dc.set('key1', 'Not found')
+        assert_equal 'Not found', dc.get('key1')
+      end
+    end
+
+    it "support stats" do
+      memcached do |dc|
+        # make sure that get_hits would not equal 0
+        dc.get(:a)
+
+        stats = dc.stats
+        servers = stats.keys
+        assert(servers.any? do |s|
+          stats[s]["get_hits"].to_i != 0
+        end, "general stats failed")
+
+        stats_items = dc.stats(:items)
+        servers = stats_items.keys
+        assert(servers.all? do |s|
+          stats_items[s].keys.any? do |key|
+            key =~ /items:[0-9]+:number/
+          end
+        end, "stats items failed")
+
+        stats_slabs = dc.stats(:slabs)
+        servers = stats_slabs.keys
+        assert(servers.all? do |s|
+          stats_slabs[s].keys.any? do |key|
+            key == "active_slabs"
+          end
+        end, "stats slabs failed")
+
+        # reset_stats test
+        results = dc.reset_stats
+        assert(results.all? { |x| x })
+        stats = dc.stats
+        servers = stats.keys
+
+        # check if reset was performed
+        servers.each do |s|
+          assert_equal 0, dc.stats[s]["get_hits"].to_i
+        end
+      end
+    end
+
+    it "support the fetch operation" do
+      memcached do |dc|
+        dc.flush
+
+        expected = { 'blah' => 'blerg!' }
+        executed = false
+        value = dc.fetch('fetch_key') do
+          executed = true
+          expected
+        end
+        assert_equal expected, value
+        assert_equal true, executed
+
+        executed = false
+        value = dc.fetch('fetch_key') do
+          executed = true
+          expected
+        end
+        assert_equal expected, value
+        assert_equal false, executed
+      end
+    end
+
+    it "support the fetch operation with falsey values" do
+      memcached do |dc|
+        dc.flush
+
+        dc.set("fetch_key", false)
+        res = dc.fetch("fetch_key") { flunk "fetch block called" }
+        assert_equal false, res
+
+        dc.set("fetch_key", nil)
+        res = dc.fetch("fetch_key") { "bob" }
+        assert_equal 'bob', res
+      end
+    end
+
+    it "support the cas operation" do
+      memcached do |dc|
+        dc.flush
+
+        expected = { 'blah' => 'blerg!' }
+
+        resp = dc.cas('cas_key') do |value|
+          fail('Value it not exist')
+        end
+        assert_nil resp
+
+        mutated = { 'blah' => 'foo!' }
+        dc.set('cas_key', expected)
+        resp = dc.cas('cas_key') do |value|
+          assert_equal expected, value
+          mutated
+        end
+        assert op_cas_succeeds(resp)
+
+        resp = dc.get('cas_key')
+        assert_equal mutated, resp
+      end
+    end
+
+    it "support multi-get" do
+      memcached do |dc|
+        dc.close
+        dc.flush
+        resp = dc.get_multi(%w(a b c d e f))
+        assert_equal({}, resp)
+
+        dc.set('a', 'foo')
+        dc.set('b', 123)
+        dc.set('c', %w(a b c))
+        # Invocation without block
+        resp = dc.get_multi(%w(a b c d e f))
+        expected_resp = { 'a' => 'foo', 'b' => 123, 'c' => %w(a b c) }
+        assert_equal(expected_resp, resp)
+
+        # Invocation with block
+        dc.get_multi(%w(a b c d e f)) do |k, v|
+          assert(expected_resp.has_key?(k) && expected_resp[k] == v)
+          expected_resp.delete(k)
+        end
+        assert expected_resp.empty?
+
+        # Perform a big multi-get with 1000 elements.
+        arr = []
+        dc.multi do
+          1000.times do |idx|
+            dc.set idx, idx
+            arr << idx
+          end
+        end
+
+        result = dc.get_multi(arr)
+        assert_equal(1000, result.size)
+        assert_equal(50, result['50'])
+      end
+    end
+
+    it 'support raw incr/decr' do
+      memcached do |client|
+        client.flush
+
+        assert op_addset_succeeds(client.set('fakecounter', 0, 0, :raw => true))
+        assert_equal 1, client.incr('fakecounter', 1)
+        assert_equal 2, client.incr('fakecounter', 1)
+        assert_equal 3, client.incr('fakecounter', 1)
+        assert_equal 1, client.decr('fakecounter', 2)
+        assert_equal "1", client.get('fakecounter', :raw => true)
+
+        resp = client.incr('mycounter', 0)
+        assert_nil resp
+
+        resp = client.incr('mycounter', 1, 0, 2)
+        assert_equal 2, resp
+        resp = client.incr('mycounter', 1)
+        assert_equal 3, resp
+
+        resp = client.set('rawcounter', 10, 0, :raw => true)
+        assert op_cas_succeeds(resp)
+
+        resp = client.get('rawcounter', :raw => true)
+        assert_equal '10', resp
+
+        resp = client.incr('rawcounter', 1)
+        assert_equal 11, resp
+      end
+    end
+
+    it "support incr/decr operations" do
+      memcached do |dc|
+        dc.flush
+
+        resp = dc.decr('counter', 100, 5, 0)
+        assert_equal 0, resp
+
+        resp = dc.decr('counter', 10)
+        assert_equal 0, resp
+
+        resp = dc.incr('counter', 10)
+        assert_equal 10, resp
+
+        current = 10
+        100.times do |x|
+          resp = dc.incr('counter', 10)
+          assert_equal current + ((x+1)*10), resp
+        end
+
+        resp = dc.decr('10billion', 0, 5, 10)
+        # go over the 32-bit mark to verify proper (un)packing
+        resp = dc.incr('10billion', 10_000_000_000)
+        assert_equal 10_000_000_010, resp
+
+        resp = dc.decr('10billion', 1)
+        assert_equal 10_000_000_009, resp
+
+        resp = dc.decr('10billion', 0)
+        assert_equal 10_000_000_009, resp
+
+        resp = dc.incr('10billion', 0)
+        assert_equal 10_000_000_009, resp
+
+        assert_nil dc.incr('DNE', 10)
+        assert_nil dc.decr('DNE', 10)
+
+        resp = dc.incr('big', 100, 5, 0xFFFFFFFFFFFFFFFE)
+        assert_equal 0xFFFFFFFFFFFFFFFE, resp
+        resp = dc.incr('big', 1)
+        assert_equal 0xFFFFFFFFFFFFFFFF, resp
+
+        # rollover the 64-bit value, we'll get something undefined.
+        resp = dc.incr('big', 1)
+        refute_equal 0x10000000000000000, resp
+        dc.reset
+      end
+    end
+
+    it 'support the append and prepend operations' do
+      memcached do |dc|
+        dc.flush
+        assert op_addset_succeeds(dc.set('456', 'xyz', 0, :raw => true))
+        assert_equal true, dc.prepend('456', '0')
+        assert_equal true, dc.append('456', '9')
+        assert_equal '0xyz9', dc.get('456', :raw => true)
+        assert_equal '0xyz9', dc.get('456')
+
+        assert_equal false, dc.append('nonexist', 'abc')
+        assert_equal false, dc.prepend('nonexist', 'abc')
+      end
+    end
+
+    it 'supports replace operation' do
+      memcached do |dc|
+        dc.flush
+        dc.set('key', 'value')
+        assert op_replace_succeeds(dc.replace('key', 'value2'))
+
+        assert_equal 'value2', dc.get('key')
+      end
+    end
+
+    it 'support touch operation' do
+      memcached do |dc|
+        begin
+          dc.flush
+          dc.set 'key', 'value'
+          assert_equal true, dc.touch('key', 10)
+          assert_equal true, dc.touch('key')
+          assert_equal 'value', dc.get('key')
+          assert_nil dc.touch('notexist')
+        rescue Dalli::DalliError => e
+          # This will happen when memcached is in lesser version than 1.4.8
+          assert_equal 'Response error 129: Unknown command', e.message
+        end
+      end
+    end
+
+    it 'support version operation' do
+      memcached do |dc|
+        v = dc.version
+        servers = v.keys
+        assert(servers.any? do |s|
+          v[s] != nil
+        end, "version failed")
+      end
+    end
+
+    it 'allow TCP connections to be configured for keepalive' do
+      memcached(19122, '', :keepalive => true) do |dc|
+        dc.set(:a, 1)
+        ring = dc.send(:ring)
+        server = ring.servers.first
+        socket = server.instance_variable_get('@sock')
+
+        optval = socket.getsockopt(Socket::SOL_SOCKET, Socket::SO_KEEPALIVE)
+        optval = optval.unpack 'i'
+
+        assert_equal true, (optval[0] != 0)
+      end
+    end
+
+    it "pass a simple smoke test" do
+      memcached do |dc|
+        resp = dc.flush
+        refute_nil resp
+        assert_equal [true, true], resp
+
+        assert op_addset_succeeds(dc.set(:foo, 'bar'))
+        assert_equal 'bar', dc.get(:foo)
+
+        resp = dc.get('123')
+        assert_equal nil, resp
+
+        assert op_addset_succeeds(dc.set('123', 'xyz'))
+
+        resp = dc.get('123')
+        assert_equal 'xyz', resp
+
+        assert op_addset_succeeds(dc.set('123', 'abc'))
+
+        dc.prepend('123', '0')
+        dc.append('123', '0')
+
+        assert_raises Dalli::UnmarshalError do
+          resp = dc.get('123')
+        end
+
+        dc.close
+        dc = nil
+
+        dc = Dalli::Client.new('localhost:19122')
+
+        assert op_addset_succeeds(dc.set('456', 'xyz', 0, :raw => true))
+
+        resp = dc.prepend '456', '0'
+        assert_equal true, resp
+
+        resp = dc.append '456', '9'
+        assert_equal true, resp
+
+        resp = dc.get('456', :raw => true)
+        assert_equal '0xyz9', resp
+
+        assert op_addset_succeeds(dc.set('456', false))
+
+        resp = dc.get('456')
+        assert_equal false, resp
+
+        resp = dc.stats
+        assert_equal Hash, resp.class
+
+        dc.close
+      end
+    end
+
+    it "support multithreaded access" do
+      memcached do |cache|
+        cache.flush
+        workers = []
+
+        cache.set('f', 'zzz')
+        assert op_cas_succeeds((cache.cas('f') do |value|
+          value << 'z'
+        end))
+        assert_equal 'zzzz', cache.get('f')
+
+        # Have a bunch of threads perform a bunch of operations at the same time.
+        # Verify the result of each operation to ensure the request and response
+        # are not intermingled between threads.
+        10.times do
+          workers << Thread.new do
+            100.times do
+              cache.set('a', 9)
+              cache.set('b', 11)
+              inc = cache.incr('cat', 10, 0, 10)
+              cache.set('f', 'zzz')
+              res = cache.cas('f') do |value|
+                value << 'z'
+              end
+              refute_nil res
+              assert_equal false, cache.add('a', 11)
+              assert_equal({ 'a' => 9, 'b' => 11 }, cache.get_multi(['a', 'b']))
+              inc = cache.incr('cat', 10)
+              assert_equal 0, inc % 5
+              cache.decr('cat', 5)
+              assert_equal 11, cache.get('b')
+
+              assert_equal %w(a b), cache.get_multi('a', 'b', 'c').keys.sort
+
+            end
+          end
+        end
+
+        workers.each { |w| w.join }
+        cache.flush
+      end
+    end
+
+    it "handle namespaced keys" do
+      memcached do |dc|
+        dc = Dalli::Client.new('localhost:19122', :namespace => 'a')
+        dc.set('namespaced', 1)
+        dc2 = Dalli::Client.new('localhost:19122', :namespace => 'b')
+        dc2.set('namespaced', 2)
+        assert_equal 1, dc.get('namespaced')
+        assert_equal 2, dc2.get('namespaced')
+      end
+    end
+
+    it "handle nil namespace" do
+      memcached do |dc|
+        dc = Dalli::Client.new('localhost:19122', :namespace => nil)
+        assert_equal 'key', dc.send(:validate_key, 'key')
+      end
+    end
+
+    it 'truncate cache keys that are too long' do
+      memcached do
+        dc = Dalli::Client.new('localhost:19122', :namespace => 'some:namspace')
+        key = "this cache key is far too long so it must be hashed and truncated and stuff" * 10
+        value = "some value"
+        assert op_addset_succeeds(dc.set(key, value))
+        assert_equal value, dc.get(key)
+      end
+    end
+
+    it "handle namespaced keys in multi_get" do
+      memcached do |dc|
+        dc = Dalli::Client.new('localhost:19122', :namespace => 'a')
+        dc.set('a', 1)
+        dc.set('b', 2)
+        assert_equal({'a' => 1, 'b' => 2}, dc.get_multi('a', 'b'))
+      end
+    end
+
+    it "handle application marshalling issues" do
+      memcached do |dc|
+        old = Dalli.logger
+        Dalli.logger = Logger.new(nil)
+        begin
+          assert_equal false, dc.set('a', Proc.new { true })
+        ensure
+          Dalli.logger = old
+        end
+      end
+    end
+
+    describe 'with compression' do
+      it 'allow large values' do
+        memcached do |dc|
+          dalli = Dalli::Client.new(dc.instance_variable_get(:@servers), :compress => true)
+
+          value = "0"*1024*1024
+          assert_equal false, dc.set('verylarge', value)
+          dalli.set('verylarge', value)
+        end
+      end
+    end
+
+    describe 'in low memory conditions' do
+
+      it 'handle error response correctly' do
+        memcached(19125, '-m 1 -M') do |dc|
+          failed = false
+          value = "1234567890"*100
+          1_000.times do |idx|
+            begin
+              assert op_addset_succeeds(dc.set(idx, value))
+            rescue Dalli::DalliError
+              failed = true
+              assert((800..960).include?(idx), "unexpected failure on iteration #{idx}")
+              break
+            end
+          end
+          assert failed, 'did not fail under low memory conditions'
+        end
+      end
+
+      it 'fit more values with compression' do
+        memcached(19126, '-m 1 -M') do |dc|
+          dalli = Dalli::Client.new('localhost:19126', :compress => true)
+          failed = false
+          value = "1234567890"*1000
+          10_000.times do |idx|
+            begin
+              assert op_addset_succeeds(dalli.set(idx, value))
+            rescue Dalli::DalliError
+              failed = true
+              assert((6000..7800).include?(idx), "unexpected failure on iteration #{idx}")
+              break
+            end
+          end
+          assert failed, 'did not fail under low memory conditions'
+        end
+      end
+
+    end
+
+  end
+end
diff --git a/lib/dalli-2.7.2/test/test_encoding.rb b/lib/dalli-2.7.2/test/test_encoding.rb
new file mode 100644
index 000000000..2ab3ece64
--- /dev/null
+++ b/lib/dalli-2.7.2/test/test_encoding.rb
@@ -0,0 +1,32 @@
+# encoding: utf-8
+require 'helper'
+require 'memcached_mock'
+
+describe 'Encoding' do
+
+  describe 'using a live server' do
+    it 'support i18n content' do
+      memcached do |dc|
+        key = 'foo'
+        utf_key = utf8 = 'ƒ©åÍÎ'
+
+        assert dc.set(key, utf8)
+        assert_equal utf8, dc.get(key)
+
+        dc.set(utf_key, utf8)
+        assert_equal utf8, dc.get(utf_key)
+      end
+    end
+
+    it 'support content expiry' do
+      memcached do |dc|
+        key = 'foo'
+        assert dc.set(key, 'bar', 1)
+        assert_equal 'bar', dc.get(key)
+        sleep 1.2
+        assert_equal nil, dc.get(key)
+      end
+    end
+
+  end
+end
diff --git a/lib/dalli-2.7.2/test/test_failover.rb b/lib/dalli-2.7.2/test/test_failover.rb
new file mode 100644
index 000000000..990b6bc31
--- /dev/null
+++ b/lib/dalli-2.7.2/test/test_failover.rb
@@ -0,0 +1,128 @@
+require 'helper'
+
+describe 'failover' do
+
+  describe 'timeouts' do
+    it 'not lead to corrupt sockets' do
+      memcached(29125) do
+        dc = Dalli::Client.new ['localhost:29125']
+        begin
+          Timeout.timeout 0.01 do
+            1_000.times do
+              dc.set("test_123", {:test => "123"})
+            end
+            flunk("Did not timeout")
+          end
+        rescue Timeout::Error
+        end
+
+        assert_equal({:test => '123'}, dc.get("test_123"))
+      end
+    end
+  end
+
+
+  describe 'assuming some bad servers' do
+
+    it 'silently reconnect if server hiccups' do
+      memcached(29125) do
+        dc = Dalli::Client.new ['localhost:29125']
+        dc.set 'foo', 'bar'
+        foo = dc.get 'foo'
+        assert_equal foo, 'bar'
+
+        memcached_kill(29125)
+        memcached(29125) do
+
+          foo = dc.get 'foo'
+          assert_nil foo
+
+          memcached_kill(29125)
+        end
+      end
+    end
+
+    it 'handle graceful failover' do
+      memcached(29125) do
+        memcached(29126) do
+          dc = Dalli::Client.new ['localhost:29125', 'localhost:29126']
+          dc.set 'foo', 'bar'
+          foo = dc.get 'foo'
+          assert_equal foo, 'bar'
+
+          memcached_kill(29125)
+
+          dc.set 'foo', 'bar'
+          foo = dc.get 'foo'
+          assert_equal foo, 'bar'
+
+          memcached_kill(29126)
+
+          assert_raises Dalli::RingError, :message => "No server available" do
+            dc.set 'foo', 'bar'
+          end
+        end
+      end
+    end
+
+    it 'handle them gracefully in get_multi' do
+      memcached(29125) do
+        memcached(29126) do
+          dc = Dalli::Client.new ['localhost:29125', 'localhost:29126']
+          dc.set 'a', 'a1'
+          result = dc.get_multi ['a']
+          assert_equal result, {'a' => 'a1'}
+
+          memcached_kill(29125)
+
+          result = dc.get_multi ['a']
+          assert_equal result, {'a' => 'a1'}
+        end
+      end
+    end
+
+    it 'handle graceful failover in get_multi' do
+      memcached(29125) do
+        memcached(29126) do
+          dc = Dalli::Client.new ['localhost:29125', 'localhost:29126']
+          dc.set 'foo', 'foo1'
+          dc.set 'bar', 'bar1'
+          result = dc.get_multi ['foo', 'bar']
+          assert_equal result, {'foo' => 'foo1', 'bar' => 'bar1'}
+
+          memcached_kill(29125)
+
+          dc.set 'foo', 'foo1'
+          dc.set 'bar', 'bar1'
+          result = dc.get_multi ['foo', 'bar']
+          assert_equal result, {'foo' => 'foo1', 'bar' => 'bar1'}
+
+          memcached_kill(29126)
+
+          result = dc.get_multi ['foo', 'bar']
+          assert_equal result, {}
+        end
+      end
+    end
+
+    it 'stats it still properly report' do
+      memcached(29125) do
+        memcached(29126) do
+          dc = Dalli::Client.new ['localhost:29125', 'localhost:29126']
+          result = dc.stats
+          assert_instance_of Hash, result['localhost:29125']
+          assert_instance_of Hash, result['localhost:29126']
+
+          memcached_kill(29125)
+
+          dc = Dalli::Client.new ['localhost:29125', 'localhost:29126']
+          result = dc.stats
+          assert_instance_of NilClass, result['localhost:29125']
+          assert_instance_of Hash, result['localhost:29126']
+
+          memcached_kill(29126)
+        end
+      end
+    end
+  end
+end
diff --git a/lib/dalli-2.7.2/test/test_network.rb b/lib/dalli-2.7.2/test/test_network.rb
new file mode 100644
index 000000000..7399c1737
--- /dev/null
+++ b/lib/dalli-2.7.2/test/test_network.rb
@@ -0,0 +1,54 @@
+require 'helper'
+
+describe 'Network' do
+
+  describe 'assuming a bad network' do
+
+    it 'handle no server available' do
+      assert_raises Dalli::RingError, :message => "No server available" do
+        dc = Dalli::Client.new 'localhost:19333'
+        dc.get 'foo'
+      end
+    end
+
+    describe 'with a fake server' do
+      it 'handle connection reset' do
+        memcached_mock(lambda {|sock| sock.close }) do
+          assert_raises Dalli::RingError, :message => "No server available" do
+            dc = Dalli::Client.new('localhost:19123')
+            dc.get('abc')
+          end
+        end
+      end
+
+      it 'handle malformed response' do
+        memcached_mock(lambda {|sock| sock.write('123') }) do
+          assert_raises Dalli::RingError, :message => "No server available" do
+            dc = Dalli::Client.new('localhost:19123')
+            dc.get('abc')
+          end
+        end
+      end
+
+      it 'handle connect timeouts' do
+        memcached_mock(lambda {|sock| sleep(0.6); sock.close }, :delayed_start) do
+          assert_raises Dalli::RingError, :message => "No server available" do
+            dc = Dalli::Client.new('localhost:19123')
+            dc.get('abc')
+          end
+        end
+      end
+
+      it 'handle read timeouts' do
+        memcached_mock(lambda {|sock| sleep(0.6); sock.write('giraffe') }) do
+          assert_raises Dalli::RingError, :message => "No server available" do
+            dc = Dalli::Client.new('localhost:19123')
+            dc.get('abc')
+          end
+        end
+      end
+
+    end
+
+  end
+end
diff --git a/lib/dalli-2.7.2/test/test_rack_session.rb b/lib/dalli-2.7.2/test/test_rack_session.rb
new file mode 100644
index 000000000..657b061a7
--- /dev/null
+++ b/lib/dalli-2.7.2/test/test_rack_session.rb
@@ -0,0 +1,341 @@
+require 'helper'
+
+require 'rack/session/dalli'
+require 'rack/lint'
+require 'rack/mock'
+require 'thread'
+
+describe Rack::Session::Dalli do
+  Rack::Session::Dalli::DEFAULT_OPTIONS[:memcache_server] = 'localhost:19129'
+
+  before do
+    memcached(19129) do
+    end
+
+    # test memcache connection
+    Rack::Session::Dalli.new(incrementor)
+  end
+
+  let(:session_key) { Rack::Session::Dalli::DEFAULT_OPTIONS[:key] }
+  let(:session_match) do
+    /#{session_key}=([0-9a-fA-F]+);/
+  end
+  let(:incrementor_proc) do
+    lambda do |env|
+      env["rack.session"]["counter"] ||= 0
+      env["rack.session"]["counter"] += 1
+      Rack::Response.new(env["rack.session"].inspect).to_a
+    end
+  end
+  let(:drop_session) do
+    Rack::Lint.new(proc do |env|
+        env['rack.session.options'][:drop] = true
+        incrementor_proc.call(env)
+      end)
+  end
+  let(:renew_session) do
+    Rack::Lint.new(proc do |env|
+        env['rack.session.options'][:renew] = true
+        incrementor_proc.call(env)
+      end)
+  end
+  let(:defer_session) do
+    Rack::Lint.new(proc do |env|
+        env['rack.session.options'][:defer] = true
+        incrementor_proc.call(env)
+      end)
+  end
+  let(:skip_session) do
+    Rack::Lint.new(proc do |env|
+        env['rack.session.options'][:skip] = true
+        incrementor_proc.call(env)
+      end)
+  end
+  let(:incrementor) { Rack::Lint.new(incrementor_proc) }
+
+  it "faults on no connection" do
+    assert_raises Dalli::RingError do
+      Rack::Session::Dalli.new(incrementor, :memcache_server => 'nosuchserver')
+    end
+  end
+
+  it "connects to existing server" do
+    assert_silent do
+      rsd = Rack::Session::Dalli.new(incrementor, :namespace => 'test:rack:session')
+      rsd.pool.set('ping', '')
+    end
+  end
+
+  it "passes options to MemCache" do
+    rsd = Rack::Session::Dalli.new(incrementor, :namespace => 'test:rack:session')
+    assert_equal('test:rack:session', rsd.pool.instance_eval { @options[:namespace] })
+  end
+
+  it "creates a new cookie" do
+    rsd = Rack::Session::Dalli.new(incrementor)
+    res = Rack::MockRequest.new(rsd).get("/")
+    assert res["Set-Cookie"].include?("#{session_key}=")
+    assert_equal '{"counter"=>1}', res.body
+  end
+
+  it "determines session from a cookie" do
+    rsd = Rack::Session::Dalli.new(incrementor)
+    req = Rack::MockRequest.new(rsd)
+    res = req.get("/")
+    cookie = res["Set-Cookie"]
+    assert_equal '{"counter"=>2}', req.get("/", "HTTP_COOKIE" => cookie).body
+    assert_equal '{"counter"=>3}', req.get("/", "HTTP_COOKIE" => cookie).body
+  end
+
+  it "determines session only from a cookie by default" do
+    rsd = Rack::Session::Dalli.new(incrementor)
+    req = Rack::MockRequest.new(rsd)
+    res = req.get("/")
+    sid = res["Set-Cookie"][session_match, 1]
+    assert_equal '{"counter"=>1}', req.get("/?rack.session=#{sid}").body
+    assert_equal '{"counter"=>1}', req.get("/?rack.session=#{sid}").body
+  end
+
+  it "determines session from params" do
+    rsd = Rack::Session::Dalli.new(incrementor, :cookie_only => false)
+    req = Rack::MockRequest.new(rsd)
+    res = req.get("/")
+    sid = res["Set-Cookie"][session_match, 1]
+    assert_equal '{"counter"=>2}', req.get("/?rack.session=#{sid}").body
+    assert_equal '{"counter"=>3}', req.get("/?rack.session=#{sid}").body
+  end
+
+  it "survives nonexistant cookies" do
+    bad_cookie = "rack.session=blarghfasel"
+    rsd = Rack::Session::Dalli.new(incrementor)
+    res = Rack::MockRequest.new(rsd).
+      get("/", "HTTP_COOKIE" => bad_cookie)
+    assert_equal '{"counter"=>1}', res.body
+    cookie = res["Set-Cookie"][session_match]
+    refute_match(/#{bad_cookie}/, cookie)
+  end
+
+  it "survives nonexistant blank cookies" do
+    bad_cookie = "rack.session="
+    rsd = Rack::Session::Dalli.new(incrementor)
+    res = Rack::MockRequest.new(rsd).
+      get("/", "HTTP_COOKIE" => bad_cookie)
+    cookie = res["Set-Cookie"][session_match]
+    refute_match(/#{bad_cookie}$/, cookie)
+  end
+
+  it "maintains freshness" do
+    rsd = Rack::Session::Dalli.new(incrementor, :expire_after => 3)
+    res = Rack::MockRequest.new(rsd).get('/')
+    assert res.body.include?('"counter"=>1')
+    cookie = res["Set-Cookie"]
+    res = Rack::MockRequest.new(rsd).get('/', "HTTP_COOKIE" => cookie)
+    assert_equal cookie, res["Set-Cookie"]
+    assert res.body.include?('"counter"=>2')
+    puts 'Sleeping to expire session' if $DEBUG
+    sleep 4
+    res = Rack::MockRequest.new(rsd).get('/', "HTTP_COOKIE" => cookie)
+    refute_equal cookie, res["Set-Cookie"]
+    assert res.body.include?('"counter"=>1')
+  end
+
+  it "does not send the same session id if it did not change" do
+    rsd = Rack::Session::Dalli.new(incrementor)
+    req = Rack::MockRequest.new(rsd)
+
+    res0 = req.get("/")
+    cookie = res0["Set-Cookie"][session_match]
+    assert_equal '{"counter"=>1}', res0.body
+
+    res1 = req.get("/", "HTTP_COOKIE" => cookie)
+    assert_nil res1["Set-Cookie"]
+    assert_equal '{"counter"=>2}', res1.body
+
+    res2 = req.get("/", "HTTP_COOKIE" => cookie)
+    assert_nil res2["Set-Cookie"]
+    assert_equal '{"counter"=>3}', res2.body
+  end
+
+  it "deletes cookies with :drop option" do
+    rsd = Rack::Session::Dalli.new(incrementor)
+    req = Rack::MockRequest.new(rsd)
+    drop = Rack::Utils::Context.new(rsd, drop_session)
+    dreq = Rack::MockRequest.new(drop)
+
+    res1 = req.get("/")
+    session = (cookie = res1["Set-Cookie"])[session_match]
+    assert_equal '{"counter"=>1}', res1.body
+
+    res2 = dreq.get("/", "HTTP_COOKIE" => cookie)
+    assert_nil res2["Set-Cookie"]
+    assert_equal '{"counter"=>2}', res2.body
+
+    res3 = req.get("/", "HTTP_COOKIE" => cookie)
+    refute_equal session, res3["Set-Cookie"][session_match]
+    assert_equal '{"counter"=>1}', res3.body
+  end
+
+  it "provides new session id with :renew option" do
+    rsd = Rack::Session::Dalli.new(incrementor)
+    req = Rack::MockRequest.new(rsd)
+    renew = Rack::Utils::Context.new(rsd, renew_session)
+    rreq = Rack::MockRequest.new(renew)
+
+    res1 = req.get("/")
+    session = (cookie = res1["Set-Cookie"])[session_match]
+    assert_equal '{"counter"=>1}', res1.body
+
+    res2 = rreq.get("/", "HTTP_COOKIE" => cookie)
+    new_cookie = res2["Set-Cookie"]
+    new_session = new_cookie[session_match]
+    refute_equal session, new_session
+    assert_equal '{"counter"=>2}', res2.body
+
+    res3 = req.get("/", "HTTP_COOKIE" => new_cookie)
+    assert_equal '{"counter"=>3}', res3.body
+
+    # Old cookie was deleted
+    res4 = req.get("/", "HTTP_COOKIE" => cookie)
+    assert_equal '{"counter"=>1}', res4.body
+  end
+
+  it "omits cookie with :defer option but still updates the state" do
+    rsd = Rack::Session::Dalli.new(incrementor)
+    count = Rack::Utils::Context.new(rsd, incrementor)
+    defer = Rack::Utils::Context.new(rsd, defer_session)
+    dreq = Rack::MockRequest.new(defer)
+    creq = Rack::MockRequest.new(count)
+
+    res0 = dreq.get("/")
+    assert_nil res0["Set-Cookie"]
+    assert_equal '{"counter"=>1}', res0.body
+
+    res0 = creq.get("/")
+    res1 = dreq.get("/", "HTTP_COOKIE" => res0["Set-Cookie"])
+    assert_equal '{"counter"=>2}', res1.body
+    res2 = dreq.get("/", "HTTP_COOKIE" => res0["Set-Cookie"])
+    assert_equal '{"counter"=>3}', res2.body
+  end
+
+  it "omits cookie and state update with :skip option" do
+    rsd = Rack::Session::Dalli.new(incrementor)
+    count = Rack::Utils::Context.new(rsd, incrementor)
+    skip = Rack::Utils::Context.new(rsd, skip_session)
+    sreq = Rack::MockRequest.new(skip)
+    creq = Rack::MockRequest.new(count)
+
+    res0 = sreq.get("/")
+    assert_nil res0["Set-Cookie"]
+    assert_equal '{"counter"=>1}', res0.body
+
+    res0 = creq.get("/")
+    res1 = sreq.get("/", "HTTP_COOKIE" => res0["Set-Cookie"])
+    assert_equal '{"counter"=>2}', res1.body
+    res2 = sreq.get("/", "HTTP_COOKIE" => res0["Set-Cookie"])
+    assert_equal '{"counter"=>2}', res2.body
+  end
+
+  it "updates deep hashes correctly" do
+    hash_check = proc do |env|
+      session = env['rack.session']
+      unless session.include? 'test'
+        session.update :a => :b, :c => { :d => :e },
+          :f => { :g => { :h => :i} }, 'test' => true
+      else
+        session[:f][:g][:h] = :j
+      end
+      [200, {}, [session.inspect]]
+    end
+    rsd = Rack::Session::Dalli.new(hash_check)
+    req = Rack::MockRequest.new(rsd)
+
+    res0 = req.get("/")
+    session_id = (cookie = res0["Set-Cookie"])[session_match, 1]
+    ses0 = rsd.pool.get(session_id, true)
+
+    req.get("/", "HTTP_COOKIE" => cookie)
+    ses1 = rsd.pool.get(session_id, true)
+
+    refute_equal ses0, ses1
+  end
+
+  # anyone know how to do this better?
+  it "cleanly merges sessions when multithreaded" do
+    unless $DEBUG
+      assert_equal 1, 1 # fake assertion to appease the mighty bacon
+      next
+    end
+    warn 'Running multithread test for Session::Dalli'
+    rsd = Rack::Session::Dalli.new(incrementor)
+    req = Rack::MockRequest.new(rsd)
+
+    res = req.get('/')
+    assert_equal '{"counter"=>1}', res.body
+    cookie = res["Set-Cookie"]
+    session_id = cookie[session_match, 1]
+
+    delta_incrementor = lambda do |env|
+      # emulate disconjoinment of threading
+      env['rack.session'] = env['rack.session'].dup
+      Thread.stop
+      env['rack.session'][(Time.now.usec*rand).to_i] = true
+      incrementor.call(env)
+    end
+    tses = Rack::Utils::Context.new rsd, delta_incrementor
+    treq = Rack::MockRequest.new(tses)
+    tnum = rand(7).to_i+5
+    r = Array.new(tnum) do
+      Thread.new(treq) do |run|
+        run.get('/', "HTTP_COOKIE" => cookie, 'rack.multithread' => true)
+      end
+    end.reverse.map{|t| t.run.join.value }
+    r.each do |request|
+      assert_equal cookie, request['Set-Cookie']
+      assert request.body.include?('"counter"=>2')
+    end
+
+    session = rsd.pool.get(session_id)
+    assert_equal tnum+1, session.size  # counter
+    assert_equal 2, session['counter'] # meeeh
+
+    tnum = rand(7).to_i+5
+    r = Array.new(tnum) do |i|
+      app = Rack::Utils::Context.new rsd, time_delta
+      req = Rack::MockRequest.new app
+      Thread.new(req) do |run|
+        run.get('/', "HTTP_COOKIE" => cookie, 'rack.multithread' => true)
+      end
+    end.reverse.map{|t| t.run.join.value }
+    r.each do |request|
+      assert_equal cookie, request['Set-Cookie']
+      assert request.body.include?('"counter"=>3')
+    end
+
+    session = rsd.pool.get(session_id)
+    assert_equal tnum+1, session.size
+    assert_equal 3, session['counter']
+
+    drop_counter = proc do |env|
+      env['rack.session'].delete 'counter'
+      env['rack.session']['foo'] = 'bar'
+      [200, {'Content-Type'=>'text/plain'}, env['rack.session'].inspect]
+    end
+    tses = Rack::Utils::Context.new rsd, drop_counter
+    treq = Rack::MockRequest.new(tses)
+    tnum = rand(7).to_i+5
+    r = Array.new(tnum) do
+      Thread.new(treq) do |run|
+        run.get('/', "HTTP_COOKIE" => cookie, 'rack.multithread' => true)
+      end
+    end.reverse.map{|t| t.run.join.value }
+    r.each do |request|
+      assert_equal cookie, request['Set-Cookie']
+      assert request.body.include?('"foo"=>"bar"')
+    end
+
+    session = rsd.pool.get(session_id)
+    assert_equal r.size+1, session.size
+    assert_nil session['counter']
+    assert_equal 'bar', session['foo']
+  end
+end
diff --git a/lib/dalli-2.7.2/test/test_ring.rb b/lib/dalli-2.7.2/test/test_ring.rb
new file mode 100644
index 000000000..de4862a9c
--- /dev/null
+++ b/lib/dalli-2.7.2/test/test_ring.rb
@@ -0,0 +1,85 @@
+require 'helper'
+
+describe 'Ring' do
+
+  describe 'a ring of servers' do
+
+    it "have the continuum sorted by value" do
+      servers = [stub(:hostname => "localhost", :port => "11211", :weight => 1),
+                 stub(:hostname => "localhost", :port => "9500", :weight => 1)]
+      ring = Dalli::Ring.new(servers, {})
+      previous_value = 0
+      ring.continuum.each do |entry|
+        assert entry.value > previous_value
+        previous_value = entry.value
+      end
+    end
+
+    it 'raise when no servers are available/defined' do
+      ring = Dalli::Ring.new([], {})
+      assert_raises Dalli::RingError, :message => "No server available" do
+        ring.server_for_key('test')
+      end
+    end
+
+    describe 'containing only a single server' do
+      it "raise correctly when it's not alive" do
+        servers = [
+          Dalli::Server.new("localhost:12345"),
+        ]
+        ring = Dalli::Ring.new(servers, {})
+        assert_raises Dalli::RingError, :message => "No server available" do
+          ring.server_for_key('test')
+        end
+      end
+
+      it "return the server when it's alive" do
+        servers = [
+          Dalli::Server.new("localhost:19191"),
+        ]
+        ring = Dalli::Ring.new(servers, {})
+        memcached(19191) do |mc|
+          ring = mc.send(:ring)
+          assert_equal ring.servers.first.port, ring.server_for_key('test').port
+        end
+      end
+    end
+
+    describe 'containing multiple servers' do
+      it "raise correctly when no server is alive" do
+        servers = [
+          Dalli::Server.new("localhost:12345"),
+          Dalli::Server.new("localhost:12346"),
+        ]
+        ring = Dalli::Ring.new(servers, {})
+        assert_raises Dalli::RingError, :message => "No server available" do
+          ring.server_for_key('test')
+        end
+      end
+
+      it "return an alive server when at least one is alive" do
+        servers = [
+          Dalli::Server.new("localhost:12346"),
+          Dalli::Server.new("localhost:19191"),
+        ]
+        ring = Dalli::Ring.new(servers, {})
+        memcached(19191) do |mc|
+          ring = mc.send(:ring)
+          assert_equal ring.servers.first.port, ring.server_for_key('test').port
+        end
+      end
+    end
+
+    it 'detect when a dead server is up again' do
+      memcached(19997) do
+        down_retry_delay = 0.5
+        dc = Dalli::Client.new(['localhost:19997', 'localhost:19998'], :down_retry_delay => down_retry_delay)
+        assert_equal 1, dc.stats.values.compact.count
+
+        memcached(19998) do
+          assert_equal 2, dc.stats.values.compact.count
+        end
+      end
+    end
+  end
+end
diff --git a/lib/dalli-2.7.2/test/test_sasl.rb b/lib/dalli-2.7.2/test/test_sasl.rb
new file mode 100644
index 000000000..eca91c6a2
--- /dev/null
+++ b/lib/dalli-2.7.2/test/test_sasl.rb
@@ -0,0 +1,110 @@
+require 'helper'
+
+describe 'Sasl' do
+
+  # https://github.com/seattlerb/minitest/issues/298
+  def self.xit(msg, &block)
+  end
+
+  describe 'a server requiring authentication' do
+    before do
+      @server = mock()
+      @server.stubs(:request).returns(true)
+      @server.stubs(:weight).returns(1)
+      @server.stubs(:hostname).returns("localhost")
+      @server.stubs(:port).returns("19124")
+    end
+
+    describe 'without authentication credentials' do
+      before do
+        ENV['MEMCACHE_USERNAME'] = 'foo'
+        ENV['MEMCACHE_PASSWORD'] = 'wrongpwd'
+      end
+
+      after do
+        ENV['MEMCACHE_USERNAME'] = nil
+        ENV['MEMCACHE_PASSWORD'] = nil
+      end
+
+      it 'provide one test that passes' do
+        assert true
+      end
+
+      it 'gracefully handle authentication failures' do
+        memcached(19124, '-S') do |dc|
+          assert_error Dalli::DalliError, /32/ do
+            dc.set('abc', 123)
+          end
+        end
+      end
+    end
+
+    it 'fail SASL authentication with wrong options' do
+      memcached(19124, '-S') do |dc|
+        dc = Dalli::Client.new('localhost:19124', :username => 'foo', :password => 'wrongpwd')
+        assert_error Dalli::DalliError, /32/ do
+          dc.set('abc', 123)
+        end
+      end
+    end
+
+    # OSX: Create a SASL user for the memcached application like so:
+    #
+    # saslpasswd2 -a memcached -c testuser
+    #
+    # with password 'testtest'
+    describe 'in an authenticated environment' do
+      before do
+        ENV['MEMCACHE_USERNAME'] = 'testuser'
+        ENV['MEMCACHE_PASSWORD'] = 'testtest'
+      end
+
+      after do
+        ENV['MEMCACHE_USERNAME'] = nil
+        ENV['MEMCACHE_PASSWORD'] = nil
+      end
+
+      xit 'pass SASL authentication' do
+        memcached(19124, '-S') do |dc|
+          # I get "Dalli::DalliError: Error authenticating: 32" in OSX
+          # but SASL works on Heroku servers. YMMV.
+          assert_equal true, dc.set('abc', 123)
+          assert_equal 123, dc.get('abc')
+          results = dc.stats
+          assert_equal 1, results.size
+          assert_equal 38, results.values.first.size
+        end
+      end
+    end
+
+    xit 'pass SASL authentication with options' do
+      memcached(19124, '-S') do |dc|
+        dc = Dalli::Client.new('localhost:19124', :username => 'testuser', :password => 'testtest')
+        # I get "Dalli::DalliError: Error authenticating: 32" in OSX
+        # but SASL works on Heroku servers. YMMV.
+        assert_equal true, dc.set('abc', 123)
+        assert_equal 123, dc.get('abc')
+        results = dc.stats
+        assert_equal 1, results.size
+        assert_equal 38, results.values.first.size
+      end
+    end
+
+    it 'pass SASL as URI' do
+      Dalli::Server.expects(:new).with("localhost:19124",
+        :username => "testuser", :password => "testtest").returns(@server)
+      dc = Dalli::Client.new('memcached://testuser:testtest@localhost:19124')
+      dc.flush_all
+    end
+
+    it 'pass SASL as ring of URIs' do
+      Dalli::Server.expects(:new).with("localhost:19124",
+        :username => "testuser", :password => "testtest").returns(@server)
+      Dalli::Server.expects(:new).with("otherhost:19125",
+        :username => "testuser2", :password => "testtest2").returns(@server)
+      dc = Dalli::Client.new(['memcached://testuser:testtest@localhost:19124',
+      'memcached://testuser2:testtest2@otherhost:19125'])
+      dc.flush_all
+    end
+  end
+end
diff --git a/lib/dalli-2.7.2/test/test_serializer.rb b/lib/dalli-2.7.2/test/test_serializer.rb
new file mode 100644
index 000000000..e8118f249
--- /dev/null
+++ b/lib/dalli-2.7.2/test/test_serializer.rb
@@ -0,0 +1,30 @@
+# encoding: utf-8
+require 'helper'
+require 'json'
+require 'memcached_mock'
+
+describe 'Serializer' do
+
+  it 'default to Marshal' do
+    memcached_kill(29198) do |dc|
+      memcache = Dalli::Client.new('127.0.0.1:29198')
+      memcache.set 1,2
+      assert_equal Marshal, memcache.instance_variable_get('@ring').servers.first.serializer
+    end
+  end
+
+  it 'support a custom serializer' do
+    memcached_kill(29198) do |dc|
+      memcache = Dalli::Client.new('127.0.0.1:29198', :serializer => JSON)
+      memcache.set 1,2
+      begin
+        assert_equal JSON, memcache.instance_variable_get('@ring').servers.first.serializer
+
+        memcached(19128) do |newdc|
+          assert newdc.set("json_test", {"foo" => "bar"})
+          assert_equal({"foo" => "bar"}, newdc.get("json_test"))
+        end
+      end
+    end
+  end
+end
diff --git a/lib/dalli-2.7.2/test/test_server.rb b/lib/dalli-2.7.2/test/test_server.rb
new file mode 100644
index 000000000..547587176
--- /dev/null
+++ b/lib/dalli-2.7.2/test/test_server.rb
@@ -0,0 +1,80 @@
+require 'helper'
+
+describe Dalli::Server do
+  describe 'hostname parsing' do
+    it 'handles no port or weight' do
+      s = Dalli::Server.new('localhost')
+      assert_equal 'localhost', s.hostname
+      assert_equal 11211, s.port
+      assert_equal 1, s.weight
+    end
+
+    it 'handles a port, but no weight' do
+      s = Dalli::Server.new('localhost:11212')
+      assert_equal 'localhost', s.hostname
+      assert_equal 11212, s.port
+      assert_equal 1, s.weight
+    end
+
+    it 'handles a port and a weight' do
+      s = Dalli::Server.new('localhost:11212:2')
+      assert_equal 'localhost', s.hostname
+      assert_equal 11212, s.port
+      assert_equal 2, s.weight
+    end
+
+    it 'handles ipv4 addresses' do
+      s = Dalli::Server.new('127.0.0.1')
+      assert_equal '127.0.0.1', s.hostname
+      assert_equal 11211, s.port
+      assert_equal 1, s.weight
+    end
+
+    it 'handles ipv6 addresses' do
+      s = Dalli::Server.new('[::1]')
+      assert_equal '::1', s.hostname
+      assert_equal 11211, s.port
+      assert_equal 1, s.weight
+    end
+
+    it 'handles ipv6 addresses with port' do
+      s = Dalli::Server.new('[::1]:11212')
+      assert_equal '::1', s.hostname
+      assert_equal 11212, s.port
+      assert_equal 1, s.weight
+    end
+
+    it 'handles ipv6 addresses with port and weight' do
+      s = Dalli::Server.new('[::1]:11212:2')
+      assert_equal '::1', s.hostname
+      assert_equal 11212, s.port
+      assert_equal 2, s.weight
+    end
+
+    it 'handles a FQDN' do
+      s = Dalli::Server.new('my.fqdn.com')
+      assert_equal 'my.fqdn.com', s.hostname
+      assert_equal 11211, s.port
+      assert_equal 1, s.weight
+    end
+
+    it 'handles a FQDN with port and weight' do
+      s = Dalli::Server.new('my.fqdn.com:11212:2')
+      assert_equal 'my.fqdn.com', s.hostname
+      assert_equal 11212, s.port
+      assert_equal 2, s.weight
+    end
+  end
+
+  describe 'ttl translation' do
+    it 'does not translate ttls under 30 days' do
+      s = Dalli::Server.new('localhost')
+      assert_equal s.send(:sanitize_ttl, 30*24*60*60), 30*24*60*60
+    end
+
+    it 'translates ttls over 30 days into timestamps' do
+      s = Dalli::Server.new('localhost')
+      assert_equal s.send(:sanitize_ttl, 30*24*60*60 + 1), Time.now.to_i + 30*24*60*60+1
+    end
+  end
+end

From 90d9e77b324c8583d5bec10d95959fbccb4115b2 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 2 Mar 2015 17:31:04 +0800
Subject: [PATCH 15/22] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E4=B8=BB=E9=A1=B5=E6=B2=A1=E6=9C=892015=E5=B9=B4=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/welcome/course.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/welcome/course.html.erb b/app/views/welcome/course.html.erb
index d427a9aea..1d8a56060 100644
--- a/app/views/welcome/course.html.erb
+++ b/app/views/welcome/course.html.erb
@@ -96,11 +96,11 @@
        year_now -= 1
        course_term = "秋季学期"
      elsif month_now < 9
-       course_term = "秋季学期"
+       course_term = "春季学期"
      end
   %>
   <%# (month_now >= 3 && month_now < 9) ? course_term = "春季学期" : course_term = "秋季学期" %>
-  <% @school_id.nil? ? cur_school_course = [] : cur_school_course = find_miracle_course(10,7,@school_id, year_now, course_term) %>
+  <% cur_school_course = @school_id.nil? ? [] : find_miracle_course(10,7,@school_id, year_now, course_term) %>
 
   <% if cur_school_course.count == 0 %>
       <span>

From 32264fb4a6fc5f09de1d9559718bcc5b66e4772c Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Tue, 3 Mar 2015 09:11:47 +0800
Subject: [PATCH 16/22] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9=E4=B8=BA=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E6=89=80=E6=9C=89=E8=AF=BE=E7=A8=8B=E5=8A=A8=E6=80=81=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/mobile/apis/courses.rb  |  2 +-
 app/services/courses_service.rb | 42 ++++++++++++++++++++++-----------
 2 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/app/api/mobile/apis/courses.rb b/app/api/mobile/apis/courses.rb
index 8b167980d..6d68d549a 100644
--- a/app/api/mobile/apis/courses.rb
+++ b/app/api/mobile/apis/courses.rb
@@ -213,7 +213,7 @@ module Mobile
           present :status, 0
         end
 
-        desc '课程动态'
+        desc '用户课程动态'
         params do
           requires :token, type: String
         end
diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb
index 1f5ca7894..7e80f415c 100644
--- a/app/services/courses_service.rb
+++ b/app/services/courses_service.rb
@@ -333,24 +333,38 @@ class CoursesService
   end
 
   def course_dynamic(params,current_user)
-    course = Course.find(params[:id])
-    if current_user.nil? || !(current_user.admin? || course.is_public == 1 || (course.is_public == 0 && current_user.member_of_course?(course)))
-      raise '403'
+
+    @user = User.find(params[:id])
+    if !current_user.admin? && !@user.active?
+      raise '404'
+      return
     end
-    count,is_teacher = get_course_anonymous_evaluation current_user,course
-    if is_teacher
-      student_commit_number = count
+    if current_user == @user || current_user.admin?
+      membership = @user.coursememberships.all
     else
-      need_anonymous_comments_count = count
+      membership = @user.coursememberships.all(:conditions => Course.visible_condition(current_user))
     end
-    news_count = course.news.count
-    message_count = course.journals_for_messages.count
+    membership.sort! {|older, newer| newer.created_on <=> older.created_on }
     result = []
-    result << {:course_name => course.name,:course_id => course.id,:course_img_url => url_to_avatar(course),:type => 1,:count => message_count}
-    result << {:course_name => course.name,:course_id => course.id,:course_img_url => url_to_avatar(course),:type => 2,:count => need_anonymous_comments_count}
-    result << {:course_name => course.name,:course_id => course.id,:course_img_url => url_to_avatar(course),:type => 3,:count => student_commit_number}
-    result << {:course_name => course.name,:course_id => course.id,:course_img_url => url_to_avatar(course),:type => 4,:count => news_count}
-    #{:course_name => course.name,:need_anonymous_comments_count=>need_anonymous_comments_count,:student_commit_number=>student_commit_number,:news_count=> news_count,:message_count=>message_count}
+    membership.each do |mp|
+      course = mp.course
+      unless current_user.nil? || !(current_user.admin? || course.is_public == 1 || (course.is_public == 0 && current_user.member_of_course?(course)))
+        count,is_teacher = get_course_anonymous_evaluation current_user,course
+        if is_teacher
+          student_commit_number = count
+        else
+          need_anonymous_comments_count = count
+        end
+        news_count = course.news.count
+        message_count = course.journals_for_messages.count
+
+        result << {:course_name => course.name,:course_id => course.id,:course_img_url => url_to_avatar(course),:type => 1,:count => message_count}
+        result << {:course_name => course.name,:course_id => course.id,:course_img_url => url_to_avatar(course),:type => 2,:count => need_anonymous_comments_count}
+        result << {:course_name => course.name,:course_id => course.id,:course_img_url => url_to_avatar(course),:type => 3,:count => student_commit_number}
+        result << {:course_name => course.name,:course_id => course.id,:course_img_url => url_to_avatar(course),:type => 4,:count => news_count}
+        #{:course_name => course.name,:need_anonymous_comments_count=>need_anonymous_comments_count,:student_commit_number=>student_commit_number,:news_count=> news_count,:message_count=>message_count}
+      end
+    end
     result
   end
 

From 0ba6c6d3bab62069b56882d288214a045282e577 Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Tue, 3 Mar 2015 16:03:59 +0800
Subject: [PATCH 17/22] =?UTF-8?q?=E8=BF=98=E5=8E=9Fmemcached=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E7=9A=84=E6=96=87=E4=BB=B6[memcache=E5=AE=9E=E9=AA=8C?=
 =?UTF-8?q?=E8=BF=98=E6=B2=A1=E5=BC=84=E5=A5=BD]=20Signed-off-by:=20alan?=
 =?UTF-8?q?=20<547533434@qq.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/environments/development.rb | 6 ++----
 config/environments/production.rb  | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/config/environments/development.rb b/config/environments/development.rb
index 80d1c9db8..3b894d207 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -8,12 +8,10 @@ RedmineApp::Application.configure do
   # Log error messages when you accidentally call methods on nil.
   config.whiny_nils        = true
   config.logger = Logger.new('log/development.log', 'daily') # daily, weekly or monthly
-
-
   # Show full error reports and disable caching
   config.consider_all_requests_local = true
-  config.action_controller.perform_caching             = true
-  config.cache_store = :dalli_store
+  config.action_controller.perform_caching             = false
+  config.cache_store = :file_store,  "#{Rails.root }/public/tmp/"
   # Don't care if the mailer can't send
   config.action_mailer.raise_delivery_errors = true
 
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 0b61ed132..48b2514cf 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -3,7 +3,7 @@ RedmineApp::Application.configure do
   # The production environment is meant for finished, "live" apps.
   # Code is not reloaded between requests
   config.cache_classes = true
-  config.cache_store = :dalli_store
+
   #####
   # Customize the default logger (http://ruby-doc.org/core/classes/Logger.html)
   #

From 9233213127d6e00e01fafe8855372df50e23ab49 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 3 Mar 2015 17:35:46 +0800
Subject: [PATCH 18/22] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9C=AA=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E6=97=B6=E8=BF=9B=E5=85=A5=E6=8C=87=E5=AE=9A=E5=AD=A6?=
 =?UTF-8?q?=E6=A0=A1=E8=AF=BE=E7=A8=8B=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=8D=B4=E6=98=AF=E5=9B=BD=E9=98=B2=E7=A7=91=E5=A4=A7=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E5=88=97=E8=A1=A8=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/welcome_controller.rb | 2 +-
 app/views/welcome/course.html.erb     | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb
index 3ae5538e9..db2f287eb 100644
--- a/app/controllers/welcome_controller.rb
+++ b/app/controllers/welcome_controller.rb
@@ -84,7 +84,7 @@ class WelcomeController < ApplicationController
   
   def course
     @course_page = FirstPage.find_by_page_type('course')
-    @school_id = params[:school_id] || User.current.user_extensions.school.try(:id)
+    @school_id = params[:school_id] || User.current.user_extensions.school.try(:id) || 117
     @logoLink ||= logolink()
 
     ##3-8月份为查找春季课程，9-2月份为查找秋季课程
diff --git a/app/views/welcome/course.html.erb b/app/views/welcome/course.html.erb
index 1d8a56060..95837cb6d 100644
--- a/app/views/welcome/course.html.erb
+++ b/app/views/welcome/course.html.erb
@@ -108,12 +108,13 @@
       </span>
       <div class="d-p-projectlist-box">
         <ul class="d-p-projectlist">
-          <% if User.current.logged? %>
+          <%# if User.current.logged? %>
               <li>
                 <%= render :partial => 'no_course_title', :locals => {:course_title => l(:label_school_no_course)} %>
               </li>
-          <% end %>
-          <% User.current.logged? ? course_count = 9 : course_count = 10 %>
+          <%# end %>
+          <%# User.current.logged? ? course_count = 9 : course_count = 10 %>
+          <% course_count = 9 %>
           <% all_new_hot_course = find_all_new_hot_course(course_count, @school_id, year_now, course_term)%>
           <% while all_new_hot_course.count < course_count%>
               <% if course_term == "春季学期"

From 451a022d5fe2855a5aa6f974128e9ab379e5f8b4 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Tue, 3 Mar 2015 17:36:05 +0800
Subject: [PATCH 19/22] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E3=80=81=E4=BD=9C=E4=B8=9A=E5=88=97=E8=A1=A8=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/mobile/entities/course.rb   |  2 +-
 app/api/mobile/entities/homework.rb | 12 +++++++++++-
 app/services/courses_service.rb     |  5 +++--
 app/services/homework_service.rb    | 26 +++++++++++++++++++++-----
 4 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/app/api/mobile/entities/course.rb b/app/api/mobile/entities/course.rb
index 512aab69a..4c91738c1 100644
--- a/app/api/mobile/entities/course.rb
+++ b/app/api/mobile/entities/course.rb
@@ -53,7 +53,7 @@ module Mobile
           c[:course].teacher
         end
       end
-      expose :my_homework,using: Mobile::Entities::HomeworkAttach  do |f, opt|
+      expose :my_homework,using: Mobile::Entities::Homework  do |f, opt|
         f[:my_homework] if f.is_a?(Hash) && f.key?(:my_homework)
       end
       course_expose :current_user_is_member
diff --git a/app/api/mobile/entities/homework.rb b/app/api/mobile/entities/homework.rb
index 5b996c1af..55883e14e 100644
--- a/app/api/mobile/entities/homework.rb
+++ b/app/api/mobile/entities/homework.rb
@@ -1,10 +1,15 @@
 module Mobile
   module Entities
     class Homework < Grape::Entity
+      include Redmine::I18n
       def self.homework_expose(field)
         expose field do |f,opt|
           if f.is_a?(Hash) && f.key?(field)
-            f[field]
+            if field == :created_on
+              format_time(f[field])
+            else
+              f[field]
+            end
           elsif f.is_a?(::Bid)
             if f.respond_to?(field)
               f.send(field)
@@ -18,6 +23,8 @@ module Mobile
       homework_expose :id
       #课程名称
       homework_expose :course_name
+
+      homework_expose :course_id
       #作业发布者
       expose :author,using: Mobile::Entities::User  do |f, opt|
          f[:author]
@@ -42,6 +49,9 @@ module Mobile
       #只有作业启用了匿评功能且当前用户是课程老师且已提交的作品数量大于或等于2才能开启匿评
       homework_expose :homework_state
 
+      homework_expose :created_on
+      homework_expose :deadline
+
       expose :homework_for_anonymous_comments,using: Mobile::Entities::HomeworkAttach  do |f, opt|
         f[:homework_for_anonymous_comments] if f.is_a?(Hash) && f.key?(:homework_for_anonymous_comments)
       end
diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb
index 7e80f415c..22b7f8cd3 100644
--- a/app/services/courses_service.rb
+++ b/app/services/courses_service.rb
@@ -383,8 +383,9 @@ class CoursesService
     end
     #end
     open_anonymous_evaluation = bid.open_anonymous_evaluation
-    {:course_name => course.name,:id => bid.id, :author => bid.author,:author_real_name => author_real_name, :homework_times => many_times, :homework_name => name, :homework_count => homework_count,:student_questions_count => student_questions_count,
-     :description => description, :homework_state => state,:open_anonymous_evaluation => open_anonymous_evaluation,:homework_for_anonymous_comments => homework_for_anonymous_comments}
+    {:course_name => course.name,:course_id => course.id,:id => bid.id, :author => bid.author,:author_real_name => author_real_name, :homework_times => many_times, :homework_name => name, :homework_count => homework_count,:student_questions_count => student_questions_count,
+     :description => description, :homework_state => state,:open_anonymous_evaluation => open_anonymous_evaluation,:homework_for_anonymous_comments => homework_for_anonymous_comments,:created_on => bid.created_on,:deadline => bid.deadline}
+
   end
 
   #显示作业列表的同时显示分配给当前学生匿评的作业
diff --git a/app/services/homework_service.rb b/app/services/homework_service.rb
index c5a333125..6287eeef5 100644
--- a/app/services/homework_service.rb
+++ b/app/services/homework_service.rb
@@ -26,8 +26,8 @@ class HomeworkService
     state = @bid.comment_status
     #end
     open_anonymous_evaluation = @bid.open_anonymous_evaluation
-    {:course_name => course.name,:id => @bid.id, :author => @bid.author,:author_real_name =>author,  :homework_times => many_times, :homework_name => name, :homework_count => homework_count,:student_questions_count => student_questions_count,
-     :description => description, :homework_state => state,:open_anonymous_evaluation => open_anonymous_evaluation}
+    {:course_name => course.name,:course_id => course.id,:id => @bid.id, :author => @bid.author,:author_real_name =>author,  :homework_times => many_times, :homework_name => name, :homework_count => homework_count,:student_questions_count => student_questions_count,
+     :description => description, :homework_state => state,:open_anonymous_evaluation => open_anonymous_evaluation,:created_on => @bid.created_on,:deadline => @bid.deadline}
   end
   
   # 启动作业匿评前提示信息
@@ -274,10 +274,26 @@ class HomeworkService
     membership.each do |mp|
       my_homeworks = []
       mp.course.homeworks.each do |bid|
-        hw = bid.homeworks.where("user_id = #{current_user.id}")
-        my_homeworks << hw[0] unless (hw.nil? || hw[0].nil?)
+        #hw = bid.homeworks.where("user_id = #{current_user.id}")
+        @bid = bid
+        course  = @bid.courses.first
+        author = @bid.author.lastname + @bid.author.firstname
+        many_times = course.homeworks.index(@bid) + 1
+        name = @bid.name
+        homework_count = @bid.homeworks.count  #已提交的作业数量
+        student_questions_count = @bid.commit.nil? ? 0 : @bid.commit
+        description = @bid.description
+                                               #if is_course_teacher(User.current, course) && @bid.open_anonymous_evaluation == 1 && @bid.homeworks.count >= 2
+        state = @bid.comment_status
+                                               #end
+        open_anonymous_evaluation = @bid.open_anonymous_evaluation
+
+        my_homeworks << {:course_name => course.name,:id => @bid.id, :author => @bid.author,:author_real_name =>author,  :homework_times => many_times, :homework_name => name, :homework_count => homework_count,:student_questions_count => student_questions_count,
+                         :description => description, :homework_state => state,:open_anonymous_evaluation => open_anonymous_evaluation}
+      end
+      if mp.course.homeworks.count != 0
+        course_list << {:course => mp.course,:img_url => url_to_avatar(mp.course),:my_homework => my_homeworks,:current_user_is_member => current_user.member_of_course?(mp.course),:current_user_is_teacher => is_course_teacher(current_user,mp.course)}
       end
-      course_list << {:course => mp.course,:img_url => url_to_avatar(mp.course),:my_homework => my_homeworks,:current_user_is_member => current_user.member_of_course?(mp.course),:current_user_is_teacher => is_course_teacher(current_user,mp.course)}
     end
     course_list
   end

From 2c4e86408058c3634234aabfd21c6a2bf601fa23 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 3 Mar 2015 17:53:15 +0800
Subject: [PATCH 20/22] =?UTF-8?q?#1949=20=E5=AD=A6=E7=94=9F=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E9=80=9A=E8=BF=87url=E8=AE=BF=E9=97=AE=E8=80=81?=
 =?UTF-8?q?=E5=B8=88=E5=B9=B6=E6=9C=AA=E5=8F=91=E5=B8=83=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E5=8D=B7=E5=B9=B6=E8=BF=9B=E8=A1=8C=E4=BD=9C=E7=AD=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/poll_controller.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb
index 1b2794034..b897d039a 100644
--- a/app/controllers/poll_controller.rb
+++ b/app/controllers/poll_controller.rb
@@ -23,6 +23,10 @@ class PollController < ApplicationController
 
   def show
     @poll = Poll.find params[:id]
+    if @poll.polls_status != 2 && !User.current.allowed_to?(:as_teacher,@course)
+      render_403
+      return
+    end
     #已提交问卷的用户不能再访问该界面
     if has_commit_poll?(@poll.id,User.current.id) && (!User.current.admin?)
       render_403

From 5bba54432d47b9d89cf968800255e75615630365 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 4 Mar 2015 09:52:01 +0800
Subject: [PATCH 21/22] =?UTF-8?q?#1930=20=E9=A1=B9=E7=9B=AE=E7=BC=BA?=
 =?UTF-8?q?=E9=99=B7=E6=98=BE=E7=A4=BA=E4=B8=AA=E6=95=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_projects.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index b8cc2ddc9..d33a33a14 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -134,7 +134,7 @@
                                             </td>
                                             <!-- 项目sidebar栏显示问题数目为项目总问题数排除已关闭和已解决的项目问题数，即排除3（已解决），5（已关闭）的 项目问题数  !-->
 											<td class="font_index">
-                                              <%=link_to "#{@project.issues.where('status_id in (1,2,4,6)').count}", project_issues_path(@project) %>
+                                              <%=link_to "#{@project.issues.where('status_id in (1,2,4,6)').count}/#{@project.issues.count}", project_issues_path(@project) %>
                                             </td>
 										</tr>
 										<tr class="font_aram">

From 33e9a3e326def600d594c81ee0824a2bd20d4ef7 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 4 Mar 2015 10:02:40 +0800
Subject: [PATCH 22/22] =?UTF-8?q?#1958=20=E5=85=B3=E6=B3=A8=E6=9C=89?=
 =?UTF-8?q?=E7=94=A8=E6=88=B70=E4=B8=AA=E5=90=8E=E8=BE=B9=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E5=86=92=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/user_watchlist.html.erb | 100 ++++++++++++++----------
 config/locales/zh.yml                   |  12 +--
 2 files changed, 64 insertions(+), 48 deletions(-)

diff --git a/app/views/users/user_watchlist.html.erb b/app/views/users/user_watchlist.html.erb
index e58e35d27..b6e889b91 100644
--- a/app/views/users/user_watchlist.html.erb
+++ b/app/views/users/user_watchlist.html.erb
@@ -1,47 +1,63 @@
 <h3><%= l(:label_user_watcher)%></h3>
 <div class="inf_user_image">
 	<% for user in User.watched_by(@user.id) %>
-	<ul class="list_watch"><li>
-<table width="660px" border="0" align="center">
-  <tr>
- <td colspan="2" valign="top" width="50" ><%= link_to image_tag(url_to_avatar(user), :class => "avatar"), user_path(user), :title => "#{user.name}" %></td>
-     <td><table width="580px" border="0">
-      <tr>  <!-- modified by bai 增加了关注人的名字全称-->
-        <td colspan="2" valign="top"><strong><%= content_tag "div", link_to(user.name,user_path(user)), :class => "project_avatar_name" %></strong>
-        </td>
-        </tr>
-      <tr>  <!-- modified by bai 区别了“关注”里个人参与的项目与课程-->
-        <td colspan="2" width="580px" ><p class="font_description">
-			<%# unless user.memberships.empty? %>
-			<% cond = Project.visible_condition(User.current) + " AND projects.project_type <> 1" %>
-			<% memberships = user.memberships.all(:conditions => cond) %>
-			<%= l(:label_x_contribute_to, :count => memberships.count) %>
-			<% for member in memberships %>
-			<%= link_to_project(member.project) %><%= (user.memberships.last == member) ? '' : '，' %>
-			<% end %>
-			<%# end %>
-			</p>
-			<p class="font_description">
-			<%# unless user.memberships.empty? %>
-              <% user_courses = user_courses_list(user) %>
-              <%= l(:label_x_course_contribute_to, :count => user_courses.count) %>
-              <% for course in user_courses %>
-                  <%# if course.name != nil %>
-                  <%= link_to course.name,{:controller => 'courses',:action => 'show',id:course.id, host:  Setting.course_domain} %><%= (user_courses.last == course) ? '' : '，' %>
-                  <%# end %>
-              <% end %>
-			<%# end %>
-			</p>
-		</td>
-        </tr>
-        <!-- end -->
-        
-      <tr>        
-        <td width="200" align="right" class="font_lighter"><%= l(:label_user_joinin) %><%= format_date(user.created_on) %>
-        </td>
-      </tr>
-    </table></td>
-  </tr>
-</table></li></ul>
+	<ul class="list_watch">
+      <li>
+        <table width="660px" border="0" align="center">
+          <tr>
+             <td colspan="2" valign="top" width="50" >
+               <%= link_to image_tag(url_to_avatar(user), :class => "avatar"), user_path(user), :title => "#{user.name}" %>
+             </td>
+             <td>
+               <table width="580px" border="0">
+                <tr>  <!-- modified by bai 增加了关注人的名字全称-->
+                    <td colspan="2" valign="top">
+                      <strong>
+                        <%= content_tag "div", link_to(user.name,user_path(user)), :class => "project_avatar_name" %>
+                      </strong>
+                    </td>
+                </tr>
+                <tr>  <!-- modified by bai 区别了“关注”里个人参与的项目与课程-->
+                    <td colspan="2" width="580px" >
+                      <p class="font_description">
+                        <%# unless user.memberships.empty? %>
+                        <% cond = Project.visible_condition(User.current) + " AND projects.project_type <> 1" %>
+                        <% memberships = user.memberships.all(:conditions => cond) %>
+                        <%= l(:label_x_contribute_to, :count => memberships.count) %>
+                        <%= "：" unless memberships.empty? %>
+                        <% for member in memberships %>
+                            <%= link_to_project(member.project) %>
+                            <%= (user.memberships.last == member) ? '' : '，' %>
+                        <% end %>
+                        <%# end %>
+                      </p>
+                      <p class="font_description">
+                        <%# unless user.memberships.empty? %>
+                          <% user_courses = user_courses_list(user) %>
+                          <%= l(:label_x_course_contribute_to, :count => user_courses.count) %>
+                          <%= "：" unless user_courses.empty? %>
+                          <% for course in user_courses %>
+                              <%# if course.name != nil %>
+                              <%= link_to course.name,{:controller => 'courses',:action => 'show',id:course.id, host:  Setting.course_domain} %><%= (user_courses.last == course) ? '' : '，' %>
+                              <%# end %>
+                          <% end %>
+                        <%# end %>
+                      </p>
+                    </td>
+                </tr>
+                <!-- end -->
+
+                <tr>
+                    <td width="200" align="right" class="font_lighter">
+                      <%= l(:label_user_joinin) %>
+                      <%= format_date(user.created_on) %>
+                    </td>
+                </tr>
+              </table>
+            </td>
+          </tr>
+        </table>
+    </li>
+    </ul>
 <% end %>
 </div>
\ No newline at end of file
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 9ef20756f..aa153cda6 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1420,9 +1420,9 @@ zh:
   label_contribute_to: 参与了 %{project_count} 个项目：
   #modify by men
   label_x_contribute_to:
-    zero: 参与了 %{count} 个项目：
-    one: 参与了 %{count} 个项目：
-    other: 参与了 %{count} 个项目：
+    zero: 参与了 %{count} 个项目
+    one: 参与了 %{count} 个项目
+    other: 参与了 %{count} 个项目
   #end
   label_total_commit: 共%{total_commit}次提交
   label_question_number: 第%{question_number}题：
@@ -1809,9 +1809,9 @@ zh:
 
   label_course_contribute_to: 参与了 %{project_count} 个项目：
   label_x_course_contribute_to:
-    zero: "参与了 %{count} 个课程："
-    one: "参与了 %{count} 个课程："
-    other: "参与了 %{count} 个课程："
+    zero: "参与了 %{count} 个课程"
+    one: "参与了 %{count} 个课程"
+    other: "参与了 %{count} 个课程"
 
   label_join_contest: 加入竞赛
   label_exit_contest: 退出竞赛