intranet-pictures 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 564df3bd8811c29b26f35a7a9a883e5af23d4092e63d616240d76cd73c77c2bd
-  data.tar.gz: af344718de64f2952b30ed0249cf52bddfafc30eaf45498e02378bbcb1198623
+  metadata.gz: e66eb28eaa3e467128bdc27efb08312858b12287802c3a87edce02b1140e07a8
+  data.tar.gz: 743fe1ff0f2d48803a49915cdf7228591f05659450edcd4261f0a6bbc8338c35
 SHA512:
-  metadata.gz: 6a321298b67ea2822c0bc75b2bdaa5473b0cf38b9fc2dac6badb90f37f9dd1535425101f129b5f8d61c457d3611e28ee2d33e397ce792d8cf380be66c46d831d
-  data.tar.gz: '098fe4089fd07dd9843dc1ebd023c841be1668113c394cddc7dc0407457d1f19bcc4060342969facebeb9eea7c29c9abb484caf3d0720041971251f68bcbfe6f'
+  metadata.gz: 97a43240f2124083e2ebabc109e8b5f7fa10d2d5c91c83f5f3a0f65c8a0671a4ac58cb30de709b57e1f4b527ffe91f883b3f30a25bf82bd3700fefe377f17cae
+  data.tar.gz: da6b3cc170771ff37c89a0b2e729463482d513654373e18137a2d8726f28898d4311aafbab6d0a429eae16204552ebb0c7d0021b4c9b75435bbac0ac7a8484a1

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/version.rb

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

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
@@ -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.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Ebling Mis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-04 00:00:00.000000000 Z
+date: 2021-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: intranet-core
@@ -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.