forest_liana 7.6.2 → 7.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf5ae1ded0eccb39f9cd865766053b17ba0887f53109d15d1424b5eb0106fe79
-  data.tar.gz: af2489f53d749ec12c3c8daeecbca39fd351d71894cd2fafe9dba31b44fcedbc
+  metadata.gz: b2c5dee061bff5a6292ee2524d8ec3df10fdd6698960285532cb847c9407412d
+  data.tar.gz: 224fc3ad7164a489f3480fe06b153b31a20614a1f4aaf1fc2e66461fa8993218
 SHA512:
-  metadata.gz: 3fadc88d411dbf662bf99d836a3790d6ff0d17a5db44fd2ba9153632b1e553202693076609bf0355aba7c9859f27ec82c97e4b6364272a92e17d881c1e7b9ad1
-  data.tar.gz: 6b202989c5fbb4481c4b86e0911969703a2bbe8f7b4ab1a01874e14b4cb9bb0c33a313eaaeaf0d49958540325ac4f5e031fa7d8e5d0ca8ba6f3acbf7668eefef
+  metadata.gz: b0b21988df4803f55f3ef8a72980af8d52d512faddd0189458bc3ab5639e7608fd240da95d0f0a075458a7d855f8b5ff9f81a2b694ef9adf2e29a1c33c373c48
+  data.tar.gz: 557a854cee3d809681be1ee96f420266278c3ea2d665f4d4653b574b71ec8a8fa03acf5c6ee4d2c48b031485079d5c3bf0ac39510c31fde228a3d7b18e77dc7f

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/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "7.6.2"
+  VERSION = "7.6.3"
 end

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