ru.Bee 1.10.1 → 1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e34bf9669d522ca579263e0ea388b8157f443f362991a36b7e76b73b69d49467
-  data.tar.gz: a58a62af03a502867bbd61316b4983a2114dc2d5a64e5744941c3bcb03776c70
+  metadata.gz: b13412e9ba012f30b62abd7a994f6b4ed927be61a5e8d24503b63d5fe0d2b1d1
+  data.tar.gz: adea3313785a63c6bbd9c502d51885c8a8325344a2b0976bfcc0e0aa3e5d5532
 SHA512:
-  metadata.gz: a0e8688ef9c4c8ae50552e5db73964ae477b036383eb10cf7194df7edf31b58f7e9fb143689e61f6445750933d9dec9815ffd7e67d0cd0cf684df96b90fd9df3
-  data.tar.gz: ea6871cf13344b5d235eff69b7fc6df7cd98e9061aeaa593b682b9a35071f73a7dad8a5012778bf55a64b8f1ef49ffdc4ad49cc6bf702cbacfa39410a1f2368c
+  metadata.gz: d13cb1aabdd86f70109a496fecd67b135b5f364d6bb3ec7d0e1c5423b1bc5a8f73fcb127a7e3fda6a3b84b83d11d2fdc5acd19ec37a6665aae0dc260a29ac1a4
+  data.tar.gz: ebee546824550e812aea3e15fe19ef43d7538be4b8c6fd560d555e667e3477e55bc85d52d1bf57602d15e1439981f20f16a2c80a0a6abe6f748f0b59dbe1f568

data/lib/rubee/extensions/hookable.rb

@@ -7,16 +7,6 @@ module Rubee
 
     module ClassMethods
       def before(*methods, handler, **options)
-        if options[:class_methods]
-          methods.each do |method|
-            define_method(method) do |*args, &block|
-              self.class.send(method, *args, &block)
-            end
-
-            private(method)
-          end
-        end
-
         methods.each do |method|
           hook = Module.new do
             define_method(method) do |*args, &block|
@@ -28,21 +18,11 @@ module Rubee
             end
           end
 
-          prepend(hook)
+          options[:class_methods] ? singleton_class.prepend(hook) : prepend(hook)
         end
       end
 
       def after(*methods, handler, **options)
-        if options[:class_methods]
-          methods.each do |method|
-            define_method(method) do |*args, &block|
-              self.class.send(method, *args, &block)
-            end
-
-            private(method)
-          end
-        end
-
         methods.each do |method|
           hook = Module.new do
             define_method(method) do |*args, &block|
@@ -56,21 +36,11 @@ module Rubee
             end
           end
 
-          prepend(hook)
+          options[:class_methods] ? singleton_class.prepend(hook) : prepend(hook)
         end
       end
 
       def around(*methods, handler, **options)
-        if options[:class_methods]
-          methods.each do |method|
-            define_method(method) do |*args, &block|
-              self.class.send(method, *args, &block)
-            end
-
-            private(method)
-          end
-        end
-
         methods.each do |method|
           hook = Module.new do
             define_method(method) do |*args, &block|
@@ -93,17 +63,9 @@ module Rubee
             end
           end
 
-          prepend(hook)
+          options[:class_methods] ? singleton_class.prepend(hook) : prepend(hook)
         end
       end
-    end
-
-    module InstanceMethods
-      private
-
-      def handle_class_method
-        self.class.send(name, *args, &block)
-      end
 
       def conditions_met?(if_condition = nil, unless_condition = nil)
         return true if if_condition.nil? && unless_condition.nil?
@@ -128,5 +90,11 @@ module Rubee
         if_condition_result && !unless_condition_result
       end
     end
+
+    module InstanceMethods
+      def conditions_met?(if_condition = nil, unless_condition = nil)
+        self.class.conditions_met?(if_condition, unless_condition)
+      end
+    end
   end
 end

data/lib/rubee.rb

@@ -16,7 +16,7 @@ module Rubee
   JS_DIR = File.join(APP_ROOT, LIB, 'js') unless defined?(JS_DIR)
   CSS_DIR = File.join(APP_ROOT, LIB, 'css') unless defined?(CSS_DIR)
   ROOT_PATH = File.expand_path(File.join(__dir__, '..')) unless defined?(ROOT_PATH)
-  VERSION = '1.10.1'
+  VERSION = '1.11'
 
   require_relative 'rubee/router'
   require_relative 'rubee/logger'

data/lib/tests/controllers/hookable_test.rb

@@ -54,6 +54,11 @@ class TestHookable
   before :prep_unless_condition, :set_value
   after :set_unless_condition, :set_glue, unless: :value_red
 
+  # Check class methods
+  before :before_print_hello, :print_world, class_methods: true
+  after :after_print_hello, :print_world, class_methods: true
+  around :around_print_hello, :around_print_world, class_methods: true
+
   def after_around_before; end
 
   def before_around_after; end
@@ -82,6 +87,31 @@ class TestHookable
     value == 'red'
   end
 
+  class << self
+    def before_print_hello
+      puts 'hello'
+    end
+
+    def after_print_hello
+      puts 'hello'
+    end
+
+    def around_print_hello
+      puts 'hello'
+    end
+
+    def print_world
+      puts 'world'
+    end
+
+    def around_print_world
+      puts 'world1'
+      res = yield
+      puts 'world2'
+      res
+    end
+  end
+
   private
 
   def set_value
@@ -217,4 +247,30 @@ describe 'Hookable Controller' do
       _(hookable.glue).must_be_nil
     end
   end
+
+  describe 'class methods' do
+    it 'calls before print hello hook' do
+      output = capture_io do
+        TestHookable.before_print_hello
+      end.first # capture_io returns [stdout, stderr]
+
+      _(output).must_equal("world\nhello\n")
+    end
+
+    it 'calls after print hello hook' do
+      output = capture_io do
+        TestHookable.after_print_hello
+      end.first # capture_io returns [stdout, stderr]
+
+      _(output).must_equal("hello\nworld\n")
+    end
+
+    it 'calls around print hello hook' do
+      output = capture_io do
+        TestHookable.around_print_hello
+      end.first # capture_io returns [stdout, stderr]
+
+      _(output).must_equal("world1\nhello\nworld2\n")
+    end
+  end
 end

data/lib/tests/logger_test.rb

@@ -19,14 +19,12 @@ end
 describe 'Rubee::Logger' do
   describe 'logger' do
     it 'exists' do
-      puts "logger exists"
       _(Rubee::Logger).wont_be_nil
     end
   end
 
   describe '.warn' do
     it 'output message' do
-      puts "warn output message"
       output = capture_stdout { Rubee::Logger.warn(message: 'test') }
 
       assert_includes(output, "WARN test")
@@ -35,7 +33,6 @@ describe 'Rubee::Logger' do
 
   describe '.info' do
     it 'output message' do
-      puts "info output message"
       output = capture_stdout { Rubee::Logger.info(message: 'test') }
 
       assert_includes(output, "INFO test")
@@ -52,7 +49,6 @@ describe 'Rubee::Logger' do
 
   describe '.critical' do
     it 'output message' do
-      puts "critical output message"
       output = capture_stdout { Rubee::Logger.critical(message: 'test') }
 
       assert_includes(output, "CRITICAL test")
@@ -61,7 +57,6 @@ describe 'Rubee::Logger' do
 
   describe '.debug' do
     it 'output message' do
-      puts "debug output message"
       output = capture_stdout { Rubee::Logger.debug(object: User.new(email: 'ok@ok.com', password: 123)) }
 
       assert_includes(output, "DEBUG #<User:")
@@ -70,7 +65,6 @@ describe 'Rubee::Logger' do
 
   describe 'when custom logger defined in the configuration' do
     it 'uses custom logger' do
-      puts "CUSTOM INFO test"
       Rubee::Configuration.setup(env = :test) { _1.logger = { logger: CustomLogger, env: } }
 
       output = capture_stdout { Rubee::Logger.info(message: 'test') }

data/readme.md

@@ -148,6 +148,8 @@ rubee start_dev --jit=yjit
 rubee test
 # or you can specify specific test file
 rubee test models/user_model_test.rb
+# you can run specicfc line in the test file
+rubee test models/user_model_test.rb --line=12
 ```
 [Back to content](#content)
 
@@ -812,6 +814,28 @@ after log around
 127.0.0.1 - - [17/Feb/2025:11:42:14 -0500] "GET /apples HTTP/1.1" 401 - 0.0359
 ```
 
+Starting from ver 1.11 hooks are able to be pinned to class methods.
+
+```ruby
+class AnyClass
+  before :print_world, :print_hello, instance_methods: true # you can useinstance method as a handler
+
+  class << self
+    def print_world
+      puts "world!"
+    end
+
+    def print_hello
+      puts "hello!"
+    end
+  end
+end
+```
+```bash
+hello!
+world!
+```
+
 [Back to content](#content)
 
 ## JWT based authentification

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ru.Bee
 version: !ruby/object:Gem::Version
-  version: 1.10.1
+  version: '1.11'
 platform: ruby
 authors:
 - Oleg Saltykov