rof 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a758b08f2917578d0af74b15925348e59f4f1be8
-  data.tar.gz: 66fc12edffcf6716c188186efaae4b6a27c8d7ca
+  metadata.gz: 2904ea17597fc64687691d34928f1996007acaef
+  data.tar.gz: 5bab7145ebb3b4390fcb0b45b9848d4286664ccc
 SHA512:
-  metadata.gz: f42308bf063ae22ec22ddbdc19d06bddb56c741e158834e4a4e7b3f82e49389f455c629e57d7a28014ba1617d0e707883ec8086dc7f518cfdb3f027ad3013eed
-  data.tar.gz: 30d352eaf0860643ebe35ef40a45721dccee826dedad9c6c8a5de01e240eab48404d63d24330692523dfd72845f72fe3056d7a65766ed67b2a6455530a975f7e
+  metadata.gz: eec647ac396d07d11c04b8dfa0f72bc199c7b5c9720623f843cdbf1f9c827f8d078015a952a684cf9d52a7ad6b9ef6de472a8ecfde1fc3bd062a25e48487cae3
+  data.tar.gz: 3753abfbb4bdecbc70b89f8068f41e52c830a9affb8d72f4e7ed1ee5797bd2672ecaf6afa745ace2ab96da4ed476f333aa6cae1f77309e90fb5e40eb72d4fd93

data/lib/rof/rdf_context.rb

@@ -4,6 +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/',
@@ -29,6 +30,7 @@ module ROF
     'fedora-model' => 'info:fedora/fedora-system:def/model#',
     'pav' => 'http://purl.org/pav/',
     'hydra' => 'http://projecthydra.org/ns/relations#',
+    'hydramata-rel' => 'http://projecthydra.org/ns/relations#',
     'hasModel' => { '@id' => 'fedora-model:hasModel', '@type' => '@id' },
     "hasEditor"=>{"@id"=>"hydra:hasEditor", "@type"=>"@id"},
     "hasEditorGroup"=>{"@id"=>"hydra:hasEditorGroup", "@type"=>"@id"},

data/lib/rof/translators/jsonld_to_rof.rb

@@ -71,6 +71,10 @@ module ROF
         handler.map('role', to: ['metadata', 'dc:contributor', 'ms:role'], force: true)
       end
 
+      # The $1 will be the PID
+      # @see Related specs for expected behavior
+      REGEXP_FOR_A_CURATE_RDF_SUBJECT = %r{\Ahttps?://curate(?:[\w\.]*).nd.edu/show/([[:alnum:]]+)/?}.freeze
+
       # @api public
       #
       # Convert's the given JSON-LD into an ROF document that can be used to batch ingest into Fedora.

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

@@ -175,7 +175,7 @@ module ROF
 
         def coerce_object_to_string(object)
           return object if object.nil?
-          if object.to_s =~ %r{https?://curate.nd.edu/show/([^\\]+)/?}
+          if object.to_s =~ ROF::Translators::JsonldToRof::REGEXP_FOR_A_CURATE_RDF_SUBJECT
             return "und:#{$1}"
           elsif object.respond_to?(:value)
             return object.value

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

@@ -64,10 +64,9 @@ module ROF
           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 =~ REGEXP_FOR_A_CURATE_RDF_SUBJECT
+            return nil unless @statement.subject.to_s =~ ROF::Translators::JsonldToRof::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.5"
+  VERSION="1.2.6"
 end

data/spec/fixtures/DLTP-1007/remediated-z029p269r94.jsonld

@@ -0,0 +1,127 @@
+{
+  "@context": {
+    "bibo": "http://purl.org/ontology/bibo/",
+    "dc": "http://purl.org/dc/terms/",
+    "ebucore": "http://www.ebu.ch/metadata/ontologies/ebucore/ebucore#",
+    "fedora-model": "info:fedora/fedora-system:def/model#",
+    "foaf": "http://xmlns.com/foaf/0.1/",
+    "frels": "info:fedora/fedora-system:def/relations-external#",
+    "hasEditor": {
+      "@id": "hydra:hasEditor",
+      "@type": "@id"
+    },
+    "hasEditorGroup": {
+      "@id": "hydra:hasEditorGroup",
+      "@type": "@id"
+    },
+    "hasMember": {
+      "@id": "frels:hasMember",
+      "@type": "@id"
+    },
+    "hasModel": {
+      "@id": "fedora-model:hasModel",
+      "@type": "@id"
+    },
+    "hasViewer": {
+      "@id": "hydra:hasViewer",
+      "@type": "@id"
+    },
+    "hasViewerGroup": {
+      "@id": "hydra:hasViewerGroup",
+      "@type": "@id"
+    },
+    "hydra": "http://projecthydra.org/ns/relations#",
+    "isEditorOf": {
+      "@id": "hydra:isEditorOf",
+      "@type": "@id"
+    },
+    "isMemberOfCollection": {
+      "@id": "frels:isMemberOfCollection",
+      "@type": "@id"
+    },
+    "isPartOf": {
+      "@id": "frels:isPartOf",
+      "@type": "@id"
+    },
+    "mrel": "http://id.loc.gov/vocabulary/relators/",
+    "ms": "http://www.ndltd.org/standards/metadata/etdms/1.1/",
+    "nd": "https://library.nd.edu/ns/terms/",
+    "pav": "http://purl.org/pav/",
+    "previousVersion": "pav:previousVersion",
+    "rdfs": "http://www.w3.org/2000/01/rdf-schema#",
+    "und": "https://curatesvrpprd.library.nd.edu/show/",
+    "vracore": "http://purl.org/vra/"
+  },
+  "@graph": [
+    {
+      "@id": "_:b0",
+      "dc:contributor": "Dr. Spock",
+      "ms:role": "Committee Member"
+    },
+    {
+      "@id": "_:b1",
+      "dc:contributor": "Dr. Quinn",
+      "ms:role": "Committee Chair"
+    },
+    {
+      "@id": "_:b2",
+      "dc:contributor": "Dr. Zhivago",
+      "ms:role": "Committee Member"
+    },
+    {
+      "@id": "_:b3",
+      "ms:discipline": "Civil Engineering and Geological Sciences",
+      "ms:level": "Master's Thesis",
+      "ms:name": "MSCE"
+    },
+    {
+      "@id": "und:z029p269r94",
+      "dc:contributor": [
+        {
+          "@id": "_:b0"
+        },
+        {
+          "@id": "_:b1"
+        },
+        {
+          "@id": "_:b2"
+        }
+      ],
+      "dc:creator": "Bob the Builder",
+      "dc:creator#administrative_unit": "University of Notre Dame::College of Engineering::Civil and Environmental Engineering and Earth Sciences::Civil Engineering",
+      "dc:date": "2006-03-24",
+      "dc:date#approved": "2011-01-04",
+      "dc:date#created": "2010-12-20",
+      "dc:dateSubmitted": "2006-04-01",
+      "dc:description#abstract": "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.",
+      "dc:identifier#other": "etd-04012006-182810",
+      "dc:language": "English",
+      "dc:publisher": "University of Notre Dame",
+      "dc:publisher#country": "United States of America",
+      "dc:rights": "All rights reserved",
+      "dc:subject": [
+        "Structural health monitoring",
+        "multipath",
+        "GPS"
+      ],
+      "dc:title": "Lorem Ipsum",
+      "hydra:hasEditor": {
+        "@id": "und:qb98mc9021z"
+      },
+      "hydra:hasEditorGroup": {
+        "@id": "und:q524jm23g92"
+      },
+      "mrel:ths": "Dr. Worm",
+      "ms:degree": {
+        "@id": "_:b3"
+      },
+      "nd:accessEdit": "curate_batch_user",
+      "nd:accessReadGroup": "public",
+      "nd:afmodel": "Etd",
+      "nd:depositor": "curate_batch_user",
+      "nd:representativeFile": {
+        "@id": "und:z603qv36b1d"
+      }
+    }
+  ]
+}

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

@@ -35,6 +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/',

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

@@ -17,6 +17,37 @@ module ROF
           expect(output.first['rights'].fetch('embargo-date')).to eq("2016-11-16")
         end
       end
+
+      describe 'DLTP-1007 regression' do
+        it 'converts representative XML correctly' do
+          jsonld_from_curatend = JSON.load(File.read(File.join(GEM_ROOT, "spec/fixtures/DLTP-1007/remediated-z029p269r94.jsonld")))
+          output = described_class.call(jsonld_from_curatend, {})
+          expect(output.size).to eq(1)
+          properties = output.first.fetch('properties')
+          expect(properties).to include('<representative>und:z603qv36b1d</representative>')
+        end
+      end
+
+      describe '::REGEXP_FOR_A_CURATE_RDF_SUBJECT' do
+        it 'handles data as expected' do
+          [
+            ["https://curate.nd.edu/downloads/abcd123", nil],
+            ["http://curate.nd.edu/downloads/abcd123", nil],
+            ["http://curatepprd.nd.edu/downloads/abcd123", nil],
+            ["http://curatepprd.nd.edu/show/abcd123", "abcd123"],
+            ["https://curatepprd.nd.edu/show/abcd123", "abcd123"],
+            ["https://curatepprd.library.nd.edu/show/abcd123", "abcd123"],
+            ["https://curate.nd.edu/show/abcd123", "abcd123"],
+            ["http://curate.nd.edu/show/abcd123", "abcd123"],
+            ["http://mycurate.nd.edu/show/abcd123", nil],
+            ["http://curate.nd.edu/show/abcd123/extra", 'abcd123'],
+          ].each do |input, expected|
+            input =~ described_class::REGEXP_FOR_A_CURATE_RDF_SUBJECT
+            expect($1).to eq(expected)
+          end
+        end
+      end
+
       describe '.call' do
         [
           '2j62s467216',

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

@@ -37,6 +37,7 @@ RSpec.describe ROF::Translators::OsfToRof do
                      "rels-ext"=> {"@context"=> {"@vocab"=>"info:fedora/fedora-system:def/relations-external#",
                                    "fedora-model"=>"info:fedora/fedora-system:def/model#",
                                    "pav"=>"http://purl.org/pav/",
+                                   "hydramata-rel"=>"http://projecthydra.org/ns/relations#",
                                    "hydra"=>"http://projecthydra.org/ns/relations#",
                                    "hasModel"=>{"@id"=>"fedora-model:hasModel", "@type"=>"@id"},
                                    "hasEditor"=>{"@id"=>"hydra:hasEditor", "@type"=>"@id"},
@@ -52,6 +53,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/',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rof
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - Jeremy Friesen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-08 00:00:00.000000000 Z
+date: 2017-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -409,6 +409,7 @@ files:
 - lib/rof/version.rb
 - rof.gemspec
 - spec/coverage_helper.rb
+- spec/fixtures/DLTP-1007/remediated-z029p269r94.jsonld
 - spec/fixtures/DLTP-999/pr76f190f54.jsonld
 - spec/fixtures/a.json
 - spec/fixtures/for_utility_load_items_from_json_file/multiple_items.json
@@ -497,6 +498,7 @@ specification_version: 4
 summary: Raw Object Format
 test_files:
 - spec/coverage_helper.rb
+- spec/fixtures/DLTP-1007/remediated-z029p269r94.jsonld
 - spec/fixtures/DLTP-999/pr76f190f54.jsonld
 - spec/fixtures/a.json
 - spec/fixtures/for_utility_load_items_from_json_file/multiple_items.json