ddr-models 1.3.0 → 1.4.0

data/spec/models/attachment_spec.rb

@@ -4,10 +4,4 @@ RSpec.describe Attachment, type: :model, attachments: true do
   it_behaves_like "a DDR model"
   it_behaves_like "an object that can have content"
   it_behaves_like "it has an association", :belongs_to, :attached_to, :is_attached_to, "ActiveFedora::Base"
-  context "validations" do
-    before { subject.valid? }
-    it "should have content" do
-      expect(subject.errors.messages).to have_key(:content)
-    end
-  end
 end

data/spec/spec_helper.rb

@@ -1,5 +1,8 @@
 ENV['RAILS_ENV'] ||= "test"
 
+require "coveralls"
+Coveralls.wear!("rails")
+
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 
 require "ddr-models"
@@ -105,8 +108,12 @@ RSpec.configure do |config|
   end
 
   config.after(:suite) do
-    FileUtils.remove_entry_secure(Ddr::Models.external_file_store)
-    FileUtils.remove_entry_secure(Ddr::Models.minter_statefile)
+    if Ddr::Models.external_file_store && Dir.exist?(Ddr::Models.external_file_store)
+      FileUtils.remove_entry_secure(Ddr::Models.external_file_store) 
+    end
+    if Ddr::Models.minter_statefile && File.exist?(Ddr::Models.minter_statefile)
+      FileUtils.remove_entry_secure(Ddr::Models.minter_statefile)
+    end
   end
 
   config.after(:each) do

data/spec/support/shared_examples_for_has_content.rb

@@ -49,13 +49,6 @@ RSpec.shared_examples "an object that can have content" do
 
   describe "save" do
 
-    describe "when content is not present" do
-      it "should not save" do
-        expect(object.save).to be false
-        expect(object.errors[:content]).to include "can't be blank"
-      end
-    end
-
     describe "when new content is present" do
 
       context "and it's a new object" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-models
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Jim Coble
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-14 00:00:00.000000000 Z
+date: 2014-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -249,37 +249,27 @@ files:
 - app/models/collection.rb
 - app/models/component.rb
 - app/models/item.rb
-- app/models/solr_document.rb
 - app/models/target.rb
 - config/initializers/active_fedora_base.rb
 - config/initializers/active_fedora_datastream.rb
 - config/initializers/devise.rb
-- config/initializers/devise.rb~
 - config/initializers/subscriptions.rb
 - config/routes.rb
 - db/migrate/20141021233359_create_events.rb
 - db/migrate/20141021234156_create_minted_ids.rb
 - db/migrate/20141103192146_create_workflow_state.rb
 - db/migrate/20141104181418_create_users.rb
-- db/migrate/20141104181418_create_users.rb~
 - db/migrate/20141107124012_add_columns_to_user.rb
 - lib/ddr-models.rb
 - lib/ddr/actions.rb
 - lib/ddr/actions/fixity_check.rb
 - lib/ddr/auth.rb
-- lib/ddr/auth.rb~
 - lib/ddr/auth/ability.rb
-- lib/ddr/auth/ability.rb~
 - lib/ddr/auth/group_service.rb
-- lib/ddr/auth/group_service.rb~
 - lib/ddr/auth/grouper_service.rb
-- lib/ddr/auth/grouper_service.rb~
 - lib/ddr/auth/remote_group_service.rb
-- lib/ddr/auth/remote_group_service.rb~
 - lib/ddr/auth/superuser.rb
-- lib/ddr/auth/superuser.rb~
 - lib/ddr/auth/user.rb
-- lib/ddr/auth/user.rb~
 - lib/ddr/datastreams.rb
 - lib/ddr/datastreams/content_metadata_datastream.rb
 - lib/ddr/datastreams/datastream_behavior.rb
@@ -341,6 +331,7 @@ files:
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/app/models/solr_document.rb
 - spec/dummy/app/models/user.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/bin/bundle
@@ -382,8 +373,6 @@ files:
 - spec/factories/target_factories.rb
 - spec/factories/test_model_factories.rb
 - spec/factories/user_factories.rb
-- spec/factories/user_factories.rb~
-- spec/features/grouper_integration_spec.rb~
 - spec/fixtures/contentMetadata.xml
 - spec/fixtures/image1.tiff
 - spec/fixtures/image2.tiff
@@ -393,7 +382,6 @@ files:
 - spec/fixtures/sample.pdf
 - spec/fixtures/target.png
 - spec/models/ability_spec.rb
-- spec/models/ability_spec.rb~
 - spec/models/active_fedora_base_spec.rb
 - spec/models/active_fedora_datastream_spec.rb
 - spec/models/attachment_spec.rb
@@ -408,12 +396,9 @@ files:
 - spec/models/permanent_identification_spec.rb
 - spec/models/role_assignments_datastream_spec.rb
 - spec/models/superuser_spec.rb
-- spec/models/superuser_spec.rb~
 - spec/models/target_spec.rb
 - spec/models/user_spec.rb
-- spec/models/user_spec.rb~
 - spec/services/group_service_spec.rb
-- spec/services/group_service_spec.rb~
 - spec/services/id_service_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_examples_for_access_controllables.rb
@@ -457,6 +442,7 @@ test_files:
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/app/models/solr_document.rb
 - spec/dummy/app/models/user.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/bin/bundle
@@ -500,8 +486,6 @@ test_files:
 - spec/factories/target_factories.rb
 - spec/factories/test_model_factories.rb
 - spec/factories/user_factories.rb
-- spec/factories/user_factories.rb~
-- spec/features/grouper_integration_spec.rb~
 - spec/fixtures/contentMetadata.xml
 - spec/fixtures/image1.tiff
 - spec/fixtures/image2.tiff
@@ -511,7 +495,6 @@ test_files:
 - spec/fixtures/sample.pdf
 - spec/fixtures/target.png
 - spec/models/ability_spec.rb
-- spec/models/ability_spec.rb~
 - spec/models/active_fedora_base_spec.rb
 - spec/models/active_fedora_datastream_spec.rb
 - spec/models/attachment_spec.rb
@@ -526,12 +509,9 @@ test_files:
 - spec/models/permanent_identification_spec.rb
 - spec/models/role_assignments_datastream_spec.rb
 - spec/models/superuser_spec.rb
-- spec/models/superuser_spec.rb~
 - spec/models/target_spec.rb
 - spec/models/user_spec.rb
-- spec/models/user_spec.rb~
 - spec/services/group_service_spec.rb
-- spec/services/group_service_spec.rb~
 - spec/services/id_service_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_examples_for_access_controllables.rb

data/config/initializers/devise.rb~

@@ -1,245 +0,0 @@
-require 'devise'
-
-# Use this hook to configure devise mailer, warden hooks and so forth.
-# Many of these configuration options can be set straight in your model.
-Devise.setup do |config|
-
-  # Given the modules that we implement, this shouldn't be used, but Devise >= 3.1 requires it,
-  # so a random value should suffice.
-  config.secret_key = SecureRandom.hex(64)
-
-  # ==> Mailer Configuration
-  # Configure the e-mail address which will be shown in Devise::Mailer,
-  # note that it will be overwritten if you use your own mailer class with default "from" parameter.
-  config.mailer_sender = "lib-drs@duke.edu"
-
-  # Configure the class responsible to send e-mails.
-  # config.mailer = "Devise::Mailer"
-
-  # ==> ORM configuration
-  # Load and configure the ORM. Supports :active_record (default) and
-  # :mongoid (bson_ext recommended) by default. Other ORMs may be
-  # available as additional gems.
-  require 'devise/orm/active_record'
-
-  # ==> Configuration for any authentication mechanism
-  # Configure which keys are used when authenticating a user. The default is
-  # just :email. You can configure it to use [:username, :subdomain], so for
-  # authenticating a user, both parameters are required. Remember that those
-  # parameters are used only when authenticating and not when retrieving from
-  # session. If you need permissions, you should implement that in a before filter.
-  # You can also supply a hash where the value is a boolean determining whether
-  # or not authentication should be aborted when the value is not present.
-  config.authentication_keys = [ :username ]
-
-  # Configure parameters from the request object used for authentication. Each entry
-  # given should be a request method and it will automatically be passed to the
-  # find_for_authentication method and considered in your model lookup. For instance,
-  # if you set :request_keys to [:subdomain], :subdomain will be used on authentication.
-  # The same considerations mentioned for authentication_keys also apply to request_keys.
-  # config.request_keys = []
-
-  # Configure which authentication keys should be case-insensitive.
-  # These keys will be downcased upon creating or modifying a user and when used
-  # to authenticate or find a user. Default is :email.
-  config.case_insensitive_keys = [ :username ]
-
-  # Configure which authentication keys should have whitespace stripped.
-  # These keys will have whitespace before and after removed upon creating or
-  # modifying a user and when used to authenticate or find a user. Default is :email.
-  config.strip_whitespace_keys = [ :username ]
-
-  # Tell if authentication through request.params is enabled. True by default.
-  # It can be set to an array that will enable params authentication only for the
-  # given strategies, for example, `config.params_authenticatable = [:database]` will
-  # enable it only for database (email + password) authentication.
-  config.params_authenticatable = [:database]
-
-  # Tell if authentication through HTTP Basic Auth is enabled. False by default.
-  # It can be set to an array that will enable http authentication only for the
-  # given strategies, for example, `config.http_authenticatable = [:token]` will
-  # enable it only for token authentication.
-  # config.http_authenticatable = false
-
-  # If http headers should be returned for AJAX requests. True by default.
-  # config.http_authenticatable_on_xhr = true
-
-  # The realm used in Http Basic Authentication. "Application" by default.
-  # config.http_authentication_realm = "Application"
-
-  # It will change confirmation, password recovery and other workflows
-  # to behave the same regardless if the e-mail provided was right or wrong.
-  # Does not affect registerable.
-  # config.paranoid = true
-
-  # By default Devise will store the user in session. You can skip storage for
-  # :http_auth and :token_auth by adding those symbols to the array below.
-  # Notice that if you are skipping storage for all authentication paths, you
-  # may want to disable generating routes to Devise's sessions controller by
-  # passing :skip => :sessions to `devise_for` in your config/routes.rb
-  config.skip_session_storage = [:http_auth]
-
-  # ==> Configuration for :database_authenticatable
-  # For bcrypt, this is the cost for hashing the password and defaults to 10. If
-  # using other encryptors, it sets how many times you want the password re-encrypted.
-  #
-  # Limiting the stretches to just one in testing will increase the performance of
-  # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use
-  # a value less than 10 in other environments.
-  config.stretches = Rails.env.test? ? 1 : 10
-
-  # Setup a pepper to generate the encrypted password.
-  # config.pepper = "37669e0c50042b93e63f790c4102864bace2ee0a30eecad6fca7d490f3124d855d8bc6d2978e5500fb266aab2b8c8003d9f202a1f23e4c2c8e8f105b7c46a68f"
-
-  # ==> Configuration for :confirmable
-  # A period that the user is allowed to access the website even without
-  # confirming his account. For instance, if set to 2.days, the user will be
-  # able to access the website for two days without confirming his account,
-  # access will be blocked just in the third day. Default is 0.days, meaning
-  # the user cannot access the website without confirming his account.
-  # config.allow_unconfirmed_access_for = 2.days
-
-  # If true, requires any email changes to be confirmed (exactly the same way as
-  # initial account confirmation) to be applied. Requires additional unconfirmed_email
-  # db field (see migrations). Until confirmed new email is stored in
-  # unconfirmed email column, and copied to email column on successful confirmation.
-  config.reconfirmable = true
-
-  # Defines which key will be used when confirming an account
-  config.confirmation_keys = [ :username ]
-
-  # ==> Configuration for :rememberable
-  # The time the user will be remembered without asking for credentials again.
-  # config.remember_for = 2.weeks
-
-  # If true, extends the user's remember period when remembered via cookie.
-  # config.extend_remember_period = false
-
-  # Options to be passed to the created cookie. For instance, you can set
-  # :secure => true in order to force SSL only cookies.
-  # config.rememberable_options = {}
-
-  # ==> Configuration for :validatable
-  # Range for password length. Default is 6..128.
-  # config.password_length = 6..128
-
-  # Email regex used to validate email formats. It simply asserts that
-  # an one (and only one) @ exists in the given string. This is mainly
-  # to give user feedback and not to assert the e-mail validity.
-  # config.email_regexp = /\A[^@]+@[^@]+\z/
-
-  # ==> Configuration for :timeoutable
-  # The time you want to timeout the user session without activity. After this
-  # time the user will be asked for credentials again. Default is 30 minutes.
-  # config.timeout_in = 30.minutes
-  
-  # If true, expires auth token on session timeout.
-  # config.expire_auth_token_on_timeout = false
-
-  # ==> Configuration for :lockable
-  # Defines which strategy will be used to lock an account.
-  # :failed_attempts = Locks an account after a number of failed attempts to sign in.
-  # :none            = No lock strategy. You should handle locking by yourself.
-  # config.lock_strategy = :failed_attempts
-
-  # Defines which key will be used when locking and unlocking an account
-  config.unlock_keys = [ :username ]
-
-  # Defines which strategy will be used to unlock an account.
-  # :email = Sends an unlock link to the user email
-  # :time  = Re-enables login after a certain amount of time (see :unlock_in below)
-  # :both  = Enables both strategies
-  # :none  = No unlock strategy. You should handle unlocking by yourself.
-  # config.unlock_strategy = :both
-
-  # Number of authentication tries before locking an account if lock_strategy
-  # is failed attempts.
-  # config.maximum_attempts = 20
-
-  # Time interval to unlock the account if :time is enabled as unlock_strategy.
-  # config.unlock_in = 1.hour
-
-  # ==> Configuration for :recoverable
-  #
-  # Defines which key will be used when recovering the password for an account
-  config.reset_password_keys = [ :username ]
-
-  # Time interval you can reset your password with a reset password key.
-  # Don't put a too small interval or your users won't have the time to
-  # change their passwords.
-  config.reset_password_within = 6.hours
-
-  # ==> Configuration for :encryptable
-  # Allow you to use another encryption algorithm besides bcrypt (default). You can use
-  # :sha1, :sha512 or encryptors from others authentication tools as :clearance_sha1,
-  # :authlogic_sha512 (then you should set stretches above to 20 for default behavior)
-  # and :restful_authentication_sha1 (then you should set stretches to 10, and copy
-  # REST_AUTH_SITE_KEY to pepper)
-  # config.encryptor = :sha512
-
-  # ==> Configuration for :token_authenticatable
-  # Defines name of the authentication token params key
-  # config.token_authentication_key = :auth_token
-
-  # ==> Scopes configuration
-  # Turn scoped views on. Before rendering "sessions/new", it will first check for
-  # "users/sessions/new". It's turned off by default because it's slower if you
-  # are using only default views.
-  # config.scoped_views = false
-
-  # Configure the default scope given to Warden. By default it's the first
-  # devise role declared in your routes (usually :user).
-  # config.default_scope = :user
-
-  # Set this configuration to false if you want /users/sign_out to sign out
-  # only the current scope. By default, Devise signs out all scopes.
-  # config.sign_out_all_scopes = true
-
-  # ==> Navigation configuration
-  # Lists the formats that should be treated as navigational. Formats like
-  # :html, should redirect to the sign in page when the user does not have
-  # access, but formats like :xml or :json, should return 401.
-  #
-  # If you have any extra navigational formats, like :iphone or :mobile, you
-  # should add them to the navigational formats lists.
-  #
-  # The "*/*" below is required to match Internet Explorer requests.
-  # config.navigational_formats = ["*/*", :html]
-
-  # The default HTTP method used to sign out a resource. Default is :delete.
-  config.sign_out_via = :get
-
-  # ==> OmniAuth
-  # Add a new OmniAuth provider. Check the wiki for more information on setting
-  # up on your models and hooks.
-  # config.omniauth :github, 'APP_ID', 'APP_SECRET', :scope => 'user,public_repo'
-
-  # ==> Warden configuration
-  # If you want to use other strategies, that are not supported by Devise, or
-  # change the failure app, you can configure them inside the config.warden block.
-  #
-  # config.warden do |manager|
-    # manager.intercept_401 = false
-    # manager.default_strategies(:scope => :user).unshift :remote_user_authenticatable
-  # end
-
-  config.warden do |manager|
-    # :superuser scope
-    manager.serialize_into_session(:superuser) { |superuser| superuser.id }
-    manager.serialize_from_session(:superuser) { |id| User.find(id) }
-  end
-
-  # ==> Mountable engine configurations
-  # When using Devise inside an engine, let's call it `MyEngine`, and this engine
-  # is mountable, there are some extra configurations to be taken into account.
-  # The following options are available, assuming the engine is mounted as:
-  #
-  #     mount MyEngine, at: "/my_engine"
-  #
-  # The router that invoked `devise_for`, in the example above, would be:
-  # config.router_name = :my_engine
-  #
-  # When using omniauth, Devise cannot automatically set Omniauth path,
-  # so you need to do it manually. For the users scope, it would be:
-  # config.omniauth_path_prefix = "/my_engine/users/auth"
-end

data/db/migrate/20141104181418_create_users.rb~

@@ -1,6 +0,0 @@
-class CreateUsers < ActiveRecord::Migration
-  def change
-    create_table :users do |t|
-    end
-  end
-end

data/lib/ddr/auth.rb~

@@ -1,47 +0,0 @@
-module Ddr
-  module Auth
-    extend ActiveSupport::Autoload
-
-    autoload :User
-    autoload :Superuser
-    autoload :Ability
-    autoload :GroupService
-    autoload :GrouperService
-    autoload :RemoteGroupService
-
-    # Superuser group
-    mattr_accessor :superuser_group do
-      ENV['SUPERUSER_GROUP']
-    end
-
-    ## Remote groups (i.e., Grouper) config settings
-    # request.env key for group memberships
-    mattr_accessor :remote_groups_env_key do
-      "ismemberof"
-    end
-
-    # request.env value internal delimiter
-    mattr_accessor :remote_groups_env_value_delim do
-      ";"
-    end
-
-    # pattern/repl for converting request.env membership values to proper (Grouper) group names
-    mattr_accessor :remote_groups_env_value_sub do
-      [/^urn:mace:duke\.edu:groups/, "duke"]
-    end
-
-    # Filter for getting list of remote groups for the repository - String, not Regexp
-    mattr_accessor :remote_groups_name_filter do
-      "duke:library:repository:ddr:"
-    end
-
-    mattr_accessor :everyone_group do
-      "public"
-    end
-
-    mattr_accessor :authenticated_users_group do
-      "registered"
-    end
-
-  end
-end