aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2018-09-28 12:19:43 -0700
committerDavid Heinemeier Hansson <david@loudthinking.com>2018-09-28 12:19:43 -0700
commit8a0a1034955544ee2e4c1f85317c0db84f3aa55b (patch)
tree1e00acdce252b2ce505ff2e8f9f5acd4ba19bbeb /app
parent5ad0813322820a6c42d7b3074531ac40108bfb69 (diff)
downloadrails-8a0a1034955544ee2e4c1f85317c0db84f3aa55b.tar.gz
rails-8a0a1034955544ee2e4c1f85317c0db84f3aa55b.tar.bz2
rails-8a0a1034955544ee2e4c1f85317c0db84f3aa55b.zip
ActionMailroom -> ActionMailbox
We didn't end up using the mailroom metaphor directly, so let's stick with a more conventional naming strategy.
Diffstat (limited to 'app')
-rw-r--r--app/.DS_Storebin0 -> 6148 bytes
-rw-r--r--app/controllers/.DS_Storebin0 -> 6148 bytes
-rw-r--r--app/controllers/action_mailbox/inbound_emails_controller.rb (renamed from app/controllers/action_mailroom/inbound_emails_controller.rb)4
-rw-r--r--app/controllers/rails/.DS_Storebin0 -> 6148 bytes
-rw-r--r--app/controllers/rails/conductor/action_mailbox/inbound_emails_controller.rb (renamed from app/controllers/rails/conductor/action_mailroom/inbound_emails_controller.rb)8
-rw-r--r--app/controllers/rails/conductor/action_mailbox/reroutes_controller.rb (renamed from app/controllers/rails/conductor/action_mailroom/reroutes_controller.rb)4
-rw-r--r--app/jobs/.DS_Storebin0 -> 6148 bytes
-rw-r--r--app/jobs/action_mailbox/inbound_email/incineration_job.rb11
-rw-r--r--app/jobs/action_mailbox/routing_job.rb7
-rw-r--r--app/jobs/action_mailroom/inbound_email/incineration_job.rb11
-rw-r--r--app/jobs/action_mailroom/routing_job.rb7
-rw-r--r--app/models/.DS_Storebin0 -> 6148 bytes
-rw-r--r--app/models/action_mailbox/inbound_email.rb (renamed from app/models/action_mailroom/inbound_email.rb)4
-rw-r--r--app/models/action_mailbox/inbound_email/incineratable.rb (renamed from app/models/action_mailroom/inbound_email/incineratable.rb)4
-rw-r--r--app/models/action_mailbox/inbound_email/incineratable/incineration.rb (renamed from app/models/action_mailroom/inbound_email/incineratable/incineration.rb)4
-rw-r--r--app/models/action_mailbox/inbound_email/message_id.rb (renamed from app/models/action_mailroom/inbound_email/message_id.rb)2
-rw-r--r--app/models/action_mailbox/inbound_email/routable.rb (renamed from app/models/action_mailroom/inbound_email/routable.rb)4
-rw-r--r--app/views/.DS_Storebin0 -> 6148 bytes
-rw-r--r--app/views/layouts/.DS_Storebin0 -> 6148 bytes
-rw-r--r--app/views/rails/.DS_Storebin0 -> 6148 bytes
-rw-r--r--app/views/rails/conductor/.DS_Storebin0 -> 6148 bytes
-rw-r--r--app/views/rails/conductor/action_mailbox/inbound_emails/index.html.erb (renamed from app/views/rails/conductor/action_mailroom/inbound_emails/index.html.erb)0
-rw-r--r--app/views/rails/conductor/action_mailbox/inbound_emails/new.html.erb (renamed from app/views/rails/conductor/action_mailroom/inbound_emails/new.html.erb)0
-rw-r--r--app/views/rails/conductor/action_mailbox/inbound_emails/show.html.erb (renamed from app/views/rails/conductor/action_mailroom/inbound_emails/show.html.erb)0
24 files changed, 35 insertions, 35 deletions
diff --git a/app/.DS_Store b/app/.DS_Store
new file mode 100644
index 0000000000..6719b65737
--- /dev/null
+++ b/app/.DS_Store
Binary files differ
diff --git a/app/controllers/.DS_Store b/app/controllers/.DS_Store
new file mode 100644
index 0000000000..ea1205963a
--- /dev/null
+++ b/app/controllers/.DS_Store
Binary files differ
diff --git a/app/controllers/action_mailroom/inbound_emails_controller.rb b/app/controllers/action_mailbox/inbound_emails_controller.rb
index 57e0530ac6..ec9bd6f229 100644
--- a/app/controllers/action_mailroom/inbound_emails_controller.rb
+++ b/app/controllers/action_mailbox/inbound_emails_controller.rb
@@ -1,12 +1,12 @@
# TODO: Add access protection using basic auth with verified tokens. Maybe coming from credentials by default?
# TODO: Spam/malware catching?
# TODO: Specific bounces for SMTP good citizenship: 200/404/400
-class ActionMailroom::InboundEmailsController < ActionController::Base
+class ActionMailbox::InboundEmailsController < ActionController::Base
skip_forgery_protection
before_action :require_rfc822_message, only: :create
def create
- ActionMailroom::InboundEmail.create_and_extract_message_id!(params[:message])
+ ActionMailbox::InboundEmail.create_and_extract_message_id!(params[:message])
head :created
end
diff --git a/app/controllers/rails/.DS_Store b/app/controllers/rails/.DS_Store
new file mode 100644
index 0000000000..627263b12d
--- /dev/null
+++ b/app/controllers/rails/.DS_Store
Binary files differ
diff --git a/app/controllers/rails/conductor/action_mailroom/inbound_emails_controller.rb b/app/controllers/rails/conductor/action_mailbox/inbound_emails_controller.rb
index a5a1f34929..70537da9c4 100644
--- a/app/controllers/rails/conductor/action_mailroom/inbound_emails_controller.rb
+++ b/app/controllers/rails/conductor/action_mailbox/inbound_emails_controller.rb
@@ -1,13 +1,13 @@
-class Rails::Conductor::ActionMailroom::InboundEmailsController < Rails::Conductor::BaseController
+class Rails::Conductor::ActionMailbox::InboundEmailsController < Rails::Conductor::BaseController
def index
- @inbound_emails = ActionMailroom::InboundEmail.order(created_at: :desc)
+ @inbound_emails = ActionMailbox::InboundEmail.order(created_at: :desc)
end
def new
end
def show
- @inbound_email = ActionMailroom::InboundEmail.find(params[:id])
+ @inbound_email = ActionMailbox::InboundEmail.find(params[:id])
end
def create
@@ -21,7 +21,7 @@ class Rails::Conductor::ActionMailroom::InboundEmailsController < Rails::Conduct
end
def create_inbound_email(mail)
- ActionMailroom::InboundEmail.create! raw_email: \
+ ActionMailbox::InboundEmail.create! raw_email: \
{ io: StringIO.new(mail.to_s), filename: 'inbound.eml', content_type: 'message/rfc822', identify: false }
end
end
diff --git a/app/controllers/rails/conductor/action_mailroom/reroutes_controller.rb b/app/controllers/rails/conductor/action_mailbox/reroutes_controller.rb
index 028ed9e2d6..226116a3d6 100644
--- a/app/controllers/rails/conductor/action_mailroom/reroutes_controller.rb
+++ b/app/controllers/rails/conductor/action_mailbox/reroutes_controller.rb
@@ -1,6 +1,6 @@
-class Rails::Conductor::ActionMailroom::ReroutesController < Rails::Conductor::BaseController
+class Rails::Conductor::ActionMailbox::ReroutesController < Rails::Conductor::BaseController
def create
- inbound_email = ActionMailroom::InboundEmail.find(params[:inbound_email_id])
+ inbound_email = ActionMailbox::InboundEmail.find(params[:inbound_email_id])
reroute inbound_email
redirect_to main_app.rails_conductor_inbound_email_url(inbound_email)
diff --git a/app/jobs/.DS_Store b/app/jobs/.DS_Store
new file mode 100644
index 0000000000..4f6e8d17e4
--- /dev/null
+++ b/app/jobs/.DS_Store
Binary files differ
diff --git a/app/jobs/action_mailbox/inbound_email/incineration_job.rb b/app/jobs/action_mailbox/inbound_email/incineration_job.rb
new file mode 100644
index 0000000000..a2911efef1
--- /dev/null
+++ b/app/jobs/action_mailbox/inbound_email/incineration_job.rb
@@ -0,0 +1,11 @@
+class ActionMailbox::InboundEmail::IncinerationJob < ApplicationJob
+ queue_as :action_mailbox_incineration
+
+ def self.schedule(inbound_email)
+ set(wait: ActionMailbox::InboundEmail::Incineratable::INCINERATABLE_AFTER).perform_later(inbound_email)
+ end
+
+ def perform(inbound_email)
+ inbound_email.incinerate
+ end
+end
diff --git a/app/jobs/action_mailbox/routing_job.rb b/app/jobs/action_mailbox/routing_job.rb
new file mode 100644
index 0000000000..a2618bb8aa
--- /dev/null
+++ b/app/jobs/action_mailbox/routing_job.rb
@@ -0,0 +1,7 @@
+class ActionMailbox::RoutingJob < ActiveJob::Base
+ queue_as :action_mailbox_routing
+
+ def perform(inbound_email)
+ ApplicationMailbox.route inbound_email
+ end
+end
diff --git a/app/jobs/action_mailroom/inbound_email/incineration_job.rb b/app/jobs/action_mailroom/inbound_email/incineration_job.rb
deleted file mode 100644
index fa1d346008..0000000000
--- a/app/jobs/action_mailroom/inbound_email/incineration_job.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-class ActionMailroom::InboundEmail::IncinerationJob < ApplicationJob
- queue_as :action_mailroom_incineration
-
- def self.schedule(inbound_email)
- set(wait: ActionMailroom::InboundEmail::Incineratable::INCINERATABLE_AFTER).perform_later(inbound_email)
- end
-
- def perform(inbound_email)
- inbound_email.incinerate
- end
-end
diff --git a/app/jobs/action_mailroom/routing_job.rb b/app/jobs/action_mailroom/routing_job.rb
deleted file mode 100644
index 85a3c7ab00..0000000000
--- a/app/jobs/action_mailroom/routing_job.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-class ActionMailroom::RoutingJob < ActiveJob::Base
- queue_as :action_mailroom_routing
-
- def perform(inbound_email)
- ApplicationMailbox.route inbound_email
- end
-end
diff --git a/app/models/.DS_Store b/app/models/.DS_Store
new file mode 100644
index 0000000000..4f6e8d17e4
--- /dev/null
+++ b/app/models/.DS_Store
Binary files differ
diff --git a/app/models/action_mailroom/inbound_email.rb b/app/models/action_mailbox/inbound_email.rb
index cf7370d543..f2589d7429 100644
--- a/app/models/action_mailroom/inbound_email.rb
+++ b/app/models/action_mailbox/inbound_email.rb
@@ -1,7 +1,7 @@
require "mail"
-class ActionMailroom::InboundEmail < ActiveRecord::Base
- self.table_name = "action_mailroom_inbound_emails"
+class ActionMailbox::InboundEmail < ActiveRecord::Base
+ self.table_name = "action_mailbox_inbound_emails"
include Incineratable, MessageId, Routable
diff --git a/app/models/action_mailroom/inbound_email/incineratable.rb b/app/models/action_mailbox/inbound_email/incineratable.rb
index 83ccec89ba..6ba73c0c6d 100644
--- a/app/models/action_mailroom/inbound_email/incineratable.rb
+++ b/app/models/action_mailbox/inbound_email/incineratable.rb
@@ -1,4 +1,4 @@
-module ActionMailroom::InboundEmail::Incineratable
+module ActionMailbox::InboundEmail::Incineratable
extend ActiveSupport::Concern
# TODO: Extract into framework configuration
@@ -26,6 +26,6 @@ module ActionMailroom::InboundEmail::Incineratable
end
def incinerate_later
- ActionMailroom::InboundEmail::IncinerationJob.schedule(self)
+ ActionMailbox::InboundEmail::IncinerationJob.schedule(self)
end
end
diff --git a/app/models/action_mailroom/inbound_email/incineratable/incineration.rb b/app/models/action_mailbox/inbound_email/incineratable/incineration.rb
index 8b88c1fc5b..bd2bf7d91e 100644
--- a/app/models/action_mailroom/inbound_email/incineratable/incineration.rb
+++ b/app/models/action_mailbox/inbound_email/incineratable/incineration.rb
@@ -1,4 +1,4 @@
-class ActionMailroom::InboundEmail::Incineratable::Incineration
+class ActionMailbox::InboundEmail::Incineratable::Incineration
def initialize(inbound_email)
@inbound_email = inbound_email
end
@@ -9,7 +9,7 @@ class ActionMailroom::InboundEmail::Incineratable::Incineration
private
def due?
- @inbound_email.updated_at < ActionMailroom::InboundEmail::Incineratable::INCINERATABLE_AFTER.ago.end_of_day
+ @inbound_email.updated_at < ActionMailbox::InboundEmail::Incineratable::INCINERATABLE_AFTER.ago.end_of_day
end
def processed?
diff --git a/app/models/action_mailroom/inbound_email/message_id.rb b/app/models/action_mailbox/inbound_email/message_id.rb
index 6bdda8c1c7..590dbfc4d7 100644
--- a/app/models/action_mailroom/inbound_email/message_id.rb
+++ b/app/models/action_mailbox/inbound_email/message_id.rb
@@ -1,4 +1,4 @@
-module ActionMailroom::InboundEmail::MessageId
+module ActionMailbox::InboundEmail::MessageId
extend ActiveSupport::Concern
included do
diff --git a/app/models/action_mailroom/inbound_email/routable.rb b/app/models/action_mailbox/inbound_email/routable.rb
index 5075db326e..1928f9e387 100644
--- a/app/models/action_mailroom/inbound_email/routable.rb
+++ b/app/models/action_mailbox/inbound_email/routable.rb
@@ -1,4 +1,4 @@
-module ActionMailroom::InboundEmail::Routable
+module ActionMailbox::InboundEmail::Routable
extend ActiveSupport::Concern
included do
@@ -6,6 +6,6 @@ module ActionMailroom::InboundEmail::Routable
end
def route_later
- ActionMailroom::RoutingJob.perform_later self
+ ActionMailbox::RoutingJob.perform_later self
end
end
diff --git a/app/views/.DS_Store b/app/views/.DS_Store
new file mode 100644
index 0000000000..bedd266c7a
--- /dev/null
+++ b/app/views/.DS_Store
Binary files differ
diff --git a/app/views/layouts/.DS_Store b/app/views/layouts/.DS_Store
new file mode 100644
index 0000000000..5de81d0983
--- /dev/null
+++ b/app/views/layouts/.DS_Store
Binary files differ
diff --git a/app/views/rails/.DS_Store b/app/views/rails/.DS_Store
new file mode 100644
index 0000000000..627263b12d
--- /dev/null
+++ b/app/views/rails/.DS_Store
Binary files differ
diff --git a/app/views/rails/conductor/.DS_Store b/app/views/rails/conductor/.DS_Store
new file mode 100644
index 0000000000..4f6e8d17e4
--- /dev/null
+++ b/app/views/rails/conductor/.DS_Store
Binary files differ
diff --git a/app/views/rails/conductor/action_mailroom/inbound_emails/index.html.erb b/app/views/rails/conductor/action_mailbox/inbound_emails/index.html.erb
index 19c53984e2..19c53984e2 100644
--- a/app/views/rails/conductor/action_mailroom/inbound_emails/index.html.erb
+++ b/app/views/rails/conductor/action_mailbox/inbound_emails/index.html.erb
diff --git a/app/views/rails/conductor/action_mailroom/inbound_emails/new.html.erb b/app/views/rails/conductor/action_mailbox/inbound_emails/new.html.erb
index be989ff0bc..be989ff0bc 100644
--- a/app/views/rails/conductor/action_mailroom/inbound_emails/new.html.erb
+++ b/app/views/rails/conductor/action_mailbox/inbound_emails/new.html.erb
diff --git a/app/views/rails/conductor/action_mailroom/inbound_emails/show.html.erb b/app/views/rails/conductor/action_mailbox/inbound_emails/show.html.erb
index e761904196..e761904196 100644
--- a/app/views/rails/conductor/action_mailroom/inbound_emails/show.html.erb
+++ b/app/views/rails/conductor/action_mailbox/inbound_emails/show.html.erb