ree_lib 1.0.84 → 1.0.85

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68d91436860401eb57063022aeafa8fafa3f574ce56fe2e19082cf4c6fc42565
-  data.tar.gz: 4e5620b188fd303242cc3943f617b83b9c933ceeacc8dd4e07f43f38d4cdda68
+  metadata.gz: 79577e4a77cb22f4a504b2d6944064c878585a683b89c166418aa003c8fd7eb0
+  data.tar.gz: 8ac9c51bea3e5c2611049a8002d23f191ee621801d5e0582e665f5fca51dbb97
 SHA512:
-  metadata.gz: e7ba357081e00e5d96598a7efe22f17c62fabeafbee66354d02f770f4b3c3f0cf9c337bcf1a52ac94ca60c9706463c163ebfa7b4113dc73e165a62a1f5251d01
-  data.tar.gz: 401f407e94dd2f9f540c495ddca201fb762e764d4a5dda6ad130f52211883edd3f3a1ff5b27a84a28ae3ff8e50a73b5ef0152cc86236dd6b84cb92c18f4c1076
+  metadata.gz: 889a59aeae260e884cd25948b349866ec840bcdb0b85d02bd44c87cef6cdb5e72511669f86cb8f567f3a9e53fba81a85243af9469563fd0fcfbef6fb387356a9
+  data.tar.gz: 1880826420b58191ca75292f7dea4a973d3250b93c99e9530a2cafa49d79cb4a1c68be4ee96fb6c6aba19a84fc927a7d22603c4f97f63e9c8141f97aa899e6b9

data/Gemfile.lock

@@ -1,9 +1,8 @@
 PATH
   remote: .
   specs:
-    ree_lib (1.0.84)
+    ree_lib (1.0.85)
       binding_of_caller (~> 1.0.0)
-      fiber_scheduler (~> 0.13.0)
       i18n (~> 1.12.0)
       loofah (~> 2.18.0)
       oj (~> 3.13.17)
@@ -31,7 +30,6 @@ GEM
     diff-lcs (1.5.0)
     faker (3.2.0)
       i18n (>= 1.8.11, < 2)
-    fiber_scheduler (0.13.0)
     hashdiff (1.0.1)
     highline (2.0.3)
     i18n (1.12.0)

data/lib/ree_lib/packages/ree_dao/package/ree_dao/association.rb

@@ -127,18 +127,12 @@ module ReeDao
       else
         threads = associations.instance_exec(assoc_list, &block)
 
-        scheduler_proc do
-          threads[:association_threads].map do |association, assoc_type, assoc_name, __opts, block|
-            task_proc do
-              association.load(assoc_type, assoc_name, **__opts, &block)
-            end
-          end
+        threads[:association_threads].map do |association, assoc_type, assoc_name, __opts, block|
+            association.load(assoc_type, assoc_name, **__opts, &block)
+        end
 
-          threads[:field_threads].map do |association, field_proc|
-            task_proc do
-              association.handle_field(field_proc)
-            end
-          end
+        threads[:field_threads].map do |association, field_proc|
+          association.handle_field(field_proc)
         end
       end
     end
@@ -355,24 +349,6 @@ module ReeDao
 
     private
 
-    def task_proc(&proc)
-      if Sequel.current.is_a?(Fiber)
-        Fiber.schedule &proc
-      else
-        proc.call
-      end
-    end
-
-    def scheduler_proc(&proc)
-      if Sequel.current.is_a?(Fiber)
-        FiberScheduler do
-          Fiber.schedule(:waiting, &proc)
-        end
-      else
-        proc.call
-      end
-    end
-
     def foreign_key_from_dao(dao)
       "#{dao.first_source_table.to_s.gsub(/s$/, '')}_id".to_sym
     end

data/lib/ree_lib/packages/ree_dao/package/ree_dao/functions/agg.rb

@@ -64,37 +64,13 @@ class ReeDao::Agg
     if dao.db.in_transaction? || ReeDao.load_sync_associations_enabled?
       associations
     else
-      scheduler_proc do
-        associations[:association_threads].map do |association, assoc_type, assoc_name, opts, block|
-          task_proc do
-            association.load(assoc_type, assoc_name, **opts, &block)
-          end
-        end
-
-        associations[:field_threads].map do |association, field_proc|
-          task_proc do
-            association.handle_field(field_proc)
-          end
-        end
+      associations[:association_threads].map do |association, assoc_type, assoc_name, opts, block|
+        association.load(assoc_type, assoc_name, **opts, &block)
       end
-    end
-  end
-
-  def task_proc(&proc)
-    if Sequel.current.is_a?(Fiber)
-      Fiber.schedule(&proc)
-    else
-      proc.call
-    end
-  end
 
-  def scheduler_proc(&proc)
-    if Sequel.current.is_a?(Fiber)
-      FiberScheduler do
-        Fiber.schedule(:waiting, &proc)
+      associations[:field_threads].map do |association, field_proc|
+        association.handle_field(field_proc)
       end
-    else
-      proc.call
     end
   end
 end

data/lib/ree_lib/packages/ree_dao/package/ree_dao.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "sequel"
-require "fiber_scheduler"
 
 module ReeDao
   include Ree::PackageDSL

data/lib/ree_lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ReeLib
-  VERSION = "1.0.84"
+  VERSION = "1.0.85"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ree_lib
 version: !ruby/object:Gem::Version
-  version: 1.0.84
+  version: 1.0.85
 platform: ruby
 authors:
 - Ruslan Gatiyatov
@@ -122,20 +122,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.1
-- !ruby/object:Gem::Dependency
-  name: fiber_scheduler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.13.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement