rof 1.2.6 → 1.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2904ea17597fc64687691d34928f1996007acaef
-  data.tar.gz: 5bab7145ebb3b4390fcb0b45b9848d4286664ccc
+  metadata.gz: 827e88ec60564b1d9f6dbf9c268db50994dc0c1c
+  data.tar.gz: 4bf1f3095bdf70cc8b2f0968eb3041b56be0ce2e
 SHA512:
-  metadata.gz: eec647ac396d07d11c04b8dfa0f72bc199c7b5c9720623f843cdbf1f9c827f8d078015a952a684cf9d52a7ad6b9ef6de472a8ecfde1fc3bd062a25e48487cae3
-  data.tar.gz: 3753abfbb4bdecbc70b89f8068f41e52c830a9affb8d72f4e7ed1ee5797bd2672ecaf6afa745ace2ab96da4ed476f333aa6cae1f77309e90fb5e40eb72d4fd93
+  metadata.gz: 9495282350fb90ae4b7a6a039ff8412e3092b59c12ac069b0ca3cfb14383146327ceb2d9768cd9ecfb4e1853e0336afc4ac2b553c7ad26d19862c310a171d286
+  data.tar.gz: c8413636f1e6178d046f857d30d005c27781ec177880702b4074f0fa10f9815089b0e76920dc0be097e22007eed2a92f5ac7a4ba655cbaa3dcba951fabe9e46b

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

@@ -71,19 +71,37 @@ module ROF
           rof
         end
 
-        class TooManyEmbargoDatesError < RuntimeError
+        class TooManyElementsError < RuntimeError
+          def initialize(context, expected_count, got_count)
+            super(%(Expected #{expected_count} in "#{context}" but instead got #{got_count}))
+          end
         end
 
         def force_cardinality_for_backwards_compatability(rof)
+          rof = force_rights_cardinality(rof)
+          rof = force_bendo_cardinality(rof)
+          rof
+        end
+
+        def force_rights_cardinality(rof)
           rights = rof.fetch('rights', {})
           if rights.key?('embargo-date')
             embargo_dates = Array.wrap(rights['embargo-date'])
-            raise TooManyEmbargoDatesError if embargo_dates.size > 1
+            raise TooManyElementsError.new('rights > embargo-date', 1, embargo_dates.size) if embargo_dates.size > 1
             rof['rights']['embargo-date'] = embargo_dates.first
           end
           rof
         end
 
+        def force_bendo_cardinality(rof)
+          if rof.key?('bendo-item')
+            bendo_items = Array.wrap(rof['bendo-item'])
+            raise TooManyElementsError.new('bendo-item', 1, bendo_items.size) if bendo_items.size > 1
+            rof['bendo-item'] = bendo_items.first
+          end
+          rof
+        end
+
         public
 
         # @api public

data/lib/rof/version.rb

@@ -1,3 +1,3 @@
 module ROF
-  VERSION="1.2.6"
+  VERSION="1.2.7"
 end

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

@@ -117,35 +117,65 @@ module ROF
         end
 
         describe '#to_rof' do
-          let(:initial_rof) do
-            {
-              "rights"=> {
-                "edit"=>["curate_batch_user"],
-                "embargo-date"=>["2016-11-16"],
-                "read"=>["wma1"],
-                "read-groups"=>["public"]
+          describe 'for embargo-date' 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)
+            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::TooManyElementsError)
+              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
-          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)
+          describe 'bendo-item' do
+            let(:initial_rof) do
+              {
+                "bendo-item"=> ['abcd1']
+              }
+            end
+            context 'with one embargo-date' do
+              it 'will have a single embargo date' do
+                rof = initial_rof
+                rof['bendo-item'] = ['abcd1']
+                expect(described_class.new(rof).to_rof.fetch('bendo-item')).to eq('abcd1')
+              end
+            end
+            context 'with more than one embargo-date' do
+              it 'will raise an exception' do
+                rof = initial_rof
+                rof['bendo-item'] = ['abcd1', 'efgh1']
+                expect { described_class.new(rof).to_rof }.to raise_error(described_class::TooManyElementsError)
+              end
+            end
+            context 'no embargo-date' do
+              it 'will not have an embargo-date' do
+                rof = initial_rof
+                rof.delete('bendo-item')
+                expect { described_class.new(rof).to_rof.fetch('bendo-item') }.to raise_error(KeyError)
+              end
             end
           end
         end

metadata

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