curation_concerns 0.12.0.pre4 → 0.12.0.pre5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad2b197734a59a28a4ab248eacd7c8b0e2ece654
-  data.tar.gz: 46e47043c3c00bc9daac8efa8912113388525061
+  metadata.gz: 4cc5f2766beec4a47127cd43e76cd15789ea7edf
+  data.tar.gz: 0d1eccaf7b536f7a4c7d51d575f9828e4f2f7ad6
 SHA512:
-  metadata.gz: 725c69274e3e5125825d8adeb1b83e9374d10efc3b35b51caef69d88fb4918e8955f24c074b36bc3a9803a70517dc49f131ab7290f1e8cce90e67d2154b3fb5d
-  data.tar.gz: de35e7ef96cd2c794b35de216240e99997397020428a1082c70a675ae2ad41a062fc73b0c737463ef97da17b7965203a34da90232e739fb6289abea031b6134a
+  metadata.gz: 775fd8bd118db29f56b3a12b8aee3f36e02dcb108cefcd4da104413b042c0b38fd3983102cd55b49824b26acc0c2fdd3448909edcb734cb89018f8fccf0d7d12
+  data.tar.gz: 697fe8253127b5cfa3ab326458b944a44d09693af59710d629d1a65f59fa5ff49ae558fe5ef82848f18fc0fbc7221cdf37c60390e08f5b9c48dfd949c4e7cd4d

data/app/actors/curation_concerns/actor_stack.rb

@@ -0,0 +1,27 @@
+module CurationConcerns
+  class ActorStack
+    attr_reader :curation_concern, :user, :first_actor_class, :more_actors
+    def initialize(curation_concern, user, more_actors)
+      @curation_concern = curation_concern
+      @user = user
+      @more_actors = more_actors
+      @first_actor_class = @more_actors.shift || RootActor
+    end
+
+    def inner_stack
+      ActorStack.new(curation_concern, user, more_actors)
+    end
+
+    def actor
+      first_actor_class.new(curation_concern, user, inner_stack)
+    end
+
+    def create(attributes)
+      actor.create(attributes.with_indifferent_access)
+    end
+
+    def update(attributes)
+      actor.update(attributes.with_indifferent_access)
+    end
+  end
+end

data/app/actors/curation_concerns/file_set_actor.rb

@@ -26,7 +26,7 @@ module CurationConcerns
       file_set.date_modified = now
       file_set.creator = [user.user_key]
 
-      CurationConcern::ActorStack.new(file_set, user, [InterpretVisibilityActor]).create(file_set_params) if assign_visibility?(file_set_params)
+      ActorStack.new(file_set, user, [InterpretVisibilityActor]).create(file_set_params) if assign_visibility?(file_set_params)
       attach_file_to_work(work, file_set, file_set_params) if work
       yield(file_set) if block_given?
     end
@@ -66,9 +66,9 @@ module CurationConcerns
     end
 
     def update_metadata(attributes)
-      stack = CurationConcern::ActorStack.new(file_set,
-                                              user,
-                                              [InterpretVisibilityActor, BaseActor])
+      stack = ActorStack.new(file_set,
+                             user,
+                             [InterpretVisibilityActor, BaseActor])
       if result = stack.update(attributes)
         CurationConcerns.config.callback.run(:after_update_metadata, file_set, user)
       end

data/app/models/concerns/curation_concerns/ability.rb

@@ -22,7 +22,11 @@ module CurationConcerns
     end
 
     def admin_permissions
-      can [:create, :discover, :show, :read, :edit, :update, :destroy], :all
+      alias_action :edit, to: :update
+      alias_action :show, to: :read
+      alias_action :discover, to: :read
+
+      can :manage, curation_concerns_models
     end
 
     def admin?
@@ -42,8 +46,13 @@ module CurationConcerns
     # to submit content
     def everyone_can_create_curation_concerns
       return unless registered_user?
-      can :create, [::FileSet, ::Collection]
-      can :create, [CurationConcerns.config.curation_concerns]
+      can :create, curation_concerns_models
     end
+
+    private
+
+      def curation_concerns_models
+        [::FileSet, ::Collection] + CurationConcerns.config.curation_concerns
+      end
   end
 end

data/app/models/concerns/curation_concerns/file_set_behavior.rb

@@ -1,6 +1,12 @@
 module CurationConcerns
   module FileSetBehavior
     extend ActiveSupport::Concern
+    # BasicMetadata needs to be included before Characterization since
+    # both of them declare properties with the same predicate (dc:creator
+    # and dc:language.) Loading BasicMetadata first allows Characterization
+    # to detect the duplicate (via the AlreadyThereStrategy) and prevents
+    # the warning.
+    include CurationConcerns::BasicMetadata
     include Hydra::Works::FileSetBehavior
     include Hydra::Works::VirusCheck
     include Hydra::Works::Characterization
@@ -9,7 +15,6 @@ module CurationConcerns
     include CurationConcerns::Noid
     include CurationConcerns::FileSet::Derivatives
     include CurationConcerns::Permissions
-    include CurationConcerns::BasicMetadata
     include CurationConcerns::FileSet::FullTextIndexing
     include CurationConcerns::FileSet::Indexing
     include CurationConcerns::FileSet::BelongsToWorks

data/app/services/curation_concerns/actor_factory.rb

@@ -0,0 +1,24 @@
+module CurationConcerns
+  class ActorFactory
+    def self.build(curation_concern, current_user)
+      ActorStack.new(curation_concern,
+                     current_user,
+                     stack_actors(curation_concern))
+    end
+
+    def self.stack_actors(curation_concern)
+      [AddToCollectionActor,
+       AssignRepresentativeActor,
+       AttachFilesActor,
+       ApplyOrderActor,
+       InterpretVisibilityActor,
+       model_actor(curation_concern),
+       AssignIdentifierActor]
+    end
+
+    def self.model_actor(curation_concern)
+      actor_identifier = curation_concern.class.to_s.split('::').last
+      "CurationConcerns::#{actor_identifier}Actor".constantize
+    end
+  end
+end

data/app/services/curation_concerns/curation_concern.rb

@@ -1,46 +1,15 @@
 module CurationConcerns
-  module CurationConcern
-    # Returns the top-level actor on the stack
+  class CurationConcern
+    class_attribute :actor_factory
+    self.actor_factory = CurationConcerns::ActorFactory
+
+    # A consumer of this method can inject a different factory
+    # into this class in order to change the behavior of this method.
+    # @param [ActiveFedora::Base] curation_concern a work to be updated
+    # @param [User] current_user the depositor/updater of the work
+    # @return [#create, #update] an actor that can create and update the work
     def self.actor(curation_concern, current_user)
-      ActorStack.new(curation_concern, current_user,
-                     [AddToCollectionActor,
-                      AssignRepresentativeActor,
-                      AttachFilesActor,
-                      ApplyOrderActor,
-                      InterpretVisibilityActor,
-                      model_actor(curation_concern),
-                      AssignIdentifierActor])
-    end
-
-    def self.model_actor(curation_concern)
-      actor_identifier = curation_concern.class.to_s.split('::').last
-      "CurationConcerns::#{actor_identifier}Actor".constantize
-    end
-
-    class ActorStack
-      attr_reader :curation_concern, :user, :first_actor_class, :more_actors
-      def initialize(curation_concern, user, more_actors)
-        @curation_concern = curation_concern
-        @user = user
-        @more_actors = more_actors
-        @first_actor_class = @more_actors.shift || RootActor
-      end
-
-      def inner_stack
-        ActorStack.new(curation_concern, user, more_actors)
-      end
-
-      def actor
-        first_actor_class.new(curation_concern, user, inner_stack)
-      end
-
-      def create(attributes)
-        actor.create(attributes.with_indifferent_access)
-      end
-
-      def update(attributes)
-        actor.update(attributes.with_indifferent_access)
-      end
+      actor_factory.build(curation_concern, current_user)
     end
   end
 end

data/lib/curation_concerns/version.rb

@@ -1,3 +1,3 @@
 module CurationConcerns
-  VERSION = "0.12.0.pre4".freeze
+  VERSION = "0.12.0.pre5".freeze
 end

data/solr/config/schema.xml

@@ -103,7 +103,7 @@
       http://wiki.apache.org/solr/SolrAdaptersForLuceneSpatial4
     -->
     <fieldType name="location_rpt" class="solr.SpatialRecursivePrefixTreeFieldType"
-      geo="true" distErrPct="0.025" maxDistErr="0.000009" units="degrees" />
+      geo="true" distErrPct="0.025" maxDistErr="0.000009" distanceUnits="degrees" />
     
     <fieldType name="text" class="solr.TextField" omitNorms="false">
       <analyzer>

data/spec/actors/curation_concerns/add_to_collections_actor_spec.rb

@@ -4,10 +4,10 @@ describe CurationConcerns::AddToCollectionActor do
   let(:curation_concern) { GenericWork.new }
   let(:attributes) { {} }
   subject do
-    CurationConcerns::CurationConcern::ActorStack.new(curation_concern,
-                                                      user,
-                                                      [described_class,
-                                                       CurationConcerns::GenericWorkActor])
+    CurationConcerns::ActorStack.new(curation_concern,
+                                     user,
+                                     [described_class,
+                                      CurationConcerns::GenericWorkActor])
   end
   describe 'the next actor' do
     let(:root_actor) { double }

data/spec/actors/curation_concerns/interpret_visibility_actor_spec.rb

@@ -4,10 +4,10 @@ describe CurationConcerns::InterpretVisibilityActor do
   let(:curation_concern) { GenericWork.new }
   let(:attributes) { {} }
   subject do
-    CurationConcerns::CurationConcern::ActorStack.new(curation_concern,
-                                                      user,
-                                                      [described_class,
-                                                       CurationConcerns::GenericWorkActor])
+    CurationConcerns::ActorStack.new(curation_concern,
+                                     user,
+                                     [described_class,
+                                      CurationConcerns::GenericWorkActor])
   end
   let(:date) { Date.today + 2 }
 

data/spec/models/file_set_spec.rb

@@ -105,7 +105,7 @@ describe FileSet do
       expect(subject).to respond_to(:well_formed)
       expect(subject).to respond_to(:page_count)
       expect(subject).to respond_to(:file_title)
-      expect(subject).to respond_to(:file_author)
+      expect(subject).to respond_to(:creator)
     end
 
     it 'redefines to_param to make redis keys more recognizable' do

data/spec/services/curation_concern_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe CurationConcerns::CurationConcern do
+  let(:work) { GenericWork.new }
+  let(:user) { double }
+
+  describe ".actor" do
+    subject { described_class.actor(work, user) }
+    it { is_expected.to be_kind_of CurationConcerns::ActorStack }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curation_concerns
 version: !ruby/object:Gem::Version
-  version: 0.12.0.pre4
+  version: 0.12.0.pre5
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-07 00:00:00.000000000 Z
+date: 2016-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-head
@@ -615,6 +615,7 @@ files:
 - Rakefile
 - app/actors/concerns/curation_concerns/manages_embargoes_actor.rb
 - app/actors/curation_concerns/abstract_actor.rb
+- app/actors/curation_concerns/actor_stack.rb
 - app/actors/curation_concerns/add_to_collection_actor.rb
 - app/actors/curation_concerns/apply_order_actor.rb
 - app/actors/curation_concerns/assign_identifier_actor.rb
@@ -787,6 +788,7 @@ files:
 - app/search_builders/curation_concerns/single_result.rb
 - app/search_builders/curation_concerns/single_use_link_search_builder.rb
 - app/search_builders/curation_concerns/work_search_builder.rb
+- app/services/curation_concerns/actor_factory.rb
 - app/services/curation_concerns/curation_concern.rb
 - app/services/curation_concerns/derivative_path.rb
 - app/services/curation_concerns/embargo_service.rb
@@ -1152,6 +1154,7 @@ files:
 - spec/search_builders/curation_concerns/lease_search_builder_spec.rb
 - spec/search_builders/curation_concerns/search_builder_spec.rb
 - spec/search_builders/resource_types_service_spec.rb
+- spec/services/curation_concern_spec.rb
 - spec/services/derivative_path_spec.rb
 - spec/services/embargo_service_spec.rb
 - spec/services/file_set_audit_service_spec.rb
@@ -1229,7 +1232,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A Rails Engine that allows an application to CRUD CurationConcern objects
@@ -1352,6 +1355,7 @@ test_files:
 - spec/search_builders/curation_concerns/lease_search_builder_spec.rb
 - spec/search_builders/curation_concerns/search_builder_spec.rb
 - spec/search_builders/resource_types_service_spec.rb
+- spec/services/curation_concern_spec.rb
 - spec/services/derivative_path_spec.rb
 - spec/services/embargo_service_spec.rb
 - spec/services/file_set_audit_service_spec.rb