intranet-core 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf5a56e43b31aff50e2987cb337fdca3308f5444
-  data.tar.gz: c319c8fa7398563f469bb403edb7fff1923c126c
+  metadata.gz: b297a91ba8ca9fc6a44723c4f9f738d879193828
+  data.tar.gz: bc44f0b1858f045978da8d39824ad36a0a52c485
 SHA512:
-  metadata.gz: 0cd16c07120e3a5f3996a9b186d69c40a5816ad58b3852b988d334a82a18637bf2f130dc098ce7d465976a4148b412cbb1955e001cad546ccf5c77d2d23b7599
-  data.tar.gz: a280390146e29d0fa3be5c44faebdc6f72b54d4c7e4599dd81ae94bde5c15e4481ece613c236d777522433beae0c9cb16dd92842488318a109b712f7ef2b9a8d
+  metadata.gz: a5094ed435333e80537e85603359276059b345554ae185cdb6c56e9d843ca385b31fc1e1e008e329114c3f5584e509d89087dab4e3e24423a2fbb35f0081457b
+  data.tar.gz: e06fea82c25af97e56230a51df3f4b4f9447fd2218d9ca7b28b0663f83d43d3713cda474aab06c15c45a5860680d02edf5adf95742ee552331e19755e01a19ad

data/lib/intranet/abstract_responder.rb

@@ -15,6 +15,13 @@ module Intranet
     # @return [String/Nil] The homepage URL of the module, or nil if no homepage is available.
     def self.module_homepage; end
 
+    # Specifies if the responder instance should be displayed in the main navigation menu or not.
+    # @return [Boolean] True if the responder instance should be added to the main navigation menu,
+    #                   False otherwise.
+    def in_menu?
+      true
+    end
+
     # Destroys the responder instance.
     # This method gets called when server is shut down.
     def finalize

data/lib/intranet/core/builder.rb

@@ -47,13 +47,13 @@ module Intranet
       # @param query [Hash] The content of the GET parameters of the URL.
       # @return [Array] The HTTP return code, the MIME type and the answer body.
       def do_get(path, query = {})
-        resp, responder_path = get_responder(path)
-        status, mime_type, body = resp.generate_page(responder_path, query)
+        responder, responder_path = get_responder(path)
+        status, mime_type, body = responder.generate_page(responder_path, query)
 
         # Generate header and footer when partial content is returned by the responder
         if status == 206 && mime_type == 'text/html'
-          body = to_markup('skeleton', is_home: path == '/index.html', body: body,
-                                       css: resp.css_dependencies, js: resp.js_dependencies)
+          body = to_markup('skeleton', body: body, css: responder.css_dependencies,
+                                       js: responder.js_dependencies)
           status = 200
         end
         [status, mime_type, body]

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

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

@@ -16,20 +16,21 @@
       %nav
         %a{id: 'closemenu', onclick: 'closeNavMenu();'}= '×'
         %ul
-          - responders.children_nodes.each do |child_id, child_node|
-            %li
-              - if child_node.children? # Create a dropdown menu entry
-                %a= I18n.t(child_id + '.menu', default: child_id.humanize)
-                %ul
-                  - child_node.children_nodes.each do |child_url, node|
-                    %li
-                      %a{href: '/' + child_id + '/' + child_url + '/index.html'}
-                        = I18n.t(child_id + '.' + child_url + '.menu', default: child_url.humanize)
-              - else # Create a regular menu entry
-                %a{href: '/' + child_id + '/index.html'}= I18n.t(child_id + '.menu', default: child_id.humanize)
-
-    - if is_home
-      %aside
+          - responders.children_nodes.each do |path, node|
+            - if node.children?
+              - if node.children_nodes.values.any? { |n| n.value.in_menu? } # Create a dropdown menu entry
+                %li
+                  %a= I18n.t(path + '.menu', default: path.humanize)
+                  %ul
+                    - node.children_nodes.each do |subpath, subnode|
+                      - if subnode.value.in_menu?
+                        %li
+                          %a{href: '/' + path + '/' + subpath + '/index.html'}
+                            = I18n.t(path + '.' + subpath + '.menu', default: subpath.humanize)
+            - else # Create a regular menu entry
+              - if node.value.in_menu?
+                %li
+                  %a{href: '/' + path + '/index.html'}= I18n.t(path + '.menu', default: path.humanize)
 
     %main
       = body[:content]

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

@@ -192,17 +192,9 @@ ul.breadcrumb li a, main article a {
 
 /******************************** Main content *******************************/
 
-body > aside {
-    background: url('background.jpg') fixed top right no-repeat;
-    height: 45%;
-    min-height: 350px;
-    max-height: 500px; /* less than height of background.jpg */
-}
-
 body > main {
     background: #f2f2f2;
     padding: 57px 0px; /* height of the navigation bar */
-    min-height: 500px; /* lower or equal to height of background.jpg (with padding) */
 }
 
 body > main section, body > main article, body > main hr, body > footer p {

data/spec/intranet/core_spec.rb

@@ -319,10 +319,15 @@ 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)
           @intranet.register_module(responder, [], responder.resources_dir)
           @intranet.register_module(responder, %w[dep_th1], responder.resources_dir)
           @intranet.register_module(responder, %w[depth2 res_p1], responder.resources_dir)
           @intranet.register_module(responder, %w[depth2 resp2], responder.resources_dir)
+          @intranet.register_module(other_responder, %w[depth2 resp], other_responder.resources_dir)
+          @intranet.register_module(other_responder, %w[other1], other_responder.resources_dir)
+          @intranet.register_module(other_responder, %w[other2 res1], other_responder.resources_dir)
+          @intranet.register_module(other_responder, %w[other2 res2], other_responder.resources_dir)
           thread = Thread.new do
             @intranet.start
           end
@@ -341,13 +346,18 @@ RSpec.describe Intranet::Core do
           html = socket.readpartial(4096) # read rest of data
 
           # Returned HTML document main menu
-          expect(html).to match(%r{<a href='/dep_th1/index.html'>.*Dep Th1.*</a>})
+          expect(html).to     match(%r{<a href='/dep_th1/index.html'>.*Dep Th1.*</a>})
+          expect(html).not_to match(%r{<a href='/other1/index.html'>})
           expect(html).to match(
             %r{<a>.*Depth2.*</a>.*<ul>.*<a href='/depth2/res_p1/index.html'>.*Res P1.*</a>.*</ul>}m
           )
           expect(html).to match(
             %r{<a>.*Depth2.*</a>.*<ul>.*<a href='/depth2/resp2/index.html'>.*Resp2.*</a>.*</ul>}m
           )
+          expect(html).not_to match(%r{<a href='/depth2/resp/index.html'>})
+          expect(html).not_to match(%r{<a>.*Other2.*</a>}m)
+          expect(html).not_to match(%r{<a href='/other2/res1/index.html'>})
+          expect(html).not_to match(%r{<a href='/other2/res2/index.html'>})
         ensure
           socket.close
           Thread.kill(thread)

data/spec/test_responder/responder.rb

@@ -6,11 +6,12 @@ module Intranet
   class TestResponder < AbstractResponder
     attr_reader :finalized
 
-    def initialize(responses = {}, extra_css = [], extra_js = [])
+    def initialize(responses = {}, extra_css = [], extra_js = [], hide_from_menu = false)
       @responses = responses
       @extra_css = extra_css
       @extra_js = extra_js
       @finalized = false
+      @hide_from_menu = hide_from_menu
     end
 
     def finalize
@@ -18,6 +19,12 @@ module Intranet
       super
     end
 
+    def in_menu?
+      return false if @hide_from_menu
+
+      super
+    end
+
     def self.module_name
       'test-responder'
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: intranet-core
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Ebling Mis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-02 00:00:00.000000000 Z
+date: 2019-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.61.0
+        version: 0.63.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.61.0
+        version: 0.63.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -174,7 +174,6 @@ files:
 - lib/intranet/resources/haml/title_and_breadcrumb.haml
 - lib/intranet/resources/locales/en.yml
 - lib/intranet/resources/locales/fr.yml
-- lib/intranet/resources/www/background.jpg
 - lib/intranet/resources/www/error.png
 - lib/intranet/resources/www/favicon.ico
 - lib/intranet/resources/www/fonts/SourceSansPro.woff2