infopark_fiona_connector 7.0.1.6.1.6.rc1 → 7.0.1.6.1.6.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2b76b71446af6398f3aaf4f81e328ac901695595c8f46ec767c2114a9782f28
-  data.tar.gz: 461cf4e95303c46a64fef16bd4a8f2b6ee30359377adc4956b4c0d554f14a023
+  metadata.gz: 354adf51aab5a30ed1a7760f4543f8dfcbbb67e0390bf20c57f9f2da31e8c4c9
+  data.tar.gz: 3e9e8398ea686d96065f77c4565136364b2b36fe2a76ad83a832d50e60629717
 SHA512:
-  metadata.gz: b3515ef24dd4e51fb8e4243af991208d2b58e1fb215cbdc0eced0df0b3f4e4284230b93d5c3c742d1670bf0e049d8d5a56061998767bb40a67cb0363fdaa9def
-  data.tar.gz: a6113fbe1c6131056e798e5ad4e8467340ccc7a37872f45912a84c7114269341b36bc97fbcdaea9494506cb5ca9500bd6b310324b1a15e71d57c0670af8d6ff6
+  metadata.gz: 0fb8ab8a8ebb91a9c2f94569efd01da7dcff2495cb5a1958a81ecbea1869751b4ba3246f22b685d67852e4e24aac3639543ad8f0b87dcfa28c9516e1d3a08d01
+  data.tar.gz: 5cfebc09e5ce14e2a8bd287e1c026c92714ef880c5edd5baac100a9ef1f11d5b0aad32141efa2899b00483298d70577fbaad2d2fbeb45da07d7d1d2638126311

data/lib/rails_connector/cms_base_model.rb

@@ -37,16 +37,6 @@ module RailsConnector
       true
     end
 
-    def attribute_for_inspect(attr_name)
-      value = read_attribute(attr_name)
-
-      if value.is_a?(RailsConnector::LinkList)
-        value.destination_objects.map(&:to_s)
-      else
-        super
-      end
-    end
-
     class << self
       # The prefix of the table name is determined by using the instance name followed by an underscore.
       # Set the instance_name in your environment to the CMS instance name (defaults to 'default').

data/lib/rails_connector/core_extensions/active_record/core.rb

@@ -0,0 +1,76 @@
+# Patches for ActiveRecord::Core (see include in engine.rb)
+module RailsConnector
+  module CoreExtensions
+    module ActiveRecord
+      module Core
+        # Reason for patch: activerecord/lib/active_record/core#inspect does not support RailsConnector::Linklist.
+        # We need to transform RailsConnector::Linklist to a string to prevent circular references.
+        # Rails 6.0 does not make use of `attribute_for_inspect`, therefore we need to patch `format_for_inspect` directly.
+        # `format_for_inspect` in > 6.1 uses two parameters
+        #
+        # Reason for change: activerecord/lib/active_record/core#inspect might change in future Rails versions.
+        if Rails::VERSION::MAJOR < 6
+          def attribute_for_inspect(attr_name)
+            value = read_attribute(attr_name)
+
+            if value.is_a?(RailsConnector::LinkList)
+              value.destination_objects.map(&:to_s)
+            else
+              super
+            end
+          end
+        elsif Rails::VERSION::MAJOR == 6 && Rails::VERSION::MINOR.zero?
+          def format_for_inspect(value)
+            if value.is_a?(RailsConnector::LinkList)
+              value.destination_objects.map(&:to_s)
+            else
+              super
+            end
+          end
+        else
+          def attribute_for_inspect(attr_name)
+            attr_name = attr_name.to_s
+            attr_name = self.class.attribute_aliases[attr_name] || attr_name
+            value = _read_attribute(attr_name)
+            if value.present? && value.is_a?(RailsConnector::LinkList)
+              value.destination_objects.map(&:to_s)
+            else
+              super
+            end
+          end
+        end
+
+        # Reason for patch: activerecord/lib/active_record/core#pretty_print ends up in circular reference,
+        # as RailsConnector::Linklist was not handled. infopark_reactor/lib/reactor/attributes.rb#_read_attribute(attr_name) overwrites
+        # the method, which is called by activerecord/lib/active_record/core#pretty_print.
+        #
+        # Reason for change: activerecord/lib/active_record/core#pretty_print might change in future Rails versions.
+        # Check rails console output of an Obj with RailsConnector::Linklist attributes.
+        def pretty_print(pp)
+          return super if custom_inspect_method_defined?
+
+          pp.object_address_group(self) do
+            if defined?(@attributes) && @attributes
+              attr_names = self.class.attribute_names.select { |name| has_attribute?(name) }
+              pp.seplist(attr_names, proc { pp.text "," }) do |attr_name|
+                pp.breakable " "
+                pp.group(1) do
+                  pp.text attr_name
+                  pp.text ":"
+                  pp.breakable
+                  value = _read_attribute(attr_name)
+                  value = value.destination_objects.map(&:to_s) if value.present? && value.is_a?(RailsConnector::LinkList)
+                  value = inspection_filter.filter_param(attr_name, value) unless value.nil?
+                  pp.pp value
+                end
+              end
+            else
+              pp.breakable " "
+              pp.text "not initialized"
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rails_connector/core_extensions.rb

@@ -1 +1,2 @@
 require "rails_connector/core_extensions/time"
+require "rails_connector/core_extensions/active_record/core"

data/lib/rails_connector/engine.rb

@@ -10,6 +10,14 @@ module ::RailsConnector
     # make sure our exceptions cause an adequate error page and http status code
     config.action_dispatch.rescue_responses["RailsConnector::ResourceNotFound"] = :not_found
 
+    initializer "Rails patches" do
+      config.to_prepare do
+        ActiveSupport.on_load(:active_record) do
+          include RailsConnector::CoreExtensions::ActiveRecord::Core
+        end
+      end
+    end
+
     initializer "rails_connector.add_fiona_time_type" do
       ActiveSupport.on_load(:active_record) do
         ActiveRecord::Type.register(:fiona_datetime, FionaDateTime)
@@ -70,6 +78,7 @@ module ::RailsConnector
           autoloader.ignore("#{config.root}/lib/version.rb")
           autoloader.ignore("#{config.root}/lib/rails_connector/core_extensions.rb")
           autoloader.ignore("#{config.root}/lib/rails_connector/core_extensions/time.rb")
+          autoloader.ignore("#{config.root}/lib/rails_connector/core_extensions/active_record/core.rb")
           autoloader.ignore("#{config.root}/lib/rails_connector/errors.rb")
           autoloader.ignore("#{config.root}/lib/rails_connector/fiona_date_time.rb")
           autoloader.ignore("#{config.root}/lib/rails_connector/rack_middlewares.rb")

data/lib/version.rb

@@ -1,7 +1,7 @@
 module RailsConnector
   module Version
     def self.get
-      "7.0.1.6.1.6.rc1"
+      "7.0.1.6.1.6.rc2"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infopark_fiona_connector
 version: !ruby/object:Gem::Version
-  version: 7.0.1.6.1.6.rc1
+  version: 7.0.1.6.1.6.rc2
 platform: ruby
 authors:
 - Infopark AG
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-24 00:00:00.000000000 Z
+date: 2022-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -220,6 +220,7 @@ files:
 - lib/rails_connector/configuration.rb
 - lib/rails_connector/content.rb
 - lib/rails_connector/core_extensions.rb
+- lib/rails_connector/core_extensions/active_record/core.rb
 - lib/rails_connector/core_extensions/time.rb
 - lib/rails_connector/date_attribute.rb
 - lib/rails_connector/default_search_request.rb