intranet-pictures 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 375bdf2fb9b0a0354f3066e44c59a4426077916642a248a9180aabc3842628d5
-  data.tar.gz: 34b5b68ae804b7a441320eee02880726ce8ca85eb15a813f9e49ab99c64491a6
+  metadata.gz: f83afa6acab98f33abb964031b20ee5e3e13a9225ff3ec4525be209c87c66f51
+  data.tar.gz: 1c43a4f8cc550fe3900684a81e93ed0e50276ed59154f166132b1395d0748911
 SHA512:
-  metadata.gz: 7ba048e77bb9b56447962e17c005c28e14f3ef30795cc218610e485be2ab7ef2da3df9faa0a189704391bae6d55bb75245ba925899093b4d56a58dfdf394cfad
-  data.tar.gz: 99eac1be0abd8986a67e3fe0ea09700a74304a053d3b33cff10c7fe7c30850942232655e48c42d2064de366829a01a835f8fc101e1052d1ec0cd961c82425464
+  metadata.gz: 9746b40dee3c630e69510789eed1d3f937f88441b7a484c0a139d90b7eacfdff63394875bc8122e9efea0583c6955fbc3da77852bb4816a1615952b3658de099
+  data.tar.gz: 9e8d8f8903b495bb1dbbacf010cea817f11440a0475b2eb6b98dc7b6e0576ea1dd6d1583cff63f27a9f607f384d108e1a6fa8dc969d009ba43d57b3e544cccb9

data/lib/intranet/pictures/json_db_provider.rb

@@ -5,7 +5,7 @@ require 'mimemagic'
 
 module Intranet
   module Pictures
-    # Provides pictures data and pictures groups listings from a database file in JSON format.
+    # Provides pictures data and pictures listings from a database file in JSON format.
     #
     # === Structure of the JSON database
     # See the example below.
@@ -14,37 +14,34 @@ module Intranet
     #
     # Pictures are described individually as a hash in the +pictures+ array. The mandatory keys in
     # this hash are:
-    # * +id+ : unique identifier of the picture
     # * +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
     #
-    # Pictures are meant to be grouped in various group types (event, city, region/country, ...).
-    # Each group type is defined as an entry in the +groups+ hash and consists of a set of groups,
-    # each of them described by a hash with the following keys:
+    # 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.
+    # 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
-    # * +title+ : human-readable group name, mandatory
     # * +brief+ : optional short text associated to the group name
     # * +uri+ : optional group thumbnail, relative to the JSON file
     #
-    # Each image is associated to at most one group in each group type by by a a "foreign key"
-    # constraint of the type *picture*.+group_type+ = *group*.+id+.
     # @example Structure of the JSON database (not all mandatory are present for readability)
     #   {
     #     "title": "gallery title",
     #     "groups": {
     #       "event": [
-    #         { "id": "party", "title": "...", "brief": "...", "uri": "party.jpg", ... },
+    #         { "id": "Party", "brief": "...", "uri": "party.jpg", ... },
     #         { ... }
     #       ],
     #       "city": [
-    #         { "id": "houston", "title": "...", "uri": "houston.png", ... },
+    #         { "id": "Houston", "uri": "houston.png", ... },
     #         { ... }
     #       ]
     #     },
     #     "pictures": [
-    #       { "uri": "dir/pic0.jpg", "datetime": "...", "event": "party", "city": "houston", ... },
+    #       { "uri": "dir/pic0.jpg", "datetime": "...", "event": "Party", "city": "Houston", ... },
     #       { ... }
     #     ]
     #   }
@@ -66,47 +63,16 @@ module Intranet
         @json.fetch('title').to_s
       end
 
-      # Returns the list of available group types.
-      # @return [Array<String>] The available group types.
-      # @raise KeyError If no group type is defined in JSON file.
-      def group_types
-        load_json
-        @json.fetch('groups').keys
-      end
-
-      # Returns the list of the groups satisfying the following conditions:
-      # * the group is of the given +type+, and
-      # * at least one picture belonging to that group matches the +selector+.
-      # Results are returned ordered by *group*.+sort_by+ in ascending order if +asc+, and in
-      # descending order otherwise.
-      # @param type [String] The group type.
-      # @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 group field to sort the results by, or nil if results should be
-      #                         returned without particular sorting.
-      # @param asc [Boolean] True to sort returned groups in ascending order, False to sort in
-      #                      descending order.
-      # @return [Array<Hash{'id'=>String, 'title'=>String, ...}>] The selected groups.
-      # @raise KeyError If JSON file is malformed, if +type+ does not match an existing group type,
-      #                 or if +sort_by+ is not an existing group field.
-      def list_groups(type, selector = {}, sort_by = nil, asc = true)
-        load_json
-        groups = select_groups(type, selector).map { |g| g.except('uri') }
-        groups.sort_by! { |g| g.fetch(sort_by) } unless sort_by.nil?
-        groups.reverse! unless asc
-        groups
-      end
-
       # Returns the list of the pictures matching +selector+.
-      # Results are returned ordered by *picture*.+sort_by+ in ascending order if +asc+, and in
-      # descending order otherwise.
+      # Results are returned ordered by +sort_by+ in ascending order if +asc+, and in descending
+      # order otherwise.
       # @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
       #                         be returned without particular sorting.
-      # @param asc [Boolean] True to sort returned pictures in ascending order, False to sort in
-      #                      descending order.
-      # @return [Array<Hash{'id'=>String, 'title'=>String, 'datetime'=>String, 'height'=>Integer,
+      # @param asc [Boolean] True to sort returned pictures in ascending order, False to sort them
+      #                      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.
       def list_pictures(selector = {}, sort_by = nil, asc = true)
@@ -122,35 +88,46 @@ module Intranet
       #                                       picture.
       # @return [String, Blob] The MIME type of the picture, and the picture file content.
       # @raise KeyError If JSON file is malformed, if selector does not match exactly one picture,
-      #                 or if the *picture*.+uri+ does not refer to an existing image file.
+      #                 or if the picture +uri+ does not refer to an existing image file.
       def picture(selector = {})
         load_json
         pic = select_pictures(selector)
         raise KeyError unless pic.size == 1
 
         path = File.join(@json_dir, pic.first.fetch('uri'))
-        open_image_file(path)
+        read_image_file(path)
       end
 
-      # Returns the thumbnail picture of the group satisfying the following conditions:
-      # * the group is of the given +type+, and
-      # * at least one picture belonging to that group matches the +selector+.
-      # @param type [String] The group type.
-      # @param selector [Hash<String,String>] The pictures selector, interpreted as a logical AND
-      #                                       combination of all key/value pairs provided. The
-      #                                       selector should return exactly one group.
+      # Returns the thumbnail picture of the group whose type is +key+ and named +value+.
+      # @param key [String] The group type.
+      # @param value [String] The group name.
       # @return [String, Blob] The MIME type of the picture, and the picture file content. Nil may
       #                        be returned if no thumbnail is available for that group.
-      # @raise KeyError If JSON file is malformed, if selector does not match exactly one group,
-      #                 or if the *group*.+uri+ does not refer to an existing image file.
-      def group_thumbnail(type, selector = {})
+      # @raise KeyError If JSON file is malformed, if key/value do not designate exactly one group,
+      #                 or if the group +uri+ does not refer to an existing image file.
+      def group_thumbnail(key, value)
         load_json
-        group = select_groups(type, selector)
+        group = select_group(key, value)
         raise KeyError unless group.size == 1
         return nil if group.first['uri'].nil?
 
         path = File.join(@json_dir, group.first.fetch('uri'))
-        open_image_file(path)
+        read_image_file(path)
+      end
+
+      # Returns the brief text of the group whose type is +key+ and named +value+.
+      # @param key [String] The group type.
+      # @param value [String] The group name.
+      # @return [String] The brief text of the group, or an empty string if no brief is available.
+      # @raise KeyError If JSON file is malformed or if key/value do not designate exactly one
+      #                 group.
+      def group_brief(key, value)
+        load_json
+        group = select_group(key, value)
+        raise KeyError unless group.size == 1
+        return '' if group.first['brief'].nil?
+
+        group.first.fetch('brief')
       end
 
       private
@@ -164,7 +141,7 @@ module Intranet
         @json_time = mtime
       end
 
-      def open_image_file(path)
+      def read_image_file(path)
         mime_type = MimeMagic.by_path(path).type
         raise KeyError unless mime_type.start_with?('image/')
 
@@ -179,19 +156,12 @@ module Intranet
         false
       end
 
-      def select_groups(type, selector)
-        return @json.fetch('groups').fetch(type) if selector.empty? # optimization
-
-        groups_id = select_pictures_having(type, selector).map { |p| p.fetch(type) }.uniq.compact
-        @json.fetch('groups').fetch(type).select { |g| groups_id.include?(g.fetch('id')) }
-      end
-
       def select_pictures(selector)
         @json.fetch('pictures').select { |p| picture_match?(p, selector) }
       end
 
-      def select_pictures_having(group_type, selector)
-        @json.fetch('pictures').select { |p| p.key?(group_type) && picture_match?(p, selector) }
+      def select_group(type, id)
+        @json.fetch('groups').fetch(type).select { |g| g.fetch('id') == id }
       end
     end
   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
+    class Responder < AbstractResponder # rubocop:disable Metrics/ClassLength
       include Core::HamlWrapper # 'inherits' from methods of HamlWrapper
 
       # Returns the name of the module.
@@ -18,30 +18,37 @@ module Intranet
         NAME
       end
 
-      # The version of the module, according to semantic versionning.
+      # Returns the version of the module, according to semantic versionning.
       # @return [String] The version of the module.
       def self.module_version
         VERSION
       end
 
-      # The homepage of the module.
+      # Returns the homepage URL of the module.
       # @return [String] The homepage URL of the module.
       def self.module_homepage
         HOMEPAGE_URL
       end
 
       # Initializes a new Pictures responder instance.
-      # @param provider [#title,#group_types,#list_groups,#group_thumbnail,#list_pictures,#picture]
+      # @param provider [#title,#list_pictures,#group_thumbnail,#group_brief,#picture]
       #  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_type:String, sort_by:String, asc:Boolean, limit:Integer}>]
-      #  The description of the recent pictures album to be displayed on the module home page (all
-      #  keys except +group_type+ may be omitted).
-      # @param home_groups [Array<Hash{group_type:String, sort_by:String, asc:Boolean,
-      #  browse:String, browse_sort_by:String, browse_asc:Boolean}>]
-      #  The description of the groups to be displayed on the module home page. All groups of the
-      #  +group_type+ will be displayed and link to a page showing all groups of the +browse+ type.
+      # @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 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)
@@ -65,34 +72,42 @@ module Intranet
       end
 
       # Generates the HTML content associated to the given +path+ and +query+.
-      # === REST API Description:
-      # * Read-only access to pictures listings under */api/pictures* using +GET+ method, response
-      #   is in JSON format with the following structure:
+      # @param path [String] The requested URI, relative to that module root URI.
+      # @param query [Hash<String,String>] The URI variable/value pairs, if any.
+      # @return [Integer, String, String] The HTTP return code, the MIME type and the answer body.
+      #
+      # Relevant queries are as follows:
+      #
+      # * If +path+ is +/browse.html+, key/value pairs may be used to restrict the displayed images
+      #   to those satisfying all the pairs. Moreover, +sort_by+ (followed by a key), +sort_order+
+      #   (followed by either +asc+ or +desc+) and +group_by+ may be used to alter the way images
+      #   are displayed.
+      # * If +path+ is +/api/group_thumbnail+ or +/api/group_brief+, query must contain only a
+      #   single key/value pair designating the pictures group.
+      # * If +path+ is +/api/pictures+, key/value pairs may be used to restrict the displayed images
+      #   to those satisfying all the pairs. Moreover, +sort_by+ (followed by a key), and
+      #   +sort_order+ (followed by either +asc+ or +desc+) may be used to alter the order in which
+      #   images are returned.
+      # * If +path+ is +api/picture+, key/value pairs must be used to select a single image from the
+      #   gallery.
+      #
+      # When +path+ is +/api/pictures+, the selected pictures are returned in JSON format (REST API)
+      # with the following structure:
       #     [
       #       { "id": "...", "height": 480, "width": 640, "title": "...", "datetime": "...", ... },
       #       { ... }
       #     ]
-      # * Read-only access to groups listings under */api/groups/*+group_type+ using +GET+ method,
-      #   response is in JSON format with the following structure:
-      #     [
-      #       { "id": "...", "title": "...", ... },
-      #       { ... }
-      #     ]
-      # @param path [String] The requested URI, relative to that module root URI.
-      # @param query [Hash<String,String>] The URI variable/value pairs, if any.
-      # @return [Integer, String, String] The HTTP return code, the MIME type and the answer body.
       def generate_page(path, query)
         case path
-        when %r{^/index\.html$} then serve_home
-        when %r{^/browse_\w+\.html$}
-          serve_groups(path.gsub(%r{^/browse_(\w+)\.html$}, '\\1'), query)
+        when %r{^/index\.html$}  then serve_home
+        when %r{^/browse\.html$} then serve_browse(query)
         when %r{^/api/} then serve_api(path.gsub(%r{^/api}, ''), query)
         when %r{^/i18n\.js$} then serve_i18n_js
         else super(path, query)
         end
       end
 
-      # The title of the Pictures module, as displayed on the web page.
+      # Returns the title of the Pictures module, as displayed on the web page.
       # @return [String] The title of the Pictures module web page.
       def title
         @provider.title
@@ -101,23 +116,30 @@ module Intranet
       private
 
       # Extract a selector from the given +query+.
-      # @return [Hash<String,String>] The picture or group selector.
+      # @return [Hash<String,String>] The picture selector.
       def selector(query)
-        query.except('sort_by', 'sort_order')
+        query.except('group_by', 'sort_by', 'sort_order')
       end
 
-      # Extract the sort criteria from the given +query+.
-      # @return [String] The key to use to sort pictures or groups, or nil if no sort order is
-      #                  specified in +query+.
+      # Extract the grouping criteria from the given +query+, ie. the key that will be used to group
+      # the selected pictures.
+      # @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')
+      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
       end
 
-      # Extract the sort order from the given +query+.
-      # @return [Boolean] False if the pictures or groups should be sorted in descending order,
-      #                   True otherwise.
+      # 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'
@@ -143,52 +165,55 @@ module Intranet
       ###            Servicing of the HTML "display-able" content            ###
       ##########################################################################
 
-      def active_filters(query)
-        selector(query).map do |k, v|
-          { k => @provider.list_groups(k, { k => v }).first.fetch('title') }
-        rescue KeyError
-          { k => v }
-        end.reduce({}, :merge)
+      def collect_groups(selector, group_by, sort_by, sort_order)
+        # Select all pictures, sort them & 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
+      end
+
+      def hash_to_query(hash)
+        hash.map { |k, v| [k, v].join('=') }.join('&')
       end
 
       def recent_groups
         @recents.map do |recent|
-          groups = @provider.list_groups(recent[:group_type], {}, recent[:sort_by], recent[:asc])
+          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])
-            see_more_url = "browse_#{recent[:group_type]}.html?sort_by=#{recent[:sort_by]}"
-            see_more_url += '&sort_order=desc' unless recent[:asc]
+          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_type: recent[:group_type], groups: groups, see_more_url: see_more_url }
+          { group_key: group_by(recent), groups: groups, see_more_url: see_more_url }
         end
       end
 
       def all_groups
-        @home_groups.map do |section|
-          groups = @provider.list_groups(section[:group_type], {}, section[:sort_by], section[:asc])
-          url_prefix = "browse_#{section[:browse]}.html?sort_by=#{section[:browse_sort_by]}"
-          url_prefix += '&sort_order=desc' unless section[:browse_asc]
-          { group_type: section[:group_type], groups: groups, url_prefix: url_prefix }
+        @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
       end
 
-      def make_nav(group_type = nil, query = {})
+      def make_nav(query = {})
         h = { I18n.t('nav.home') => '/index.html', I18n.t('pictures.menu') => nil, title => nil }
-        unless group_type.nil?
+        unless query['group_by'].nil?
           h[title] = 'index.html'
-          extra_key = I18n.t("pictures.nav.#{group_type}")
-          filters = active_filters(query).values
+          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
       end
 
-      def gallery_url(group_type, group_id, filters = {})
-        filters.store(group_type, group_id)
+      def gallery_url(key, value, filters = {})
+        filters.store(key, value)
         filters.store('sort_by', 'datetime')
-        filters.map { |k, v| [k, v].join('=') }.join('&')
+        hash_to_query(filters)
       end
 
       def serve_home
@@ -199,9 +224,9 @@ module Intranet
         [404, '', '']
       end
 
-      def serve_groups(type, query)
-        groups = @provider.list_groups(type, selector(query), sort_by(query), sort_order(query))
-        content = to_markup('pictures_browse', nav: make_nav(type, query), group_type: type,
+      def serve_browse(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)
         [206, 'text/html',
          { content: content, title: title, stylesheets: stylesheets, scripts: scripts }]
@@ -222,28 +247,32 @@ module Intranet
       ###        Servicing of the REST API (raw JSON data & pictures)        ###
       ##########################################################################
 
-      def api_list_groups(path, query)
-        group_type = path.split('/')[2].to_s
-        @provider.list_groups(group_type, selector(query), sort_by(query), sort_order(query))
-      end
+      def api_group_thumbnail(query)
+        raise KeyError unless query.size == 1
 
-      def api_group_thumbnail(path, query)
-        group_type = path.split('/')[2].to_s
-        pic = @provider.group_thumbnail(group_type, selector(query))
+        key, value = query.first
+        pic = @provider.group_thumbnail(key, value)
         if pic.nil?
           pic = ['image/svg+xml', File.read(File.join(resources_dir, 'www', 'group_thumbnail.svg'))]
         end
         pic
       end
 
+      def api_group_brief(query)
+        raise KeyError unless query.size == 1
+
+        key, value = query.first
+        @provider.group_brief(key, value)
+      end
+
       def api_list_pictures(query)
         @provider.list_pictures(selector(query), sort_by(query), sort_order(query))
       end
 
       def serve_api(path, query)
         case path
-        when %r{^/groups/} then [200, 'application/json', api_list_groups(path, query).to_json]
-        when %r{^/group/} then [200, api_group_thumbnail(path, query)].flatten
+        when %r{^/group_thumbnail$} then [200, api_group_thumbnail(query)].flatten
+        when %r{^/group_brief$} then [200, 'application/json', api_group_brief(query).to_json]
         when %r{^/pictures$} then [200, 'application/json', api_list_pictures(query).to_json]
         when %r{^/picture$} then [200, @provider.picture(query)].flatten
         else [404, '', '']

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 = '1.1.0'
+    VERSION = '2.0.0'
 
     # The URL of the gem homepage.
     HOMEPAGE_URL = 'https://rubygems.org/gems/intranet-pictures'

data/lib/intranet/resources/haml/pictures_browse.haml

@@ -1,13 +1,14 @@
 %section
   = to_markup 'title_and_breadcrumb', {title: title, nav: nav}
   %ul.groups
-    - groups.each do |group|
-      %li{ title: group['title'] }
-        %a{ onclick: 'openImagesGallery("' + gallery_url(group_type, group['id'], filters) + '");' }
+    - groups.each do |group_name|
+      %li{ title: group_name }
+        %a{ onclick: 'openImagesGallery("' + gallery_url(group_key, group_name, filters) + '");' }
           %figure
-            %div{ style: 'background-image: url("api/group/' + group_type + '?' + group_type + '=' + group['id'] + '")' }
+            %div{ style: 'background-image: url("api/group_thumbnail?' + group_key + '=' + group_name + '")' }
             %figcaption
-              = group['title']
-              - if group['brief']
+              = group_name
+              - group_brief = api_group_brief({ group_key => group_name })
+              - unless group_brief.empty?
                 %br
-                %em= group['brief']
+                %em= group_brief

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

@@ -2,32 +2,34 @@
   = to_markup 'title_and_breadcrumb', {title: title, nav: nav}
 
   - recent_groups.each do |recent|
-    %h3= I18n.t('pictures.recents.' + recent[:group_type])
+    %h3= I18n.t('pictures.recents.' + recent[:group_key])
     %ul.groups
-      - recent[:groups].each do |group|
-        %li{ title: group['title'] }
-          %a{ onclick: 'openImagesGallery("' + gallery_url(recent[:group_type], group['id']) + '");' }
+      - recent[:groups].each do |group_name|
+        %li{ title: group_name }
+          %a{ onclick: 'openImagesGallery("' + gallery_url(recent[:group_key], group_name) + '");' }
             %figure
-              %div{ style: 'background-image: url("api/group/' + recent[:group_type] + '?' + recent[:group_type] + '=' + group['id'] + '")' }
+              %div{ style: 'background-image: url("api/group_thumbnail?' + recent[:group_key] + '=' + group_name + '")' }
               %figcaption
-                = group['title']
-                - if group['brief']
+                = group_name
+                - group_brief = api_group_brief({ recent[:group_key] => group_name })
+                - unless group_brief.empty?
                   %br
-                  %em= group['brief']
+                  %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_type])
+    %h3= I18n.t('pictures.browse_by.' + section[:group_key])
     %ul.groups.wide
-      - section[:groups].each do |group|
-        %li{ title: group['title'] }
-          %a{ href: section[:url_prefix] + '&' + section[:group_type] + '=' + group['id'] }
+      - 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/' + section[:group_type] + '?' + section[:group_type] + '=' + group['id'] + '")' }
+              %div{ style: 'background-image: url("api/group_thumbnail?' + section[:group_key] + '=' + group_name + '")' }
               %figcaption
-                = group['title']
-                - if group['brief']
+                = group_name
+                - group_brief = api_group_brief({ section[:group_key] => group_name })
+                - unless group_brief.empty?
                   %br
-                  %em= group['brief']
+                  %em= group_brief