ru.Bee 1.10.0 → 1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4309600ffa9a5cff66e752b2068805b1b5a0f16471b6be7a5ac00c7e1326c75a
-  data.tar.gz: f8fd1a0ac518e24eb9c03885e39448a7f1f94bfce6f5a5bdfd5e99ea35987bf2
+  metadata.gz: b13412e9ba012f30b62abd7a994f6b4ed927be61a5e8d24503b63d5fe0d2b1d1
+  data.tar.gz: adea3313785a63c6bbd9c502d51885c8a8325344a2b0976bfcc0e0aa3e5d5532
 SHA512:
-  metadata.gz: ed3f43069f1b6c7e9dd3633e54ca9eb76b5fe8ed11c944690959f8c971623a33b688e156a8996477c49ce177f5702f2a6a87196299b881bb1f8c6d8a42ee725c
-  data.tar.gz: d560d5c3272d758b1f082c1a036e092f95e86d8cbb6243ff44fff39b1872b46cea410e96d31b6317ac6a916619ce6dd539e5054f3998af0712d5d86c4f029b6a
+  metadata.gz: d13cb1aabdd86f70109a496fecd67b135b5f364d6bb3ec7d0e1c5423b1bc5a8f73fcb127a7e3fda6a3b84b83d11d2fdc5acd19ec37a6665aae0dc260a29ac1a4
+  data.tar.gz: ebee546824550e812aea3e15fe19ef43d7538be4b8c6fd560d555e667e3477e55bc85d52d1bf57602d15e1439981f20f16a2c80a0a6abe6f748f0b59dbe1f568

data/lib/rubee/cli/test.rb

@@ -9,15 +9,71 @@ module Rubee
         def test(argv)
           ENV['RACK_ENV'] = 'test'
           file_name = argv[1] # Get the first argument
+          line = argv[2]&.start_with?('--line=') ? argv[2].split('=')[1] : nil
           lib = Rubee::PROJECT_NAME == 'rubee' ? '/lib' : ''
-          if file_name
+          if file_name && !line
             color_puts("Running #{file_name} test ...", color: :yellow)
             exec("ruby -Itest -e \"require '.#{lib}/tests/#{file_name}'\"")
+          elsif file_name && line
+            color_puts("Running #{file_name} test at line #{line} ...", color: :yellow)
+            test_name = find_test_at_line(".#{lib}/tests/#{file_name}", line)
+            exec("ruby -Itest .#{lib}/tests/#{file_name} -n #{test_name}")
           else
             color_puts('Running all tests ...', color: :yellow)
             exec("ruby -Itest -e \"Dir.glob('.#{lib}/tests/**/*_test.rb').each { |file| require file }\"")
           end
         end
+
+        private
+
+        def find_test_at_line(file, line)
+          source = File.read(file).lines
+          name   = nil
+          kind   = nil
+
+          # 1. Look backwards from the line
+          source[0...line.to_i].reverse_each do |l|
+            if l =~ /^\s*def\s+(test_\w+)/
+              name = ::Regexp.last_match(1)
+              kind = :method
+              break
+            elsif l =~ /^\s*describe\s+['"](.*)['"]/
+              name = ::Regexp.last_match(1)
+              kind = :spec
+              break
+            elsif l =~ /^\s*it\s+['"](.*)['"]/
+              name = ::Regexp.last_match(1)
+              kind = :spec
+              break
+            end
+          end
+
+          # 2. If nothing was found, fallback to first def/it in the file
+          if name.nil?
+            source.each do |l|
+              if l =~ /^\s*def\s+(test_\w+)/
+                name = ::Regexp.last_match(1)
+                kind = :method
+                break
+              elsif l =~ /^\s*describe\s+['"](.*)['"]/
+                name = ::Regexp.last_match(1)
+                kind = :spec
+                break
+              elsif l =~ /^\s*it\s+['"](.*)['"]/
+                name = ::Regexp.last_match(1)
+                kind = :spec
+                break
+              end
+            end
+          end
+
+          # 3. Return correct `-n` filter
+          if kind == :spec
+            "/#{Regexp.escape(name)}/"
+          else
+            name
+          end
+        end
       end
     end
   end

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.0'
+  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/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)
 
@@ -164,7 +166,9 @@ rubee test models/user_model_test.rb
           attributes: [
             { name: 'id', type: :primary },
             { name: 'colour', type: :string },
-            { name: 'weight', type: :integer }
+            { name: 'weight', type: :integer },
+            { name: 'created', type: :datetime },
+            { name: 'updated', type: :datetime },
           ]
         }
     end
@@ -251,7 +255,7 @@ irb(main):015> user = User.new(email: "llo@ok.com", password: 543)
 
 Save record in db
 ```Ruby
-=> #<User:0x000000010cda23b8 @email="llo@ok.com", @password=543>
+=> #<User:0x000000010cda23b8 @email="llo@ok.com", @password=543, @created="2025-09-28 22:03:07.011332 -0400", @updated="2025-09-28 22:03:07.011332 -0400">
 irb(main):018> user.save
 => true
 ```
@@ -259,7 +263,7 @@ irb(main):018> user.save
 Update record with new value
 ```Ruby
 irb(main):019> user.update(email: "update@email.com")
-=> #<User:0x000000010c39b298 @email="update@email.com", @id=3, @password="543">
+=> #<User:0x000000010c39b298 @email="update@email.com", @id=3, @password="543" @created="2025-09-28 22:03:07.011332 -0400", @updated="2025-09-28 22:03:07.011332 -0400">
 ```
 
 Check whether it includes id
@@ -273,13 +277,13 @@ irb(main):016> user.persisted?
 Get the record from the database
 ```Ruby
 irb(main):011> user = User.last
-=> #<User:0x000000010ccea178 @email="ok23@ok.com", @id=2, @password="123">
+=> #<User:0x000000010ccea178 @email="ok23@ok.com", @id=2, @password="123", @created="2025-09-28 22:03:07.011332 -0400", @updated="2025-09-28 22:03:07.011332 -0400">
 irb(main):012> user.email = "new@ok.com"
 => "new@ok.com"
 irb(main):013> user
-=> #<User:0x000000010ccea178 @email="new@ok.com", @id=2, @password="123">
+=> #<User:0x000000010ccea178 @email="new@ok.com", @id=2, @password="123", @created="2025-09-28 22:03:07.011332 -0400", @updated="2025-09-28 22:03:07.011332 -0400">
 irb(main):014> user.reload
-=> #<User:0x000000010c488548 @email="ok23@ok.com", @id=2, @password="123"> # not persited data was updated from db
+=> #<User:0x000000010c488548 @email="ok23@ok.com", @id=2, @password="123", @created="2025-09-28 22:03:07.011332 -0400", @updated="2025-09-28 22:03:07.011332 -0400"> # not persited data was updated from db
 ```
 
 Assign attributes without persisiting it to db
@@ -297,24 +301,24 @@ irb(main):005> User.where(email: "ok23@ok.com")
 Get all record
 ```Ruby
 irb(main):001> User.all
-=> [#<User:0x000000010c239a30 @email="ok@ok.com", @id=1, @password="password">]
+=> [#<User:0x000000010c239a30 @email="ok@ok.com", @id=1, @password="password", @created="2025-09-28 22:03:07.011332 -0400", @updated="2025-09-28 22:03:07.011332 -0400">]
 ```
 Find by id
 ```Ruby
 irb(main):002> user = User.find 1
-=> #<User:0x000000010c2f7cd8 @email="ok@ok.com", @id=1, @password="password">
+=> #<User:0x000000010c2f7cd8 @email="ok@ok.com", @id=1, @password="password", @created="2025-09-28 22:03:07.011332 -0400", @updated="2025-09-28 22:03:07.011332 -0400">
 ```
 
 Get last record
 ```Ruby
 irb(main):003> User.last
-=> #<User:0x000000010c2f7cd8 @email="ok@ok.com", @id=1, @password="password">
+=> #<User:0x000000010c2f7cd8 @email="ok@ok.com", @id=1, @password="password", @created="2025-09-28 22:03:07.011332 -0400", @updated="2025-09-28 22:03:07.011332 -0400">
 ```
 
 Create new persited record
 ```Ruby
 irb(main):004> User.create(email: "ok23@ok.com", password: 123)
-=> #<User:0x000000010c393818 @email="ok23@ok.com", @id=2, @password=123>
+=> #<User:0x000000010c393818 @email="ok23@ok.com", @id=2, @password=123, @created="2025-09-28 22:03:07.011332 -0400", @updated="2025-09-28 22:03:07.011332 -0400">
 ```
 
 Destroy record and all related records
@@ -326,7 +330,7 @@ irb(main):021> user.destroy(cascade: true)
 Destroy all records one by one
 ```Ruby
 irb(main):022> User.destroy_all
-=> [#<User:0x000000010d42df98 @email="ok@ok.com", @id=1, @password="password">, #<User:0x000000010d42de80 @email="ok23@ok.com", @id=2, @password="123">
+=> [#<User:0x000000010d42df98 @email="ok@ok.com", @id=1, @password="password", @created="2025-09-28 22:03:07.011332 -0400", @updated="2025-09-28 22:03:07.011332 -0400">, #<User:0x000000010d42de80 @email="ok23@ok.com", @id=2, @password="123", @created="2025-09-28 22:03:07.011332 -0400", @updated="2025-09-28 22:03:07.011332 -0400">>
 irb(main):023> User.all
 => []
 ```
@@ -335,19 +339,19 @@ Use complex queries chains and when ready serialize it back to Rubee object.
 ```Ruby
 # user model
 class User < Rubee::SequelObject
-  attr_accessor :id, :email, :password
+  attr_accessor :id, :email, :password, :created, :updated
   owns_many :comments, over: :posts
 end
 
 # comment model
 class Comment < Rubee::SequelObject
-  attr_accessor :id, :text, :user_id
+  attr_accessor :id, :text, :user_id, :created, :updated
   owns_many :users, over: :posts
 end
 
-# join post model
+# join post modenl
 class Post < Rubee::SequelObject
-  attr_accessor :id, :user_id, :comment_id
+  attr_accessor :id, :user_id, :comment_id, :created, :updated
   holds :comment
   holds :user
 end
@@ -362,11 +366,11 @@ irb(main):005> post = Post.new(user_id: user.id, comment_id: comment.id)
 irb(main):006> post.save
 => true
 irb(main):007> comment
-=> #<Comment:0x000000012281a650 @id=21, @text="test">
+=> #<Comment:0x000000012281a650 @id=21, @text="test", @created=2025-09-28 22:03:07.011332 -0400, @updated=2025-09-28 22:03:07.011332 -0400>
 irb(main):008> result = Comment.dataset.join(:posts, comment_id: :id)
 irb(main):009>  .where(comment_id: Comment.where(text: "test").last.id)
 irb(main):010>  .then { |dataset| Comment.serialize(dataset) }
-=> [#<Comment:0x0000000121889998 @id=30, @text="test", @user_id=702>]
+=> [#<Comment:0x0000000121889998 @id=30, @text="test", @user_id=702, @created=2025-09-28 22:03:07.011332 -0400, @updated=2025-09-28 22:03:07.011332 -0400>]
 ```
 This is recommended when you want to run one query and serialize it back to Rubee object only once.
 So it may safe some resources.
@@ -432,7 +436,9 @@ Rubee::Router.draw do |router|
       attributes: [
         { name: 'id', type: :primary },
         { name: 'colour', type: :string },
-        { name: 'weight', type: :integer }
+        { name: 'weight', type: :integer },
+        { name: 'created', type: :datetime },
+        { name: 'updated', type: :datetime },
       ]
     }
 end
@@ -527,7 +533,9 @@ Rubee::Router.draw do |router|
       attributes: [
         { name: 'id', type: :primary },
         { name: 'colour', type: :string },
-        { name: 'weight', type: :integer }
+        { name: 'weight', type: :integer },
+        { name: 'created', type: :datetime },
+        { name: 'updated', type: :datetime },
       ]
     }
 end
@@ -571,7 +579,9 @@ Rubee::Router.draw do |router|
                                  name: 'cabage',
                                  attributes: [
                                    { name: 'id', type: :primary },
-                                   { name: 'name', type: :string }
+                                   { name: 'name', type: :string },
+                                   { name: 'created', type: :datetime },
+                                   { name: 'updated', type: :datetime },
                                  ]
                                },
                                namespace: :admin # mandatory option for supporting namespacing
@@ -804,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.0
+  version: '1.11'
 platform: ruby
 authors:
 - Oleg Saltykov