rof 1.2.0 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa7099ebb75041867fac5b65720c86773fb645e0
-  data.tar.gz: 21ab74ec208d2e2e6b41ef3ffa061b0824e45674
+  metadata.gz: 2e7e89b3743a07578f148505d8226c5214f14d3f
+  data.tar.gz: 57ad5579aad0fc95f217be7de73910216faf52d7
 SHA512:
-  metadata.gz: 3721b89f933f47cf9535718c3d35a1a2cc5664c3eccbb728a39494473f5e8c7411a33fd0171d204501a200c3b6074dea29b92384b97cb3274b69d4cc12511d73
-  data.tar.gz: eff5c5cce4953dcaca174fc0d51d682cbc811250f3b30090679bdce78821599c74c625c04a46bccc37feeab78032b7cc92e15f4bf3d52b8f11efc67e812b385b
+  metadata.gz: 3955c71a26485168038e7bc6ca0546dfe33b6828e4f5921453bcebe629c4e44b91800ad2a65e5cbd71e7dc3e9d50fdd34a2d90026f429f40381167d969ee2ede
+  data.tar.gz: 71b836f300477b6e497a90943476b676fea747fb4876192fd5fa1207c095b189dc2d8514268d192da8fb78031091aece9e6350083d8ea848e69b8332d452325c

data/bin/bundle

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+load Gem.bin_path('bundler', 'bundle')

data/bin/csv_to_rof

@@ -22,4 +22,4 @@ end
 
 STDIN.set_encoding("UTF-8")
 csv_contents = STDIN.read
-ROF::Translators.csv_to_rof(csv_contents, {}, STDOUT)
+ROF::CLI.csv_to_rof(csv_contents, {}, STDOUT)

data/lib/rof/filters.rb

@@ -17,6 +17,7 @@ module ROF
       "file-to-url" => ROF::Filters::FileToUrl,
       "label" => ROF::Filters::Label,
       "work" => ROF::Filters::Work,
+      "access-to-relsext" => ROF::Filters::AccessToRelsext
     }
     # @api public
     #

data/lib/rof/filters/access_to_relsext.rb

@@ -0,0 +1,47 @@
+require 'rof/filter'
+module ROF
+  module Filters
+
+    class AccessToRelsext < ROF::Filter
+      def initialize(options = {})
+      end
+
+      def process(obj_list)
+        # We need to map access with pid to rels-ext predicates
+        obj_list.map! do |obj|
+          obj.fetch("rights").each do |access_type, access_list|
+            convert_to_relsext(access_type, access_list, obj)
+          end
+          obj
+        end
+      end
+
+      def convert_to_relsext(access_type, access_list, rof)
+        # map any access fields of the form XXX:YYY into
+        # a rels-ext section
+        Array.wrap(access_list).each do |access_user|
+          if access_user =~ /([^:]+):.+/
+            rof['rels-ext'] ||= {}
+            case access_type
+              when "read"
+                rof['rels-ext']['hasViewer'] ||=[]
+                rof['rels-ext']['hasViewer'] << access_user
+              when "read-groups"
+                rof['rels-ext']['hasViewerGroup'] ||= []
+                rof['rels-ext']['hasViewerGroup'] << access_user
+              when "edit"
+                rof['rels-ext']['hasEditor'] ||= []
+                rof['rels-ext']['hasEditor'] << access_user
+              when "edit-groups"
+                rof['rels-ext']['hasEditorGroup'] ||= []
+                rof['rels-ext']['hasEditorGroup'] << access_user
+              else
+                raise AccessMappingNotFound
+            end
+          end
+        end
+        return rof
+      end
+    end
+  end
+end

data/lib/rof/filters/label.rb

@@ -16,21 +16,21 @@ module ROF
       class OutOfIdentifiers < RuntimeError
       end
 
-      # Create a new label assigner and resolver. The source of identifiers
-      # is given using options.
-      # Use :noid_server and :pool_name to connect to an external noid server.
-      # Use :id_list to pass in a ruby object responding to #shift and #empty? to generate
-      # ids. This is usually a list, to facilitate testing.
-      #
-      # If prefix is not nil, then "<prefix>:" is prepended to
-      # every identifier.
+      class AccessMappingNotFound < RuntimeError
+      end
+
+      # @param options [Hash]
+      # @option options [String, nil] :prefix - if truthy, prepend "<prefix>:" to each identifier
+      # @option options [Array, nil] :id_list - circumvent using the :noids configuration and instead use these for next_ids
+      # @option options [Hash] :noids - A Hash with keys :noid_server and :pool_name; Responsible for minting next_ids
+      # @raise NoPool if we don't have a means of determining the next_id
       def initialize(options = {})
         prefix = options.fetch(:prefix, nil)
         @id_list =  case
                     when options[:id_list]
                       options[:id_list]
-                    when options[:noid_server]
-                      NoidsPool.new(options[:noid_server], options.fetch(:pool_name))
+                    when options[:noids]
+                      NoidsPool.new(options[:noids].fetch(:noid_server), options[:noids].fetch(:pool_name))
                     else
                       raise NoPool
                     end

data/lib/rof/ingesters/rels_ext_ingester.rb

@@ -52,9 +52,9 @@ module ROF
         # This is kinda hacky. Is there a better way?
         input.each do |relation, targets|
           next if relation == "@context" || relation == "@id" || relation == "hasModel"
-          targets = [targets] if targets.is_a? String
+          targets = [targets] if targets.is_a?(String) || targets.is_a?(Hash)
           input[relation] = targets.map do |target|
-            target.is_a?(String) ? {"@id" => "info:fedora/#{target}"} : target
+            target.is_a?(String) ? {"@id" => "info:fedora/#{target}"} : prefix_ids_recursive(target)
           end
         end
 
@@ -62,6 +62,20 @@ module ROF
         graph.dump(:rdfxml)
       end
 
+      # prefix all strings or hash values with "info:fedora/"
+      # recursively decends into arrays and hashes
+      def prefix_ids_recursive(data)
+          return "info:fedora/" + data if data.is_a?(String)
+          if data.is_a?(Array)
+              return data.map { |x| prefix_ids_recursive(x) }
+          end
+          if data.is_a?(Hash)
+              return Hash[data.map { |k,v| [k, prefix_ids_recursive(v)] }]
+          end
+          # don't know what data is. just return it
+          data
+      end
+
       def persist(content)
         if fdoc
           ds = fdoc['RELS-EXT']

data/lib/rof/rdf_context.rb

@@ -4,7 +4,7 @@ module ROF
     'dc' => 'http://purl.org/dc/terms/',
     'ebucore' => 'http://www.ebu.ch/metadata/ontologies/ebucore/ebucore#',
     'foaf' => 'http://xmlns.com/foaf/0.1/',
-    'hydramata-rel' => 'http://projecthydra.org/ns/relations#',
+    'hydra' => 'http://projecthydra.org/ns/relations#',
     'mrel' => 'http://id.loc.gov/vocabulary/relators/',
     'ms' => 'http://www.ndltd.org/standards/metadata/etdms/1.1/',
     'nd' => 'https://library.nd.edu/ns/terms/',
@@ -30,8 +30,10 @@ module ROF
     'pav' => 'http://purl.org/pav/',
     'hydra' => 'http://projecthydra.org/ns/relations#',
     'hasModel' => { '@id' => 'fedora-model:hasModel', '@type' => '@id' },
-    'hasEditor' => { '@id' => 'hydra:hasEditor', '@type' => '@id' },
-    'hasEditorGroup' => { '@id' => 'hydra:hasEditorGroup', '@type' => '@id' },
+    "hasEditor"=>{"@id"=>"hydra:hasEditor", "@type"=>"@id"},
+    "hasEditorGroup"=>{"@id"=>"hydra:hasEditorGroup", "@type"=>"@id"},
+    "hasViewer"=>{"@id"=>"hydra:hasViewer", "@type"=>"@id"},
+    "hasViewerGroup"=>{"@id"=>"hydra:hasViewerGroup", "@type"=>"@id"},
     'isPartOf' => { '@type' => '@id' },
     'isMemberOfCollection' => { '@type' => '@id' },
     'isEditorOf' => { '@id' => 'hydra:isEditorOf', '@type' => '@id' },

data/lib/rof/translators/fedora_to_rof.rb

@@ -27,9 +27,11 @@ module ROF
       attr_reader :pids, :fedora_connection_information, :config, :connection
 
       private
-        def connect_to_fedora!
-          @connection = Rubydora.connect(fedora_connection_information)
-        end
+
+      def connect_to_fedora!
+        @connection = Rubydora.connect(fedora_connection_information)
+      end
+
       public
 
       def to_rof
@@ -59,7 +61,12 @@ module ROF
           # use reflection to call appropriate method for each
           fedora_object.datastreams.each do |dsname, ds|
             method_name = DATASTREAM_NAME_TO_METHOD_MAP.fetch(dsname) { :default_datastream_conversion }
-            send(method_name, dsname, ds)
+            begin
+              send(method_name, dsname, ds)
+            rescue => e
+              # if a named method throws a conversion, try the default datastream conversion
+              default_datastream_conversion(dsname, ds)
+            end
           end
           @fedora_info
         end
@@ -74,7 +81,7 @@ module ROF
           'bendo-item'       => :default_datastream_conversion,
           'characterization' => :default_datastream_conversion,
           'thumbnail'        => :default_datastream_conversion
-        }
+        }.freeze
 
         private
 

data/lib/rof/translators/jsonld_to_rof/statement_handler.rb

@@ -63,8 +63,11 @@ module ROF
             PredicateObjectHandler.call(@statement.predicate, @statement.object, @accumulator)
           end
 
+          # Handle the various CurateND environments instead of just curate.nd.edu
+          REGEXP_FOR_A_CURATE_RDF_SUBJECT = %r{https://curate(?:[\w\.]*).nd.edu/show/([^\\]+)/?}.freeze
+
           def handle_subject
-            return nil unless @statement.subject.to_s =~ %r{https://curate.nd.edu/show/([^\\]+)/?}
+            return nil unless @statement.subject.to_s =~ REGEXP_FOR_A_CURATE_RDF_SUBJECT
             pid = "und:#{$1}"
             @accumulator.add_pid(pid)
           end

data/lib/rof/version.rb

@@ -1,3 +1,3 @@
 module ROF
-  VERSION="1.2.0"
+  VERSION="1.2.3"
 end

data/spec/fixtures/DLTP-999/pr76f190f54.jsonld

@@ -0,0 +1,90 @@
+{
+  "@context": {
+    "und": "https://curatesvrpprd.library.nd.edu/show/",
+    "bibo": "http://purl.org/ontology/bibo/",
+    "dc": "http://purl.org/dc/terms/",
+    "ebucore": "http://www.ebu.ch/metadata/ontologies/ebucore/ebucore#",
+    "foaf": "http://xmlns.com/foaf/0.1/",
+    "mrel": "http://id.loc.gov/vocabulary/relators/",
+    "nd": "https://library.nd.edu/ns/terms/",
+    "rdfs": "http://www.w3.org/2000/01/rdf-schema#",
+    "vracore": "http://purl.org/vra/",
+    "frels": "info:fedora/fedora-system:def/relations-external#",
+    "ms": "http://www.ndltd.org/standards/metadata/etdms/1.1/",
+    "pav": "http://purl.org/pav/",
+    "fedora-model": "info:fedora/fedora-system:def/model#",
+    "hydra": "http://projecthydra.org/ns/relations#",
+    "hasModel": {
+      "@id": "fedora-model:hasModel",
+      "@type": "@id"
+    },
+    "hasEditor": {
+      "@id": "hydra:hasEditor",
+      "@type": "@id"
+    },
+    "hasEditorGroup": {
+      "@id": "hydra:hasEditorGroup",
+      "@type": "@id"
+    },
+    "isPartOf": {
+      "@id": "frels:isPartOf",
+      "@type": "@id"
+    },
+    "isMemberOfCollection": {
+      "@id": "frels:isMemberOfCollection",
+      "@type": "@id"
+    },
+    "isEditorOf": {
+      "@id": "hydra:isEditorOf",
+      "@type": "@id"
+    },
+    "hasMember": {
+      "@id": "frels:hasMember",
+      "@type": "@id"
+    },
+    "previousVersion": "pav:previousVersion"
+  },
+  "@graph": [
+    {
+      "@id": "_:b0",
+      "dc:contributor": "Faculty 1",
+      "ms:role": "Research Director"
+    },
+    {
+      "@id": "_:b1",
+      "ms:discipline": "Electrical Engineering",
+      "ms:level": "Doctoral Dissertation",
+      "ms:name": "Doctor of Philosophy"
+    },
+    {
+      "@id": "und:pr76f190f54",
+      "dc:contributor": {
+        "@id": "_:b0"
+      },
+      "dc:creator": "Author 1",
+      "dc:date": "2015-07-06",
+      "dc:dateSubmitted": "2016-02-18Z",
+      "dc:creator#administrative_unit": "University of Notre Dame::College of Engineering::Electrical Engineering",
+      "dc:description#abstract": "<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>",
+      "dc:language": "English",
+      "dc:modified": "2016-02-18Z",
+      "dc:rights": "All rights reserved",
+      "dc:subject": "Lorem ipsum dolor sit amet",
+      "dc:title": "Lorem ipsum dolor sit amet",
+      "hydra:hasEditor": {
+        "@id": "und:m900ns08d06"
+      },
+      "hydra:hasEditorGroup": {
+        "@id": "und:m613mw2539x"
+      },
+      "ms:degree": {
+        "@id": "_:b1"
+      },
+      "nd:accessEdit": "curate_batch_user",
+      "nd:accessRead": "wma1",
+      "nd:accessReadGroup": "public",
+      "nd:afmodel": "Etd",
+      "nd:depositor": "curate_batch_user"
+    }
+  ]
+}

data/spec/lib/rof/filters/access_to_relsext_spec.rb

@@ -0,0 +1,49 @@
+require 'spec_helper'
+require 'rof/filters/access_to_relsext'
+require 'support/an_rof_filter'
+
+RSpec.describe ROF::Filters::AccessToRelsext do
+  it_behaves_like "an ROF::Filter"
+  let(:access_to_relsext){ nil }
+  let(:valid_options) { {} }
+
+  describe '#process' do
+    subject { described_class.new.process(original_object_list) }
+    let(:original_object_list) do
+      [
+        { "rights" => {
+            "read-groups" => ["bogus", "registered" ],
+            "edit" => [
+            "non-pid",
+            "und:pid"],
+            "embargo-date"=> "2016-12-25",
+            "edit-groups" => ["und:editgrouppid"]
+          }
+        }
+      ]
+    end
+    context 'maps to relsext' do
+      it 'will map access to relsext' do
+        expected_object_list = [
+          {
+            "rights" => {
+            "read-groups" => ["bogus", "registered"],
+            "edit" => [
+                "non-pid",
+                "und:pid"],
+            "embargo-date"=> "2016-12-25",
+            "edit-groups" => ["und:editgrouppid"]
+            },
+           "rels-ext" => {
+              "hasEditor" => ["und:pid"],
+              "hasEditorGroup"=> ["und:editgrouppid"]
+           }
+          }
+        ]
+        expect(subject).to eq(expected_object_list)
+      end
+    end
+
+
+  end
+end

data/spec/lib/rof/filters/label_spec.rb

@@ -16,7 +16,7 @@ module ROF
           noid_server = double
           pool_name = double
           expect(described_class::NoidsPool).to receive(:new).with(noid_server, pool_name)
-          expect { Label.new(noid_server: noid_server, pool_name: pool_name) }.not_to raise_error
+          expect { Label.new(noids: { noid_server: noid_server, pool_name: pool_name }) }.not_to raise_error
         end
         it 'will fail if not given a list of IDs nor a noid_server' do
           expect { Label.new }.to raise_error(described_class::NoPool)

data/spec/lib/rof/ingesters/rels_ext_ingester_spec.rb

@@ -57,6 +57,29 @@ module ROF
           subject.call
         end
       end
+
+      context 'it handles nested objects' do
+        let(:item) {
+            { "pid" => 'abc:1234',
+              "rels-ext" => {
+                "isMemberOf" => { "@id" => "xyz:789" }
+            }}
+        }
+
+        let(:expected_content) {
+%Q{
+<?xml version='1.0' encoding='utf-8' ?>
+<rdf:RDF xmlns:ns0='info:fedora/fedora-system:def/model#' xmlns:ns1='info:fedora/fedora-system:def/relations-external#' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>
+  <rdf:Description rdf:about='info:fedora/abc:1234'>
+    <ns0:hasModel rdf:resource='info:fedora/afmodel:Shoe' />
+    <ns1:isMemberOf rdf:resource='info:fedora/xyz:789' />
+  </rdf:Description>
+</rdf:RDF>
+}
+        }
+
+        its(:call) { should be_equivalent_to(expected_content) }
+      end
     end
   end
 end

data/spec/lib/rof/translators/fedora_to_rof_spec.rb

@@ -35,7 +35,7 @@ RSpec.describe ROF::Translators::FedoraToRof do
              "dc"=>"http://purl.org/dc/terms/",
              "ebucore"=>"http://www.ebu.ch/metadata/ontologies/ebucore/ebucore#",
              "foaf"=>"http://xmlns.com/foaf/0.1/",
-             'hydramata-rel' => 'http://projecthydra.org/ns/relations#',
+             'hydra' => 'http://projecthydra.org/ns/relations#',
              "mrel"=>"http://id.loc.gov/vocabulary/relators/",
              "ms" => 'http://www.ndltd.org/standards/metadata/etdms/1.1/',
              "nd"=>"https://library.nd.edu/ns/terms/",

data/spec/lib/rof/translators/jsonld_to_rof_spec.rb

@@ -8,6 +8,14 @@ module ROF
     # find . -maxdepth 2 -name '*.rof' -type f | xargs grep -l <pid>
     # ```
     RSpec.describe JsonldToRof do
+      describe 'DLTP-999 regression' do
+        it 'converts @graph > @id keys to pid' do
+          jsonld_from_curatend = JSON.load(File.read(File.join(GEM_ROOT, "spec/fixtures/DLTP-999/pr76f190f54.jsonld")))
+          output = described_class.call(jsonld_from_curatend, {})
+          expect(output.size).to eq(1) # We have one item
+          expect(output.first.fetch('pid')).to eq('und:pr76f190f54')
+        end
+      end
       describe '.call' do
         [
           '2j62s467216',

data/spec/lib/rof/translators/osf_to_rof_spec.rb

@@ -41,6 +41,8 @@ RSpec.describe ROF::Translators::OsfToRof do
                                    "hasModel"=>{"@id"=>"fedora-model:hasModel", "@type"=>"@id"},
                                    "hasEditor"=>{"@id"=>"hydra:hasEditor", "@type"=>"@id"},
                                    "hasEditorGroup"=>{"@id"=>"hydra:hasEditorGroup", "@type"=>"@id"},
+                                   "hasViewer"=>{"@id"=>"hydra:hasViewer", "@type"=>"@id"},
+                                   "hasViewerGroup"=>{"@id"=>"hydra:hasViewerGroup", "@type"=>"@id"},
                                    "isPartOf"=>{"@type"=>"@id"},
                                    "isMemberOfCollection"=>{"@type"=>"@id"},
                                    "isEditorOf"=>{"@id"=>"hydra:isEditorOf", "@type"=>"@id"},
@@ -50,7 +52,7 @@ RSpec.describe ROF::Translators::OsfToRof do
                                                  "dc"=>"http://purl.org/dc/terms/",
                                                  "ebucore"=>"http://www.ebu.ch/metadata/ontologies/ebucore/ebucore#",
                                                  "foaf"=>"http://xmlns.com/foaf/0.1/",
-                                                 'hydramata-rel' => 'http://projecthydra.org/ns/relations#',
+                                                 'hydra' => 'http://projecthydra.org/ns/relations#',
                                                  "mrel"=>"http://id.loc.gov/vocabulary/relators/",
                                                  'ms' => 'http://www.ndltd.org/standards/metadata/etdms/1.1/',
                                                  "nd"=>"https://library.nd.edu/ns/terms/",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rof
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.3
 platform: ruby
 authors:
 - Jeremy Friesen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-14 00:00:00.000000000 Z
+date: 2017-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -351,6 +351,7 @@ email:
 - jeremy.n.friesen@gmail.com
 executables:
 - ".ruby-version"
+- bundle
 - csv_to_rof
 - fedora_to_rof
 - jsonld_to_rof
@@ -368,6 +369,7 @@ files:
 - README.md
 - Rakefile
 - bin/.ruby-version
+- bin/bundle
 - bin/csv_to_rof
 - bin/fedora_to_rof
 - bin/jsonld_to_rof
@@ -382,6 +384,7 @@ files:
 - lib/rof/compare_rof.rb
 - lib/rof/filter.rb
 - lib/rof/filters.rb
+- lib/rof/filters/access_to_relsext.rb
 - lib/rof/filters/bendo.rb
 - lib/rof/filters/date_stamp.rb
 - lib/rof/filters/file_to_url.rb
@@ -406,6 +409,7 @@ files:
 - lib/rof/version.rb
 - rof.gemspec
 - spec/coverage_helper.rb
+- spec/fixtures/DLTP-999/pr76f190f54.jsonld
 - spec/fixtures/a.json
 - spec/fixtures/for_utility_load_items_from_json_file/multiple_items.json
 - spec/fixtures/for_utility_load_items_from_json_file/parse_error.json
@@ -443,6 +447,7 @@ files:
 - spec/lib/rof/collection_spec.rb
 - spec/lib/rof/compare_rof_spec.rb
 - spec/lib/rof/filter_spec.rb
+- spec/lib/rof/filters/access_to_relsext_spec.rb
 - spec/lib/rof/filters/bendo_spec.rb
 - spec/lib/rof/filters/date_stamp_spec.rb
 - spec/lib/rof/filters/file_to_url_spec.rb
@@ -492,6 +497,7 @@ specification_version: 4
 summary: Raw Object Format
 test_files:
 - spec/coverage_helper.rb
+- spec/fixtures/DLTP-999/pr76f190f54.jsonld
 - spec/fixtures/a.json
 - spec/fixtures/for_utility_load_items_from_json_file/multiple_items.json
 - spec/fixtures/for_utility_load_items_from_json_file/parse_error.json
@@ -529,6 +535,7 @@ test_files:
 - spec/lib/rof/collection_spec.rb
 - spec/lib/rof/compare_rof_spec.rb
 - spec/lib/rof/filter_spec.rb
+- spec/lib/rof/filters/access_to_relsext_spec.rb
 - spec/lib/rof/filters/bendo_spec.rb
 - spec/lib/rof/filters/date_stamp_spec.rb
 - spec/lib/rof/filters/file_to_url_spec.rb