diff --git a/Gemfile b/Gemfile index 22b9afe..27af929 100644 --- a/Gemfile +++ b/Gemfile @@ -5,6 +5,7 @@ gem "climate_control" gem "json" gem "mysql2" gem "puma" +gem "rackup" gem "sequel" gem "sinatra" gem "sinatra-contrib" diff --git a/Gemfile.lock b/Gemfile.lock index 1f34f1f..94f7037 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,114 +2,115 @@ GEM remote: https://rubygems.org/ specs: ast (2.4.2) - base64 (0.1.1) - bigdecimal (3.1.4) + base64 (0.2.0) + bigdecimal (3.1.9) canister (0.9.2) climate_control (1.2.0) coderay (1.1.3) - diff-lcs (1.5.0) - docile (1.4.0) - json (2.6.3) - language_server-protocol (3.17.0.3) + diff-lcs (1.5.1) + docile (1.4.1) + json (2.9.1) + language_server-protocol (3.17.0.4) lint_roller (1.1.0) logger (1.6.6) - method_source (1.0.0) + method_source (1.1.0) multi_json (1.15.0) mustermann (3.0.3) ruby2_keywords (~> 0.0.1) - mysql2 (0.5.5) + mysql2 (0.5.6) nio4r (2.7.4) - parallel (1.23.0) - parser (3.2.2.4) + parallel (1.26.3) + parser (3.3.7.0) ast (~> 2.4.1) racc - pry (0.14.2) + pry (0.15.2) coderay (~> 1.1) method_source (~> 1.0) - puma (6.4.3) + puma (6.6.0) nio4r (~> 2.0) - racc (1.7.1) + racc (1.8.1) rack (3.1.10) - rack-protection (4.1.0) + rack-protection (4.1.1) base64 (>= 0.1.0) logger (>= 1.6.0) rack (>= 3.0.0, < 4) rack-session (2.1.0) base64 (>= 0.1.0) rack (>= 3.0.0) - rack-test (2.1.0) + rack-test (2.2.0) rack (>= 1.3) + rackup (2.2.1) + rack (>= 3) rainbow (3.1.1) - regexp_parser (2.8.2) + regexp_parser (2.10.0) rexml (3.3.9) - 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) + rspec (3.13.0) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) + rspec-core (3.13.2) + rspec-support (~> 3.13.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-mocks (3.12.6) + rspec-support (~> 3.13.0) + rspec-mocks (3.13.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-support (3.12.1) - rubocop (1.56.4) - base64 (~> 0.1.1) + rspec-support (~> 3.13.0) + rspec-support (3.13.2) + rubocop (1.70.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.2.2.3) + parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) - rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.28.1, < 2.0) + regexp_parser (>= 2.9.3, < 3.0) + rubocop-ast (>= 1.36.2, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.29.0) - parser (>= 3.2.1.0) - rubocop-performance (1.19.1) - rubocop (>= 1.7.0, < 2.0) - rubocop-ast (>= 0.4.0) + unicode-display_width (>= 2.4.0, < 4.0) + rubocop-ast (1.38.0) + parser (>= 3.3.1.0) + rubocop-performance (1.23.1) + rubocop (>= 1.48.1, < 2.0) + rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (1.13.0) ruby2_keywords (0.0.5) - sequel (5.73.0) + sequel (5.89.0) bigdecimal simplecov (0.22.0) docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) - simplecov-html (0.12.3) + simplecov-html (0.13.1) simplecov-lcov (0.8.0) simplecov_json_formatter (0.1.4) - sinatra (4.1.0) + sinatra (4.1.1) logger (>= 1.6.0) mustermann (~> 3.0) rack (>= 3.0.0, < 4) - rack-protection (= 4.1.0) + rack-protection (= 4.1.1) rack-session (>= 2.0.0, < 3) tilt (~> 2.0) - sinatra-contrib (4.1.0) + sinatra-contrib (4.1.1) multi_json (>= 0.0.2) mustermann (~> 3.0) - rack-protection (= 4.1.0) - sinatra (= 4.1.0) + rack-protection (= 4.1.1) + sinatra (= 4.1.1) tilt (~> 2.0) - standard (1.31.2) + standard (1.44.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.56.4) + rubocop (~> 1.70.0) standard-custom (~> 1.0.0) - standard-performance (~> 1.2) + standard-performance (~> 1.6) standard-custom (1.0.2) lint_roller (~> 1.0) rubocop (~> 1.50) - standard-performance (1.2.1) + standard-performance (1.6.0) lint_roller (~> 1.1) - rubocop-performance (~> 1.19.1) + rubocop-performance (~> 1.23.0) tilt (2.6.0) - unicode-display_width (2.5.0) + unicode-display_width (3.1.4) + unicode-emoji (~> 4.0, >= 4.0.4) + unicode-emoji (4.0.4) PLATFORMS aarch64-linux @@ -123,6 +124,7 @@ DEPENDENCIES pry puma rack-test + rackup rspec sequel simplecov diff --git a/docker-compose.yml b/docker-compose.yml index b087e90..af22c68 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,4 @@ --- -version: '3' - x-condition-healthy: &healthy condition: service_healthy diff --git a/lib/rights_api/models/access_statement_map.rb b/lib/rights_api/models/access_statement_map.rb index f2cd142..7b54df6 100644 --- a/lib/rights_api/models/access_statement_map.rb +++ b/lib/rights_api/models/access_statement_map.rb @@ -13,7 +13,7 @@ def self.default_key # @return [Sequel::SQL::Expression] def self.query_for_field(field:) return Sequel.join [:a_attr, :a_access_profile], "." if field.to_sym == :attr_access_id - super field: field + super end def to_h diff --git a/lib/rights_api/models/rights_current.rb b/lib/rights_api/models/rights_current.rb index a6f78f1..430cfa2 100644 --- a/lib/rights_api/models/rights_current.rb +++ b/lib/rights_api/models/rights_current.rb @@ -27,7 +27,7 @@ def self.query_for_field(field:) if field.to_sym == :htid return Sequel.join [qualify(field: :namespace), qualify(field: :id)], "." end - super field: field + super end # rights_current and rights_log should order by timestamp diff --git a/lib/rights_api/models/rights_log.rb b/lib/rights_api/models/rights_log.rb index 3330436..cc9fa0d 100644 --- a/lib/rights_api/models/rights_log.rb +++ b/lib/rights_api/models/rights_log.rb @@ -28,7 +28,7 @@ def self.query_for_field(field:) if field.to_sym == :htid return Sequel.join [qualify(field: :namespace), qualify(field: :id)], "." end - super field: field + super end # rights_current and rights_log should order by timestamp diff --git a/spec/integration/support_table_spec.rb b/spec/integration/support_table_spec.rb index f982b92..d6261c9 100644 --- a/spec/integration/support_table_spec.rb +++ b/spec/integration/support_table_spec.rb @@ -18,7 +18,7 @@ it "has valid #{table} data" do response = parse_json(last_response.body) response[:data].each do |row| - validator = "validate_#{table}_row".to_sym + validator = :"validate_#{table}_row" send validator, row end end