From 6e7fb72d6210e7190fec5f9ed0bc1cedb354724b Mon Sep 17 00:00:00 2001 From: Piotrek O Date: Wed, 8 May 2024 21:07:48 +0200 Subject: [PATCH 1/4] Fix benchmarks --- benchmarks/README.md | 2 +- benchmarks/config.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/benchmarks/README.md b/benchmarks/README.md index c837e17..50f6dab 100644 --- a/benchmarks/README.md +++ b/benchmarks/README.md @@ -1,6 +1,6 @@ # Benchmark results -Benchmarks ran on Ubuntu 17.04 64bit, i7 6700k @ 4.0Ghz, 32 GB RAM with Ruby 2.3. +Benchmarks ran on MacBook Pro M1 Pro 2021, 32 GB RAM on Ruby 3.2. ## permissions.rb diff --git a/benchmarks/config.rb b/benchmarks/config.rb index 8f698dc..b49336e 100644 --- a/benchmarks/config.rb +++ b/benchmarks/config.rb @@ -15,7 +15,7 @@ def initialize(user) can :read, String can :zoom, Integer can :boom, Hash - can :rub, Fixnum + can :rub, File end end @@ -37,7 +37,7 @@ def configure can :read, String can :zoom, Integer can :boom, Hash - can :rub, Fixnum + can :rub, File end end end From 68eb7d0f67d2f7efaeac2d51ac10fd78f74796f8 Mon Sep 17 00:00:00 2001 From: Piotrek O Date: Wed, 8 May 2024 21:14:38 +0200 Subject: [PATCH 2/4] Update benchmark results --- benchmarks/README.md | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/benchmarks/README.md b/benchmarks/README.md index 50f6dab..4bde691 100644 --- a/benchmarks/README.md +++ b/benchmarks/README.md @@ -8,17 +8,17 @@ This benchmark runs `can?` method for the 3 user roles for 20 seconds each, for ``` Warming up -------------------------------------- - ag-admin 158.815k i/100ms - ag-moderator 161.055k i/100ms - ag-user 161.670k i/100ms - cancan-admin 14.865k i/100ms - cancan-moderator 13.181k i/100ms - cancan-user 18.907k i/100ms + ag-admin 358.693k i/100ms + ag-moderator 359.044k i/100ms + ag-user 360.627k i/100ms + cancan-admin 30.797k i/100ms + cancan-moderator 26.825k i/100ms + cancan-user 37.946k i/100ms Calculating ------------------------------------- - ag-admin 2.141M (± 3.9%) i/s - 10.799M in 5.052573s - ag-moderator 2.180M (± 2.1%) i/s - 10.952M in 5.025727s - ag-user 2.206M (± 0.4%) i/s - 11.155M in 5.056550s - cancan-admin 158.288k (± 2.4%) i/s - 802.710k in 5.074299s - cancan-moderator 142.573k (± 2.1%) i/s - 724.955k in 5.087277s - cancan-user 204.783k (± 2.2%) i/s - 1.040M in 5.080488s + ag-admin 3.640M (± 0.3%) i/s - 18.293M in 5.025691s + ag-moderator 3.642M (± 0.4%) i/s - 18.311M in 5.027575s + ag-user 3.643M (± 0.3%) i/s - 18.392M in 5.049271s + cancan-admin 308.383k (± 0.7%) i/s - 1.571M in 5.093398s + cancan-moderator 270.716k (± 0.8%) i/s - 1.368M in 5.053863s + cancan-user 383.198k (± 0.7%) i/s - 1.935M in 5.050472s ``` From 2ddf534a8f1b46398bea54154f3c46c4cc92b43e Mon Sep 17 00:00:00 2001 From: Piotrek O Date: Wed, 8 May 2024 21:14:49 +0200 Subject: [PATCH 3/4] Clean up --- lib/access-granted/policy.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/access-granted/policy.rb b/lib/access-granted/policy.rb index 0bd837c..73c967b 100644 --- a/lib/access-granted/policy.rb +++ b/lib/access-granted/policy.rb @@ -7,7 +7,6 @@ def initialize(user, cache_enabled = true) @user = user @roles = [] @cache = {} - configure end def configure From 4be1a8d9fb2b39bfc84638b7eb651c3d442f616d Mon Sep 17 00:00:00 2001 From: Piotrek O Date: Wed, 8 May 2024 21:15:44 +0200 Subject: [PATCH 4/4] Revert "Clean up" This reverts commit 2ddf534a8f1b46398bea54154f3c46c4cc92b43e. --- lib/access-granted/policy.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/access-granted/policy.rb b/lib/access-granted/policy.rb index 73c967b..0bd837c 100644 --- a/lib/access-granted/policy.rb +++ b/lib/access-granted/policy.rb @@ -7,6 +7,7 @@ def initialize(user, cache_enabled = true) @user = user @roles = [] @cache = {} + configure end def configure