intranet-pictures 1.0.1 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42beab994981aa7bc689ea5ad6f5dd7adad424b46c9f13b33ecc55ad89199b5d
-  data.tar.gz: f4a3214ca9a29331c28f2080c2c8265ed8ba8ba31eb2565b5206704b8bb53552
+  metadata.gz: 628a14d0155be72d18ea879e45225bfa736d3e8ff85f737245595c7faba201bb
+  data.tar.gz: d9156887f2265f2dcfc622aab9ff63a87ff4b57eecd3b894b6bab8b21479250e
 SHA512:
-  metadata.gz: fa46c519503498af50e612ce4bc14040134a939732753e0eaa98144b37d88485fcbb40f176b42e0c154a82275cca18c9cb2fcb8ce3ad9a0366c855495d5b5d3c
-  data.tar.gz: 98effc28029acce7b7932299e9371d40092977309774bddaf77b101923ae5c9df176eb9ed4fcca8cf1a0ccdc6036fb3e0c5604fc45bfa580ee7095685bf0487b
+  metadata.gz: 98cba0984d30e6ad3c6086bee626376e8775624628ecc5ebac979b96e2ddb6026c6ef88a96e9f0471b16608d2b2eb6070fec3833e7f14646c2a1f78c086b69e2
+  data.tar.gz: 8af2829b1308cbdbf28bacfbb81cd89c0ad8d5216c9084eccd8ca3b9b75b489d34925a58a07f36a4055c1f210b47a6c04b87732a57e8b7b7078956a527fa75ef

data/lib/intranet/pictures/json_db_provider.rb

@@ -182,15 +182,17 @@ module Intranet
       def select_groups(type, selector)
         return @json.fetch('groups').fetch(type) if selector.empty? # optimization
 
-        groups_id = @json.fetch('pictures').map do |p|
-          p.fetch(type) if picture_match?(p, selector)
-        end.uniq.compact
+        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) }
+      end
     end
   end
 end

data/lib/intranet/pictures/responder.rb

@@ -222,7 +222,7 @@ module Intranet
         group_type = path.split('/')[2].to_s
         pic = @provider.group_thumbnail(group_type, selector(query))
         if pic.nil?
-          pic = ['image/jpeg', File.read(File.join(resources_dir, 'www', 'group_thumbnail.jpg'))]
+          pic = ['image/svg+xml', File.read(File.join(resources_dir, 'www', 'group_thumbnail.svg'))]
         end
         pic
       end

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

data/lib/intranet/resources/www/group_thumbnail.svg

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="860" height="380">
+  <rect width="860" height="380" style="fill:rgb(226,226,226)" />
+  <rect x="308" y="96" width="211" height="154" rx="2" ry="2" style="fill:rgb(226,226,226);stroke-width:13.5;stroke:rgb(245,245,245)" />
+  <rect x="323" y="111" width="211" height="154" style="fill:rgb(226,226,226)" />
+  <rect x="344" y="132" width="211" height="154" rx="2" ry="2" style="fill:rgb(226,226,226);stroke-width:13.5;stroke:rgb(245,245,245)" />
+  <circle cx="401" cy="185" r="18" fill="rgb(245,245,245)" />
+  <path d="M 368 257 Q 374 223 435 231 L 469 178 L 496 219 L 511 199 L 531 257 Z" fill="rgb(245,245,245)" />
+</svg>

data/lib/intranet/resources/www/photoswipe/default-skin/default-skin.css

@@ -273,11 +273,11 @@ a.pswp__share--download:hover {
 
 .pswp__caption__center {
   text-align: center; /* patch intranet */
-  max-width: 600px; /* patch intranet */
+  /*max-width: 420px;*/ /* patch intranet */
   margin: 0 auto;
   font-size: 100%; /* patch intranet */
-  padding: 10px;
-  line-height: 20px;
+  padding: 0.625em; /* patch intranet */
+  /*line-height: 20px;*/ /* patch intranet */
   font-weight: bold; /* patch intranet */
   color: #CCC; }
 

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

@@ -8,9 +8,6 @@
 p.see_more {
   text-align: right;
 }
-p.see_more a {
-  color: #748ea3;
-}
 
 /******************************* Picture groups *******************************/
 
@@ -18,7 +15,7 @@ ul.groups {
   display: grid;
   grid-template-columns: repeat(4, 1fr);
   grid-auto-flow: dense;
-  gap: 30px;
+  gap: 1.875em;
   padding: 0px;
   margin: 1em 15px 0px; /* top sides bottom */
 }
@@ -28,7 +25,6 @@ ul.groups.wide {
 ul.groups li {
   display: block;
   width: 100%;
-  max-width: 270px;
   margin: 0px;
   background: #ffffff;
   text-align: center;
@@ -38,8 +34,8 @@ ul.groups li {
   border-radius: 3px;
   justify-self: center;
 }
-ul.groups.wide li {
-  max-width: 570px;
+ul.groups a {
+  color: black;
 }
 
 /* Small screens only */
@@ -57,11 +53,12 @@ ul.groups li figure {
 }
 ul.groups li figure div {
   height: 0px;
-  padding-bottom: 74.075%; /* 200:270 ratio */
+  padding-bottom: 75%; /* 300:400 ratio */
   background: no-repeat center;
+  background-size: cover;
 }
 ul.groups.wide li figure div {
-  padding-bottom: 43.860%; /* 250:570 ratio */
+  padding-bottom: 44.186%; /* 380:860 ratio */
 }
 ul.groups li figcaption {
   display: block;
@@ -73,7 +70,7 @@ ul.groups li figcaption {
 ul.groups li em {
   display: inline-block;
   margin-top: 0.5em;
-  font-size: 90%;
+  font-size: 0.9em;
 }
 
 ul.groups li:hover, ul.groups li:focus {

data/spec/intranet/pictures/json_db_provider_spec.rb

@@ -30,7 +30,7 @@ RSpec.describe Intranet::Pictures::JsonDbProvider do
     end
 
     it 'should return the available group types' do
-      expect(@provider.group_types).to eql(%w[group1 group2])
+      expect(@provider.group_types).to eql(%w[group1 group2 group3])
     end
   end
 
@@ -54,6 +54,12 @@ RSpec.describe Intranet::Pictures::JsonDbProvider do
             { 'id' => 'group2_title3', 'title' => 'Group 2, Title 3', 'value' => 'aabb' }
           ]
         )
+        expect(@provider.list_groups('group3')).to eql(
+          [
+            { 'id' => 'group3_title1', 'title' => 'Group 3, Title 1' },
+            { 'id' => 'group3_title2', 'title' => 'Group 3, Title 2' }
+          ]
+        )
       end
 
       it 'should return only the groups matching the given +selector+' do
@@ -87,7 +93,14 @@ RSpec.describe Intranet::Pictures::JsonDbProvider do
           ]
         )
 
-        selector = { 'group3' => 'foo_bar_boz' } # referencing undefined fields
+        selector = { 'value' => true }
+        expect(@provider.list_groups('group3', selector)).to eql(
+          [
+            { 'id' => 'group3_title2', 'title' => 'Group 3, Title 2' }
+          ]
+        )
+
+        selector = { 'group4' => 'foo_bar_boz' } # referencing undefined fields
         expect(@provider.list_groups('group2', selector)).to eql([])
       end
     end
@@ -132,10 +145,10 @@ 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', 'group1' => 'group1_title1', 'group2' => 'group2_title2' },
+          { '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' },
+          { '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' }
         ]
       )
@@ -147,7 +160,7 @@ RSpec.describe Intranet::Pictures::JsonDbProvider do
         [
           { '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' }
+          { 'datetime' => '2020:06:20 06:09:54', 'value' => true, 'group1' => 'group1_title2', 'group2' => 'group2_title3', 'group3' => 'group3_title2' }
         ]
       )
     end
@@ -159,14 +172,14 @@ RSpec.describe Intranet::Pictures::JsonDbProvider do
           [
             { 'datetime' => '2020:06:20 18:14:09', 'value' => true, 'group1' => 'group1_title2', 'group2' => 'group2_title1' },
             { 'datetime' => '2020:06:19 07:51:05', 'value' => false, 'group1' => 'group1_title2', 'group2' => 'group2_title2' },
-            { 'datetime' => '2020:06:20 06:09:54', 'value' => true, 'group1' => 'group1_title2', 'group2' => 'group2_title3' }
+            { 'datetime' => '2020:06:20 06:09:54', 'value' => true, 'group1' => 'group1_title2', 'group2' => 'group2_title3', 'group3' => 'group3_title2' }
           ]
         )
 
         expect(@provider.list_pictures(selector, 'datetime', false)).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' },
+            { 'datetime' => '2020:06:20 06:09:54', 'value' => true, 'group1' => 'group1_title2', 'group2' => 'group2_title3', 'group3' => 'group3_title2' },
             { 'datetime' => '2020:06:19 07:51:05', 'value' => false, 'group1' => 'group1_title2', 'group2' => 'group2_title2' }
           ]
         )

data/spec/intranet/pictures/responder_spec.rb

@@ -71,25 +71,25 @@ RSpec.describe Intranet::Pictures::Responder do
   describe '#generate_page' do
     def photoswipe_markup # rubocop:disable Metrics/MethodLength
       "<div aria-hidden class='pswp' role='dialog' tabindex='-1'>\n" \
-      "<div class='pswp__bg'></div>\n" \
-      "<div class='pswp__scroll-wrap'>\n" \
-      "<div class='pswp__container'>\n" \
-      "<div class='pswp__item'></div>\n" \
-      "<div class='pswp__item'></div>\n" \
-      "<div class='pswp__item'></div>\n" \
-      "</div>\n" \
-      "<div class='pswp__ui pswp__ui--hidden'>\n" \
-      "<div class='pswp__top-bar'>\n" \
-      "<div class='pswp__counter'></div>\n" \
-      "<button class='pswp__button pswp__button--close' title='#{I18n.t('pictures.viewer.close')} (Esc)'></button>\n" \
-      "<button class='pswp__button pswp__button--fs' title='#{I18n.t('pictures.viewer.fullscreen')}'></button>\n" \
-      "<button class='pswp__button pswp__button--zoom' title='#{I18n.t('pictures.viewer.zoom')}'></button>\n" \
-      "<div class='pswp__preloader'>\n<div class='pswp__preloader__icn'>\n<div class='pswp__preloader__cut'>\n<div class='pswp__preloader__donut'></div>\n</div>\n</div>\n</div>\n</div>\n" \
-      "<div class='pswp__share-modal pswp__share-modal--hidden pswp__single-tap'>\n<div class='pswp__share-tooltip'></div>\n</div>\n" \
-      "<button class='pswp__button pswp__button--arrow--left' title='#{I18n.t('pictures.viewer.previous')}'></button>\n" \
-      "<button class='pswp__button pswp__button--arrow--right' title='#{I18n.t('pictures.viewer.next')}'></button>\n" \
-      "<div class='pswp__caption'>\n<div class='pswp__caption__center'></div>\n</div>\n" \
-      "</div>\n</div>\n</div>\n\n"
+        "<div class='pswp__bg'></div>\n" \
+        "<div class='pswp__scroll-wrap'>\n" \
+        "<div class='pswp__container'>\n" \
+        "<div class='pswp__item'></div>\n" \
+        "<div class='pswp__item'></div>\n" \
+        "<div class='pswp__item'></div>\n" \
+        "</div>\n" \
+        "<div class='pswp__ui pswp__ui--hidden'>\n" \
+        "<div class='pswp__top-bar'>\n" \
+        "<div class='pswp__counter'></div>\n" \
+        "<button class='pswp__button pswp__button--close' title='#{I18n.t('pictures.viewer.close')} (Esc)'></button>\n" \
+        "<button class='pswp__button pswp__button--fs' title='#{I18n.t('pictures.viewer.fullscreen')}'></button>\n" \
+        "<button class='pswp__button pswp__button--zoom' title='#{I18n.t('pictures.viewer.zoom')}'></button>\n" \
+        "<div class='pswp__preloader'>\n<div class='pswp__preloader__icn'>\n<div class='pswp__preloader__cut'>\n<div class='pswp__preloader__donut'></div>\n</div>\n</div>\n</div>\n</div>\n" \
+        "<div class='pswp__share-modal pswp__share-modal--hidden pswp__single-tap'>\n<div class='pswp__share-tooltip'></div>\n</div>\n" \
+        "<button class='pswp__button pswp__button--arrow--left' title='#{I18n.t('pictures.viewer.previous')}'></button>\n" \
+        "<button class='pswp__button pswp__button--arrow--right' title='#{I18n.t('pictures.viewer.next')}'></button>\n" \
+        "<div class='pswp__caption'>\n<div class='pswp__caption__center'></div>\n</div>\n" \
+        "</div>\n</div>\n</div>\n\n"
     end
 
     context 'when asked for \'/index.html\'' do
@@ -404,9 +404,9 @@ RSpec.describe Intranet::Pictures::Responder do
         query = { 'group2' => 'group2_title2' }
         code, mime, content = @responder.generate_page('/api/group/group2', query)
         expect(code).to eql(200)
-        expect(mime).to eql('image/jpeg')
+        expect(mime).to eql('image/svg+xml')
         expect(content).to eql(
-          File.read(File.join(__dir__, '../../../lib/intranet/resources/www/group_thumbnail.jpg'))
+          File.read(File.join(__dir__, '../../../lib/intranet/resources/www/group_thumbnail.svg'))
         )
 
         # Existing group with non-existant thumbnail
@@ -426,10 +426,10 @@ 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' },
+            { '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' },
+            { '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' }
           ].to_json
         )
@@ -442,7 +442,7 @@ RSpec.describe Intranet::Pictures::Responder do
         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' }
+            { 'datetime' => '2020:06:20 06:09:54', 'value' => true, 'group1' => 'group1_title2', 'group2' => 'group2_title3', 'group3' => 'group3_title2' }
           ].to_json
         )
 
@@ -453,7 +453,7 @@ RSpec.describe Intranet::Pictures::Responder do
         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' },
+            { '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' }
           ].to_json
         )
@@ -464,7 +464,7 @@ RSpec.describe Intranet::Pictures::Responder do
         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' },
+            { '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' }
           ].to_json
         )

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

@@ -32,6 +32,16 @@
         "title": "Group 2, Title 3",
         "value": "aabb"
       }
+    ],
+    "group3": [
+      {
+        "id": "group3_title1",
+        "title": "Group 3, Title 1"
+      },
+      {
+        "id": "group3_title2",
+        "title": "Group 3, Title 2"
+      }
     ]
   },
   "pictures": [
@@ -39,7 +49,8 @@
       "uri": "white.jpg",
       "datetime": "2019:07:22 09:41:31",
       "group1": "group1_title1",
-      "group2": "group2_title2"
+      "group2": "group2_title2",
+      "group3": "group3_title1"
     },
     {
       "uri": "./alpha.png",
@@ -60,7 +71,8 @@
       "datetime": "2020:06:20 06:09:54",
       "value": true,
       "group1": "group1_title2",
-      "group2": "group2_title3"
+      "group2": "group2_title3",
+      "group3": "group3_title2"
     },
     {
       "datetime": "2019:07:22 09:45:17",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: intranet-pictures
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.6
 platform: ruby
 authors:
 - Ebling Mis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-08 00:00:00.000000000 Z
+date: 2021-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: intranet-core
@@ -19,7 +19,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.4.1
 - !ruby/object:Gem::Dependency
   name: mimemagic
   requirement: !ruby/object:Gem::Requirement
@@ -128,7 +128,7 @@ files:
 - lib/intranet/resources/haml/pictures_photoswipe.haml
 - lib/intranet/resources/locales/en.yml
 - lib/intranet/resources/locales/fr.yml
-- lib/intranet/resources/www/group_thumbnail.jpg
+- lib/intranet/resources/www/group_thumbnail.svg
 - lib/intranet/resources/www/jpictures.js
 - lib/intranet/resources/www/photoswipe/LICENSE
 - lib/intranet/resources/www/photoswipe/default-skin/default-skin.css
@@ -167,8 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.2.5
 signing_key: 
 specification_version: 4
 summary: Pictures gallery module for the intranet.