forest_liana 7.7.1 → 7.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c02a63ee28d085f4d9c67052da7a2699660658be64eca344e6325d3e759723e4
-  data.tar.gz: 3342aface5ee342ef696d794dc4566780a8c47af75bdd3ae22ebbed1485b1768
+  metadata.gz: e8c6c5a8b5b33ac56a02d5b3a25b8d02e30789da233e7449d32a0b2675802f32
+  data.tar.gz: b5d2d9b22e74c1a55e20a84b2f6fb2975837d2413dbb520d772211595d6215e2
 SHA512:
-  metadata.gz: be594c260067dbed8109038afe6f0b63322dac51d8c5635b62280e8611aad02cab0b21c44314140a988f0482d21b3df6e9a50cf7933fd9cc3b8cd63e84faae16
-  data.tar.gz: 042f28ed3fb7b0dbbf4db36042fb16dbbabda97c874776a5729e4601b3cdf517e04d7b567f3caa4ea32db75fed11a1c4872fbf44d032ffe68a007518387619ea
+  metadata.gz: 68c3af37427709c5b5292d122694f5ae8999262f37ba5f8ebb6cdf8873c1f6bafb543b4be45d14ab707d2913afab270c9a16910ca6528394fb5ac74c8098792d
+  data.tar.gz: a41c9d7e1e9504404b127a139b5f2a9bbf8cc7f7727b646c10ee66b7045fb58ac2639a5c5b1efc75f066b58126ff66085f9cc8f4cd98ef956c718335d85b36cb

data/app/serializers/forest_liana/serializer_factory.rb

@@ -369,7 +369,6 @@ module ForestLiana
 
     def attributes(active_record_class)
       return [] if @is_smart_collection
-
       active_record_class.column_names.select do |column_name|
         !association?(active_record_class, column_name)
       end
@@ -410,7 +409,7 @@ module ForestLiana
 
     def foreign_keys(active_record_class)
       begin
-        SchemaUtils.associations(active_record_class).map(&:foreign_key)
+        SchemaUtils.belongs_to_associations(active_record_class).map(&:foreign_key)
       rescue => err
         # Association foreign_key triggers an error. Put the stacktrace and
         # returns no foreign keys.

data/app/services/forest_liana/line_stat_getter.rb

@@ -23,7 +23,7 @@ module ForestLiana
     end
 
     def perform
-      value = get_resource().joins(@includes)
+      value = get_resource()
 
       filters = ForestLiana::ScopeManager.append_scope_for_user(@params[:filters], @user, @resource.name)
 

data/app/services/forest_liana/schema_utils.rb

@@ -18,6 +18,12 @@ module ForestLiana
       end
     end
 
+    def self.belongs_to_associations(active_record_class)
+      self.associations(active_record_class).select do |x|
+        [:belongs_to].include?(x.macro)
+      end
+    end
+
     def self.many_associations(active_record_class)
       self.associations(active_record_class).select do |x|
         [:has_many, :has_and_belongs_to_many].include?(x.macro)

data/app/services/forest_liana/stat_getter.rb

@@ -8,5 +8,11 @@ module ForestLiana
       @user = forest_user
       compute_includes()
     end
+
+    def get_resource
+      super
+      @resource.reorder('')
+    end
+
   end
 end

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "7.7.1"
+  VERSION = "7.7.3"
 end

data/spec/dummy/app/models/owner.rb

@@ -1,3 +1,5 @@
 class Owner < ActiveRecord::Base
   has_many :trees
+
+  default_scope { order('hired_at ASC') }
 end

data/spec/services/forest_liana/line_stat_getter_spec.rb

@@ -7,6 +7,7 @@ module ForestLiana
     before(:each) do
       ForestLiana::ScopeManager.invalidate_scope_cache(rendering_id)
       allow(ForestLiana::ScopeManager).to receive(:fetch_scopes).and_return(scopes)
+      Owner.delete_all
     end
 
     describe 'Check client_timezone function' do
@@ -54,5 +55,21 @@ module ForestLiana
         end
       end
     end
+
+    describe 'Check new instance function' do
+      describe 'Using a Count aggregation' do
+        it 'should remove any order to the resource' do
+          Owner.create(name: 'Shuri', hired_at: Date.parse('09-11-2022'));
+          stat = LineStatGetter.new(Owner, {
+            timezone: "Europe/Paris",
+            aggregate: "Count",
+            time_range: "Day",
+            group_by_date_field: "hired_at",
+          }, user)
+
+          expect(stat.get_resource.where(name: "Shuri").to_sql.downcase.exclude? "order by").to be true
+        end
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 7.7.1
+  version: 7.7.3
 platform: ruby
 authors:
 - Sandro Munda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-20 00:00:00.000000000 Z
+date: 2022-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -523,193 +523,193 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.5
 signing_key: 
 specification_version: 4
 summary: Official Rails Liana for Forest
 test_files:
-- test/fixtures/has_many_field.yml
-- test/fixtures/tree.yml
-- test/fixtures/owner.yml
-- test/fixtures/has_one_field.yml
-- test/fixtures/has_many_through_field.yml
-- test/fixtures/serialize_field.yml
-- test/fixtures/reference.yml
-- test/fixtures/belongs_to_field.yml
-- test/fixtures/string_field.yml
-- test/routing/route_test.rb
-- test/test_helper.rb
-- test/services/forest_liana/operator_date_interval_parser_test.rb
-- test/services/forest_liana/schema_adapter_test.rb
-- test/forest_liana_test.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environment.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/config/routes.rb
-- test/dummy/config/database.yml
-- test/dummy/config/initializers/cookies_serializer.rb
-- test/dummy/config/initializers/filter_parameter_logging.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/assets.rb
-- test/dummy/config/initializers/session_store.rb
-- test/dummy/config/application.rb
-- test/dummy/config/secrets.yml
-- test/dummy/config/boot.rb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/app/models/has_one_field.rb
-- test/dummy/app/models/has_many_class_name_field.rb
+- test/dummy/README.rdoc
+- test/dummy/Rakefile
+- test/dummy/app/assets/config/manifest.js
+- test/dummy/app/assets/javascripts/application.js
+- test/dummy/app/assets/stylesheets/application.css
+- test/dummy/app/controllers/application_controller.rb
+- test/dummy/app/helpers/application_helper.rb
 - test/dummy/app/models/belongs_to_class_name_field.rb
-- test/dummy/app/models/serialize_field.rb
-- test/dummy/app/models/owner.rb
+- test/dummy/app/models/belongs_to_field.rb
 - test/dummy/app/models/boolean_field.rb
 - test/dummy/app/models/date_field.rb
-- test/dummy/app/models/has_and_belongs_to_many_field.rb
+- test/dummy/app/models/decimal_field.rb
 - test/dummy/app/models/float_field.rb
-- test/dummy/app/models/polymorphic_field.rb
-- test/dummy/app/models/has_many_through_field.rb
+- test/dummy/app/models/has_and_belongs_to_many_field.rb
+- test/dummy/app/models/has_many_class_name_field.rb
 - test/dummy/app/models/has_many_field.rb
+- test/dummy/app/models/has_many_through_field.rb
+- test/dummy/app/models/has_one_field.rb
 - test/dummy/app/models/integer_field.rb
-- test/dummy/app/models/string_field.rb
-- test/dummy/app/models/decimal_field.rb
+- test/dummy/app/models/owner.rb
+- test/dummy/app/models/polymorphic_field.rb
 - test/dummy/app/models/reference.rb
-- test/dummy/app/models/belongs_to_field.rb
+- test/dummy/app/models/serialize_field.rb
+- test/dummy/app/models/string_field.rb
 - test/dummy/app/models/tree.rb
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/assets/config/manifest.js
-- test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/assets/stylesheets/application.css
-- test/dummy/db/schema.rb
-- test/dummy/db/migrate/20170614141921_create_serialize_field.rb
+- test/dummy/app/views/layouts/application.html.erb
+- test/dummy/bin/bundle
+- test/dummy/bin/rails
+- test/dummy/bin/rake
+- test/dummy/bin/setup
+- test/dummy/config/application.rb
+- test/dummy/config/boot.rb
+- test/dummy/config/database.yml
+- test/dummy/config/environment.rb
+- test/dummy/config/environments/development.rb
+- test/dummy/config/environments/production.rb
+- test/dummy/config/environments/test.rb
+- test/dummy/config/initializers/assets.rb
+- test/dummy/config/initializers/backtrace_silencers.rb
+- test/dummy/config/initializers/cookies_serializer.rb
+- test/dummy/config/initializers/filter_parameter_logging.rb
+- test/dummy/config/initializers/inflections.rb
+- test/dummy/config/initializers/mime_types.rb
+- test/dummy/config/initializers/session_store.rb
+- test/dummy/config/initializers/wrap_parameters.rb
+- test/dummy/config/locales/en.yml
+- test/dummy/config/routes.rb
+- test/dummy/config/secrets.yml
+- test/dummy/config.ru
 - test/dummy/db/migrate/20150608130516_create_date_field.rb
-- test/dummy/db/migrate/20150609114636_create_belongs_to_class_name_field.rb
-- test/dummy/db/migrate/20181111162121_create_references_table.rb
-- test/dummy/db/migrate/20160628173505_add_timestamps.rb
-- test/dummy/db/migrate/20150612112520_create_has_and_belongs_to_many_field.rb
-- test/dummy/db/migrate/20150608133044_create_has_one_field.rb
-- test/dummy/db/migrate/20150608150016_create_has_many_field.rb
-- test/dummy/db/migrate/20160627172810_create_owner.rb
-- test/dummy/db/migrate/20150608132159_create_boolean_field.rb
+- test/dummy/db/migrate/20150608131430_create_integer_field.rb
+- test/dummy/db/migrate/20150608131603_create_decimal_field.rb
 - test/dummy/db/migrate/20150608131610_create_float_field.rb
+- test/dummy/db/migrate/20150608132159_create_boolean_field.rb
+- test/dummy/db/migrate/20150608132621_create_string_field.rb
 - test/dummy/db/migrate/20150608133038_create_belongs_to_field.rb
-- test/dummy/db/migrate/20150814081918_create_has_many_through_field.rb
+- test/dummy/db/migrate/20150608133044_create_has_one_field.rb
+- test/dummy/db/migrate/20150608150016_create_has_many_field.rb
+- test/dummy/db/migrate/20150609114636_create_belongs_to_class_name_field.rb
+- test/dummy/db/migrate/20150612112520_create_has_and_belongs_to_many_field.rb
 - test/dummy/db/migrate/20150616150629_create_polymorphic_field.rb
 - test/dummy/db/migrate/20150623115554_create_has_many_class_name_field.rb
-- test/dummy/db/migrate/20150608131430_create_integer_field.rb
-- test/dummy/db/migrate/20150608131603_create_decimal_field.rb
-- test/dummy/db/migrate/20150608132621_create_string_field.rb
+- test/dummy/db/migrate/20150814081918_create_has_many_through_field.rb
+- test/dummy/db/migrate/20160627172810_create_owner.rb
 - test/dummy/db/migrate/20160627172951_create_tree.rb
-- test/dummy/Rakefile
-- test/dummy/config.ru
-- test/dummy/README.rdoc
-- test/dummy/public/favicon.ico
+- test/dummy/db/migrate/20160628173505_add_timestamps.rb
+- test/dummy/db/migrate/20170614141921_create_serialize_field.rb
+- test/dummy/db/migrate/20181111162121_create_references_table.rb
+- test/dummy/db/schema.rb
 - test/dummy/public/404.html
-- test/dummy/public/500.html
 - test/dummy/public/422.html
-- test/dummy/bin/bundle
-- test/dummy/bin/rails
-- test/dummy/bin/setup
-- test/dummy/bin/rake
-- spec/lib/forest_liana/schema_file_updater_spec.rb
-- spec/lib/forest_liana/bootstrapper_spec.rb
-- spec/spec_helper.rb
+- test/dummy/public/500.html
+- test/dummy/public/favicon.ico
+- test/fixtures/belongs_to_field.yml
+- test/fixtures/has_many_field.yml
+- test/fixtures/has_many_through_field.yml
+- test/fixtures/has_one_field.yml
+- test/fixtures/owner.yml
+- test/fixtures/reference.yml
+- test/fixtures/serialize_field.yml
+- test/fixtures/string_field.yml
+- test/fixtures/tree.yml
+- test/forest_liana_test.rb
+- test/routing/route_test.rb
+- test/services/forest_liana/operator_date_interval_parser_test.rb
+- test/services/forest_liana/schema_adapter_test.rb
+- test/test_helper.rb
 - spec/config/initializers/logger_spec.rb
-- spec/requests/cors_spec.rb
-- spec/requests/resources_spec.rb
-- spec/requests/stats_spec.rb
-- spec/requests/count_spec.rb
-- spec/requests/actions_controller_spec.rb
-- spec/requests/authentications_spec.rb
-- spec/requests/test.ru
-- spec/rails_helper.rb
-- spec/helpers/forest_liana/schema_helper_spec.rb
-- spec/helpers/forest_liana/query_helper_spec.rb
-- spec/services/forest_liana/permissions_checker_acl_disabled_spec.rb
-- spec/services/forest_liana/permissions_checker_live_queries_spec.rb
-- spec/services/forest_liana/scope_manager_spec.rb
-- spec/services/forest_liana/permissions_getter_spec.rb
-- spec/services/forest_liana/filters_parser_spec.rb
-- spec/services/forest_liana/value_stat_getter_spec.rb
-- spec/services/forest_liana/has_many_getter_spec.rb
-- spec/services/forest_liana/permissions_formatter_spec.rb
-- spec/services/forest_liana/line_stat_getter_spec.rb
-- spec/services/forest_liana/pie_stat_getter_spec.rb
-- spec/services/forest_liana/permissions_checker_acl_enabled_spec.rb
-- spec/services/forest_liana/smart_action_field_validator_spec.rb
-- spec/services/forest_liana/resource_updater_spec.rb
-- spec/services/forest_liana/apimap_sorter_spec.rb
-- spec/services/forest_liana/ip_whitelist_checker_spec.rb
-- spec/services/forest_liana/schema_adapter_spec.rb
-- spec/services/forest_liana/resources_getter_spec.rb
-- spec/dummy/lib/forest_liana/controllers/owners_controller.rb
-- spec/dummy/lib/forest_liana/controllers/owner_trees_controller.rb
-- spec/dummy/lib/forest_liana/collections/island.rb
-- spec/dummy/lib/forest_liana/collections/location.rb
-- spec/dummy/lib/forest_liana/collections/user.rb
-- spec/dummy/config/environments/test.rb
+- spec/dummy/README.rdoc
+- spec/dummy/Rakefile
+- spec/dummy/app/assets/config/manifest.js
+- spec/dummy/app/assets/javascripts/application.js
+- spec/dummy/app/assets/stylesheets/application.css
+- spec/dummy/app/config/routes.rb
+- spec/dummy/app/controllers/application_controller.rb
+- spec/dummy/app/controllers/forest/islands_controller.rb
+- spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/app/models/application_record.rb
+- spec/dummy/app/models/car.rb
+- spec/dummy/app/models/driver.rb
+- spec/dummy/app/models/garage_record.rb
+- spec/dummy/app/models/island.rb
+- spec/dummy/app/models/location.rb
+- spec/dummy/app/models/manufacturer.rb
+- spec/dummy/app/models/owner.rb
+- spec/dummy/app/models/product.rb
+- spec/dummy/app/models/reference.rb
+- spec/dummy/app/models/sub_application_record.rb
+- spec/dummy/app/models/town.rb
+- spec/dummy/app/models/tree.rb
+- spec/dummy/app/models/user.rb
+- spec/dummy/app/models/user_record.rb
+- spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/bin/bundle
+- spec/dummy/bin/rails
+- spec/dummy/bin/rake
+- spec/dummy/bin/setup
+- spec/dummy/config/application.rb
+- spec/dummy/config/boot.rb
+- spec/dummy/config/database.yml
+- spec/dummy/config/environment.rb
 - spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/production.rb
-- spec/dummy/config/environment.rb
-- spec/dummy/config/routes.rb
-- spec/dummy/config/database.yml
+- spec/dummy/config/environments/test.rb
+- spec/dummy/config/initializers/assets.rb
+- spec/dummy/config/initializers/backtrace_silencers.rb
 - spec/dummy/config/initializers/cookies_serializer.rb
 - spec/dummy/config/initializers/filter_parameter_logging.rb
-- spec/dummy/config/initializers/backtrace_silencers.rb
+- spec/dummy/config/initializers/forest_liana.rb
 - spec/dummy/config/initializers/inflections.rb
-- spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/forest_liana.rb
-- spec/dummy/config/initializers/assets.rb
 - spec/dummy/config/initializers/session_store.rb
-- spec/dummy/config/application.rb
+- spec/dummy/config/initializers/wrap_parameters.rb
+- spec/dummy/config/routes.rb
 - spec/dummy/config/secrets.yml
-- spec/dummy/config/boot.rb
-- spec/dummy/app/config/routes.rb
-- spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/app/models/car.rb
-- spec/dummy/app/models/town.rb
-- spec/dummy/app/models/product.rb
-- spec/dummy/app/models/driver.rb
-- spec/dummy/app/models/owner.rb
-- spec/dummy/app/models/sub_application_record.rb
-- spec/dummy/app/models/island.rb
-- spec/dummy/app/models/location.rb
-- spec/dummy/app/models/garage_record.rb
-- spec/dummy/app/models/user_record.rb
-- spec/dummy/app/models/user.rb
-- spec/dummy/app/models/application_record.rb
-- spec/dummy/app/models/reference.rb
-- spec/dummy/app/models/manufacturer.rb
-- spec/dummy/app/models/tree.rb
-- spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/app/controllers/forest/islands_controller.rb
-- spec/dummy/app/controllers/application_controller.rb
-- spec/dummy/app/assets/config/manifest.js
-- spec/dummy/app/assets/javascripts/application.js
-- spec/dummy/app/assets/stylesheets/application.css
-- spec/dummy/db/schema.rb
+- spec/dummy/config.ru
+- spec/dummy/db/migrate/20190226172951_create_user.rb
+- spec/dummy/db/migrate/20190226173051_create_isle.rb
+- spec/dummy/db/migrate/20190226174951_create_tree.rb
 - spec/dummy/db/migrate/20190716130830_add_age_to_tree.rb
-- spec/dummy/db/migrate/20220719094127_create_cars.rb
 - spec/dummy/db/migrate/20190716135241_add_type_to_user.rb
-- spec/dummy/db/migrate/20210526084712_create_products.rb
-- spec/dummy/db/migrate/20220727114930_add_columns_to_products.rb
-- spec/dummy/db/migrate/20210511141752_create_owners.rb
-- spec/dummy/db/migrate/20190226173051_create_isle.rb
 - spec/dummy/db/migrate/20210326110524_create_references.rb
 - spec/dummy/db/migrate/20210326140855_create_locations.rb
-- spec/dummy/db/migrate/20190226172951_create_user.rb
-- spec/dummy/db/migrate/20190226174951_create_tree.rb
+- spec/dummy/db/migrate/20210511141752_create_owners.rb
+- spec/dummy/db/migrate/20210526084712_create_products.rb
+- spec/dummy/db/migrate/20220719094127_create_cars.rb
 - spec/dummy/db/migrate/20220719094450_create_drivers.rb
 - spec/dummy/db/migrate/20220727114450_create_manufacturers.rb
-- spec/dummy/Rakefile
-- spec/dummy/config.ru
-- spec/dummy/README.rdoc
-- spec/dummy/bin/bundle
-- spec/dummy/bin/rails
-- spec/dummy/bin/setup
-- spec/dummy/bin/rake
+- spec/dummy/db/migrate/20220727114930_add_columns_to_products.rb
+- spec/dummy/db/schema.rb
+- spec/dummy/lib/forest_liana/collections/island.rb
+- spec/dummy/lib/forest_liana/collections/location.rb
+- spec/dummy/lib/forest_liana/collections/user.rb
+- spec/dummy/lib/forest_liana/controllers/owner_trees_controller.rb
+- spec/dummy/lib/forest_liana/controllers/owners_controller.rb
+- spec/helpers/forest_liana/query_helper_spec.rb
+- spec/helpers/forest_liana/schema_helper_spec.rb
+- spec/lib/forest_liana/bootstrapper_spec.rb
+- spec/lib/forest_liana/schema_file_updater_spec.rb
+- spec/rails_helper.rb
+- spec/requests/actions_controller_spec.rb
+- spec/requests/authentications_spec.rb
+- spec/requests/cors_spec.rb
+- spec/requests/count_spec.rb
+- spec/requests/resources_spec.rb
+- spec/requests/stats_spec.rb
+- spec/requests/test.ru
+- spec/services/forest_liana/apimap_sorter_spec.rb
+- spec/services/forest_liana/filters_parser_spec.rb
+- spec/services/forest_liana/has_many_getter_spec.rb
+- spec/services/forest_liana/ip_whitelist_checker_spec.rb
+- spec/services/forest_liana/line_stat_getter_spec.rb
+- spec/services/forest_liana/permissions_checker_acl_disabled_spec.rb
+- spec/services/forest_liana/permissions_checker_acl_enabled_spec.rb
+- spec/services/forest_liana/permissions_checker_live_queries_spec.rb
+- spec/services/forest_liana/permissions_formatter_spec.rb
+- spec/services/forest_liana/permissions_getter_spec.rb
+- spec/services/forest_liana/pie_stat_getter_spec.rb
+- spec/services/forest_liana/resource_updater_spec.rb
+- spec/services/forest_liana/resources_getter_spec.rb
+- spec/services/forest_liana/schema_adapter_spec.rb
+- spec/services/forest_liana/scope_manager_spec.rb
+- spec/services/forest_liana/smart_action_field_validator_spec.rb
+- spec/services/forest_liana/value_stat_getter_spec.rb
+- spec/spec_helper.rb