From ae789b1d84ac214fcde8f1fde70fea32e7d5eca6 Mon Sep 17 00:00:00 2001 From: yuzai chen Date: Thu, 30 Jul 2009 13:01:48 +0800 Subject: [PATCH] migrate mailr 2.2.2 to 2.3.2 --- .gitignore | 1 + README | 2 +- ...plication.rb => application_controller.rb} | 0 .../controllers}/contact_group_controller.rb | 0 .../helpers}/contact_group_helper.rb | 0 .../contacts => app/models}/contact_group.rb | 0 .../views}/contact_group/edit.rhtml | 0 .../views}/contact_group/list.rhtml | 0 components/layouts/chooser.rhtml | 18 ------------- components/layouts/public.rhtml | 26 ------------------- config/environment.rb | 4 +-- {components => lib}/webmail/bounced_mail.rb | 0 {components => lib}/webmail/cdfmail.rb | 0 {components => lib}/webmail/environment.rb | 0 {components => lib}/webmail/expression.rb | 0 {components => lib}/webmail/filter.rb | 0 {components => lib}/webmail/imap_message.rb | 0 {components => lib}/webmail/imapmailbox.rb | 2 +- {components => lib}/webmail/mail2screen.rb | 0 {components => lib}/webmail/mail_transform.rb | 0 .../webmail/maildropserializator.rb | 0 {components => lib}/webmail/routes.rb | 0 {components => lib}/webmail/virtual_email.rb | 0 23 files changed, 5 insertions(+), 48 deletions(-) rename app/controllers/{application.rb => application_controller.rb} (100%) rename {components/contacts => app/controllers}/contact_group_controller.rb (100%) rename {components/contacts => app/helpers}/contact_group_helper.rb (100%) rename {components/contacts => app/models}/contact_group.rb (100%) rename {components/contacts => app/views}/contact_group/edit.rhtml (100%) rename {components/contacts => app/views}/contact_group/list.rhtml (100%) delete mode 100644 components/layouts/chooser.rhtml delete mode 100644 components/layouts/public.rhtml rename {components => lib}/webmail/bounced_mail.rb (100%) rename {components => lib}/webmail/cdfmail.rb (100%) rename {components => lib}/webmail/environment.rb (100%) rename {components => lib}/webmail/expression.rb (100%) rename {components => lib}/webmail/filter.rb (100%) rename {components => lib}/webmail/imap_message.rb (100%) rename {components => lib}/webmail/imapmailbox.rb (99%) rename {components => lib}/webmail/mail2screen.rb (100%) rename {components => lib}/webmail/mail_transform.rb (100%) rename {components => lib}/webmail/maildropserializator.rb (100%) rename {components => lib}/webmail/routes.rb (100%) rename {components => lib}/webmail/virtual_email.rb (100%) diff --git a/.gitignore b/.gitignore index 6d57af1..38c4877 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ config/database.yml config/site.rb tmp mail_temp +config/site.rb diff --git a/README b/README index 0030f04..f9f4036 100644 --- a/README +++ b/README @@ -3,7 +3,7 @@ Installation Guide Requirements * Ruby 1.8.7 - * Rails 2.2.2 + * Rails 2.3.2 Installation diff --git a/app/controllers/application.rb b/app/controllers/application_controller.rb similarity index 100% rename from app/controllers/application.rb rename to app/controllers/application_controller.rb diff --git a/components/contacts/contact_group_controller.rb b/app/controllers/contact_group_controller.rb similarity index 100% rename from components/contacts/contact_group_controller.rb rename to app/controllers/contact_group_controller.rb diff --git a/components/contacts/contact_group_helper.rb b/app/helpers/contact_group_helper.rb similarity index 100% rename from components/contacts/contact_group_helper.rb rename to app/helpers/contact_group_helper.rb diff --git a/components/contacts/contact_group.rb b/app/models/contact_group.rb similarity index 100% rename from components/contacts/contact_group.rb rename to app/models/contact_group.rb diff --git a/components/contacts/contact_group/edit.rhtml b/app/views/contact_group/edit.rhtml similarity index 100% rename from components/contacts/contact_group/edit.rhtml rename to app/views/contact_group/edit.rhtml diff --git a/components/contacts/contact_group/list.rhtml b/app/views/contact_group/list.rhtml similarity index 100% rename from components/contacts/contact_group/list.rhtml rename to app/views/contact_group/list.rhtml diff --git a/components/layouts/chooser.rhtml b/components/layouts/chooser.rhtml deleted file mode 100644 index ffe7b25..0000000 --- a/components/layouts/chooser.rhtml +++ /dev/null @@ -1,18 +0,0 @@ - - - -<%=@title%> - - - - - -<%=@additional_scripts%> - - -<%= @content_for_layout %> - - - - diff --git a/components/layouts/public.rhtml b/components/layouts/public.rhtml deleted file mode 100644 index a69afb1..0000000 --- a/components/layouts/public.rhtml +++ /dev/null @@ -1,26 +0,0 @@ - - - - <%=_('Mailr')%> - - - - - - - <%=(@content_for_scripts ? @content_for_scripts : @additional_scripts )%> - - -
-
-
<%= link_to _('[Logout]'), :controller=>'/login', :action=>'logout' %>
- -
<%= @content_for_layout %>
-
-
-
- - diff --git a/config/environment.rb b/config/environment.rb index 679cefa..7ef1a4e 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -4,7 +4,7 @@ # (Use only when you can't set environment variables through your web/app server) # ENV['RAILS_ENV'] = 'production' -RAILS_GEM_VERSION = '2.2.2' unless defined? RAILS_GEM_VERSION +RAILS_GEM_VERSION = '2.3.2' unless defined? RAILS_GEM_VERSION # Bootstrap the Rails environment, frameworks, and default configuration require File.join(File.dirname(__FILE__), 'boot') @@ -15,7 +15,7 @@ Rails::Initializer.run do |config| # Add additional load paths for your own custom dirs config.load_paths += %W( #{RAILS_ROOT}/vendor/ezcrypto-0.1.1/lib ) - + config.load_paths += %W( #{RAILS_ROOT}/lib/webmail ) # Force all environments to use the same logger level # (by default production uses :info, the others :debug) # config.log_level = :debug diff --git a/components/webmail/bounced_mail.rb b/lib/webmail/bounced_mail.rb similarity index 100% rename from components/webmail/bounced_mail.rb rename to lib/webmail/bounced_mail.rb diff --git a/components/webmail/cdfmail.rb b/lib/webmail/cdfmail.rb similarity index 100% rename from components/webmail/cdfmail.rb rename to lib/webmail/cdfmail.rb diff --git a/components/webmail/environment.rb b/lib/webmail/environment.rb similarity index 100% rename from components/webmail/environment.rb rename to lib/webmail/environment.rb diff --git a/components/webmail/expression.rb b/lib/webmail/expression.rb similarity index 100% rename from components/webmail/expression.rb rename to lib/webmail/expression.rb diff --git a/components/webmail/filter.rb b/lib/webmail/filter.rb similarity index 100% rename from components/webmail/filter.rb rename to lib/webmail/filter.rb diff --git a/components/webmail/imap_message.rb b/lib/webmail/imap_message.rb similarity index 100% rename from components/webmail/imap_message.rb rename to lib/webmail/imap_message.rb diff --git a/components/webmail/imapmailbox.rb b/lib/webmail/imapmailbox.rb similarity index 99% rename from components/webmail/imapmailbox.rb rename to lib/webmail/imapmailbox.rb index 5c29881..8b5949f 100644 --- a/components/webmail/imapmailbox.rb +++ b/lib/webmail/imapmailbox.rb @@ -135,7 +135,7 @@ class IMAPMailbox def disconnect if @connected @imap.logout - @imap.disconnect + #@imap.disconnect @imap = nil @connected = false end diff --git a/components/webmail/mail2screen.rb b/lib/webmail/mail2screen.rb similarity index 100% rename from components/webmail/mail2screen.rb rename to lib/webmail/mail2screen.rb diff --git a/components/webmail/mail_transform.rb b/lib/webmail/mail_transform.rb similarity index 100% rename from components/webmail/mail_transform.rb rename to lib/webmail/mail_transform.rb diff --git a/components/webmail/maildropserializator.rb b/lib/webmail/maildropserializator.rb similarity index 100% rename from components/webmail/maildropserializator.rb rename to lib/webmail/maildropserializator.rb diff --git a/components/webmail/routes.rb b/lib/webmail/routes.rb similarity index 100% rename from components/webmail/routes.rb rename to lib/webmail/routes.rb diff --git a/components/webmail/virtual_email.rb b/lib/webmail/virtual_email.rb similarity index 100% rename from components/webmail/virtual_email.rb rename to lib/webmail/virtual_email.rb