forest_admin_datasource_active_record 1.0.0.pre.beta.47 → 1.0.0.pre.beta.49

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cdcd9294dea10cadd5dded524d1384d64ce7406076ecd6a5f5a024c03a4d377f
-  data.tar.gz: 8d84560eb10754d5f66722fddb8189203af433bdf1344cb800ecaa966ed61171
+  metadata.gz: 3751729665ad36eddcb41f4e994f500e560475c7f7ae96a7f70f2609270572fd
+  data.tar.gz: 48081174198bec227b8b6114fe5cfa35b72c917ad5a95bea4755be32e420cf0f
 SHA512:
-  metadata.gz: 7ff18cacf134668c70a6f2ffdc5510597fb86fb04c3df74a2bea583d9c045454e360d0dce8bf56adb3ea981d2e15f6a05afa08454fed60697fac2115b77d0228
-  data.tar.gz: 5eb548cfe3eab7c7bc0e783bd90c852f46108006df0824905b22a14451c1988367535de3f45fcc1399b5d620af77ed54b382c9f3e974676b6469b84db6275067
+  metadata.gz: 955a888a7c4fa73370b581a8f78a50b7e2eaf24b65324aded83acc2d195f32449767d7f9a2c75a8b8c02f12f81ddfe30d5e77325edb0868f0616d80d551f4774
+  data.tar.gz: 3d2f22d5028b5f7e08e25567d7f6f7975c0e9e657d8b2e2ad43ee3a9adb148117bb7cdaa64cca8132f778d4f74690f6bad8195eb9129c220ff0ab311374cdc92

data/forest_admin_datasource_active_record.gemspec

@@ -17,7 +17,7 @@ admin work on any Ruby application."
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/ForestAdmin/agent-ruby"
-  spec.metadata["changelog_uri"] = "https://github.com/ForestAdmin/agent-ruby/CHANGELOG.md"
+  spec.metadata["changelog_uri"] = "https://github.com/ForestAdmin/agent-ruby/blob/main/CHANGELOG.md"
   spec.metadata["rubygems_mfa_required"] = "false"
 
   # Specify which files should be added to the gem when it is released.

data/lib/forest_admin_datasource_active_record/collection.rb

@@ -16,9 +16,9 @@ module ForestAdminDatasourceActiveRecord
     end
 
     def list(_caller, filter, projection)
-      query = Utils::Query.new(self, projection, filter).build
+      query = Utils::Query.new(self, projection, filter)
 
-      query.all.map { |record| Utils::ActiveRecordSerializer.new(record).to_hash }
+      query.get.map { |record| Utils::ActiveRecordSerializer.new(record).to_hash }
     end
 
     def aggregate(_caller, filter, aggregation, limit = nil)

data/lib/forest_admin_datasource_active_record/utils/query.rb

@@ -18,9 +18,16 @@ module ForestAdminDatasourceActiveRecord
         apply_select
       end
 
+      def get
+        build
+
+        return @query.all if @filter.page.nil?
+
+        @query.offset(@filter.page.offset).limit(@filter.page.limit)
+      end
+
       def apply_filter
         @query = apply_condition_tree(@filter.condition_tree) unless @filter.condition_tree.nil?
-        @query = apply_pagination(@filter.page) unless @filter.page.nil?
         @query = apply_sort(@filter.sort) unless @filter.sort.nil?
 
         @query
@@ -92,11 +99,6 @@ module ForestAdminDatasourceActiveRecord
                          "#{@collection.model.table_name}.#{relation_schema.foreign_key}"
                        end
           end
-
-          # @query = @query.select(query_select.join(', '))
-          # @query = @query.eager_load(@projection.relations.keys.map(&:to_sym))
-          # # TODO: replace eager_load by joins because eager_load select ALL columns of relation
-          # # @query = @query.joins(@projection.relations.keys.map(&:to_sym))
         end
 
         @query

data/lib/forest_admin_datasource_active_record/utils/query_aggregate.rb

@@ -37,8 +37,8 @@ module ForestAdminDatasourceActiveRecord
       def compute_result_aggregate(rows)
         rows.map do |row|
           {
-            value: row.send(@operation.to_sym),
-            group: @aggregation.groups.each_with_object({}) do |group, memo|
+            'value' => row.send(@operation.to_sym),
+            'group' => @aggregation.groups.each_with_object({}) do |group, memo|
               memo[group[:field]] = row.send(group[:field].to_sym)
             end
           }

data/lib/forest_admin_datasource_active_record/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminDatasourceActiveRecord
-  VERSION = "1.0.0-beta.47"
+  VERSION = "1.0.0-beta.49"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_admin_datasource_active_record
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.beta.47
+  version: 1.0.0.pre.beta.49
 platform: ruby
 authors:
 - Matthieu
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-05-22 00:00:00.000000000 Z
+date: 2024-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -65,7 +65,6 @@ extra_rdoc_files: []
 files:
 - ".rspec"
 - LICENSE
-- README.md
 - Rakefile
 - forest_admin_datasource_active_record.gemspec
 - lib/forest_admin_datasource_active_record.rb
@@ -86,7 +85,7 @@ licenses:
 metadata:
   homepage_uri: https://www.forestadmin.com
   source_code_uri: https://github.com/ForestAdmin/agent-ruby
-  changelog_uri: https://github.com/ForestAdmin/agent-ruby/CHANGELOG.md
+  changelog_uri: https://github.com/ForestAdmin/agent-ruby/blob/main/CHANGELOG.md
   rubygems_mfa_required: 'false'
 post_install_message: 
 rdoc_options: []

data/README.md

@@ -1,31 +0,0 @@
-# ForestAdminDatasourceActiveRecord
-
-TODO: Delete this and the text below, and describe your gem
-
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/forest_admin_datasource_active_record`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-## Installation
-
-TODO: Replace `UPDATE_WITH_YOUR_GEM_NAME_PRIOR_TO_RELEASE_TO_RUBYGEMS_ORG` with your gem name right after releasing it to RubyGems.org. Please do not do it earlier due to security reasons. Alternatively, replace this section with instructions to install your gem from git if you don't plan to release to RubyGems.org.
-
-Install the gem and add to the application's Gemfile by executing:
-
-    $ bundle add UPDATE_WITH_YOUR_GEM_NAME_PRIOR_TO_RELEASE_TO_RUBYGEMS_ORG
-
-If bundler is not being used to manage dependencies, install the gem by executing:
-
-    $ gem install UPDATE_WITH_YOUR_GEM_NAME_PRIOR_TO_RELEASE_TO_RUBYGEMS_ORG
-
-## Usage
-
-TODO: Write usage instructions here
-
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to [rubygems.org](https://rubygems.org).
-
-## Contributing
-
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/forest_admin_datasource_active_record.