forest_liana 6.4.0 → 6.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13952d2e70b5b32f326839ad76067ec236adda426152fd116e4836141d92efc7
-  data.tar.gz: '026179b31057b1ce2bb8b60f6bae5a529467941d27a57c12a897028f4ce8d7bc'
+  metadata.gz: 56720f9edd9f48712a65f46e41447785aa04772b3de3f0ef959faea901a3fd97
+  data.tar.gz: 4b26438ea7fb4a2cc807c35c29366697650fe27c11963cf177f631d13b953918
 SHA512:
-  metadata.gz: '04698769547e0fd18c1720bf247365e6631ac8ef1715967932ab65d01dc9baef9086d017d5623c080cef6b11b72c4e50d4163584b3e6c89538b2fc85bb77cffe'
-  data.tar.gz: 021f90c8f6ec1962d7761503554e92274d4eb48c6071ab00127cd5fb44ec7243a66d44069d3eafface9ac09b81a5f545fe93b0bb7f92ac2bfeb857622ec688fc
+  metadata.gz: 0ba707e8b91588054a0c38de31dc9a02ed5603d0b164ca8040bbe97b08dd426493795dfe283f8af0c49d2ebef73f9c64ff3d18a07e01038cea1ee371ff35286e
+  data.tar.gz: da40468756bdb066b0c45a400e35bab3e2c2846b38efe773dfaae5e3b48b453d9e9a2451fd532702c0d032027bf03541d0151c3ee85f27827a8deed3a7d1131f

data/app/controllers/forest_liana/smart_actions_controller.rb

@@ -57,11 +57,8 @@ module ForestLiana
 
     # smart action permissions are retrieved from the action's endpoint and http_method
     def get_smart_action_request_info
-      endpoint = request.fullpath
-      # Trim starting '/'
-      endpoint[0] = '' if endpoint[0] == '/'
       {
-        endpoint: endpoint,
+        endpoint: request.fullpath,
         http_method: request.request_method
       }
     end

data/app/services/forest_liana/apimap_sorter.rb

@@ -92,6 +92,7 @@ module ForestLiana
           end
         end
 
+        @apimap['meta']['stack'] = reorder_keys_basic(@apimap['meta']['stack'])
         @apimap['meta'] = reorder_keys_basic(@apimap['meta'])
         @apimap
       rescue => exception

data/app/services/forest_liana/line_stat_getter.rb

@@ -23,7 +23,7 @@ module ForestLiana
     end
 
     def perform
-      value = get_resource().eager_load(@includes)
+      value = get_resource().joins(@includes)
 
       unless @params[:filters].blank?
         value = FiltersParser.new(@params[:filters], value, @params[:timezone]).apply_filters

data/app/services/forest_liana/permissions_checker.rb

@@ -177,7 +177,7 @@ module ForestLiana
       return false unless pool_permissions
 
       # NOTICE: equivalent to Object.values in js & removes nil values
-      array_permission_infos = @query_request_info.values.filter_map{ |x| x unless x.nil? }
+      array_permission_infos = @query_request_info.values.select{ |x| !x.nil? }
 
       # NOTICE: Is there any pool_permissions containing the array_permission_infos
       return pool_permissions.any? {

data/app/services/forest_liana/token.rb

@@ -19,6 +19,7 @@ module ForestLiana
         first_name: user['first_name'],
         last_name: user['last_name'],
         team: user['teams'][0],
+        role: user['role'],
         rendering_id: rendering_id,
         exp: expiration_in_seconds()
       }, ForestLiana.auth_secret, 'HS256')

data/app/services/forest_liana/utils/beta_schema_utils.rb

@@ -6,7 +6,7 @@ module ForestLiana
 
         return nil unless collection
 
-        collection.actions.find { |action| action.endpoint == endpoint && action.http_method == http_method }
+        collection.actions.find { |action| (action.endpoint == endpoint || "/#{action.endpoint}" == endpoint) && action.http_method == http_method }
       end
     end
   end

data/lib/forest_liana/bootstrapper.rb

@@ -203,10 +203,12 @@ module ForestLiana
 
     def setup_forest_liana_meta
       ForestLiana.meta = {
-        database_type: database_type,
         liana: 'forest-rails',
         liana_version: ForestLiana::VERSION,
-        orm_version: Gem.loaded_specs["activerecord"].version.version
+        stack: {
+           database_type: database_type,
+           orm_version: Gem.loaded_specs["activerecord"].version.version,
+        }
       }
     end
 

data/lib/forest_liana/version.rb

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

data/spec/lib/forest_liana/bootstrapper_spec.rb

@@ -0,0 +1,12 @@
+module ForestLiana
+  describe Bootstrapper do
+    describe 'setup_forest_liana_meta' do
+      it "should put statistic data related to user stack on a dedicated object" do
+        expect(ForestLiana.meta[:stack])
+          .to include(:orm_version)
+        expect(ForestLiana.meta[:stack])
+          .to include(:database_type)
+      end
+    end
+  end
+end

data/spec/requests/authentications_spec.rb

@@ -45,7 +45,7 @@ describe "Authentications", type: :request do
 
   describe "GET /authentication/callback" do
     before() do 
-      response = '{"data":{"id":666,"attributes":{"first_name":"Alice","last_name":"Doe","email":"alice@forestadmin.com","teams":[1,2,3]}}}'
+      response = '{"data":{"id":666,"attributes":{"first_name":"Alice","last_name":"Doe","email":"alice@forestadmin.com","teams":[1,2,3],"role":"Test"}}}'
       allow(ForestLiana::ForestApiRequester).to receive(:get).with(
         "/liana/v2/renderings/42/authorization", { :headers => { "forest-token" => "THE-ACCESS-TOKEN" }, :query=> {} }
       ).and_return(
@@ -72,6 +72,7 @@ describe "Authentications", type: :request do
         "first_name" => 'Alice',
         "last_name" => 'Doe',
         "team" => 1,
+        "role" => "Test",
       }
 
       expect(decoded).to include(expected_token_data)

data/spec/services/forest_liana/apimap_sorter_spec.rb

@@ -4,9 +4,11 @@ module ForestLiana
       context 'on a disordered apimap' do
         apimap = {
           'meta': {
-            'orm_version': '4.34.9',
+            stack: {
+              'orm_version': '4.34.9',
+              'database_type': 'postgresql',
+            },
             'liana_version': '1.5.24',
-            'database_type': 'postgresql',
             liana: 'forest-rails',
           },
           'data': [{
@@ -165,8 +167,8 @@ module ForestLiana
         end
 
         it 'should sort the meta values' do
-          expect(apimap_sorted['meta'].keys).to eq(
-            ['database_type', 'liana', 'liana_version', 'orm_version'])
+          expect(apimap_sorted['meta'].keys).to eq(['liana', 'liana_version', 'stack'])
+          expect(apimap_sorted['meta']['stack'].keys).to eq(['database_type', 'orm_version'])
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 6.4.0
+  version: 6.6.1
 platform: ruby
 authors:
 - Sandro Munda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-26 00:00:00.000000000 Z
+date: 2021-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -371,6 +371,7 @@ files:
 - spec/helpers/forest_liana/is_same_data_structure_helper_spec.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/rails_helper.rb
 - spec/requests/actions_controller_spec.rb
 - spec/requests/authentications_spec.rb
@@ -663,6 +664,7 @@ test_files:
 - spec/dummy/app/models/location.rb
 - spec/dummy/app/models/island.rb
 - spec/dummy/app/models/reference.rb
+- spec/lib/forest_liana/bootstrapper_spec.rb
 - spec/rails_helper.rb
 - spec/requests/stats_spec.rb
 - spec/requests/resources_spec.rb