ddr-models 3.0.0.alpha.4 → 3.0.0.beta.1

data/spec/models/search_builder_spec.rb

@@ -26,11 +26,11 @@ module Ddr::Models
     describe "#policy_role_policies" do
       let(:collections) { FactoryGirl.build_list(:collection, 3) }
       before do
-        collections[0].roles.grant type: "Editor", agent: "foo", scope: "policy"
+        collections[0].roles.grant role_type: "Editor", agent: "foo", scope: "policy"
         collections[0].save
-        collections[1].roles.grant type: "Contributor", agent: "bar", scope: "policy"
+        collections[1].roles.grant role_type: "Contributor", agent: "bar", scope: "policy"
         collections[1].save
-        collections[2].roles.grant type: "Viewer", agent: "foo:bar", scope: "policy"
+        collections[2].roles.grant role_type: "Viewer", agent: "foo:bar", scope: "policy"
         collections[2].save
       end
       it "returns a list of IDs for collections on which the current ability has a role" do

data/spec/models/solr_document_spec.rb

@@ -82,12 +82,12 @@ RSpec.describe SolrDocument, type: :model, contacts: true do
   end
 
   describe "#roles" do
-    let(:json) { "[{\"role_type\":[\"Editor\"],\"agent\":[\"Editors\"],\"scope\":[\"policy\"]},{\"role_type\":[\"Contributor\"],\"agent\":[\"bob@example.com\"],\"scope\":[\"resource\"]}]" }
+    let(:json) { "{\"roles\":[{\"role_type\":\"Editor\",\"agent\":\"Editors\",\"scope\":\"policy\"},{\"role_type\":\"Contributor\",\"agent\":\"bob@example.com\",\"scope\":\"resource\"}]}" }
     before { subject[Ddr::Index::Fields::ACCESS_ROLE] = json }
     it "should deserialize the roles from JSON" do
       expect(subject.roles.to_a)
-        .to eq([Ddr::Auth::Roles::Role.build(type: "Editor", agent: "Editors", scope: "policy"),
-                Ddr::Auth::Roles::Role.build(type: "Contributor", agent: "bob@example.com", scope: "resource")])
+        .to eq([Ddr::Auth::Roles::Role.build(role_type: "Editor", agent: "Editors", scope: "policy"),
+                Ddr::Auth::Roles::Role.build(role_type: "Contributor", agent: "bob@example.com", scope: "resource")])
     end
   end
 

data/spec/support/shared_examples_for_non_collection_models.rb

@@ -4,7 +4,7 @@ RSpec.shared_examples "a non-collection model" do
     let(:user) { FactoryGirl.build(:user) }
     before { subject.grant_roles_to_creator(user) }
     it "should include the Editor role in resource scope" do
-      expect(subject.roles.to_a).to eq([Ddr::Auth::Roles::Role.build(type: "Editor", agent: user.agent, scope: "resource")])
+      expect(subject.roles.to_a).to eq([Ddr::Auth::Roles::Role.build(role_type: "Editor", agent: user.agent, scope: "resource")])
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-models
 version: !ruby/object:Gem::Version
-  version: 3.0.0.alpha.4
+  version: 3.0.0.beta.1
 platform: ruby
 authors:
 - Jim Coble
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-04 00:00:00.000000000 Z
+date: 2015-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '9.5'
+        version: 9.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '9.5'
+        version: 9.6.2
 - !ruby/object:Gem::Dependency
   name: hydra-validations
   requirement: !ruby/object:Gem::Requirement
@@ -209,16 +209,30 @@ dependencies:
   name: ddr-antivirus
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.1
+- !ruby/object:Gem::Dependency
+  name: virtus
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 1.0.5
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -337,14 +351,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.15'
+        version: 5.15.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.15'
+        version: 5.15.0
 description: Models used in the Duke Digital Repository
 email:
 - lib-drs@duke.edu
@@ -426,14 +440,14 @@ files:
 - lib/ddr/auth/resource_roles.rb
 - lib/ddr/auth/role_based_access_controls_enforcement.rb
 - lib/ddr/auth/roles.rb
-- lib/ddr/auth/roles/detached_role_set.rb
-- lib/ddr/auth/roles/property_role_set.rb
 - lib/ddr/auth/roles/role.rb
+- lib/ddr/auth/roles/role_attribute.rb
 - lib/ddr/auth/roles/role_set.rb
+- lib/ddr/auth/roles/role_set_manager.rb
 - lib/ddr/auth/roles/role_set_query.rb
 - lib/ddr/auth/roles/role_type.rb
 - lib/ddr/auth/roles/role_types.rb
-- lib/ddr/auth/roles/roles_datastream.rb
+- lib/ddr/auth/roles/role_validator.rb
 - lib/ddr/auth/superuser_ability.rb
 - lib/ddr/auth/test_helpers.rb
 - lib/ddr/auth/user.rb
@@ -497,7 +511,6 @@ files:
 - lib/ddr/models/attached_file_profile.rb
 - lib/ddr/models/attached_files_profile.rb
 - lib/ddr/models/base.rb
-- lib/ddr/models/describable.rb
 - lib/ddr/models/engine.rb
 - lib/ddr/models/error.rb
 - lib/ddr/models/event_loggable.rb
@@ -531,6 +544,8 @@ files:
 - lib/ddr/models/struct_div.rb
 - lib/ddr/models/structure.rb
 - lib/ddr/models/url_safe_id.rb
+- lib/ddr/models/validatable.rb
+- lib/ddr/models/validator.rb
 - lib/ddr/models/version.rb
 - lib/ddr/models/year_facet.rb
 - lib/ddr/notifications.rb
@@ -554,9 +569,9 @@ files:
 - spec/auth/group_spec.rb
 - spec/auth/groups_spec.rb
 - spec/auth/ldap_gateway_spec.rb
-- spec/auth/roles/detached_role_set_spec.rb
-- spec/auth/roles/property_role_set_spec.rb
+- spec/auth/roles/role_set_manager_spec.rb
 - spec/auth/roles/role_set_query_spec.rb
+- spec/auth/roles/role_set_spec.rb
 - spec/auth/roles/role_spec.rb
 - spec/auth/roles/role_type_spec.rb
 - spec/auth/superuser_ability_spec.rb
@@ -718,9 +733,9 @@ test_files:
 - spec/auth/group_spec.rb
 - spec/auth/groups_spec.rb
 - spec/auth/ldap_gateway_spec.rb
-- spec/auth/roles/detached_role_set_spec.rb
-- spec/auth/roles/property_role_set_spec.rb
+- spec/auth/roles/role_set_manager_spec.rb
 - spec/auth/roles/role_set_query_spec.rb
+- spec/auth/roles/role_set_spec.rb
 - spec/auth/roles/role_spec.rb
 - spec/auth/roles/role_type_spec.rb
 - spec/auth/superuser_ability_spec.rb

data/lib/ddr/auth/roles/detached_role_set.rb

@@ -1,59 +0,0 @@
-require "set"
-
-module Ddr
-  module Auth
-    module Roles
-      #
-      # Wraps a set of Roles detached from a repository object
-      #
-      class DetachedRoleSet < RoleSet
-
-        delegate :each, to: :role_set
-        
-        class << self
-          # Deserialize a serialized RoleSet into a DetachedRoleSet
-          def deserialize(serialized)
-            role_set = serialized.map { |role_data| Role.deserialize(role_data) }
-            new(role_set)
-          end
-
-          # Deserialize a JSON representation of a set of Roles into a DetachedRoleSet
-          def from_json(json)
-            deserialize JSON.parse(json)
-          end
-        end
-
-        attr_writer :role_set
-
-        def initialize(role_set = Set.new)
-          super role_set.to_set
-        end
-
-        def grant(*roles)
-          role_set.merge coerce(roles)
-        end
-
-        def revoke(*roles)
-          self.role_set -= coerce(roles)
-        end
-
-        def revoke_all
-          clear
-        end
-
-        def to_a
-          role_set.to_a
-        end
-
-        # Merges the roles from another role set into the role set
-        # @param other [Enumerable<Role>]
-        # @return [DetachedRoleSet] self
-        def merge(other)
-          role_set.merge other
-          self
-        end
-
-      end
-    end
-  end
-end

data/lib/ddr/auth/roles/property_role_set.rb

@@ -1,46 +0,0 @@
-module Ddr
-  module Auth
-    module Roles
-      #
-      # Wraps a set of Roles implemented as an ActiveTriples::Term.
-      #
-      class PropertyRoleSet < RoleSet
-
-        def grant(*roles)
-          if roles.present?
-            role_set << coerce(roles)
-          end
-        end
-        
-        # @note We have to destroy resources on the ActiveTriples::Term
-        #   because Term#delete does not support isomorphism.
-        # @see https://github.com/ActiveTriples/ActiveTriples/issues/42
-        def revoke(*roles)
-          coerce(roles).each do |role|
-            if role_index = find_index(role)
-              role_set[role_index].destroy
-            end
-          end
-        end
-
-        # @note We have to destroy resources on the
-        #   ActiveTriples::Term because Term#delete does not
-        #   support isomorphism.
-        # @see https://github.com/ActiveTriples/ActiveTriples/issues/42
-        def revoke_all
-          each(&:destroy)
-          self
-        end
-
-        def each(&block)
-          role_set.map.each(&block)
-        end
-
-        def to_set
-          map.to_set
-        end
-
-      end
-    end
-  end
-end

data/lib/ddr/auth/roles/roles_datastream.rb

@@ -1,9 +0,0 @@
-module Ddr::Auth::Roles
-  class RolesDatastream < ActiveFedora::NtriplesRDFDatastream
-
-    property :roles,
-             predicate: Ddr::Vocab::Roles.hasRole,
-             class_name: Ddr::Auth::Roles::Role
-
-  end
-end

data/lib/ddr/models/describable.rb

@@ -1,79 +0,0 @@
-module Ddr::Models
-  module Describable
-    extend ActiveSupport::Concern
-
-    included do
-      DescriptiveMetadata.mapping.each do |name, term|
-        property name, predicate: term.predicate do |index|
-          index.as :stored_searchable
-        end
-      end
-    end
-
-    def descMetadata
-      @descMetadata ||= DescriptiveMetadata.new(self)
-    end
-
-    def has_desc_metadata?
-      descMetadata.has_content?
-    end
-
-    def desc_metadata_terms *args
-      return DescriptiveMetadata.unqualified_names.sort if args.empty?
-      arg = args.pop
-      terms = case arg.to_sym
-              when :empty
-                desc_metadata_terms.select { |t| desc_metadata_values(t).empty? }
-              when :present
-                desc_metadata_terms.select { |t| desc_metadata_values(t).present? }
-              when :defined_attributes
-                desc_metadata_terms & desc_metadata_attributes
-              when :required
-                desc_metadata_terms(:defined_attributes).select {|t| required? t}
-              when :dcterms
-                MetadataMapping.dc11.unqualified_names +
-                  (MetadataMapping.dcterms.unqualified_names - MetadataMapping.dc11.unqualified_names)
-              when :dcterms_elements11
-                Ddr::Vocab::Vocabulary.term_names(RDF::DC11)
-              when :duke
-                Ddr::Vocab::Vocabulary.term_names(Ddr::Vocab::DukeTerms)
-              else
-                raise ArgumentError, "Invalid argument: #{arg.inspect}"
-              end
-      if args.empty?
-        terms
-      else
-        terms | desc_metadata_terms(*args)
-      end
-    end
-
-    def desc_metadata_attributes
-      MetadataMapping.dc11.unqualified_names
-    end
-
-    def desc_metadata_values(term)
-      descMetadata.values term
-    end
-
-    def desc_metadata_vocabs
-      descMetadata.class.vocabularies
-    end
-
-    def set_desc_metadata_values(term, values)
-      descMetadata.set_values term, values
-    end
-
-    # Update all descMetadata terms with values in hash
-    # Note that term not having key in hash will be set to nil!
-    def set_desc_metadata(term_values_hash)
-      desc_metadata_terms.each { |t| set_desc_metadata_values(t, term_values_hash[t]) }
-    end
-
-    module ClassMethods
-      def find_by_identifier(identifier)
-        find(Ddr::Index::Fields::IDENTIFIER_ALL => identifier)
-      end
-    end
-
-  end
-end

data/spec/auth/roles/detached_role_set_spec.rb

@@ -1,50 +0,0 @@
-module Ddr::Auth
-  module Roles
-    RSpec.describe DetachedRoleSet do
-
-      subject { described_class.new(wrapped) }
-      
-      let(:wrapped) { Set.new }
-
-      it_behaves_like "a role set"
-
-      describe "deserialization" do
-        let(:role1) { {type: "Editor", agent: "bob@example.com", scope: "resource"} }
-        let(:role2) { {type: "Curator", agent: "sue@example.com", scope: "policy"} }
-
-        before { subject.grant role1, role2 }
-        
-        it "should deserialize to an equalivalent role set" do
-          expect(described_class.deserialize(subject.serialize)).to eq(subject)
-        end
-
-        it "should load JSON data" do
-          expect(described_class.from_json("[{\"role_type\":[\"Editor\"],\"agent\":[\"bob@example.com\"],\"scope\":[\"resource\"]},{\"role_type\":[\"Curator\"],\"agent\":[\"sue@example.com\"],\"scope\":[\"policy\"]}]")).to eq(subject)
-        end
-      end
-
-      describe "conversion to a plain Array" do
-        let(:role1) { FactoryGirl.build(:role, :curator, :person, :policy) }
-        let(:role2) { FactoryGirl.build(:role, :editor, :group, :resource) }
-        before { subject.grant role1, role2 }
-        its(:to_a) { should eq([role1, role2]) }
-      end
-
-      describe "equality" do
-        let(:role1) { FactoryGirl.build(:role, :curator, :person, :policy) }
-        let(:role2) { FactoryGirl.build(:role, :editor, :group, :resource) }        
-        let(:other) { described_class.new(Array.new) }
-        before do
-          subject.grant role1, role2
-          other.grant role2, role1
-        end
-        it "should be equal to another role set if it has the same roles, regardless of order" do
-          expect(subject).to eq(other)
-        end
-      end
-
-    end
-    
-  end
-end
-

data/spec/auth/roles/property_role_set_spec.rb

@@ -1,32 +0,0 @@
-module Ddr::Auth
-  module Roles
-    RSpec.describe PropertyRoleSet, roles: true do
-
-      subject { described_class.new(wrapped) }
-      
-      let(:wrapped_class) do
-        Class.new(ActiveTriples::Resource) do
-          property :role, predicate: Ddr::Vocab::Roles.hasRole
-        end
-      end
-
-      let(:wrapped) { wrapped_class.new.role }
-
-      it_behaves_like "a role set"
-
-      describe "equality" do
-        let(:role1) { FactoryGirl.build(:role, :curator, :person, :policy) }
-        let(:role2) { FactoryGirl.build(:role, :editor, :group, :resource) }        
-        let(:other) { described_class.new(wrapped_class.new.role) }
-        before do
-          subject.grant role1, role2
-          other.grant role2, role1
-        end
-        it "should be equal to another role set if it has the same roles, regardless of order" do
-          expect(subject).to eq(other)
-        end
-      end
-
-    end
-  end
-end