ddr-models 1.2.1 → 1.3.0

data/spec/services/group_service_spec.rb~

@@ -0,0 +1,71 @@
+require 'spec_helper'
+
+describe DulHydra::Services::GroupService do  
+  subject { described_class.new }
+  
+  describe "#groups" do
+    describe "at minimum" do
+      it "should include the 'public' and 'registered' groups" do
+        expect(subject.groups).to include("public", "registered")
+      end
+    end
+    describe "using #append_groups hook" do
+      before { allow(subject).to receive(:append_groups).and_return(["spam:eggs", "fish:water"]) }
+      it "should add the groups to the list" do
+        expect(subject.groups).to include("spam:eggs", "fish:water")
+      end
+    end
+    describe "when RoleMapper config file is present and not empty" do
+      before do
+        allow(described_class).to receive(:include_role_mapper_groups).and_return(true)
+        allow(RoleMapper).to receive(:role_names).and_return(["foo", "bar"])
+      end
+      it "should include the role mapper groups" do
+        expect(subject.groups).to include("foo", "bar")
+      end
+    end
+    describe "when RoleMapper config file is missing or empty" do
+      before { allow(described_class).to receive(:include_role_mapper_groups).and_return(false) }
+      it "should only include the default minimum groups" do
+        expect(subject.groups).to match_array(["public", "registered"])
+      end
+    end
+  end
+  
+  describe "#user_groups(user)" do
+    describe "when user is not persisted" do
+      let(:user) { FactoryGirl.build(:user) }
+      it "should return only 'public' group" do
+        expect(subject.user_groups(user)).to eq(["public"])
+      end
+    end
+    describe "when the user is persisted" do
+      let(:user) { FactoryGirl.create(:user) }
+      it "should include the 'public' and 'registered' groups" do
+        expect(subject.user_groups(user)).to include("public", "registered")
+      end
+      describe "using #append_user_groups(user) hook" do
+        before { allow(subject).to receive(:append_user_groups).with(user).and_return(["spam:eggs", "fish:water"]) }
+        it "should add the groups to the list" do
+          expect(subject.user_groups(user)).to include("spam:eggs", "fish:water")
+        end
+      end
+      describe "when the RoleMapper config file is present and not empty" do
+        before do
+          allow(described_class).to receive(:include_role_mapper_groups).and_return(true)
+          allow(RoleMapper).to receive(:roles).with(user).and_return(["foo", "bar"])
+        end
+        it "should add the user's roles to the list" do
+          expect(subject.user_groups(user)).to include("foo", "bar")
+        end
+      end
+      describe "when RoleMapper config file is missing or empty" do
+        before { allow(described_class).to receive(:include_role_mapper_groups).and_return(false) }
+        it "should only include the default minimum groups" do
+          expect(subject.groups).to match_array(["public", "registered"])
+        end
+      end
+    end
+  end
+end
+

data/spec/spec_helper.rb

@@ -7,33 +7,19 @@ require "rails"
 require "rspec/rails"
 require "factory_girl_rails"
 require "database_cleaner"
+require "tempfile"
 
 Dir[File.join(File.dirname(__FILE__), "support", "*.rb")].each { |f| require f }
 
 DatabaseCleaner.strategy = :truncation
 
 require "ddr-antivirus"
-Ddr::Antivirus.scanner_adapter = :null
-
-require "logger"
-Ddr::Antivirus.logger = Logger.new(File::NULL)
-
-# This file was generated by the `rspec --init` command. Conventionally, all
-# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
-# The generated `.rspec` file contains `--require spec_helper` which will cause this
-# file to always be loaded, without a need to explicitly require it in any files.
-#
-# Given that it is always loaded, you are encouraged to keep this file as
-# light-weight as possible. Requiring heavyweight dependencies from this file
-# will add to the boot time of your test suite on EVERY test run, even for an
-# individual file that may not need all of that loaded. Instead, consider making
-# a separate helper file that requires the additional dependencies and performs
-# the additional setup, and require it from the spec files that actually need it.
-#
-# The `.rspec` file also contains a few flags that are not defaults but that
-# users commonly want.
-#
-# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+Ddr::Antivirus.configure do |config|
+  config.scanner_adapter = :null
+  require "logger"
+  config.logger = Logger.new(File::NULL)
+end
+
 RSpec.configure do |config|
 
   config.include ActionDispatch::TestProcess
@@ -79,7 +65,7 @@ RSpec.configure do |config|
 
   # This setting enables warnings. It's recommended, but in some cases may
   # be too noisy due to issues in dependencies.
-  #config.warnings = true
+  config.warnings = false
 
   # Many RSpec users commonly either run the entire suite or an individual
   # file, and it's useful to allow more verbose output when running an
@@ -94,7 +80,7 @@ RSpec.configure do |config|
   # Print the 10 slowest examples and example groups at the
   # end of the spec run, to help surface which specs are running
   # particularly slow.
-  #config.profile_examples = 10
+  # config.profile_examples = 10
 
   # Run specs in random order to surface order dependencies. If you find an
   # order dependency and want to debug it, you can fix the order by providing
@@ -111,11 +97,16 @@ RSpec.configure do |config|
   config.before(:suite) do
     DatabaseCleaner.clean
     ActiveFedora::Base.destroy_all
-    Ddr::Models.external_file_store = Dir.mktmpdir
+    Ddr::Models.configure do |config|
+      config.external_file_store = Dir.mktmpdir
+      config.external_file_subpath_pattern = "--"
+      config.minter_statefile = Tempfile.new("minter_statefile").path
+    end
   end
 
   config.after(:suite) do
-    FileUtils.remove_entry_secure Ddr::Models.external_file_store
+    FileUtils.remove_entry_secure(Ddr::Models.external_file_store)
+    FileUtils.remove_entry_secure(Ddr::Models.minter_statefile)
   end
 
   config.after(:each) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-models
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Jim Coble
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-10 00:00:00.000000000 Z
+date: 2014-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -81,20 +81,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: clamav
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: noid
   requirement: !ruby/object:Gem::Requirement
@@ -267,26 +253,33 @@ files:
 - app/models/target.rb
 - config/initializers/active_fedora_base.rb
 - config/initializers/active_fedora_datastream.rb
-- config/initializers/ddr.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/configurable.rb
+- lib/ddr/auth/user.rb~
 - lib/ddr/datastreams.rb
 - lib/ddr/datastreams/content_metadata_datastream.rb
 - lib/ddr/datastreams/datastream_behavior.rb
@@ -389,6 +382,8 @@ 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
@@ -398,6 +393,7 @@ 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
@@ -412,9 +408,12 @@ 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
@@ -501,6 +500,8 @@ 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
@@ -510,6 +511,7 @@ 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
@@ -524,9 +526,12 @@ 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/ddr.rb

@@ -1,8 +0,0 @@
-Ddr::Models.configure do |config|
-
-  config.external_file_store = ENV['EXTERNAL_FILE_STORE']
-  config.external_file_subpath_pattern = ENV['EXTERNAL_FILE_SUBPATH_PATTERN'] || "--"
-  config.noid_template = "2.reeddeeddk"
-  config.minter_statefile = Rails.env.test? ? "/tmp/minter-state" : ENV['MINTER_STATEFILE']
-
-end

data/lib/ddr/configurable.rb

@@ -1,34 +0,0 @@
-module Ddr
-  module Configurable
-    extend ActiveSupport::Concern
-
-    included do
-      # Base directory of external file store
-      mattr_accessor :external_file_store      
-
-      # Regexp for building external file subpath from hex digest
-      mattr_accessor :external_file_subpath_regexp
-      
-      # Pattern (template) for constructing noids
-      mattr_accessor :noid_template
-
-      # Noid minter state file location
-      mattr_accessor :minter_statefile
-    end
-
-    module ClassMethods
-      def configure
-        yield self
-      end
-
-      def external_file_subpath_pattern= (pattern)
-        unless /^-{1,2}(\/-{1,2}){0,3}$/ =~ pattern
-          raise "Invalid external file subpath pattern: #{pattern}"
-        end
-        re = pattern.split("/").map { |x| "(\\h{#{x.length}})" }.join("")
-        self.external_file_subpath_regexp = Regexp.new("^#{re}")
-      end
-    end
-
-  end
-end