Merge a08775b into 5185a20

.env.test

@@ -0,0 +1 @@
+export HYRAX_HOST=localhost

.gitignore

@@ -38,3 +38,7 @@ coverage
 
 # Ignore local browse-everything configs
 config/browse_everything_providers.yml
+
+
+# Don't check dotenv files into github
+.env

Gemfile

@@ -10,7 +10,8 @@ gem 'clamby', '>= 1.2.5'
 gem 'coffee-rails'
 gem 'devise'
 gem 'devise-guests', '~> 0.5'
-
+gem 'dotenv'
+gem 'dotenv-rails'
 gem 'factory_girl_rails' # Needed so we can load fixtures for demos in production
 gem 'ffaker' # Needed so we can load fixtures for demos in production
 gem 'hydra-role-management'

Gemfile.lock

@@ -210,6 +210,10 @@ GEM
       devise
     diff-lcs (1.3)
     docile (1.1.5)
+    dotenv (2.2.1)
+    dotenv-rails (2.2.1)
+      dotenv (= 2.2.1)
+      railties (>= 3.2, < 5.2)
     dropbox-sdk (1.6.5)
       json
     dry-configurable (0.7.0)
@@ -902,6 +906,8 @@ DEPENDENCIES
   database_cleaner
   devise
   devise-guests (~> 0.5)
+  dotenv
+  dotenv-rails
   factory_girl_rails
   fcrepo_wrapper
   ffaker

app/mailers/test_mailer.rb

@@ -0,0 +1,10 @@
+class TestMailer < ApplicationMailer
+  def test_email
+    mail(
+      from: "bess@curationexperts.com",
+      to: "bess@curationexperts.com",
+      subject: "Test mail",
+      body: "Test mail body"
+    )
+  end
+end

app/models/user.rb

@@ -48,4 +48,10 @@ def self.from_omniauth(auth)
   def to_s
     uid
   end
+
+  # Mailboxer (the notification system) needs the User object to respond to this method
+  # in order to send emails
+  def mailboxer_email(_object)
+    email
+  end
 end

app/services/hyrax/workflow/approved_notification.rb

@@ -7,15 +7,20 @@ def workflow_recipients
         { "to" => (approvers << depositor) }
       end
 
-      private
+      def subject
+        "Deposit #{title} has been approved"
+      end
+
+      def message
+        "The work titled \"#{title}\" has been approved by #{user.display_name}.
 
-        def subject
-          "Deposit #{title} has been approved"
-        end
+        Comments (if any):
+         #{comment}
 
-        def message
-          "#{title} (#{link_to work_id, document_path}) has been approved by #{user.display_name}  #{comment}"
-        end
+         You can view the work in the Emory Electronic Thesis and Dissertation system at
+         #{link_to document_url, document_url}
+      "
+      end
     end
   end
 end

app/services/hyrax/workflow/changes_required_notification.rb

@@ -7,15 +7,13 @@ def workflow_recipients
         { "to" => (approvers << depositor) }
       end
 
-      protected
-
-        def subject
-          "Deposit #{title} requires changes"
-        end
+      def subject
+        "Deposit #{title} requires changes"
+      end
 
-        def message
-          "#{title} (#{link_to work_id, document_path}) requires additional changes before approval.\n\n '#{comment}'"
-        end
+      def message
+        "#{title} (#{link_to work_id, document_url}) requires additional changes before approval.\n\n '#{comment}'"
+      end
     end
   end
 end

app/services/hyrax/workflow/comment_notification.rb

@@ -5,15 +5,13 @@ def workflow_recipients
         { "to" => (approvers << depositor) }
       end
 
-      private
-
-        def subject
-          'Comment on Deposit'
-        end
+      def subject
+        "Comment on Deposit"
+      end
 
-        def message
-          "#{user.display_name} has added a comment to #{title} (#{link_to work_id, document_path}) \n\n #{comment}"
-        end
+      def message
+        "#{user.display_name} has added a comment to #{title} (#{link_to work_id, document_url}): \n\n #{comment}"
+      end
     end
   end
 end

app/services/hyrax/workflow/degree_awarded_notification.rb

@@ -7,15 +7,13 @@ def workflow_recipients
         { "to" => (approvers << depositor) }
       end
 
-      private
-
-        def subject
-          "Degree awarded for #{title}"
-        end
+      def subject
+        "Degree awarded for #{title}"
+      end
 
-        def message
-          "The degree associated with #{title} (#{link_to work_id, document_path}) has been awarded."
-        end
+      def message
+        "The degree associated with #{title} (#{link_to work_id, document_url}) has been awarded."
+      end
     end
   end
 end

app/services/hyrax/workflow/hidden_notification.rb

@@ -5,19 +5,17 @@ def workflow_recipients
         { "to" => (approvers << depositor) }
       end
 
-      private
-
-        def subject
-          'Deposit has been hidden'
-        end
+      def subject
+        'Deposit has been hidden'
+      end
 
-        def message
-          "#{title} (#{link_to work_id, document_path}) was hidden by #{user.display_name}  #{comment}"
-        end
+      def message
+        "#{title} (#{link_to work_id, document_url}) was hidden by #{user.display_name}  #{comment}"
+      end
 
-        def users_to_notify
-          super << user
-        end
+      def users_to_notify
+        super << user
+      end
     end
   end
 end

app/services/hyrax/workflow/laevigata_notification.rb

@@ -14,6 +14,13 @@ def title
         original_title.length > max ? "#{original_title[0...max]}..." : original_title
       end
 
+      # Get the full URL for email notifications
+      # This should get pushed upstream to Hyrax
+      def document_url
+        key = document.model_name.singular_route_key
+        Rails.application.routes.url_helpers.send(key + "_url", document.id)
+      end
+
       def workflow_recipients
         raise NotImplementedError, "Implement workflow_recipients in a child class"
       end

app/services/hyrax/workflow/pending_approval_notification.rb

@@ -5,15 +5,13 @@ def workflow_recipients
         { "to" => (approvers << depositor) }
       end
 
-      private
-
-        def subject
-          "Deposit #{title} is awaiting approval"
-        end
+      def subject
+        "Deposit #{title} is awaiting approval"
+      end
 
-        def message
-          "#{title} (#{link_to work_id, document_path}) was deposited by #{user.display_name} and is awaiting approval. #{comment}"
-        end
+      def message
+        "#{title} (#{link_to work_id, document_url}) was deposited by #{user.display_name} and is awaiting approval. #{comment}"
+      end
     end
   end
 end

app/services/hyrax/workflow/pending_review_notification.rb

@@ -5,15 +5,13 @@ def workflow_recipients
         { "to" => (reviewers << depositor) }
       end
 
-      private
-
-        def subject
-          'Deposit needs review'
-        end
+      def subject
+        'Deposit needs review'
+      end
 
-        def message
-          "#{title} (#{link_to work_id, document_path}) was deposited by #{user.display_name} and is awaiting initial review. #{comment}"
-        end
+      def message
+        "#{title} (#{link_to work_id, document_url}) was deposited by #{user.display_name} and is awaiting initial review. #{comment}"
+      end
     end
   end
 end

app/services/hyrax/workflow/published_notification.rb

@@ -1,19 +1,17 @@
 module Hyrax
   module Workflow
     class PublishedNotification < AbstractNotification
-      private
+      def subject
+        'Deposit reviewed and published'
+      end
 
-        def subject
-          'Deposit reviewed and published'
-        end
+      def message
+        "#{title} (#{link_to work_id, document_url}) was published by #{user.display_name}  #{comment}"
+      end
 
-        def message
-          "#{title} (#{link_to work_id, document_path}) was published by #{user.display_name}  #{comment}"
-        end
-
-        def users_to_notify
-          super << user
-        end
+      def users_to_notify
+        super << user
+      end
     end
   end
 end

app/services/hyrax/workflow/reviewed_notification.rb

@@ -5,15 +5,13 @@ def workflow_recipients
         { "to" => (reviewers << depositor) }
       end
 
-      private
-
-        def subject
-          'Deposit reviewed and ready for final approval'
-        end
+      def subject
+        'Deposit reviewed and ready for final approval'
+      end
 
-        def message
-          "#{title} (#{link_to work_id, document_path}) has completed initial review and is awaiting final approval. #{comment}"
-        end
+      def message
+        "#{title} (#{link_to work_id, document_url}) has completed initial review and is awaiting final approval. #{comment}"
+      end
     end
   end
 end

app/services/hyrax/workflow/seven_day_embargo_notification.rb

@@ -14,7 +14,7 @@ def subject
       def message
         "Dear #{user.display_name},\n\n" \
         "The embargo on your dissertation or thesis, #{title}, will expire in seven days.\n" \
-        "Your dissertation or thesis can be accessed in the Emory University ETD Repository at: (#{link_to document_path, document_path}) \n\n" \
+        "Your dissertation or thesis can be accessed in the Emory University ETD Repository at: #{link_to document_url, document_url} \n\n" \
         "If you need your record to remain restricted/embargoed, please contact etd-help@listserv.cc.emory.edu<mailto:etd-help@listserv.cc.emory.edu> with your request. \n\n" \
         "Please do not reply directy to this email.\n\n" \
 

app/services/hyrax/workflow/sixty_day_embargo_notification.rb

@@ -14,7 +14,7 @@ def subject
       def message
         "Dear #{user.display_name},\n\n" \
         "The embargo on your dissertation or thesis, #{title}, will expire in sixty days.\n" \
-        "Your dissertation or thesis can be accessed in the Emory University ETD Repository at: (#{link_to document_path, document_path}) \n\n" \
+        "Your dissertation or thesis can be accessed in the Emory University ETD Repository at: #{link_to document_url, document_url} \n\n" \
         "If you need your record to remain restricted/embargoed, please contact etd-help@listserv.cc.emory.edu<mailto:etd-help@listserv.cc.emory.edu> with your request. \n\n" \
         "Please do not reply directy to this email.\n\n" \
 

app/services/hyrax/workflow/today_embargo_notification.rb

@@ -17,7 +17,7 @@ def message
         "The access restriction on your disseration or thesis, #{title}, expires today." \
         "We have not been informed that you wish to extend your access restriction period " \
         "and therefore your dissertation or thesis is now available in full text form in our repository.\n\n" \
-        "Your dissertation or thesis can be accessed in the Emory University ETD Repository at: (#{link_to document_path, document_path}) \n\n" \
+        "Your dissertation or thesis can be accessed in the Emory University ETD Repository at: #{link_to document_url, document_url} \n\n" \
         "If you need your record to remain restricted/embargoed, please contact etd-help@listserv.cc.emory.edu<mailto:etd-help@listserv.cc.emory.edu> with your request. \n\n" \
         "Please do not reply directy to this email.\n\n" \
 

app/services/hyrax/workflow/unhidden_notification.rb

@@ -5,15 +5,13 @@ def workflow_recipients
         { "to" => (approvers << depositor) }
       end
 
-      private
-
-        def subject
-          'Deposit has been unhidden'
-        end
+      def subject
+        'Deposit has been unhidden'
+      end
 
-        def message
-          "#{title} (#{link_to work_id, document_path}) was unhidden by #{user.display_name}  #{comment}"
-        end
+      def message
+        "#{title} (#{link_to work_id, document_url}) was unhidden by #{user.display_name}  #{comment}"
+      end
     end
   end
 end

app/services/hyrax/workflow/virus_encountered_notification.rb

@@ -7,16 +7,14 @@ def workflow_recipients
         { "to" => (approvers << depositor) }
       end
 
-      private
-
-        def subject
-          "Virus encountered in #{title}"
-        end
+      def subject
+        "Virus encountered in #{title}"
+      end
 
-        def message
-          "A virus has been detected in the work #{title} (#{link_to work_id, document_path}). " \
-          "The infected file has been deleted and a clean version will need to be resubmitted."
-        end
+      def message
+        "A virus has been detected in the work #{title} (#{link_to work_id, document_url}). " \
+        "The infected file has been deleted and a clean version will need to be resubmitted."
+      end
     end
   end
 end

config/application.rb

@@ -5,9 +5,10 @@
 # Require the gems listed in Gemfile, including any gems
 # you've limited to :test, :development, or :production.
 Bundler.require(*Rails.groups)
-
 module Laevigata
   class Application < Rails::Application
+    config.action_mailer.default_url_options = { host: ENV["HYRAX_HOST"] }
+    config.action_mailer.raise_delivery_errors = false
     # The compile method (default in tinymce-rails 4.5.2) doesn't work when also
     # using tinymce-rails-imageupload, so revert to the :copy method
     # https://github.com/spohlenz/tinymce-rails/issues/183
@@ -23,3 +24,4 @@ class Application < Rails::Application
     # -- all .rb files in that directory are automatically loaded.
   end
 end
+Rails.application.routes.default_url_options[:host] = ENV["HYRAX_HOST"]

config/initializers/mailboxer.rb

@@ -3,11 +3,11 @@
   config.uses_emails = true
 
   # Configures the default from for emails sent for Messages and Notifications
-  config.default_from = "no-reply@mailboxer.com"
+  config.default_from = "Emory ETD Service <etd@aws.emory.edu>"
 
   # Configures the methods needed by mailboxer
   config.email_method = :mailboxer_email
-  config.name_method = :name
+  config.name_method = :display_name
 
   # Configures if you use or not a search engine and which one you are using
   # Supported engines: [:solr,:sphinx]