assembly-objectfile 2.1.3 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6743d03c8c75529ad425586ed16bece4858c1fd2394342918ab29c568199d4f7
-  data.tar.gz: 16a79c4115124aae1402f1651076a85eb58912b4309f5a7503536246cd55076f
+  metadata.gz: cbf476be726445b2be5a1ff9f4787d12f7e8016a828d22937c488c51d53c5071
+  data.tar.gz: b4e1953bfee015bb956dbc20ab5ab1ce09dd6e953d50aeed81c2f7c8595a04d7
 SHA512:
-  metadata.gz: f08d614455304c1d7c935bc5e69ca85400493b8ba4bb045d048dc519c5a78f401d2d7e1a62292a8048cc0e9b83bdd0bc3f9fa540e8021356f9929ba3ec72ef37
-  data.tar.gz: 2340e0deff59c7e913272c6c18ce6f27513d2b1777e7d7da9120a4b3377f00c80ae2c59e31c3c29769ae763dc2cc4888b3bbdc76ce75f6962b81b2de713d4551
+  metadata.gz: 7b0f524f32a5082068cddec3d5bd8f98371d79ca5c76867a7f7b2f0125c0452b035fb9e6a424a2d6e734b5ef61380f8821bf0be012ce8ea3ccdb25a9249943bd
+  data.tar.gz: 1fc0f0b3937c254667c6428bbb26cd1f901d175f26a6c026e07c497ee4e24bf06566ef2640f0af3c851e8bca233e10f2be84e123b5655e6885db333c004e0ca1

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@4.0.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.51.0)
       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.23.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.2.0'
   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/lib/assembly-objectfile.rb

@@ -18,7 +18,8 @@ module Assembly
   # the unix file system command returns the mapping format is "extension with period: returned mimetype",
   # e.g. for any .json file, you will always get `application/json`
   OVERRIDE_MIMETYPES = {
-    '.json': 'application/json'
+    '.json': 'application/json',
+    '.vtt': 'text/vtt'
   }.freeze
 end