ru.Bee 2.7.8 → 2.7.10

data/lib/rubee/extensions/validatable.rb

@@ -35,7 +35,7 @@ module Rubee
         value = @instance.send(@attribute)
 
         error_hash = assemble_error_hash(error_message, :required, attribute: @attribute)
-        if value.nil? || (value.respond_to?(:empty?) && value.empty?)
+        if value.nil? # If there is any value empty string or empty array, we'r still good to go.
           @state.add_error(@attribute, error_hash)
         end
 

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.8'
+  VERSION = '2.7.10'
 
   require_relative 'rubee/router'
   require_relative 'rubee/logger'

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
@@ -346,5 +346,15 @@ describe 'Comment model' do
         _(comment.errors[:text]).must_equal({ message: "Text length must be greater than 4" })
       end
     end
+
+    describe 'when validate required' do
+      describe 'when empty string' do
+        it 'is valid' do
+          Comment.validate { attribute(:text).required }
+          comment = Comment.new(text: '')
+          _(comment.valid?).must_equal(true)
+        end
+      end
+    end
   end
 end

metadata

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