active-fedora 7.1.0 → 7.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 481726bbeb31ad09149dbe0facfcc577a504f0da
-  data.tar.gz: 66f87369d95a41cb5c0d5fd02dccd43f89e589f7
+  metadata.gz: 203a347c89c96ff4ad8016269999d4ea0cfa1fca
+  data.tar.gz: afdb1db5a4ce51cb2957b2a2f6856c24f2c3fa4e
 SHA512:
-  metadata.gz: 82de3808e266997ca4e95144e6792877398deabddceb9cc7306ea0f7badecfe5d79a666915cb688a4fa2b5fcabc1997436b31593c39e52f7e6a204d3b48aaa77
-  data.tar.gz: f038a141b3d4136c9d5313e63137412a912f5a78632c0ca27efe235757e030e117f7d3b58d97c9544bfddb3a8e12b0b2b666a03145b1283957e8be9fffc6ae32
+  metadata.gz: 41f183bdade943a90f304d30ddc80bd34bbbb22d798718f908a2b4b61b7d8e27fe7f003c83983695ab1acbc16cd5964ea31d6623cbeb8392e007d688ba18e3f7
+  data.tar.gz: 1c361808bc616a266f82394f10342b7969482971d691e50b885ac20057e3c33b6a407849cd992c6a5c44d4356027d50f33afbbccf5733d83cea18b34181fcd87

data/lib/active_fedora/datastreams.rb

@@ -141,18 +141,19 @@ module ActiveFedora
       [:mimeType, :controlGroup, :dsLabel, :dsLocation, :checksumType, :versionable].each do |key|
         ds.send("#{key}=".to_sym, opts[key]) unless opts[key].nil?
       end
-      blob = opts[:blob] 
-      if blob 
-        if !ds.mimeType.present? 
-          ##TODO, this is all done by rubydora -- remove
-          ds.mimeType = blob.respond_to?(:content_type) ? blob.content_type : "application/octet-stream"
-        end
-        if !ds.dsLabel.present? && blob.respond_to?(:path)
-          ds.dsLabel = File.basename(blob.path)
+      if ds.managed? || ds.inline?
+        blob = opts[:blob] 
+        if blob 
+          if !ds.mimeType.present? 
+            ##TODO, this is all done by rubydora -- remove
+            ds.mimeType = blob.respond_to?(:content_type) ? blob.content_type : "application/octet-stream"
+          end
+          if !ds.dsLabel.present? && blob.respond_to?(:path)
+            ds.dsLabel = File.basename(blob.path)
+          end
         end
+        ds.content = blob || "" 
       end
-
-      ds.content = blob || "" 
       ds
     end
 

data/lib/active_fedora/rdf/ntriples_rdf_datastream.rb

@@ -3,7 +3,7 @@ require 'rdf/ntriples'
 module ActiveFedora
   class NtriplesRDFDatastream < RDFDatastream
     def self.default_attributes
-      super.merge(:controlGroup => 'M', :mimeType => 'text/plain')
+      super.merge(:controlGroup => 'M', :mimeType => 'application/n-triples')
     end
 
     def serialization_format

data/lib/active_fedora/rdf/rdf_datastream.rb

@@ -38,10 +38,10 @@ module ActiveFedora
       serialize
     end
 
-    def content=(content)
+    def content=(new_content)
       resource.clear!
-      resource << deserialize(content)
-      content
+      resource << deserialize(new_content)
+      new_content
     end
 
     def content_changed?
@@ -100,10 +100,15 @@ module ActiveFedora
 
     def deserialize(data=nil)
       return RDF::Graph.new if new? && data.nil?
-      data ||= datastream_content
+
+      if data.nil?
+        data = datastream_content
+      elsif behaves_like_io?(data)
+        data = io_content(data)
+      end
 
       # Because datastream_content can return nil, we should check that here.
-      return repository if data.nil?
+      return RDF::Graph.new if data.nil?
 
       data.force_encoding('utf-8')
       RDF::Graph.new << RDF::Reader.for(serialization_format).new(data)
@@ -113,5 +118,16 @@ module ActiveFedora
       raise "you must override the `serialization_format' method in a subclass"
     end
 
+    private
+
+    def io_content(data)
+      begin
+        data.rewind
+        data.read
+      ensure
+        data.rewind
+      end
+    end
+
   end
 end

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "7.1.0"
+  VERSION = "7.1.1"
 end

data/spec/unit/datastream_collections_spec.rb

@@ -302,7 +302,6 @@ describe ActiveFedora::DatastreamCollections do
       datastreams["external"].first.dsid.should == "EXTERNAL1"
       datastreams["external"].first.dsLocation.should == "http://myresource.com"
       datastreams["external"].first.controlGroup.should == "E"
-      datastreams["external"].first.content.should == "" 
 
       datastreams["high"].size.should == 1
       datastreams["high"].first.dsLabel.should == 'dino.jpg'

data/spec/unit/datastreams_spec.rb

@@ -213,10 +213,20 @@ describe ActiveFedora::Datastreams do
     end
 
     it "should use the filename as a default label" do
-     mock_file = double(:path => '/asdf/fdsa')
+      mock_file = double(:path => '/asdf/fdsa')
       ds = subject.create_datastream(ActiveFedora::Datastream, nil, {:blob => mock_file})
       ds.dsLabel.should == 'fdsa'
     end
+
+    it "should not set content for controlGroup 'E'" do
+      ds = subject.create_datastream(ActiveFedora::Datastream, nil, {controlGroup: 'E'})
+      expect(ds.content).to be_nil
+    end
+
+    it "should not set content for controlGroup 'R'" do
+      ds = subject.create_datastream(ActiveFedora::Datastream, nil, {controlGroup: 'R'})
+      expect(ds.content).to be_nil
+    end
   end
 
   describe "#additional_attributes_for_external_and_redirect_control_groups" do

data/spec/unit/ntriples_datastream_spec.rb

@@ -25,7 +25,7 @@ describe ActiveFedora::NtriplesRDFDatastream do
       @subject.controlGroup.should == 'M'
     end
     it "should have mimeType" do
-      @subject.mimeType.should == 'text/plain'
+      @subject.mimeType.should == 'application/n-triples'
     end
     it "should have dsid" do
       @subject.dsid.should == 'descMetadata'

data/spec/unit/rdf_datastream_spec.rb

@@ -54,13 +54,27 @@ describe ActiveFedora::RDFDatastream do
   end
 
   describe "deserialize" do
-    it "should be able to handle non-utf-8 characters" do
+    let(:ds) { ActiveFedora::NtriplesRDFDatastream.new }
+    subject { ds.deserialize(data) }
+
+    context "with non-utf-8 characters" do
       # see https://github.com/ruby-rdf/rdf/issues/142
-      ds = ActiveFedora::NtriplesRDFDatastream.new
-      data = "<info:fedora/scholarsphere:qv33rx50r> <http://purl.org/dc/terms/description> \"\\n\xE2\x80\x99 \" .\n".force_encoding('ASCII-8BIT')
+      let(:data) { "<info:fedora/scholarsphere:qv33rx50r> <http://purl.org/dc/terms/description> \"\\n\xE2\x80\x99 \" .\n".force_encoding('ASCII-8BIT') }
+
+      it "should be able to handle non-utf-8 characters" do
+        expect(subject.dump(:ntriples)).to eq "<info:fedora/scholarsphere:qv33rx50r> <http://purl.org/dc/terms/description> \"\\n’ \" .\n"
+      end
+    end
 
-      result = ds.deserialize(data)
-      result.dump(:ntriples).should == "<info:fedora/scholarsphere:qv33rx50r> <http://purl.org/dc/terms/description> \"\\n’ \" .\n"
+    context "when the object is saved and has no content in the datastream" do
+      let(:data) { nil }
+      before do
+        allow(ds).to receive(:new?).and_return(false);
+        allow(ds).to receive(:datastream_content).and_return(nil);
+      end
+      it "should return an empty graph" do
+        expect(subject).to be_kind_of RDF::Graph
+      end
     end
   end
 
@@ -71,6 +85,13 @@ describe ActiveFedora::RDFDatastream do
       ds.content = data
       expect(ds.resource.dump(:ntriples)).to eq "<info:fedora/scholarsphere:qv33rx50r> <http://purl.org/dc/terms/description> \"\\n’ \" .\n"
     end
+    context "when passed an IO-like object" do
+      let(:file) { File.new(File.join(File.dirname(__FILE__), "..", "fixtures", "dublin_core_rdf_descMetadata.nt")) }
+      it "should read it" do
+        ds.content = file
+        expect(ds.resource.dump(:ntriples)).to eq File.read(file.path)
+      end
+    end
   end
 
   describe 'legacy non-utf-8 characters' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 7.1.0
+  version: 7.1.1
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-18 00:00:00.000000000 Z
+date: 2014-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr