Clearup gems, speed up boot time.

Author: huacnlee

Gemfile

@@ -16,7 +16,7 @@ end
 gem 'carrierwave', '0.6.2'
 gem 'carrierwave-mongoid', '0.2.0', :require => 'carrierwave/mongoid'
 gem 'carrierwave-upyun', '0.1.3'
-gem 'mini_magick','3.3'
+gem 'mini_magick','3.3', :require => false
 
 # Mongoid 辅助插件
 gem "mongoid", "2.4.8"
@@ -35,10 +35,7 @@ gem 'bootstrap-will_paginate', '0.0.3'
 
 # 三方平台 OAuth 验证登陆
 gem "omniauth", "~> 1.0.1"
-gem 'omniauth-openid', "~> 1.0.1"
 gem "omniauth-github", "~> 1.0.0"
-gem "omniauth-twitter", "~> 0.0.7"
-gem "omniauth-douban", :git => "git://github.com/ballantyne/omniauth-douban.git"
 
 # permission
 gem "cancan", "~> 1.6.7"
@@ -51,7 +48,6 @@ gem "redis-objects", "0.5.2"
 
 # Markdown 格式
 gem "redcarpet", "~> 2.0.0"
-gem 'hpricot', '~> 0.8.5'
 gem "pygments.rb", '~> 0.2.4'
 
 # YAML 配置信息
@@ -65,26 +61,20 @@ gem "resque_mailer", '2.0.2'
 
 # AWS Simple Email Server
 gem "aws-ses", "~> 0.4.3"
-gem 'mail_view', :git => 'git://github.com/37signals/mail_view.git'
-
-# 用于组合小图片
-gem "sprite-factory", "1.4.1"
 
 # 分享功能
 gem "social-share-button", "~> 0.0.3"
 
 # 表单 last commit: 2011-12-03
-gem 'simple_form', :git => "git://github.com/plataformatec/simple_form.git"
+gem 'simple_form', "2.0.2"
 gem 'bootstrap-rails', :require => 'bootstrap-rails', :git => 'git://github.com/xdite/bootstrap-rails.git'
 
 # 全文搜索
 gem 'sunspot_rails',  "~> 1.3.2"
 gem 'sunspot_solr'
 
-gem 'daemon-spawn'
-
 # 禁用 assets 日志
-gem 'quiet_assets', :git => 'git://github.com/AgilionApps/quiet_assets.git'
+gem 'quiet_assets', "1.0.1"
 
 # Github API
 gem 'ruby-github'
@@ -93,13 +83,14 @@ gem 'ruby-github'
 gem 'grape', :git => 'git://github.com/intridea/grape.git', :branch => 'frontier'
 
 group :development, :test do
-  gem 'capistrano', '2.9.0'
-  gem 'chunky_png', "1.2.5"
+  gem 'capistrano', '2.9.0', :require => false
+  # 用于组合小图片
+  gem "sprite-factory", "1.4.1", :require => false
+  gem 'chunky_png', "1.2.5", :require => false
   gem "memcache-client", "1.8.5"
-  gem 'rspec-rails', '~> 2.8.1'
+  gem 'rspec-rails', '~> 2.10.0'
   gem 'factory_girl_rails'
   gem 'thin'
-  gem "simplecov", :require => false
   gem "rspec-cells"
   gem "capybara"
   gem "sunspot-rails-tester"

Gemfile.lock

@@ -1,25 +1,3 @@
-GIT
-  remote: git://github.com/37signals/mail_view.git
-  revision: a99c2fc242fbb271a739a0934c59d4d66d3cf9c7
-  specs:
-    mail_view (1.0.1)
-      tilt
-
-GIT
-  remote: git://github.com/AgilionApps/quiet_assets.git
-  revision: b699ee6c8aac59dc2e1405e98aef82802e8b8098
-  specs:
-    quiet_assets (0.0.1)
-
-GIT
-  remote: git://github.com/ballantyne/omniauth-douban.git
-  revision: 7affc4a09216f1c82a271a691ade3ba990e20a24
-  specs:
-    omniauth-douban (1.0.0.rc2)
-      multi_json
-      omniauth (~> 1.0.0.rc2)
-      omniauth-oauth (~> 1.0.0.rc2)
-
 GIT
   remote: git://github.com/intridea/grape.git
   revision: d24bd2f758544244ac65f19c69b94f0ffc34e71b
@@ -32,14 +10,6 @@ GIT
       rack
       rack-mount
 
-GIT
-  remote: git://github.com/plataformatec/simple_form.git
-  revision: da92c45953e907aed0fbb1e38477d845a7c3bc11
-  specs:
-    simple_form (2.0.0.rc)
-      actionpack (~> 3.0)
-      activemodel (~> 3.0)
-
 GIT
   remote: git://github.com/xdite/bootstrap-rails.git
   revision: 7fe2d48ef0b01de7b16aa927465d83c768e3769e
@@ -129,7 +99,6 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.2.0)
-    daemon-spawn (0.4.2)
     daemons (1.1.6)
     dalli (1.1.1)
     devise (1.5.2)
@@ -157,14 +126,13 @@ GEM
     hike (1.2.1)
     hoe (2.14.0)
       rake (~> 0.8)
-    hpricot (0.8.5)
     i18n (0.6.0)
     journey (1.0.3)
     jquery-atwho-rails (0.1.3)
     jquery-rails (1.0.16)
       railties (~> 3.0)
       thor (~> 0.14)
-    json (1.6.5)
+    json (1.7.3)
     kgio (2.6.0)
     mail (2.4.1)
       i18n (>= 0.4.0)
@@ -201,7 +169,6 @@ GEM
     net-ssh-gateway (1.1.0)
       net-ssh (>= 1.99.1)
     nokogiri (1.5.2)
-    oauth (0.4.5)
     oauth2 (0.5.1)
       faraday (~> 0.7.4)
       multi_json (~> 1.0.3)
@@ -211,30 +178,21 @@ GEM
     omniauth-github (1.0.0)
       omniauth (~> 1.0)
       omniauth-oauth2 (~> 1.0)
-    omniauth-oauth (1.0.0)
-      oauth
-      omniauth (~> 1.0)
     omniauth-oauth2 (1.0.0)
       oauth2 (~> 0.5.0)
       omniauth (~> 1.0)
-    omniauth-openid (1.0.1)
-      omniauth (~> 1.0)
-      rack-openid (~> 1.3.1)
-    omniauth-twitter (0.0.7)
-      omniauth-oauth (~> 1.0)
     orm_adapter (0.0.5)
     polyglot (0.3.3)
     pr_geohash (1.0.0)
     pygments.rb (0.2.4)
       rubypython (~> 0.5.3)
+    quiet_assets (1.0.1)
+      railties (~> 3.1)
     rack (1.4.1)
-    rack-cache (1.1)
+    rack-cache (1.2)
       rack (>= 0.4)
     rack-mount (0.8.3)
       rack (>= 1.0.0)
-    rack-openid (1.3.1)
-      rack (>= 1.1.0)
-      ruby-openid (>= 2.1.8)
     rack-protection (1.2.0)
       rack
     rack-ssl (1.3.2)
@@ -282,28 +240,27 @@ GEM
       mime-types (>= 1.16)
     rsolr (1.0.8)
       builder (>= 2.1.2)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
+    rspec (2.10.0)
+      rspec-core (~> 2.10.0)
+      rspec-expectations (~> 2.10.0)
+      rspec-mocks (~> 2.10.0)
     rspec-cells (0.1.2)
       cells (~> 3.4)
       rails (~> 3.0)
       rspec-rails (~> 2.2)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
-    rspec-rails (2.8.1)
+    rspec-core (2.10.0)
+    rspec-expectations (2.10.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.10.1)
+    rspec-rails (2.10.1)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec (~> 2.8.0)
+      rspec (~> 2.10.0)
     ruby-github (0.0.3)
       hoe (>= 1.5.1)
       json
       mash (>= 0.0.3)
-    ruby-openid (2.1.8)
     rubypython (0.5.3)
       blankslate (>= 2.1.2.3)
       ffi (~> 1.0.7)
@@ -319,17 +276,16 @@ GEM
       multi_json (~> 1.0.4)
       rubyzip
     settingslogic (2.0.6)
-    simplecov (0.5.4)
-      multi_json (~> 1.0.3)
-      simplecov-html (~> 0.5.3)
-    simplecov-html (0.5.3)
+    simple_form (2.0.2)
+      actionpack (~> 3.0)
+      activemodel (~> 3.0)
     sinatra (1.3.2)
       rack (~> 1.3, >= 1.3.6)
       rack-protection (~> 1.2)
       tilt (~> 1.3, >= 1.3.3)
     social-share-button (0.0.3)
     sprite-factory (1.4.1)
-    sprockets (2.1.2)
+    sprockets (2.1.3)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
@@ -387,15 +343,12 @@ DEPENDENCIES
   cells (= 3.7.1)
   chunky_png (= 1.2.5)
   coffee-rails (~> 3.2.1)
-  daemon-spawn
   dalli (= 1.1.1)
   devise (= 1.5.2)
   factory_girl_rails
   grape!
-  hpricot (~> 0.8.5)
   jquery-atwho-rails (= 0.1.3)
   jquery-rails (= 1.0.16)
-  mail_view!
   memcache-client (= 1.8.5)
   mini_magick (= 3.3)
   mongo-rails-instrumentation (= 0.2.4)
@@ -404,12 +357,9 @@ DEPENDENCIES
   mongoid_colored_logger (= 0.1.1)
   mongoid_rails_migrations (~> 0.0.14)
   omniauth (~> 1.0.1)
-  omniauth-douban!
   omniauth-github (~> 1.0.0)
-  omniauth-openid (~> 1.0.1)
-  omniauth-twitter (~> 0.0.7)
   pygments.rb (~> 0.2.4)
-  quiet_assets!
+  quiet_assets (= 1.0.1)
   rails (= 3.2.2)
   rails-i18n (= 0.1.8)
   rails_autolink (>= 1.0.4)
@@ -419,12 +369,11 @@ DEPENDENCIES
   resque (~> 1.20.0)
   resque_mailer (= 2.0.2)
   rspec-cells
-  rspec-rails (~> 2.8.1)
+  rspec-rails (~> 2.10.0)
   ruby-github
   sass-rails (~> 3.2.3)
   settingslogic (~> 2.0.6)
-  simple_form!
-  simplecov
+  simple_form (= 2.0.2)
   social-share-button (~> 0.0.3)
   sprite-factory (= 1.4.1)
   sunspot-rails-tester

app/mailers/user_mailer.rb

@@ -5,11 +5,4 @@ def welcome(user_id)
     return false if @user.blank?
     mail(:to => @user.email, :subject => "#{t("mail.welcome_subject", :app_name => Setting.app_name)}")
   end
-
-  class Preview < MailView
-    # Pull data from existing fixtures
-    def welcome
-      ::UserMailer.welcome(User.last.id)
-    end
-  end
 end

app/views/cpanel/comments/_form.html.erb

@@ -1,4 +1,4 @@
-<%= simple_form_for([:cpanel,@comment], :wrapper => :inline) do |f| %>
+<%= simple_form_for([:cpanel,@comment]) do |f| %>
   <fieldset>
     <legend>Edit Comment</legend>
     <%= render "/shared/error_messages", :target => @comment %>

app/views/cpanel/locations/_form.html.erb

@@ -1,6 +1,6 @@
 <div id="cpanel_location" class="form">
 
-<%= simple_form_for([:cpanel,@location], :wrapper => :inline ) do |f| %>
+<%= simple_form_for([:cpanel,@location]) do |f| %>
   <%= render "/shared/error_messages", :target => @location  %>
   <fieldset>
     <legend><%= t("common.edit") %></legend>

app/views/cpanel/site_nodes/_form.html.erb

@@ -1,6 +1,6 @@
 <div id="cpanel_site_node" class="form">
 
-<%= simple_form_for([:cpanel,@site_node], :wrapper => :inline ) do |f| %>
+<%= simple_form_for([:cpanel,@site_node]) do |f| %>
   <%= render "/shared/error_messages", :target => @site_node  %>
   <fieldset>
     <legend><%= t("common.edit") %></legend>

app/views/cpanel/sites/_form.html.erb

@@ -1,6 +1,6 @@
 <div id="cpanel_site" class="form">
 
-<%= simple_form_for([:cpanel,@site], :wrapper => :inline ) do |f| %>
+<%= simple_form_for([:cpanel,@site]) do |f| %>
   <%= render "/shared/error_messages", :target => @site  %>
   <fieldset>
     <legend><%= t("common.edit") %></legend>

app/views/cpanel/users/_form.html.erb

@@ -1,4 +1,4 @@
-<%= simple_form_for([:cpanel,@user], :html => { :enctype =>  "multipart/form-data" }, :wrapper => :inline) do |f| %>
+<%= simple_form_for([:cpanel,@user]) do |f| %>
   <%= render 'shared/error_messages', :target => @user %>
   <%= f.input :login %>
   <%= f.input :name %>

app/views/pages/_form.html.erb

@@ -1,31 +1,32 @@
-<%= simple_form_for @page, :wrapper => :inline do |f| %>
-  <fieldset>
-    <legend><%= t("pages.edit_wiki_page")%></legend>
-    <%= render "shared/error_messages", :target => @page %>
+<%= simple_form_for @page do |f| %>
+<fieldset>
+  <legend><%= t("pages.edit_wiki_page")%></legend>
+  <%= render "shared/error_messages", :target => @page %>
 
-    <%= f.input :slug, :hint => "http://#{Setting.domain}/wiki/:slug"%>
-    <%= f.input :title, :input_html => { :class => "xxlarge" } %>
-    
-    <% if I18n.default_locale == "zh-CN" %>
-        <%= f.input :body, :as => :text,
-                    :input_html => { :class => "long", :rows => "30" },
-                    :hint => "请使用 Markdown 格式编写,可以试试用 <a href='http://mouapp.com' target='_blank'>Mou</a> 这个 App 来编写。".html_safe
-        %>
-    <% else %>
-        <%= f.input :body, :as => :text,
-                    :input_html => { :class => "long", :rows => "30" },
-                    :hint => "請使用 Markdown 格式編寫,可以試試用 <a href='http://mouapp.com' target='_blank'>Mou</a> 這個 App 来編寫。".html_safe
-        %>
-    <% end %>
+  <%= f.input :slug, :hint => "http://#{Setting.domain}/wiki/:slug"%>
+  <%= f.input :title, :input_html => { :class => "xxlarge" } %>
 
-    <% if not @page.new_record? %>
-      <%= f.input :change_desc , :as => :text,
-                  :input_html => { :class => "long", :rows => "2" },
-                  :hint => t("pages.describe_this_time_change")
-    %>
+  <% if I18n.default_locale == "zh-CN" %>
+  <%= f.input :body, :as => :text,
+              :input_html => { :class => "long", :rows => "30" },
+              :hint => "请使用 Markdown 格式编写,可以试试用 <a href='http://mouapp.com' target='_blank'>Mou</a> 这个 App 来编写。".html_safe
+  %>
+  <% else %>
+  <%= f.input :body, :as => :text,
+              :input_html => { :class => "long", :rows => "30" },
+              :hint => "請使用 Markdown 格式編寫,可以試試用 <a href='http://mouapp.com' target='_blank'>Mou</a> 這個 App 来編寫。".html_safe
+  %>
+  <% end %>
 
-    <% end %>
-    <div class="actions">
-      <%= f.submit t("common.save"), :class => "btn primary", :disable_with => t("common.saving") %>
-    </div>
+  <% if not @page.new_record? %>
+  <%= f.input :change_desc , :as => :text,
+              :input_html => { :class => "long", :rows => "2" },
+              :hint => t("pages.describe_this_time_change")
+  %>
+
+  <% end %>
+  <div class="actions">
+    <%= f.submit t("common.save"), :class => "btn primary", :disable_with => t("common.saving") %>
+  </div>
+</fieldset>
 <% end %>