ree_lib 1.0.64 → 1.0.65

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58dcd5d4f8eeefdbea1dc995ea2e76734a8dccc6a913354085453ca9a0ddd72e
-  data.tar.gz: 1d29d9be3027f3d57e3502e6269ac3cd455e50e5ecdf4b17ea73877b15379423
+  metadata.gz: e6a080727db9b2998d5e983aa2e024fd73833e6b98deb2f75eb8ac8309af1c6b
+  data.tar.gz: b96cc24d1df8586e8159e96c7545017ecab7009a01bd5b9a2b9c759fb1beeddd
 SHA512:
-  metadata.gz: 35b733d5bcaf9f7f837d212c7279c77044f29e11b5e48d0480a879180497f77805b3aa0bf5e17a8b2b1aa991f769a1452fad291d6895436d8d1eca6e9a6a4fb6
-  data.tar.gz: '08ec8fe4b53aceff584a515ca820484e59bfa387ae3d5f9c9d21fcdf73afa018d777882f40cab8e6f835fc5eb80ca941977f211614aa0005e10ebcea9fc333c9'
+  metadata.gz: c1a8e3c1d0471a58cb3dd4602a83a8da2f30498e4af39f9ade709a256592d8f3a6ef6c58a14a8fff1c3f865d9508c49e5673d4bbbe8d0ddbe95fa5dd37074695
+  data.tar.gz: 34e1a0221ad4040a469082111c63687903e6e5d6a89d25c8ada10f742efbd6774e0e8bc729c251670a5ef293b4917dfebe3c701be6155f84241a4a651d952b9c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ree_lib (1.0.64)
+    ree_lib (1.0.65)
       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

@@ -2,8 +2,10 @@ module ReeDao
   class Association
     include Ree::LinkDSL
 
+    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_name, :list, :global_opts
 
@@ -21,8 +23,8 @@ module ReeDao
       Ksplat[RestKeys => Any],
       Optblock => Array
     )
-    def load(assoc_type, assoc_name, **opts, &block)
-      load_association(assoc_type, assoc_name, **opts, &block)
+    def load(assoc_type, assoc_name, **__opts, &block)
+      load_association(assoc_type, assoc_name, **__opts, &block)
     end
 
     def handle_field(field_proc)
@@ -35,19 +37,30 @@ module ReeDao
       Ksplat[RestKeys => Any],
       Optblock => Nilor[Array]
     )
-    def load_association(assoc_type, assoc_name, **opts, &block)
-      opts[:autoload_children] ||= false
+    def load_association(assoc_type, assoc_name, **__opts, &block)
+      __opts[:autoload_children] ||= false
 
       assoc_index = load_association_by_type(
         assoc_type,
         assoc_name,
-        **opts
+        **__opts
       )
 
-      dao = find_dao(assoc_name, parent, opts[:scope])
-      dao_name = dao.first_source_table
+      dao = find_dao(assoc_name, parent, __opts[:scope])
 
-      process_block(assoc_index, opts[:autoload_children], opts[:to_dto], dao_name, &block) if block_given?
+      dao_name = if dao
+        dao.first_source_table
+      elsif __opts[:scope].is_a?(Array)
+        name = underscore(demodulize(__opts[:scope].first.class.name))
+
+        if name.end_with?("s")
+          "#{name}es"
+        else
+          "#{name}s"
+        end
+      end
+
+      process_block(assoc_index, __opts[:autoload_children], __opts[:to_dto], dao_name, &block) if block_given?
 
       list
     end
@@ -57,17 +70,17 @@ module ReeDao
       Symbol,
       Ksplat[RestKeys => Any] => Any
     )
-    def load_association_by_type(type, assoc_name, **opts)
+    def load_association_by_type(type, assoc_name, **__opts)
       case type
       when :belongs_to
         one_to_one(
           parent_dao_name,
           assoc_name,
           list,
-          scope: opts[:scope],
-          primary_key: opts[:primary_key],
-          foreign_key: opts[:foreign_key],
-          setter: opts[:setter],
+          scope: __opts[:scope],
+          primary_key: __opts[:primary_key],
+          foreign_key: __opts[:foreign_key],
+          setter: __opts[:setter],
           reverse: false
         )
       when :has_one
@@ -75,11 +88,11 @@ module ReeDao
           parent_dao_name,
           assoc_name,
           list,
-          scope: opts[:scope],
-          primary_key: opts[:primary_key],
-          foreign_key: opts[:foreign_key],
-          to_dto: opts[:to_dto],
-          setter: opts[:setter],
+          scope: __opts[:scope],
+          primary_key: __opts[:primary_key],
+          foreign_key: __opts[:foreign_key],
+          to_dto: __opts[:to_dto],
+          setter: __opts[:setter],
           reverse: true
         )
       when :has_many
@@ -87,11 +100,11 @@ module ReeDao
           parent_dao_name,
           assoc_name,
           list,
-          scope: opts[:scope],
-          primary_key: opts[:primary_key],
-          foreign_key: opts[:foreign_key],
-          to_dto: opts[:to_dto],
-          setter: opts[:setter]
+          scope: __opts[:scope],
+          primary_key: __opts[:primary_key],
+          foreign_key: __opts[:foreign_key],
+          to_dto: __opts[:to_dto],
+          setter: __opts[:setter]
         )
       end
     end
@@ -124,9 +137,9 @@ module ReeDao
           autoload_children,
           **global_opts
         ).instance_exec(assoc_list, &block)
-        threads[:association_threads].map do |association, assoc_type, assoc_name, opts, block|
+        threads[:association_threads].map do |association, assoc_type, assoc_name, __opts, block|
           Thread.new do
-            association.load(assoc_type, assoc_name, **opts, &block)
+            association.load(assoc_type, assoc_name, **__opts, &block)
           end
         end.map(&:join)
 
@@ -192,6 +205,7 @@ module ReeDao
         setter: setter,
         reverse: reverse,
         primary_key: primary_key,
+        foreign_key: foreign_key,
         to_dto: to_dto
       )
 
@@ -243,6 +257,7 @@ module ReeDao
         assoc_name,
         setter: setter,
         primary_key: primary_key,
+        foreign_key: foreign_key,
         to_dto: to_dto,
         multiple: true
       )
@@ -256,13 +271,14 @@ module ReeDao
       Symbol,
       Kwargs[
         primary_key: Nilor[Symbol],
+        foreign_key: Nilor[Symbol],
         reverse: Nilor[Bool],
         setter: Nilor[Or[Symbol, Proc]],
         to_dto: Nilor[Proc],
         multiple: Bool
       ] => Any
     )
-    def populate_association(list, association_index, assoc_name, primary_key: nil, reverse: nil, setter: nil, to_dto: nil, multiple: false)
+    def populate_association(list, association_index, assoc_name, primary_key: nil, foreign_key: nil, reverse: nil, setter: nil, to_dto: nil, multiple: false)
       assoc_setter = if setter
         setter
       else
@@ -290,7 +306,11 @@ module ReeDao
           key = if reverse.nil?
             primary_key
           else
-            reverse ? primary_key : "#{assoc_name}_id"
+            if reverse
+              primary_key
+            else
+              foreign_key ? foreign_key : "#{assoc_name}_id"
+            end
           end
 
           value = association_index[item.send(key)]
@@ -330,6 +350,7 @@ module ReeDao
       return dao_from_name if dao_from_name
 
       raise ArgumentError, "can't find DAO for :#{assoc_name}, provide correct scope or association name" if scope.nil?
+      return nil if scope.is_a?(Array)
 
       table_name = scope.first_source_table
       dao_from_scope = parent.instance_variable_get("@#{table_name}")

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

@@ -14,8 +14,13 @@ module ReeDao
       @parent_dao_name = parent_dao_name
       @autoload_children = autoload_children
 
-      raise ArgumentError.new("you can't use both :only and :except arguments at the same time") if @only && @except
+      if @only && @except
+        shared_keys = @only.intersection(@except)
 
+        if shared_keys.size > 0
+          raise ArgumentError.new("you can't use both :only and :except for #{shared_keys.map { "\"#{_1}\"" }.join(", ")} keys") 
+        end
+      end
 
       if !self.class.sync_mode?
         @assoc_threads = []
@@ -40,8 +45,8 @@ module ReeDao
       Nilor[Proc, Sequel::Dataset],
       Optblock => Any
     )
-    def belongs_to(assoc_name, opts = nil, &block)
-      association(__method__, assoc_name, opts, &block)
+    def belongs_to(assoc_name, __opts = nil, &block)
+      association(__method__, assoc_name, __opts, &block)
     end
 
     contract(
@@ -49,8 +54,8 @@ module ReeDao
       Nilor[Proc, Sequel::Dataset],
       Optblock => Any
     )
-    def has_one(assoc_name, opts = nil, &block)
-      association(__method__, assoc_name, opts, &block)
+    def has_one(assoc_name, __opts = nil, &block)
+      association(__method__, assoc_name, __opts, &block)
     end
 
     contract(
@@ -58,8 +63,8 @@ module ReeDao
       Nilor[Proc, Sequel::Dataset],
       Optblock => Any
     )
-    def has_many(assoc_name, opts = nil, &block)
-      association(__method__, assoc_name, opts, &block)
+    def has_many(assoc_name, __opts = nil, &block)
+      association(__method__, assoc_name, __opts, &block)
     end
 
     contract(Symbol, Proc => Any)
@@ -80,16 +85,16 @@ module ReeDao
       Nilor[Proc, Sequel::Dataset],
       Optblock => Any
     )
-    def association(assoc_type, assoc_name, opts, &block)
+    def association(assoc_type, assoc_name, __opts, &block)
       if self.class.sync_mode?
         return if association_is_not_included?(assoc_name) || list.empty?
 
         association = Association.new(self, parent_dao_name, list, **global_opts)
 
         if assoc_type == :field
-          association.handle_field(assoc_name, opts)
+          association.handle_field(assoc_name, __opts)
         else
-          association.load(assoc_type, assoc_name, **get_assoc_opts(opts), &block)
+          association.load(assoc_type, assoc_name, **get_assoc_opts(__opts), &block)
         end
       else
         if association_is_not_included?(assoc_name) || list.empty?
@@ -99,7 +104,7 @@ module ReeDao
         association = Association.new(self, parent_dao_name, list, **global_opts)
 
         if assoc_type == :field
-          field_proc = opts
+          field_proc = __opts
           {
             association_threads: @assoc_threads,
             field_threads: @field_threads << [
@@ -109,7 +114,7 @@ module ReeDao
         else
           {
             association_threads: @assoc_threads << [
-              association, assoc_type, assoc_name, get_assoc_opts(opts), block
+              association, assoc_type, assoc_name, get_assoc_opts(__opts), block
             ],
             field_threads: @field_threads
           }
@@ -125,7 +130,10 @@ module ReeDao
         return false if only && only.include?(assoc_name)
 
         if only && !only.include?(assoc_name)
-          return false if autoload_children
+          if autoload_children
+            return true if except && except.include?(assoc_name)
+            return false
+          end
           return true
         end
       end

data/lib/ree_lib/packages/ree_dao/spec/ree_dao/functions/load_agg/load_agg_spec.rb

@@ -105,7 +105,7 @@ RSpec.describe :load_agg do
           has_one :author
           has_many :chapters
 
-          has_many :reviews do |reviews_list|
+          has_many :reviews, -> { reviews_opts } do |reviews_list|
             has_one :review_author
 
             field :review_calculatetable_field, -> { some_method(reviews_list) }
@@ -146,6 +146,10 @@ RSpec.describe :load_agg do
         scope: books.where(title: "1984")
       }
     end
+
+    def reviews_opts
+      { autoload_children: true }
+    end
   end
 
   class ReeDaoLoadAggTest::UsersAggWithDto
@@ -353,6 +357,24 @@ RSpec.describe :load_agg do
     end
   end
 
+  class ReeDaoLoadAggTest::UsersAggOnlyExceptKeys
+    include ReeDao::AggregateDSL
+
+    aggregate :users_agg_only_except_keys do
+      link :users, from: :ree_dao_load_agg_test
+      link :organizations, from: :ree_dao_load_agg_test
+      link :books, from: :ree_dao_load_agg_test
+      link :load_agg, from: :ree_dao
+    end
+
+    def call(ids_or_scope, **opts)
+      load_agg(users, ids_or_scope, **opts) do
+        belongs_to :organization
+        has_many :books
+      end
+    end
+  end
+
   let(:users_agg) { ReeDaoLoadAggTest::UsersAgg.new }
   let(:users_agg_block) { ReeDaoLoadAggTest::UsersAggBlockTest.new }
   let(:users_agg_scope_method) { ReeDaoLoadAggTest::UsersAggScopeMethodTest.new }
@@ -361,6 +383,7 @@ RSpec.describe :load_agg do
   let(:users_agg_without_dao) { ReeDaoLoadAggTest::UsersAggWithoutDao.new }
   let(:users_agg_with_dto) { ReeDaoLoadAggTest::UsersAggWithDto.new }
   let(:users_agg_only_dataset) { ReeDaoLoadAggTest::UsersAggOnlyDataset.new }
+  let(:user_agg_only_except_keys) { ReeDaoLoadAggTest::UsersAggOnlyExceptCase.new }
   let(:organizations) { ReeDaoLoadAggTest::Organizations.new }
   let(:users) { ReeDaoLoadAggTest::Users.new }
   let(:user_passports) { ReeDaoLoadAggTest::UserPassports.new }
@@ -385,6 +408,69 @@ RSpec.describe :load_agg do
     }.to raise_error(ArgumentError)
   }
 
+  it {
+    organizations.delete_all
+    users.delete_all
+    user_passports.delete_all
+    books.delete_all
+    chapters.delete_all
+
+    organization = ReeDaoLoadAggTest::Organization.new(name: "Test Org")
+    organizations.put(organization)
+
+    user_1 = ReeDaoLoadAggTest::User.new(name: "John", age: 33, organization_id: organization.id)
+    user_2 = ReeDaoLoadAggTest::User.new(name: "Sam", age: 21, organization_id: organization.id)
+    users.put(user_1)
+    users.put(user_2)
+
+    passport_1 = ReeDaoLoadAggTest::UserPassport.new(user_id: user_1.id, info: "some info")
+    user_passports.put(passport_1)
+    user_passports.put(ReeDaoLoadAggTest::UserPassport.new(user_id: user_2.id, info: "another info"))
+
+    book_1 = ReeDaoLoadAggTest::Book.new(user_id: user_1.id, title: "1984")
+    book_2 = ReeDaoLoadAggTest::Book.new(user_id: user_1.id, title: "1408")
+
+    books.put(book_1)
+    books.put(book_2)
+
+    chapter = ReeDaoLoadAggTest::Chapter.new(book_id: book_1.id, title: "beginning")
+    chapters.put(chapter)
+    chapters.put(ReeDaoLoadAggTest::Chapter.new(book_id: book_1.id, title: "interlude"))
+    chapters.put(ReeDaoLoadAggTest::Chapter.new(book_id: book_1.id, title: "tragic ending"))
+    chapters.put(ReeDaoLoadAggTest::Chapter.new(book_id: book_2.id, title: "beginning"))
+    chapters.put(ReeDaoLoadAggTest::Chapter.new(book_id: book_2.id, title: "ending"))
+
+
+    authors.put(ReeDaoLoadAggTest::Author.new(book_id: book_1.id, name: "George Orwell"))
+    review = ReeDaoLoadAggTest::Review.new(book_id: book_1.id, rating: 10)
+    reviews.put(review)
+    reviews.put(ReeDaoLoadAggTest::Review.new(book_id: book_1.id, rating: 7))
+    review_authors.put(ReeDaoLoadAggTest::ReviewAuthor.new(review_id: review.id, name: "John Review"))
+
+    res = users_agg.call(
+      users.all,
+      only: [:books, :reviews],
+      except: [:review_author]
+    )
+
+    expect(res.first.books.first.reviews.first.review_author).to eq(nil)
+  }
+
+  it {
+    organizations.delete_all
+    users.delete_all
+
+    organization = ReeDaoLoadAggTest::Organization.new(name: "Test Org")
+    organizations.put(organization)
+
+    user = ReeDaoLoadAggTest::User.new(name: "John", age: 33, organization_id: organization.id)
+    users.put(user)
+
+    expect {
+      users_agg_without_dao.call(users.all, only: [:books], except: [:books])
+    }.to raise_error(ArgumentError, "you can't use both :only and :except for \"books\" keys")
+  }
+
   it {
     organizations.delete_all
     users.delete_all

data/lib/ree_lib/version.rb

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

metadata

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