forest_liana 8.3.0 → 8.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ea6ac547b42d4f12e817252a87559007df62b18ab679d3ca7c6c3c5a4cd5e00
-  data.tar.gz: 061b0e356dc3b0d3d3a83ee2b09760b20f13573b021abf7ed1cd0c9a4e810322
+  metadata.gz: f575399255a09d606c838be6a483b043c8b517eca0a8ccca55c747334555616b
+  data.tar.gz: fbe167b9daa4f6b3d22ddfd58e297cd3da3e020c165a548e37d8ae886c3671ed
 SHA512:
-  metadata.gz: 67743e9e1cd9d3d1ce893b151b9069c5025d17fcdb763c936e699fd1cdf39b5b30392d0410bc9b77cb9a927bcda8b23755a59bee008928d4e6c73be0a2419710
-  data.tar.gz: b74d7d94e51a29636935b751db6963a257f8f27e83e608b4a73b4a0fe6d4a459dbb3b27f602104b9a565da6f9a52f6ee699b278f052588d3f3cac09b3fb5b566
+  metadata.gz: 025fdca59a9d40cc79221d021f9f64b08aa95ad7cbb7035ee6f1adcc0350c00c7427cd80a25ddaebfe334c48ff83e92a30156709e1ac5a6e3701509b29bae5b9
+  data.tar.gz: 189a32d33adc6f1d898d10328032ae2a3a36da7dfd5be070bd555afba75869b6069ae306bee9d6b9215e55efb7354c11a42092c80811c7c0659fa5e2c021d161

data/app/services/forest_liana/ability/permission.rb

@@ -97,7 +97,7 @@ module ForestLiana
         Rails.cache.fetch('forest.stats', expires_in: TTL) do
           stat_hash = []
           get_permissions('/liana/v4/permissions/renderings/' + rendering_id)['stats'].each do |stat|
-            stat_hash << "#{stat['type']}:#{Digest::SHA1.hexdigest(stat.sort.to_h.to_s)}"
+            stat_hash << "#{stat['type']}:#{Digest::SHA1.hexdigest(stat.deep_sort.to_s)}"
           end
 
           stat_hash

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "8.3.0"
+  VERSION = "8.3.1"
 end

data/spec/requests/stats_spec.rb

@@ -2,24 +2,8 @@ require 'rails_helper'
 require 'json'
 
 describe "Stats", type: :request do
-
-  token = JWT.encode({
-    id: 1,
-    email: 'michael.kelso@that70.show',
-    first_name: 'Michael',
-    last_name: 'Kelso',
-    team: 'Operations',
-    rendering_id: '1',
-    exp: Time.now.to_i + 2.weeks.to_i,
-    permission_level: 'admin'
-  }, ForestLiana.auth_secret, 'HS256')
-
-  headers = {
-    'Accept' => 'application/json',
-    'Content-Type' => 'application/json',
-    'Authorization' => "Bearer #{token}"
-  }
-
+  let(:rendering_id) { '13' }
+  let(:scopes) { {'scopes' => {}, 'team' => {'id' => '1', 'name' => 'Operations'}} }
   let(:schema) {
     [
       ForestLiana::Model::Collection.new({
@@ -30,10 +14,31 @@ describe "Stats", type: :request do
     ]
   }
 
+  let(:token) {
+      JWT.encode({
+      id: 1,
+      email: 'michael.kelso@that70.show',
+      first_name: 'Michael',
+      last_name: 'Kelso',
+      team: 'Operations',
+      rendering_id: rendering_id,
+      exp: Time.now.to_i + 2.weeks.to_i,
+      permission_level: 'user'
+    }, ForestLiana.auth_secret, 'HS256')
+  }
+
+  let(:headers) {
+    {
+      'Accept' => 'application/json',
+      'Content-Type' => 'application/json',
+      'Authorization' => "Bearer #{token}"
+    }
+  }
+
   before do
     Rails.cache.write('forest.users', {'1' => { 'id' => 1, 'roleId' => 1, 'rendering_id' => '1' }})
     Rails.cache.write('forest.has_permission', true)
-    allow_any_instance_of(ForestLiana::Ability::Fetch)
+    allow_any_instance_of(ForestLiana::Ability::Permission)
       .to receive(:get_permissions)
         .and_return(
           {
@@ -45,6 +50,31 @@ describe "Stats", type: :request do
                 "aggregateFieldName" => nil,
                 "sourceCollectionName" => "Owner"
               },
+              {
+                "type" => "Objective",
+                "sourceCollectionName" => "Owner",
+                "aggregateFieldName" => nil,
+                "aggregator" => "Count",
+                "objective" => 200,
+                "filter" => nil,
+              },
+              {
+                "type" => "Pie",
+                "sourceCollectionName" => "Owner",
+                "aggregateFieldName" => nil,
+                "groupByFieldName" => "id",
+                "aggregator" => "Count",
+                "filter" => nil,
+              },
+              {
+                "type" => "Line",
+                "sourceCollectionName" => "Owner",
+                "aggregateFieldName" => nil,
+                "groupByFieldName" => "hired_at",
+                "aggregator" => "Count",
+                "timeRange" => "Week",
+                "filter" => nil,
+              },
               {
                 "type"  => "Value",
                 "query" => "SELECT COUNT(*) AS value FROM products;"
@@ -53,13 +83,9 @@ describe "Stats", type: :request do
           }
         )
 
-    ForestLiana::ScopeManager.class_variable_set(:@@scopes_cache, {
-      '1' => {
-        :fetched_at => Time.now,
-        :scopes => {}
-      }
-    })
-
+    ForestLiana::ScopeManager.invalidate_scope_cache(rendering_id)
+    allow(ForestLiana::ScopeManager).to receive(:fetch_scopes).and_return(scopes)
+    
     allow(ForestLiana).to receive(:apimap).and_return(schema)
     allow(ForestLiana::IpWhitelist).to receive(:retrieve) { true }
     allow(ForestLiana::IpWhitelist).to receive(:is_ip_whitelist_retrieved) { true }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 8.3.0
+  version: 8.3.1
 platform: ruby
 authors:
 - Sandro Munda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-14 00:00:00.000000000 Z
+date: 2024-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails