ree_lib 1.0.56 → 1.0.57

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23c4603ab3ab820869ca4478b42b3d350c5484c8da7b21c99b469449f45764a1
-  data.tar.gz: 4293f4d083185f09f6098e11698b5f35981a748b00ff84e486389bab19445751
+  metadata.gz: 84ad4225d13e31575c1799fd4c7a4b480a1e7ae6b9709834447a733a3a260367
+  data.tar.gz: ba98679b88ac6ad2cec30fcd0280c01638220fdd0a7488f8f33c7ead0dd2de7d
 SHA512:
-  metadata.gz: fe885988996c1f0b9aeba40c9f61e119ab4ffc02aa471afe3774b470192fc5601093c1b13673febebad76bf348baa0be61cb2e19a5abf81b1970b518d86ddc9d
-  data.tar.gz: acbdf84eacfa6c46c6997999af1e0eb5dc03eedc95b95d954927a3907048c9c28d924328041203d02db1bd5c9dc78310c2cc234db826c74e585a8701b7982ed9
+  metadata.gz: ccbda33bb5233fc869f470993a93ec1770471e6fdce354a49455bf15c487731b06384bb776ed762c172e75428d77a071fc4483087cdbd2de8ef780729ccae3ac
+  data.tar.gz: d24649974cf1ca2f05c0bece050a7aa91450244cc065f972acacef6f7d966ee52f285c458cf9925d76693b14862d9ebfe77d42142dbb1bea24c3277a26b5a887

data/Gemfile.lock

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

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

@@ -143,6 +143,8 @@ module ReeDao
     def get_assoc_opts(opts)
       if opts.is_a?(Proc)
         opts.call
+      elsif opts.is_a?(Sequel::Dataset)
+        { scope: opts }
       else
         {}
       end

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

@@ -37,7 +37,9 @@ class ReeDao::LoadAgg
     list = scope.is_a?(Sequel::Dataset) ? scope.all : scope
 
     if opts[:to_dto]
-      list = opts[:to_dto].call(list)
+      list = list.map do |item|
+        list = opts[:to_dto].call(item)
+      end
     end
 
     load_associations(list, **opts, &block) if block_given?

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

@@ -275,7 +275,7 @@ RSpec.describe :load_agg do
       load_agg(users, ids_or_scope, **opts) do |agg_list|
         some_id = agg_list.first.id
         title = "1984"
-        belongs_to :organization
+        belongs_to :organization, organizations.by_name("Corp")
 
         has_many :books, -> { books_opts(title) }
       end
@@ -292,6 +292,22 @@ RSpec.describe :load_agg do
     end
   end
 
+  class ReeDaoLoadAggTest::UsersAggOnlyDataset
+    include ReeDao::AggregateDSL
+
+    aggregate :users_agg_only_dataset do
+      link :users, 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
+        has_many :books, books.where(title: "1408")
+      end
+    end
+  end
+
   class ReeDaoLoadAggTest::UsersAggWithoutDao
     include ReeDao::AggregateDSL
 
@@ -316,6 +332,7 @@ RSpec.describe :load_agg do
   let(:users_agg_autoload_reviews_children) { ReeDaoLoadAggTest::UsersAggAutoloadReviewsChildren.new }
   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(:organizations) { ReeDaoLoadAggTest::Organizations.new }
   let(:users) { ReeDaoLoadAggTest::Users.new }
   let(:user_passports) { ReeDaoLoadAggTest::UserPassports.new }
@@ -354,21 +371,41 @@ RSpec.describe :load_agg do
 
     res = users_agg_with_dto.call(
       users.all,
-      to_dto: -> (users) {
-        users.map do |user|
-          ReeDaoLoadAggTest::UserDto.new(
-            id: user.id,
-            name: user.name,
-            organization_id: user.organization_id,
-            full_name: user.name
-          )
-        end
+      to_dto: -> (user) {
+        ReeDaoLoadAggTest::UserDto.new(
+          id: user.id,
+          name: user.name,
+          organization_id: user.organization_id,
+          full_name: user.name
+        )
       }
     )
 
-    res_user = res[0]
+    expect(res.first.class).to eq(ReeDaoLoadAggTest::UserDto)
+  }
+
+  it {
+    organizations.delete_all
+    users.delete_all
+
+    org = ReeDaoLoadAggTest::Organization.new(name: "Test Org")
+    organizations.put(org)
+
+    user = ReeDaoLoadAggTest::User.new(name: "John", age: 33, organization_id: org.id)
+    users.put(user)
+
+    book_1 = ReeDaoLoadAggTest::Book.new(user_id: user.id, title: "1984")
+    book_2 = ReeDaoLoadAggTest::Book.new(user_id: user.id, title: "1408")
+    book_3 = ReeDaoLoadAggTest::Book.new(user_id: user.id, title: "1408")
+
+    books.put(book_1)
+    books.put(book_2)
+    books.put(book_3)
+    
+    res = users_agg_only_dataset.call(users.where(name: "John"))
 
-    expect(res_user.class).to eq(ReeDaoLoadAggTest::UserDto)
+    user = res[0]
+    expect(user.books.map(&:title).uniq).to eq(["1408"])
   }
 
   it {

data/lib/ree_lib/version.rb

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

metadata

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