oxidized-web 0.15.1 → 0.17.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oxidized-web
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.17.0
 platform: ruby
 authors:
 - Saku Ytti
@@ -9,22 +9,28 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-20 00:00:00.000000000 Z
+date: 2025-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: charlock_holmes
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.5
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.5
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: emk-sinatra-url-for
   requirement: !ruby/object:Gem::Requirement
@@ -43,114 +49,118 @@ dependencies:
   name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.0.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: 6.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: 6.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 6.4.0
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: 4.3.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 4.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.3.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: 4.4.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.3'
-- !ruby/object:Gem::Dependency
-  name: ostruct
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: 2.3.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 2.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 2.3.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: oxidized
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.31'
+        version: 0.34.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.31'
+        version: 0.34.0
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.11.4
+        version: 6.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.11.4
+        version: 6.6.0
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.6
+        version: 4.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.6
+        version: 4.1.1
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.6
+        version: 4.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.6
+        version: 4.1.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -241,42 +251,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.72.1
+        version: 1.78.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.72.1
+        version: 1.78.0
 - !ruby/object:Gem::Dependency
   name: rubocop-minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.37.1
+        version: 0.38.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.37.1
+        version: 0.38.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.30.0
+        version: 2.32.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.30.0
+        version: 2.32.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
@@ -305,20 +315,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.22.0
-- !ruby/object:Gem::Dependency
-  name: simplecov-cobertura
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.1.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: simplecov-html
   requirement: !ruby/object:Gem::Requirement
@@ -349,12 +345,12 @@ files:
 - ".github/workflows/stale.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".rubocop_todo.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - README.md
 - Rakefile
+- docs/configuration.md
 - docs/development.md
 - lib/oxidized/web.rb
 - lib/oxidized/web/public/css/oxidized.css
@@ -376,6 +372,8 @@ files:
 - lib/oxidized/web/public/weblibs/dataTables.bootstrap5.js
 - lib/oxidized/web/public/weblibs/dataTables.buttons.js
 - lib/oxidized/web/public/weblibs/dataTables.js
+- lib/oxidized/web/public/weblibs/dayjs-plugin-utc.min.js
+- lib/oxidized/web/public/weblibs/dayjs.min.js
 - lib/oxidized/web/public/weblibs/fonts/bootstrap-icons.woff
 - lib/oxidized/web/public/weblibs/fonts/bootstrap-icons.woff2
 - lib/oxidized/web/public/weblibs/jquery.js
@@ -394,12 +392,14 @@ files:
 - oxidized-web.gemspec
 - package-lock.json
 - package.json
-- spec/node_spec.rb
-- spec/node_version_spec.rb
-- spec/nodes_spec.rb
-- spec/root_spec.rb
 - spec/spec_helper.rb
-- spec/webapp_spec.rb
+- spec/web/node/show_spec.rb
+- spec/web/node/version_spec.rb
+- spec/web/node_spec.rb
+- spec/web/nodes_spec.rb
+- spec/web/root_spec.rb
+- spec/web/webapp_spec.rb
+- spec/web_spec.rb
 homepage: http://github.com/ytti/oxidized-web
 licenses:
 - Apache-2.0

data/.rubocop_todo.yml

@@ -1,64 +0,0 @@
-# This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2025-02-20 10:05:16 UTC using RuboCop version 1.72.2.
-# The point is for the user to remove these configuration records
-# one by one as the offenses are removed from the code base.
-# Note that changes in the inspected code, or installation of new
-# versions of RuboCop, may require this file to be generated again.
-
-# Offense count: 2
-# Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
-Metrics/AbcSize:
-  Max: 31
-
-# Offense count: 1
-# Configuration parameters: AllowedMethods, AllowedPatterns.
-Metrics/CyclomaticComplexity:
-  Max: 9
-
-# Offense count: 5
-# Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
-Metrics/MethodLength:
-  Max: 28
-
-# Offense count: 1
-# Configuration parameters: AllowedMethods, AllowedPatterns.
-Metrics/PerceivedComplexity:
-  Max: 11
-
-# Offense count: 1
-# Configuration parameters: Include.
-# Include: app/**/*.rb, config/**/*.rb, lib/**/*.rb
-Rails/Exit:
-  Exclude:
-    - 'lib/oxidized/web.rb'
-
-# Offense count: 7
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: Include.
-# Include: **/Rakefile, **/*.rake
-Rails/RakeEnvironment:
-  Exclude:
-    - 'Rakefile'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-Rake/Desc:
-  Exclude:
-    - 'Rakefile'
-
-# Offense count: 2
-Rake/DuplicateTask:
-  Exclude:
-    - 'Rakefile'
-
-# Offense count: 1
-Security/Eval:
-  Exclude:
-    - 'Rakefile'
-
-# Offense count: 1
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Security/JSONLoad:
-  Exclude:
-    - 'lib/oxidized/web/webapp.rb'

data/spec/node_version_spec.rb

@@ -1,102 +0,0 @@
-require_relative 'spec_helper'
-
-describe Oxidized::API::WebApp do
-  include Rack::Test::Methods
-
-  def app
-    Oxidized::API::WebApp
-  end
-
-  before do
-    @nodes = mock('Oxidized::Nodes')
-    app.set(:nodes, @nodes)
-  end
-
-  describe '/node/version.?:format?' do
-    it 'fetches all versions of a node without a group' do
-      @nodes.expects(:version).with('sw5', nil).returns(
-        [{ oid: "C006", date: "2025-02-05 19:49:00 +0100" },
-         { oid: "C003", date: "2025-02-05 19:03:00 +0100" },
-         { oid: "C001", date: "2025-02-05 19:01:00 +0100" }]
-      )
-
-      get '/node/version?node_full=sw5'
-      _(last_response.ok?).must_equal true
-      _(last_response.body.include?(
-          "<tr>\n<td>3</td>\n<td>2025-02-05 19:49:00 +0100</td>\n"
-        )).must_equal true
-    end
-
-    it 'fetches all versions of a node with a group' do
-      @nodes.expects(:version).with('sw5', 'group1').returns(
-        [{ oid: "C006", date: "2025-02-05 19:49:00 +0100" },
-         { oid: "C003", date: "2025-02-05 19:03:00 +0100" },
-         { oid: "C001", date: "2025-02-05 19:01:00 +0100" }]
-      )
-
-      get '/node/version?node_full=group1/sw5'
-      _(last_response.ok?).must_equal true
-      _(last_response.body.include?(
-          "<tr>\n<td>3</td>\n<td>2025-02-05 19:49:00 +0100</td>\n"
-        )).must_equal true
-    end
-
-    it 'fetches all versions of a node with a group with /' do
-      @nodes.expects(:version).with('sw5', 'gr/oup1').returns(
-        [{ oid: "C006", date: "2025-02-05 19:49:00 +0100" },
-         { oid: "C003", date: "2025-02-05 19:03:00 +0100" },
-         { oid: "C001", date: "2025-02-05 19:01:00 +0100" }]
-      )
-
-      get '/node/version?node_full=gr/oup1/sw5'
-      _(last_response.ok?).must_equal true
-      _(last_response.body.include?(
-          "<tr>\n<td>3</td>\n<td>2025-02-05 19:49:00 +0100</td>\n"
-        )).must_equal true
-    end
-  end
-
-  describe '/node/version/view.?:format?' do
-    it 'fetches a previous version from git' do
-      @nodes.expects(:get_version).with('sw5', '', 'c8aa93cab5').returns('Old configuration of sw5')
-
-      get '/node/version/view?node=sw5&group=&oid=c8aa93cab5&date=2024-06-07 08:27:37 +0200&num=2'
-      _(last_response.ok?).must_equal true
-      _(last_response.body.include?('Old configuration of sw5')).must_equal true
-    end
-
-    it 'does not display binary content' do
-      @nodes.expects(:get_version).with('sw5', '', 'c8aa93cab5').returns("\xff\x42 binary content\x00")
-
-      get '/node/version/view?node=sw5&group=&oid=c8aa93cab5&date=2024-06-07 08:27:37 +0200&num=2'
-      _(last_response.ok?).must_equal true
-      _(last_response.body.include?('cannot display')).must_equal true
-    end
-
-    it 'fetches a git-version when using a group containing /' do
-      @nodes.expects(:get_version).with('sw5', 'my/group', 'c8aa93cab5').returns('Old configuration of sw5')
-
-      get '/node/version/view?node=sw5&group=my/group&oid=c8aa93cab5&date=2024-06-07 08:27:37 +0200&num=2'
-      _(last_response.ok?).must_equal true
-      _(last_response.body.include?('Old configuration of sw5')).must_equal true
-    end
-
-    it 'does not encode html-chars in text-format' do
-      configuration = "text &/<> \n ascii;"
-      @nodes.expects(:get_version).with('sw5', '', 'c8aa93cab5').returns(configuration)
-      get '/node/version/view?node=sw5&group=&oid=c8aa93cab5&date=2024-06-07 08:27:37 +0200&num=2&format=text'
-
-      _(last_response.ok?).must_equal true
-      _(last_response.body).must_equal configuration
-    end
-
-    it 'does not encode html-chars in json-format' do
-      configuration = "text &/<> \n ascii;"
-      @nodes.expects(:get_version).with('sw5', '', 'c8aa93cab5').returns(configuration)
-      get '/node/version/view?node=sw5&group=&oid=c8aa93cab5&date=2024-06-07 08:27:37 +0200&num=2&format=json'
-
-      _(last_response.ok?).must_equal true
-      _(last_response.body).must_equal '["text &/<> \n"," ascii;"]'
-    end
-  end
-end