assembly-objectfile 2.2.1 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8fa613f8ed1430fc36afc62c81826a53c1825ba517423ad76f00f6312660e981
-  data.tar.gz: 7fbeb270ed5c9966df2a97f7cfdbf0d575b1ed02aad64ae7fbe04de214ce288a
+  metadata.gz: 573f33db1e5eaf184ce40a88c40c0f194d5bceb3b7f4c4064e457c25b90e50f6
+  data.tar.gz: 82d86665fee350c6e21be0336cb6551373dde51ac60d1f14e4574e14663a00d7
 SHA512:
-  metadata.gz: 229db4e410f940135b8a2035ec06fb2afa80208859f2499228e74a81cf56dc1530cac9a8f2270d098e5690e400db82f0bcda7ffe95ed5a51bca153d70db4b70f
-  data.tar.gz: eb28fe4b430a39fffb23964c3622a402b3557adeb5d4cbc32400cb51a5ce5d2d9902a1106657f8d527b9e14046a373a0b0040a74cab705ffe95d651016d05a65
+  metadata.gz: ccd8fdca0e0dc2faf6186be255140cd52d7dc0f0f159e79dbbd9057a1916bd136940f0165d570f1ea7fd1b0b1103053535cd998621248b2ef5b792f9ad7c6ab7
+  data.tar.gz: 659a0abed78f1583c8ad8e5f9227634946e0129f8dc6991a9336cb83542f7029bd1579b6159693772be616aa23b66661180a50102e8b9038031cec882e8f06e1

data/.circleci/config.yml

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

data/.rubocop.yml

@@ -32,7 +32,7 @@ Naming/FileName:
   Exclude:
     - 'lib/assembly-objectfile.rb'
 
-Naming/PredicateName:
+Naming/PredicatePrefix:
   ForbiddenPrefixes:
     - has_
     - have_
@@ -221,7 +221,7 @@ Lint/ConstantOverwrittenInRescue: # new in 1.31
   Enabled: true
 Lint/NonAtomicFileOperation: # new in 1.31
   Enabled: true
-Capybara/SpecificMatcher: # new in 2.12
+Capybara/RSpec/SpecificMatcher: # new in 2.12
   Enabled: true
 RSpecRails/HaveHttpStatus: # new in 2.12
   Enabled: true
@@ -287,9 +287,9 @@ Style/RedundantRegexpConstructor: # new in 1.52
   Enabled: true
 Style/RedundantStringEscape: # new in 1.37
   Enabled: true
-Capybara/MatchStyle: # new in 2.17
+Capybara/RSpec/MatchStyle: # new in 2.17
   Enabled: true
-Capybara/NegationMatcher: # new in 2.14
+Capybara/RSpec/NegationMatcher: # new in 2.14
   Enabled: true
 Capybara/SpecificActions: # new in 2.14
   Enabled: true
@@ -327,3 +327,170 @@ RSpecRails/MinitestAssertions: # new in 2.17
   Enabled: true
 RSpecRails/TravelAround: # new in 2.19
   Enabled: true
+
+Gemspec/AddRuntimeDependency: # new in 1.65
+  Enabled: true
+Gemspec/AttributeAssignment: # new in 1.77
+  Enabled: true
+Layout/EmptyLinesAfterModuleInclusion: # new in 1.79
+  Enabled: true
+Lint/ArrayLiteralInRegexp: # new in 1.71
+  Enabled: true
+Lint/ConstantReassignment: # new in 1.70
+  Enabled: true
+Lint/CopDirectiveSyntax: # new in 1.72
+  Enabled: true
+Lint/DataDefineOverride: # new in 1.85
+  Enabled: true
+Lint/DuplicateSetElement: # new in 1.67
+  Enabled: true
+Lint/HashNewWithKeywordArgumentsAsDefault: # new in 1.69
+  Enabled: true
+Lint/ItWithoutArgumentsInBlock: # new in 1.59
+  Enabled: true
+Lint/LiteralAssignmentInCondition: # new in 1.58
+  Enabled: true
+Lint/MixedCaseRange: # new in 1.53
+  Enabled: true
+Lint/NumericOperationWithConstantResult: # new in 1.69
+  Enabled: true
+Lint/RedundantRegexpQuantifiers: # new in 1.53
+  Enabled: true
+Lint/RedundantTypeConversion: # new in 1.72
+  Enabled: true
+Lint/SharedMutableDefault: # new in 1.70
+  Enabled: true
+Lint/SuppressedExceptionInNumberConversion: # new in 1.72
+  Enabled: true
+Lint/UnescapedBracketInRegexp: # new in 1.68
+  Enabled: true
+Lint/UnreachablePatternBranch: # new in 1.85
+  Enabled: true
+Lint/UselessConstantScoping: # new in 1.72
+  Enabled: true
+Lint/UselessDefaultValueArgument: # new in 1.76
+  Enabled: true
+Lint/UselessDefined: # new in 1.69
+  Enabled: true
+Lint/UselessNumericOperation: # new in 1.66
+  Enabled: true
+Lint/UselessOr: # new in 1.76
+  Enabled: true
+Naming/PredicateMethod: # new in 1.76
+  Enabled: true
+Style/AmbiguousEndlessMethodDefinition: # new in 1.68
+  Enabled: true
+Style/ArrayIntersectWithSingleElement: # new in 1.81
+  Enabled: true
+Style/BitwisePredicate: # new in 1.68
+  Enabled: true
+Style/CollectionQuerying: # new in 1.77
+  Enabled: true
+Style/CombinableDefined: # new in 1.68
+  Enabled: true
+Style/ComparableBetween: # new in 1.74
+  Enabled: true
+Style/DigChain: # new in 1.69
+  Enabled: true
+Style/EmptyClassDefinition: # new in 1.84
+  Enabled: true
+Style/EmptyStringInsideInterpolation: # new in 1.76
+  Enabled: true
+Style/FileNull: # new in 1.69
+  Enabled: true
+Style/FileOpen: # new in 1.85
+  Enabled: true
+Style/FileTouch: # new in 1.69
+  Enabled: true
+Style/HashFetchChain: # new in 1.75
+  Enabled: true
+Style/HashSlice: # new in 1.71
+  Enabled: true
+Style/ItAssignment: # new in 1.70
+  Enabled: true
+Style/ItBlockParameter: # new in 1.75
+  Enabled: true
+Style/KeywordArgumentsMerging: # new in 1.68
+  Enabled: true
+Style/MapIntoArray: # new in 1.63
+  Enabled: true
+Style/MapJoin: # new in 1.85
+  Enabled: true
+Style/ModuleMemberExistenceCheck: # new in 1.82
+  Enabled: true
+Style/NegativeArrayIndex: # new in 1.84
+  Enabled: true
+Style/OneClassPerFile: # new in 1.85
+  Enabled: true
+Style/PartitionInsteadOfDoubleSelect: # new in 1.85
+  Enabled: true
+Style/PredicateWithKind: # new in 1.85
+  Enabled: true
+Style/ReduceToHash: # new in 1.85
+  Enabled: true
+Style/RedundantArrayFlatten: # new in 1.76
+  Enabled: true
+Style/RedundantCurrentDirectoryInPath: # new in 1.53
+  Enabled: true
+Style/RedundantFormat: # new in 1.72
+  Enabled: true
+Style/RedundantInterpolationUnfreeze: # new in 1.66
+  Enabled: true
+Style/RedundantMinMaxBy: # new in 1.85
+  Enabled: true
+Style/RedundantRegexpArgument: # new in 1.53
+  Enabled: true
+Style/ReturnNilInPredicateMethodDefinition: # new in 1.53
+  Enabled: true
+Style/ReverseFind: # new in 1.84
+  Enabled: true
+Style/SafeNavigationChainLength: # new in 1.68
+  Enabled: true
+Style/SelectByKind: # new in 1.85
+  Enabled: true
+Style/SelectByRange: # new in 1.85
+  Enabled: true
+Style/SendWithLiteralMethodName: # new in 1.64
+  Enabled: true
+Style/SingleLineDoEndBlock: # new in 1.57
+  Enabled: true
+Style/SuperArguments: # new in 1.64
+  Enabled: true
+Style/SuperWithArgsParentheses: # new in 1.58
+  Enabled: true
+Style/TallyMethod: # new in 1.85
+  Enabled: true
+Style/YAMLFileRead: # new in 1.53
+  Enabled: true
+Capybara/AssertStyle: # new in 2.23
+  Enabled: true
+Capybara/FindAllFirst: # new in 2.22
+  Enabled: true
+Capybara/RedundantWithinFind: # new in 2.20
+  Enabled: true
+Capybara/RSpec/CurrentPathExpectation: # new in 1.18
+  Enabled: true
+Capybara/RSpec/HaveContent: # new in 2.23
+  Enabled: true
+Capybara/RSpec/HaveSelector: # new in 2.19
+  Enabled: true
+Capybara/RSpec/NegationMatcherAfterVisit: # new in 2.22
+  Enabled: true
+Capybara/RSpec/PredicateMatcher: # new in 2.19
+  Enabled: true
+Capybara/RSpec/VisibilityMatcher: # new in 1.39
+  Enabled: true
+FactoryBot/ExcessiveCreateList: # new in 2.25
+  Enabled: true
+FactoryBot/IdSequence: # new in 2.24
+  Enabled: true
+RSpec/IncludeExamples: # new in 3.6
+  Enabled: true
+RSpec/LeakyLocalVariable: # new in 3.8
+  Enabled: true
+RSpec/Output: # new in 3.9
+  Enabled: true
+RSpecRails/HttpStatusNameConsistency: # new in 2.32
+  Enabled: true
+RSpecRails/NegationBeValid: # new in 2.23
+  Enabled: true

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    assembly-objectfile (2.2.1)
+    assembly-objectfile (2.4.0)
       activesupport (>= 5.2.0)
       mime-types (> 3)
       mini_exiftool
@@ -9,7 +9,7 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (8.1.1)
+    activesupport (8.1.3.1)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
@@ -24,59 +24,61 @@ GEM
       uri (>= 0.13.1)
     ast (2.4.3)
     base64 (0.3.0)
-    bigdecimal (4.0.1)
-    concurrent-ruby (1.3.6)
+    bigdecimal (4.1.2)
+    concurrent-ruby (1.3.8)
     connection_pool (3.0.2)
-    date (3.5.1)
     debug (1.11.1)
       irb (~> 1.10)
       reline (>= 0.3.8)
     diff-lcs (1.6.2)
-    docile (1.4.1)
     drb (2.2.3)
-    erb (6.0.1)
-    i18n (1.14.8)
+    erb (6.0.7)
+    i18n (1.15.2)
       concurrent-ruby (~> 1.0)
-    io-console (0.8.2)
-    irb (1.16.0)
+    io-console (0.9.2)
+    irb (1.18.0)
       pp (>= 0.6.0)
+      prism (>= 1.3.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
-    json (2.18.0)
-    language_server-protocol (3.17.0.5)
+    json (2.21.2)
+    language_server-protocol (3.17.0.6)
     lint_roller (1.1.0)
     logger (1.7.0)
     mime-types (3.7.0)
       logger
       mime-types-data (~> 3.2025, >= 3.2025.0507)
-    mime-types-data (3.2025.0924)
+    mime-types-data (3.2026.0701)
     mini_exiftool (2.14.0)
       ostruct (>= 0.6.0)
       pstore (>= 0.1.3)
-    minitest (6.0.1)
+    minitest (6.0.6)
+      drb (~> 2.0)
       prism (~> 1.5)
     ostruct (0.6.3)
-    parallel (1.27.0)
-    parser (3.3.10.0)
+    parallel (2.1.0)
+    parser (3.3.12.0)
       ast (~> 2.4.1)
       racc
-    pp (0.6.3)
+    pp (0.6.4)
       prettyprint
     prettyprint (0.2.0)
-    prism (1.7.0)
-    pstore (0.2.0)
-    psych (5.3.1)
-      date
-      stringio
+    prism (1.9.0)
+    pstore (0.2.1)
     racc (1.8.1)
     rainbow (3.1.1)
-    rake (13.3.1)
-    rdoc (7.0.3)
+    rake (13.4.2)
+    rbs (4.1.3)
+      logger
+      prism (>= 1.6.0)
+      tsort
+    rdoc (8.0.0)
       erb
-      psych (>= 4.0.0)
+      prism (>= 1.6.0)
+      rbs (>= 4.0.0)
       tsort
-    regexp_parser (2.11.3)
-    reline (0.6.3)
+    regexp_parser (2.12.0)
+    reline (0.7.0)
       io-console (~> 0.5)
     rspec (3.13.2)
       rspec-core (~> 3.13.0)
@@ -87,46 +89,41 @@ GEM
     rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.7)
+    rspec-mocks (3.13.8)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-support (3.13.6)
-    rubocop (1.82.1)
+    rspec-support (3.13.7)
+    rubocop (1.89.0)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
-      parallel (~> 1.10)
+      parallel (>= 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.48.0, < 2.0)
+      rubocop-ast (>= 1.49.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.49.0)
+    rubocop-ast (1.50.0)
       parser (>= 3.3.7.2)
       prism (~> 1.7)
-    rubocop-capybara (2.22.1)
+    rubocop-capybara (3.0.0)
       lint_roller (~> 1.1)
-      rubocop (~> 1.72, >= 1.72.1)
+      rubocop (~> 1.81)
     rubocop-factory_bot (2.28.0)
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
-    rubocop-rspec (3.8.0)
+    rubocop-rspec (3.10.2)
       lint_roller (~> 1.1)
-      rubocop (~> 1.81)
+      regexp_parser (>= 2.0)
+      rubocop (~> 1.86, >= 1.86.2)
     rubocop-rspec_rails (2.32.0)
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
       rubocop-rspec (~> 3.5)
     ruby-progressbar (1.13.0)
     securerandom (0.4.1)
-    simplecov (0.22.0)
-      docile (~> 1.1)
-      simplecov-html (~> 0.11)
-      simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.13.2)
-    simplecov_json_formatter (0.1.4)
-    stringio (3.2.0)
+    simplecov (1.0.3)
     tsort (0.2.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
@@ -151,4 +148,4 @@ DEPENDENCIES
   simplecov
 
 BUNDLED WITH
-  4.0.3
+  4.0.18

data/Rakefile

@@ -1,14 +1,8 @@
 # frozen_string_literal: true
 
-require 'bundler/gem_tasks'
-
-desc 'Run console with irb (default), pry, etc.'
-task :console, :irb do |_t, args|
-  irb = args[:irb].nil? ? 'irb' : args[:irb]
-  sh irb, '-r', "#{File.dirname(__FILE__)}/config/boot.rb"
-end
-
+require 'bundler/setup' # Set up gems listed in the Gemfile.
 require 'rspec/core/rake_task'
+require 'bundler/gem_tasks'
 
 desc 'Run specs'
 RSpec::Core::RakeTask.new(:spec)

data/bin/console

@@ -1,3 +1,9 @@
-#!/bin/bash
+#! /usr/bin/env ruby
+# frozen_string_literal: true
 
-bundle exec rake console
+require 'rubygems'
+require 'pry'
+
+require File.expand_path("#{File.dirname(__FILE__)}/../config/boot")
+
+Pry.start

data/lib/assembly/object_file/version.rb

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

data/lib/assembly-objectfile.rb

@@ -19,7 +19,11 @@ module Assembly
   # e.g. for any .json file, you will always get `application/json`
   OVERRIDE_MIMETYPES = {
     '.json': 'application/json',
-    '.vtt': 'text/vtt'
+    '.xml': 'application/xml',
+    '.vtt': 'text/vtt',
+    '.shp': 'application/vnd.shp',
+    '.geojson': 'application/geo+json',
+    '.ovr': 'application/octet-stream'
   }.freeze
 end
 

data/spec/assembly/object_file_spec.rb

@@ -248,6 +248,20 @@ describe Assembly::ObjectFile do
       end
     end
 
+    context 'with tif overview file' do
+      it 'application/octet-stream' do
+        object_file = described_class.new(File.join(fixture_input_dir, 'tif_overview.tif.ovr'))
+        expect(object_file.mimetype).to eq('application/octet-stream')
+      end
+    end
+
+    context 'with ESRI XML metadata for a tif' do
+      it 'application/xml' do
+        object_file = described_class.new(File.join(fixture_input_dir, 'arc_metadata.tif.xml'))
+        expect(object_file.mimetype).to eq('application/xml')
+      end
+    end
+
     context 'with .jp2 file' do
       it 'image/jp2' do
         object_file = described_class.new(jp2_fixture_file)
@@ -311,6 +325,14 @@ describe Assembly::ObjectFile do
       end
     end
 
+    context 'when .geojson file' do
+      it 'uses the manual mapping to set the correct mimetype of application/geo+json for a .geojson file' do
+        geojson_fixture_file = File.join(fixture_input_dir, 'index_map.geojson')
+        object_file = described_class.new(geojson_fixture_file)
+        expect(object_file.mimetype).to eq('application/geo+json')
+      end
+    end
+
     context 'when .vtt file' do
       it 'uses the manual mapping to set the correct mimetype of text/vtt for a .vtt file' do
         object_file = described_class.new(vtt_fixture_file)