assembly-objectfile 1.6.7 → 1.6.8

data/spec/object_file_spec.rb

@@ -4,137 +4,155 @@ describe Assembly::ObjectFile do
   
   it "should not run if no input file is passed in" do
     @ai=Assembly::ObjectFile.new('')
-    lambda{@ai.filesize}.should raise_error
-    lambda{@ai.sha1}.should raise_error
-    lambda{@ai.md5}.should raise_error
+    expect{@ai.filesize}.to raise_error(RuntimeError,'input file  does not exist')
+    expect{@ai.sha1}.to raise_error(RuntimeError,'input file  does not exist')
+    expect{@ai.md5}.to raise_error(RuntimeError,'input file  does not exist')
   end
 
   it "should return the common directory of a set of filenames passed into it, where the common part does not terminate on a directory" do
-    Assembly::ObjectFile.common_path(['/Users/peter/00/test.tif','/Users/peter/05/test.jp2']).should == "/Users/peter/"    
+    expect(Assembly::ObjectFile.common_path(['/Users/peter/00/test.tif','/Users/peter/05/test.jp2'])).to eq("/Users/peter/")    
   end
 
   it "should return the common directory of a set of filenames passed into it, where the common part does not terminate on a directory" do
-    Assembly::ObjectFile.common_path(['/Users/peter/00/test.tif','/Users/peter/00/test.jp2']).should == "/Users/peter/00/"    
+    expect(Assembly::ObjectFile.common_path(['/Users/peter/00/test.tif','/Users/peter/00/test.jp2'])).to eq("/Users/peter/00/")    
   end
   
   it "should tell us if an input file is an image" do
-    File.exists?(TEST_TIF_INPUT_FILE).should be true
+    expect(File.exists?(TEST_TIF_INPUT_FILE)).to be true
     @ai = Assembly::ObjectFile.new(TEST_TIF_INPUT_FILE)
-    @ai.image?.should == true
-    @ai.exif.should_not be nil
-    @ai.mimetype.should == 'image/tiff'
-    @ai.file_mimetype.should == 'image/tiff'
-    @ai.object_type.should == :image
-    @ai.valid_image?.should == true
-    @ai.jp2able?.should == true
+    expect(@ai.image?).to eq(true)
+    expect(@ai.exif).not_to be nil
+    expect(@ai.mimetype).to eq('image/tiff')
+    expect(@ai.file_mimetype).to eq('image/tiff')
+    expect(@ai.object_type).to eq(:image)
+    expect(@ai.valid_image?).to eq(true)
+    expect(@ai.jp2able?).to eq(true)
   end
   
   it "should tell us information about the input file" do
     @ai = Assembly::ObjectFile.new(TEST_TIF_INPUT_FILE)
-    @ai.filename.should == "test.tif"
-    @ai.ext.should == ".tif"
-    @ai.filename_without_ext.should == "test"
-    @ai.dirname.should == File.dirname(TEST_TIF_INPUT_FILE)
+    expect(@ai.filename).to eq("test.tif")
+    expect(@ai.ext).to eq(".tif")
+    expect(@ai.filename_without_ext).to eq("test")
+    expect(@ai.dirname).to eq(File.dirname(TEST_TIF_INPUT_FILE))
   end
 
   it "should give us the mimetype of a file even if the exif information is damaged" do
     @ai = Assembly::ObjectFile.new(TEST_FILE_NO_EXIF)
-    @ai.filename.should == "file_with_no_exif.xml"
-    @ai.ext.should == ".xml"
-    ['text/html','application/xml'].include?(@ai.mimetype).should be true # we could get either of these mimetypes depending on the OS
+    expect(@ai.filename).to eq("file_with_no_exif.xml")
+    expect(@ai.ext).to eq(".xml")
+    expect(['text/html','application/xml'].include?(@ai.mimetype)).to be true # we could get either of these mimetypes depending on the OS
   end
 
   it "should give us the DPG base name for a file" do
     test_file=File.join(TEST_INPUT_DIR,'oo000oo0001_00_001.tif')
     @ai = Assembly::ObjectFile.new(test_file)
-    @ai.dpg_basename.should == "oo000oo0001_001"
+    expect(@ai.dpg_basename).to eq("oo000oo0001_001")
   end
 
   it "should give us the DPG subfolder name for a file" do
     test_file=File.join(TEST_INPUT_DIR,'oo000oo0001_05_001.tif')
     @ai = Assembly::ObjectFile.new(test_file)
-    @ai.dpg_folder.should == "05"
+    expect(@ai.dpg_folder).to eq("05")
   end
   
   it "should tell us that a jp2 file is not jp2able but does have a color profile" do
-    File.exists?(TEST_JP2_INPUT_FILE).should be true
+    expect(File.exists?(TEST_JP2_INPUT_FILE)).to be true
     @ai = Assembly::ObjectFile.new(TEST_JP2_INPUT_FILE)
-    @ai.image?.should == true
-    @ai.object_type.should == :image
-    @ai.valid_image?.should == true
-    @ai.jp2able?.should == false
-    @ai.has_color_profile?.should == true
+    expect(@ai.image?).to eq(true)
+    expect(@ai.object_type).to eq(:image)
+    expect(@ai.valid_image?).to eq(true)
+    expect(@ai.jp2able?).to eq(false)
+    expect(@ai.has_color_profile?).to eq(true)
   end
 
   it "should tell us that a tiff file is jp2able and has a color profile" do
-    File.exists?(TEST_RES1_TIF1).should be true
+    expect(File.exists?(TEST_RES1_TIF1)).to be true
     @ai = Assembly::ObjectFile.new(TEST_RES1_TIF1)
-    @ai.image?.should == true
-    @ai.object_type.should == :image
-    @ai.valid_image?.should == true
-    @ai.jp2able?.should == true
-    @ai.has_color_profile?.should == true
+    expect(@ai.image?).to eq(true)
+    expect(@ai.object_type).to eq(:image)
+    expect(@ai.valid_image?).to eq(true)
+    expect(@ai.jp2able?).to eq(true)
+    expect(@ai.has_color_profile?).to eq(true)
   end
   
   it "should tell us that a tiff file is not jp2able and is not valid since it has no profile" do
-    File.exists?(TEST_TIFF_NO_COLOR_FILE).should be true
+    expect(File.exists?(TEST_TIFF_NO_COLOR_FILE)).to be true
     @ai = Assembly::ObjectFile.new(TEST_TIFF_NO_COLOR_FILE)
-    @ai.image?.should == true
-    @ai.object_type.should == :image
-    @ai.valid_image?.should == true
-    @ai.jp2able?.should == true
-    @ai.has_color_profile?.should == false
+    expect(@ai.image?).to eq(true)
+    expect(@ai.object_type).to eq(:image)
+    expect(@ai.valid_image?).to eq(true)
+    expect(@ai.jp2able?).to eq(true)
+    expect(@ai.has_color_profile?).to eq(false)
   end
     
   it "should compute checksums for an image file" do
-    File.exists?(TEST_TIF_INPUT_FILE).should be true
+    expect(File.exists?(TEST_TIF_INPUT_FILE)).to be true
     @ai = Assembly::ObjectFile.new(TEST_TIF_INPUT_FILE)
-    @ai.md5.should == 'a2400500acf21e43f5440d93be894101'
-    @ai.sha1.should == '8d11fab63089a24c8b17063d29a4b0eac359fb41'
+    expect(@ai.md5).to eq('a2400500acf21e43f5440d93be894101')
+    expect(@ai.sha1).to eq('8d11fab63089a24c8b17063d29a4b0eac359fb41')
   end
 
   it "should indicate that the file is not found when a valid directory is supplied instead of a file or when an invalid file path is specified" do
     path=Assembly::PATH_TO_GEM
     @ai = Assembly::ObjectFile.new(path)
-    File.exists?(path).should be true
-    File.directory?(path).should be true
-    @ai.file_exists?.should be false
+    expect(File.exists?(path)).to be true
+    expect(File.directory?(path)).to be true
+    expect(@ai.file_exists?).to be false
     
     path=File.join(Assembly::PATH_TO_GEM,'bogus.txt')
     @ai = Assembly::ObjectFile.new(path)
-    File.exists?(path).should be false
-    File.directory?(path).should be false
-    @ai.file_exists?.should be false    
+    expect(File.exists?(path)).to be false
+    expect(File.directory?(path)).to be false
+    expect(@ai.file_exists?).to be false    
+  end
+  
+  it "should set attributes correctly when initializing" do
+    @ai = Assembly::ObjectFile.new('/some/file.txt')
+    expect(@ai.path).to eq('/some/file.txt')
+    expect(@ai.label).to be_nil 
+    expect(@ai.file_attributes).to be_nil
+    expect(@ai.provider_sha1).to be_nil
+    expect(@ai.provider_md5).to be_nil
+    expect(@ai.relative_path).to be_nil
+    
+    @ai = Assembly::ObjectFile.new('/some/file.txt',:label=>'some label',:file_attributes=>{'shelve'=>'yes','publish'=>'yes','preserve'=>'no'},:relative_path=>'/tmp')
+    expect(@ai.path).to eq('/some/file.txt')
+    expect(@ai.label).to eq('some label')
+    expect(@ai.file_attributes).to eq({'shelve'=>'yes','publish'=>'yes','preserve'=>'no'})
+    expect(@ai.provider_sha1).to be_nil
+    expect(@ai.provider_md5).to be_nil
+    expect(@ai.relative_path).to eq('/tmp')
   end
   
   it "should tell us if an input file is not an image" do
     non_image_file=File.join(Assembly::PATH_TO_GEM,'spec/object_file_spec.rb')
-    File.exists?(non_image_file).should be true
+    expect(File.exists?(non_image_file)).to be true
     @ai = Assembly::ObjectFile.new(non_image_file)
-    @ai.image?.should == false
-    @ai.object_type.should_not == :image
-    @ai.valid_image?.should == false
+    expect(@ai.image?).to eq(false)
+    expect(@ai.object_type).not_to eq(:image)
+    expect(@ai.valid_image?).to eq(false)
 
     non_image_file=File.join(Assembly::PATH_TO_GEM,'README.rdoc')
-    File.exists?(non_image_file).should be true
+    expect(File.exists?(non_image_file)).to be true
     @ai = Assembly::ObjectFile.new(non_image_file)
-    @ai.image?.should == false
-    @ai.object_type.should == :other    
-    @ai.valid_image?.should == false    
+    expect(@ai.image?).to eq(false)
+    expect(@ai.object_type).to eq(:other)    
+    expect(@ai.valid_image?).to eq(false)    
   end
 
   it "should tell us the size of an input file" do
-    File.exists?(TEST_TIF_INPUT_FILE).should be true
+    expect(File.exists?(TEST_TIF_INPUT_FILE)).to be true
     @ai = Assembly::ObjectFile.new(TEST_TIF_INPUT_FILE)
-    @ai.filesize.should == 63542
+    expect(@ai.filesize).to eq(63542)
   end
 
   it "should tell us the mimetype and encoding of an input file" do
-    File.exists?(TEST_TIF_INPUT_FILE).should be true
+    expect(File.exists?(TEST_TIF_INPUT_FILE)).to be true
     @ai = Assembly::ObjectFile.new(TEST_TIF_INPUT_FILE)
-    @ai.mimetype.should == 'image/tiff'
-    @ai.file_mimetype.should == 'image/tiff'
-    @ai.encoding.should == 'binary'
+    expect(@ai.mimetype).to eq('image/tiff')
+    expect(@ai.file_mimetype).to eq('image/tiff')
+    expect(@ai.encoding).to eq('binary')
   end
         
 end

data/spec/spec_helper.rb

@@ -1,6 +1,10 @@
 bootfile = File.expand_path(File.dirname(__FILE__) + '/../config/boot')
 require bootfile
 
+RSpec.configure do |config|
+  config.order = 'random'
+end
+
 TEST_DATA_DIR = File.join(Assembly::PATH_TO_GEM,'spec','test_data')
 TEST_INPUT_DIR       = File.join(TEST_DATA_DIR,'input')
 TEST_OUTPUT_DIR      = File.join(TEST_DATA_DIR,'output')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: assembly-objectfile
 version: !ruby/object:Gem::Version
-  version: 1.6.7
+  version: 1.6.8
 platform: ruby
 authors:
 - Peter Mangiafico
@@ -9,9 +9,9 @@ authors:
 - Monty Hindman
 - Tony Calavano
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2016-10-03 00:00:00.000000000 Z
+date: 2016-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_exiftool
@@ -89,14 +89,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -114,9 +114,7 @@ dependencies:
 description: Get exif data, file sizes and more.
 email:
 - pmangiafico@stanford.edu
-executables:
-- console
-- run_all_tests
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
@@ -195,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: assembly-objectfile
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: Ruby immplementation of file services needed to prepare objects to be accessioned
@@ -237,3 +235,4 @@ test_files:
 - spec/test_data/input/test2.jp2
 - spec/test_data/input/test2.tif
 - spec/test_data/input/test_no_color_profile.tif
+has_rdoc: