intranet-pictures 1.1.0 → 2.0.0

data/spec/intranet/pictures/responder_spec.rb

@@ -52,7 +52,7 @@ RSpec.describe Intranet::Pictures::Responder do
     context 'when asked for \'/index.html\'' do
       it 'should return a partial HTML content showing recent groups according to configuration' do
         # Nominal case with limit
-        recents = [{ group_type: 'group2', sort_by: 'value', asc: false, limit: 2 }]
+        recents = [{ 'group_by' => 'location', 'sort_by' => 'datetime', 'sort_order' => 'desc', 'limit' => 2 }]
         @responder.instance_variable_set(:@recents, recents)
         code, mime, content = @responder.generate_page('/index.html', {})
         expect(code).to eql(206)
@@ -65,12 +65,12 @@ RSpec.describe Intranet::Pictures::Responder do
                      "<li>#{I18n.t('pictures.menu')}</li>\n" \
                      "<li>My Gallery</li>\n" \
                      "</ul>\n\n" \
-                     "<h3>#{I18n.t('pictures.recents.group2')}</h3>\n" \
+                     "<h3>#{I18n.t('pictures.recents.location')}</h3>\n" \
                      "<ul class='groups'>\n" \
-                     "<li title='Group 2, Title 2'>\n<a onclick='openImagesGallery(&quot;group2=group2_title2&amp;sort_by=datetime&quot;);'>\n<figure>\n<div style='background-image: url(&quot;api/group/group2?group2=group2_title2&quot;)'></div>\n<figcaption>\nGroup 2, Title 2\n<br>\n<em>brief_text_2</em>\n</figcaption>\n</figure>\n</a>\n</li>\n" \
-                     "<li title='Group 2, Title 1'>\n<a onclick='openImagesGallery(&quot;group2=group2_title1&amp;sort_by=datetime&quot;);'>\n<figure>\n<div style='background-image: url(&quot;api/group/group2?group2=group2_title1&quot;)'></div>\n<figcaption>\nGroup 2, Title 1\n</figcaption>\n</figure>\n</a>\n</li>\n" \
+                     "<li title='New York, USA'>\n<a onclick='openImagesGallery(&quot;location=New York, USA&amp;sort_by=datetime&quot;);'>\n<figure>\n<div style='background-image: url(&quot;api/group_thumbnail?location=New York, USA&quot;)'></div>\n<figcaption>\nNew York, USA\n</figcaption>\n</figure>\n</a>\n</li>\n" \
+                     "<li title='Paris, France'>\n<a onclick='openImagesGallery(&quot;location=Paris, France&amp;sort_by=datetime&quot;);'>\n<figure>\n<div style='background-image: url(&quot;api/group_thumbnail?location=Paris, France&quot;)'></div>\n<figcaption>\nParis, France\n<br>\n<em>The City of Light</em>\n</figcaption>\n</figure>\n</a>\n</li>\n" \
                      "</ul>\n" \
-                     "<p class='see_more'>\n<a href='browse_group2.html?sort_by=value&amp;sort_order=desc'>#{I18n.t('pictures.see_more')}</a>\n</p>\n" \
+                     "<p class='see_more'>\n<a href='browse.html?group_by=location&amp;sort_by=datetime&amp;sort_order=desc'>#{I18n.t('pictures.see_more')}</a>\n</p>\n" \
                      "</section>\n",
             title: 'My Gallery',
             stylesheets: [
@@ -83,7 +83,7 @@ RSpec.describe Intranet::Pictures::Responder do
         )
 
         # Nominal case with limit
-        recents = [{ group_type: 'group2', sort_by: 'value', asc: true, limit: 2 }]
+        recents = [{ 'group_by' => 'location', 'sort_by' => 'datetime', 'limit' => 2 }]
         @responder.instance_variable_set(:@recents, recents)
         code, mime, content = @responder.generate_page('/index.html', {})
         expect(code).to eql(206)
@@ -96,12 +96,12 @@ RSpec.describe Intranet::Pictures::Responder do
                      "<li>#{I18n.t('pictures.menu')}</li>\n" \
                      "<li>My Gallery</li>\n" \
                      "</ul>\n\n" \
-                     "<h3>#{I18n.t('pictures.recents.group2')}</h3>\n" \
+                     "<h3>#{I18n.t('pictures.recents.location')}</h3>\n" \
                      "<ul class='groups'>\n" \
-                     "<li title='Group 2, Title 3'>\n<a onclick='openImagesGallery(&quot;group2=group2_title3&amp;sort_by=datetime&quot;);'>\n<figure>\n<div style='background-image: url(&quot;api/group/group2?group2=group2_title3&quot;)'></div>\n<figcaption>\nGroup 2, Title 3\n</figcaption>\n</figure>\n</a>\n</li>\n" \
-                     "<li title='Group 2, Title 1'>\n<a onclick='openImagesGallery(&quot;group2=group2_title1&amp;sort_by=datetime&quot;);'>\n<figure>\n<div style='background-image: url(&quot;api/group/group2?group2=group2_title1&quot;)'></div>\n<figcaption>\nGroup 2, Title 1\n</figcaption>\n</figure>\n</a>\n</li>\n" \
+                     "<li title='Paris, France'>\n<a onclick='openImagesGallery(&quot;location=Paris, France&amp;sort_by=datetime&quot;);'>\n<figure>\n<div style='background-image: url(&quot;api/group_thumbnail?location=Paris, France&quot;)'></div>\n<figcaption>\nParis, France\n<br>\n<em>The City of Light</em>\n</figcaption>\n</figure>\n</a>\n</li>\n" \
+                     "<li title='Tokyo, Japan'>\n<a onclick='openImagesGallery(&quot;location=Tokyo, Japan&amp;sort_by=datetime&quot;);'>\n<figure>\n<div style='background-image: url(&quot;api/group_thumbnail?location=Tokyo, Japan&quot;)'></div>\n<figcaption>\nTokyo, Japan\n</figcaption>\n</figure>\n</a>\n</li>\n" \
                      "</ul>\n" \
-                     "<p class='see_more'>\n<a href='browse_group2.html?sort_by=value'>#{I18n.t('pictures.see_more')}</a>\n</p>\n" \
+                     "<p class='see_more'>\n<a href='browse.html?group_by=location&amp;sort_by=datetime'>#{I18n.t('pictures.see_more')}</a>\n</p>\n" \
                      "</section>\n",
             title: 'My Gallery',
             stylesheets: [
@@ -114,7 +114,7 @@ RSpec.describe Intranet::Pictures::Responder do
         )
 
         # Nominal case without limit
-        recents = [{ group_type: 'group2' }]
+        recents = [{ 'group_by' => 'location', 'sort_by' => 'location', 'sort_order' => 'desc' }]
         @responder.instance_variable_set(:@recents, recents)
         code, mime, content = @responder.generate_page('/index.html', {})
         expect(code).to eql(206)
@@ -127,11 +127,11 @@ RSpec.describe Intranet::Pictures::Responder do
                      "<li>#{I18n.t('pictures.menu')}</li>\n" \
                      "<li>My Gallery</li>\n" \
                      "</ul>\n\n" \
-                     "<h3>#{I18n.t('pictures.recents.group2')}</h3>\n" \
+                     "<h3>#{I18n.t('pictures.recents.location')}</h3>\n" \
                      "<ul class='groups'>\n" \
-                     "<li title='Group 2, Title 3'>\n<a onclick='openImagesGallery(&quot;group2=group2_title3&amp;sort_by=datetime&quot;);'>\n<figure>\n<div style='background-image: url(&quot;api/group/group2?group2=group2_title3&quot;)'></div>\n<figcaption>\nGroup 2, Title 3\n</figcaption>\n</figure>\n</a>\n</li>\n" \
-                     "<li title='Group 2, Title 2'>\n<a onclick='openImagesGallery(&quot;group2=group2_title2&amp;sort_by=datetime&quot;);'>\n<figure>\n<div style='background-image: url(&quot;api/group/group2?group2=group2_title2&quot;)'></div>\n<figcaption>\nGroup 2, Title 2\n<br>\n<em>brief_text_2</em>\n</figcaption>\n</figure>\n</a>\n</li>\n" \
-                     "<li title='Group 2, Title 1'>\n<a onclick='openImagesGallery(&quot;group2=group2_title1&amp;sort_by=datetime&quot;);'>\n<figure>\n<div style='background-image: url(&quot;api/group/group2?group2=group2_title1&quot;)'></div>\n<figcaption>\nGroup 2, Title 1\n</figcaption>\n</figure>\n</a>\n</li>\n" \
+                     "<li title='Tokyo, Japan'>\n<a onclick='openImagesGallery(&quot;location=Tokyo, Japan&amp;sort_by=datetime&quot;);'>\n<figure>\n<div style='background-image: url(&quot;api/group_thumbnail?location=Tokyo, Japan&quot;)'></div>\n<figcaption>\nTokyo, Japan\n</figcaption>\n</figure>\n</a>\n</li>\n" \
+                     "<li title='Paris, France'>\n<a onclick='openImagesGallery(&quot;location=Paris, France&amp;sort_by=datetime&quot;);'>\n<figure>\n<div style='background-image: url(&quot;api/group_thumbnail?location=Paris, France&quot;)'></div>\n<figcaption>\nParis, France\n<br>\n<em>The City of Light</em>\n</figcaption>\n</figure>\n</a>\n</li>\n" \
+                     "<li title='New York, USA'>\n<a onclick='openImagesGallery(&quot;location=New York, USA&amp;sort_by=datetime&quot;);'>\n<figure>\n<div style='background-image: url(&quot;api/group_thumbnail?location=New York, USA&quot;)'></div>\n<figcaption>\nNew York, USA\n</figcaption>\n</figure>\n</a>\n</li>\n" \
                      "</ul>\n" \
                      "</section>\n",
             title: 'My Gallery',
@@ -145,7 +145,7 @@ RSpec.describe Intranet::Pictures::Responder do
         )
 
         # Incorrect recents specification
-        recents = [{ group_type: 'invalid', sort_by: 'id' }]
+        recents = [{ 'group_by' => 'invalid', 'sort_by' => 'location' }]
         @responder.instance_variable_set(:@recents, recents)
         code, mime, content = @responder.generate_page('/index.html', {})
         expect(code).to eql(404)
@@ -155,7 +155,8 @@ RSpec.describe Intranet::Pictures::Responder do
 
       it 'should return a partial HTML content showing all groups according to configuration' do
         # Nominal case without recents
-        home_groups = [{ group_type: 'group2', asc: true, browse: 'group1', browse_sort_by: 'uri', browse_asc: true }]
+        home_groups = [{ 'group_by' => 'location', 'sort_by' => 'location',
+                         'browse_group_by' => 'author' }]
         @responder.instance_variable_set(:@home_groups, home_groups)
         code, mime, content = @responder.generate_page('/index.html', {})
         expect(code).to eql(206)
@@ -168,11 +169,11 @@ RSpec.describe Intranet::Pictures::Responder do
                      "<li>#{I18n.t('pictures.menu')}</li>\n" \
                      "<li>My Gallery</li>\n" \
                      "</ul>\n\n" \
-                     "<h3>#{I18n.t('pictures.browse_by.group2')}</h3>\n" \
+                     "<h3>#{I18n.t('pictures.browse_by.location')}</h3>\n" \
                      "<ul class='groups wide'>\n" \
-                     "<li title='Group 2, Title 1'>\n<a href='browse_group1.html?sort_by=uri&amp;group2=group2_title1'>\n<figure>\n<div style='background-image: url(&quot;api/group/group2?group2=group2_title1&quot;)'></div>\n<figcaption>\nGroup 2, Title 1\n</figcaption>\n</figure>\n</a>\n</li>\n" \
-                     "<li title='Group 2, Title 2'>\n<a href='browse_group1.html?sort_by=uri&amp;group2=group2_title2'>\n<figure>\n<div style='background-image: url(&quot;api/group/group2?group2=group2_title2&quot;)'></div>\n<figcaption>\nGroup 2, Title 2\n<br>\n<em>brief_text_2</em>\n</figcaption>\n</figure>\n</a>\n</li>\n" \
-                     "<li title='Group 2, Title 3'>\n<a href='browse_group1.html?sort_by=uri&amp;group2=group2_title3'>\n<figure>\n<div style='background-image: url(&quot;api/group/group2?group2=group2_title3&quot;)'></div>\n<figcaption>\nGroup 2, Title 3\n</figcaption>\n</figure>\n</a>\n</li>\n" \
+                     "<li title='New York, USA'>\n<a href='browse.html?group_by=author&amp;location=New York, USA'>\n<figure>\n<div style='background-image: url(&quot;api/group_thumbnail?location=New York, USA&quot;)'></div>\n<figcaption>\nNew York, USA\n</figcaption>\n</figure>\n</a>\n</li>\n" \
+                     "<li title='Paris, France'>\n<a href='browse.html?group_by=author&amp;location=Paris, France'>\n<figure>\n<div style='background-image: url(&quot;api/group_thumbnail?location=Paris, France&quot;)'></div>\n<figcaption>\nParis, France\n<br>\n<em>The City of Light</em>\n</figcaption>\n</figure>\n</a>\n</li>\n" \
+                     "<li title='Tokyo, Japan'>\n<a href='browse.html?group_by=author&amp;location=Tokyo, Japan'>\n<figure>\n<div style='background-image: url(&quot;api/group_thumbnail?location=Tokyo, Japan&quot;)'></div>\n<figcaption>\nTokyo, Japan\n</figcaption>\n</figure>\n</a>\n</li>\n" \
                      "</ul>\n" \
                      "</section>\n",
             title: 'My Gallery',
@@ -186,9 +187,10 @@ RSpec.describe Intranet::Pictures::Responder do
         )
 
         # Nominal case with recents
-        recents = [{ group_type: 'group2' }]
+        recents = [{ 'group_by' => 'location', 'sort_by' => 'location', 'sort_order' => 'asc' }]
         @responder.instance_variable_set(:@recents, recents)
-        home_groups = [{ group_type: 'group1', asc: false, browse: 'group2', browse_sort_by: 'value', browse_asc: false }]
+        home_groups = [{ 'group_by' => 'author', 'sort_by' => 'author', 'sort_order' => 'asc',
+                         'browse_group_by' => 'location', 'browse_sort_by' => 'location', 'browse_sort_order' => 'desc' }]
         @responder.instance_variable_set(:@home_groups, home_groups)
         code, mime, content = @responder.generate_page('/index.html', {})
         expect(code).to eql(206)
@@ -201,16 +203,16 @@ RSpec.describe Intranet::Pictures::Responder do
                      "<li>#{I18n.t('pictures.menu')}</li>\n" \
                      "<li>My Gallery</li>\n" \
                      "</ul>\n\n" \
-                     "<h3>#{I18n.t('pictures.recents.group2')}</h3>\n" \
+                     "<h3>#{I18n.t('pictures.recents.location')}</h3>\n" \
                      "<ul class='groups'>\n" \
-                     "<li title='Group 2, Title 3'>\n<a onclick='openImagesGallery(&quot;group2=group2_title3&amp;sort_by=datetime&quot;);'>\n<figure>\n<div style='background-image: url(&quot;api/group/group2?group2=group2_title3&quot;)'></div>\n<figcaption>\nGroup 2, Title 3\n</figcaption>\n</figure>\n</a>\n</li>\n" \
-                     "<li title='Group 2, Title 2'>\n<a onclick='openImagesGallery(&quot;group2=group2_title2&amp;sort_by=datetime&quot;);'>\n<figure>\n<div style='background-image: url(&quot;api/group/group2?group2=group2_title2&quot;)'></div>\n<figcaption>\nGroup 2, Title 2\n<br>\n<em>brief_text_2</em>\n</figcaption>\n</figure>\n</a>\n</li>\n" \
-                     "<li title='Group 2, Title 1'>\n<a onclick='openImagesGallery(&quot;group2=group2_title1&amp;sort_by=datetime&quot;);'>\n<figure>\n<div style='background-image: url(&quot;api/group/group2?group2=group2_title1&quot;)'></div>\n<figcaption>\nGroup 2, Title 1\n</figcaption>\n</figure>\n</a>\n</li>\n" \
+                     "<li title='New York, USA'>\n<a onclick='openImagesGallery(&quot;location=New York, USA&amp;sort_by=datetime&quot;);'>\n<figure>\n<div style='background-image: url(&quot;api/group_thumbnail?location=New York, USA&quot;)'></div>\n<figcaption>\nNew York, USA\n</figcaption>\n</figure>\n</a>\n</li>\n" \
+                     "<li title='Paris, France'>\n<a onclick='openImagesGallery(&quot;location=Paris, France&amp;sort_by=datetime&quot;);'>\n<figure>\n<div style='background-image: url(&quot;api/group_thumbnail?location=Paris, France&quot;)'></div>\n<figcaption>\nParis, France\n<br>\n<em>The City of Light</em>\n</figcaption>\n</figure>\n</a>\n</li>\n" \
+                     "<li title='Tokyo, Japan'>\n<a onclick='openImagesGallery(&quot;location=Tokyo, Japan&amp;sort_by=datetime&quot;);'>\n<figure>\n<div style='background-image: url(&quot;api/group_thumbnail?location=Tokyo, Japan&quot;)'></div>\n<figcaption>\nTokyo, Japan\n</figcaption>\n</figure>\n</a>\n</li>\n" \
                      "</ul>\n" \
-                     "<h3>#{I18n.t('pictures.browse_by.group1')}</h3>\n" \
+                     "<h3>#{I18n.t('pictures.browse_by.author')}</h3>\n" \
                      "<ul class='groups wide'>\n" \
-                     "<li title='Group 1, Title 2'>\n<a href='browse_group2.html?sort_by=value&amp;sort_order=desc&amp;group1=group1_title2'>\n<figure>\n<div style='background-image: url(&quot;api/group/group1?group1=group1_title2&quot;)'></div>\n<figcaption>\nGroup 1, Title 2\n</figcaption>\n</figure>\n</a>\n</li>\n" \
-                     "<li title='Group 1, Title 1'>\n<a href='browse_group2.html?sort_by=value&amp;sort_order=desc&amp;group1=group1_title1'>\n<figure>\n<div style='background-image: url(&quot;api/group/group1?group1=group1_title1&quot;)'></div>\n<figcaption>\nGroup 1, Title 1\n<br>\n<em>brief_text_1</em>\n</figcaption>\n</figure>\n</a>\n</li>\n" \
+                     "<li title='Jane Doe'>\n<a href='browse.html?group_by=location&amp;sort_by=location&amp;sort_order=desc&amp;author=Jane Doe'>\n<figure>\n<div style='background-image: url(&quot;api/group_thumbnail?author=Jane Doe&quot;)'></div>\n<figcaption>\nJane Doe\n</figcaption>\n</figure>\n</a>\n</li>\n" \
+                     "<li title='John Doe'>\n<a href='browse.html?group_by=location&amp;sort_by=location&amp;sort_order=desc&amp;author=John Doe'>\n<figure>\n<div style='background-image: url(&quot;api/group_thumbnail?author=John Doe&quot;)'></div>\n<figcaption>\nJohn Doe\n<br>\n<em>Best photographer ever</em>\n</figcaption>\n</figure>\n</a>\n</li>\n" \
                      "</ul>\n" \
                      "</section>\n",
             title: 'My Gallery',
@@ -225,11 +227,11 @@ RSpec.describe Intranet::Pictures::Responder do
       end
     end
 
-    context 'when asked for \'/browse_*.html\'' do
-      it 'should return a partial HTML content with selected groups' do
-        # Existing group, no selector nor sort order
-        query = {}
-        code, mime, content = @responder.generate_page('/browse_group1.html', query)
+    context 'when asked for \'/browse.html\'' do
+      it 'should return a partial HTML content with selected pictures grouped as requested' do
+        # No selector nor sort order
+        query = { 'group_by' => 'author' }
+        code, mime, content = @responder.generate_page('/browse.html', query)
         expect(code).to eql(206)
         expect(mime).to eql('text/html')
         expect(content).to eql(
@@ -239,11 +241,11 @@ RSpec.describe Intranet::Pictures::Responder do
                      "<li>\n<a href='/index.html'>#{I18n.t('nav.home')}</a>\n</li>\n" \
                      "<li>#{I18n.t('pictures.menu')}</li>\n" \
                      "<li>\n<a href='index.html'>My Gallery</a>\n</li>\n" \
-                     "<li>#{I18n.t('pictures.nav.group1')}</li>\n" \
+                     "<li>#{I18n.t('pictures.nav.author')}</li>\n" \
                      "</ul>\n\n" \
                      "<ul class='groups'>\n" \
-                     "<li title='Group 1, Title 1'>\n<a onclick='openImagesGallery(&quot;group1=group1_title1&amp;sort_by=datetime&quot;);'>\n<figure>\n<div style='background-image: url(&quot;api/group/group1?group1=group1_title1&quot;)'></div>\n<figcaption>\nGroup 1, Title 1\n<br>\n<em>brief_text_1</em>\n</figcaption>\n</figure>\n</a>\n</li>\n" \
-                     "<li title='Group 1, Title 2'>\n<a onclick='openImagesGallery(&quot;group1=group1_title2&amp;sort_by=datetime&quot;);'>\n<figure>\n<div style='background-image: url(&quot;api/group/group1?group1=group1_title2&quot;)'></div>\n<figcaption>\nGroup 1, Title 2\n</figcaption>\n</figure>\n</a>\n</li>\n" \
+                     "<li title='John Doe'>\n<a onclick='openImagesGallery(&quot;author=John Doe&amp;sort_by=datetime&quot;);'>\n<figure>\n<div style='background-image: url(&quot;api/group_thumbnail?author=John Doe&quot;)'></div>\n<figcaption>\nJohn Doe\n<br>\n<em>Best photographer ever</em>\n</figcaption>\n</figure>\n</a>\n</li>\n" \
+                     "<li title='Jane Doe'>\n<a onclick='openImagesGallery(&quot;author=Jane Doe&amp;sort_by=datetime&quot;);'>\n<figure>\n<div style='background-image: url(&quot;api/group_thumbnail?author=Jane Doe&quot;)'></div>\n<figcaption>\nJane Doe\n</figcaption>\n</figure>\n</a>\n</li>\n" \
                      "</ul>\n" \
                      "</section>\n",
             title: 'My Gallery',
@@ -256,9 +258,9 @@ RSpec.describe Intranet::Pictures::Responder do
           }
         )
 
-        # Existing group, valid selector, valid sort order
-        query = { 'group1' => 'group1_title1', 'sort_by' => 'id', 'sort_order' => 'desc' }
-        code, mime, content = @responder.generate_page('/browse_group2.html', query)
+        # Valid selector, valid sort order
+        query = { 'group_by' => 'location', 'author' => 'John Doe', 'sort_by' => 'location', 'sort_order' => 'desc' }
+        code, mime, content = @responder.generate_page('/browse.html', query)
         expect(code).to eql(206)
         expect(mime).to eql('text/html')
         expect(content).to eql(
@@ -268,11 +270,11 @@ RSpec.describe Intranet::Pictures::Responder do
                      "<li>\n<a href='/index.html'>#{I18n.t('nav.home')}</a>\n</li>\n" \
                      "<li>#{I18n.t('pictures.menu')}</li>\n" \
                      "<li>\n<a href='index.html'>My Gallery</a>\n</li>\n" \
-                     "<li>#{I18n.t('pictures.nav.group2')} (Group 1, Title 1)</li>\n" \
+                     "<li>#{I18n.t('pictures.nav.location')} (John Doe)</li>\n" \
                      "</ul>\n\n" \
                      "<ul class='groups'>\n" \
-                     "<li title='Group 2, Title 3'>\n<a onclick='openImagesGallery(&quot;group1=group1_title1&amp;group2=group2_title3&amp;sort_by=datetime&quot;);'>\n<figure>\n<div style='background-image: url(&quot;api/group/group2?group2=group2_title3&quot;)'></div>\n<figcaption>\nGroup 2, Title 3\n</figcaption>\n</figure>\n</a>\n</li>\n" \
-                     "<li title='Group 2, Title 2'>\n<a onclick='openImagesGallery(&quot;group1=group1_title1&amp;group2=group2_title2&amp;sort_by=datetime&quot;);'>\n<figure>\n<div style='background-image: url(&quot;api/group/group2?group2=group2_title2&quot;)'></div>\n<figcaption>\nGroup 2, Title 2\n<br>\n<em>brief_text_2</em>\n</figcaption>\n</figure>\n</a>\n</li>\n" \
+                     "<li title='Tokyo, Japan'>\n<a onclick='openImagesGallery(&quot;author=John Doe&amp;location=Tokyo, Japan&amp;sort_by=datetime&quot;);'>\n<figure>\n<div style='background-image: url(&quot;api/group_thumbnail?location=Tokyo, Japan&quot;)'></div>\n<figcaption>\nTokyo, Japan\n</figcaption>\n</figure>\n</a>\n</li>\n" \
+                     "<li title='Paris, France'>\n<a onclick='openImagesGallery(&quot;author=John Doe&amp;location=Paris, France&amp;sort_by=datetime&quot;);'>\n<figure>\n<div style='background-image: url(&quot;api/group_thumbnail?location=Paris, France&quot;)'></div>\n<figcaption>\nParis, France\n<br>\n<em>The City of Light</em>\n</figcaption>\n</figure>\n</a>\n</li>\n" \
                      "</ul>\n" \
                      "</section>\n",
             title: 'My Gallery',
@@ -286,8 +288,8 @@ RSpec.describe Intranet::Pictures::Responder do
         )
 
         # Invalid selector
-        query = { 'foo' => 'bar' }
-        code, mime, content = @responder.generate_page('/browse_group2.html', query)
+        query = { 'group_by' => 'location', 'foo' => 'bar' }
+        code, mime, content = @responder.generate_page('/browse.html', query)
         expect(code).to eql(206)
         expect(mime).to eql('text/html')
         expect(content).to eql(
@@ -297,7 +299,7 @@ RSpec.describe Intranet::Pictures::Responder do
                      "<li>\n<a href='/index.html'>#{I18n.t('nav.home')}</a>\n</li>\n" \
                      "<li>#{I18n.t('pictures.menu')}</li>\n" \
                      "<li>\n<a href='index.html'>My Gallery</a>\n</li>\n" \
-                     "<li>#{I18n.t('pictures.nav.group2')} (bar)</li>\n" \
+                     "<li>#{I18n.t('pictures.nav.location')} (bar)</li>\n" \
                      "</ul>\n\n" \
                      "<ul class='groups'>\n</ul>\n" \
                      "</section>\n",
@@ -311,15 +313,16 @@ RSpec.describe Intranet::Pictures::Responder do
           }
         )
 
-        # Invalid group type
-        code, mime, content = @responder.generate_page('/browse_foo.html', {})
+        # Invalid grouping criteria
+        query = { 'group_by' => 'foo' }
+        code, mime, content = @responder.generate_page('/browse.html', query)
         expect(code).to eql(404)
         expect(mime).to be_empty
         expect(content).to be_empty
 
-        # Invalid sort order
-        query = { 'sort_order' => 'foo' }
-        code, mime, content = @responder.generate_page('/browse_group2.html', query)
+        # Invalid sorting criteria
+        query = { 'group_by' => 'location', 'sort_order' => 'foo' }
+        code, mime, content = @responder.generate_page('/browse.html', query)
         expect(code).to eql(404)
         expect(mime).to be_empty
         expect(content).to be_empty
@@ -341,97 +344,59 @@ RSpec.describe Intranet::Pictures::Responder do
       end
     end
 
-    context 'when asked for \'/api/groups\'' do
-      it 'should return a JSON representation of the selected groups' do
-        # Existing group, no selector nor sort order
-        query = {}
-        code, mime, content = @responder.generate_page('/api/groups/group1', query)
-        expect(code).to eql(200)
-        expect(mime).to eql('application/json')
-        expect(content).to eql(
-          [
-            { 'id' => 'group1_title1', 'title' => 'Group 1, Title 1', 'brief' => 'brief_text_1' },
-            { 'id' => 'group1_title2', 'title' => 'Group 1, Title 2' }
-          ].to_json
-        )
-
-        # Existing group, valid selector, no sort order
-        query = { 'group1' => 'group1_title1' }
-        code, mime, content = @responder.generate_page('/api/groups/group2', query)
+    context 'when asked for \'/api/group_thumbnail\'' do
+      it 'should return the selected group thumnail' do
+        # Existing group with thumbnail
+        query = { 'location' => 'New York, USA' }
+        code, mime, content = @responder.generate_page('/api/group_thumbnail', query)
         expect(code).to eql(200)
-        expect(mime).to eql('application/json')
-        expect(content).to eql(
-          [
-            { 'id' => 'group2_title2', 'title' => 'Group 2, Title 2', 'value' => 'bcde', 'brief' => 'brief_text_2' },
-            { 'id' => 'group2_title3', 'title' => 'Group 2, Title 3', 'value' => 'aabb' }
-          ].to_json
-        )
+        expect(mime).to eql('image/png')
+        expect(content).to eql(File.read(File.join(__dir__, 'alpha.png')))
 
-        # Existing group, valid selector, valid sort order
-        query = { 'group1' => 'group1_title1', 'sort_by' => 'value', 'sort_order' => 'asc' }
-        code, mime, content = @responder.generate_page('/api/groups/group2', query)
-        expect(code).to eql(200)
-        expect(mime).to eql('application/json')
-        expect(content).to eql(
-          [
-            { 'id' => 'group2_title3', 'title' => 'Group 2, Title 3', 'value' => 'aabb' },
-            { 'id' => 'group2_title2', 'title' => 'Group 2, Title 2', 'value' => 'bcde', 'brief' => 'brief_text_2' }
-          ].to_json
-        )
-        query = { 'group1' => 'group1_title1', 'sort_by' => 'id', 'sort_order' => 'desc' }
-        code, mime, content = @responder.generate_page('/api/groups/group2', query)
+        # Existing group with no specified thumbnail
+        query = { 'location' => 'Paris, France' }
+        code, mime, content = @responder.generate_page('/api/group_thumbnail', query)
         expect(code).to eql(200)
-        expect(mime).to eql('application/json')
+        expect(mime).to eql('image/svg+xml')
         expect(content).to eql(
-          [
-            { 'id' => 'group2_title3', 'title' => 'Group 2, Title 3', 'value' => 'aabb' },
-            { 'id' => 'group2_title2', 'title' => 'Group 2, Title 2', 'value' => 'bcde', 'brief' => 'brief_text_2' }
-          ].to_json
+          File.read(File.join(__dir__, '../../../lib/intranet/resources/www/group_thumbnail.svg'))
         )
 
-        # Invalid selector
-        query = { 'foo' => 'bar' }
-        code, mime, content = @responder.generate_page('/api/groups/group2', query)
-        expect(code).to eql(200)
-        expect(mime).to eql('application/json')
-        expect(content).to eql([].to_json)
-
-        # Invalid group type
-        code, mime, content = @responder.generate_page('/api/groups/foo', {})
+        # Existing group with non-existant thumbnail
+        query = { 'author' => 'Jane Doe' }
+        code, mime, content = @responder.generate_page('/api/group_thumbnail', query)
         expect(code).to eql(404)
         expect(mime).to be_empty
         expect(content).to be_empty
 
-        # Invalid sort order
-        query = { 'sort_order' => 'foo' }
-        code, mime, content = @responder.generate_page('/api/groups/group2', query)
+        # Invalid query
+        query = { 'location' => 'Tokyo, Japan', 'camera' => 'Canon EOS 5D MARK IV' }
+        code, mime, content = @responder.generate_page('/api/group_thumbnail', query)
         expect(code).to eql(404)
         expect(mime).to be_empty
         expect(content).to be_empty
       end
     end
 
-    context 'when asked for \'/api/group\'' do
-      it 'should return the selected group thumnail' do
-        # Existing group with thumbnail
-        query = { 'group2' => 'group2_title1' }
-        code, mime, content = @responder.generate_page('/api/group/group2', query)
+    context 'when asked for \'/api/group_brief\'' do
+      it 'should return the selected group brief text' do
+        # Existing group with brief text
+        query = { 'location' => 'Paris, France' }
+        code, mime, content = @responder.generate_page('/api/group_brief', query)
         expect(code).to eql(200)
-        expect(mime).to eql('image/png')
-        expect(content).to eql(File.read(File.join(__dir__, 'alpha.png')))
+        expect(mime).to eql('application/json')
+        expect(content).to eql('The City of Light'.to_json)
 
-        # Existing group with no specified thumbnail
-        query = { 'group2' => 'group2_title2' }
-        code, mime, content = @responder.generate_page('/api/group/group2', query)
+        # Existing group with no brief text
+        query = { 'location' => 'Tokyo, Japan' }
+        code, mime, content = @responder.generate_page('/api/group_brief', query)
         expect(code).to eql(200)
-        expect(mime).to eql('image/svg+xml')
-        expect(content).to eql(
-          File.read(File.join(__dir__, '../../../lib/intranet/resources/www/group_thumbnail.svg'))
-        )
+        expect(mime).to eql('application/json')
+        expect(content).to eql(''.to_json)
 
-        # Existing group with non-existant thumbnail
-        query = { 'group1' => 'group1_title2' }
-        code, mime, content = @responder.generate_page('/api/group/group1', query)
+        # Invalid query
+        query = { 'location' => 'Tokyo, Japan', 'camera' => 'Canon EOS 5D MARK IV' }
+        code, mime, content = @responder.generate_page('/api/group_brief', query)
         expect(code).to eql(404)
         expect(mime).to be_empty
         expect(content).to be_empty
@@ -446,46 +411,46 @@ RSpec.describe Intranet::Pictures::Responder do
         expect(mime).to eql('application/json')
         expect(content).to eql(
           [
-            { 'datetime' => '2019:07:22 09:41:31', 'group1' => 'group1_title1', 'group2' => 'group2_title2', 'group3' => 'group3_title1' },
-            { 'datetime' => '2020:06:19 07:51:05', 'value' => false, 'group1' => 'group1_title2', 'group2' => 'group2_title2' },
-            { 'datetime' => '2020:06:20 18:14:09', 'value' => true, 'group1' => 'group1_title2', 'group2' => 'group2_title1' },
-            { 'datetime' => '2020:06:20 06:09:54', 'value' => true, 'group1' => 'group1_title2', 'group2' => 'group2_title3', 'group3' => 'group3_title2' },
-            { 'datetime' => '2019:07:22 09:45:17', 'group1' => 'group1_title1', 'group2' => 'group2_title3' }
+            { 'datetime' => '2019:07:22 09:41:31', 'author' => 'John Doe', 'location' => 'Paris, France', 'camera' => 'Apple iPhone 11' },
+            { 'datetime' => '2020:06:19 07:51:05', 'flash' => false, 'author' => 'Jane Doe', 'location' => 'Tokyo, Japan' },
+            { 'datetime' => '2020:06:20 18:14:09', 'flash' => true, 'author' => 'Jane Doe', 'location' => 'New York, USA' },
+            { 'datetime' => '2020:06:20 06:09:54', 'flash' => true, 'author' => 'Jane Doe', 'location' => 'Paris, France', 'camera' => 'Canon EOS 5D MARK IV' },
+            { 'datetime' => '2019:07:22 09:45:17', 'author' => 'John Doe', 'location' => 'Tokyo, Japan' }
           ].to_json
         )
 
         # Valid selector, no sort order
-        query = { 'group1' => 'group1_title2', 'value' => true }
+        query = { 'author' => 'Jane Doe', 'flash' => true }
         code, mime, content = @responder.generate_page('/api/pictures', query)
         expect(code).to eql(200)
         expect(mime).to eql('application/json')
         expect(content).to eql(
           [
-            { 'datetime' => '2020:06:20 18:14:09', 'value' => true, 'group1' => 'group1_title2', 'group2' => 'group2_title1' },
-            { 'datetime' => '2020:06:20 06:09:54', 'value' => true, 'group1' => 'group1_title2', 'group2' => 'group2_title3', 'group3' => 'group3_title2' }
+            { 'datetime' => '2020:06:20 18:14:09', 'flash' => true, 'author' => 'Jane Doe', 'location' => 'New York, USA' },
+            { 'datetime' => '2020:06:20 06:09:54', 'flash' => true, 'author' => 'Jane Doe', 'location' => 'Paris, France', 'camera' => 'Canon EOS 5D MARK IV' }
           ].to_json
         )
 
         # Valid selector, valid sort order
-        query = { 'group1' => 'group1_title2', 'value' => true, 'sort_by' => 'datetime' }
+        query = { 'author' => 'Jane Doe', 'flash' => true, 'sort_by' => 'datetime' }
         code, mime, content = @responder.generate_page('/api/pictures', query)
         expect(code).to eql(200)
         expect(mime).to eql('application/json')
         expect(content).to eql(
           [
-            { 'datetime' => '2020:06:20 06:09:54', 'value' => true, 'group1' => 'group1_title2', 'group2' => 'group2_title3', 'group3' => 'group3_title2' },
-            { 'datetime' => '2020:06:20 18:14:09', 'value' => true, 'group1' => 'group1_title2', 'group2' => 'group2_title1' }
+            { 'datetime' => '2020:06:20 06:09:54', 'flash' => true, 'author' => 'Jane Doe', 'location' => 'Paris, France', 'camera' => 'Canon EOS 5D MARK IV' },
+            { 'datetime' => '2020:06:20 18:14:09', 'flash' => true, 'author' => 'Jane Doe', 'location' => 'New York, USA' }
           ].to_json
         )
-        query = { 'group1' => 'group1_title2', 'value' => true, 'sort_by' => 'group2',
+        query = { 'author' => 'Jane Doe', 'flash' => true, 'sort_by' => 'location',
                   'sort_order' => 'desc' }
         code, mime, content = @responder.generate_page('/api/pictures', query)
         expect(code).to eql(200)
         expect(mime).to eql('application/json')
         expect(content).to eql(
           [
-            { 'datetime' => '2020:06:20 06:09:54', 'value' => true, 'group1' => 'group1_title2', 'group2' => 'group2_title3', 'group3' => 'group3_title2' },
-            { 'datetime' => '2020:06:20 18:14:09', 'value' => true, 'group1' => 'group1_title2', 'group2' => 'group2_title1' }
+            { 'datetime' => '2020:06:20 06:09:54', 'flash' => true, 'author' => 'Jane Doe', 'location' => 'Paris, France', 'camera' => 'Canon EOS 5D MARK IV' },
+            { 'datetime' => '2020:06:20 18:14:09', 'flash' => true, 'author' => 'Jane Doe', 'location' => 'New York, USA' }
           ].to_json
         )
 

data/spec/intranet/pictures/sample-db.json

@@ -1,46 +1,36 @@
 {
   "title": "My Gallery",
   "groups": {
-    "group1": [
+    "author": [
       {
-        "id": "group1_title1",
-        "title": "Group 1, Title 1",
+        "id": "John Doe",
         "uri": "white.jpg",
-        "brief": "brief_text_1"
+        "brief": "Best photographer ever"
       },
       {
-        "id": "group1_title2",
-        "title": "Group 1, Title 2",
+        "id": "Jane Doe",
         "uri": "thumb12.jpg"
       }
     ],
-    "group2": [
+    "location": [
       {
-        "id": "group2_title1",
-        "title": "Group 2, Title 1",
-        "uri": "alpha.png",
-        "value": "abcd"
+        "id": "New York, USA",
+        "uri": "alpha.png"
       },
       {
-        "id": "group2_title2",
-        "title": "Group 2, Title 2",
-        "value": "bcde",
-        "brief": "brief_text_2"
+        "id": "Paris, France",
+        "brief": "The City of Light"
       },
       {
-        "id": "group2_title3",
-        "title": "Group 2, Title 3",
-        "value": "aabb"
+        "id": "Tokyo, Japan"
       }
     ],
-    "group3": [
+    "camera": [
       {
-        "id": "group3_title1",
-        "title": "Group 3, Title 1"
+        "id": "Apple iPhone 11"
       },
       {
-        "id": "group3_title2",
-        "title": "Group 3, Title 2"
+        "id": "Canon EOS 5D MARK IV"
       }
     ]
   },
@@ -48,36 +38,36 @@
     {
       "uri": "white.jpg",
       "datetime": "2019:07:22 09:41:31",
-      "group1": "group1_title1",
-      "group2": "group2_title2",
-      "group3": "group3_title1"
+      "author": "John Doe",
+      "location": "Paris, France",
+      "camera": "Apple iPhone 11"
     },
     {
       "uri": "./alpha.png",
       "datetime": "2020:06:19 07:51:05",
-      "value": false,
-      "group1": "group1_title2",
-      "group2": "group2_title2"
+      "flash": false,
+      "author": "Jane Doe",
+      "location": "Tokyo, Japan"
     },
     {
       "uri": "pic3.jpg",
       "datetime": "2020:06:20 18:14:09",
-      "value": true,
-      "group1": "group1_title2",
-      "group2": "group2_title1"
+      "flash": true,
+      "author": "Jane Doe",
+      "location": "New York, USA"
     },
     {
       "uri": "sample-db.json",
       "datetime": "2020:06:20 06:09:54",
-      "value": true,
-      "group1": "group1_title2",
-      "group2": "group2_title3",
-      "group3": "group3_title2"
+      "flash": true,
+      "author": "Jane Doe",
+      "location": "Paris, France",
+      "camera": "Canon EOS 5D MARK IV"
     },
     {
       "datetime": "2019:07:22 09:45:17",
-      "group1": "group1_title1",
-      "group2": "group2_title3"
+      "author": "John Doe",
+      "location": "Tokyo, Japan"
     }
   ]
 }

data/spec/spec_helper.rb

@@ -41,13 +41,11 @@ RSpec.configure do |config|
   $LOAD_PATH << File.absolute_path(File.join('..', 'lib'), __dir__)
 
   # Load and start SimpleCov to gather code coverage information
-  unless config.files_to_run.one?
-    require 'simplecov'
-    SimpleCov.start do
-      enable_coverage :branch                   # measure branches coverage
-      primary_coverage :branch
-      minimum_coverage line: 100, branch: 100   # minimal coverage rate to succeed
-      add_filter 'spec'                         # exclude 'spec' folder from coverage
-    end
+  require 'simplecov'
+  SimpleCov.start do
+    enable_coverage :branch                   # measure branches coverage
+    primary_coverage :branch
+    minimum_coverage line: 100, branch: 100   # minimal coverage rate to succeed
+    add_filter 'spec'                         # exclude 'spec' folder from coverage
   end
 end