sufia 3.1.0 → 3.2.1

data/spec/models/generic_file_spec.rb

@@ -90,22 +90,38 @@ describe GenericFile do
     end
   end
 
+  describe "visibility" do
+    it "should not be changed when it's new" do
+      subject.should_not be_visibility_changed
+    end
+    it "should be changed when it has been changed" do
+      subject.visibility= 'open'
+      subject.should be_visibility_changed
+    end
+
+    it "should not be changed when it's set to its previous value" do
+      subject.visibility= 'restricted'
+      subject.should_not be_visibility_changed
+    end
+
+  end
+
   describe "attributes" do
     it "should have rightsMetadata" do
-      @file.rightsMetadata.should be_instance_of ParanoidRightsDatastream
+      subject.rightsMetadata.should be_instance_of ParanoidRightsDatastream
     end
     it "should have properties datastream for depositor" do
-      @file.properties.should be_instance_of PropertiesDatastream
+      subject.properties.should be_instance_of PropertiesDatastream
     end
     it "should have apply_depositor_metadata" do
-      @file.rightsMetadata.edit_access.should == ['jcoyne']
-      @file.depositor.should == 'jcoyne'
+      subject.rightsMetadata.edit_access.should == ['jcoyne']
+      subject.depositor.should == 'jcoyne'
     end
     it "should have a set of permissions" do
-      @file.read_groups=['group1', 'group2']
-      @file.edit_users=['user1']
-      @file.read_users=['user2', 'user3']
-      @file.permissions.should == [{:type=>"group", :access=>"read", :name=>"group1"},
+      subject.read_groups=['group1', 'group2']
+      subject.edit_users=['user1']
+      subject.read_users=['user2', 'user3']
+      subject.permissions.should == [{:type=>"group", :access=>"read", :name=>"group1"},
           {:type=>"group", :access=>"read", :name=>"group2"},
           {:type=>"user", :access=>"read", :name=>"user2"},
           {:type=>"user", :access=>"read", :name=>"user3"},
@@ -113,51 +129,51 @@ describe GenericFile do
     end
     describe "updating permissions" do
       it "should create new group permissions" do
-        @file.permissions = {:new_group_name => {'group1'=>'read'}}
-        @file.permissions.should == [{:type=>"group", :access=>"read", :name=>"group1"},
+        subject.permissions = {:new_group_name => {'group1'=>'read'}}
+        subject.permissions.should == [{:type=>"group", :access=>"read", :name=>"group1"},
                                      {:type=>"user", :access=>"edit", :name=>"jcoyne"}]
       end
       it "should create new user permissions" do
-        @file.permissions = {:new_user_name => {'user1'=>'read'}}
-        @file.permissions.should == [{:type=>"user", :access=>"read", :name=>"user1"},
+        subject.permissions = {:new_user_name => {'user1'=>'read'}}
+        subject.permissions.should == [{:type=>"user", :access=>"read", :name=>"user1"},
                                      {:type=>"user", :access=>"edit", :name=>"jcoyne"}]
       end
       it "should not replace existing groups" do
-        @file.permissions = {:new_group_name=> {'group1' => 'read'}}
-        @file.permissions = {:new_group_name=> {'group2' => 'read'}}
-        @file.permissions.should == [{:type=>"group", :access=>"read", :name=>"group1"},
+        subject.permissions = {:new_group_name=> {'group1' => 'read'}}
+        subject.permissions = {:new_group_name=> {'group2' => 'read'}}
+        subject.permissions.should == [{:type=>"group", :access=>"read", :name=>"group1"},
                                      {:type=>"group", :access=>"read", :name=>"group2"},
                                      {:type=>"user", :access=>"edit", :name=>"jcoyne"}]
       end
       it "should not replace existing users" do
-        @file.permissions = {:new_user_name=>{'user1'=>'read'}}
-        @file.permissions = {:new_user_name=>{'user2'=>'read'}}
-        @file.permissions.should == [{:type=>"user", :access=>"read", :name=>"user1"},
+        subject.permissions = {:new_user_name=>{'user1'=>'read'}}
+        subject.permissions = {:new_user_name=>{'user2'=>'read'}}
+        subject.permissions.should == [{:type=>"user", :access=>"read", :name=>"user1"},
                                      {:type=>"user", :access=>"read", :name=>"user2"},
                                      {:type=>"user", :access=>"edit", :name=>"jcoyne"}]
       end
       it "should update permissions on existing users" do
-        @file.permissions = {:new_user_name=>{'user1'=>'read'}}
-        @file.permissions = {:user=>{'user1'=>'edit'}}
-        @file.permissions.should == [{:type=>"user", :access=>"edit", :name=>"user1"},
+        subject.permissions = {:new_user_name=>{'user1'=>'read'}}
+        subject.permissions = {:user=>{'user1'=>'edit'}}
+        subject.permissions.should == [{:type=>"user", :access=>"edit", :name=>"user1"},
                                      {:type=>"user", :access=>"edit", :name=>"jcoyne"}]
       end
       it "should update permissions on existing groups" do
-        @file.permissions = {:new_group_name=>{'group1'=>'read'}}
-        @file.permissions = {:group=>{'group1'=>'edit'}}
-        @file.permissions.should == [{:type=>"group", :access=>"edit", :name=>"group1"},
+        subject.permissions = {:new_group_name=>{'group1'=>'read'}}
+        subject.permissions = {:group=>{'group1'=>'edit'}}
+        subject.permissions.should == [{:type=>"group", :access=>"edit", :name=>"group1"},
                                      {:type=>"user", :access=>"edit", :name=>"jcoyne"}]
       end
     end
     it "should have a characterization datastream" do
-      @file.characterization.should be_kind_of FitsDatastream
+      subject.characterization.should be_kind_of FitsDatastream
     end
     it "should have a dc desc metadata" do
-      @file.descMetadata.should be_kind_of GenericFileRdfDatastream
+      subject.descMetadata.should be_kind_of GenericFileRdfDatastream
     end
     it "should have content datastream" do
-      @file.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
-      @file.content.should be_kind_of FileContentDatastream
+      subject.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
+      subject.content.should be_kind_of FileContentDatastream
     end
   end
   describe "delegations" do

data/spec/support/uploaded_file_monkeypatch.rb

@@ -1,17 +1,3 @@
-# Copyright © 2012 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 #Monkey patch UploadedFile so that it responds to read (same as ActionDispatch::Http::UploadedFile). Required by RestClient when posting to fedora.
 class Rack::Test::UploadedFile
   def read(*args)

data/sufia-models/app/models/batch.rb

@@ -1,17 +1,3 @@
-# Copyright © 2012 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 class Batch < ActiveFedora::Base
   include Hydra::ModelMixins::CommonMetadata
   include Hydra::ModelMixins::RightsMetadata

data/sufia-models/app/models/checksum_audit_log.rb

@@ -1,5 +1,5 @@
 class ChecksumAuditLog < ActiveRecord::Base
-  attr_accessible :pass, :pid, :dsid, :version, :created_at if Rails::VERSION::MAJOR == 3
+  deprecated_attr_accessible :pass, :pid, :dsid, :version, :created_at
 
   def ChecksumAuditLog.get_audit_log(version)
     ChecksumAuditLog.find_or_create_by_pid_and_dsid_and_version(:pid => version.pid,

data/sufia-models/app/models/concerns/sufia/models/access_right.rb

@@ -0,0 +1,79 @@
+module Sufia
+  module Models
+    class AccessRight
+      PERMISSION_TEXT_VALUE_PUBLIC = 'public'.freeze
+      PERMISSION_TEXT_VALUE_AUTHENTICATED = 'registered'.freeze
+      VISIBILITY_TEXT_VALUE_PUBLIC = 'open'.freeze
+      VISIBILITY_TEXT_VALUE_EMBARGO = 'open_with_embargo_release_date'.freeze
+      VISIBILITY_TEXT_VALUE_AUTHENTICATED = 'psu'.freeze
+      VISIBILITY_TEXT_VALUE_PRIVATE = 'restricted'.freeze
+
+      # @param permissionable [#visibility, #permissions]
+      # @example
+      #   file = GenericFile.find('sufia:1234')
+      #   access = Sufia::AccessRight.new(file)
+      def initialize(permissionable)
+        @permissionable = permissionable
+      end
+
+      attr_reader :permissionable
+      delegate :persisted?, :permissions, :visibility, to: :permissionable
+      protected :persisted?, :permissions, :visibility
+
+
+      def open_access?
+        return true if has_visibility_text_for?(VISIBILITY_TEXT_VALUE_PUBLIC)
+        # We don't want to know if its under embargo, simply does it have a date.
+        # In this way, we can properly inform the label input
+        persisted_open_access_permission? && !permissionable.embargo_release_date.present?
+      end
+
+      def open_access_with_embargo_release_date?
+        return false unless permissionable_is_embargoable?
+        return true if has_visibility_text_for?(VISIBILITY_TEXT_VALUE_EMBARGO)
+        # We don't want to know if its under embargo, simply does it have a date.
+        # In this way, we can properly inform the label input
+        persisted_open_access_permission? && permissionable.embargo_release_date.present?
+      end
+
+      def authenticated_only?
+        return false if open_access?
+        has_permission_text_for?(PERMISSION_TEXT_VALUE_AUTHENTICATED) ||
+          has_visibility_text_for?(VISIBILITY_TEXT_VALUE_AUTHENTICATED)
+      end
+
+      def private?
+        return false if open_access?
+        return false if authenticated_only?
+        return false if open_access_with_embargo_release_date?
+        true
+      end
+
+      private
+
+        def persisted_open_access_permission?
+          if persisted?
+            has_permission_text_for?(PERMISSION_TEXT_VALUE_PUBLIC)
+          else
+            visibility.to_s == ''
+          end
+        end
+
+        def on_or_after_any_embargo_release_date?
+          return true unless permissionable.embargo_release_date
+          permissionable.embargo_release_date.to_date < Date.today
+        end
+
+        def permissionable_is_embargoable?
+          permissionable.respond_to?(:embargo_release_date)
+        end
+
+        def has_visibility_text_for?(text)
+          visibility == text
+        end
+        def has_permission_text_for?(text)
+          !!permissions.detect { |perm| perm[:name] == text }
+        end
+    end
+  end
+end

data/sufia-models/app/models/concerns/sufia/models/with_access_right.rb

@@ -0,0 +1,33 @@
+module Sufia
+  module Models
+    module WithAccessRight
+      extend ActiveSupport::Concern
+
+      def under_embargo?
+        @under_embargo ||= rightsMetadata.under_embargo?
+      end
+
+      def open_access?
+        access_rights.open_access?
+      end
+
+      def open_access_with_embargo_release_date?
+        access_rights.open_access_with_embargo_release_date?
+      end
+
+      def authenticated_only_access?
+        access_rights.authenticated_only?
+      end
+
+      def private_access?
+        access_rights.private?
+      end
+
+      def access_rights
+        @access_rights ||= AccessRight.new(self)
+      end
+      protected :access_rights
+
+    end
+  end
+end

data/sufia-models/app/models/datastreams/batch_rdf_datastream.rb

@@ -1,17 +1,3 @@
-# Copyright © 2012 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 class BatchRdfDatastream < ActiveFedora::NtriplesRDFDatastream
   map_predicates do |map|
     map.part(:to => "hasPart", :in => RDF::DC)

data/sufia-models/app/models/datastreams/fits_datastream.rb

@@ -1,17 +1,3 @@
-# Copyright © 2012 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 class FitsDatastream < ActiveFedora::OmDatastream
   include OM::XML::Document
 

data/sufia-models/app/models/datastreams/generic_file_rdf_datastream.rb

@@ -1,17 +1,3 @@
-# Copyright © 2012 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 class GenericFileRdfDatastream < ActiveFedora::NtriplesRDFDatastream
   map_predicates do |map|
     map.part_of(:to => "isPartOf", :in => RDF::DC)

data/sufia-models/app/models/datastreams/properties_datastream.rb

@@ -1,17 +1,3 @@
-# Copyright © 2012 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 # properties datastream: catch-all for info that didn't have another home.  Particularly depositor.
 class PropertiesDatastream < ActiveFedora::OmDatastream
   set_terminology do |t|

data/sufia-models/app/models/domain_term.rb

@@ -1,5 +1,5 @@
 class DomainTerm < ActiveRecord::Base
-  attr_accessible :model, :term if Rails::VERSION::MAJOR == 3
+  deprecated_attr_accessible  :model, :term
 
   # TODO we should add an index on this join table and remove the uniq query
   has_and_belongs_to_many :local_authorities, :uniq=> true 

data/sufia-models/app/models/follow.rb

@@ -1,17 +1,3 @@
-# Copyright © 2012 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 class Follow < ActiveRecord::Base
 
   extend ActsAsFollower::FollowerLib

data/sufia-models/app/models/generic_file.rb

@@ -1,16 +1,3 @@
-# Copyright © 2012 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
 class GenericFile < ActiveFedora::Base
   include Sufia::GenericFile
 end

data/sufia-models/app/models/local_authority.rb

@@ -2,7 +2,7 @@ require 'rdf'
 require 'rdf/rdfxml'
 
 class LocalAuthority < ActiveRecord::Base
-  attr_accessible :name if Rails::VERSION::MAJOR == 3
+  deprecated_attr_accessible  :name
   # TODO we should add an index on this join table and remove the uniq query
   has_and_belongs_to_many :domain_terms, :uniq=> true 
   has_many :local_authority_entries

data/sufia-models/app/models/local_authority_entry.rb

@@ -1,4 +1,4 @@
 class LocalAuthorityEntry < ActiveRecord::Base
   belongs_to :local_authority
-  attr_accessible :local_authority, :label, :uri if Rails::VERSION::MAJOR == 3
+  deprecated_attr_accessible  :local_authority, :label, :uri
 end

data/sufia-models/app/models/single_use_link.rb

@@ -1,6 +1,6 @@
 class SingleUseLink < ActiveRecord::Base
 
-  attr_accessible :downloadKey, :expires, :itemId, :path if Rails::VERSION::MAJOR == 3
+  deprecated_attr_accessible  :downloadKey, :expires, :itemId, :path
     
   
   def self.create_show(item_id)

data/sufia-models/app/models/subject_local_authority_entry.rb

@@ -1,16 +1,2 @@
-# Copyright © 2012 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 class SubjectLocalAuthorityEntry < ActiveRecord::Base
 end

data/sufia-models/app/models/trophy.rb

@@ -1,5 +1,5 @@
 class Trophy < ActiveRecord::Base
-  attr_accessible :generic_file_id, :user_id if Rails::VERSION::MAJOR == 3
+  deprecated_attr_accessible  :generic_file_id, :user_id
 
   validate :count_within_limit, :on => :create
 

data/sufia-models/app/models/version_committer.rb

@@ -1,3 +1,3 @@
 class VersionCommitter < ActiveRecord::Base
-  attr_accessible :obj_id, :datastream_id, :version_id, :committer_login if Rails::VERSION::MAJOR == 3
+  deprecated_attr_accessible  :obj_id, :datastream_id, :version_id, :committer_login
 end

data/sufia-models/lib/generators/sufia/models/install_generator.rb

@@ -0,0 +1,102 @@
+# -*- encoding : utf-8 -*-
+require 'rails/generators'
+require 'rails/generators/migration'
+
+class Sufia::Models::InstallGenerator < Rails::Generators::Base
+  include Rails::Generators::Migration
+
+  source_root File.expand_path('../templates', __FILE__)
+
+  argument     :model_name, :type => :string , :default => "user"
+  desc """
+This generator makes the following changes to your application:
+ 1. Creates several database migrations if they do not exist in /db/migrate
+ 2. Adds user behavior to the user model
+ 3. Creates the sufia.rb configuration file
+ 4. Adds Sufia::SolrDocumentBehavior to app/models/solr_document.rb
+ 5. Generates mailboxer
+       """
+
+  # Implement the required interface for Rails::Generators::Migration.
+  # taken from http://github.com/rails/rails/blob/master/activerecord/lib/generators/active_record.rb
+  def self.next_migration_number(path)
+    if @prev_migration_nr
+      @prev_migration_nr += 1
+    else
+      if last_migration = Dir[File.join(path, '*.rb')].sort.last
+        @prev_migration_nr = last_migration.sub(File.join(path, '/'), '').to_i + 1
+      else
+        @prev_migration_nr = Time.now.utc.strftime("%Y%m%d%H%M%S").to_i
+      end
+    end
+    @prev_migration_nr.to_s
+  end
+
+  # Setup the database migrations
+  def copy_migrations
+    # Can't get this any more DRY, because we need this order.
+    [
+      "acts_as_follower_migration.rb",
+      "add_social_to_users.rb",
+      "create_single_use_links.rb",
+      "add_ldap_attrs_to_user.rb",
+      "add_avatars_to_users.rb",
+      "create_checksum_audit_logs.rb",
+      "create_version_committers.rb",
+      "add_groups_to_users.rb",
+      "create_local_authorities.rb",
+      "create_trophies.rb"
+    ].each do |file|
+      better_migration_template file
+    end
+  end
+
+  # Add behaviors to the user model
+  def inject_sufia_user_behavior
+    file_path = "app/models/#{model_name.underscore}.rb"
+    if File.exists?(file_path)
+      inject_into_class file_path, model_name.classify do
+        "# Connects this user object to Sufia behaviors. " +
+          "\n include Sufia::User\n"
+      end
+    else
+      puts "     \e[31mFailure\e[0m  Sufia requires a user object. This generators assumes that the model is defined in the file #{file_path}, which does not exist.  If you used a different name, please re-run the generator and provide that name as an argument. Such as \b  rails -g sufia client"
+    end
+  end
+
+  def create_configuration_files
+    copy_file "config/sufia.rb", "config/initializers/sufia.rb"
+    copy_file "config/redis.yml", "config/redis.yml"
+    copy_file "config/redis_config.rb", "config/initializers/redis_config.rb"
+    copy_file "config/resque_admin.rb", "config/initializers/resque_admin.rb"
+    copy_file "config/resque_config.rb", "config/initializers/resque_config.rb"
+  end
+
+  # Add behaviors to the SolrDocument model
+  def inject_sufia_solr_document_behavior
+    file_path = "app/models/solr_document.rb"
+    if File.exists?(file_path)
+      inject_into_class file_path, "SolrDocument" do
+        "  # Adds Sufia behaviors to the SolrDocument.\n" +
+          "  include Sufia::SolrDocumentBehavior\n"
+      end
+    else
+      puts "     \e[31mFailure\e[0m  Sufia requires a SolrDocument object. This generators assumes that the model is defined in the file #{file_path}, which does not exist."
+    end
+  end
+
+  def install_mailboxer
+    generate "mailboxer:install"
+  end
+
+  private
+
+  def better_migration_template(file)
+    begin
+      migration_template "migrations/#{file}", "db/migrate/#{file}"
+    rescue Rails::Generators::Error => e
+      say_status("warning", e.message, :yellow)
+    end
+  end
+
+end

data/sufia-models/lib/generators/sufia/models/templates/config/clamav.rb

@@ -0,0 +1 @@
+ClamAV.instance.loaddb() if defined? ClamAV

data/sufia-models/lib/generators/sufia/models/templates/config/mailboxer.rb

@@ -0,0 +1,17 @@
+Mailboxer.setup do |config|
+
+  #Configures if you applications uses or no the email sending for Notifications and Messages
+  config.uses_emails = true
+
+  #Configures the default from for the email sent for Messages and Notifications of Mailboxer
+  config.default_from = "no-reply@mailboxer.com"
+
+  #Configures the methods needed by mailboxer
+  config.email_method = :mailboxer_email
+  config.name_method = :name
+
+  #Configures if you use or not a search engine and wich one are you using
+  #Supported enignes: [:solr,:sphinx]
+  config.search_enabled = false
+  config.search_engine = :solr
+end

data/{lib/generators/sufia → sufia-models/lib/generators/sufia/models}/templates/config/redis_config.rb

@@ -7,7 +7,7 @@ if defined?(PhusionPassenger)
       config = YAML::load(ERB.new(IO.read(File.join(Rails.root, 'config', 'redis.yml'))).result)[Rails.env].with_indifferent_access
 
       # The important two lines
-      $redis.client.disconnect if $redis 
+      $redis.client.disconnect if $redis
       $redis = Redis.new(host: config[:host], port: config[:port], thread_safe: true) rescue nil
       Resque.redis = $redis
       Resque.redis.client.reconnect if Resque.redis

data/{lib/generators/sufia → sufia-models/lib/generators/sufia/models}/templates/config/resque_config.rb

@@ -2,4 +2,4 @@ config = YAML::load(ERB.new(IO.read(File.join(Rails.root, 'config', 'redis.yml')
 Resque.redis = Redis.new(host: config[:host], port: config[:port], thread_safe: true)
 
 Resque.inline = Rails.env.test?
-Resque.redis.namespace = "#{Sufia::Engine.config.id_namespace}:#{Rails.env}"
+Resque.redis.namespace = "#{Sufia.config.id_namespace}:#{Rails.env}"

data/sufia-models/lib/generators/sufia/models/templates/config/setup_mail.rb

@@ -0,0 +1,3 @@
+ActionMailer::Base.smtp_settings = {
+  :address                  => "smtp.psu.edu"
+}