hydra-access-controls 10.5.1 → 10.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ff67011c0dfacf46f43a710b1bf75be300c91f8
-  data.tar.gz: 9894ed9ca3d96943443058a9546b32cdd71c8a8c
+  metadata.gz: 194c22619390bf832d9525d0560f36cf82c81591
+  data.tar.gz: 6dc606293605fa52c7347d99540c2761be4c4e22
 SHA512:
-  metadata.gz: 41a3c4f41486967062df9adb768a6002eb5762967e70ce225dfa474eb2c293c2b86edea0a0b7cc935e57518bbcc1dd4d7ea2124b2dc514e600e0221ab209a0fb
-  data.tar.gz: c862bc4aa6120634f94370b7d0a0d72c579e4f07de7f135fff793c9ca65024519fbe5462777659ab89c5d91fc0a83955981722aa56284cec9615d82b773614c4
+  metadata.gz: 2fb11965a6ba204c99d8cc10ac9883d9c716e677d4cc407e365eb8da99834e5d796b704130a8889175d1edeb4b38e13925aed0c6a25e19f8c78970673bbdf73e
+  data.tar.gz: eec346cdd2746922f3e0b8e777555ad980b8853c156e9ff4787d666d16a6f4ca70a920380665ce97bd8bd34952c36b659e95fa030845e3bb4745c581994b9b3f

data/README.textile

@@ -56,21 +56,21 @@ In config/initializers/hydra_config.rb
 <pre>
   Hydra.configure(:shared) do |config|
     # ... other stuff ...
-    indexer = Solrizer::Descriptor.new(:string, :stored, :indexed, :multivalued)
+    indexer = ActiveFedora::Indexing::Descriptor.new(:string, :stored, :indexed, :multivalued)
     config[:permissions] = {
       :discover => {:group =>ActiveFedora::SolrQueryBuilder.solr_name("discover_access_group", indexer), :individual=>ActiveFedora::SolrQueryBuilder.solr_name("discover_access_person", indexer)},
       :read => {:group =>ActiveFedora::SolrQueryBuilder.solr_name("read_access_group", indexer), :individual=>ActiveFedora::SolrQueryBuilder.solr_name("read_access_person", indexer)},
       :edit => {:group =>ActiveFedora::SolrQueryBuilder.solr_name("edit_access_group", indexer), :individual=>ActiveFedora::SolrQueryBuilder.solr_name("edit_access_person", indexer)},
       :owner => ActiveFedora::SolrQueryBuilder.solr_name("depositor", indexer),
-      :embargo_release_date => ActiveFedora::SolrQueryBuilder.solr_name("embargo_release_date", Solrizer::Descriptor.new(:date, :stored, :indexed))
+      :embargo_release_date => ActiveFedora::SolrQueryBuilder.solr_name("embargo_release_date", ActiveFedora::Indexing::Descriptor.new(:date, :stored, :indexed))
     }
-    indexer = Solrizer::Descriptor.new(:string, :stored, :indexed, :multivalued)
+    indexer = ActiveFedora::Indexing::Descriptor.new(:string, :stored, :indexed, :multivalued)
     config[:permissions][:inheritable] = {
       :discover => {:group =>ActiveFedora::SolrQueryBuilder.solr_name("inheritable_discover_access_group", indexer), :individual=>ActiveFedora::SolrQueryBuilder.solr_name("inheritable_discover_access_person", indexer)},
       :read => {:group =>ActiveFedora::SolrQueryBuilder.solr_name("inheritable_read_access_group", indexer), :individual=>ActiveFedora::SolrQueryBuilder.solr_name("inheritable_read_access_person", indexer)},
       :edit => {:group =>ActiveFedora::SolrQueryBuilder.solr_name("inheritable_edit_access_group", indexer), :individual=>ActiveFedora::SolrQueryBuilder.solr_name("inheritable_edit_access_person", indexer)},
       :owner => ActiveFedora::SolrQueryBuilder.solr_name("inheritable_depositor", indexer),
-      :embargo_release_date => ActiveFedora::SolrQueryBuilder.solr_name("inheritable_embargo_release_date", Solrizer::Descriptor.new(:date, :stored, :indexed))
+      :embargo_release_date => ActiveFedora::SolrQueryBuilder.solr_name("inheritable_embargo_release_date", ActiveFedora::Indexing::Descriptor.new(:date, :stored, :indexed))
     }
   end
 </pre>

data/app/models/concerns/hydra/admin_policy_behavior.rb

@@ -16,7 +16,7 @@ module Hydra
         end
         if default_embargo
           key = Hydra.config.permissions.inheritable.embargo.release_date.sub(/_[^_]+$/, '') #Strip off the suffix
-          ::Solrizer.insert_field(doc, key, default_embargo.embargo_release_date, :stored_sortable)
+          ActiveFedora::Indexing::Inserter.insert_field(doc, key, default_embargo.embargo_release_date, :stored_sortable)
         end
       end
     end

data/app/models/hydra/access_controls/embargo.rb

@@ -28,10 +28,10 @@ module Hydra::AccessControls
     def to_hash
       {}.tap do |doc|
         date_field_name = Hydra.config.permissions.embargo.release_date.sub(/_dtsi/, '')
-        Solrizer.insert_field(doc, date_field_name, embargo_release_date, :stored_sortable)
-        doc[::Solrizer.solr_name("visibility_during_embargo", :symbol)] = visibility_during_embargo unless visibility_during_embargo.nil?
-        doc[::Solrizer.solr_name("visibility_after_embargo", :symbol)] = visibility_after_embargo unless visibility_after_embargo.nil?
-        doc[::Solrizer.solr_name("embargo_history", :symbol)] = embargo_history unless embargo_history.nil?
+        ActiveFedora::Indexing::Inserter.insert_field(doc, date_field_name, embargo_release_date, :stored_sortable)
+        doc[ActiveFedora.index_field_mapper.solr_name("visibility_during_embargo", :symbol)] = visibility_during_embargo unless visibility_during_embargo.nil?
+        doc[ActiveFedora.index_field_mapper.solr_name("visibility_after_embargo", :symbol)] = visibility_after_embargo unless visibility_after_embargo.nil?
+        doc[ActiveFedora.index_field_mapper.solr_name("embargo_history", :symbol)] = embargo_history unless embargo_history.nil?
       end
     end
     protected

data/app/models/hydra/access_controls/lease.rb

@@ -27,11 +27,11 @@ module Hydra::AccessControls
     def to_hash
       {}.tap do |doc|
         date_field_name = Hydra.config.permissions.lease.expiration_date.sub(/_dtsi/, '')
-        Solrizer.insert_field(doc, date_field_name, lease_expiration_date, :stored_sortable)
+        ActiveFedora::Indexing::Inserter.insert_field(doc, date_field_name, lease_expiration_date, :stored_sortable)
 
-        doc[::Solrizer.solr_name("visibility_during_lease", :symbol)] = visibility_during_lease unless visibility_during_lease.nil?
-        doc[::Solrizer.solr_name("visibility_after_lease", :symbol)] = visibility_after_lease unless visibility_after_lease.nil?
-        doc[::Solrizer.solr_name("lease_history", :symbol)] = lease_history unless lease_history.nil?
+        doc[ActiveFedora.index_field_mapper.solr_name("visibility_during_lease", :symbol)] = visibility_during_lease unless visibility_during_lease.nil?
+        doc[ActiveFedora.index_field_mapper.solr_name("visibility_after_lease", :symbol)] = visibility_after_lease unless visibility_after_lease.nil?
+        doc[ActiveFedora.index_field_mapper.solr_name("lease_history", :symbol)] = lease_history unless lease_history.nil?
       end
     end
 

data/app/models/hydra/access_controls/permission.rb

@@ -80,18 +80,18 @@ module Hydra::AccessControls
     end
 
     def build_agent_resource(prefix, name)
-      Agent.new(::RDF::URI.new("#{prefix}##{URI.encode(name)}"))
+      [Agent.new(::RDF::URI.new("#{prefix}##{URI.encode(name)}"))]
     end
 
     def build_access(access)
       raise "Can't build access #{inspect}" unless access
       self.mode = case access
                   when 'read'
-                    Mode.new(::ACL.Read)
+                    [Mode.new(::ACL.Read)]
                   when 'edit'
-                    Mode.new(::ACL.Write)
+                    [Mode.new(::ACL.Write)]
                   when 'discover'
-                    Mode.new(Hydra::ACL.Discover)
+                    [Mode.new(Hydra::ACL.Discover)]
                   else
                     raise ArgumentError, "Unknown access #{access.inspect}"
                   end

data/hydra-access-controls.gemspec

@@ -19,11 +19,11 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = '>= 1.9.3'
 
   gem.add_dependency 'activesupport', '>= 4', '< 6'
-  gem.add_dependency "active-fedora", '>= 10.0.0', '< 12'
+  gem.add_dependency "active-fedora", '>= 10.0.0', '< 13'
   gem.add_dependency 'cancancan', '~> 1.8'
   gem.add_dependency 'deprecation', '~> 1.0'
   gem.add_dependency "blacklight", '>= 5.16'
-  gem.add_dependency "blacklight-access_controls", '~> 0.6'
+  gem.add_dependency "blacklight-access_controls", '~> 0.6.0'
 
   gem.add_development_dependency "rake", '~> 10.1'
   gem.add_development_dependency 'rspec', '~> 3.1'

data/lib/hydra-access-controls.rb

@@ -29,12 +29,7 @@ module Hydra
     alias :config :configure
   end
 
-  class Engine < Rails::Engine
-    # autoload_paths is only necessary for Rails 3
-    config.autoload_paths += %W(
-      #{config.root}/app/models/concerns
-    )
-  end
+  class Engine < Rails::Engine; end
 
   # This error is raised when a user isn't allowed to access a given controller action.
   # This usually happens within a call to AccessControlsEnforcement#enforce_access_controls but can be
@@ -43,3 +38,11 @@ module Hydra
 end
 
 require 'active_fedora/accessible_by'
+
+# While we support ActiveFedora 10 and 11, alias ActiveFedora::Indexing and
+# ActiveFedora::Indexing::Inserter to Solrizer
+require 'active_fedora/version'
+if ActiveFedora.version.split('.').first.to_i < 12
+  ActiveFedora::Indexing::Inserter   = Solrizer
+  ActiveFedora::Indexing::Descriptor = Solrizer::Descriptor
+end

data/spec/unit/admin_policy_spec.rb

@@ -43,16 +43,19 @@ describe Hydra::AdminPolicy do
       expect(subject.default_permissions.map(&:to_hash)).to eq [{:type=>'person', :access=>'discover', :name=>'user1'},
                                    {:type=>'person', :access=>'discover', :name=>'user2'}]
     end
-    it "should update permissions on existing users" do
+
+    it "updates permissions on existing users" do
       subject.default_permissions.build({:name=>'user1', :access=>'discover', :type=>'person'})
-      subject.default_permissions.first.mode = Hydra::AccessControls::Mode.new(::ACL.Write)
+      subject.default_permissions.first.mode = [Hydra::AccessControls::Mode.new(::ACL.Write)]
       expect(subject.default_permissions.map(&:to_hash)).to eq [{:type=>'person', :access=>'edit', :name=>'user1'}]
     end
-    it "should update permissions on existing groups" do
+
+    it "updates permissions on existing groups" do
       subject.default_permissions.build({:name=>'group1', :access=>'discover', :type=>'group'})
-      subject.default_permissions.first.mode = Hydra::AccessControls::Mode.new(::ACL.Write)
+      subject.default_permissions.first.mode = [Hydra::AccessControls::Mode.new(::ACL.Write)]
       expect(subject.default_permissions.map(&:to_hash)).to eq [{:type=>'group', :access=>'edit', :name=>'group1'}]
     end
+
     it "should assign user permissions when :type == 'person'" do
       subject.default_permissions.build({:name=>'user1', :access=>'discover', :type=>'person'})
       expect(subject.default_permissions.map(&:to_hash)).to eq [{:type=>'person', :access=>'discover', :name=>'user1'}]

data/spec/unit/config_spec.rb

@@ -14,7 +14,7 @@ describe Hydra::Config do
                 individual: ActiveFedora.index_field_mapper.solr_name("edit_access_person", :symbol)},
         owner: ActiveFedora.index_field_mapper.solr_name("depositor", :symbol),
       }
-      config.permissions.embargo.release_date = ActiveFedora.index_field_mapper.solr_name("embargo_release_date", Solrizer::Descriptor.new(:date, :stored, :indexed))
+      config.permissions.embargo.release_date = ActiveFedora.index_field_mapper.solr_name("embargo_release_date", ActiveFedora::Indexing::Descriptor.new(:date, :stored, :indexed))
 
       # specify the user model
       config[:user_model] = 'User'

data/spec/unit/policy_aware_access_controls_enforcement_spec.rb

@@ -136,6 +136,7 @@ describe Hydra::PolicyAwareAccessControlsEnforcement do
       before { subject.apply_gated_discovery(@solr_parameters) }
       
       it "builds a query that includes all the policies" do
+        skip if ActiveFedora.version.split('.').first.to_i < 11
         (1..11).each do |p|
           expect(policy_queries).to include(/_query_:\"{!raw f=#{governed_field}}test-policy#{p}\"/)
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-access-controls
 version: !ruby/object:Gem::Version
-  version: 10.5.1
+  version: 10.6.0
 platform: ruby
 authors:
 - Chris Beer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-18 00:00:00.000000000 Z
+date: 2018-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -41,7 +41,7 @@ dependencies:
         version: 10.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '12'
+        version: '13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -51,7 +51,7 @@ dependencies:
         version: 10.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '12'
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: cancancan
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement