assembly-objectfile 2.1.3 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6743d03c8c75529ad425586ed16bece4858c1fd2394342918ab29c568199d4f7
-  data.tar.gz: 16a79c4115124aae1402f1651076a85eb58912b4309f5a7503536246cd55076f
+  metadata.gz: 808727d8b4ab8ff12dd01249accf0d2a88e6821349d23950c2b8aaa2a1913391
+  data.tar.gz: 406feb2ba9a205ec1bb3bd9aafa8a95b87ebb6f815cbb025f6e437467ab5e2dc
 SHA512:
-  metadata.gz: f08d614455304c1d7c935bc5e69ca85400493b8ba4bb045d048dc519c5a78f401d2d7e1a62292a8048cc0e9b83bdd0bc3f9fa540e8021356f9929ba3ec72ef37
-  data.tar.gz: 2340e0deff59c7e913272c6c18ce6f27513d2b1777e7d7da9120a4b3377f00c80ae2c59e31c3c29769ae763dc2cc4888b3bbdc76ce75f6962b81b2de713d4551
+  metadata.gz: de4086ae3355a75b2bdcdf95e077215b9076b607792648404004176e09c7d724dc3c3b441a89a69149f86717461651eb89c9e0d1e83582897214ba9bce600144
+  data.tar.gz: 125078c8caf3b6f2d4fb9d17a6bd41ae622894586648cfc43a67530744cfa474505b1ddc32f3ecf51079bbcdb88978c504522a05bf3d185221da523befc9d1d0

data/.circleci/config.yml

@@ -1,6 +1,6 @@
 version: 2.1
 orbs:
-  ruby-rails: sul-dlss/ruby-rails@3.1.2
+  ruby-rails: sul-dlss/ruby-rails@3.2.0
 workflows:
   build:
     jobs:

data/.gitignore

@@ -2,8 +2,7 @@
 *.gem
 .DS_Store
 .bundle
-config/certs/*
-config/environments/*
+.rspec_status
 coverage/*
 doc/*
 log/*

data/.rubocop.yml

@@ -1,14 +1,26 @@
-inherit_from: .rubocop_todo.yml
 require: rubocop-rspec
 
+inherit_from: .rubocop_todo.yml
+
 AllCops:
   TargetRubyVersion: 3.0
+  SuggestExtensions: false
   DisplayCopNames: true
+  Include:
+    - './Rakefile' # rake only
+    - '**/*.rb'
   Exclude:
+    # autogenerated files (that we don't change) should go here
     - 'Gemfile.lock'
     - '**/*.md'
+    - spec/spec_helper.rb
     - 'vendor/**/*' # avoid running rubocop on cached bundler
 
+Bundler/GemComment:
+  OnlyFor:
+    - restrictive_version_specifiers
+    - branch
+
 Layout/LineLength:
   Max: 120
 
@@ -26,125 +38,93 @@ Metrics/BlockLength:
     - '**/*.gemspec'
 
 RSpec/ExampleLength:
-  Max: 10
+  Enabled: false
 
 RSpec/MultipleExpectations:
-  Max: 10
+  Max: 6 # default 1
+  Exclude:
+    - spec/features/**/*_spec.rb
+
+RSpec/MultipleMemoizedHelpers:
+  Enabled: false
 
 RSpec/NestedGroups:
-  Max: 4
+  Max: 4 # default: 3
 
 Gemspec/DeprecatedAttributeAssignment: # (new in 1.10)
   Enabled: true
-
 Layout/SpaceAroundMethodCallOperator:
   Enabled: true
-
 Layout/EmptyLinesAroundAttributeAccessor:
   Enabled: true
-
 Layout/SpaceBeforeBrackets: # (new in 1.7)
   Enabled: true
-
 Lint/AmbiguousAssignment: # (new in 1.7)
   Enabled: true
-
 Lint/DeprecatedConstants: # (new in 1.8)
   Enabled: true
-
 Lint/DuplicateBranch: # (new in 1.3)
   Enabled: true
-
 Lint/DuplicateRegexpCharacterClassElement: # (new in 1.1)
   Enabled: true
-
 Lint/EmptyBlock: # (new in 1.1)
   Enabled: true
-
 Lint/EmptyClass: # (new in 1.3)
   Enabled: true
-
 Lint/LambdaWithoutLiteralBlock: # (new in 1.8)
   Enabled: true
-
 Lint/NoReturnInBeginEndBlocks: # (new in 1.2)
   Enabled: true
-
 Lint/NumberedParameterAssignment: # (new in 1.9)
   Enabled: true
-
 Lint/OrAssignmentToConstant: # (new in 1.9)
   Enabled: true
-
 Lint/RedundantDirGlobSort: # (new in 1.8)
   Enabled: true
-
 Lint/SymbolConversion: # (new in 1.9)
   Enabled: true
-
 Lint/ToEnumArguments: # (new in 1.1)
   Enabled: true
-
 Lint/TripleQuotes: # (new in 1.9)
   Enabled: true
-
 Lint/UnexpectedBlockArity: # (new in 1.5)
   Enabled: true
-
 Lint/UnmodifiedReduceAccumulator: # (new in 1.1)
   Enabled: true
-
 Lint/RaiseException:
   Enabled: true
-
 Lint/StructNewOverride:
   Enabled: true
-
 Style/ExponentialNotation:
   Enabled: true
-
 Style/HashEachMethods:
   Enabled: true
-
 Style/HashTransformKeys:
   Enabled: true
-
 Style/HashTransformValues:
   Enabled: true
-
 Style/SlicingWithRange:
   Enabled: true
-
 Style/ArgumentsForwarding: # (new in 1.1)
   Enabled: true
-
 Style/CollectionCompact: # (new in 1.2)
   Enabled: true
-
 Style/DocumentDynamicEvalDefinition: # (new in 1.1)
   Enabled: true
-
 Style/EndlessMethod: # (new in 1.8)
   Enabled: true
-
 Style/HashConversion: # (new in 1.10)
   Enabled: true
-
 Style/HashExcept: # (new in 1.7)
   Enabled: true
-
 Style/IfWithBooleanLiteralBranches: # (new in 1.9)
   Enabled: true
-
 Style/NegatedIfElseCondition: # (new in 1.2)
   Enabled: true
-
 Style/NilLambda: # (new in 1.3)
   Enabled: true
-
 Style/RedundantArgument: # (new in 1.4)
   Enabled: true
-
 Style/SwapValues: # (new in 1.1)
   Enabled: true
 
@@ -240,3 +220,16 @@ RSpec/Capybara/SpecificMatcher: # new in 2.12
   Enabled: true
 RSpec/Rails/HaveHttpStatus: # new in 2.12
   Enabled: true
+
+Lint/RequireRangeParentheses: # new in 1.32
+  Enabled: true
+Style/EmptyHeredoc: # new in 1.32
+  Enabled: true
+Style/MagicCommentFormat: # new in 1.35
+  Enabled: true
+RSpec/ClassCheck: # new in 2.13
+  Enabled: true
+RSpec/NoExpectationExample: # new in 2.13
+  Enabled: true
+RSpec/Capybara/SpecificFinders: # new in 2.13
+  Enabled: true

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    assembly-objectfile (2.1.3)
+    assembly-objectfile (2.1.4)
       activesupport (>= 5.2.0)
       mime-types (> 3)
       mini_exiftool
@@ -9,7 +9,7 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (7.0.3.1)
+    activesupport (7.0.4.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -17,22 +17,22 @@ GEM
     ast (2.4.2)
     byebug (11.1.3)
     coderay (1.1.3)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.2)
     diff-lcs (1.5.0)
     docile (1.4.0)
-    i18n (1.12.0)
+    i18n (1.13.0)
       concurrent-ruby (~> 1.0)
-    json (2.6.2)
+    json (2.6.3)
     method_source (1.0.0)
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2022.0105)
+    mime-types-data (3.2023.0218.1)
     mini_exiftool (2.10.2)
-    minitest (5.16.3)
-    parallel (1.22.1)
-    parser (3.1.2.1)
+    minitest (5.18.0)
+    parallel (1.23.0)
+    parser (3.2.2.1)
       ast (~> 2.4.1)
-    pry (0.14.1)
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
     pry-byebug (3.10.1)
@@ -40,45 +40,51 @@ GEM
       pry (>= 0.13, < 0.15)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.5.0)
+    regexp_parser (2.8.0)
     rexml (3.2.5)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.1)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.5)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
-    rubocop (1.35.1)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    rubocop (1.50.2)
       json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.1.2.1)
+      parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.20.1, < 2.0)
+      rubocop-ast (>= 1.28.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.21.0)
-      parser (>= 3.1.1.0)
-    rubocop-rspec (2.12.1)
-      rubocop (~> 1.31)
-    ruby-progressbar (1.11.0)
-    simplecov (0.21.2)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.28.1)
+      parser (>= 3.2.1.0)
+    rubocop-capybara (2.18.0)
+      rubocop (~> 1.41)
+    rubocop-factory_bot (2.22.0)
+      rubocop (~> 1.33)
+    rubocop-rspec (2.22.0)
+      rubocop (~> 1.33)
+      rubocop-capybara (~> 2.17)
+      rubocop-factory_bot (~> 2.22)
+    ruby-progressbar (1.13.0)
+    simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    tzinfo (2.0.5)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.2.0)
+    unicode-display_width (2.4.2)
 
 PLATFORMS
   ruby
@@ -94,4 +100,4 @@ DEPENDENCIES
   simplecov
 
 BUNDLED WITH
-   2.3.17
+   2.4.13

data/lib/assembly/object_file/version.rb

@@ -4,6 +4,6 @@
 module Assembly
   class ObjectFile
     # Gem version
-    VERSION = '2.1.3'
+    VERSION = '2.1.4'
   end
 end

data/lib/assembly/object_file.rb

@@ -11,8 +11,8 @@ module Assembly
     # @return [String] longest common initial path of filenames passed in
     #
     # Example:
-    #   puts Assembly::ObjectFile.common_prefix(['/Users/peter/00/test.tif','/Users/peter/05/test.jp2'])
-    #   # => '/Users/peter/0'
+    #   puts Assembly::ObjectFile.common_path(['/Users/peter/00/test.tif','/Users/peter/05/test.jp2'])
+    #   # => '/Users/peter/'
     def self.common_path(strings)
       return nil if strings.empty?
 
@@ -27,7 +27,7 @@ module Assembly
       end
     end
 
-    attr_accessor :file_attributes, :label, :path, :provider_md5, :provider_sha1, :relative_path, :mime_type_order
+    attr_accessor :file_attributes, :label, :path, :provider_md5, :relative_path, :mime_type_order
 
     VALID_MIMETYPE_METHODS = %i[override exif file extension].freeze
 
@@ -39,7 +39,6 @@ module Assembly
     # @option params [String] :label a resource label (files bundled together will just get the first
     #                                file's label attribute if set)
     # @option params [String] :provider_md5 pre-computed MD5 checksum
-    # @option params [String] :provider_sha1 pre-computed SHA1 checksum
     # @option params [String] :relative_path if you want the file ids in the content metadata it can be set,
     #                                        otherwise content metadata will get the full path
     # @option params [Array] :mime_type_order can be set to the order in which you want mimetypes to be determined
@@ -55,7 +54,6 @@ module Assembly
       @file_attributes = params[:file_attributes]
       @relative_path = params[:relative_path]
       @provider_md5 = params[:provider_md5]
-      @provider_sha1 = params[:provider_sha1]
       @mime_type_order = params[:mime_type_order] || default_mime_type_order
     end
 
@@ -90,13 +88,13 @@ module Assembly
     # @return [String] computed md5 checksum
     def md5
       check_for_file unless @md5
-      @md5 ||= Digest::MD5.file(path).hexdigest
+      @md5 ||= Digest(:MD5).file(path).hexdigest
     end
 
     # @return [String] computed sha1 checksum
     def sha1
       check_for_file unless @sha1
-      @sha1 ||= Digest::SHA1.file(path).hexdigest
+      @sha1 ||= Digest(:SHA1).file(path).hexdigest
     end
 
     # Returns mimetype information for the current file based on the ordering set in default_mime_type_order

data/spec/assembly/object_file_spec.rb

@@ -3,6 +3,19 @@
 require 'spec_helper'
 
 describe Assembly::ObjectFile do
+  let(:root_path) { File.expand_path("#{File.dirname(__dir__)}/..") }
+  let(:fixture_input_dir) { File.join(root_path, 'spec', 'fixtures', 'input') }
+  let(:tif_fixture_file) { File.join(fixture_input_dir, 'test.tif') }
+  let(:jp2_fixture_file) { File.join(fixture_input_dir, 'test.jp2') }
+  let(:tiff_no_color_fixture_file) { File.join(fixture_input_dir, 'test_no_color_profile.tif') }
+  let(:resource1_tif_fixture_file) { File.join(fixture_input_dir, 'res1_image1.tif') }
+  let(:resource1_text_fixture_file) { File.join(fixture_input_dir, 'res1_textfile.txt') }
+  let(:resource1_pdf_fixture_file) { File.join(fixture_input_dir, 'res1_transcript.pdf') }
+  let(:no_exif_fixture_file) { File.join(fixture_input_dir, 'file_with_no_exif.xml') }
+  let(:json_fixture_file) { File.join(fixture_input_dir, 'test.json') }
+  let(:obj_fixture_file) { File.join(fixture_input_dir, 'someobject.obj') }
+  let(:ply_fixture_file) { File.join(fixture_input_dir, 'someobject.ply') }
+
   describe '.common_path' do
     context 'when common path is 2 nodes out of 4' do
       it 'returns the common directory' do
@@ -33,7 +46,6 @@ describe Assembly::ObjectFile do
         expect(object_file.path).to eq('/some/file.txt')
         expect(object_file.label).to be_nil
         expect(object_file.file_attributes).to be_nil
-        expect(object_file.provider_sha1).to be_nil
         expect(object_file.provider_md5).to be_nil
         expect(object_file.relative_path).to be_nil
       end
@@ -52,7 +64,6 @@ describe Assembly::ObjectFile do
         expect(object_file.path).to eq('/some/file.txt')
         expect(object_file.label).to eq('some label')
         expect(object_file.file_attributes).to eq('shelve' => 'yes', 'publish' => 'yes', 'preserve' => 'no')
-        expect(object_file.provider_sha1).to be_nil
         expect(object_file.provider_md5).to be_nil
         expect(object_file.relative_path).to eq('/tmp')
       end
@@ -69,29 +80,29 @@ describe Assembly::ObjectFile do
 
   describe '#filename' do
     it 'returns File.basename' do
-      object_file = described_class.new(TEST_TIF_INPUT_FILE)
+      object_file = described_class.new(tif_fixture_file)
       expect(object_file.filename).to eq('test.tif')
-      expect(object_file.filename).to eq(File.basename(TEST_TIF_INPUT_FILE))
+      expect(object_file.filename).to eq(File.basename(tif_fixture_file))
     end
   end
 
   describe '#ext' do
     it 'returns the file extension' do
-      object_file = described_class.new(TEST_TIF_INPUT_FILE)
+      object_file = described_class.new(tif_fixture_file)
       expect(object_file.ext).to eq('.tif')
     end
   end
 
   describe '#dirname' do
     it 'returns the File.dirname' do
-      object_file = described_class.new(TEST_TIF_INPUT_FILE)
-      expect(object_file.dirname).to eq(File.dirname(TEST_TIF_INPUT_FILE))
+      object_file = described_class.new(tif_fixture_file)
+      expect(object_file.dirname).to eq(File.dirname(tif_fixture_file))
     end
   end
 
   describe '#filename_without_ext' do
     it 'returns filename before extension' do
-      object_file = described_class.new(TEST_TIF_INPUT_FILE)
+      object_file = described_class.new(tif_fixture_file)
       expect(object_file.filename_without_ext).to eq('test')
     end
   end
@@ -100,13 +111,13 @@ describe Assembly::ObjectFile do
     subject { object_file.image? }
 
     context 'with tiff' do
-      let(:object_file) { described_class.new(TEST_TIF_INPUT_FILE) }
+      let(:object_file) { described_class.new(tif_fixture_file) }
 
       it { is_expected.to be true }
     end
 
     context 'with jp2' do
-      let(:object_file) { described_class.new(TEST_JP2_INPUT_FILE) }
+      let(:object_file) { described_class.new(jp2_fixture_file) }
 
       it { is_expected.to be true }
     end
@@ -117,19 +128,19 @@ describe Assembly::ObjectFile do
         allow(object_file).to receive(:file_mimetype).and_return('image/x-tga')
       end
 
-      let(:object_file) { described_class.new(TEST_JP2_INPUT_FILE) }
+      let(:object_file) { described_class.new(jp2_fixture_file) }
 
       it { is_expected.to be false }
     end
 
     context 'with ruby file' do
-      let(:object_file) { described_class.new(File.join(PATH_TO_GEM, 'spec/assembly/object_file_spec.rb')) }
+      let(:object_file) { described_class.new(File.join(root_path, 'spec/assembly/object_file_spec.rb')) }
 
       it { is_expected.to be false }
     end
 
     context 'with xml' do
-      let(:object_file) { described_class.new(File.join(PATH_TO_GEM, 'spec/test_data/input/file_with_no_exif.xml')) }
+      let(:object_file) { described_class.new(File.join(fixture_input_dir, 'file_with_no_exif.xml')) }
 
       it { is_expected.to be false }
     end
@@ -138,21 +149,21 @@ describe Assembly::ObjectFile do
   describe '#object_type' do
     context 'with tiff' do
       it ':image' do
-        object_file = described_class.new(TEST_TIF_INPUT_FILE)
+        object_file = described_class.new(tif_fixture_file)
         expect(object_file.object_type).to eq(:image)
       end
     end
 
     context 'with jp2' do
       it ':image' do
-        object_file = described_class.new(TEST_JP2_INPUT_FILE)
+        object_file = described_class.new(jp2_fixture_file)
         expect(object_file.object_type).to eq(:image)
       end
     end
 
     context 'with ruby file' do
       it ':text' do
-        non_image_file = File.join(PATH_TO_GEM, 'spec/assembly/object_file_spec.rb')
+        non_image_file = File.join(root_path, 'spec/assembly/object_file_spec.rb')
         object_file = described_class.new(non_image_file)
         expect(object_file.object_type).to eq(:text)
       end
@@ -160,7 +171,7 @@ describe Assembly::ObjectFile do
 
     context 'with xml' do
       it ':application' do
-        non_image_file = File.join(PATH_TO_GEM, 'spec/test_data/input/file_with_no_exif.xml')
+        non_image_file = File.join(fixture_input_dir, 'file_with_no_exif.xml')
         object_file = described_class.new(non_image_file)
         expect(object_file.object_type).to eq(:application)
       end
@@ -170,35 +181,35 @@ describe Assembly::ObjectFile do
   describe '#valid_image?' do
     context 'with tiff' do
       it 'true' do
-        object_file = described_class.new(TEST_TIF_INPUT_FILE)
+        object_file = described_class.new(tif_fixture_file)
         expect(object_file.valid_image?).to be(true)
       end
     end
 
     context 'with tiff resolution 1' do
       it 'true' do
-        object_file = described_class.new(TEST_RES1_TIF1)
+        object_file = described_class.new(resource1_tif_fixture_file)
         expect(object_file.valid_image?).to be(true)
       end
     end
 
     context 'with tiff no color' do
       it 'true' do
-        object_file = described_class.new(TEST_TIFF_NO_COLOR_FILE)
+        object_file = described_class.new(tiff_no_color_fixture_file)
         expect(object_file.valid_image?).to be(true)
       end
     end
 
     context 'with jp2' do
       it 'true' do
-        object_file = described_class.new(TEST_JP2_INPUT_FILE)
+        object_file = described_class.new(jp2_fixture_file)
         expect(object_file.valid_image?).to be(true)
       end
     end
 
     context 'with ruby file' do
       it 'false' do
-        non_image_file = File.join(PATH_TO_GEM, 'spec/assembly/object_file_spec.rb')
+        non_image_file = File.join(root_path, 'spec/assembly/object_file_spec.rb')
         object_file = described_class.new(non_image_file)
         expect(object_file.valid_image?).to be(false)
       end
@@ -206,7 +217,7 @@ describe Assembly::ObjectFile do
 
     context 'with xml' do
       it 'false' do
-        non_image_file = File.join(PATH_TO_GEM, 'spec/test_data/input/file_with_no_exif.xml')
+        non_image_file = File.join(fixture_input_dir, 'file_with_no_exif.xml')
         object_file = described_class.new(non_image_file)
         expect(object_file.valid_image?).to be(false)
       end
@@ -217,14 +228,14 @@ describe Assembly::ObjectFile do
     # rubocop:disable RSpec/RepeatedExampleGroupBody
     context 'with .txt file' do
       it 'plain/text' do
-        object_file = described_class.new(TEST_RES1_TEXT)
+        object_file = described_class.new(resource1_text_fixture_file)
         expect(object_file.mimetype).to eq('text/plain')
       end
     end
 
     context 'with .xml file' do
       it 'plain/text' do
-        object_file = described_class.new(TEST_RES1_TEXT)
+        object_file = described_class.new(resource1_text_fixture_file)
         expect(object_file.mimetype).to eq('text/plain')
       end
     end
@@ -232,21 +243,21 @@ describe Assembly::ObjectFile do
 
     context 'with .tif file' do
       it 'image/tiff' do
-        object_file = described_class.new(TEST_TIF_INPUT_FILE)
+        object_file = described_class.new(tif_fixture_file)
         expect(object_file.mimetype).to eq('image/tiff')
       end
     end
 
     context 'with .jp2 file' do
       it 'image/jp2' do
-        object_file = described_class.new(TEST_JP2_INPUT_FILE)
+        object_file = described_class.new(jp2_fixture_file)
         expect(object_file.mimetype).to eq('image/jp2')
       end
     end
 
     context 'with .pdf file' do
       it 'application/pdf' do
-        object_file = described_class.new(TEST_RES1_PDF)
+        object_file = described_class.new(resource1_pdf_fixture_file)
         expect(object_file.mimetype).to eq('application/pdf')
       end
     end
@@ -254,21 +265,21 @@ describe Assembly::ObjectFile do
     context 'with .obj (3d) file' do
       context 'when default preference (unix file system command)' do
         it 'plain/text' do
-          object_file = described_class.new(TEST_OBJ_FILE)
+          object_file = described_class.new(obj_fixture_file)
           expect(object_file.mimetype).to eq('text/plain')
         end
       end
 
       context 'when mimetype extension gem preferred over unix file system command' do
         it 'application/x-tgif' do
-          object_file = described_class.new(TEST_OBJ_FILE, mime_type_order: %i[extension file exif])
+          object_file = described_class.new(obj_fixture_file, mime_type_order: %i[extension file exif])
           expect(object_file.mimetype).to eq('application/x-tgif')
         end
       end
 
       context 'when invalid first preference mimetype generation' do
         it 'ignores invalid mimetype generation method and respects valid method preference order' do
-          object_file = described_class.new(TEST_OBJ_FILE, mime_type_order: %i[bogus extension file])
+          object_file = described_class.new(obj_fixture_file, mime_type_order: %i[bogus extension file])
           expect(object_file.mimetype).to eq('application/x-tgif')
         end
       end
@@ -276,14 +287,14 @@ describe Assembly::ObjectFile do
 
     context 'with .ply 3d file' do
       it 'text/plain' do
-        object_file = described_class.new(TEST_PLY_FILE)
+        object_file = described_class.new(ply_fixture_file)
         expect(object_file.mimetype).to eq('text/plain')
       end
     end
 
     context 'when exif information is damaged' do
       it 'gives us the mimetype' do
-        object_file = described_class.new(TEST_FILE_NO_EXIF)
+        object_file = described_class.new(no_exif_fixture_file)
         expect(object_file.filename).to eq('file_with_no_exif.xml')
         expect(object_file.ext).to eq('.xml')
         # we could get either of these mimetypes depending on the OS
@@ -293,7 +304,7 @@ describe Assembly::ObjectFile do
 
     context 'when .json file' do
       it 'uses the manual mapping to set the correct mimetype of application/json for a .json file' do
-        object_file = described_class.new(TEST_JSON_FILE)
+        object_file = described_class.new(json_fixture_file)
         expect(object_file.send(:exif_mimetype)).to be_nil # exif
         expect(object_file.send(:file_mimetype)).to eq('text/plain') # unix file system command
         expect(object_file.mimetype).to eq('application/json') # our configured mapping overrides both
@@ -304,14 +315,14 @@ describe Assembly::ObjectFile do
   describe '#file_mimetype (unix file system command)' do
     context 'when .json file' do
       it 'text/plain' do
-        object_file = described_class.new(TEST_JSON_FILE)
+        object_file = described_class.new(json_fixture_file)
         expect(object_file.send(:file_mimetype)).to eq('text/plain')
       end
     end
 
     context 'when .tif file' do
       it 'image/tiff' do
-        object_file = described_class.new(TEST_TIF_INPUT_FILE)
+        object_file = described_class.new(tif_fixture_file)
         expect(object_file.send(:file_mimetype)).to eq('image/tiff')
       end
     end
@@ -320,21 +331,21 @@ describe Assembly::ObjectFile do
   describe '#jp2able?' do
     context 'with jp2 file' do
       it 'false' do
-        object_file = described_class.new(TEST_JP2_INPUT_FILE)
+        object_file = described_class.new(jp2_fixture_file)
         expect(object_file.jp2able?).to be(false)
       end
     end
 
     context 'with tiff resolution 1 file' do
       it 'true' do
-        object_file = described_class.new(TEST_RES1_TIF1)
+        object_file = described_class.new(resource1_tif_fixture_file)
         expect(object_file.jp2able?).to be(true)
       end
     end
 
     context 'with tiff no color file' do
       it 'true' do
-        object_file = described_class.new(TEST_TIFF_NO_COLOR_FILE)
+        object_file = described_class.new(tiff_no_color_fixture_file)
         expect(object_file.jp2able?).to be(true)
       end
     end
@@ -342,7 +353,7 @@ describe Assembly::ObjectFile do
 
   describe '#md5' do
     it 'computes md5 for an image file' do
-      object_file = described_class.new(TEST_TIF_INPUT_FILE)
+      object_file = described_class.new(tif_fixture_file)
       expect(object_file.md5).to eq('a2400500acf21e43f5440d93be894101')
     end
 
@@ -354,7 +365,7 @@ describe Assembly::ObjectFile do
 
   describe '#sha1' do
     it 'computes sha1 for an image file' do
-      object_file = described_class.new(TEST_TIF_INPUT_FILE)
+      object_file = described_class.new(tif_fixture_file)
       expect(object_file.sha1).to eq('8d11fab63089a24c8b17063d29a4b0eac359fb41')
     end
 
@@ -366,7 +377,7 @@ describe Assembly::ObjectFile do
 
   describe '#file_exists?' do
     it 'false when a valid directory is specified instead of a file' do
-      path = PATH_TO_GEM
+      path = root_path
       object_file = described_class.new(path)
       expect(File.exist?(path)).to be true
       expect(File.directory?(path)).to be true
@@ -374,7 +385,7 @@ describe Assembly::ObjectFile do
     end
 
     it 'false when a non-existent file is specified' do
-      path = File.join(PATH_TO_GEM, 'file_not_there.txt')
+      path = File.join(root_path, 'file_not_there.txt')
       object_file = described_class.new(path)
       expect(File.exist?(path)).to be false
       expect(File.directory?(path)).to be false
@@ -384,7 +395,7 @@ describe Assembly::ObjectFile do
 
   describe '#filesize' do
     it 'tells us the size of an input file' do
-      object_file = described_class.new(TEST_TIF_INPUT_FILE)
+      object_file = described_class.new(tif_fixture_file)
       expect(object_file.filesize).to eq(63_542)
     end
 
@@ -397,12 +408,12 @@ describe Assembly::ObjectFile do
   describe '#exif' do
     subject(:exif) { object_file.exif }
 
-    let(:object_file) { described_class.new(TEST_TIF_INPUT_FILE) }
+    let(:object_file) { described_class.new(tif_fixture_file) }
 
-    it { is_expected.to be_kind_of MiniExiftool }
+    it { is_expected.to be_a MiniExiftool }
 
     context 'when exiftool raises an error initializing the file' do
-      let(:object_file) { described_class.new('spec/test_data/empty.txt') }
+      let(:object_file) { described_class.new('spec/fixtures/empty.txt') }
 
       it { is_expected.to be_nil }
     end
@@ -412,14 +423,14 @@ describe Assembly::ObjectFile do
     # mime-types gem, based on a file extension lookup
     context 'with .obj file' do
       it 'application/x-tgif' do
-        object_file = described_class.new(TEST_OBJ_FILE)
+        object_file = described_class.new(obj_fixture_file)
         expect(object_file.send(:extension_mimetype)).to eq('application/x-tgif')
       end
     end
 
     context 'with .tif file' do
       it 'image/tiff' do
-        object_file = described_class.new(TEST_TIF_INPUT_FILE)
+        object_file = described_class.new(tif_fixture_file)
         expect(object_file.send(:extension_mimetype)).to eq('image/tiff')
       end
     end
@@ -428,14 +439,14 @@ describe Assembly::ObjectFile do
   describe '#exif_mimetype' do
     context 'with .tif file' do
       it 'image/tiff' do
-        object_file = described_class.new(TEST_TIF_INPUT_FILE)
+        object_file = described_class.new(tif_fixture_file)
         expect(object_file.send(:exif_mimetype)).to eq('image/tiff')
       end
     end
 
     context 'when .json file' do
       it 'nil' do
-        object_file = described_class.new(TEST_JSON_FILE)
+        object_file = described_class.new(json_fixture_file)
         expect(object_file.send(:exif_mimetype)).to be_nil
       end
     end

data/spec/spec_helper.rb

@@ -7,23 +7,15 @@ require File.expand_path("#{File.dirname(__FILE__)}/../config/boot")
 require 'pry-byebug'
 
 RSpec.configure do |config|
-  config.order = 'random'
-end
-
-PATH_TO_GEM = File.expand_path("#{File.dirname(__FILE__)}/..")
-TEST_INPUT_DIR       = File.join(PATH_TO_GEM, 'spec', 'test_data', 'input')
-TEST_TIF_INPUT_FILE  = File.join(TEST_INPUT_DIR, 'test.tif')
-TEST_JP2_INPUT_FILE = File.join(TEST_INPUT_DIR, 'test.jp2')
-
-TEST_TIFF_NO_COLOR_FILE = File.join(TEST_INPUT_DIR, 'test_no_color_profile.tif')
+  # Enable flags like --only-failures and --next-failure
+  config.example_status_persistence_file_path = ".rspec_status"
 
-TEST_RES1_TIF1 = File.join(TEST_INPUT_DIR, 'res1_image1.tif')
-TEST_RES1_TEXT = File.join(TEST_INPUT_DIR, 'res1_textfile.txt')
-TEST_RES1_PDF = File.join(TEST_INPUT_DIR, 'res1_transcript.pdf')
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
 
-TEST_FILE_NO_EXIF = File.join(TEST_INPUT_DIR, 'file_with_no_exif.xml')
+  config.default_formatter = 'doc' if config.files_to_run.one?
 
-TEST_JSON_FILE = File.join(TEST_INPUT_DIR, 'test.json')
-
-TEST_OBJ_FILE = File.join(TEST_INPUT_DIR, 'someobject.obj')
-TEST_PLY_FILE = File.join(TEST_INPUT_DIR, 'someobject.ply')
+  config.order = 'random'
+  Kernel.srand config.seed
+end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: assembly-objectfile
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.4
 platform: ruby
 authors:
 - Peter Mangiafico
 - Renzo Sanchez-Silva
 - Monty Hindman
 - Tony Calavano
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-30 00:00:00.000000000 Z
+date: 2023-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -166,25 +166,25 @@ files:
 - lib/assembly/object_file.rb
 - lib/assembly/object_file/version.rb
 - spec/assembly/object_file_spec.rb
+- spec/fixtures/empty.txt
+- spec/fixtures/input/.empty
+- spec/fixtures/input/file_with_no_exif.xml
+- spec/fixtures/input/res1_image1.tif
+- spec/fixtures/input/res1_textfile.txt
+- spec/fixtures/input/res1_transcript.pdf
+- spec/fixtures/input/someobject.obj
+- spec/fixtures/input/someobject.ply
+- spec/fixtures/input/test.jp2
+- spec/fixtures/input/test.json
+- spec/fixtures/input/test.tif
+- spec/fixtures/input/test_no_color_profile.tif
 - spec/spec_helper.rb
-- spec/test_data/empty.txt
-- spec/test_data/input/.empty
-- spec/test_data/input/file_with_no_exif.xml
-- spec/test_data/input/res1_image1.tif
-- spec/test_data/input/res1_textfile.txt
-- spec/test_data/input/res1_transcript.pdf
-- spec/test_data/input/someobject.obj
-- spec/test_data/input/someobject.ply
-- spec/test_data/input/test.jp2
-- spec/test_data/input/test.json
-- spec/test_data/input/test.tif
-- spec/test_data/input/test_no_color_profile.tif
 homepage: https://github.com/sul-dlss/assembly-objectfile
 licenses:
 - ALv2
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -199,8 +199,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
-signing_key:
+rubygems_version: 3.4.12
+signing_key: 
 specification_version: 4
 summary: Ruby implementation of file services needed to prepare objects to be accessioned
   into the Stanford Digital Repository