Merge 9c1cbed into f35f55c

diaspora · Jan 25, 2020 · 5f3ee26 · 5f3ee26
2 parents f35f55c + 9c1cbed
commit 5f3ee26
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/app/presenters/photo_presenter.rb b/app/presenters/photo_presenter.rb
@@ -12,7 +12,8 @@ def base_hash
       sizes:      {
         small:  url(:thumb_small),
         medium: url(:thumb_medium),
-        large:  url(:scaled_full)
+        large:  url(:scaled_full),
+        raw:    url
       }
     }
   end
@@ -26,7 +27,8 @@ def as_api_json(full=false)
       sizes:      {
         small:  url(:thumb_small),
         medium: url(:thumb_medium),
-        large:  url(:scaled_full)
+        large:  url(:scaled_full),
+        raw:    url
       }
     }
 

diff --git a/lib/schemas/api_v1.json b/lib/schemas/api_v1.json
@@ -205,12 +205,13 @@
     "photo_sizes": {
       "type": "object",
       "properties": {
+        "raw": { "$ref": "#/definitions/url" },
         "large": { "$ref": "#/definitions/url" },
         "medium": { "$ref": "#/definitions/url" },
         "small": { "$ref": "#/definitions/url" }
       },
-      "required": ["large", "medium", "small"],
-      "additionalProperties": true
+      "required": ["raw", "large", "medium", "small"],
+      "additionalProperties": false
     },
 
     "photo_dimensions": {

diff --git a/spec/presenters/photo_presenter_spec.rb b/spec/presenters/photo_presenter_spec.rb
@@ -34,6 +34,7 @@ def confirm_photo_format(photo, ref_photo)
     expect(photo[:sizes][:small]).to be_truthy
     expect(photo[:sizes][:medium]).to be_truthy
     expect(photo[:sizes][:large]).to be_truthy
+    expect(photo[:sizes][:raw]).to be_truthy
   end
   # rubocop:enable Metrics/AbcSize
 end