ddr-models 2.10.0.rc1 → 2.10.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb52395b49775aa484605d3eccc046d52a97226a
-  data.tar.gz: a3d47a19af939cb42b2b20c1341fb3be1b9f04d8
+  metadata.gz: 26d6609061f9e80fa722a9af79352fef7888b167
+  data.tar.gz: 99a273e1f056423a3e42c638ea26c4df180b2b83
 SHA512:
-  metadata.gz: 9335f431776f65227f2ab87585e89c401a9b8a62cad9885900d59ce909ce6be00b942a509465bf14138d9283db2cd57a2e229caa0ff34d8c92bf8f6fcc8921bc
-  data.tar.gz: 6dc0228d4831aaa17604a9eb4b71197acee77c3738798688edfb59804f58d4f887bbcdce5e359f53e07ba8f5c2e318f912918d39c9a7a570c6706a4fa72a6451
+  metadata.gz: 48ce992373a777089e971e3ea6b9aa8d5c0d8ca4f64772b6adaca651b074773e34be342d3c201761c5db328862200f502716b0b63919d81e8e720b01cf0a6268
+  data.tar.gz: 184e6633e7513ea79127241b4845f4d77b47fc5865e00db70df42c36dc595a9e7857dacc5b93762ba2dd05abcc7ff7cec1b996a6992efa2899fa168e3830be81

data/lib/ddr/datastreams/metadata_datastream.rb

@@ -2,6 +2,9 @@ module Ddr
   module Datastreams
     class MetadataDatastream < ActiveFedora::NtriplesRDFDatastream
 
+      # ASCII control chars, except newline
+      ILLEGAL_CHARS = Regexp.new('[\x00-\x09\x0B-\x1F]')
+
       def self.term_names
         properties.keys.map(&:to_sym).sort
       end
@@ -43,7 +46,7 @@ module Ddr
         value
           .to_s
           .strip
-          .gsub(/[[:cntrl:]]/, "")
+          .gsub(ILLEGAL_CHARS, "")
       end
 
       def reject_value?(value)

data/lib/ddr/models/version.rb

@@ -1,5 +1,5 @@
 module Ddr
   module Models
-    VERSION = "2.10.0.rc1"
+    VERSION = "2.10.0.rc2"
   end
 end

data/spec/models/descriptive_metadata_datastream_spec.rb

@@ -91,10 +91,14 @@ module Ddr::Datastreams
           subject.set_values :type, [ "Image", "Still Image " ]
           expect(subject.type).to eq([ "Image", "Still Image" ])
         end
-        it "strips controls characters from values" do
+        it "strips control characters from values" do
           subject.set_values :type, [ "Image", "Still\f Image" ]
           expect(subject.type).to eq([ "Image", "Still Image" ])
         end
+        it "does not strip CR and LF characters from values" do
+          subject.set_values :type, [ "Image", "Still\nImage" ]
+          expect(subject.type).to eq([ "Image", "Still\nImage" ])
+        end
       end
       describe "#add_value" do
         it "should add the supplied value to those of the term" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-models
 version: !ruby/object:Gem::Version
-  version: 2.10.0.rc1
+  version: 2.10.0.rc2
 platform: ruby
 authors:
 - Jim Coble
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-29 00:00:00.000000000 Z
+date: 2017-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -803,7 +803,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Models used in the Duke Digital Repository