itsi 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6032d30eaeb45f3c548f5c04516ac6f0a6013dab27366ebd728ae18d9182363
-  data.tar.gz: 77d245ba4031de6b51d3bf8ce28ec719ea182c8a29cb335bad2a8ca9b9d8af6f
+  metadata.gz: 79c36b477ccc4ed0f1327f160d6a0c0d53d8a0524f3458d98ed3ddefa5e59e72
+  data.tar.gz: eb43759f50d8eb8f62c7a8dbfcf71bea68ccda7b441877cc356cfba827d58612
 SHA512:
-  metadata.gz: cc89a4390491739d8519c2314f3d95924f4746362a66dc2884ed6df28bda3333e22a44c84514b07df41aa53cd582e05193e766451aaea3835853c0dff5a0ad61
-  data.tar.gz: 6087eb3b4d8123168c23ceea92d60e5740db8cc7638d95f1952493bc57d8b46b091f8778a5845de9e8008f9b55ffc4e21bd08ed185a89eccbdb41dcf7117b60a
+  metadata.gz: 201903b6a53a8f29f916711b4cffa67ae2f67737cff05c7ddae1016ba928f3c0704656a17ab8739d05da1ac2ff8ff15d3b26fb89527ebbf47b128af022a21953
+  data.tar.gz: 7752aa84a9af2d8f8be6f52b714b73ce47c0cb6b19833f65248cacb8d7967f14ed89d387e7243c7663634305c169492566c0709534e0d33063e7c5e200a506f8

data/Cargo.lock

@@ -1644,7 +1644,7 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
 [[package]]
 name = "itsi-scheduler"
-version = "0.2.7"
+version = "0.2.8"
 dependencies = [
  "bytes",
  "derive_more",
@@ -1662,7 +1662,7 @@ dependencies = [
 
 [[package]]
 name = "itsi-server"
-version = "0.2.7"
+version = "0.2.8"
 dependencies = [
  "argon2",
  "async-channel",

data/crates/itsi_scheduler/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "itsi-scheduler"
-version = "0.2.7"
+version = "0.2.8"
 edition = "2021"
 authors = ["Wouter Coppieters <wc@pico.net.nz>"]
 license = "MIT"

data/crates/itsi_scheduler/src/itsi_scheduler.rs

@@ -7,7 +7,7 @@ use itsi_error::ItsiError;
 use itsi_rb_helpers::{call_without_gvl, create_ruby_thread};
 use magnus::{
     error::Result as MagnusResult,
-    value::{InnerValue, Opaque, ReprValue},
+    value::{InnerValue, Lazy, LazyId, Opaque, ReprValue},
     Module, RClass, Ruby, Value,
 };
 use mio::{Events, Poll, Token, Waker};
@@ -19,7 +19,7 @@ use std::{
     time::Duration,
 };
 use timer::Timer;
-use tracing::{debug, info, warn};
+use tracing::{debug, error, info, warn};
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub(crate) struct Readiness(i16);
@@ -31,6 +31,9 @@ impl std::fmt::Debug for ItsiScheduler {
 }
 
 const WAKE_TOKEN: Token = Token(0);
+static ID_CURRENT: LazyId = LazyId::new("current");
+static CLASS_FIBER: Lazy<RClass> =
+    Lazy::new(|ruby| ruby.module_kernel().const_get("Fiber").unwrap());
 
 #[magnus::wrap(class = "Itsi::Scheduler", free_immediately, size)]
 pub(crate) struct ItsiScheduler {
@@ -225,14 +228,17 @@ impl ItsiScheduler {
         let result: Arc<RwLock<Option<T>>> = Arc::new(RwLock::new(None));
         let result_clone = Arc::clone(&result);
 
-        let current_fiber = Opaque::from(ruby.fiber_current());
-        let scheduler = Opaque::from(
-            ruby.module_kernel()
-                .const_get::<_, RClass>("Fiber")
-                .unwrap()
-                .funcall::<_, _, Value>("scheduler", ())
-                .unwrap(),
-        );
+        let class_fiber = ruby.get_inner(&CLASS_FIBER);
+        let current_fiber = ruby
+            .get_inner(&CLASS_FIBER)
+            .funcall::<_, _, Value>(*ID_CURRENT, ());
+
+        if current_fiber.is_err() {
+            error!("Failed to get current fiber");
+            return Err(ItsiError::ArgumentError("Failed to get current fiber".to_string()).into());
+        }
+        let current_fiber = Opaque::from(current_fiber.unwrap());
+        let scheduler = Opaque::from(class_fiber.funcall::<_, _, Value>("scheduler", ()).unwrap());
 
         create_ruby_thread(move || {
             call_without_gvl(|| {

data/crates/itsi_server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "itsi-server"
-version = "0.2.7"
+version = "0.2.8"
 edition = "2021"
 authors = ["Wouter Coppieters <wc@pico.net.nz>"]
 license = "MIT"

data/docs/content/features/_index.md

@@ -7,7 +7,7 @@ next: /getting_started
 
 Itsi bundles a slew of essential modern web features into a single, easy-to-use package.
 Here's a list of the essentials.
-Or jump straight in to <a target="_blank" href="tsi](/getting_started)">install</a> and <a target="_blank" href="t](/configuration)"> configure</a> for a deeper dive.
+Or jump straight in to <a target="_blank" href="/getting_started">install</a> and <a target="_blank" href="/configuration">configure</a> for a deeper dive.
 
 {{< callout >}}
 You don't need to use all of the features listed below to benefit from Itsi. E.g.

data/docs/content/getting_started/_index.md

@@ -5,7 +5,6 @@ weight: 2
 prev: features/
 next: getting_started/local_development/
 ---
-
 {{% steps %}}
 
 ### Step 1 - Install Ruby
@@ -26,34 +25,60 @@ Install Ruby
   apt-get install build-essential libclang-dev
   ```
 
-  Then use `gem` to install the Itsi package. This will in turn install both the
-  `itsi-server` gem, and the `itsi-scheduler` gem.
-
+  Then use `gem` to install Itsi, or its components based on your Ruby version.
 
+  **For Ruby >= 3.1**:
   ```bash
   gem install itsi
   ```
+  *(Installs both `itsi-server` and `itsi-scheduler`)*
+
+  **For Ruby 2.7 – 3.0**:
+  ```bash
+  gem install itsi-server
+  ```
+  *(Installs `itsi-server` only; `itsi-scheduler` is not supported on Ruby < 3.1)*
 
   {{< callout type="info" >}}
-  If you wish to use either the scheduler or server independently, these can be installed individually
-  by running `gem install itsi-server` or `gem install itsi-scheduler`.
+  Itsi (**server + scheduler**) requires **Ruby >= 3.1**.
+
+  Itsi **server** supports **Ruby >= 2.7**.
+
+  If you wish to use either the scheduler or server independently:
+  - `gem install itsi-server`
+  - `gem install itsi-scheduler` (Ruby >= 3.1 only)
+
   {{< /callout >}}
 
   {{< /tab >}}
   {{< tab >}}
   **Mac**:
+  **For Ruby >= 3.1**:
   ```bash
   gem install itsi
   ```
+
+  **For Ruby 2.7 – 3.0**:
+  ```bash
+  gem install itsi-server
+  ```
+
   {{< callout type="info" >}}
-  If you wish to use either the scheduler or server independently, these can be installed individually
-  by running `gem install itsi-server` or `gem install itsi-scheduler`.
+  Itsi (**server + scheduler**) requires **Ruby >= 3.1**.
+
+  Itsi **server** supports **Ruby >= 2.7**.
+
+  You can install components individually:
+  - `gem install itsi-server`
+  - `gem install itsi-scheduler` (Ruby >= 3.1 only)
+
+  ⚠️ Scheduler is not compatible with Ruby 3.0.
   {{< /callout >}}
 
   {{< /tab >}}
-  {{< tab >}}**Windows**: Itsi currently doesn't support native Windows builds, but it runs well on [https://learn.microsoft.com/en-us/windows/wsl/install](WSL).
+  {{< tab >}}**Windows**: Itsi currently doesn't support native Windows builds, but it runs well on [WSL](https://learn.microsoft.com/en-us/windows/wsl/install).
 
-  Follow the linked instructions to Install a linux distribution like Ubuntu or Debian and then follow the instructions in the Linux tab.
+  Follow the linked instructions to install a Linux distribution like Ubuntu or Debian, and then follow the instructions in the Linux tab.
   {{< /tab >}}
 
 {{< /tabs >}}
@@ -62,7 +87,6 @@ Install Ruby
 
 Great! You now have Itsi installed. Go to one of the following pages to learn how to use it:
 
-
 {{< cards >}}
   {{< card link="./local_development" title="Local Development" icon="star" >}}
   {{< card link="../options" title="Options" icon="adjustments" >}}

data/gems/scheduler/Cargo.lock

@@ -213,7 +213,7 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
 [[package]]
 name = "itsi-scheduler"
-version = "0.2.7"
+version = "0.2.8"
 dependencies = [
  "bytes",
  "derive_more",

data/gems/scheduler/itsi-scheduler.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.description = "Itsi Scheduler - A light-weight Fiber Scheduler implementation for Ruby"
   spec.homepage = "https://itsi.fyi"
   spec.license = "MIT"
-  spec.required_ruby_version = ">= 3.0.0"
+  spec.required_ruby_version = ">= 3.1"
   spec.required_rubygems_version = ">= 3.1.11"
 
   spec.metadata["homepage_uri"] = spec.homepage

data/gems/scheduler/lib/itsi/scheduler/version.rb

@@ -2,6 +2,6 @@
 
 module Itsi
   class Scheduler
-    VERSION = "0.2.7"
+    VERSION = "0.2.8"
   end
 end

data/gems/scheduler/test/test_active_record.rb

@@ -94,14 +94,26 @@ class TestActiveRecordFiberScheduler < Minitest::Test
 
     with_scheduler do |_scheduler|
       Fiber.schedule do
-        ActiveRecord::Base.connection_pool.with_connection(prevent_permanent_checkout: true) do
-          results << ActiveRecord::Base.connection.select_value("SELECT 1")
+        if ActiveRecord::Base.connection_pool.method(:with_connection).arity == 0
+          ActiveRecord::Base.connection_pool.with_connection do
+            results << ActiveRecord::Base.connection.select_value("SELECT 1")
+          end
+        else
+          ActiveRecord::Base.connection_pool.with_connection(prevent_permanent_checkout: true) do
+            results << ActiveRecord::Base.connection.select_value("SELECT 1")
+          end
         end
       end
 
       Fiber.schedule do
-        ActiveRecord::Base.connection_pool.with_connection(prevent_permanent_checkout: true) do
-          results << ActiveRecord::Base.connection.select_value("SELECT 2")
+        if ActiveRecord::Base.connection_pool.method(:with_connection).arity == 0
+          ActiveRecord::Base.connection_pool.with_connection do
+            results << ActiveRecord::Base.connection.select_value("SELECT 2")
+          end
+        else
+          ActiveRecord::Base.connection_pool.with_connection(prevent_permanent_checkout: true) do
+            results << ActiveRecord::Base.connection.select_value("SELECT 2")
+          end
         end
       end
     end

data/gems/scheduler/test/test_nested_fibers.rb

@@ -181,44 +181,47 @@ class TestNestedFibers < Minitest::Test
     assert_equal [0, 1, 2, 3, 4, 5, 6, 7], results
   end
 
-  def test_nested_unowned_fibers_with_scheduler
-    results = []
-    out, err = capture_subprocess_io do
-      begin
-        with_scheduler do |scheduler|
-          Fiber.new do
-            fib = Fiber.new do
-              results << 4
-              sleep 0.001
-              results << 5
-              sleep 0.001
-              results << 6
-            end
-
+  if RUBY_VERSION >= '3.2'
+    def test_nested_unowned_fibers_with_scheduler
+      results = []
+      out, err = capture_subprocess_io do
+        begin
+          with_scheduler do |scheduler|
             Fiber.new do
-              results << 0
-              sleep 0.001
-              Fiber.new do
-                results << 1
-                sleep 0.1
-                results << 8
-              end.transfer
-              results << 2
-            end.resume
-
-            results << 3
+              fib = Fiber.new do
+                results << 4
+                sleep 0.001
+                results << 5
+                sleep 0.001
+                results << 6
+              end
 
-            fib.resume
-            sleep 0.01
-            results << 7
-          end.transfer
+              Fiber.new do
+                results << 0
+                sleep 0.001
+                puts "Launch and transfer"
+                Fiber.new do
+                  results << 1
+                  sleep 0.1
+                  results << 8
+                end.transfer
+                results << 2
+              end.resume
+
+              results << 3
+
+              fib.resume
+              sleep 0.01
+              results << 7
+            end.transfer
+          end
+        rescue
         end
-      rescue
       end
+      # Transfered fibers are not resumed after yielding out.
+      assert_equal [0, 3, 4, 1, 5, 6], results
+      # assert_match /attempt to yield on a not resumed fiber/, out
     end
-    # Transfered fibers are not resumed after yielding out.
-    assert_equal [0, 3, 4, 1, 5, 6], results
-    # assert_match /attempt to yield on a not resumed fiber/, out
   end
 
   def test_nested_unowned_fibers_no_scheduler

data/gems/server/Cargo.lock

@@ -1644,7 +1644,7 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
 [[package]]
 name = "itsi-server"
-version = "0.2.7"
+version = "0.2.8"
 dependencies = [
  "argon2",
  "async-channel",

data/gems/server/itsi-server.gemspec

@@ -39,6 +39,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "rack", ">= 1.6"
   spec.add_dependency "json", '~> 2'
   spec.add_dependency "rb_sys", "~> 0.9.91"
+  spec.add_dependency 'prism', '~> 1.4'
 
   spec.add_development_dependency "ruby-lsp"
   # For more information and examples about making a new gem, check out our

data/gems/server/lib/itsi/server/config/config_helpers.rb

@@ -42,7 +42,16 @@ module Itsi
         end
 
         def self.included(cls) # rubocop:disable Metrics/PerceivedComplexity,Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength
+
+          class << cls
+            def subclasses
+              @subclasses ||= []
+            end
+          end
+
           def cls.inherited(base) # rubocop:disable Metrics/MethodLength,Lint/MissingSuper,Metrics/PerceivedComplexity
+            self.subclasses << base
+
             %i[detail documentation insert_text schema].each do |attr|
               base.define_singleton_method(attr) do |value = nil|
                 @middleware_class_attrs ||= {}

data/gems/server/lib/itsi/server/version.rb

@@ -2,6 +2,6 @@
 
 module Itsi
   class Server
-    VERSION = "0.2.7"
+    VERSION = "0.2.8"
   end
 end

data/gems/server/test/rack/test_rack_server.rb

@@ -75,6 +75,8 @@ class TestRackServer < Minitest::Test
   end
 
   def test_scheduler_non_blocking
+    return unless RUBY_VERSION > "3.1"
+
     server(
       itsi_rb: lambda do
         fiber_scheduler "Itsi::Scheduler"

data/lib/itsi/version.rb

@@ -1,3 +1,3 @@
 module Itsi
-  VERSION = "0.2.7"
+  VERSION = "0.2.8"
 end

data/tasks.txt

@@ -1,8 +1,6 @@
-0.2.6:
-- Opt in to gRPC compression override, per endpoint or per service
-
+Tasks:
 - Static ruby build
-- Add hook to opt non Itsi.rb files into LSP
+- Add way to opt non Itsi.rb files into LSP
 - OTel
 - Even faster Hash creation for Rack
 - Image resizer

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: itsi
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Wouter Coppieters
@@ -15,28 +15,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.7
+        version: 0.2.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.7
+        version: 0.2.8
 - !ruby/object:Gem::Dependency
   name: itsi-server
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.7
+        version: 0.2.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.7
+        version: 0.2.8
 description: Wrapper Gem for both the Itsi server and the Itsi Fiber scheduler
 email:
 - wc@pico.net.nz
@@ -1035,7 +1035,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="