forest_liana 7.6.10 → 7.6.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 529622dcf795df3fecbb514a1b707c59ba2508d5b9c09b51ebc4cd25984cc558
-  data.tar.gz: 31d36870440829fcad6549e452ccba2b25cde75a9bb3ce3c7370baf48248c6c2
+  metadata.gz: 9b031b66a7afc9e69d6d16fdc8787ce99087abe166faa9e708bf19ad4583b464
+  data.tar.gz: a94b3ad5cc17306b53e43424e1b4317561bcd59484aa270422cb5a0a20216d7d
 SHA512:
-  metadata.gz: 8183bd54a698c09f6831a8972bf108074cf038f983c3e9e89ab688b61dab07d9bb9e4fc75b337d0bcf54fe6d64e11eb96cfe7e3e6a05b133f9b2c3c5dd2a2724
-  data.tar.gz: f677de6ae48ec830dcde1f2f9acaa7b795017f4a068af72a5d2f3eacc3c826c5df6827fe5398869671ef275d86beb355736eefd64a7b1f965c3baa8dc5a760f6
+  metadata.gz: 6f29bbbed569c99ec65dc51711c98744dd4e249bc62845c3bc0b0c0eda3c734ce9fc8dd15fc23a29e83ad884430e25b5315183f0d95c00102376f8c930fcee58
+  data.tar.gz: d27f1c9eec56ddb0889552e6edcf2312866b5df5a5f11a924611b84c00f02b48ed332dac5fd884b31e3fd3000be38015ecfdc393c1c4a083b6fcef4d4baaf402

data/app/services/forest_liana/schema_adapter.rb

@@ -8,7 +8,7 @@ module ForestLiana
       add_columns
       add_associations
 
-      collection.fields.sort_by! { |k| k[:field].to_s }
+      collection.fields.sort_by!.with_index { |k, idx| [k[:field].to_s, idx] }
 
       # NOTICE: Add ActsAsTaggable fields
       if @model.try(:taggable?) && @model.respond_to?(:acts_as_taggable) &&

data/app/services/forest_liana/schema_utils.rb

@@ -31,11 +31,7 @@ module ForestLiana
         if model.abstract_class?
           model_found = self.find_model_from_abstract_class(model, collection_name)
         elsif ForestLiana.name_for(model) == collection_name
-          if self.sti_child?(model)
-            model_found = model
-          else
-            model_found = model.base_class
-          end
+          model_found = model
         end
 
         break if model_found
@@ -90,28 +86,5 @@ module ForestLiana
     def self.is_active_type? model
       Object.const_defined?('ActiveType::Object') && model < ActiveType::Object
     end
-
-    def self.sti_child?(model)
-      begin
-        parent = model.try(:superclass)
-        return false unless parent.try(:table_name)
-
-        if ForestLiana.name_for(parent)
-          inheritance_column = parent.columns.find do |column|
-            (parent.inheritance_column && column.name == parent.inheritance_column)\
-              || column.name == 'type'
-          end
-
-          return inheritance_column.present?
-        end
-      rescue NoMethodError
-        # NOTICE: ActiveRecord::Base throw the exception "undefined method
-        # `abstract_class?' for Object:Class" when calling the existing method
-        # "table_name".
-        return false
-      end
-
-      return false
-    end
   end
 end

data/app/services/forest_liana/scope_manager.rb

@@ -48,7 +48,7 @@ module ForestLiana
         Thread.new { refresh_scopes_cache(rendering_id) }
       end
 
-      @@scopes_cache[rendering_id][:scopes][collection_name]
+      @@scopes_cache[rendering_id][:scopes][collection_name].deep_dup
     end
 
     def self.has_cache_expired?(rendering_id)
@@ -91,7 +91,6 @@ module ForestLiana
           condition['value'] = dynamic_scopes_values.dig('users', user_id, value)
         end
       end
-
       filter
     end
 

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "7.6.10"
+  VERSION = "7.6.13"
 end

metadata

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