ru.Bee 2.2.8 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aab21c21cff250f991e5e1cba522989e46db0149bd5bf5e7817255cf0ef0bc82
-  data.tar.gz: ca03ebc252d70456d66b4d3177c9551ac4ff82d37fe645d60e5813c36637c05d
+  metadata.gz: 7e0cf8da8114b03f7ab38bfb0994fcd93b353f0bffc01c3a38689a28ea1daf15
+  data.tar.gz: c650fc422ef9d764e63e683819580cf1faea6daf84ee8d761ebb6199cf0b2546
 SHA512:
-  metadata.gz: 65f45e769c4d8a6a3ff4917a6642992bf108f5fcd82a82a2afba785216d039f0936650e6e7c499d16c410ca9ada18330f0dbe43bbfdc061d89d517f6cf48f856
-  data.tar.gz: 5e73d0b8daf20401817eaf0e6b7d6db7c2909fda7f7bcb1b255188acd2b5cc242bd14d0374903701144bae6122b83a589d4b17694f05bae7444f1048e7674414
+  metadata.gz: fd1f34ec5f2335781075b39fe477bf9bc9c98d8f3ba33aad9decb50a58b9202ce54507a8ba36b172625011bac20b87bb9cb022e683555292c5cca2e58ef427b0
+  data.tar.gz: 056b9e3ddf0aa83c76f5efe50dd32c0e93fe2b06fdce7474ee08e2a4e77d10c10c598ed5ebb777148ebc523ff167576a6ac89837861465a8cdd1b5aa2c48ffd6

data/lib/db/create_carrots.rb

@@ -0,0 +1,13 @@
+class CreateCarrots
+  def call
+    return if Rubee::SequelObject::DB.tables.include?(:carrots)
+
+    Rubee::SequelObject::DB.create_table(:carrots) do
+      primary_key(:id)
+      String(:color, null: false)
+      # timestamps
+      datetime(:created)
+      datetime(:updated)
+    end
+  end
+end

data/lib/rubee/autoload.rb

@@ -7,9 +7,9 @@ module Rubee
         # autoload all rbs
         root_directory = File.join(Rubee::ROOT_PATH, '/lib')
         priority_order_require(root_directory, black_list)
+        load_inits(root_directory, black_list)
         # ensure sequel object is connected
         Rubee::SequelObject.reconnect!
-
         Dir.glob(File.join(Rubee::APP_ROOT, '**', '*.rb')).sort.each do |file|
           base_name = File.basename(file)
 
@@ -27,7 +27,7 @@ module Rubee
         end
       end
 
-      def priority_order_require(root_directory, black_list)
+      def load_inits(root_directory, black_list)
         # rubee inits
         Dir[File.join(root_directory, 'inits/**', '*.rb')].each do |file|
           require_relative file unless black_list.include?("#{file}.rb")
@@ -36,6 +36,9 @@ module Rubee
         Dir[File.join(Rubee::APP_ROOT, 'inits/**', '*.rb')].each do |file|
           require_relative file unless black_list.include?("#{file}.rb")
         end
+      end
+
+      def priority_order_require(root_directory, black_list)
         # rubee pub sub
         Dir[File.join(root_directory, 'rubee/pubsub/**', '*.rb')].each do |file|
           require_relative file unless black_list.include?("#{file}.rb")

data/lib/rubee/extensions/validatable.rb

@@ -125,7 +125,6 @@ module Rubee
       end
 
       def errors
-        run_validations
         @__validation_state.errors
       end
 
@@ -164,6 +163,13 @@ module Rubee
       def validate(&block)
         @validation_block = block
       end
+
+      def validate_after_setters
+        unless respond_to?(:after)
+          raise "Can't use validate_after_setters without after hook, please include Rubee::Hookable"
+        end
+        after(*accessor_names.filter { |name| !name.start_with?("__") }.map { |name| "#{name}=" }, :run_validations)
+      end
     end
   end
 end

data/lib/rubee/models/database_objectable.rb

@@ -27,5 +27,8 @@ module Rubee
 
     module Initializer
     end
+
+    module ClassMethods
+    end
   end
 end

data/lib/rubee/models/sequel_object.rb

@@ -28,13 +28,15 @@ module Rubee
         begin
           update(args)
         rescue StandardError => _e
+          add_error(:base, sequel_error: e.message)
           return false
         end
 
       else
         begin
           created_id = self.class.dataset.insert(args)
-        rescue StandardError => _e
+        rescue StandardError => e
+          add_error(:base, sequel_error: e.message)
           return false
         end
         self.id = created_id
@@ -169,8 +171,14 @@ module Rubee
 
       def dataset
         @dataset ||= DB[pluralize_class_name.to_sym]
-      rescue Exception => _e
+      rescue Exception => e
         reconnect!
+        @__reconnect_count ||= 0
+        @__reconnect_count += 1
+        if @__reconnect_count > 3
+          raise e
+        end
+        sleep(0.1)
         retry
       end
 

data/lib/rubee.rb

@@ -17,7 +17,7 @@ module Rubee
   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 = '2.2.8'
+  VERSION = '2.3.1'
 
   require_relative 'rubee/router'
   require_relative 'rubee/logger'

data/lib/tests/example_models/carrots.rb

@@ -0,0 +1,3 @@
+class Carrot < Rubee::SequelObject
+  attr_accessor :color, :created, :updated
+end

data/lib/tests/models/carrot_model_test.rb

@@ -0,0 +1,11 @@
+require_relative '../test_helper'
+
+describe 'When sequle raise error' do
+  it 'should save error' do
+    apple = Carrot.new(updated: Time.now)
+    apple.save
+    _(apple.errors).must_equal(
+      { base: { sequel_error: "SQLite3::ConstraintException: NOT NULL constraint failed: carrots.color" } }
+    )
+  end
+end

data/lib/tests/models/comment_model_test.rb

@@ -222,5 +222,23 @@ describe 'Comment model' do
         _(comment.errors[:text]).must_equal({ message: "Text is a mandatory field" })
       end
     end
+
+    describe 'when validate_after_setters' do
+      it 'validates attribute' do
+        Comment.validate_after_setters
+        Comment.validate do
+          attribute(:text)
+            .required("Text is a mandatory field").type(String, "Text must be a string")
+            .condition(-> { text.length > 4 }, "Text length must be greater than 4")
+        end
+
+        comment = Comment.new(text: 'testqwe')
+        _(comment.valid?).must_equal(true)
+        comment.text = 'test'
+
+        _(comment.errors.empty?).must_equal(false)
+        _(comment.errors[:text]).must_equal({ message: "Text length must be greater than 4" })
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ru.Bee
 version: !ruby/object:Gem::Version
-  version: 2.2.8
+  version: 2.3.1
 platform: ruby
 authors:
 - Oleg Saltykov
@@ -58,6 +58,7 @@ files:
 - lib/css/app.css
 - lib/db/create_accounts.rb
 - lib/db/create_addresses.rb
+- lib/db/create_carrots.rb
 - lib/db/create_clients.rb
 - lib/db/create_comments.rb
 - lib/db/create_posts.rb
@@ -281,12 +282,14 @@ files:
 - lib/tests/controllers/users_controller_test.rb
 - lib/tests/example_models/account.rb
 - lib/tests/example_models/address.rb
+- lib/tests/example_models/carrots.rb
 - lib/tests/example_models/client.rb
 - lib/tests/example_models/comment.rb
 - lib/tests/example_models/post.rb
 - lib/tests/example_models/user.rb
 - lib/tests/logger_test.rb
 - lib/tests/models/account_model_test.rb
+- lib/tests/models/carrot_model_test.rb
 - lib/tests/models/comment_model_test.rb
 - lib/tests/models/db_objectable_test.rb
 - lib/tests/models/seralizable_test.rb