sbsm 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c49aade69c54b5d99fabe38bb3896307a2a5d726629bbb14764c4bcbcee46ce
-  data.tar.gz: 76a61fc0932cfd6dd8bfb065e573c0c0b8b62b079235008620f82b2e76f7b4ac
+  metadata.gz: 0c0b16442273f02641861ab2af2df40bdedf7adcf57a5da81e7f2f643c8cb40f
+  data.tar.gz: 52cbff715b9e7c64a476a1c8daca37aa684103b9a88e05451fb1ab6f1b8190e9
 SHA512:
-  metadata.gz: 547e0cb68e3454ba50f7a2058fef10c482fdd1cee0454cb3ef6c00e5150718241f6d312464dd88ab1ea6738f1532f2cffc661ef65b2ab8f3c9aabb665c2fe460
-  data.tar.gz: 73c7c87eff58a13e476d0222d56b54ee57904e8b7757fe94cc4ca5fc0097828c3c2b88b6ce783cd5163a1886fc09701b83e457d3fe5bd56eaf7619b0b0214be0
+  metadata.gz: 45cc5410d706b22306be01727bfd9db0364df776402592cfcaa1de71850774bbb961107411b8eb35225a05dae23fc944a3047289f761d64d3743cf7fc236b67d
+  data.tar.gz: 3056680481b6b5d3a24d04637713497f41d6b4e7394a0d81023f6da3880eacaf8b94649eb487c50ff28f54fa8e3847fd135572d34bfd293953d9abfd0f7178d3

data/.envrc

@@ -0,0 +1,3 @@
+source_url "https://raw.githubusercontent.com/cachix/devenv/d1f7b48e35e6dee421cfd0f51481d17f77586997/direnvrc" "sha256-YBzqskFZxmNb3kYVoKD9ZixoPXJh1C9ZvTLGFRkauZ0="
+
+use devenv

data/.github/workflows/ruby.yml

@@ -22,7 +22,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu]
-        ruby: [2.5, 2.6, 2.7, 3.0, 3.1, head]
+        ruby: [2.5, 2.6, 2.7, '3.0', 3.1, 3.2, 3.3, head]
     continue-on-error: ${{ endsWith(matrix.ruby, 'head') }}
     steps:
     - uses: actions/checkout@v2
@@ -31,5 +31,5 @@ jobs:
         ruby-version: ${{ matrix.ruby }}
         bundler-cache: true
 
-    - name: Run tests via rake
-      run: bundle exec rake
+    - name: Run tests via test/suite.rb
+      run: bundle exec test/suite.rb

data/.gitignore

@@ -1,4 +1,3 @@
-.ruby-version
 Gemfile.lock
 etc/
 .bundle/
@@ -7,3 +6,14 @@ vendor/
 pkg/
 coverage/
 *.log
+
+# Devenv
+.devenv*
+devenv.local.nix
+
+# direnv
+.direnv
+
+# pre-commit
+.pre-commit-config.yaml
+

data/.ruby-version

@@ -0,0 +1 @@
+3.3.0

data/History.txt

@@ -1,3 +1,10 @@
+=== 1.6.2 / 25.01.2024
+
+* Add devenv environment for Ruby 3.3 (see https://devenv.sh/)
+* Replace Chronologger with Logger as https://github.com/ma2gedev/chrono_logger
+  is no longer maintained and leads to test errors under Ruby 3.3
+* Run all tests also under Ruby 3.3
+
 === 1.6.1 / 09.12.2022
 
 * Fix Mime-Bug for Davaz.com

data/devenv.lock

@@ -0,0 +1,228 @@
+{
+  "nodes": {
+    "devenv": {
+      "locked": {
+        "dir": "src/modules",
+        "lastModified": 1705399223,
+        "narHash": "sha256-2nhAJ/9LMlwaEZDnoDIhnhQ0pEC/YIIt09WD7FmTp6g=",
+        "owner": "cachix",
+        "repo": "devenv",
+        "rev": "ff37923d4ba9e220b9826594e83fc29e1a4f4338",
+        "type": "github"
+      },
+      "original": {
+        "dir": "src/modules",
+        "owner": "cachix",
+        "repo": "devenv",
+        "type": "github"
+      }
+    },
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-compat_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1694529238,
+        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_2": {
+      "inputs": {
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1701680307,
+        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "gitignore": {
+      "inputs": {
+        "nixpkgs": [
+          "pre-commit-hooks",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1703887061,
+        "narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=",
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1705331948,
+        "narHash": "sha256-qjQXfvrAT1/RKDFAMdl8Hw3m4tLVvMCc8fMqzJv0pP4=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "b8dd8be3c790215716e7c12b247f45ca525867e2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-23.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-ruby": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1705118282,
+        "narHash": "sha256-9FUnVSPjF+xV2a7tfai8fxi9Ek538mdkEjaFJnWRk9Y=",
+        "owner": "bobvanderlinden",
+        "repo": "nixpkgs-ruby",
+        "rev": "1a4b0055af39b2d0756d5a117589b8ccddbce4f8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "bobvanderlinden",
+        "repo": "nixpkgs-ruby",
+        "type": "github"
+      }
+    },
+    "nixpkgs-stable": {
+      "locked": {
+        "lastModified": 1704874635,
+        "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "3dc440faeee9e889fe2d1b4d25ad0f430d449356",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-23.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "pre-commit-hooks": {
+      "inputs": {
+        "flake-compat": "flake-compat_2",
+        "flake-utils": "flake-utils_2",
+        "gitignore": "gitignore",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "nixpkgs-stable": "nixpkgs-stable"
+      },
+      "locked": {
+        "lastModified": 1705229514,
+        "narHash": "sha256-itILy0zimR/iyUGq5Dgg0fiW8plRDyxF153LWGsg3Cw=",
+        "owner": "cachix",
+        "repo": "pre-commit-hooks.nix",
+        "rev": "ffa9a5b90b0acfaa03b1533b83eaf5dead819a05",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "pre-commit-hooks.nix",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "devenv": "devenv",
+        "nixpkgs": "nixpkgs",
+        "nixpkgs-ruby": "nixpkgs-ruby",
+        "pre-commit-hooks": "pre-commit-hooks"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

data/devenv.nix

@@ -0,0 +1,30 @@
+{ pkgs, ... }:
+
+{
+  # https://devenv.sh/basics/
+  env.GREET = "devenv";
+
+  # https://devenv.sh/packages/
+  packages = [ pkgs.git pkgs.libyaml ];
+
+  enterShell = ''
+    echo This is the devenv shell for oddb2xml
+    git --version
+    ruby --version
+  '';
+
+  env.FREEDESKTOP_MIME_TYPES_PATH = "${pkgs.shared-mime-info}/share/mime/packages/freedesktop.org.xml";
+
+  # https://devenv.sh/languages/
+  # languages.nix.enable = true;
+
+  languages.ruby.enable = true;
+  languages.ruby.versionFile = ./.ruby-version;
+  # https://devenv.sh/pre-commit-hooks/
+  # pre-commit.hooks.shellcheck.enable = true;
+
+  # https://devenv.sh/processes/
+  # processes.ping.exec = "ping example.com";
+
+  # See full reference at https://devenv.sh/reference/options/
+}

data/devenv.yaml

@@ -0,0 +1,8 @@
+inputs:
+  nixpkgs:
+    url: github:NixOS/nixpkgs/nixos-23.11
+  nixpkgs-ruby:
+    url: github:bobvanderlinden/nixpkgs-ruby
+    inputs:
+      nixpkgs:
+        follows: nixpkgs

data/lib/sbsm/logger.rb

@@ -22,7 +22,7 @@
 # ngiger@ywesee.com
 #++
 
-require 'chrono_logger'
+require 'logger'
 require 'sbsm/version'
 module SBSM
   @@logger = Logger.new(STDERR)

data/lib/sbsm/version.rb

@@ -1,3 +1,3 @@
 module SBSM
-  VERSION = '1.6.1'
+  VERSION = '1.6.2'
 end

data/sbsm.gemspec

@@ -21,10 +21,9 @@ Gem::Specification.new do |spec|
   # hoping that these version fix only security/severe bugs
   # Consulted the Gemfile.lock to get 
   spec.add_dependency 'rack'
-  spec.add_dependency 'mail'
+  spec.add_dependency 'mail', '< 2.8.0'
   spec.add_dependency 'hpricot'
   spec.add_dependency 'mimemagic'
-  spec.add_dependency 'chrono_logger'
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

data/test/simple_sbsm.rb

@@ -5,7 +5,7 @@ require 'sbsm/logger'
 require 'sbsm/app'
 
 root_dir = File.expand_path(File.join(__FILE__, '..', '..'))
-TEST_LOGGER = ChronoLogger.new(File.join(root_dir, 'test.log'))
+TEST_LOGGER = Logger.new(File.join(root_dir, 'test.log'))
 SBSM.logger=TEST_LOGGER
 
 TEST_APP_URI  = 'druby://localhost:9876'

data/test/suite.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 # TestSuite -- ydim -- 27.01.2005 -- hwyss@ywesee.com
 require 'simplecov'
+puts "Running under ruby #{RUBY_VERSION}"
 
 $: << File.dirname(File.expand_path(__FILE__))
 SimpleCov.start do

data/test/test_session.rb

@@ -121,7 +121,7 @@ class StubSessionWithView < SBSM::Session
   def initialize(args)
     args[:app]       ||= StubSessionApp.new
     args[:validator] ||= StubSessionValidator.new
-    super(args)
+    super(:app => args[:app], :validator => args[:validator])
     persistent_user_input = {}
   end
 end
@@ -163,7 +163,7 @@ class TestSession < Minitest::Test
   include Rack::Test::Methods
 	def setup
     @app = StubSessionApp.new(validator: StubSessionValidator.new)
-    @session = StubSessionWithView.new(app: @app,
+    @session = StubSessionWithView.new(# app: @app,
                            validator: StubSessionValidator.new)
     @request = StubSessionRequest.new
 		@state = StubSessionState.new(@session, nil)
@@ -174,8 +174,8 @@ class TestSession < Minitest::Test
     assert_equal('example.com', @session.server_name)
   end
   def test_user_input
-    @request["foo"] = "bar"
-    @request["baz"] = "zuv"
+    @request.params["foo"] = "bar"
+    @request.params["baz"] = "zuv"
     # next line checks whether we did setup correctly the session
     assert_equal(@session.validator.class, StubSessionValidator)
     @session.process_rack(rack_request: @request)
@@ -190,18 +190,18 @@ class TestSession < Minitest::Test
     assert_equal(expected, result)
   end
   def test_persistent_user_input
-    @request["baz"] = "zuv"
+    @request.params["baz"] = "zuv"
     @session.process_rack(rack_request: @request)
     assert_equal("zuv", @session.persistent_user_input(:baz))
     @session.process_rack(StubSessionRequest.new)
     assert_equal("zuv", @session.persistent_user_input(:baz))
-    @request["baz"] = "bla"
+    @request.params["baz"] = "bla"
     @session.process_rack(rack_request: @request)
     assert_equal("bla", @session.persistent_user_input(:baz))
   end
   def test_user_input_hash
-    @request["hash[1]"] = "4"
-    @request["hash[2]"] = "5"
+    @request.params["hash[1]"] = "4"
+    @request.params["hash[2]"] = "5"
     @request.params["hash[3]"] = "6"
     @request.params['real_hash'] = {'1' => 'a', '2' => 'b'}
     @session.process_rack(rack_request: @request)
@@ -231,12 +231,12 @@ class TestSession < Minitest::Test
 		@session.process_rack(:rack_request =>req1)
 		state1 = @session.state
 		req2 = StubSessionRequest.new
-		req2["event"] = "foo"
+                req2.params["event"] = "foo"
 		@session.process_rack(:rack_request =>req2)
 		state2 = @session.state
 		refute_equal(state1, state2)
 		req3 = StubSessionRequest.new
-		req3["event"] = :bar
+                req3.params["event"] = :bar
 		@session.process_rack(:rack_request =>req3)
 		state3 = @session.state
 		refute_equal(state1, state3)
@@ -248,7 +248,7 @@ class TestSession < Minitest::Test
 		}
 		assert_equal(attended, @session.attended_states)
 		req4 = StubSessionRequest.new
-		req4["event"] = :foobar
+                req4.params["event"] = :foobar
 		@session.process_rack(:rack_request =>req4)
 		@session.cap_max_states
 		state4 = @session.state
@@ -338,8 +338,8 @@ class TestSession < Minitest::Test
 		assert_nil(@session.user_input(:no_input))
 	end
   def test_user_input
-		@request["foo"] = "bar"
-		@request["baz"] = "zuv"
+		@request.params["foo"] = "bar"
+		@request.params["baz"] = "zuv"
     @session.process_rack(rack_request: @request)
     assert_equal("bar", @session.user_input(:foo))
     assert_equal("zuv", @session.user_input(:baz))
@@ -352,9 +352,9 @@ class TestSession < Minitest::Test
 		assert_equal(expected, result)
   end
 	def test_user_input_hash
-		@request["hash[1]"] = "4"
-		@request["hash[2]"] = "5"
-		@request["hash[3]"] = "6"
+		@request.params["hash[1]"] = "4"
+		@request.params["hash[2]"] = "5"
+		@request.params["hash[3]"] = "6"
 		@session.process_rack(rack_request: @request)
 		hash = @session.user_input(:hash)
 		assert_equal(Hash, hash.class)
@@ -379,12 +379,12 @@ class TestSession < Minitest::Test
 		assert_equal([], @session.valid_values('oof'))
 	end
 	def test_persistent_user_input
-		@request["baz"] = "zuv"
+		@request.params["baz"] = "zuv"
     @session.process_rack(rack_request: @request)
 		assert_equal("zuv", @session.persistent_user_input(:baz))
 		@session.process_rack(rack_request: StubSessionRequest.new)
 		assert_equal("zuv", @session.persistent_user_input(:baz))
-		@request["baz"] = "bla"
+		@request.params["baz"] = "bla"
     @session.process_rack(rack_request: @request)
 		assert_equal("bla", @session.persistent_user_input(:baz))
 	end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sbsm
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - Masaomi Hatakeyama, Zeno R.R. Davatz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-10 00:00:00.000000000 Z
+date: 2024-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -28,16 +28,16 @@ dependencies:
   name: mail
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: hpricot
   requirement: !ruby/object:Gem::Requirement
@@ -66,20 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: chrono_logger
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -254,8 +240,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".envrc"
 - ".github/workflows/ruby.yml"
 - ".gitignore"
+- ".ruby-version"
 - Gemfile
 - History.txt
 - LICENCE.txt
@@ -268,6 +256,9 @@ files:
 - data/flavored_uri.grammar
 - data/uri.grammar
 - data/zone_uri.grammar
+- devenv.lock
+- devenv.nix
+- devenv.yaml
 - install.rb
 - lib/sbsm.rb
 - lib/sbsm/admin_server.rb
@@ -331,7 +322,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.5.3
 signing_key: 
 specification_version: 4
 summary: Application framework for state based session management from ywesee