forest_liana 8.3.3 → 9.0.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4e97c61fafcfa35449d0198b68c6e9aa1ac070f43c09fb65337b88b75b7eb73
-  data.tar.gz: 56a2db7abad36e6242205497a155bc615b838148162bfa2019cc2201ae4d3aea
+  metadata.gz: 0a157aee784201e7da6a7330fc813ce01540107f3c319a6ac294120de809a823
+  data.tar.gz: f8343a2641fa23b7eb2934d35a0de7f5e8198e44c961380a0c07a9049671f2ab
 SHA512:
-  metadata.gz: 91031cc5688326bb38b7c8932965cd65a6aac71e0d44dc8c40867a826ab688339f0de2f14fae7723cee59e63173a3672db444391207bfe98f8ccd4000cb6af6e
-  data.tar.gz: 11dac2d84060f8414c97dcf8485444df9a50e20f21be995aa50f560b0003ae734b013e55ae187e00e57dd95de58fcea16d510e9a0d1a32968970a75edc181b81
+  metadata.gz: 6057484cb179b3ae0203f935df4638cd080c4777807cfcc4758a4dd2bbfc9ca4627cd1a7b85b487a469f2e9a66f31a9ce9f58e7fdd474e5de552516780c57be2
+  data.tar.gz: 6bb712c6471e7cbe7016582b3a10fe34159cf46b12b8c1626ca706fb95f2d91e585ee4dd8592a1efcf8afd91e287def131777f35c2d028903fa502a4007cd546

data/app/controllers/forest_liana/associations_controller.rb

@@ -76,8 +76,6 @@ module ForestLiana
         dissociator.perform
 
         head :no_content
-      rescue ActiveRecord::RecordNotDestroyed => error
-        render json: { errors: [{ status: :bad_request, detail: error.message }] }, status: :bad_request
       rescue => error
         FOREST_REPORTER.report error
         FOREST_LOGGER.error "Association Dissociate error: #{error}\n#{format_stacktrace(error)}"

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.deep_sort.to_s)}"
+            stat_hash << "#{stat['type']}:#{Digest::SHA1.hexdigest(stat.sort.to_h.to_s)}"
           end
 
           stat_hash

data/app/services/forest_liana/belongs_to_updater.rb

@@ -17,7 +17,7 @@ module ForestLiana
           if @data.nil?
             new_value = nil
           else
-            association_klass = SchemaUtils.polymorphic_models(@association).select { |a| a.name == @data[:type] }.first
+            association_klass = SchemaUtils.polymorphic_models(@association).select { |a| a.name.downcase == @data[:type] }.first
             new_value = association_klass.find(@data[:id]) if @data && @data[:id]
           end
         else

data/app/services/forest_liana/has_many_dissociator.rb

@@ -31,12 +31,7 @@ module ForestLiana
 
         if @with_deletion
           record_ids = record_ids.select { |record_id| @association.klass.exists?(record_id) }
-          @resource.transaction do
-            record_ids.each do |id|
-              record = @association.klass.find(id)
-              record.destroy!
-            end
-          end
+          @association.klass.destroy(record_ids)
         end
       end
     end

data/app/services/forest_liana/schema_adapter.rb

@@ -242,8 +242,6 @@ module ForestLiana
       SchemaUtils.associations(@model).each do |association|
         begin
           if SchemaUtils.polymorphic?(association) &&
-            (ENV['ENABLE_SUPPORT_POLYMORPHISM'].present? && ENV['ENABLE_SUPPORT_POLYMORPHISM'].downcase == 'true')
-            
             collection.fields << {
               field: association.name.to_s,
               type: get_type_for_association(association),

data/app/services/forest_liana/schema_utils.rb

@@ -4,12 +4,7 @@ module ForestLiana
     def self.associations(active_record_class)
       active_record_class.reflect_on_all_associations.select do |association|
         begin
-          if (ENV['ENABLE_SUPPORT_POLYMORPHISM'].present? && ENV['ENABLE_SUPPORT_POLYMORPHISM'].downcase == 'true')
-            polymorphic?(association) ? true : !is_active_type?(association.klass)
-          else
-            !polymorphic?(association) && !is_active_type?(association.klass)
-          end
-
+          polymorphic?(association) ? true : !is_active_type?(association.klass)
         rescue
           FOREST_LOGGER.warn "Unknown association #{association.name} on class #{active_record_class.name}"
           false

data/app/services/forest_liana/search_query_builder.rb

@@ -1,6 +1,6 @@
 module ForestLiana
   class SearchQueryBuilder
-    REGEX_UUID = /\A[0-9a-f]{8}-[0-9a-f]{4}-[1-8][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}\z/i
+    REGEX_UUID = /\A[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}\z/i
 
     attr_reader :fields_searched
 
@@ -160,9 +160,12 @@ module ForestLiana
     end
 
     def sort_query
+      column = nil
+      order = 'DESC'
+
       if @params[:sort]
         @params[:sort].split(',').each do |field|
-          order_detected = detect_sort_order(field)
+          order_detected = detect_sort_order(@params[:sort])
           order = order_detected.upcase
           field.slice!(0) if order_detected == :desc
 
@@ -172,12 +175,14 @@ module ForestLiana
           else
             column = field
           end
-
-          @records = @records.order(Arel.sql("#{column} #{order}"))
         end
       end
 
-      @records
+      if column
+        @records = @records.order(Arel.sql("#{column} #{order}"))
+      else
+        @records
+      end
     end
 
     def detect_reference(param)

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "8.3.3"
+  VERSION = "9.0.0.beta.1"
 end

data/spec/requests/stats_spec.rb

@@ -2,8 +2,24 @@ require 'rails_helper'
 require 'json'
 
 describe "Stats", type: :request do
-  let(:rendering_id) { '13' }
-  let(:scopes) { {'scopes' => {}, 'team' => {'id' => '1', 'name' => 'Operations'}} }
+
+  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(:schema) {
     [
       ForestLiana::Model::Collection.new({
@@ -14,31 +30,10 @@ 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::Permission)
+    allow_any_instance_of(ForestLiana::Ability::Fetch)
       .to receive(:get_permissions)
         .and_return(
           {
@@ -50,31 +45,6 @@ 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;"
@@ -83,9 +53,13 @@ describe "Stats", type: :request do
           }
         )
 
-    ForestLiana::ScopeManager.invalidate_scope_cache(rendering_id)
-    allow(ForestLiana::ScopeManager).to receive(:fetch_scopes).and_return(scopes)
-    
+    ForestLiana::ScopeManager.class_variable_set(:@@scopes_cache, {
+      '1' => {
+        :fetched_at => Time.now,
+        :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 }

data/spec/services/forest_liana/schema_adapter_spec.rb

@@ -40,23 +40,6 @@ module ForestLiana
 
           expect(removed_fields).to be_empty
         end
-
-        context 'when the polymorphic support was disabled' do
-          it 'should not define the association' do
-            ENV['ENABLE_SUPPORT_POLYMORPHISM'] = 'false'
-            Bootstrapper.new(true)
-            collection = ForestLiana.apimap.find do |object|
-              object.name.to_s == ForestLiana.name_for(Address)
-            end
-            association = collection.fields.find { |field| field[:field] == 'addressable' }
-            fields = collection.fields.select do |field|
-              field[:field] == 'addressable_id' || field[:field] == 'addressable_type'
-            end
-
-            expect(association).to be_nil
-            expect(fields.size).to eq(2)
-          end
-        end
       end
 
       context 'with an "unhandled" column types (binary, postgis geography, ...)' do

data/spec/spec_helper.rb

@@ -19,7 +19,6 @@ SimpleCov.add_filter ['app/services/forest_liana/ability/fetch.rb', 'lib/forest_
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
   ENV['RAILS_ENV'] = 'test'
-  ENV['ENABLE_SUPPORT_POLYMORPHISM'] = 'true'
 
   require File.expand_path('../dummy/config/environment', __FILE__)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 8.3.3
+  version: 9.0.0.beta.1
 platform: ruby
 authors:
 - Sandro Munda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-09-18 00:00:00.000000000 Z
+date: 2024-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -542,9 +542,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.3.5
 signing_key: