forest_liana 6.6.1 → 6.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56720f9edd9f48712a65f46e41447785aa04772b3de3f0ef959faea901a3fd97
-  data.tar.gz: 4b26438ea7fb4a2cc807c35c29366697650fe27c11963cf177f631d13b953918
+  metadata.gz: 3c09d00ec3f4c4c72cd36b9be6316fc42fa568ad959dbab90645f04c444e9e91
+  data.tar.gz: b01ca1c1b257ed31805deba1bb886dc041ef9545c38f9120f505d8369d066b7d
 SHA512:
-  metadata.gz: 0ba707e8b91588054a0c38de31dc9a02ed5603d0b164ca8040bbe97b08dd426493795dfe283f8af0c49d2ebef73f9c64ff3d18a07e01038cea1ee371ff35286e
-  data.tar.gz: da40468756bdb066b0c45a400e35bab3e2c2846b38efe773dfaae5e3b48b453d9e9a2451fd532702c0d032027bf03541d0151c3ee85f27827a8deed3a7d1131f
+  metadata.gz: 6fc61c7b395475da62ea7da9068941dbf88386a8cd85616568febe897816ab58d1fbef4907ead68be9f2e954afc3a89549015303d1b743e6a684b906a4bf7398
+  data.tar.gz: 31d8fb2855a56dcbd05f6f35c30a63c77843e90adf355aaff95d569a3f70c943acd146cdfa77328dadfd26f8ce816cd3fa557cf8338ce5b2975810ae52c6aa0e

data/app/services/forest_liana/permissions_checker.rb

@@ -1,7 +1,7 @@
 module ForestLiana
   class PermissionsChecker
     @@permissions_cached = Hash.new
-    @@scopes_cached = Hash.new
+    @@renderings_cached = Hash.new
     @@roles_acl_activated = false
     # TODO: handle cache scopes per rendering
     @@expiration_in_seconds = (ENV['FOREST_PERMISSIONS_EXPIRATION_IN_SECONDS'] || 3600).to_i
@@ -39,13 +39,16 @@ module ForestLiana
         permissions['data'] = ForestLiana::PermissionsFormatter.convert_to_new_format(permissions['data'], @rendering_id)
         @@permissions_cached[@rendering_id] = permissions
       end
+
+      # NOTICE: Add stats permissions to the RenderingPermissions
+      permissions['data']['renderings'][@rendering_id]['stats'] = permissions['stats']
       add_scopes_to_cache(permissions)
     end
 
     def add_scopes_to_cache(permissions)
       permissions['data']['renderings'].keys.each { |rendering_id|
-        @@scopes_cached[rendering_id] = permissions['data']['renderings'][rendering_id]
-        @@scopes_cached[rendering_id]['last_fetch'] = Time.now
+        @@renderings_cached[rendering_id] = permissions['data']['renderings'][rendering_id]
+        @@renderings_cached[rendering_id]['last_fetch'] = Time.now
       } if permissions['data']['renderings']
     end
 
@@ -59,8 +62,6 @@ module ForestLiana
         return stat_with_parameters_allowed?
       end
 
-      
-
       if permissions && permissions[@collection_name] &&
         permissions[@collection_name]['collection']
         if @permission_name === 'actions'
@@ -83,21 +84,25 @@ module ForestLiana
     end
 
     def get_scope_in_permissions
-      @@scopes_cached[@rendering_id] &&
-      @@scopes_cached[@rendering_id][@collection_name] &&
-      @@scopes_cached[@rendering_id][@collection_name]['scope']
+      @@renderings_cached[@rendering_id] &&
+      @@renderings_cached[@rendering_id][@collection_name] &&
+      @@renderings_cached[@rendering_id][@collection_name]['scope']
     end
 
     def scope_cache_expired?
-      return true unless @@scopes_cached[@rendering_id] && @@scopes_cached[@rendering_id]['last_fetch']
+      return true unless @@renderings_cached[@rendering_id] && @@renderings_cached[@rendering_id]['last_fetch']
 
-      elapsed_seconds = date_difference_in_seconds(Time.now, @@scopes_cached[@rendering_id]['last_fetch'])
+      elapsed_seconds = date_difference_in_seconds(Time.now, @@renderings_cached[@rendering_id]['last_fetch'])
       elapsed_seconds >= @@expiration_in_seconds
     end
 
     # This will happen only on rolesACLActivated (as scope cache will always be up to date on disabled)
     def refresh_scope_cache
       permissions = ForestLiana::PermissionsGetter::get_permissions_for_rendering(@rendering_id, rendering_specific_only: true)
+
+      # NOTICE: Add stats permissions to the RenderingPermissions
+      permissions['data']['renderings'][@rendering_id]['stats'] = permissions['stats']
+
       add_scopes_to_cache(permissions)
     end
 
@@ -112,12 +117,12 @@ module ForestLiana
     end
 
     def get_live_query_permissions_content
-      permissions = get_permissions
+      permissions = @@renderings_cached[@rendering_id]
       permissions && permissions['stats'] && permissions['stats']['queries']
     end
     
     def get_stat_with_parameters_content(statPermissionType)
-      permissions = get_permissions
+      permissions = @@renderings_cached[@rendering_id]
       permissions && permissions['stats'] && permissions['stats'][statPermissionType]
     end
 
@@ -201,7 +206,7 @@ module ForestLiana
     # Used only for testing purpose
     def self.empty_cache
       @@permissions_cached = Hash.new
-      @@scopes_cached = Hash.new
+      @@renderings_cached = Hash.new
       @@roles_acl_activated = false
       @@expiration_in_seconds = (ENV['FOREST_PERMISSIONS_EXPIRATION_IN_SECONDS'] || 3600).to_i
     end

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "6.6.1"
+  VERSION = "6.6.2"
 end

data/spec/services/forest_liana/permissions_checker_acl_enabled_spec.rb

@@ -50,7 +50,8 @@ module ForestLiana
         })
       ]
     }
-    let(:scope_permissions) { nil }
+    let(:default_rendering_id) { 1 }
+    let(:scope_permissions) { { default_rendering_id => { 'scopes' => nil } } }
     let(:default_api_permissions) {
       {
         "data" => {
@@ -118,12 +119,14 @@ module ForestLiana
           },
           'renderings' => scope_permissions
         },
+        "stats" => {
+          "queries"=>[],
+        },
         "meta" => {
           "rolesACLActivated" => true
         }
       }
     }
-    let(:default_rendering_id) { 1 }
 
     before do
       allow(ForestLiana).to receive(:apimap).and_return(schema)
@@ -368,9 +371,12 @@ module ForestLiana
                 "data" => {
                   'collections' => { },
                   'renderings' => {
-                    '2' => { 'custom' => nil }
+                    other_rendering_id => { 'custom' => nil }
                   }
                 },
+                "stats" => {
+                  "somestats" => [],
+                },
                 "meta" => {
                   "rolesACLActivated" => true
                 }

data/spec/services/forest_liana/permissions_checker_live_queries_spec.rb

@@ -20,7 +20,8 @@ module ForestLiana
         })
       ]
     }
-    let(:scope_permissions) { nil }
+    let(:default_rendering_id) { 1 }
+    let(:scope_permissions) { { default_rendering_id => { 'scopes' => nil } } }
     let(:default_api_permissions) {
       {
         "data" => {
@@ -61,7 +62,6 @@ module ForestLiana
         },
       }
     }
-    let(:default_rendering_id) { 1 }
 
     before do
       allow(ForestLiana).to receive(:apimap).and_return(schema)

metadata

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