ree_lib 1.0.71 → 1.0.72

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83750e368c52ed97daa01d069e57a184129c6bafb7bd7867aa8c71685562da16
-  data.tar.gz: 37ea4a0f4c852bed89692d47f5c86891f281a16f1e13f04faeb2670f57bfd173
+  metadata.gz: 0421ad28472f902b4c53091515c749bdcb6aba9ef96ed42009abe27d115edf48
+  data.tar.gz: 3909bfecb3e92e05708a9be5effb672fc8042e2f53ed4aadb426539f0eba8574
 SHA512:
-  metadata.gz: ff00e69c9a2b54dd03eee000076e3aac5cb0236b53cdbba0ed669eba2d5918d1c14d88f0c8a6d8e58497a86e02208a0f5850fbef294e552ad2f994aaa83cf89c
-  data.tar.gz: bb9a5580e423c17d894d07a69896f39d0d26ef9fc21b8bd3871c505034516a20fa2c5bf6a95827a1733a4cb06a6e6fea7bb4dd0a0e4735f13eca1fb5f2087cb9
+  metadata.gz: bb696f99d8af84de496f0e6a3bf616256853302d952409832fd89eb24830c0f29cb2cead19b245eee883a2c9dc7d358633bccc308be56369c2d8aeb569a66c7d
+  data.tar.gz: 0accc79d4259f341f4fbf6306103e28521b070119b2ee6be3e7bb98e08802b78ad857f476524a128d9c51cd7ca02fb59298ac70886b70a1304de8d39455d13d5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ree_lib (1.0.71)
+    ree_lib (1.0.72)
       binding_of_caller (~> 1.0.0)
       i18n (~> 1.12.0)
       loofah (~> 2.18.0)

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

@@ -3,14 +3,12 @@ module ReeDao
     include Ree::LinkDSL
     include ReeDao::AssociationMethods
 
-    link :demodulize, from: :ree_string
     link :group_by, from: :ree_array
     link :index_by, from: :ree_array
-    link :underscore, from: :ree_string
 
     attr_reader :parent, :parent_dao, :list, :global_opts
 
-    contract(ReeDao::Associations, Sequel::Dataset, Array, Ksplat[RestKeys => Any] => Any)
+    contract(ReeDao::Associations, Nilor[Sequel::Dataset], Array, Ksplat[RestKeys => Any] => Any)
     def initialize(parent, parent_dao, list, **global_opts)
       @parent = parent
       @parent_dao = parent_dao
@@ -51,8 +49,7 @@ module ReeDao
 
       dao = if scope.is_a?(Array)
         return [] if scope.empty?
-        name = underscore(demodulize(scope.first.class.name))
-        find_dao(name, parent, nil)
+        nil
       else
         find_dao(assoc_name, parent, scope)
       end
@@ -125,7 +122,7 @@ module ReeDao
         **global_opts
       )
 
-      if parent_dao.db.in_transaction? || ReeDao::Associations.sync_mode?
+      if parent_dao.nil? || parent_dao.db.in_transaction? || ReeDao::Associations.sync_mode?
         associations.instance_exec(assoc_list, &block)
       else
         threads = associations.instance_exec(assoc_list, &block)
@@ -145,7 +142,7 @@ module ReeDao
     end
 
     contract(
-      Sequel::Dataset,
+      Nilor[Sequel::Dataset],
       Symbol,
       Array,
       Kwargs[
@@ -170,7 +167,11 @@ module ReeDao
         if reverse
           # has_one
           if !foreign_key
-            foreign_key = "#{parent_dao.first_source_table.to_s.gsub(/s$/,'')}_id".to_sym
+            if parent_dao.nil?
+              raise ArgumentError.new("foreign_key should be provided for :#{assoc_name} association")
+            end
+
+            foreign_key = foreign_key_from_dao(parent_dao)
           end
 
           root_ids = list.map(&:id).uniq
@@ -206,7 +207,7 @@ module ReeDao
     end
 
     contract(
-      Sequel::Dataset,
+      Nilor[Sequel::Dataset],
       Symbol,
       Array,
       Kwargs[
@@ -228,7 +229,13 @@ module ReeDao
         assoc_dao = nil
         assoc_dao = find_dao(assoc_name, parent, scope)
 
-        foreign_key ||= "#{parent_dao.first_source_table.to_s.gsub(/s$/, '')}_id".to_sym
+        if !foreign_key
+          if parent_dao.nil?
+            raise ArgumentError.new("foreign_key should be provided for :#{assoc_name} association")
+          end
+
+          foreign_key = foreign_key_from_dao(parent_dao)
+        end
 
         root_ids = list.map(&:"#{primary_key}")
 
@@ -343,5 +350,11 @@ module ReeDao
 
       parent.agg_caller.send(method, *args, &block)
     end
+
+    private
+
+    def foreign_key_from_dao(dao)
+      "#{dao.first_source_table.to_s.gsub(/s$/, '')}_id".to_sym
+    end
   end
 end

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

@@ -87,7 +87,7 @@ module ReeDao
       Optblock => Any
     )
     def association(assoc_type, assoc_name, __opts, &block)
-      if parent_dao.db.in_transaction? || self.class.sync_mode?
+      if parent_dao.nil? || parent_dao.db.in_transaction? || self.class.sync_mode?
         return if association_is_not_included?(assoc_name) || list.empty?
 
         association = Association.new(self, parent_dao, list, **global_opts)

data/lib/ree_lib/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ree_lib
 version: !ruby/object:Gem::Version
-  version: 1.0.71
+  version: 1.0.72
 platform: ruby
 authors:
 - Ruslan Gatiyatov