hydra-pcdm 0.8.2 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 612abf9f197aa3262b01ce197d9ef86e9ffbdaaa
-  data.tar.gz: a3112ae87173e39da38a9e0b4a26ec41031be03b
+  metadata.gz: 006a56a41489a68705b5f0ba39cb71adaebcd93a
+  data.tar.gz: 9bf9ac83b49048e144b2a595ad0a38ae16507936
 SHA512:
-  metadata.gz: 7bd4157e52e24c7be2e8125f05464c7bcffccd19a0abdca74afd9fafcb545f6fbeafbdae0fe69457aa94c6d79273b6746b602839bf9b24946a495b2ba24c2825
-  data.tar.gz: 38fbd6f1beca513ff55a939bbd75c39019895dc0b7ebe614390772bebe8917deed01050d2030628b49feb16ddf4a23a478c21c345768f03b0ff470d707732be5
+  metadata.gz: 45a1c0c840a1262986f00485d2eed19e0032c84dffabf0fa5ce51f7dcadd1e2dc0db5e02c748a4192c3e8fb541f1ca56d236726ddc2e0c02630421423d8a1b8d
+  data.tar.gz: 02969cb30e666ea14ced04268404702aea51fbee3f346957677d142e6bb907a685b1fcfac745c9017f7613cac55988171d7316b6ac88b7269fd5341babfa9b5b

data/.gitignore

@@ -24,4 +24,6 @@ mkmf.log
 .ruby-gemset
 .ruby-version
 fcrepo4-data
+fcrepo4-test-data
 jetty
+/spec/examples.txt

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--require spec_helper

data/lib/hydra/pcdm.rb

@@ -29,6 +29,7 @@ module Hydra
       autoload :PcdmBehavior
     end
 
+    autoload :PCDMIndexer
     autoload :CollectionIndexer
     autoload :ObjectIndexer
 

data/lib/hydra/pcdm/collection_indexer.rb

@@ -1,10 +1,7 @@
 module Hydra::PCDM
-  class CollectionIndexer < ObjectIndexer
+  class CollectionIndexer < PCDMIndexer
     def generate_solr_document
       super.tap do |solr_doc|
-        solr_doc[Config.indexing_member_ids_key] ||= []
-        solr_doc[Config.indexing_member_ids_key] += object.member_ids
-        solr_doc[Config.indexing_member_ids_key].uniq!
         solr_doc[Config.indexing_collection_ids_key] = object.ordered_collection_ids
       end
     end

data/lib/hydra/pcdm/config.rb

@@ -7,6 +7,11 @@ module Hydra
         INDEXING_MEMBER_IDS_KEY
       end
 
+      INDEXING_MEMBER_OF_COLLECTION_IDS_KEY = 'member_of_collection_ids_ssim'.freeze
+      def self.indexing_member_of_collection_ids_key
+        INDEXING_MEMBER_OF_COLLECTION_IDS_KEY
+      end
+
       INDEXING_COLLECTION_IDS_KEY = 'collection_ids_ssim'.freeze
       def self.indexing_collection_ids_key
         INDEXING_COLLECTION_IDS_KEY

data/lib/hydra/pcdm/models/concerns/object_behavior.rb

@@ -17,6 +17,14 @@ module Hydra::PCDM
 
       directly_contains :files, has_member_relation: Vocab::PCDMTerms.hasFile,
                                 class_name: 'Hydra::PCDM::File'
+
+      indirectly_contains :member_of_collections,
+                          has_member_relation: Vocab::PCDMTerms.memberOf,
+                          inserted_content_relation: RDF::Vocab::ORE.proxyFor,
+                          class_name: 'ActiveFedora::Base',
+                          through: 'ActiveFedora::Aggregation::Proxy',
+                          foreign_key: :target,
+                          type_validator: Validators::PCDMCollectionValidator
     end
 
     module ClassMethods
@@ -43,6 +51,10 @@ module Hydra::PCDM
       member_of.select(&:pcdm_object?).to_a
     end
 
+    def member_of_collection_ids
+      member_of_collections.map(&:id)
+    end
+
     # Returns directly contained files that have the requested RDF Type
     # @param [RDF::URI] uri for the desired Type
     # @example

data/lib/hydra/pcdm/object_indexer.rb

@@ -1,11 +1,8 @@
 module Hydra::PCDM
-  class ObjectIndexer < ActiveFedora::IndexingService
+  class ObjectIndexer < PCDMIndexer
     def generate_solr_document
       super.tap do |solr_doc|
-        solr_doc[Config.indexing_member_ids_key] ||= []
-        solr_doc[Config.indexing_member_ids_key] += object.member_ids
-        solr_doc[Config.indexing_member_ids_key].uniq!
-        solr_doc[Config.indexing_object_ids_key] = object.ordered_object_ids
+        solr_doc[Config.indexing_member_of_collection_ids_key] = object.member_of_collection_ids
       end
     end
   end

data/lib/hydra/pcdm/pcdm_indexer.rb

@@ -0,0 +1,12 @@
+module Hydra::PCDM
+  class PCDMIndexer < ActiveFedora::IndexingService
+    def generate_solr_document
+      super.tap do |solr_doc|
+        solr_doc[Config.indexing_member_ids_key] ||= []
+        solr_doc[Config.indexing_member_ids_key] += object.member_ids
+        solr_doc[Config.indexing_member_ids_key].uniq!
+        solr_doc[Config.indexing_object_ids_key] = object.ordered_object_ids
+      end
+    end
+  end
+end

data/lib/hydra/pcdm/version.rb

@@ -1,5 +1,5 @@
 module Hydra
   module PCDM
-    VERSION = '0.8.2'.freeze
+    VERSION = '0.9.0'.freeze
   end
 end

data/lib/hydra/pcdm/vocab/pcdm_terms.rb

@@ -49,13 +49,21 @@ module Hydra::PCDM
            type: 'rdfs:Class'.freeze
 
       # Property definitions
+      property :fileOf,
+               comment: %(Links from a File to its containing Object.).freeze,
+               domain: 'http://pcdm.org/models#File'.freeze,
+               label: 'is file of'.freeze,
+               range: 'http://pcdm.org/models#Object'.freeze,
+               'rdfs:isDefinedBy' => %(http://pcdm.org/models#).freeze,
+               subPropertyOf: 'http://www.openarchives.org/ore/terms/isAggregatedBy'.freeze,
+               type: 'rdf:Property'.freeze
       property :hasFile,
                comment: %(Links to a File contained by this Object.).freeze,
                domain: 'http://pcdm.org/models#Object'.freeze,
                label: 'has file'.freeze,
                range: 'http://pcdm.org/models#File'.freeze,
                'rdfs:isDefinedBy' => %(http://pcdm.org/models#).freeze,
-               subPropertyOf: 'http://www.w3.org/ns/ldp#contains'.freeze,
+               subPropertyOf: 'http://www.openarchives.org/ore/terms/aggregates'.freeze,
                type: 'rdf:Property'.freeze
       property :hasMember,
                comment: %(Links to a related Object. Typically used to link to component parts, such as a book linking to a page.).freeze,
@@ -65,13 +73,29 @@ module Hydra::PCDM
                'rdfs:isDefinedBy' => %(http://pcdm.org/models#).freeze,
                subPropertyOf: 'http://www.openarchives.org/ore/terms/aggregates'.freeze,
                type: 'rdf:Property'.freeze
-      property :hasRelatedFile,
-               comment: %(Links to a File which is related to this Object but doesn't directly describe or represent it, such as technical metadata about other files.).freeze,
+      property :hasRelatedObject,
+               comment: %(Links to a related Object that is not a component part, such as an object representing a donor agreement or policies that govern the resource.).freeze,
+               domain: 'http://www.openarchives.org/ore/terms/Aggregation'.freeze,
+               label: 'has related object'.freeze,
+               range: 'http://pcdm.org/models#Object'.freeze,
+               'rdfs:isDefinedBy' => %(http://pcdm.org/models#).freeze,
+               subPropertyOf: 'http://www.openarchives.org/ore/terms/aggregates'.freeze,
+               type: 'rdf:Property'.freeze
+      property :memberOf,
+               comment: %(Links from an Object or Collection to a containing Object or Collection.).freeze,
+               domain: 'http://www.openarchives.org/ore/terms/Aggregation'.freeze,
+               label: 'is member of'.freeze,
+               range: 'http://www.openarchives.org/ore/terms/Aggregation'.freeze,
+               'rdfs:isDefinedBy' => %(http://pcdm.org/models#).freeze,
+               subPropertyOf: 'http://www.openarchives.org/ore/terms/isAggregatedBy'.freeze,
+               type: 'rdf:Property'.freeze
+      property :relatedObjectOf,
+               comment: %(Links from an Object to a Object or Collection that it is related to.).freeze,
                domain: 'http://pcdm.org/models#Object'.freeze,
-               label: 'has related file'.freeze,
-               range: 'http://pcdm.org/models#File'.freeze,
+               label: 'is related object of'.freeze,
+               range: 'http://www.openarchives.org/ore/terms/Aggregation'.freeze,
                'rdfs:isDefinedBy' => %(http://pcdm.org/models#).freeze,
-               subPropertyOf: 'http://www.w3.org/ns/ldp#contains'.freeze,
+               subPropertyOf: 'http://www.openarchives.org/ore/terms/isAggregatedBy'.freeze,
                type: 'rdf:Property'.freeze
 
       # Extra definitions

data/spec/hydra/pcdm/models/object_spec.rb

@@ -516,4 +516,28 @@ describe Hydra::PCDM::Object do
       it { is_expected.to eq IndexingStuff::AltIndexer }
     end
   end
+
+  describe 'membership in collections' do
+    let(:collection1) { Hydra::PCDM::Collection.create }
+    let(:collection2) { Hydra::PCDM::Collection.create }
+
+    subject do
+      object = described_class.new
+      object.member_of_collections = [collection1, collection2]
+      object.save
+      object
+    end
+
+    describe '#member_of_collections' do
+      it 'contains collections the object is a member of' do
+        expect(subject.member_of_collections).to match_array [collection1, collection2]
+      end
+    end
+
+    describe '#member_of_collection_ids' do
+      it 'contains the ids of collections the object is a member of' do
+        expect(subject.member_of_collection_ids).to match_array [collection1.id, collection2.id]
+      end
+    end
+  end
 end

data/spec/hydra/pcdm/object_indexer_spec.rb

@@ -4,10 +4,13 @@ describe Hydra::PCDM::ObjectIndexer do
   let(:object)        { Hydra::PCDM::Object.new }
   let(:child_object1) { Hydra::PCDM::Object.new(id: '123') }
   let(:child_object2) { Hydra::PCDM::Object.new(id: '456') }
+  let(:collection1)   { Hydra::PCDM::Collection.new(id: 'abc') }
+  let(:collection2)   { Hydra::PCDM::Collection.new(id: 'def') }
   let(:indexer)       { described_class.new(object) }
 
   before do
     allow(object).to receive(:ordered_object_ids).and_return([child_object1.id, child_object2.id])
+    allow(object).to receive(:member_of_collection_ids).and_return([collection1.id, collection2.id])
   end
 
   describe '#generate_solr_document' do
@@ -15,6 +18,7 @@ describe Hydra::PCDM::ObjectIndexer do
 
     it 'has fields' do
       expect(subject[Hydra::PCDM::Config.indexing_object_ids_key]).to eq %w(123 456)
+      expect(subject[Hydra::PCDM::Config.indexing_member_of_collection_ids_key]).to eq %w(abc def)
     end
   end
 end

data/spec/hydra/pcdm/pcdm_indexer_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe Hydra::PCDM::PCDMIndexer do
+  let(:collection) { Hydra::PCDM::Collection.new }
+  let(:member_ids) { %w(123 456 789) }
+  let(:indexer) { described_class.new(collection) }
+
+  before do
+    allow(collection).to receive(:member_ids).and_return(member_ids)
+  end
+
+  describe '#generate_solr_document' do
+    subject { indexer.generate_solr_document }
+
+    it 'has fields' do
+      expect(subject[Hydra::PCDM::Config.indexing_member_ids_key]).to eq %w(123 456 789)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -28,16 +28,81 @@ Dir['./spec/support/**/*.rb'].each { |f| require f }
 # HttpLogger.log_headers = true
 
 RSpec.configure do |config|
-  config.color = true
-  config.tty = true
-
   # Uncomment the following line to get errors and backtrace for deprecation warnings
   # config.raise_errors_for_deprecations!
 
-  # Use the specified formatter
-  config.formatter = :progress
-
   config.before :suite do
     ActiveFedora::Cleaner.clean! if ActiveFedora::Base.count > 0
   end
+  # rspec-expectations config goes here. You can use an alternate
+  # assertion/expectation library such as wrong or the stdlib/minitest
+  # assertions if you prefer.
+  config.expect_with :rspec do |expectations|
+    # This option will default to `true` in RSpec 4. It makes the `description`
+    # and `failure_message` of custom matchers include text for helper methods
+    # defined using `chain`, e.g.:
+    #     be_bigger_than(2).and_smaller_than(4).description
+    #     # => "be bigger than 2 and smaller than 4"
+    # ...rather than:
+    #     # => "be bigger than 2"
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  # rspec-mocks config goes here. You can use an alternate test double
+  # library (such as bogus or mocha) by changing the `mock_with` option here.
+  config.mock_with :rspec do |mocks|
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended, and will default to
+    # `true` in RSpec 4.
+    mocks.verify_partial_doubles = true
+  end
+
+  # This option will default to `:apply_to_host_groups` in RSpec 4 (and will
+  # have no way to turn it off -- the option exists only for backwards
+  # compatibility in RSpec 3). It causes shared context metadata to be
+  # inherited by the metadata hash of host groups and examples, rather than
+  # triggering implicit auto-inclusion in groups with matching metadata.
+  config.shared_context_metadata_behavior = :apply_to_host_groups
+
+  # The settings below are suggested to provide a good initial experience
+  # with RSpec, but feel free to customize to your heart's content.
+
+  # This allows you to limit a spec run to individual examples or groups
+  # you care about by tagging them with `:focus` metadata. When nothing
+  # is tagged with `:focus`, all examples get run. RSpec also provides
+  # aliases for `it`, `describe`, and `context` that include `:focus`
+  # metadata: `fit`, `fdescribe` and `fcontext`, respectively.
+  config.filter_run_when_matching :focus
+
+  # Allows RSpec to persist some state between runs in order to support
+  # the `--only-failures` and `--next-failure` CLI options. We recommend
+  # you configure your source control system to ignore this file.
+  config.example_status_persistence_file_path = 'spec/examples.txt'
+
+  # 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
+  # individual spec file.
+  if config.files_to_run.one?
+    # Use the documentation formatter for detailed output,
+    # unless a formatter has already been configured
+    # (e.g. via a command-line flag).
+    config.default_formatter = 'doc'
+  end
+
+  # 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
+
+  # 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
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = :random
+
+  # Seed global randomization in this process using the `--seed` CLI option.
+  # Setting this allows you to use `--seed` to deterministically reproduce
+  # test failures related to randomization by passing the same `--seed` value
+  # as the one that triggered the failure.
+  Kernel.srand config.seed
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hydra-pcdm
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.0
 platform: ruby
 authors:
 - E. Lynette Rayle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-10 00:00:00.000000000 Z
+date: 2016-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -137,6 +137,7 @@ extra_rdoc_files: []
 files:
 - ".coveralls.yml"
 - ".gitignore"
+- ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
 - CONTRIBUTING.md
@@ -157,6 +158,7 @@ files:
 - lib/hydra/pcdm/models/file.rb
 - lib/hydra/pcdm/models/object.rb
 - lib/hydra/pcdm/object_indexer.rb
+- lib/hydra/pcdm/pcdm_indexer.rb
 - lib/hydra/pcdm/services/file/add_type.rb
 - lib/hydra/pcdm/services/file/get_mime_type.rb
 - lib/hydra/pcdm/validators.rb
@@ -190,6 +192,7 @@ files:
 - spec/hydra/pcdm/models/file_spec.rb
 - spec/hydra/pcdm/models/object_spec.rb
 - spec/hydra/pcdm/object_indexer_spec.rb
+- spec/hydra/pcdm/pcdm_indexer_spec.rb
 - spec/hydra/pcdm/services/file/get_mime_type_spec.rb
 - spec/hydra/pcdm_spec.rb
 - spec/spec_helper.rb
@@ -225,6 +228,7 @@ test_files:
 - spec/hydra/pcdm/models/file_spec.rb
 - spec/hydra/pcdm/models/object_spec.rb
 - spec/hydra/pcdm/object_indexer_spec.rb
+- spec/hydra/pcdm/pcdm_indexer_spec.rb
 - spec/hydra/pcdm/services/file/get_mime_type_spec.rb
 - spec/hydra/pcdm_spec.rb
 - spec/spec_helper.rb