ru.Bee 1.5.3 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2d3eeef6e3b96839595387ebc209aac312e5d9b5d7759f677242d7e615bdb17
-  data.tar.gz: 13186d7aef77fb4e1c8c4dd173798c61be2eee5e07bee4280b37cb4f060943b8
+  metadata.gz: eb5cbb674c5bfbfd6bc0d577039a3ca53fb46f013b62e5e004ef4a9f2c500514
+  data.tar.gz: abd0447b9655b22a85fed893e74c524f97d2d0ecf757eeb3b1730c799ae0e3d4
 SHA512:
-  metadata.gz: 3c335127b4999f214b181bdc8e970a969be1b8f54e3ec091184b300cd996f5705bd110f33aab364947af25c61e35b38fcbca39aadbc433bf2721bb69aee5d88a
-  data.tar.gz: 45c05634109187a1a3b7cd107584e8906024c8ee7e5f295c2f420441a53d112cd6bb3d1ef876385388caa1c86dd5aeeb89456cb43a96a718105cadfea951cb34
+  metadata.gz: 53195541a6b75bb6bf98ff8e8d54cc6d9fea4c5a8d5232f79c0e5cbe085b0afa48e06e17e717a314fb44fbac92c6ae375e18cbc8f4cc2aba8152fec568c59545
+  data.tar.gz: 193de59c021b3ca2265e816f6c80fc54a0b714c37f02b59194a4dafb6d01b1bc2edf9180d0c932d8a9b2d4dc23954b052926874a691f0a1aaedfbc5870906c34

data/bin/rubee

@@ -60,8 +60,8 @@ elsif command == 'react'
       exec('npm run watch')
     end
   else
-    color_puts "Unknown command: #{command}", color: :red
-    exit 1
+    color_puts("Unknown command: #{command}", color: :red)
+    exit(1)
   end
 elsif command == 'project'
   project_name = ARGV[1]

data/lib/config/base_configuration.rb

@@ -1,5 +1,6 @@
 Rubee::Configuration.setup(env = :development) do |config|
   config.database_url = { url: 'sqlite://db/development.db', env: }
+  config.thread_pool_limit = { env:, value: 5 }
 
   # Uncomment, if you want to use react
   # config.react = { on: true, env: }
@@ -7,6 +8,7 @@ end
 
 Rubee::Configuration.setup(env = :test) do |config|
   config.database_url = { url: 'sqlite://db/test.db', env: }
+  config.thread_pool_limit = { env:, value: 5 }
 
   # Uncomment, if you want to use react
   # config.react = { on: true, env: } # required if you want to use react
@@ -14,6 +16,7 @@ end
 
 Rubee::Configuration.setup(env = :production) do |config|
   config.database_url = { url: 'sqlite://db/production.db', env: }
+  config.thread_pool_limit = { env:, value: 5 }
 
   # Uncomment,if you want to use react
   # config.react = { on: true, env: } # required if you want to use react

data/lib/config/routes.rb

@@ -1,4 +1,3 @@
 Rubee::Router.draw do |router|
   router.get('/', to: 'welcome#show') # override it for your app
 end
-

data/lib/inits/charged_string.rb

@@ -1,9 +1,9 @@
 module ChargedString
   refine String do
     def pluralize
-      if self.end_with?('y') && !%w[a e i o u].include?(self[-2])
+      if end_with?('y') && !%w[a e i o u].include?(self[-2])
         "#{self[0..-2]}ies" # Replace "y" with "ies"
-      elsif self.end_with?('s', 'x', 'z', 'ch', 'sh')
+      elsif end_with?('s', 'x', 'z', 'ch', 'sh')
         "#{self}es" # Add "es" for certain endings
       else
         "#{self}s" # Default to adding "s"
@@ -11,7 +11,7 @@ module ChargedString
     end
 
     def plural?
-      return true if self.end_with?('s') && !self.end_with?('ss')
+      return true if end_with?('s') && !end_with?('ss')
 
       false
     end
@@ -21,11 +21,11 @@ module ChargedString
     end
 
     def singularize
-      if self.end_with?('ies') && self.length > 3
+      if end_with?('ies') && length > 3
         "#{self[0..-4]}y" # Convert "ies" to "y"
-      elsif self.end_with?('es') && %w[s x z ch sh].any? { |ending| self[-(ending.length + 2)..-3] == ending }
+      elsif end_with?('es') && %w[s x z ch sh].any? { |ending| self[-(ending.length + 2)..-3] == ending }
         self[0..-3] # Remove "es" for selfs like "foxes", "buses"
-      elsif self.end_with?('s') && self.length > 1
+      elsif end_with?('s') && length > 1
         self[0..-2] # Remove "s" for regular plurals
       else
         self # Return as-is if no plural form is detected

data/lib/rubee/async/thread_pool.rb

@@ -3,50 +3,58 @@ require 'singleton'
 module Rubee
   class ThreadPool
     include Singleton
-    THREADS_LIMIT = 4 # adjust as needed
+    THREAD_POOL_LIMIT = Rubee::Configuration.get_thread_pool_limit || 10 # adjust as needed
 
     def initialize
       @queue = Queue.new
       @workers = []
       @running = true
-      @mutex = Mutex.new
       spawn_workers
     end
 
     def enqueue(task, args)
       @queue << { task: task, args: args }
+      run_next
     end
 
     def bulk_enqueue(tasks)
       @queue << tasks
+      run_next
     end
 
     def shutdown
       @running = false
-      THREADS_LIMIT.times { @queue << { task: :stop, args: nil } }
-      @workers.each(&:join)
+      @queue.clear
     end
 
     private
 
+    def run_next
+      @workers.each do |fiber|
+        fiber.resume if fiber.alive? && !@queue.empty?
+      end
+    end
+
     def spawn_workers
-      THREADS_LIMIT.times do
-        @workers << Thread.new do
-          while @running
-            task_hash = @mutex.synchronize { @queue.pop }
-            if task_hash
-              task = task_hash[:task]
-              args = task_hash[:args]
-            end
-            break if task == :stop
+      THREAD_POOL_LIMIT.times do
+        fiber = Fiber.new do
+          loop do
+            Fiber.yield unless @running
+            job = @queue.shift
+            break unless job
+
+            task = job[:task]
+            args = job[:args]
 
             begin
               task.new.perform(**args)
-            rescue StandardError => e
+            rescue => e
               puts "ThreadPool Error: #{e.message}"
             end
           end
         end
+
+        @workers << fiber
       end
     end
   end

data/lib/rubee/models/sequel_object.rb

@@ -70,6 +70,10 @@ module Rubee
         nil
       end
 
+      def count
+        dataset.count
+      end
+
       def first
         found_hash = dataset.order(:id).first
         return new(**found_hash) if found_hash

data/lib/rubee.rb

@@ -15,7 +15,7 @@ module Rubee
   IMAGE_DIR = File.join(APP_ROOT, LIB, 'images') unless defined?(IMAGE_DIR)
   JS_DIR = File.join(APP_ROOT, LIB, 'js') unless defined?(JS_DIR)
   CSS_DIR = File.join(APP_ROOT, LIB, 'css') unless defined?(CSS_DIR)
-  VERSION = '1.5.3'
+  VERSION = '1.5.4'
 
   class Application
     include Singleton
@@ -80,6 +80,10 @@ module Rubee
         @configuraiton[args[:env].to_sym][:async_adapter] = args[:async_adapter]
       end
 
+      def thread_pool_limit=(args)
+        @configuraiton[args[:env].to_sym][:thread_pool_limit] = args[:thread_pool_limit]
+      end
+
       def react=(args)
         @configuraiton[args[:env].to_sym][:react] ||= { on: false }
         @configuraiton[args[:env].to_sym][:react].merge!(on: args[:on])

data/lib/tests/async/thread_async_test.rb

@@ -0,0 +1,32 @@
+require_relative '../test_helper'
+
+class TestAsyncRunnner
+  include Rubee::Asyncable
+
+  def perform(options)
+    User.create(email: options['email'], password: options['password'])
+  end
+end
+
+describe 'TestAsyncRunnner' do
+  describe 'async' do
+    after do
+      Rubee::ThreadPool.instance.shutdown
+      User.destroy_all
+    end
+
+    subject do
+      5.times do |n|
+        TestAsyncRunnner.new.perform_async(options: {"email"=> "new#{n}@new.com", "password"=> "123"})
+      end
+    end
+
+    it 'creates 5 users' do
+      assert_difference(-> { User.count }, 5) { subject }
+    end
+
+    it 'does it async' do
+      # TODO
+    end
+  end
+end

data/lib/tests/rubee_generator_test.rb

@@ -37,92 +37,95 @@ describe 'Rubee::Generator' do
       generator = Rubee::Generator.new(nil, nil, nil, nil)
       generator.call
 
-      _(File.exist?('lib/db/create_apples.rb')).must_equal false
+      _(File.exist?('lib/db/create_apples.rb')).must_equal(false)
     end
 
     it 'with a model only' do
       generator = Rubee::Generator.new('apple', nil, 'apples', nil)
       generator.call
 
-      _(File.exist?('lib/db/create_apples.rb')).must_equal true
+      _(File.exist?('lib/db/create_apples.rb')).must_equal(true)
 
       lines = File.readlines('lib/db/create_apples.rb').map(&:chomp).join("\n")
 
-      _(lines.include?('class CreateApples')).must_equal true
-      _(lines.include?('def call')).must_equal true
-      _(lines.include?('return if Rubee::SequelObject::DB.tables.include?(:apples)')).must_equal true
-      _(lines.include?('Rubee::SequelObject::DB.create_table(:apples) do')).must_equal true
-      _(lines.include?('String')).must_equal false
-      _(lines.include?('end')).must_equal true
+      _(lines.include?('class CreateApples')).must_equal(true)
+      _(lines.include?('def call')).must_equal(true)
+      _(lines.include?('return if Rubee::SequelObject::DB.tables.include?(:apples)')).must_equal(true)
+      _(lines.include?('Rubee::SequelObject::DB.create_table(:apples) do')).must_equal(true)
+      _(lines.include?('String')).must_equal(false)
+      _(lines.include?('end')).must_equal(true)
     end
 
     it 'with a model with attributes' do
-      generator = Rubee::Generator.new('apple', [{ name: 'title', type: :string }, {name: 'content', type: :text }], 'apples', nil)
+      generator = Rubee::Generator.new('apple', [{ name: 'title', type: :string }, { name: 'content', type: :text }],
+'apples', nil)
       generator.call
 
-      _(File.exist?('lib/db/create_apples.rb')).must_equal true
+      _(File.exist?('lib/db/create_apples.rb')).must_equal(true)
 
       lines = File.readlines('lib/db/create_apples.rb').map(&:chomp).join("\n")
 
-      _(lines.include?('class CreateApples')).must_equal true
-      _(lines.include?('def call')).must_equal true
-      _(lines.include?('return if Rubee::SequelObject::DB.tables.include?(:apples)')).must_equal true
-      _(lines.include?('Rubee::SequelObject::DB.create_table(:apples) do')).must_equal true
-      _(lines.include?('String :title')).must_equal true
-      _(lines.include?('String :content, text: true')).must_equal true
-      _(lines.include?('end')).must_equal true
+      _(lines.include?('class CreateApples')).must_equal(true)
+      _(lines.include?('def call')).must_equal(true)
+      _(lines.include?('return if Rubee::SequelObject::DB.tables.include?(:apples)')).must_equal(true)
+      _(lines.include?('Rubee::SequelObject::DB.create_table(:apples) do')).must_equal(true)
+      _(lines.include?('String :title')).must_equal(true)
+      _(lines.include?('String :content, text: true')).must_equal(true)
+      _(lines.include?('end')).must_equal(true)
     end
 
     it 'with a model with different attributes' do
-      generator = Rubee::Generator.new('apple', [{name: 'id', type: :bigint}, {name: 'colour', type: :string }, {name: 'weight', type: :integer }], 'apples', nil)
+      generator = Rubee::Generator.new('apple',
+[{ name: 'id', type: :bigint }, { name: 'colour', type: :string }, { name: 'weight', type: :integer }], 'apples', nil)
       generator.call
 
-      _(File.exist?('lib/db/create_apples.rb')).must_equal true
+      _(File.exist?('lib/db/create_apples.rb')).must_equal(true)
 
       lines = File.readlines('lib/db/create_apples.rb').map(&:chomp).join("\n")
 
-      _(lines.include?('class CreateApples')).must_equal true
-      _(lines.include?('def call')).must_equal true
-      _(lines.include?('return if Rubee::SequelObject::DB.tables.include?(:apples)')).must_equal true
-      _(lines.include?('Rubee::SequelObject::DB.create_table(:apples) do')).must_equal true
-      _(lines.include?('Bignum :id')).must_equal true
-      _(lines.include?('String :colour')).must_equal true
-      _(lines.include?('Integer :weight')).must_equal true
-      _(lines.include?('end')).must_equal true
+      _(lines.include?('class CreateApples')).must_equal(true)
+      _(lines.include?('def call')).must_equal(true)
+      _(lines.include?('return if Rubee::SequelObject::DB.tables.include?(:apples)')).must_equal(true)
+      _(lines.include?('Rubee::SequelObject::DB.create_table(:apples) do')).must_equal(true)
+      _(lines.include?('Bignum :id')).must_equal(true)
+      _(lines.include?('String :colour')).must_equal(true)
+      _(lines.include?('Integer :weight')).must_equal(true)
+      _(lines.include?('end')).must_equal(true)
     end
 
     it 'with a model with an attribute with multiple names' do
-      generator = Rubee::Generator.new('apple', [{ name: ['blue_id', 'shoe_id'], type: :foreign_key, table: 'blue_and_shoe_join_tb' }], 'apples', nil)
+      generator = Rubee::Generator.new('apple',
+[{ name: ['blue_id', 'shoe_id'], type: :foreign_key, table: 'blue_and_shoe_join_tb' }], 'apples', nil)
       generator.call
 
-      _(File.exist?('lib/db/create_apples.rb')).must_equal true
+      _(File.exist?('lib/db/create_apples.rb')).must_equal(true)
 
       lines = File.readlines('lib/db/create_apples.rb').map(&:chomp).join("\n")
 
-      _(lines.include?('class CreateApples')).must_equal true
-      _(lines.include?('def call')).must_equal true
-      _(lines.include?('return if Rubee::SequelObject::DB.tables.include?(:apples)')).must_equal true
-      _(lines.include?('Rubee::SequelObject::DB.create_table(:apples) do')).must_equal true
-      _(lines.include?('foreign_key [:blue_id, :shoe_id]')).must_equal true
-      _(lines.include?(':blue_and_shoe_join_tb')).must_equal true
-      _(lines.include?('end')).must_equal true
+      _(lines.include?('class CreateApples')).must_equal(true)
+      _(lines.include?('def call')).must_equal(true)
+      _(lines.include?('return if Rubee::SequelObject::DB.tables.include?(:apples)')).must_equal(true)
+      _(lines.include?('Rubee::SequelObject::DB.create_table(:apples) do')).must_equal(true)
+      _(lines.include?('foreign_key [:blue_id, :shoe_id]')).must_equal(true)
+      _(lines.include?(':blue_and_shoe_join_tb')).must_equal(true)
+      _(lines.include?('end')).must_equal(true)
     end
 
     it 'with a model with a foreign_key without table' do
       generator = Rubee::Generator.new('apple', [{ name: 'blue_id', type: :foreign_key }], 'apples', nil)
       generator.call
 
-      _(File.exist?('lib/db/create_apples.rb')).must_equal true
+      _(File.exist?('lib/db/create_apples.rb')).must_equal(true)
 
       lines = File.readlines('lib/db/create_apples.rb').map(&:chomp).join("\n")
 
-      _(lines.include?('class CreateApples')).must_equal true
-      _(lines.include?('def call')).must_equal true
-      _(lines.include?('return if Rubee::SequelObject::DB.tables.include?(:apples)')).must_equal true
-      _(lines.include?('Rubee::SequelObject::DB.create_table(:apples) do')).must_equal true
-      _(lines.include?('foreign_key :blue_id')).must_equal true
-      _(lines.include?(':replace_with_table_name')).must_equal true
-      _(lines.include?('end')).must_equal true
+      _(lines.include?('class CreateApples')).must_equal(true)
+      _(lines.include?('def call')).must_equal(true)
+      _(lines.include?('return if Rubee::SequelObject::DB.tables.include?(:apples)')).must_equal(true)
+      _(lines.include?('Rubee::SequelObject::DB.create_table(:apples) do')).must_equal(true)
+      _(lines.include?('foreign_key :blue_id')).must_equal(true)
+      _(lines.include?(':replace_with_table_name')).must_equal(true)
+      _(lines.include?('end')).must_equal(true)
     end
   end
 
@@ -136,53 +139,54 @@ describe 'Rubee::Generator' do
       generator = Rubee::Generator.new(nil, nil, nil, nil)
       generator.call
 
-      _(File.exist?('lib/app/models/apple.rb')).must_equal false
+      _(File.exist?('lib/app/models/apple.rb')).must_equal(false)
     end
 
     it 'with a model only' do
       generator = Rubee::Generator.new('apple', nil, 'apples', nil)
       generator.call
 
-      _(File.exist?('lib/app/models/apple.rb')).must_equal true
+      _(File.exist?('lib/app/models/apple.rb')).must_equal(true)
 
       lines = File.readlines('lib/app/models/apple.rb').map(&:chomp).join("\n")
 
-      _(lines.include?('class Apple < Rubee::SequelObject')).must_equal true
-      _(lines.include?('attr_accessor')).must_equal false
-      _(lines.include?('end')).must_equal true
+      _(lines.include?('class Apple < Rubee::SequelObject')).must_equal(true)
+      _(lines.include?('attr_accessor')).must_equal(false)
+      _(lines.include?('end')).must_equal(true)
     end
 
     it 'with a model with attributes' do
-      generator = Rubee::Generator.new('apple', [{ name: 'title', type: :string }, {name: 'content', type: :text }], 'apples', nil)
+      generator = Rubee::Generator.new('apple', [{ name: 'title', type: :string }, { name: 'content', type: :text }],
+'apples', nil)
       generator.call
 
-      _(File.exist?('lib/app/models/apple.rb')).must_equal true
+      _(File.exist?('lib/app/models/apple.rb')).must_equal(true)
 
       lines = File.readlines('lib/app/models/apple.rb').map(&:chomp).join("\n")
 
-      _(lines.include?('class Apple < Rubee::SequelObject')).must_equal true
-      _(lines.include?('attr_accessor')).must_equal true
-      _(lines.include?(':title, :content')).must_equal true
-      _(lines.include?('end')).must_equal true
+      _(lines.include?('class Apple < Rubee::SequelObject')).must_equal(true)
+      _(lines.include?('attr_accessor')).must_equal(true)
+      _(lines.include?(':title, :content')).must_equal(true)
+      _(lines.include?('end')).must_equal(true)
     end
 
     it 'with a model with different attributes' do
-      generator = Rubee::Generator.new('apple', [{name: 'id', type: :bigInt}, {name: 'colour', type: :string }, {name: 'weight', type: :integer }], 'apples', nil)
+      generator = Rubee::Generator.new('apple',
+[{ name: 'id', type: :bigInt }, { name: 'colour', type: :string }, { name: 'weight', type: :integer }], 'apples', nil)
       generator.call
 
-      _(File.exist?('lib/app/models/apple.rb')).must_equal true
+      _(File.exist?('lib/app/models/apple.rb')).must_equal(true)
 
       lines = File.readlines('lib/app/models/apple.rb').map(&:chomp).join("\n")
 
-      _(lines.include?('class Apple < Rubee::SequelObject')).must_equal true
-      _(lines.include?('attr_accessor')).must_equal true
-      _(lines.include?(':id, :colour, :weight')).must_equal true
-      _(lines.include?('end')).must_equal true
+      _(lines.include?('class Apple < Rubee::SequelObject')).must_equal(true)
+      _(lines.include?('attr_accessor')).must_equal(true)
+      _(lines.include?(':id, :colour, :weight')).must_equal(true)
+      _(lines.include?('end')).must_equal(true)
     end
   end
 
   describe 'generates View file' do
-
   end
 
   describe 'generates Controller file' do

data/lib/tests/test_helper.rb

@@ -10,3 +10,14 @@ Rubee::Configuration.setup(env = :test) do |config|
   config.database_url = { url: 'sqlite://lib/tests/test.db', env: }
 end
 Rubee::SequelObject.reconnect!
+
+def assert_difference(expression, difference = 1)
+  before = expression.call
+  yield
+  after = expression.call
+  actual_diff = after - before
+
+  assert_equal difference, actual_diff,
+    "Expected change of #{difference}, but got #{actual_diff}"
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ru.Bee
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.4
 platform: ruby
 authors:
 - Oleg Saltykov
@@ -241,6 +241,7 @@ files:
 - lib/rubee/models/database_objectable.rb
 - lib/rubee/models/sequel_object.rb
 - lib/tests/account_model_test.rb
+- lib/tests/async/thread_async_test.rb
 - lib/tests/auth_tokenable_test.rb
 - lib/tests/comment_model_test.rb
 - lib/tests/example_models/account.rb