ddr-models 2.11.0 → 3.0.0.alpha.1

data/lib/ddr/vocab/contact.rb

@@ -1,9 +1,11 @@
-module Ddr::Vocab
-  class Contact < RDF::StrictVocabulary("#{BASE_URI}/contact/")
+module Ddr
+  module Vocab
+    class Contact < RDF::StrictVocabulary("http://repository.lib.duke.edu/vocab/contact/")
 
-    property "assistance",
-             label: "Research Assistance",
-             comment: "Contact for research assistance with this object."
+      property "assistance",
+        label: "Research Assistance",
+        comment: "Contact for research assistance with this object."
 
+    end
   end
 end

data/lib/ddr/vocab/display.rb

@@ -1,9 +1,11 @@
-module Ddr::Vocab
-  class Display < RDF::StrictVocabulary("#{BASE_URI}/display/")
+module Ddr
+  module Vocab
+    class Display < RDF::StrictVocabulary("http://repository.lib.duke.edu/vocab/display/")
 
-    property "format",
-             label: "Display Format",
-             comment: "Format to use when displaying the object."
+      property "format",
+        label: "Display Format",
+        comment: "Format to use when displaying the object."
 
+    end
   end
-end
+end

data/lib/ddr/vocab/duke_terms.rb

@@ -1,13 +1,15 @@
-module Ddr::Vocab
+module Ddr
+  module Vocab
 
-  class DukeTerms < RDF::StrictVocabulary("http://library.duke.edu/metadata/terms/")
+    class DukeTerms < RDF::StrictVocabulary("http://library.duke.edu/metadata/terms/")
 
-    RDFVocabularyParser.new(
-      File.join(File.dirname( __FILE__ ), "sources", "duketerms.rdf"),
-      "http://library.duke.edu/metadata/terms/").
-      term_symbols.sort.each do |term|
-      property term, type: "rdf:Property".freeze
-    end
+      RDFVocabularyParser.new(
+              File.join(File.dirname( __FILE__ ), "sources", "duketerms.rdf"),
+              "http://library.duke.edu/metadata/terms/").
+              term_symbols.sort.each do |term|
+        property term, type: "rdf:Property".freeze
+      end
 
+    end
   end
 end

data/lib/ddr/vocab/rdf_vocabulary_parser.rb

@@ -1,43 +1,45 @@
 require 'rdf/rdfxml'
 
-module Ddr::Vocab
-  class RDFVocabularyParser
+module Ddr
+  module Vocab
+    class RDFVocabularyParser
+
+      attr_reader :source, :prefix
+
+      def initialize(source, prefix = "")
+        @source = source
+        @prefix = prefix
+      end
+
+      def term_names
+        @term_names ||= terms.collect { |t| t[:resource].to_s.sub(prefix, "") }.freeze
+      end
+
+      def term_symbols
+        term_names.map(&:to_sym)
+      end
+
+      def terms
+        properties.map(&:to_hash)
+      end
+
+      def properties
+        RDF::Query.execute(graph, properties_query)
+      end
+
+      def properties_query
+        {:resource => {
+            RDF.type => RDF.Property,
+            RDF::RDFS.label => :label,
+            RDF::RDFS.comment => :comment
+          }
+        }
+      end
+
+      def graph
+        @graph ||= RDF::Graph.load(source).freeze
+      end
 
-    attr_reader :source, :prefix
-
-    def initialize(source, prefix = "")
-      @source = source
-      @prefix = prefix
-    end
-
-    def term_names
-      @term_names ||= terms.collect { |t| t[:resource].to_s.sub(prefix, "") }.freeze
-    end
-
-    def term_symbols
-      term_names.map(&:to_sym)
-    end
-
-    def terms
-      properties.map(&:to_hash)
     end
-
-    def properties
-      RDF::Query.execute(graph, properties_query)
-    end
-
-    def properties_query
-      {:resource => {
-         RDF.type => RDF.Property,
-         RDF::RDFS.label => :label,
-         RDF::RDFS.comment => :comment
-       }
-      }
-    end
-
-    def graph
-      @graph ||= RDF::Graph.load(source).freeze
-    end
-
   end
 end

data/lib/ddr/vocab/roles.rb

@@ -1,25 +1,27 @@
-module Ddr::Vocab
-  class Roles < RDF::StrictVocabulary("#{BASE_URI}/roles/")
+module Ddr
+  module Vocab
+    class Roles < RDF::StrictVocabulary("http://repository.lib.duke.edu/vocab/roles/")
 
-    term :Role,
-         label: "Role",
-         comment: "An assertion of a role granted to an agent."
+      term :Role,
+        label: "Role",
+        comment: "An assertion of a role granted to an agent."
 
-    property :hasRole,
-             label: "Has Role",
-             comment: "Asserts the granting of a role on the subject to an agent."
+      property :hasRole,
+        label: "Has Role",
+        comment: "Asserts the granting of a role on the subject to an agent."
 
-    property :type,
-             label: "Type",
-             comment: "The type of role granted to the agent."
+      property :type,
+        label: "Type",
+        comment: "The type of role granted to the agent."
 
-    property :agent,
-             label: "Agent",
-             comment: "The agent to whom the role is granted."
+      property :agent,
+        label: "Agent",
+        comment: "The agent to whom the role is granted."
 
-    property :scope,
-             label: "Scope",
-             comment: "The scope within which the role applies."
+      property :scope,
+        label: "Scope",
+        comment: "The scope within which the role applies."
 
+    end
   end
 end

data/lib/ddr/vocab/sources/duketerms.rdf

@@ -843,28 +843,14 @@
         <rdfs:subPropertyOf rdf:resource="http://purl.org/dc/terms/IsPartOf"/>
     </rdf:Description>
 
-    <rdf:Description rdf:about="http://library.duke.edu/metadata/terms/biblical_book">
-        <rdfs:label xml:lang="en-US">Biblical Book</rdfs:label>
-        <rdfs:comment xml:lang="en-US"></rdfs:comment>
-        <dcterms:description xml:lang="en-US">Recommended best practice is to </dcterms:description>
-        <rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
-        <dcterms:issued>2018-06-01</dcterms:issued>
-        <dcterms:modified>2018-06-01</dcterms:modified>
-        <rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#Property"/>
-        <rdfs:range rdf:resource="http://www.w3.org/2000/01/rdf-schema#Class"/>
-        <rdfs:subPropertyOf rdf:resource="http://purl.org/dc/terms/subject"/>
-    </rdf:Description>
 
-    <rdf:Description rdf:about="http://library.duke.edu/metadata/terms/chapter_and_verse">
-        <rdfs:label xml:lang="en-US">Chapter and Verse</rdfs:label>
-        <rdfs:comment xml:lang="en-US"></rdfs:comment>
-        <dcterms:description xml:lang="en-US">Recommended best practice is to </dcterms:description>
-        <rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
-        <dcterms:issued>2018-06-01</dcterms:issued>
-        <dcterms:modified>2018-06-01</dcterms:modified>
-        <rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#Property"/>
-        <rdfs:range rdf:resource="http://www.w3.org/2000/01/rdf-schema#Class"/>
-        <rdfs:subPropertyOf rdf:resource="http://purl.org/dc/terms/subject"/>
-    </rdf:Description>
+
+
+
+
+
+
+
+
 
 </rdf:RDF>

data/lib/ddr/vocab/vocabulary.rb

@@ -1,37 +1,37 @@
-require 'rdf/vocab'
+module Ddr
+  module Vocab
+    class Vocabulary
 
-module Ddr::Vocab
-  class Vocabulary
+      def self.label(rdf_vocabulary)
+        case rdf_vocabulary.to_uri
+        when RDF::DC.to_uri
+          "DC Terms"
+        when DukeTerms.to_uri
+          "Duke Terms"
+        end
+      end
 
-    def self.label(rdf_vocabulary)
-      case rdf_vocabulary.to_uri
-      when RDF::Vocab::DC.to_uri
-        "DC Terms"
-      when DukeTerms.to_uri
-        "Duke Terms"
+      def self.namespace_prefix(rdf_vocabulary)
+        case rdf_vocabulary.to_uri
+        when RDF::DC.to_uri
+          "dcterms"
+        when DukeTerms.to_uri
+          "duke"
+        end
       end
-    end
 
-    def self.namespace_prefix(rdf_vocabulary)
-      case rdf_vocabulary.to_uri
-      when RDF::Vocab::DC.to_uri
-        "dcterms"
-      when DukeTerms.to_uri
-        "duke"
+      def self.property_terms(rdf_vocabulary)
+        rdf_vocabulary.properties.select { |p| p.type.include?("http://www.w3.org/1999/02/22-rdf-syntax-ns#Property") }
       end
-    end
 
-    def self.property_terms(rdf_vocabulary)
-      rdf_vocabulary.properties.select { |p| p.type.include?("http://www.w3.org/1999/02/22-rdf-syntax-ns#Property") }
-    end
+      def self.term_names(rdf_vocabulary)
+        self.property_terms(rdf_vocabulary).map { |term| self.term_name(rdf_vocabulary, term) }
+      end
 
-    def self.term_names(rdf_vocabulary)
-      self.property_terms(rdf_vocabulary).map { |term| self.term_name(rdf_vocabulary, term) }
-    end
+      def self.term_name(rdf_vocabulary, term)
+        term.to_s.gsub(rdf_vocabulary.to_uri.to_s, "").to_sym
+      end
 
-    def self.term_name(rdf_vocabulary, term)
-      term.to_s.gsub(rdf_vocabulary.to_uri.to_s, "").to_sym
     end
-
   end
 end

data/spec/auth/ability_factory_spec.rb

@@ -1,24 +1,7 @@
 module Ddr::Auth
   RSpec.describe AbilityFactory do
 
-    describe ".call" do
-      subject { described_class.call(user, env) }
-
-      describe "anonymous context" do
-        let(:user) { nil }
-        let(:env) { Hash.new }
-        it { is_expected.to be_a(AnonymousAbility) }
-      end
-
-      describe "superuser context" do
-        let(:user) { FactoryGirl.create(:user) }
-        let(:env) { Hash.new }
-        before {
-          allow_any_instance_of(AuthContext).to receive(:superuser?) { true }
-        }
-        it { is_expected.to be_a(SuperuserAbility) }
-      end
-    end
+    # write tests or delete this module
 
   end
 end

data/spec/auth/ability_spec.rb

@@ -2,7 +2,7 @@ module Ddr::Auth
   RSpec.describe Ability, type: :model, abilities: true do
 
     subject { described_class.new(auth_context) }
-
+    
     let(:auth_context) { FactoryGirl.build(:auth_context) }
 
     describe "aliases" do
@@ -15,7 +15,7 @@ module Ddr::Auth
     end
 
     describe "Datastream abilities" do
-      let(:obj) { FactoryGirl.build(:component) }
+      let(:obj) { FactoryGirl.create(:component) }
 
       DatastreamAbilityDefinitions::DATASTREAM_DOWNLOAD_ABILITIES.each do |dsid, permission|
         describe "\"#{dsid}\"" do
@@ -32,7 +32,7 @@ module Ddr::Auth
       end
 
       describe "non-downloadable datastreams" do
-        (Component.ds_specs.keys - DatastreamAbilityDefinitions::DATASTREAM_DOWNLOAD_ABILITIES.keys).each do |dsid|
+        (Component.ds_specs.keys.map(&:to_s) - DatastreamAbilityDefinitions::DATASTREAM_DOWNLOAD_ABILITIES.keys).each do |dsid|
           describe "\"#{dsid}\"" do
             let(:ds) { obj.datastreams[dsid] }
             before { subject.can :download, obj.pid }
@@ -56,58 +56,22 @@ module Ddr::Auth
       end
     end
 
-    describe "AdminSet abilities" do
-      describe "export" do
-        describe "when the user is a metadata manager" do
-          before {
-            allow(auth_context).to receive(:metadata_manager?) { true }
-          }
-          it { is_expected.to be_able_to(:export, Ddr::Models::AdminSet) }
-        end
-        describe "when the user is a metadata manager" do
-          before {
-            allow(auth_context).to receive(:metadata_manager?) { false }
-          }
-          it { is_expected.not_to be_able_to(:export, Ddr::Models::AdminSet) }
-        end
-      end
-    end
-
     describe "Collection abilities" do
-      describe "create" do
+      before do
+        allow(Ddr::Auth).to receive(:collection_creators_group) { "collection_creators" }
+      end
+      describe "when the user is a collection creator" do
         before do
-          allow(Ddr::Auth).to receive(:collection_creators_group) { "collection_creators" }
-        end
-        describe "when the user is a collection creator" do
-          before do
-            allow(auth_context).to receive(:member_of?) { false }
-            allow(auth_context).to receive(:member_of?).with("collection_creators") { true }
-          end
-          it { should be_able_to(:create, Collection) }
-        end
-
-        describe "when the user is not a collection creator" do
-          before do
-            allow(auth_context).to receive(:member_of?) { false }
-            allow(auth_context).to receive(:member_of?).with("collection_creators") { false }
-          end
-          it { should_not be_able_to(:create, Collection) }
+          allow(auth_context).to receive(:member_of?).with("collection_creators") { true }
         end
+        it { should be_able_to(:create, Collection) }
       end
-      describe "export" do
-        let(:collection) { FactoryGirl.build(:collection) }
-        describe "when the user has read permission via policy scope role" do
-          before {
-            collection.roles.grant role_type: "Viewer", agent: auth_context.user.to_s, scope: "policy"
-          }
-          it { is_expected.to be_able_to(:export, collection) }
-        end
-        describe "when the user does not have read permission via policy scope role" do
-          before {
-            collection.roles.grant role_type: "Viewer", agent: auth_context.user.to_s
-          }
-          it { is_expected.not_to be_able_to(:export, collection) }
+
+      describe "when the user is not a collection creator" do
+        before do
+          allow(auth_context).to receive(:member_of?).with("collection_creators") { false }
         end
+        it { should_not be_able_to(:create, Collection) }
       end
     end
 
@@ -180,74 +144,6 @@ module Ddr::Auth
       end
     end
 
-    describe "publication abilities" do
-      let(:obj) { Ddr::Models::Base.new }
-
-      describe "publish" do
-        describe "when role-based permissions permit publish" do
-          before do
-            allow(obj).to receive(:effective_permissions) { [ Permissions::PUBLISH ] }
-          end
-          describe "when the object is published" do
-            before { allow(obj).to receive(:published?) { true } }
-            it { should_not be_able_to(:publish, obj) }
-          end
-          describe "when the object is not published" do
-            describe "when the object is publishable" do
-              before { allow(obj).to receive(:publishable?) { true } }
-              it { should be_able_to(:publish, obj) }
-            end
-            describe "when the object is not publishable" do
-              before { allow(obj).to receive(:publishable?) { false } }
-              it { should_not be_able_to(:publish, obj) }
-            end
-          end
-        end
-        describe "when role-based permissions do not permit publish" do
-          before { allow(obj).to receive(:publishable?) { true } }
-          it { should_not be_able_to(:publish, obj) }
-        end
-      end
-
-      describe "unpublish" do
-        describe "when role-based permissions permit unpublish" do
-          before do
-            allow(obj).to receive(:effective_permissions) { [ Permissions::UNPUBLISH ] }
-          end
-          describe "when the object is published" do
-            before { allow(obj).to receive(:published?) { true } }
-            it { should be_able_to(:unpublish, obj) }
-          end
-          describe "when the object is not published" do
-            it { should_not be_able_to(:unpublish, obj) }
-          end
-        end
-        describe "when role-based permissions do not permit unpublish" do
-          it { should_not be_able_to(:unpublish, obj) }
-        end
-      end
-
-    end
-
-    describe "locks" do
-      let(:obj) { Ddr::Models::Base.new }
-
-      describe "effects of locks on abilities" do
-        before do
-          allow(obj).to receive(:effective_permissions) { Permissions::ALL }
-          allow(obj).to receive(:locked?) { true }
-        end
-        it { should be_able_to(:read, obj) }
-        it { should be_able_to(:download, obj) }
-        it { should_not be_able_to(:add_children, obj) }
-        it { should_not be_able_to(:update, obj) }
-        it { should_not be_able_to(:replace, obj) }
-        it { should_not be_able_to(:arrange, obj) }
-        it { should be_able_to(:audit, obj) }
-        it { should_not be_able_to(:grant, obj) }
-      end
-    end
-
     describe "role based abilities" do
       shared_examples "it has role based abilities" do
         describe "when permissions are cached" do
@@ -297,7 +193,7 @@ module Ddr::Auth
         let(:cache_key) { obj }
         let(:perm_obj) { SolrDocument.new({"id"=>"test:1"}) }
         before do
-          allow(SolrDocument).to receive(:find).with("test:1") { perm_obj }
+          allow_any_instance_of(RoleBasedAbilityDefinitions).to receive(:permissions_doc).with(obj) { perm_obj }
         end
         it_behaves_like "it has role based abilities"
       end