ddr-models 2.7.3 → 2.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b40e42bff6d22b301a1b06925cf23a5583bcb727
-  data.tar.gz: d82f30c7c237c53bb375c8f307ce50420059bbc2
+  metadata.gz: f3c6181e57a1a67d5f374d1d83d5afa6e33d1962
+  data.tar.gz: 11ee5833bb3cb7730b30ed8e2ef38579de97ac59
 SHA512:
-  metadata.gz: 2b2a22ff451d8c58a36b31ab245b9e5b3570e8e994eaca1a5e8f91698ff1c1111767175cd6d6c5bc011662aea234ac1bd88a4a2c96abbc21374ffc896aeee530
-  data.tar.gz: ae332fd91309fdf16e90ed94c3de73f8fa225cdc47404f32ec92f61dc1121f5c8f9d1f9737ed0e3851d975c8cd01a2fc317ed983e5c638a1883205bdad7847f8
+  metadata.gz: e52d6d3b398d55289c9eb51d97fad7a08661849918e1077523ae770dbf8f77b261382befd8f7695f186981e9fba2c9dc40fc89039df701a3a9391473746cf8b0
+  data.tar.gz: 49ce6887894e3857da80afa8ba9f97bedb27a6b155405b64d8706e17d983d68d4f2086fd22ee51268d0d73e1a654dc60a9fa894609fe26d2ed1560d8178fcd2e

data/lib/ddr/models/file_management.rb

@@ -19,10 +19,10 @@ module Ddr::Models
     # @param external [Boolean] Add file to external datastream.
     #   Not required for external datastream classes
     #   or datastream instances having controlGroup 'E'.
-    def add_file(file, dsid, mime_type: nil, external: false)
-      mime_type       ||= Ddr::Utils.mime_type_for(file)
-      source_path       = Ddr::Utils.file_path(file)
-      original_filename = Ddr::Utils.file_name(file)
+    def add_file(file, dsid, mime_type: nil, external: false, original_filename: nil)
+      mime_type         ||= Ddr::Utils.mime_type_for(file)
+      source_path         = Ddr::Utils.file_path(file)
+      original_filename ||= Ddr::Utils.file_name(file)
       file_to_add = FileToAdd.new(dsid, source_path, original_filename)
       cache.with(file_to_add: file_to_add) do
         run_callbacks(:add_file) do

data/lib/ddr/models/version.rb

@@ -1,5 +1,5 @@
 module Ddr
   module Models
-    VERSION = "2.7.3"
+    VERSION = "2.7.4"
   end
 end

data/spec/models/file_management_spec.rb

@@ -1,17 +1,17 @@
 RSpec.shared_examples "a repository external file" do
-  it "should be owned by the effective user" do
+  it "is owned by the effective user" do
     expect(File.owned?(file_path)).to be true
   end
-  it "should be readable by the effective user" do
+  it "is readable by the effective user" do
     expect(File.readable?(file_path)).to be true
   end
-  it "should be writable by the effective user" do
+  it "is writable by the effective user" do
     expect(File.writable?(file_path)).to be true
   end
-  it "should not have the sticky bit set" do
+  it "does not have the sticky bit set" do
     expect(File.sticky?(file_path)).to be false
   end
-  it "should have 644 mode" do
+  it "has 644 mode" do
     expect("%o" % File.world_readable?(file_path)).to eq "644"
   end
 end
@@ -24,51 +24,61 @@ module Ddr::Models
     let(:xml_file)   { fixture_file_upload("fits/image.xml", "text/xml") }
 
     describe "#add_file" do
-      it "should run a virus scan on the file" do
+      it "runs a virus scan on the file" do
         expect(object).to receive(:virus_scan)
         object.add_file image_file, "content"
       end
-      it "should call add_file_datastream by default" do
+      it "calls add_file_datastream by default" do
         expect(object).to receive(:add_file_datastream)
         object.add_file image_file, "random_ds_1"
       end
-      it "should call add_file_datastream when dsid spec is managed" do
+      it "calls add_file_datastream when dsid spec is managed" do
         expect(object).to receive(:add_file_datastream)
         object.add_file xml_file, "fits"
       end
-      it "should call add_external_file when dsid spec is external" do
+      it "calls add_external_file when dsid spec is external" do
         expect(object).to receive(:add_external_file)
                            .with(image_file, "content", mime_type: "image/tiff")
         object.add_file image_file, "content"
       end
-      it "should call add_external_file when :external => true option passed" do
+      it "calls add_external_file when :external => true option passed" do
         expect(object).to receive(:add_external_file)
                            .with(image_file, "random_ds_2", mime_type: "image/tiff")
         object.add_file image_file, "random_ds_2", external: true
       end
-      it "sets original filename when dsid == 'content'" do
-        expect { object.add_file image_file, "content" }
-          .to change(object, :original_filename).to("imageA.tif")
-      end
-      it "does not set original filename when dsid != 'content'" do
-        expect { object.add_file xml_file, "fits" }
-          .not_to change(object, :original_filename)
+      context "original_filename" do
+        context "when dsid == 'content'" do
+          it "sets original_filename" do
+            expect { object.add_file image_file, "content" }
+              .to change(object, :original_filename).to("imageA.tif")
+            expect { object.add_file image_file, "content", original_filename: "foo.tif" }
+              .to change(object, :original_filename).to("foo.tif")
+          end
+        end
+        context "when dsid != 'content'" do
+          it "does not set original_filename" do
+            expect { object.add_file xml_file, "fits" }
+              .not_to change(object, :original_filename)
+            expect { object.add_file xml_file, "fits", original_filename: "foo" }
+              .not_to change(object, :original_filename)
+          end
+        end
       end
     end
 
     describe "#add_external_file" do
-      it "should call add_external_datastream if no spec for dsid" do
+      it "calls add_external_datastream if no spec for dsid" do
         expect(object).to receive(:add_external_datastream).with("random_ds_3").and_call_original
         object.add_external_file(image_file, "random_ds_3")
       end
-      it "should raise an error if datastream is not external" do
+      it "raises an exception if datastream is not external" do
         expect { object.add_external_file(xml_file, "fits") }.to raise_error(ArgumentError)
       end
-      it "should set the mimeType" do
+      it "sets the mimeType" do
         expect(object.content).to receive(:mimeType=).with("image/tiff")
         object.add_external_file(image_file, "content", mime_type: "image/tiff")
       end
-      it "should set dsLocation to URI for generated file path by default" do
+      it "sets dsLocation to URI for generated file path by default" do
         object.add_external_file(image_file, "content")
         expect(object.content.dsLocation).not_to eq URI.escape("file:#{image_file.path}")
         expect(object.content.dsLocation).not_to be_nil
@@ -83,7 +93,7 @@ module Ddr::Models
     end
 
     describe "#add_external_datastream" do
-      it "should return a new external datastream" do
+      it "returns a new external datastream" do
         ds = object.add_external_datastream("random_ds_27")
         expect(ds.controlGroup).to eq "E"
         expect(object.datastreams["random_ds_27"]).to eq ds
@@ -100,7 +110,7 @@ module Ddr::Models
         object.add_file(file2, "e_content_2", external: true)
         object.save
       end
-      it "should return a list of file paths for all versions of all external datastreams for the object" do
+      it "returns a list of file paths for all versions of all external datastreams for the object" do
         paths = object.external_datastream_file_paths
         expect(paths.size).to eq 2
         paths.each do |path|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-models
 version: !ruby/object:Gem::Version
-  version: 2.7.3
+  version: 2.7.4
 platform: ruby
 authors:
 - Jim Coble
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-26 00:00:00.000000000 Z
+date: 2017-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -780,7 +780,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Models used in the Duke Digital Repository