infopark_fiona_connector 7.0.1.5.2.7.rc1 → 7.0.1.6.1.6.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d079283aa8959f1deefca7270e6e9c8931ee31cd4f9efb9387dd49664558a8ef
-  data.tar.gz: 1c7305e98b9315a2eedb526289e23788f6c6e430ab2ceccca6a82abab01c7d9a
+  metadata.gz: 354adf51aab5a30ed1a7760f4543f8dfcbbb67e0390bf20c57f9f2da31e8c4c9
+  data.tar.gz: 3e9e8398ea686d96065f77c4565136364b2b36fe2a76ad83a832d50e60629717
 SHA512:
-  metadata.gz: adca530e56f1697ebc35eb7e462f02a2a561bd9094cf6c7c1d0e0ad5a16c83e7f3b1ccaa41c0ddcedef58414ad523c760991abc6176941eff3c22915af74e54a
-  data.tar.gz: 163ae40500f19873ca1d10870529a81f57752390f834d786508e1a9affb64d4bf65cf30c4b14240b5c3f60d342d403c51b7176f9dd360d1b9c5e1d54cde34fa9
+  metadata.gz: 0fb8ab8a8ebb91a9c2f94569efd01da7dcff2495cb5a1958a81ecbea1869751b4ba3246f22b685d67852e4e24aac3639543ad8f0b87dcfa28c9516e1d3a08d01
+  data.tar.gz: 5cfebc09e5ce14e2a8bd287e1c026c92714ef880c5edd5baac100a9ef1f11d5b0aad32141efa2899b00483298d70577fbaad2d2fbeb45da07d7d1d2638126311

data/app/models/named_link.rb

@@ -1,2 +1,3 @@
 # ::NamedLink is just a shortcut
-::NamedLink = RailsConnector::NamedLink
+class NamedLink < RailsConnector::NamedLink
+end

data/lib/infopark_fiona_connector.rb

@@ -19,10 +19,9 @@ module ::RailsConnector
 end
 
 require "rails_connector/core_extensions"
-require "rails_connector/rack_middlewares"
 require "rails_connector/errors"
-require "rails_connector/fiona_datetime"
-ActiveRecord::Type.register(:fiona_datetime, ::FionaDateTime)
+require "rails_connector/fiona_date_time"
+require "rails_connector/rack_middlewares"
 
 # @api public
 module RailsConnector
@@ -40,5 +39,7 @@ module RailsConnector
   autoload_all_sources
 end
 
+module InfoparkFionaConnector; end
+
 require "rails_connector/engine" if defined?(Rails)
 require "rails_connector/fiona_engine" if defined?(Rails)

data/lib/obj.rb

@@ -1,3 +1,4 @@
 # empty implementation for Obj
 # only unsed in case the app does not define Obj itself
-::Obj = Class.new(RailsConnector::BasicObj)
+class Obj < RailsConnector::BasicObj
+end

data/lib/rails_connector/basic_obj.rb

@@ -1,6 +1,5 @@
 require "json"
 require "openssl"
-require "rails_connector/fiona_datetime"
 
 module RailsConnector
   # The CMS file class
@@ -37,12 +36,12 @@ module RailsConnector
     end
 
     def self.configure_column_information(table_name_postfix, use_cached_permissions)
-      reset_column_information
-
       self.table_name = "#{table_name_prefix}#{table_name_postfix}"
       self.primary_key = "obj_id"
       self.inheritance_column = "obj_class"
 
+      reset_column_information
+
       @@use_cached_permissions = use_cached_permissions
       descendants.each do |klass|
         klass.reset_table_name
@@ -128,7 +127,7 @@ module RailsConnector
 
     def self.reset_reflections
       has_many :children, class_name: "Obj", foreign_key: "parent_obj_id", validate: false
-      belongs_to :parent, class_name: "Obj", foreign_key: "parent_obj_id"
+      belongs_to :parent, class_name: "Obj", foreign_key: "parent_obj_id", optional: true
     end
 
     # @api public

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

@@ -1,8 +1,6 @@
 require "rails"
 require "active_record/railtie"
-require "action_view"
-
-require "rails_connector/configuration"
+require "action_view/railtie"
 
 module ::RailsConnector
   class Engine < Rails::Engine
@@ -12,8 +10,18 @@ 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
-      ActiveRecord::Type.register(:fiona_datetime, ::FionaDateTime)
+      ActiveSupport.on_load(:active_record) do
+        ActiveRecord::Type.register(:fiona_datetime, FionaDateTime)
+      end
     end
 
     initializer "rails_connector.add_cms_routing_paths", after: :add_routing_paths do |app|
@@ -38,7 +46,7 @@ module ::RailsConnector
 
       if runtime
         RailsConnector::LogSubscriber.attach_to :rails_connector
-        ActiveSupport.on_load(:action_controller) do
+        ActiveSupport.on_load(:action_controller_base) do
           include runtime
         end
       end
@@ -50,14 +58,40 @@ module ::RailsConnector
 
     initializer "rails_connector.routing_helpers" do
       ActionDispatch::TestRequest.include RailsConnector::CmsTestRequest if Rails.env == "test"
+      config.to_prepare do
+        ActiveSupport.on_load(:action_controller_base) do
+          include CmsRoutingHelper
+        end
+      end
 
-      ActionController::Base.include CmsRoutingHelper
-      ActionView::Base.include CmsRoutingHelper
+      ActiveSupport.on_load(:action_view_base) do
+        include CmsRoutingHelper
+      end
+    end
+
+    initializer "zeitwerk.autoloader" do
+      if Rails::VERSION::MAJOR >= 6 && Rails.autoloaders.zeitwerk_enabled?
+        Rails.autoloaders.main.inflector.inflect("ses" => "SES")
+        Rails.autoloaders.each do |autoloader|
+          autoloader.ignore("#{config.root}/lib/generators")
+          autoloader.ignore("#{config.root}/lib/meta_eager_loader.rb")
+          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")
+        end
+      end
     end
 
     config.autoload_paths += paths["lib"].to_a
-    config.autoload_once_paths += paths["lib"].to_a
+    config.autoload_once_paths += paths["lib/rails_connector"].to_a
+    config.eager_load_paths += paths["lib/rails_connector"].to_a
 
-    RailsConnector.rack_middlewares.each { |middleware| config.app_middleware.use middleware }
+    initializer "middleware.config" do
+      RailsConnector.rack_middlewares.each { |middleware| config.app_middleware.use middleware }
+    end
   end
 end

data/lib/rails_connector/meta/eager_loader.rb

@@ -21,8 +21,8 @@ module RailsConnector
         if !@obj_classes.fetch(name, nil).nil?
           @obj_classes[name]
         else
-          # TODO: preload_attribute_blobs for obj_class
-          @obj_classes[name] ||= RailsConnector::ObjClass.find_by_obj_class_name(name)
+          obj_class = RailsConnector::ObjClass.find_by_obj_class_name(name)
+          @obj_classes[name] = obj_class if obj_class
         end
       end
 

data/lib/version.rb

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

metadata

@@ -1,43 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: infopark_fiona_connector
 version: !ruby/object:Gem::Version
-  version: 7.0.1.5.2.7.rc1
+  version: 7.0.1.6.1.6.rc2
 platform: ruby
 authors:
 - Infopark AG
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-05 00:00:00.000000000 Z
+date: 2022-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -208,12 +220,13 @@ 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
 - lib/rails_connector/engine.rb
 - lib/rails_connector/errors.rb
-- lib/rails_connector/fiona_datetime.rb
+- lib/rails_connector/fiona_date_time.rb
 - lib/rails_connector/fiona_engine.rb
 - lib/rails_connector/html_string.rb
 - lib/rails_connector/job.rb
@@ -240,7 +253,8 @@ files:
 homepage: http://www.infopark.de
 licenses:
 - LGPL-3.0
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -249,14 +263,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.5
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Infopark Fiona Connector