forest_liana 7.6.1 → 7.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6bd9a95e79440b1a3c14664d2e60a18da465b6a7acbe303b13b74d2e8908625
-  data.tar.gz: e3edb0a7092586733d2f18d35692f87f87fa072dbc249152c5dd1c2f4670d8f4
+  metadata.gz: 1f706a8e009cd73a7493662f62db58e8fa05daccd6c51b3303919354573bbdb6
+  data.tar.gz: 28c20ebe192a3e9aa366026c1e2f65401cc5627806c6e1348ca6a29297b3889b
 SHA512:
-  metadata.gz: 5d408f4b76db6423df866bd4abab4b2e3bddf12141a7ea6e3dffe066bdff9af513b77fc77fb7b830395bc25542e5683f0ff571e3ba813fdcbc815af190e9df5e
-  data.tar.gz: e0e945ce71184eca4c57651dda53086e38aee31e0e592f25a6ef6d1c6db95b9ec843617969cf7a47082b85fb8635c086fa2b5ee4baacbcc02a5254b82089d0be
+  metadata.gz: b7119a64a459718a8f65b7c5a85cefcd6e427360ce14a8f5bd0749ef5eb88b30441ea82c1f409e706a60919fc7615f2f2b7b7d21d41e10490d8f9f3f2010205f
+  data.tar.gz: e85658a00033eccc188f75e59cb15a4b299044e4f7e012f92b07dad854a40b3811b524a3ba7bfedd74f2d00193d01d53424c5da09468947f5c998fd24595380b

data/app/services/forest_liana/base_getter.rb

@@ -29,5 +29,27 @@ module ForestLiana
     def compute_includes
       @includes = ForestLiana::QueryHelper.get_one_association_names_symbol(@resource)
     end
+
+    def optimize_record_loading(resource, records)
+      instance_dependent_associations = instance_dependent_associations(resource)
+      eager_loads = @includes - instance_dependent_associations
+
+      result = records.eager_load(eager_loads)
+
+      # Rails 7 can mix `eager_load` and `preload` in the same scope
+      # Rails 6 cannot mix `eager_load` and `preload` in the same scope
+      # Rails 6 and 7 cannot mix `eager_load` and `includes` in the same scope
+      if Rails::VERSION::MAJOR >= 7
+        result = result.preload(instance_dependent_associations)
+      end
+
+      result
+    end
+
+    def instance_dependent_associations(resource)
+      @includes.select do |association_name|
+        resource.reflect_on_association(association_name)&.scope&.arity&.positive?
+      end
+    end
   end
 end

data/app/services/forest_liana/has_many_getter.rb

@@ -64,12 +64,8 @@ module ForestLiana
     end
 
     def prepare_query
-      @records = @search_query_builder.perform(
-        get_resource()
-          .find(@params[:id])
-          .send(@params[:association_name])
-          .eager_load(@includes)
-      )
+      association = get_resource().find(@params[:id]).send(@params[:association_name])
+      @records = optimize_record_loading(association, @search_query_builder.perform(association))
     end
 
     def offset

data/app/services/forest_liana/pie_stat_getter.rb

@@ -5,7 +5,7 @@ module ForestLiana
     def perform
       if @params[:group_by_field]
         timezone_offset = @params[:timezone].to_i
-        resource = get_resource().eager_load(@includes)
+        resource = optimize_record_loading(@resource, get_resource)
 
         filters = ForestLiana::ScopeManager.append_scope_for_user(@params[:filters], @user, @resource.name)
 

data/app/services/forest_liana/resource_getter.rb

@@ -12,7 +12,7 @@ module ForestLiana
     end
 
     def perform
-      records = get_resource().eager_load(@includes)
+      records = optimize_record_loading(@resource, get_resource())
       scoped_records = ForestLiana::ScopeManager.apply_scopes_on_records(records, @user, @collection_name, @params[:timezone])
       @record = scoped_records.find(@params[:id])
     end

data/app/services/forest_liana/resources_getter.rb

@@ -66,13 +66,13 @@ module ForestLiana
     end
 
     def perform
-      @records = @records.eager_load(@includes)
+      @records = optimize_record_loading(@resource, @records)
     end
 
     def count
-      # NOTICE: For performance reasons, do not eager load the data if there is  no search or
+      # NOTICE: For performance reasons, do not optimize loading the data if there is  no search or
       #         filters on associations.
-      @records_count = @count_needs_includes ? @records.eager_load(@includes).count : @records.count
+      @records_count = @count_needs_includes ? optimize_record_loading(@resource, @records).count : @records.count
     end
 
     def query_for_batch

data/app/services/forest_liana/schema_adapter.rb

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

data/app/services/forest_liana/search_query_builder.rb

@@ -61,7 +61,7 @@ module ForestLiana
         conditions = []
 
         @resource.columns.each_with_index do |column, index|
-          @fields_searched << column.name if text_type? column.type
+          @fields_searched << column.name if text_type?(column.type) || column.type == :uuid
           column_name = format_column_name(@resource.table_name, column.name)
           if (@collection.search_fields && !@collection.search_fields.include?(column.name))
             conditions
@@ -73,6 +73,8 @@ module ForestLiana
               conditions << "#{@resource.table_name}.id = :search_value_for_uuid"
             end
           # NOTICE: Rails 3 do not have a defined_enums method
+          elsif REGEX_UUID.match(@search) && column.type == :uuid
+            conditions << "#{column_name}  = :search_value_for_uuid"
           elsif @resource.respond_to?(:defined_enums) &&
             @resource.defined_enums.has_key?(column.name) &&
             !@resource.defined_enums[column.name][@search.downcase].nil?

data/app/services/forest_liana/value_stat_getter.rb

@@ -4,7 +4,7 @@ module ForestLiana
 
     def perform
       return if @params[:aggregate].blank?
-      resource = get_resource().eager_load(@includes)
+      resource = optimize_record_loading(@resource, get_resource)
 
       filters = ForestLiana::ScopeManager.append_scope_for_user(@params[:filters], @user, @resource.name)
 

data/lib/forest_liana/bootstrapper.rb

@@ -59,8 +59,8 @@ module ForestLiana
           c = get_collection(collection['name'])
           unless c.nil?
             a = get_action(c, action['name'])
-            load = !a.hooks.nil? && a.hooks.key?(:load) && a.hooks[:load].is_a?(Proc)
-            change = !a.hooks.nil? && a.hooks.key?(:change) && a.hooks[:change].is_a?(Hash) ? a.hooks[:change].keys : []
+            load = !a.nil? && !a.hooks.nil? && a.hooks.key?(:load) && a.hooks[:load].is_a?(Proc)
+            change = !a.nil? && !a.hooks.nil? && a.hooks.key?(:change) && a.hooks[:change].is_a?(Hash) ? a.hooks[:change].keys : []
             action['hooks'] = {'load' => load, 'change' => change}
           end
         end

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "7.6.1"
+  VERSION = "7.6.4"
 end

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

@@ -3,4 +3,5 @@ class Island < ActiveRecord::Base
 
   has_many :trees
   has_one :location
+  has_one :eponymous_tree, ->(record) { where(name: record.name) }, class_name: 'Tree'
 end

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

@@ -2,4 +2,9 @@ class Tree < ActiveRecord::Base
   belongs_to :owner, class_name: 'User', inverse_of: :trees_owned
   belongs_to :cutter, class_name: 'User', inverse_of: :trees_cut
   belongs_to :island
+  belongs_to :eponymous_island,
+    ->(record) { where(name: record.name) },
+    class_name: 'Island',
+    inverse_of: :eponymous_tree,
+    optional: true
 end

data/spec/helpers/forest_liana/query_helper_spec.rb

@@ -14,29 +14,35 @@ module ForestLiana
         end
       end
 
-      context 'on a model having 3 belongsTo associations' do
+      context 'on a model having some belongsTo associations' do
+        let(:expected_association_attributes) do
+          [
+            { name: :owner, klass: User },
+            { name: :cutter, klass: User },
+            { name: :island, klass: Island },
+            { name: :eponymous_island, klass: Island },
+          ]
+        end
+
         it 'should return the one-one associations' do
           associations = QueryHelper.get_one_associations(Tree)
-          expect(associations.length).to eq(3)
-          expect(associations.first.name).to eq(:owner)
-          expect(associations.first.klass).to eq(User)
-          expect(associations.second.name).to eq(:cutter)
-          expect(associations.second.klass).to eq(User)
-          expect(associations.third.name).to eq(:island)
-          expect(associations.third.klass).to eq(Island)
+          expect(associations.length).to eq(expected_association_attributes.length)
+          associations.zip(expected_association_attributes).each do |association, expected_attributes|
+            expect(association).to have_attributes(expected_attributes)
+          end
         end
       end
     end
 
     describe 'get_one_association_names_symbol' do
       it 'should return the one-one associations names as symbols' do
-        expect(QueryHelper.get_one_association_names_symbol(Tree)).to eq([:owner, :cutter, :island])
+        expect(QueryHelper.get_one_association_names_symbol(Tree)).to eq([:owner, :cutter, :island, :eponymous_island])
       end
     end
 
     describe 'get_one_association_names_string' do
       it 'should return the one-one associations names as strings' do
-        expect(QueryHelper.get_one_association_names_string(Tree)).to eq(['owner', 'cutter', 'island'])
+        expect(QueryHelper.get_one_association_names_string(Tree)).to eq(['owner', 'cutter', 'island', 'eponymous_island'])
       end
     end
 
@@ -64,8 +70,9 @@ module ForestLiana
         end
 
         it 'should return relationships on models having a custom table name' do
-          expect(tables_associated_to_relations_name['isle'].length).to eq(1)
+          expect(tables_associated_to_relations_name['isle'].length).to eq(2)
           expect(tables_associated_to_relations_name['isle'].first).to eq(:island)
+          expect(tables_associated_to_relations_name['isle'].second).to eq(:eponymous_island)
         end
       end
     end

data/spec/lib/forest_liana/bootstrapper_spec.rb

@@ -8,5 +8,109 @@ module ForestLiana
           .to include(:database_type)
       end
     end
+
+    describe 'generate_action_hooks' do
+      schema = '{
+        "collections": [
+          {
+            "name": "Island",
+            "name_old": "Island",
+            "icon": null,
+            "is_read_only": false,
+            "is_searchable": true,
+            "is_virtual": false,
+            "only_for_relationships": false,
+            "pagination_type": "page",
+            "fields": [
+              {
+                "field": "id",
+                "type": "Number",
+                "default_value": null,
+                "enums": null,
+                "integration": null,
+                "is_filterable": true,
+                "is_read_only": false,
+                "is_required": false,
+                "is_sortable": true,
+                "is_virtual": false,
+                "reference": null,
+                "inverse_of": null,
+                "widget": null,
+                "validations": []
+              },
+              {
+                "field": "first_name",
+                "type": "String",
+                "default_value": null,
+                "enums": null,
+                "integration": null,
+                "is_filterable": true,
+                "is_read_only": false,
+                "is_required": false,
+                "is_sortable": true,
+                "is_virtual": false,
+                "reference": null,
+                "inverse_of": null,
+                "widget": null,
+                "validations": []
+              },
+              {
+                "field": "last_name",
+                "type": "String",
+                "default_value": null,
+                "enums": null,
+                "integration": null,
+                "is_filterable": true,
+                "is_read_only": false,
+                "is_required": false,
+                "is_sortable": true,
+                "is_virtual": false,
+                "reference": null,
+                "inverse_of": null,
+                "widget": null,
+                "validations": []
+              }
+            ],
+            "segments": [],
+            "actions": [
+              {
+                "name": "foo",
+                "type": "bulk",
+                "base_url": null,
+                "endpoint": "forest/actions/mark-as-live",
+                "http_method": "POST",
+                "redirect": null,
+                "download": false,
+                "fields": [],
+                "hooks": {
+                  "load": false,
+                  "change": []
+                }
+              }
+            ]
+          }
+        ],
+        "meta": {
+          "liana": "forest-rails",
+          "liana_version": "7.6.0",
+          "stack": {
+            "database_type": "postgresql",
+            "orm_version": "7.0.2.4"
+          }
+        }
+      }'
+
+
+      it "Should return actions hooks empty for the island collection" do
+        allow(ForestLiana).to receive(:env_secret).and_return(nil)
+        bootstrapper = Bootstrapper.new
+        content = JSON.parse(schema)
+        bootstrapper.instance_variable_set(:@collections_sent, content['collections'])
+        bootstrapper.instance_variable_set(:@meta_sent, content['meta'])
+        bootstrapper.send(:generate_action_hooks)
+
+        expect(bootstrapper.instance_variable_get("@collections_sent").first['actions'].first['hooks']).to eq({"load"=>false, "change"=>[]})
+      end
+    end
   end
 end

data/spec/services/forest_liana/resources_getter_spec.rb

@@ -155,6 +155,21 @@ module ForestLiana
       end
     end
 
+    describe 'when getting instance dependent associations' do
+      let(:resource) { Island }
+      let(:fields) { { 'Island' => 'id,eponymous_tree', 'eponymous_tree' => 'id,name'} }
+
+      it 'should get only the expected records' do
+        getter.perform
+        records = getter.records
+        count = getter.count
+
+        expect(records.count).to eq Island.count
+        expect(count).to eq Island.count
+        expect(records.map(&:name)).to match_array(Island.pluck(:name))
+      end
+    end
+
     describe 'when filtering on an ambiguous field' do
       let(:resource) { Tree }
       let(:pageSize) { 5 }

data/spec/services/forest_liana/schema_adapter_spec.rb

@@ -8,7 +8,19 @@ module ForestLiana
           end
 
           expect(collection.fields.map { |field| field[:field] }).to eq(
-            ["id", "name", "created_at", "updated_at", "trees", "location"]
+            ["created_at", "eponymous_tree", "id", "location", "name", "trees", "updated_at"]
+          )
+        end
+      end
+
+      context 'with standard fields' do
+        it 'should be sort by alphabetical order' do
+          collection = ForestLiana.apimap.find do |object|
+            object.name.to_s == ForestLiana.name_for(Tree)
+          end
+
+          expect(collection.fields.map { |field| field[:field].to_s}).to eq(
+            ["age", "created_at", "cutter", "eponymous_island", "id", "island", "name", "owner", "updated_at"]
           )
         end
       end

metadata

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