ru.Bee 2.7.7 → 2.7.9

data/lib/rubee/extensions/hookable.rb

@@ -47,11 +47,11 @@ module Rubee
               if conditions_met?(options[:if], options[:unless])
                 if handler.respond_to?(:call)
                   result = nil
-                  safe_call(handler, [self, args]) do
+                  handler_result = safe_call(handler, [self, args]) do
                     result = super(*args, &block)
                   end
 
-                  result
+                  result || handler_result
                 else
                   send(handler) do
                     super(*args, &block)

data/lib/rubee/models/assoc_array.rb

@@ -22,6 +22,14 @@ module Rubee
       @__model.where(*args, __query_dataset: @__query_dataset)
     end
 
+    def find_first(*args)
+      @__model.find_first(*args, __query_dataset: @__query_dataset)
+    end
+
+    def find_last(*args)
+      @__model.find_last(*args, __query_dataset: @__query_dataset)
+    end
+
     def order(*args)
       @__model.order(*args, __query_dataset: @__query_dataset)
     end

data/lib/rubee/models/sequel_object.rb

@@ -209,11 +209,15 @@ module Rubee
       end
 
       def find_first(args, options = {})
-        where(args, options).order(:id).limit(1).last
+        query_dataset = options[:__query_dataset] || dataset
+
+        ::Rubee::AssocArray.new([], self, query_dataset.where(**args)).order(:id).limit(1).last
       end
 
       def find_last(args, options = {})
-        where(args, options).order(id: :desc).limit(1).last
+        query_dataset = options[:__query_dataset] || dataset
+
+        ::Rubee::AssocArray.new([], self, query_dataset.where(**args)).order(id: :desc).limit(1).last
       end
 
       def order(args, options = {})

data/lib/rubee.rb

@@ -20,7 +20,7 @@ module Rubee
     RUBEE_SUPPORT = { "Rubee::Support::Hash" => Hash, "Rubee::Support::String" => String }
   end
 
-  VERSION = '2.7.7'
+  VERSION = '2.7.9'
 
   require_relative 'rubee/router'
   require_relative 'rubee/logger'

data/lib/tests/controllers/base_controller_test.rb

@@ -1,6 +1,14 @@
 require_relative '../test_helper'
 
 class TestRedirectController < Rubee::BaseController
+  around :test_me, ->(controller, &test_method) do
+    if true # We wnat to make sure that origianl method is replaced
+      controller.response_with(type: :json, object: { hijacked: :yes })
+    else
+      test_method.call
+    end
+  end
+
   def index
     response_with(type: :redirect, to: '/test')
   end
@@ -8,6 +16,10 @@ class TestRedirectController < Rubee::BaseController
   def test
     response_with(type: :json, object: { ok: :ok })
   end
+
+  def test_me
+    response_with(type: :json, object: { ok: :ok })
+  end
 end
 
 class BaseControllerTest < Minitest::Test
@@ -21,6 +33,7 @@ class BaseControllerTest < Minitest::Test
     Rubee::Router.draw do |route|
       route.get('/test', to: 'test_redirect#test')
       route.get('/index', to: 'test_redirect#index')
+      route.get('/test_me', to: 'test_redirect#test_me')
     end
   end
 
@@ -45,4 +58,11 @@ class BaseControllerTest < Minitest::Test
     assert_equal('/test', last_response.headers['Location'])
     assert_equal('', last_response.body)
   end
+
+  def test_hijacked_test_by_around
+    get('/test_me')
+
+    assert_equal(200, last_response.status)
+    assert_equal({ "hijacked" => "yes" }, JSON.parse(last_response.body))
+  end
 end

data/lib/tests/models/comment_model_test.rb

@@ -124,7 +124,7 @@ describe 'Comment model' do
       Comment.destroy_all
       comment_1 = Comment.create(text: 'test123123')
       comment_2 = Comment.create(text: 'test123123')
-      _(Comment.find_first(text: 'test123123').id).must_equal(comment_1.id)
+      _(Comment.where(text: 'test123123').find_first(text: 'test123123').id).must_equal(comment_1.id)
       Comment.destroy_all
     end
   end
@@ -134,7 +134,7 @@ describe 'Comment model' do
       Comment.destroy_all
       comment_1 = Comment.create(text: 'test123123')
       comment_2 = Comment.create(text: 'test123123')
-      _(Comment.find_last(text: 'test123123').id).must_equal(comment_2.id)
+      _(Comment.where(text: 'test123123').find_last(text: 'test123123').id).must_equal(comment_2.id)
       Comment.destroy_all
     end
   end

data/readme.md

@@ -380,12 +380,12 @@ Get all records scoped by a field
 irb(main):005> User.where(email: "ok23@ok.com")
 => [#<User:0x000000010cfaa5c0 @email="ok23@ok.com", @id=2, @password="123">]
 ```
-Get the first record. It is a shortcut for `User.where(email: "ok23@ok.com").order(:id).limit(1).last`
+Get the first record, scoped by field. It is a shortcut for `User.where(email: "ok23@ok.com").order(:id).limit(1).last`
 ```ruby
 irb(main):006> User.find_first(email: "ok23@ok.com")
 => #<User:0x000000010cfaa5c0 @email="ok23@ok.com", @id=2, @password="123">
 ```
-Get the last record. It is a shortcut for `User.where(email: "ok23@ok.com").order(id: :desc).limit(1).last`
+Get the last record, scoped by field. It is a shortcut for `User.where(email: "ok23@ok.com").order(id: :desc).limit(1).last`
 ```ruby
 irb(main):007> User.find_last(email: "ok23@ok.com")
 => #<User:0x000000010cfaa5c0 @email="ok23@ok.com", @id=2, @password="123">
@@ -940,11 +940,31 @@ class AnyClass
   end
 end
 ```
+The "around" hook can be used to hijack origianl method execution:
+```ruby
+class AnyClass
+  include Rubee::Hookable
+  around :print_world, ->(this_instance, &target_method) do
+    if condition_that_return_false
+      target_method.call
+    else
+      this_instance.print_hello
+    end
+  end
 
-Output:
+  def print_world
+    puts "world!"
+  end
+
+  def print_hello
+    puts "hello!"
+  end
+end
+```
+
+This will replace origianl method execution with `print_hello` if `condition_that_return_false` returns false.
 ```bash
 hello!
-world!
 ```
 
 [Back to content](#content)

metadata

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