intranet-core 2.3.2 → 2.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7e47a94a48b6d2b3f4c65189c7fc94327e5f53de9a899bcb28da2258e6070fb
-  data.tar.gz: add7936f6332a55e6c941a921d6640f1cbfdaab2cb898f5379ee00a22a64d518
+  metadata.gz: 1ec24599dbce60c41fef56f0b85a08c58ee76643bae4b3248841e699ebd90d0a
+  data.tar.gz: 93d61e93f4af53fbe8edad6f7a61f15d6161e9cdaf4406cce50f40a09f857a90
 SHA512:
-  metadata.gz: 88b987f64a395931ef5da9cd12988d6b0d798428511cda1e23b10ae36ed8f7e50460fc2ccfb1faf89aaa8f6c2e36f97ccb730d0be7f6b401df6ceb61e93b6981
-  data.tar.gz: eaf83db0c2c7a1c1692659a3a2442741972fbf75248da2bbd6ef012d37be3dc1434d1155099fc9767f318373802490eaf8c11dd4ef881b21440586e52d2b1a2a
+  metadata.gz: 7bfb357b1734def2604f7a5cfc0e5829e0418b213cf52e7e5eaf1a3e9cf43ad1640cb5144748b924ce435e4ce389224def7a8bfa332682c3891428803e7708b5
+  data.tar.gz: a233871543d39b35eeda9c88464a0798b4b77936fac200b1f268ffaa59d40d6e4facf4a926c585d2baac472f72c277347497575c3e3be7b6429f39ac865c7889

data/lib/intranet/abstract_responder.rb

@@ -37,30 +37,44 @@ module Intranet
       # nothing to do
     end
 
-    # Generates the HTML content associated to the given +path+ and +query+.
+    # Generates the HTML answer (HTTP return code, MIME type and body) associated to the given
+    # +path+ and +query+.
+    #
+    # The function may return a partial content, in which case the HTTP return code must be 206 and
+    # the answer body is expected to be a +Hash+ with the following keys:
+    # * +:title+ (mandatory): the page title
+    # * +:content+ (mandatory): the partial content
+    # * +:stylesheets+ (optional): an array of the required Cascade Style Sheets (CSS) files, either
+    #   absolute or relative to the module root
+    # * +:scripts+ (optional): an array of hashes, each representing a <script> element to be
+    #   included in the generated page. Keys are the one accepted by the HTML <script> tag. The
+    #   +:src+ key may be either absolute or relative to the module root
     # @param path [String] The requested URI, relative to that module root URI
     # @param query [Hash] The URI variable/value pairs, if any
-    # @return [Array] The HTTP return code, the MIME type and the answer body.
+    # @return [Array<Integer, String, String> or Array<Integer, String, Hash>] The HTTP return code,
+    #         the MIME type and the answer body (partial if return code is 206).
     def generate_page(path, query)
       [404, '', '']
     end
 
     # Provides the list of Cascade Style Sheets (CSS) dependencies for this module, either using
     # absolute or relative (from the module root) paths.
-    # If redefined, this method should probably append dependencies rather than overwriting them.
+    # @deprecated Use {generate_page} partial content feature, setting +:stylesheets+ attribute of
+    #             the returned body.
     # @return [Array] The list of CSS dependencies, as absolute path or relative to the module root
     #                 URL.
     def css_dependencies
-      ['/design/style.css']
+      []
     end
 
     # Provides the list of Javascript files (JS) dependencies for this module, either using
     # absolute or relative (from the module root) paths.
-    # If redefined, this method should probably append dependencies rather than overwriting them.
+    # @deprecated Use {generate_page} partial content feature, setting +:scripts+ attribute of the
+    #             returned body.
     # @return [Array] The list of JS dependencies, as absolute path or relative to the module root
     #                 URL.
     def js_dependencies
-      ['/design/nav.js']
+      []
     end
   end
 end

data/lib/intranet/core/builder.rb

@@ -117,8 +117,9 @@ module Intranet
       # @param responder [Intranet::AbstractResponder] The responder that produced the body
       # @param path [String] The path to the responder
       def add_header_and_footer(body, responder, path)
-        to_markup('skeleton', body: body, css: responder.css_dependencies,
-                              js: responder.js_dependencies, current_path: path)
+        body[:stylesheets] ||= responder.css_dependencies
+        body[:scripts] ||= responder.js_dependencies.map { |url| { src: url, defer: 'defer' } }
+        to_markup('skeleton', body: body, current_path: path)
       end
 
       # Check whether a path is valid. In particular, this function excludes a path containing an

data/lib/intranet/core/version.rb

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

data/lib/intranet/core.rb

@@ -91,10 +91,11 @@ module Intranet
     # See https://github.com/nahi/webrick/blob/master/lib/webrick/accesslog.rb#L69
     ACCESSLOG_FMT = "%h '%r' -> %s (%b bytes in %Ts)"
 
-    def load_http_server(preferred_port)
+    def load_http_server(preferred_port) # rubocop:disable Metrics/MethodLength
       @port = preferred_port
       begin
-        WEBrick::HTTPServer.new(Port: @port, Logger: @logger, AccessLog: [[@logger, ACCESSLOG_FMT]])
+        WEBrick::HTTPServer.new(Port: @port, Logger: @logger, AccessLog: [[@logger, ACCESSLOG_FMT]],
+                                ServerSoftware: nil)
       rescue Errno::EACCES # not enough permission to use port 80
         @port = 8080
         retry

data/lib/intranet/resources/haml/skeleton.haml

@@ -3,24 +3,23 @@
   %head
     %title= Socket.gethostname.capitalize + ' | ' + body[:title]
     %meta{charset: 'utf-8'}
+    %meta{name: 'viewport', content: 'width=device-width, initial-scale=1.0'}
     %link{rel: 'icon', type: 'image/x-icon', href: '/design/favicon.ico'}
-    - css.each do |url|
-      - if url.start_with?('/')
-        %link{rel: 'stylesheet', type: 'text/css', href: url}
-      - else
-        %link{rel: 'stylesheet', type: 'text/css', href: current_path + '/' + url}
-    - js.each do |url|
-      - if url.start_with?('/')
-        %script{src: url, defer: 'defer'}
-      - else
-        %script{src: current_path + '/' + url, defer: 'defer'}
+    %link{rel: 'stylesheet', type: 'text/css', href: '/design/style.css'}
+    - body[:stylesheets].each do |url|
+      - url = current_path + '/' + url unless url.start_with?('/')
+      %link{rel: 'stylesheet', type: 'text/css', href: url}
+    %script{type: 'module', src: '/design/nav.js'}
+    - body[:scripts].each do |script|
+      - script[:src] = current_path + '/' + script[:src] unless script[:src].start_with?('/')
+      %script{script}
   %body
     %header
-      %a{id: 'openmenu', onclick: 'openNavMenu();'}= '☰'
+      %a{id: 'openmenu'}= '☰'
       %h1
         %a{href: '/index.html', title: I18n.t('nav.back.home')}= Socket.gethostname.capitalize
       %nav
-        %a{id: 'closemenu', onclick: 'closeNavMenu();'}= '×'
+        %a{id: 'closemenu'}= '×'
         %ul
           - responders.children_nodes.each do |path, node|
             - if node.children?
@@ -48,7 +47,7 @@
         = ' ' + I18n.t('nav.generated.on_date') + ' ' + Time.now.strftime(I18n.t('date_format'))
         = ' ' + I18n.t('date_time_separator') + Time.now.strftime(I18n.t('time_format'))
         %br
-        %a{onclick: 'openModal();'}= I18n.t('nav.about')
+        %a{id: 'openmodal'}= I18n.t('nav.about')
       %aside#modal
         %div#modal-content
           %h2= 'Intranet'

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

@@ -4,23 +4,13 @@
  * and for the modal box.
  */
 
+const openMenu = document.getElementById('openmenu');
+const closeMenu = document.getElementById('closemenu');
+const navMenu = document.querySelectorAll('header nav')[0];
+openMenu.addEventListener('click', function() { navMenu.style.width = 'auto'; });
+closeMenu.addEventListener('click', function() { navMenu.style.width = ''; });
 
-function openNavMenu() {
-  document.querySelectorAll('header nav')[0].style.width = 'auto';
-}
-
-function closeNavMenu() {
-  /* Remove value property set in openNavMenu() */
-  document.querySelectorAll('header nav')[0].style.width = '';
-}
-
-function openModal() {
-  document.getElementById('modal').style.display = 'block';
-}
-
-window.onclick = function(event) {
-  if (event.target == document.getElementById('modal')) {
-    document.getElementById('modal').style.display = 'none';
-  }
-}
-
+const openModal = document.getElementById('openmodal');
+const modal = document.getElementById('modal');
+openModal.addEventListener('click', function() { modal.style.display = 'block'; });
+modal.addEventListener('click', function() { modal.style.display = 'none'; });

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

@@ -21,7 +21,7 @@ body, html {
     height: 100%;
 }
 body {
-    background: #1e262b;
+    background: #f7f8fa;
     font-family: "Source Sans Pro", Cantarell, sans-serif;
     color: black;
     font-size: 1.0rem;
@@ -30,12 +30,6 @@ body {
     -ms-text-size-adjust: none;
     font-size-adjust: none;
 }
-/* Mobile devices only */
-@media only screen and (max-width: 600px), only screen and (max-device-width: 600px) {
-    body {
-        font-size: 1.8rem;
-    }
-}
 
 a {
     color: inherit;
@@ -45,67 +39,67 @@ a {
 
 /******************************************* Navigation *******************************************/
 
-header {
+body > header {
     position: fixed;
     top: 0px;
     width: 100%;
     margin: auto;
     background-color: #1e262b;
     color: white;
-    z-index: 2;
+    z-index: 10;
 }
-header h1 {
+body > header h1 {
     float: left;
     font-size: 2.25em;
     font-weight: 500;
     margin: 0px;
     padding: 5px 20px 8px; /* top sides bottom */
 }
-header nav {
+body > header nav {
     float: right;
     padding: 0px 20px;
 }
-header nav ul {
+body > header nav ul {
     margin: 0px;
     padding: 0px;
 }
-header nav > ul > li {
+body > header nav > ul > li {
     display: inline-block;
 }
-header nav > ul > li a, header a#closemenu {
+body > header nav > ul > li a {
     display: block;
     padding: 16px 20px;
     margin: 0px;
     font-size: 1.25em;
     color: rgba(255, 255, 255, 0.7);
 }
-header nav > ul > li a:hover {
+body > header nav > ul > li a:hover {
     color: rgba(255, 255, 255, 1.0);
 }
 
 /* dropdown menus */
-header nav > ul > li > ul {
+body > header nav > ul > li > ul {
     display: none;
     background-color: #1e262b;
     position: absolute;
 }
-header nav > ul > li > ul > li {
+body > header nav > ul > li > ul > li {
     display: block;
 }
-header nav > ul > li > ul > li a {
+body > header nav > ul > li > ul > li a {
     padding: 8px 20px;
 }
-header nav > ul > li:hover > ul, header nav > ul > li:active > ul {
+body > header nav > ul > li:hover > ul, body > header nav > ul > li:active > ul {
     display: block;
 }
 
-header a#openmenu, header a#closemenu {
+body > header a#openmenu, body > header a#closemenu {
     display: none;
 }
 
 /* Mobile devices only */
 @media only screen and (max-width: 600px), only screen and (max-device-width: 600px) {
-    header a#openmenu {
+    body > header a#openmenu {
         display: block;
         position: absolute;
         top: 12%;
@@ -114,7 +108,7 @@ header a#openmenu, header a#closemenu {
         font-weight: bold;
         color: white;
     }
-    header nav a#closemenu {
+    body > header nav a#closemenu {
         display: block;
         font-size: 2.5em;
         font-weight: bold;
@@ -122,48 +116,40 @@ header a#openmenu, header a#closemenu {
         text-align: right;
         margin-right: 0.5em;
     }
-    header h1 {
+    body > header h1 {
         float: none;
         text-align: center;
     }
-    header nav {
+    body > header nav {
         position: fixed;
         top: 0;
         left: 0;
         height: 100%;
         padding: 0;
-        z-index: 1;
+        z-index: 20;
         background: inherit;
         font-size: 1.25em;
         overflow-y: scroll;
         width: 0;
         max-width: 100%;
     }
-    header nav > ul {
+    body > header nav > ul {
         height: auto;
-        margin: 0px 0px 50px; /* top sides bottom */
     }
-    header nav > ul > li {
+    body > header nav > ul > li {
         display: block;
     }
-    header nav > ul > li a {
-        color: rgba(255, 255, 255, 1.0);
-        margin-top: 35px;
+    body > header nav > ul > li a {
         padding: 10px 150px 10px 40px; /* top right bottom left */
     }
-    header nav > ul > li > ul {
+    body > header nav > ul > li > ul {
         display: block;
         position: static; /* reset absolute positionning */
     }
-    header nav > ul > li > ul > li a {
-        color: rgba(255, 255, 255, 0.7);
+    body > header nav > ul > li > ul > li a {
         margin: 0px;
         padding: 10px 100px 10px 90px; /* top right bottom left */
     }
-    header nav li a:hover {
-        color: inherit;
-        background-color: #c2c2c2;
-    }
 }
 
 /* breadcrumb navigation menu */
@@ -180,7 +166,7 @@ ul.breadcrumb li+li:before {
     padding: 4px;
     content: "/\00a0";
 }
-ul.breadcrumb li a, main article a {
+main a {
     color: #748ea3;
 }
 
@@ -191,18 +177,16 @@ ul.breadcrumb li a, main article a {
     }
 }
 
-/******************************** Main content *******************************/
+/****************************************** Main content ******************************************/
 
 body > main {
-    background: #f7f8fa;
-    padding: 57px 0px; /* height of the navigation bar */
-}
-
-body > main section, body > main article, body > main hr, body > footer p {
-    width: 75%;
-    max-width: 1200px;
+    padding: 58px 0px; /* height of the navigation bar */
+    width: 85%;
+    max-width: 1366px;
     margin: auto;
+    min-height: calc(100vh - 2*58px - 66px); /* 2*height of nav bar + height of footer */
 }
+
 body > main hr {
     height: 2px;
     border: 0px;
@@ -213,10 +197,7 @@ body > main hr {
 
 /* Mobile devices only */
 @media only screen and (max-width: 600px), only screen and (max-device-width: 600px) {
-    body > main {
-        padding: 100px 0px;
-    }
-    body > main section, main hr, footer p {
+    body > main section, body > main hr, body > footer p {
         width: 90%;
     }
 }
@@ -248,19 +229,23 @@ body > main div.loading {
     100% { transform: rotate(360deg); }
 }
 
+/********************************************* Footer *********************************************/
+
 body > footer {
     background: #1e262b;
     text-align: center;
     color: white;
-    padding: 15px 0px; /* top sides */
+    padding: 0px;
 }
 body > footer p {
     font-size: 0.85em;
+    padding: 15px 0px; /* top sides */
+    margin: 0px;
 }
 body > footer aside#modal { /* modal box container */
     display: none;
     position: fixed;
-    z-index: 10;
+    z-index: 1000;
     left: 0;
     top: 0;
     width: 100%;
@@ -276,7 +261,9 @@ body > footer aside#modal #modal-content { /* modal box */
     transform: translateY(-50%);
     padding: 20px 25px 40px; /* top sides bottom */
     border: 1px solid #1e262b;
-    width: 425px;
+    width: 25%;
+    max-width: 425px;
+    min-width: 375px;
 }
 body > footer aside#modal #modal-content dl {
   display: grid;
@@ -308,4 +295,3 @@ section#error p img {
 section#error a {
     color: #748ea3;
 }
-

data/spec/intranet/core_spec.rb

@@ -61,6 +61,31 @@ RSpec.describe Intranet::Core do
       thread&.join
     end
 
+    it 'should not advertise server version in HTTP response headers' do
+      @intranet = described_class.new(Intranet::Logger.new(Intranet::Logger::FATAL))
+      thread = Thread.new { @intranet.start }
+      while @intranet.instance_variable_get(:@server).status != :Running
+      end
+
+      socket = TCPSocket.new('localhost', @intranet.port)
+      socket.puts("GET /design/favicon.ico HTTP/1.1\r\nHost: localhost:#{@intranet.port}\r\n\r\n")
+      server_identification = ''
+      expect(socket.gets).to include('HTTP/1.1 200 OK') # pre-requisite
+      while (line = socket.gets.chomp) # look for Server response header
+        break if line.empty?
+
+        if line.start_with?('Server: ')
+          server_identification = line[8..-1]
+          break
+        end
+      end
+      expect(server_identification).to be_empty
+      socket.close
+
+      @intranet.stop
+      thread&.join
+    end
+
     context 'when no module is registered' do
       it 'should return HTTP error 404 when requested for /index.html' do
         @intranet = described_class.new(Intranet::Logger.new(Intranet::Logger::FATAL))
@@ -219,13 +244,21 @@ RSpec.describe Intranet::Core do
       it 'should be called to retrieve the body of the page' do
         @intranet = described_class.new(Intranet::Logger.new(Intranet::Logger::FATAL))
 
-        responder = Intranet::TestResponder.new(
-          {
-            '/index.html' => [206, 'text/html', { content: 'PARTIAL_CONTENT', title: 'MyTitle' }]
-          },
-          ['/responder.css', 'nav.css'],
-          ['module.js', '/js/interactive.js']
-        )
+        responder = Intranet::TestResponder.new({
+                                                  '/index.html' => [
+                                                    206,
+                                                    'text/html',
+                                                    {
+                                                      content: 'PARTIAL_CONTENT',
+                                                      title: 'MyTitle',
+                                                      stylesheets: ['/resp.css', 'nav.css'],
+                                                      scripts: [
+                                                        { src: 'module.js', type: 'module' },
+                                                        { src: '/js/interactive.js', defer: 'defer' }
+                                                      ]
+                                                    }
+                                                  ]
+                                                })
         @intranet.register_module(responder, ['r'], responder.resources_dir)
 
         thread = Thread.new { @intranet.start }
@@ -255,11 +288,11 @@ RSpec.describe Intranet::Core do
         expect(html).to match(%r{<footer>.*#{hostname}.*</footer>}m)
 
         # Returned HTML document: includes all CSS dependencies, relative or absolute path
-        expect(html).to match(%r{<link href='/responder.css' rel='stylesheet' type='text/css'})
+        expect(html).to match(%r{<link href='/resp.css' rel='stylesheet' type='text/css'})
         expect(html).to match(%r{<link href='/r/nav.css' rel='stylesheet' type='text/css'})
 
         # Returned HTML document: includes all JS dependencies
-        expect(html).to match(%r{<script defer='defer' src='/r/module.js'></script>})
+        expect(html).to match(%r{<script src='/r/module.js' type='module'></script>})
         expect(html).to match(%r{<script defer='defer' src='/js/interactive.js'></script>})
 
         # Returned HTML document: includes Intranet Core name, version and URL
@@ -281,7 +314,7 @@ RSpec.describe Intranet::Core do
         responder = Intranet::TestResponder.new(
           '/index.html' => [206, 'text/html', { content: 'PARTIAL_CONTENT', title: 'MyTitle' }]
         )
-        other_responder = Intranet::TestResponder.new({}, [], [], true)
+        other_responder = Intranet::TestResponder.new({}, true)
         @intranet.register_module(responder, %w[r], responder.resources_dir)
         @intranet.register_module(responder, %w[dep_th1], responder.resources_dir)
         @intranet.register_module(responder, %w[depth2 res_p1], responder.resources_dir)

data/spec/test_responder/responder.rb

@@ -6,10 +6,8 @@ module Intranet
   class TestResponder < AbstractResponder
     attr_reader :finalized
 
-    def initialize(responses = {}, extra_css = [], extra_js = [], hide_from_menu = false) # rubocop:disable Metrics/ParameterLists
+    def initialize(responses = {}, hide_from_menu = false)
       @responses = responses
-      @extra_css = extra_css
-      @extra_js = extra_js
       @finalized = false
       @hide_from_menu = hide_from_menu
     end
@@ -47,14 +45,6 @@ module Intranet
       super(path, query)
     end
 
-    def css_dependencies
-      super + @extra_css
-    end
-
-    def js_dependencies
-      super + @extra_js
-    end
-
     private
 
     def dump_with_encoding(path, query)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: intranet-core
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.4.3
 platform: ruby
 authors:
 - Ebling Mis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-26 00:00:00.000000000 Z
+date: 2022-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -84,44 +84,44 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -140,16 +140,16 @@ dependencies:
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.0'
 description: 
 email: ebling.mis@protonmail.com
 executables: []
@@ -211,8 +211,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: Core component to build a custom intranet.