Release #1292

Author: Mr0grog

.circleci/config.yml

@@ -4,7 +4,7 @@ executors:
   rails_executor:
     working_directory: ~/web-monitoring-db
     docker:
-      - image: cimg/ruby:3.4.5-node
+      - image: cimg/ruby:3.4.6-node
         environment:
           RAILS_ENV: test
           RACK_ENV: test

.ruby-version

@@ -1 +1 @@
-3.4.5
+3.4.6

Dockerfile

@@ -2,7 +2,7 @@
 # https://docs.docker.com/engine/userguide/eng-image/multistage-build
 
 ### BASE ENVIRONMENT STAGE ###
-FROM ruby:3.4.5-slim AS base
+FROM ruby:3.4.6-slim AS base
 LABEL maintainer="[email protected]"
 
 # Install apt based dependencies required to run Rails as
@@ -24,7 +24,7 @@ WORKDIR /app
 # the RubyGems. This is a separate step so the dependencies
 # will be cached unless changes to one of those two files
 # are made.
-COPY Gemfile Gemfile.lock ./
+COPY Gemfile Gemfile.lock .ruby-version ./
 RUN gem install bundler && bundle install --jobs 20 --retry 5
 
 # Copy the main application.

Gemfile

@@ -5,7 +5,7 @@ git_source(:github) do |repo_name|
   "https://github.com/#{repo_name}.git"
 end
 
-ruby '3.4.5'
+ruby file: ".ruby-version"
 
 gem 'aws-sdk-s3', '~> 1.198'
 gem 'concurrent-ruby', '~> 1.3'

Gemfile.lock

@@ -481,7 +481,7 @@ DEPENDENCIES
   webmock (~> 3.25)
 
 RUBY VERSION
-   ruby 3.4.5p51
+   ruby 3.4.6p54
 
 BUNDLED WITH
    2.5.9

app/assets/data/swagger.yaml

@@ -1187,7 +1187,7 @@ paths:
           default: true
           required: false
           description: >-
-            If set to false, the importer will not create new page records. If the POSTed data contains a version with a `page_url` field that doesn’t match an known page, the version will be skipped and not imported at all.
+            If set to false, the importer will not create new page records. If the POSTed data contains a version with a `url` field that doesn’t match an known page, the version will be skipped and not imported at all.
         - name: skip_unchanged_versions
           in: query
           description: >-
@@ -2147,7 +2147,7 @@ definitions:
   ImportableVersion:
     type: object
     properties:
-      page_url:
+      url:
         type: string
         format: uri
         description: The original URL the version was captured from.

db/seed_import.json

@@ -49,13 +49,13 @@ for index, page in enumerate(sampled_pages):
 
     for version in versions:
         records.append({
+            "url": version['url'],
             "capture_time": version['capture_time'].isoformat().replace('+00:00', 'Z'),
             "body_url": version['body_url'],
             "body_hash": version['body_hash'],
             "source_type": version['source_type'],
             "source_metadata": version['source_metadata'],
-            "page_url": version['url'],
-            "page_title": version['title'],
+            "title": version['title'],
             "page_maintainers": [maintainer['name'] for maintainer in page['maintainers']],
             "page_tags": [tag['name'] for tag in page['tags']],
             "uuid": version['uuid']

docs/generating-new-seed-data.md

@@ -38,7 +38,7 @@ def diff(_change, _options = nil)
   test 'authorizations' do
     import_data = [
       {
-        page_url: 'http://testsite.com/',
+        url: 'http://testsite.com/',
         title: 'Example Page',
         page_maintainers: ['The Federal Example Agency'],
         page_tags: ['Example Site'],
@@ -49,7 +49,7 @@ def diff(_change, _options = nil)
         source_metadata: { test_meta: 'data' }
       },
       {
-        page_url: 'http://testsite.com/',
+        url: 'http://testsite.com/',
         title: 'Example Page',
         page_maintainers: ['The Federal Example Agency'],
         page_tags: ['Test', 'Home Page'],
@@ -83,7 +83,7 @@ def diff(_change, _options = nil)
   test 'can import data' do
     import_data = [
       {
-        page_url: 'http://testsite.com/',
+        url: 'http://testsite.com/',
         title: 'Example Page',
         page_maintainers: ['The Federal Example Agency'],
         page_tags: ['Example Site'],
@@ -94,7 +94,7 @@ def diff(_change, _options = nil)
         source_metadata: { test_meta: 'data' }
       },
       {
-        page_url: 'http://testsite.com/',
+        url: 'http://testsite.com/',
         title: 'Example Page',
         page_maintainers: ['The Federal Example Agency'],
         page_tags: ['Test', 'Home Page'],
@@ -145,14 +145,14 @@ def diff(_change, _options = nil)
 
     versions = pages[0].versions
     assert_equal(2, versions.length)
-    assert_equal(import_data[0][:page_url], versions[1].url)
-    assert_equal(import_data[1][:page_url], versions[0].url)
+    assert_equal(import_data[0][:url], versions[1].url)
+    assert_equal(import_data[1][:url], versions[0].url)
   end
 
   test 'cannot import in read-only mode' do
     import_data = [
       {
-        page_url: 'http://testsite.com/',
+        url: 'http://testsite.com/',
         title: 'Example Page',
         page_maintainers: ['The Federal Example Agency'],
         page_tags: ['Example Site'],
@@ -163,7 +163,7 @@ def diff(_change, _options = nil)
         source_metadata: { test_meta: 'data' }
       },
       {
-        page_url: 'http://testsite.com/',
+        url: 'http://testsite.com/',
         title: 'Example Page',
         page_maintainers: ['The Federal Example Agency'],
         page_tags: ['Test', 'Home Page'],
@@ -197,8 +197,8 @@ def diff(_change, _options = nil)
     original_data = versions(:page1_v1).as_json
     import_data = [
       {
-        page_url: pages(:home_page).url,
-        page_title: pages(:home_page).title,
+        url: pages(:home_page).url,
+        title: pages(:home_page).title,
         page_maintainers: ['The Federal Example Agency'],
         page_tags: pages(:home_page).tag_names,
         capture_time: versions(:page1_v1).capture_time,
@@ -230,8 +230,8 @@ def diff(_change, _options = nil)
     page_versions_count = pages(:home_page).versions.count
     import_data = [
       {
-        page_url: pages(:home_page).url,
-        page_title: pages(:home_page).title,
+        url: pages(:home_page).url,
+        title: pages(:home_page).title,
         page_maintainers: ['The Federal Example Agency'],
         page_tags: pages(:home_page).tag_names,
         capture_time: versions(:page1_v1).capture_time,
@@ -263,8 +263,8 @@ def diff(_change, _options = nil)
     original_data = versions(:page1_v1).as_json
     import_data = [
       {
-        page_url: pages(:home_page).url,
-        page_title: pages(:home_page).title,
+        url: pages(:home_page).url,
+        title: pages(:home_page).title,
         page_maintainers: ['The Federal Example Agency'],
         page_tags: pages(:home_page).tag_names,
         capture_time: versions(:page1_v1).capture_time,
@@ -295,7 +295,7 @@ def diff(_change, _options = nil)
   test 'surfaces page validation errors' do
     import_data = [
       {
-        page_url: 'testsite',
+        url: 'testsite',
         title: 'Example Page',
         page_maintainers: ['The Federal Example Agency'],
         page_tags: ['site:Example Site'],
@@ -338,7 +338,7 @@ def diff(_change, _options = nil)
 
     import_data = [
       {
-        page_url: 'http://testsite.com/',
+        url: 'http://testsite.com/',
         title: 'Example Page',
         page_maintainers: ['The Federal Example Agency'],
         page_tags: ['site:Example Site'],
@@ -378,8 +378,8 @@ def diff(_change, _options = nil)
   test 'can import `null` page_maintainers' do
     import_data = [
       {
-        page_url: 'http://testsite.com/',
-        page_title: 'Test Page',
+        url: 'http://testsite.com/',
+        title: 'Test Page',
         page_maintainers: nil,
         capture_time: versions(:page1_v1).capture_time,
         body_url: 'https://test-bucket.s3.amazonaws.com/example-v1',
@@ -412,8 +412,8 @@ def diff(_change, _options = nil)
   test 'cannot import non-array page_maintainers' do
     import_data = [
       {
-        page_url: 'http://testsite.com/',
-        page_title: 'Test Page',
+        url: 'http://testsite.com/',
+        title: 'Test Page',
         page_maintainers: 5,
         capture_time: versions(:page1_v1).capture_time,
         body_url: 'https://test-bucket.s3.amazonaws.com/example-v1',
@@ -446,7 +446,7 @@ def diff(_change, _options = nil)
   test 'matches pages by url_key if no exact url match' do
     import_data = [
       {
-        page_url: 'http://testSITE.com/whatever',
+        url: 'http://testSITE.com/whatever',
         title: 'Example Page',
         page_maintainers: ['The Federal Example Agency'],
         page_tags: ['Example Site'],
@@ -457,7 +457,7 @@ def diff(_change, _options = nil)
         source_metadata: { test_meta: 'data' }
       },
       {
-        page_url: 'http://testsite.com/whatever/',
+        url: 'http://testsite.com/whatever/',
         title: 'Example Page',
         page_maintainers: ['The Federal Example Agency'],
         page_tags: ['Test', 'Home Page'],
@@ -485,8 +485,8 @@ def diff(_change, _options = nil)
   test 'can import `null` page_tags' do
     import_data = [
       {
-        page_url: 'http://testsite.com/',
-        page_title: 'Test Page',
+        url: 'http://testsite.com/',
+        title: 'Test Page',
         page_tags: nil,
         capture_time: versions(:page1_v1).capture_time,
         body_url: 'https://test-bucket.s3.amazonaws.com/example-v1',
@@ -519,8 +519,8 @@ def diff(_change, _options = nil)
   test 'cannot import non-array page_tags' do
     import_data = [
       {
-        page_url: 'http://testsite.com/',
-        page_title: 'Test Page',
+        url: 'http://testsite.com/',
+        title: 'Test Page',
         page_tags: 5,
         capture_time: versions(:page1_v1).capture_time,
         body_url: 'https://test-bucket.s3.amazonaws.com/example-v1',
@@ -555,7 +555,7 @@ def diff(_change, _options = nil)
 
     import_data = [
       {
-        page_url: 'http://whoa-there-betcha-this.com/is/not/in/the/database',
+        url: 'http://whoa-there-betcha-this.com/is/not/in/the/database',
         title: 'Heyooooo!',
         capture_time: '2017-05-01T12:33:01Z',
         body_url: 'https://test-bucket.s3.amazonaws.com/unknown-v1',
@@ -564,7 +564,7 @@ def diff(_change, _options = nil)
         source_metadata: { test_meta: 'data' }
       },
       {
-        page_url: pages(:home_page).url,
+        url: pages(:home_page).url,
         title: 'Example Page',
         capture_time: '2017-05-02T12:33:01Z',
         body_url: 'https://test-bucket.s3.amazonaws.com/example-v2',
@@ -609,7 +609,7 @@ def diff(_change, _options = nil)
     # The first two here should get skipped
     import_data = [
       {
-        page_url: page.url,
+        url: page.url,
         title: 'Heyooooo!',
         capture_time: (now - 3.days).iso8601,
         body_url: 'https://test-bucket.s3.amazonaws.com/unknown-v1',
@@ -618,7 +618,7 @@ def diff(_change, _options = nil)
         source_metadata: { test_meta: 'data' }
       },
       {
-        page_url: page.url,
+        url: page.url,
         title: 'Heyooooo!',
         capture_time: (now - 2.9.days).iso8601,
         body_url: 'https://test-bucket.s3.amazonaws.com/unknown-v1',
@@ -627,7 +627,7 @@ def diff(_change, _options = nil)
         source_metadata: { test_meta: 'data' }
       },
       {
-        page_url: page.url,
+        url: page.url,
         title: 'Heyooooo!',
         capture_time: (now - 2.5.days).iso8601,
         body_url: 'https://test-bucket.s3.amazonaws.com/unknown-v1',
@@ -636,7 +636,7 @@ def diff(_change, _options = nil)
         source_metadata: { test_meta: 'data' }
       },
       {
-        page_url: page.url,
+        url: page.url,
         title: 'Heyooooo!',
         capture_time: (now - 2.days).iso8601,
         body_url: 'https://test-bucket.s3.amazonaws.com/unknown-v1',