rasti-db 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3166fff22e51aca6cd07d0994d1bf6170438e0bc9aed41e90370a83920a0d9ff
-  data.tar.gz: 73e64013ec42740653058f0d9ff6c37ee45de41be0312f2296e4926fb7bff5b4
+  metadata.gz: d9da5c8d1c2a7912585a7b1f43e9f3ded9dc859e362ce071c692659e4f98b4ba
+  data.tar.gz: fa12eafca7db2b3b540871e8701218d3bb176a7cbd3b1c36d57b8fef4884064f
 SHA512:
-  metadata.gz: 55c6fc7f5b3ef1d904f252e6d54c595b5d4cb72f1fbdf67f3e577c9cc095bd838f0963f34f611f6b7069971f7ead1d96d7dd20864dbcfea8ed542c5a3008dfdc
-  data.tar.gz: 3b6c0136ba9823832cf329b3efe78406e69ea92d6d90f89950652628de740ea675a8b7d7152e530838f269b9b32140fa7f80750bcc2b41af70c9efc2b275cd78
+  metadata.gz: cd5dbacac1bf5afe377e2c3078691e8b77afed7c1fe0fa55a25e1c446f698c91630bb07045791d1aacaad45fef2967c27b2a316368083a4e27d0fd45f36c6955
+  data.tar.gz: 83a7a7048def925647078c13cfe241ca3f082cb0ab41a377d9d58fef69de1ffc06fcd781f62e51b7677bf3ffb1d60889a8d88941bc3e44c3127f656e1af720d9

data/lib/rasti/db/query.rb

@@ -57,14 +57,16 @@ module Rasti
         build_query relations_graph: relations_graph.with_all_attributes_for(relations)
       end
 
-      def append_computed_attribute(name)
-        computed_attribute = collection_class.computed_attributes[name]
-        ds = computed_attribute.apply_join(dataset).select_append(computed_attribute.identifier.as(name))
+      def select_computed_attributes(*computed_attributes)
+        ds = computed_attributes.inject(dataset) do |ds, name|
+          computed_attribute = collection_class.computed_attributes[name]
+          computed_attribute.apply_join(ds).select_append(computed_attribute.identifier.as(name))
+        end
         build_query dataset: ds
       end
 
       def all
-        with_graph(dataset.all).map do |row| 
+        with_graph(dataset.all).map do |row|
           collection_class.model.new row
         end
       end
@@ -74,13 +76,15 @@ module Rasti
         if batch_size.nil?
           all.each(&block)
         else
-          each_model_in_batches(size: batch_size, &block)
+          each_batch(size: batch_size) do |models|
+            models.each { |model| block.call model }
+          end
         end
       end
 
       def each_batch(size:, &block)
-        dataset.each_page(size) do |page|
-          query = build_query dataset: page
+        primary_keys.each_slice(size) do |pks|
+          query = where(collection_class.primary_key => pks)
           block.call query.all
         end
       end
@@ -167,14 +171,6 @@ module Rasti
         build_query dataset: instance_eval(&block)
       end
 
-      def each_model_in_batches(size:, &block)
-        dataset.each_page(size) do |page|
-          page.each do |row|
-            block.call build_model(row)
-          end
-        end
-      end
-
       def with_related(relation_name, primary_keys)
         ds = collection_class.relations[relation_name].apply_filter environment, dataset, primary_keys
         build_query dataset: ds

data/lib/rasti/db/version.rb

@@ -1,5 +1,5 @@
 module Rasti
   module DB
-    VERSION = '2.1.0'
+    VERSION = '2.2.0'
   end
 end

data/spec/minitest_helper.rb

@@ -132,8 +132,6 @@ class Minitest::Spec
   let :db do
     Sequel.connect(driver).tap do |db|
 
-      db.extension :pagination
-
       db.create_table :users do
         primary_key :id
         String :name, null: false, unique: true

data/spec/query_spec.rb

@@ -142,13 +142,13 @@ describe 'Query' do
                .must_equal [post]
   end
 
-  describe 'Append computed attribute' do
+  describe 'Select computed attributes' do
     it 'With join' do
       db[:comments].insert post_id: 1, user_id: 5, text: 'Comment 4'
-      users_query.append_computed_attribute(:comments_count)
-                .where(id: 5)
-                .all
-                .must_equal [User.new(id: 5, name: 'User 5', comments_count: 2)]
+      users_query.select_computed_attributes(:comments_count)
+                 .where(id: 5)
+                 .all
+                 .must_equal [User.new(id: 5, name: 'User 5', comments_count: 2)]
     end
 
     it 'Without join' do
@@ -159,7 +159,7 @@ describe 'Query' do
                                    birth_date: Date.parse('2020-04-24'),
                                    full_name: 'Name 1 Last Name 1'
 
-      people_query.append_computed_attribute(:full_name)
+      people_query.select_computed_attributes(:full_name)
                   .where(document_number: 'document_1')
                   .all
                   .must_equal [person_expected]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rasti-db
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Gabriel Naiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-14 00:00:00.000000000 Z
+date: 2020-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel