intranet-pictures 2.2.0 → 3.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e5e318561ea69bdaed8eaf38cf8d1349220835196596acc6ba65640c2deac52
-  data.tar.gz: ebc612ab80afffc3c9f70a3ea0b2da47467006b91854a0e7f7c05227a2c64a2d
+  metadata.gz: 42e09da26c3eecce0bdf0c37f9f39ae4db140b850c594677f87672d64ae90a23
+  data.tar.gz: fd202aa0c01b91752021116f3bf455497e153a32ce49a4d4b9ce59649b5916fa
 SHA512:
-  metadata.gz: fc2992a96129bf8b0e8a0e79753a9833541a10b875bddc9893cf5dec74e595dcf5693fd28f5b5c4b771725fb0bb64f14ebc43efb87855959c780efa19e4a822f
-  data.tar.gz: 26b461521d1b71a98a37f0e1848a3cae417eb79ccc8ba19faeaafbbc94a38143fa00871e53118417923b3a9bd1326520ae57492f732fa9fcc9f7ee68b0f35a6f
+  metadata.gz: 80ce234ae592e9073e61b2287a8cc83a228afb8afe2978072efeac125aedeeba31d201d96d714e5eadb54c2e877c34424f86e67a1599aadc87f54ce60f8a690e
+  data.tar.gz: 359976b4df45fb420eee0ebc7d03bd191886c98947815faae54114c3bbcac773b58c45c663ca16e5c6a221c0903cf15ee3963f789b50572c0ef8a4c3d6c1910b

data/lib/intranet/pictures/json_db_provider.rb

@@ -10,26 +10,26 @@ module Intranet
     # === Structure of the JSON database
     # See the example below.
     #
-    # The title of the pictures gallery is indicated in +title+
-    #
     # Pictures are described individually as a hash in the +pictures+ array. The mandatory keys in
     # this hash are:
-    # * +uri+ : location of the picture, relative to the JSON file
-    # * +title+ : description of the picture
-    # * +datetime+ : date and time of the picture, as a string in ISO8601 format
-    # * +height+ and +width+ : size in pixels of the picture
+    # * +uri+ : location of the picture, relative to the JSON file (string)
+    # * +title+ : description of the picture (string)
+    # * +datetime+ : date and time of the picture, in ISO8601 format (string)
+    # * +height+ and +width+ : size in pixels of the picture (integers)
     #
     # Additional keys may be added (for instance: event, city, region/country, ...); they will be
-    # used to group pictures sharing the same value of a given key.
+    # used to select pictures sharing the same value of a given key, or to group them.
+    # Values may either be singular string elements (for instance: "My wonderful event") or array
+    # of strings (for instance: [ "Casino", "Las Vegas", "Urban photography" ]).
+    #
     # Some groups may be defined in the +groups+ hash to add a thumbnail picture and a brief text
     # description for them. The possible keys in this hash are:
-    # * +id+ : unique identifier of the group, mandatory
-    # * +brief+ : optional short text associated to the group name
-    # * +uri+ : optional group thumbnail, relative to the JSON file
+    # * +id+ : unique identifier of the group, mandatory (string)
+    # * +brief+ : optional short text associated to the group name (string)
+    # * +uri+ : optional group thumbnail, relative to the JSON file (string)
     #
-    # @example Structure of the JSON database (not all mandatory are present for readability)
+    # @example Structure of the JSON database (not all mandatory keys are present for readability)
     #   {
-    #     "title": "gallery title",
     #     "groups": {
     #       "event": [
     #         { "id": "Party", "brief": "...", "uri": "party.jpg", ... },
@@ -41,7 +41,8 @@ module Intranet
     #       ]
     #     },
     #     "pictures": [
-    #       { "uri": "dir/pic0.jpg", "datetime": "...", "event": "Party", "city": "Houston", ... },
+    #       { "uri": "dir/pic0.jpg", "datetime": "...", "event": "Party", "city": "Houston",
+    #         "tags": [ "USA", "Portrait" ], ... },
     #       { ... }
     #     ]
     #   }
@@ -55,17 +56,16 @@ module Intranet
         load_json
       end
 
-      # Returns the pictures gallery title.
-      # @return [String] The gallery title.
-      # @raise KeyError If no title is defined in JSON file.
-      def title
-        load_json
-        @json.fetch('title').to_s
-      end
-
-      # Returns the list of the pictures matching +selector+.
-      # Results are returned ordered by +sort_by+ in ascending order if +asc+, and in descending
-      # order otherwise.
+      # Returns the list of the pictures matching the given selectors.
+      # Selectors are key/value strings pairs restricting the pictures to be returned:
+      #   - if a picture has the given key, its value is a singular string and is strictly equal
+      #     to the given value, it is returned;
+      #   - if a picture has the given key, its value is an array of strings and ONE of the
+      #     elements of this array is equal to the given value, it is returned;
+      #   - all other pictures are not returned.
+      # Results are sorted according to the value of the key +sort_by+, in ascending order if
+      # +asc+, and in descending order otherwise. Sorting by a key whose value is not a singular
+      # string is not defined.
       # @param selector [Hash<String,String>] The pictures selector, interpreted as a logical AND
       #                                       combination of all key/value pairs provided.
       # @param sort_by [String] The picture field to sort the results by, or nil if results should
@@ -74,11 +74,16 @@ module Intranet
       #                      in descending order.
       # @return [Array<Hash{'title'=>String, 'datetime'=>String, 'height'=>Integer,
       #  'width'=>Integer, ...}>] The selected pictures.
-      # @raise KeyError If JSON file is malformed, or if +sort_by+ is not an existing picture field.
+      # @raise KeyError If JSON file is malformed, or if +sort_by+ is not an existing picture field,
+      #                 or if +sort_by+ is not a singular string value.
       def list_pictures(selector = {}, sort_by = nil, asc = true)
         load_json
         pics = select_pictures(selector).map { |p| p.except('uri') }
-        pics.sort_by! { |p| p.fetch(sort_by) } unless sort_by.nil?
+        unless sort_by.nil?
+          raise KeyError if pics.any? { |p| p.fetch(sort_by).respond_to?('any?') }
+
+          pics.sort_by! { |p| p.fetch(sort_by) }
+        end
         pics.reverse! unless asc
         pics
       end
@@ -151,7 +156,14 @@ module Intranet
       end
 
       def picture_match?(picture, selector)
-        selector.all? { |k, v| picture.fetch(k) == v }
+        selector.all? do |k, v|
+          picture_value = picture.fetch(k)
+          if picture_value.respond_to?('any?')
+            picture_value.any? { |e| e == v }
+          else
+            picture_value == v
+          end
+        end
       rescue KeyError
         false
       end

data/lib/intranet/pictures/responder.rb

@@ -9,7 +9,7 @@ require_relative 'version'
 module Intranet
   module Pictures
     # The responder for the Pictures monitor module of the Intranet.
-    class Responder < AbstractResponder # rubocop:disable Metrics/ClassLength
+    class Responder < AbstractResponder
       include Core::HamlWrapper # 'inherits' from methods of HamlWrapper
 
       # Returns the name of the module.
@@ -35,27 +35,15 @@ module Intranet
       #  The pictures provider.
       # @see Intranet::Pictures::JsonDbProvider The specification of the provider, and in particular
       #  the minimal mandatory elements that must be returned by the operations.
-      # @param recents [Array<Hash{group_by:String, sort_by:String, sort_order:String,
-      #  limit:Integer}>]
-      #  The description of the recent pictures to be displayed on the module home page. Pictures
-      #  will first be sorted according to +sort_by+ and +sort_order+, then grouped by +group_by+,
-      #  keeping only the first +limit+ elements, or all if +limit+ is zero. All keys except
-      #  +group_by+ may be omitted.
-      # @param home_groups [Array<Hash{group_by:String, sort_by:String, sort_order:String,
-      #  browse_group_by:String, browse_sort_by:String, browse_sort_order:String}>]
-      #  The description of the pictures groups to be displayed on the module home page, after the
-      #  +recents+. Pictures will first be sorted according to +sort_by+ and +sort_order+, then
-      #  grouped by +group_by+. The obtained groups will be displayed with their thumbnail,
-      #  (optional) brief text and a link to display images of that group sorted according to
-      #  +browse_sort_by+ and +browse_sort_order+ and grouped by +browse_group_by+. All keys except
-      #  +group_by+ and +browse_group_by+ may be omitted.
+      # @param defaults [Hash{group_by:String, sort_by:String, sort_order:String}]
+      #  The default grouping and sort order, if none is specified in the URL.
+      #  All keys except +group_by+ may be omitted.
       # @param in_menu [Boolean] Whether the module instance should be displayed in the main
       #                          navigation menu or not.
-      def initialize(provider, recents = [], home_groups = [], in_menu = true)
+      def initialize(provider, defaults, in_menu = true)
         @provider = provider
-        @recents = recents
+        @defaults = defaults
         @in_menu = in_menu
-        @home_groups = home_groups
       end
 
       # Specifies if the responder instance should be displayed in the main navigation menu or not.
@@ -99,18 +87,17 @@ module Intranet
       #     ]
       def generate_page(path, query)
         case path
-        when %r{^/index\.html$}  then serve_home
-        when %r{^/browse\.html$} then serve_browse(query)
+        when %r{^/index\.html$} then serve_home(query)
         when %r{^/api/} then serve_api(path.gsub(%r{^/api}, ''), query)
         when %r{^/i18n\.js$} then serve_i18n_js
-        else super(path, query)
+        else super
         end
       end
 
-      # Returns the title of the Pictures module, as displayed on the web page.
-      # @return [String] The title of the Pictures module web page.
+      # The title of the Pictures module, as displayed on the web page.
+      # @return [String] The title of the Pictures web page.
       def title
-        @provider.title
+        I18n.t('pictures.menu')
       end
 
       private
@@ -126,24 +113,31 @@ module Intranet
       # @return [String] The key to use to group pictures.
       # @raise KeyError If no grouping criteria is specified.
       def group_by(query)
-        query.fetch('group_by')
+        return query['group_by'] unless query['group_by'].nil?
+
+        @defaults.fetch('group_by')
       end
 
       # Extract the sorting criteria from the given +query+, ie. the key that will be used to sort
       # the selected pictures.
       # @return [String] The key to use to sort pictures, or nil if no sorting is specified.
       def sort_by(query)
-        query.fetch('sort_by')
-      rescue KeyError
-        nil
+        return query['sort_by'] unless query['sort_by'].nil?
+
+        @defaults['sort_by']
       end
 
       # Extract the sorting order from the given +query+.
       # @return [Boolean] True if the pictures should be sorted in ascending order, False otherwise.
       # @raise KeyError If the query requests an invalid sort order.
       def sort_order(query)
-        return false if query['sort_order'] == 'desc'
-        return true if query['sort_order'].nil? || query['sort_order'] == 'asc'
+        order = query['sort_order']
+        order = @defaults['sort_order'] if order.nil?
+        if order == 'desc'
+          return false
+        elsif order.nil? || order == 'asc'
+          return true
+        end
 
         raise KeyError # incorrect value for 'sort_order'
       end
@@ -166,68 +160,43 @@ module Intranet
       ##########################################################################
 
       def collect_groups(selector, group_by, sort_by, sort_order)
-        # Select all pictures, sort them & eventually keep only group names (first occurrence only)
+        # Select all pictures & sort them
+        pics = @provider.list_pictures(selector, sort_by, sort_order)
+        return [] if pics.empty?
+
+        # Eventually keep only group names (first occurrence only)
         @provider.list_pictures(selector, sort_by, sort_order).map do |picture|
-          picture.fetch(group_by)
-        end.uniq
+          picture[group_by] # may be empty
+        end.uniq.compact
       end
 
       def hash_to_query(hash)
         hash.map { |k, v| [k, v].join('=') }.join('&')
       end
 
-      def recent_groups
-        @recents.map do |recent|
-          groups = collect_groups({}, group_by(recent), sort_by(recent), sort_order(recent))
-          see_more_url = ''
-          if recent['limit'].to_i.positive?
-            groups = groups.first(recent['limit'].to_i)
-            see_more_url = "browse.html?#{hash_to_query(recent.except('limit'))}"
-          end
-          { group_key: group_by(recent), groups: groups, see_more_url: see_more_url }
-        end
-      end
-
-      def all_groups
-        @home_groups.map do |sec|
-          groups = collect_groups({}, group_by(sec), sort_by(sec), sort_order(sec))
-          url_prefix = "browse.html?group_by=#{sec['browse_group_by']}"
-          url_prefix += "&sort_by=#{sec['browse_sort_by']}" if sec['browse_sort_by']
-          url_prefix += "&sort_order=#{sec['browse_sort_order']}" if sec['browse_sort_order']
-          { group_key: group_by(sec), groups: groups, url_prefix: url_prefix }
-        end
+      def all_tags(selector)
+        @provider.list_pictures(selector).map do |picture|
+          picture['tags'] # may be empty
+        end.flatten.compact.sort.uniq
       end
 
-      def make_nav(query = {})
-        h = { I18n.t('nav.home') => '/index.html', I18n.t('pictures.menu') => nil, title => nil }
-        unless query['group_by'].nil?
-          h[title] = 'index.html'
-          extra_key = I18n.t("pictures.nav.#{group_by(query)}")
-          filters = selector(query).values
-          extra_key += " (#{filters.join(', ')})" unless filters.empty?
-          h.store(extra_key, nil)
-        end
-        h
+      def make_nav
+        { I18n.t('nav.home') => '/index.html', I18n.t('pictures.menu') => nil, title => nil }
       end
 
       def gallery_url(key, value, filters = {})
         filters.store(key, value)
         filters.store('sort_by', 'datetime')
+        filters.store('sort_order', 'asc')
         hash_to_query(filters)
       end
 
-      def serve_home
-        content = to_markup('pictures_home', nav: make_nav)
-        [206, 'text/html',
-         { content: content, title: title, stylesheets: stylesheets, scripts: scripts }]
-      rescue KeyError
-        [404, '', '']
-      end
-
-      def serve_browse(query)
+      def serve_home(query)
         groups = collect_groups(selector(query), group_by(query), sort_by(query), sort_order(query))
-        content = to_markup('pictures_browse', nav: make_nav(query), group_key: group_by(query),
-                                               filters: selector(query), groups: groups)
+        content = to_markup('pictures_home', nav: make_nav, groups: groups,
+                                             group_key: group_by(query),
+                                             filters: selector(query),
+                                             tags: all_tags(selector(query)))
         [206, 'text/html',
          { content: content, title: title, stylesheets: stylesheets, scripts: scripts }]
       rescue KeyError

data/lib/intranet/pictures/version.rb

@@ -8,7 +8,7 @@ module Intranet
     NAME = 'intranet-pictures'
 
     # The version of the gem, according to semantic versionning.
-    VERSION = '2.2.0'
+    VERSION = '3.0.0.rc1'
 
     # The URL of the gem homepage.
     HOMEPAGE_URL = 'https://rubygems.org/gems/intranet-pictures'

data/lib/intranet/resources/haml/pictures_home.haml

@@ -1,35 +1,28 @@
 %section
   = to_markup 'title_and_breadcrumb', {title: title, nav: nav}
-
-  - recent_groups.each do |recent|
-    %h3= I18n.t('pictures.recents.' + recent[:group_key])
+  %h4 Tags
+  - if tags.empty?
+    %p
+      %em= I18n.t("pictures.no_result_found")
+  - else
+    %div#tags
+      - tags.each do |tag_name|
+        %button.tag{ type: 'button', onclick: 'filterByTag("' + tag_name + '");' }
+          = tag_name
+  %h4= I18n.t("pictures.nav.#{group_key}")
+  - if groups.empty?
+    %p
+      %em= I18n.t("pictures.no_result_found")
+  - else
     %ul.groups
-      - recent[:groups].each do |group_name|
+      - groups.each do |group_name|
         %li{ title: group_name }
-          %a{ onclick: 'openImagesGallery("' + gallery_url(recent[:group_key], group_name) + '");' }
+          %a{ onclick: 'openImagesGallery("' + gallery_url(group_key, group_name, filters) + '");' }
             %figure
-              %div{ style: 'background-image: url("api/group_thumbnail?' + recent[:group_key] + '=' + group_name + '")' }
+              %div{ style: 'background-image: url("api/group_thumbnail?' + group_key + '=' + group_name + '")' }
               %figcaption
                 = group_name
-                - group_brief = api_group_brief({ recent[:group_key] => group_name })
-                - unless group_brief.empty?
-                  %br
-                  %em= group_brief
-    - unless recent[:see_more_url].empty?
-      %p.see_more
-        %a{ href: recent[:see_more_url] }= I18n.t('pictures.see_more')
-
-  - all_groups.each do |section|
-    %h3= I18n.t('pictures.browse_by.' + section[:group_key])
-    %ul.groups.wide
-      - section[:groups].each do |group_name|
-        %li{ title: group_name }
-          %a{ href: section[:url_prefix] + '&' + section[:group_key] + '=' + group_name }
-            %figure
-              %div{ style: 'background-image: url("api/group_thumbnail?' + section[:group_key] + '=' + group_name + '")' }
-              %figcaption
-                = group_name
-                - group_brief = api_group_brief({ section[:group_key] => group_name })
+                - group_brief = api_group_brief({ group_key => group_name })
                 - unless group_brief.empty?
                   %br
                   %em= group_brief

data/lib/intranet/resources/locales/en.yml

@@ -4,7 +4,7 @@
 en:
   pictures:
     menu: 'Pictures'
-    see_more: 'See more results'
+    no_result_found: 'No result found'
     viewer:
       close: 'Close'
       zoom: 'Zoom'
@@ -18,17 +18,3 @@ en:
       country: 'Countries'
       album: 'Albums'
       category: 'Categories'
-    recents:
-      event: 'Latest events'
-      city: 'Cities visited recently'
-      region: 'Regions visited recently'
-      country: 'Countries visited recently'
-      album: 'Latest pictures albums'
-      category: 'Categories updated recently'
-    browse_by:
-      event: 'Browse pictures by event'
-      city: 'Browse pictures by city'
-      region: 'Browse pictures by region'
-      country: 'Browse pictures by country'
-      album: 'Browse pictures by album'
-      category: 'Browse pictures by category'

data/lib/intranet/resources/locales/fr.yml

@@ -4,7 +4,7 @@
 fr:
   pictures:
     menu: 'Photos'
-    see_more: 'Afficher plus de résultats'
+    no_result_found: 'Aucun résultat à afficher'
     viewer:
       close: 'Fermer'
       zoom: 'Agrandir'
@@ -18,17 +18,3 @@ fr:
       country: 'Pays'
       album: 'Albums'
       category: 'Catégories'
-    recents:
-      event: 'Événements récents'
-      city: 'Dernières villes visitées'
-      region: 'Dernières régions visitées'
-      country: 'Derniers pays visités'
-      album: 'Albums photos récents'
-      category: 'Catégories mises à jour récemment'
-    browse_by:
-      event: 'Parcourir les images par événement'
-      city: 'Parcourir les images par ville'
-      region: 'Parcourir les images par région'
-      country: 'Parcourir les images par pays'
-      album: 'Parcourir les images par album'
-      category: 'Parcourir les images par catégorie'

data/lib/intranet/resources/www/jpictures.js

@@ -108,11 +108,11 @@ class PhotoSwipePictureGallery {
       if (slide.data.event) {
         caption += '<p class="pswp__caption__exif pswp__caption__exif_event">' + slide.data.event + '</p>';
       }
-      if (slide.data.city || slide.data.region) {
+      if (slide.data.city || slide.data.country) {
         caption += '<p class="pswp__caption__exif pswp__caption__exif_location">';
         if (slide.data.city) { caption += slide.data.city; }
-        if (slide.data.city && slide.data.region) { caption += ', '; }
-        if (slide.data.region) { caption += slide.data.region; }
+        if (slide.data.city && slide.data.country) { caption += ', '; }
+        if (slide.data.country) { caption += slide.data.country; }
         caption += '</p>';
       }
       if (slide.data.model) {
@@ -130,6 +130,9 @@ class PhotoSwipePictureGallery {
       if (slide.data.isospeed) {
         caption += '<p class="pswp__caption__exif pswp__caption__exif_iso">' + 'ISO ' + slide.data.isospeed + '</p>';
       }
+      if (slide.data.tags) {
+        caption += '<p class="pswp__caption__exif pswp__caption__exif_tags">' + slide.data.tags.join(", ") + '</p>';
+      }
       return caption;
     } else {
       return '<strong>' + slideDateTime + '</strong> &mdash; ' + slideTitle;
@@ -156,3 +159,26 @@ function openImagesGallery(selectors) {
     .then(data => createImageGallery(data));
 }
 window.openImagesGallery = openImagesGallery;
+
+// Export this function so that it may be called from HTML
+function filterByTag(tagName) {
+  const urlParams = new URLSearchParams(window.location.search);
+  const activeTag = urlParams.get('tags');
+  if (activeTag == tagName) {
+    urlParams.delete('tags');
+  } else {
+    urlParams.set('tags', tagName);
+  }
+  window.location.search = urlParams.toString();
+}
+window.filterByTag = filterByTag;
+
+/* Code executed after page load */
+const urlParams = new URLSearchParams(window.location.search);
+const activeTag = urlParams.get('tags');
+const buttons = document.getElementById('tags').getElementsByTagName('button');
+for (let i = 0; i < buttons.length; i++) {
+  if (buttons[i].innerText == activeTag) {
+    buttons[i].classList.add('active');
+  }
+}

data/lib/intranet/resources/www/style.css

@@ -3,10 +3,24 @@
  * Design for the Pictures module of the IntraNet.
  */
 
-/******************************* Recent groups ********************************/
+/************************************ Tags ************************************/
 
-p.see_more {
-  text-align: right;
+button {
+  background: #ffffff;
+  border: 1px solid #eeeff2;
+  border-radius: 999em;
+  margin: 0px 4px 1em; /* top sides bottom */
+  padding: 10px 15px; /* top+bottom sides */
+  transition: all 0.2s;
+  cursor: pointer;
+}
+
+button.active {
+  background: #eaeaea;
+}
+
+button:hover, button:focus {
+  box-shadow: 0px 1px 5px rgba(0,0,0,0.08);
 }
 
 /******************************* Picture groups *******************************/
@@ -145,3 +159,7 @@ ul.groups li:hover, ul.groups li:focus {
 .pswp .pswp__caption__exif_iso {
 	background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIyNCIgaGVpZ2h0PSIyNCIgdmlld0JveD0iMCAwIDI0IDI0Ij48cGF0aCBmaWxsPSIjY2NjY2NjIiBkPSJNMTkgM0g1Yy0xLjEgMC0yIC45LTIgMnYxNGMwIDEuMS45IDIgMiAyaDE0YzEuMSAwIDItLjkgMi0yVjVjMC0xLjEtLjktMi0yLTJ6TTUuNSA3LjVoMnYtMkg5djJoMlY5SDl2Mkg3LjVWOWgtMlY3LjV6TTE5IDE5SDVMMTkgNXYxNHptLTItMnYtMS41aC01VjE3aDV6Ij48L3BhdGg+PC9zdmc+Cg==);
 }
+
+.pswp .pswp__caption__exif_tags {
+	background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIyNCIgaGVpZ2h0PSIyNCIgdmlld0JveD0iMCAwIDI0IDI0Ij48cGF0aCBmaWxsPSIjY2NjY2NjIiBkPSJNOS4yNTkgNC41SDQuNTAxdjQuNzU4TDE0Ljc0MyAxOS41bDQuNzU4LTQuNzU4em0yLjEyMS0yLjEyMUEzIDMgMCAwIDAgOS4yNTkgMS41SDEuNTAxdjcuNzU4YTMgMyAwIDAgMCAuODc5IDIuMTIxbDEwLjI0MiAxMC4yNDJhMyAzIDAgMCAwIDQuMjQyIDBsNC43NTgtNC43NThhMyAzIDAgMCAwIDAtNC4yNDJ6TTcuNTAxIDlhMS41IDEuNSAwIDEgMSAwLTMgMS41IDEuNSAwIDEgMSAwIDN6bTAgMCIgZmlsbC1ydWxlPSJldmVub2RkIi8+PC9zdmc+Cg==);
+}

data/spec/intranet/pictures/json_db_provider_spec.rb

@@ -14,16 +14,6 @@ RSpec.describe Intranet::Pictures::JsonDbProvider do
     end
   end
 
-  describe '#title' do
-    before do
-      @provider = described_class.new(File.join(__dir__, 'sample-db.json'))
-    end
-
-    it 'should return the gallery title' do
-      expect(@provider.title).to eql('My Gallery')
-    end
-  end
-
   describe '#list_pictures' do
     before do
       @provider = described_class.new(File.join(__dir__, 'sample-db.json'))
@@ -32,42 +22,63 @@ RSpec.describe Intranet::Pictures::JsonDbProvider do
     it 'should return the list of pictures without the uri key' do
       expect(@provider.list_pictures).to eql(
         [
-          { '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:41:31', 'author' => 'John Doe', 'location' => 'Paris, France', 'camera' => 'Apple iPhone 11', 'tags' => ['Modern art', 'Louvre'] },
+          { 'datetime' => '2020:06:19 07:51:05', 'flash' => 'false', 'author' => 'Jane Doe', 'location' => 'Tokyo, Japan', 'tags' => ['MoMAK', 'Modern art', 'Cherry blossom'] },
+          { 'datetime' => '2020:06:20 18:14:09', 'flash' => 'true', 'author' => 'Jane Doe', 'location' => 'New York, USA', 'tags' => 'Urban photography' },
+          { 'datetime' => '2020:06:20 06:09:54', 'flash' => 'true', 'author' => 'Jane Doe', 'location' => 'Paris, France', 'camera' => 'Canon EOS 5D MARK IV', 'tags' => ['Louvre', 'Pyramid', 'Urban photography'] },
           { 'datetime' => '2019:07:22 09:45:17', 'author' => 'John Doe', 'location' => 'Tokyo, Japan' }
         ]
       )
     end
 
     it 'should return only the pictures matching the given selector' do
+      # Select only singular string values
       selector = { 'author' => 'Jane Doe' }
       expect(@provider.list_pictures(selector)).to eql(
         [
-          { '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' => '2020:06:19 07:51:05', 'flash' => 'false', 'author' => 'Jane Doe', 'location' => 'Tokyo, Japan', 'tags' => ['MoMAK', 'Modern art', 'Cherry blossom'] },
+          { 'datetime' => '2020:06:20 18:14:09', 'flash' => 'true', 'author' => 'Jane Doe', 'location' => 'New York, USA', 'tags' => 'Urban photography' },
+          { 'datetime' => '2020:06:20 06:09:54', 'flash' => 'true', 'author' => 'Jane Doe', 'location' => 'Paris, France', 'camera' => 'Canon EOS 5D MARK IV', 'tags' => ['Louvre', 'Pyramid', 'Urban photography'] }
+        ]
+      )
+
+      # Select singular or array string values
+      selector = { 'tags' => 'Urban photography' }
+      expect(@provider.list_pictures(selector)).to eql(
+        [
+          { 'datetime' => '2020:06:20 18:14:09', 'flash' => 'true', 'author' => 'Jane Doe', 'location' => 'New York, USA', 'tags' => 'Urban photography' },
+          { 'datetime' => '2020:06:20 06:09:54', 'flash' => 'true', 'author' => 'Jane Doe', 'location' => 'Paris, France', 'camera' => 'Canon EOS 5D MARK IV', 'tags' => ['Louvre', 'Pyramid', 'Urban photography'] }
+        ]
+      )
+
+      # Multiple selectors are AND'ed together
+      selector = { 'tags' => 'Modern art', 'location' => 'Paris, France' }
+      expect(@provider.list_pictures(selector)).to eql(
+        [
+          { 'datetime' => '2019:07:22 09:41:31', 'author' => 'John Doe', 'location' => 'Paris, France', 'camera' => 'Apple iPhone 11', 'tags' => ['Modern art', 'Louvre'] }
         ]
       )
     end
 
     context 'given a valid +sort_by+ key' do
       it 'should sort the pictures by the given key' do
+        # Ascending (default) sort order, sort key has only singular string values
         selector = { 'author' => 'Jane Doe' }
         expect(@provider.list_pictures(selector, 'location')).to eql(
           [
-            { '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' => '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', 'tags' => 'Urban photography' },
+            { 'datetime' => '2020:06:20 06:09:54', 'flash' => 'true', 'author' => 'Jane Doe', 'location' => 'Paris, France', 'camera' => 'Canon EOS 5D MARK IV', 'tags' => ['Louvre', 'Pyramid', 'Urban photography'] },
+            { 'datetime' => '2020:06:19 07:51:05', 'flash' => 'false', 'author' => 'Jane Doe', 'location' => 'Tokyo, Japan', 'tags' => ['MoMAK', 'Modern art', 'Cherry blossom'] }
           ]
         )
 
+        # Descending sort order
+        selector = { 'author' => 'Jane Doe' }
         expect(@provider.list_pictures(selector, 'datetime', false)).to eql(
           [
-            { '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' => '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', 'tags' => 'Urban photography' },
+            { 'datetime' => '2020:06:20 06:09:54', 'flash' => 'true', 'author' => 'Jane Doe', 'location' => 'Paris, France', 'camera' => 'Canon EOS 5D MARK IV', 'tags' => ['Louvre', 'Pyramid', 'Urban photography'] },
+            { 'datetime' => '2020:06:19 07:51:05', 'flash' => 'false', 'author' => 'Jane Doe', 'location' => 'Tokyo, Japan', 'tags' => ['MoMAK', 'Modern art', 'Cherry blossom'] }
           ]
         )
       end
@@ -78,6 +89,12 @@ RSpec.describe Intranet::Pictures::JsonDbProvider do
         expect { @provider.list_pictures({}, 'invalid') }.to raise_error(KeyError)
       end
     end
+
+    context 'given an invalid +sort_by+ key with array values' do
+      it 'should raise KeyError' do
+        expect { @provider.list_pictures({}, 'tags') }.to raise_error(KeyError)
+      end
+    end
   end
 
   describe '#picture' do