rof 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 455635fe2cf09958271943bca2e7aa9b5a48a709
-  data.tar.gz: f315979e84b760ff2537033bd661cfa03f0a44a6
+  metadata.gz: a758b08f2917578d0af74b15925348e59f4f1be8
+  data.tar.gz: 66fc12edffcf6716c188186efaae4b6a27c8d7ca
 SHA512:
-  metadata.gz: 53ffaf40c93225551091e2a3357e9343a4b0c0dbe3b4f6bff508496fd4006cbd3cc79bbf3d985d49cfe6445860b119eee65caa082ae9400010748e7d70089a5c
-  data.tar.gz: 032d767da4543330d695c3dfb8bca7259ea998559db9e9a78e8cf31cdbf27bcf01863c842535488f548204b4c2519a283a97f8cff70de7fb4e0b6a5fcc737e75
+  metadata.gz: f42308bf063ae22ec22ddbdc19d06bddb56c741e158834e4a4e7b3f82e49389f455c629e57d7a28014ba1617d0e707883ec8086dc7f518cfdb3f027ad3013eed
+  data.tar.gz: 30d352eaf0860643ebe35ef40a45721dccee826dedad9c6c8a5de01e240eab48404d63d24330692523dfd72845f72fe3056d7a65766ed67b2a6455530a975f7e

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

@@ -22,15 +22,16 @@ module ROF
         # @return [Hash]
         def to_rof
           rof = @rof.deep_dup
-          expand_blank_node_locations(rof)
-          append_properties_to(rof)
+          expand_blank_node_locations!(rof)
+          rof = append_properties_to(rof)
+          rof = force_cardinality_for_backwards_compatability(rof)
           rof
         end
 
         private
 
         # The antics of the blank node! See the specs for blank nodes to see the expected behavior.
-        def expand_blank_node_locations(rof)
+        def expand_blank_node_locations!(rof)
           @blank_node_locations.each_pair do |node, locations|
             locations.each_pair do |location, key_value_pairs|
               data = rof
@@ -70,6 +71,19 @@ module ROF
           rof
         end
 
+        class TooManyEmbargoDatesError < RuntimeError
+        end
+
+        def force_cardinality_for_backwards_compatability(rof)
+          rights = rof.fetch('rights', {})
+          if rights.key?('embargo-date')
+            embargo_dates = Array.wrap(rights['embargo-date'])
+            raise TooManyEmbargoDatesError if embargo_dates.size > 1
+            rof['rights']['embargo-date'] = embargo_dates.first
+          end
+          rof
+        end
+
         public
 
         # @api public

data/lib/rof/version.rb

@@ -1,3 +1,3 @@
 module ROF
-  VERSION="1.2.4"
+  VERSION="1.2.5"
 end

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

@@ -81,6 +81,7 @@
         "@id": "_:b1"
       },
       "nd:accessEdit": "curate_batch_user",
+      "nd:accessEmbargoDate": "2016-11-16",
       "nd:accessRead": "wma1",
       "nd:accessReadGroup": "public",
       "nd:afmodel": "Etd",

data/spec/lib/rof/translators/jsonld_to_rof/accumulator_spec.rb

@@ -115,6 +115,40 @@ module ROF
             end
           end
         end
+
+        describe '#to_rof' do
+          let(:initial_rof) do
+            {
+              "rights"=> {
+                "edit"=>["curate_batch_user"],
+                "embargo-date"=>["2016-11-16"],
+                "read"=>["wma1"],
+                "read-groups"=>["public"]
+              }
+            }
+          end
+          context 'with one embargo-date' do
+            it 'will have a single embargo date' do
+              rof = initial_rof
+              rof['rights']['embargo-date'] = ['2016-1-2']
+              expect(described_class.new(rof).to_rof['rights'].fetch('embargo-date')).to eq('2016-1-2')
+            end
+          end
+          context 'with more than one embargo-date' do
+            it 'will raise an exception' do
+              rof = initial_rof
+              rof['rights']['embargo-date'] = ['2016-1-2', '2016-2-3']
+              expect { described_class.new(rof).to_rof }.to raise_error(described_class::TooManyEmbargoDatesError)
+            end
+          end
+          context 'no embargo-date' do
+            it 'will not have an embargo-date' do
+              rof = initial_rof
+              rof['rights'].delete('embargo-date')
+              expect { described_class.new(rof).to_rof['rights'].fetch('embargo-date') }.to raise_error(KeyError)
+            end
+          end
+        end
       end
     end
   end

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

@@ -14,6 +14,7 @@ module ROF
           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')
+          expect(output.first['rights'].fetch('embargo-date')).to eq("2016-11-16")
         end
       end
       describe '.call' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rof
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Jeremy Friesen