infopark_fiona_connector 7.0.1.5.2.4.rc1 → 7.0.1.6.1.6.rc1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/assets/javascripts/editmarker.js +2136 -238
- data/app/models/named_link.rb +2 -1
- data/lib/infopark_fiona_connector.rb +4 -3
- data/lib/obj.rb +2 -1
- data/lib/rails_connector/basic_obj.rb +3 -16
- data/lib/rails_connector/engine.rb +34 -11
- data/lib/rails_connector/{fiona_datetime.rb → fiona_date_time.rb} +0 -0
- data/lib/rails_connector/meta/eager_loader.rb +2 -2
- data/lib/version.rb +1 -1
- metadata +32 -33
data/app/models/named_link.rb
CHANGED
@@ -19,10 +19,9 @@ module ::RailsConnector
|
|
19
19
|
end
|
20
20
|
|
21
21
|
require "rails_connector/core_extensions"
|
22
|
-
require "rails_connector/rack_middlewares"
|
23
22
|
require "rails_connector/errors"
|
24
|
-
require "rails_connector/
|
25
|
-
|
23
|
+
require "rails_connector/fiona_date_time"
|
24
|
+
require "rails_connector/rack_middlewares"
|
26
25
|
|
27
26
|
# @api public
|
28
27
|
module RailsConnector
|
@@ -40,5 +39,7 @@ module RailsConnector
|
|
40
39
|
autoload_all_sources
|
41
40
|
end
|
42
41
|
|
42
|
+
module InfoparkFionaConnector; end
|
43
|
+
|
43
44
|
require "rails_connector/engine" if defined?(Rails)
|
44
45
|
require "rails_connector/fiona_engine" if defined?(Rails)
|
data/lib/obj.rb
CHANGED
@@ -1,6 +1,5 @@
|
|
1
1
|
require "json"
|
2
2
|
require "openssl"
|
3
|
-
require "rails_connector/fiona_datetime"
|
4
3
|
|
5
4
|
module RailsConnector
|
6
5
|
# The CMS file class
|
@@ -37,12 +36,12 @@ module RailsConnector
|
|
37
36
|
end
|
38
37
|
|
39
38
|
def self.configure_column_information(table_name_postfix, use_cached_permissions)
|
40
|
-
reset_column_information
|
41
|
-
|
42
39
|
self.table_name = "#{table_name_prefix}#{table_name_postfix}"
|
43
40
|
self.primary_key = "obj_id"
|
44
41
|
self.inheritance_column = "obj_class"
|
45
42
|
|
43
|
+
reset_column_information
|
44
|
+
|
46
45
|
@@use_cached_permissions = use_cached_permissions
|
47
46
|
descendants.each do |klass|
|
48
47
|
klass.reset_table_name
|
@@ -128,7 +127,7 @@ module RailsConnector
|
|
128
127
|
|
129
128
|
def self.reset_reflections
|
130
129
|
has_many :children, class_name: "Obj", foreign_key: "parent_obj_id", validate: false
|
131
|
-
belongs_to :parent, class_name: "Obj", foreign_key: "parent_obj_id"
|
130
|
+
belongs_to :parent, class_name: "Obj", foreign_key: "parent_obj_id", optional: true
|
132
131
|
end
|
133
132
|
|
134
133
|
# @api public
|
@@ -507,18 +506,6 @@ module RailsConnector
|
|
507
506
|
@mime_type ||= compute_mime_type
|
508
507
|
end
|
509
508
|
|
510
|
-
def respond_to?(method_id, include_private = false)
|
511
|
-
if super
|
512
|
-
true
|
513
|
-
elsif %w(_attr_dict _attr_defs _attr_values).include?(method_id.to_s)
|
514
|
-
# prevent infinite recursion when calling "attr_*" below,
|
515
|
-
# since rails checks the absence of an "_attr_*" method internally
|
516
|
-
false
|
517
|
-
else
|
518
|
-
attr_dict.respond_to?(method_id)
|
519
|
-
end
|
520
|
-
end
|
521
|
-
|
522
509
|
private
|
523
510
|
|
524
511
|
def fiona_fields
|
@@ -1,10 +1,6 @@
|
|
1
1
|
require "rails"
|
2
2
|
require "active_record/railtie"
|
3
|
-
require "action_view"
|
4
|
-
|
5
|
-
require "jquery-rails"
|
6
|
-
|
7
|
-
require "rails_connector/configuration"
|
3
|
+
require "action_view/railtie"
|
8
4
|
|
9
5
|
module ::RailsConnector
|
10
6
|
class Engine < Rails::Engine
|
@@ -15,7 +11,9 @@ module ::RailsConnector
|
|
15
11
|
config.action_dispatch.rescue_responses["RailsConnector::ResourceNotFound"] = :not_found
|
16
12
|
|
17
13
|
initializer "rails_connector.add_fiona_time_type" do
|
18
|
-
|
14
|
+
ActiveSupport.on_load(:active_record) do
|
15
|
+
ActiveRecord::Type.register(:fiona_datetime, FionaDateTime)
|
16
|
+
end
|
19
17
|
end
|
20
18
|
|
21
19
|
initializer "rails_connector.add_cms_routing_paths", after: :add_routing_paths do |app|
|
@@ -40,7 +38,7 @@ module ::RailsConnector
|
|
40
38
|
|
41
39
|
if runtime
|
42
40
|
RailsConnector::LogSubscriber.attach_to :rails_connector
|
43
|
-
ActiveSupport.on_load(:
|
41
|
+
ActiveSupport.on_load(:action_controller_base) do
|
44
42
|
include runtime
|
45
43
|
end
|
46
44
|
end
|
@@ -52,14 +50,39 @@ module ::RailsConnector
|
|
52
50
|
|
53
51
|
initializer "rails_connector.routing_helpers" do
|
54
52
|
ActionDispatch::TestRequest.include RailsConnector::CmsTestRequest if Rails.env == "test"
|
53
|
+
config.to_prepare do
|
54
|
+
ActiveSupport.on_load(:action_controller_base) do
|
55
|
+
include CmsRoutingHelper
|
56
|
+
end
|
57
|
+
end
|
55
58
|
|
56
|
-
|
57
|
-
|
59
|
+
ActiveSupport.on_load(:action_view_base) do
|
60
|
+
include CmsRoutingHelper
|
61
|
+
end
|
62
|
+
end
|
63
|
+
|
64
|
+
initializer "zeitwerk.autoloader" do
|
65
|
+
if Rails::VERSION::MAJOR >= 6 && Rails.autoloaders.zeitwerk_enabled?
|
66
|
+
Rails.autoloaders.main.inflector.inflect("ses" => "SES")
|
67
|
+
Rails.autoloaders.each do |autoloader|
|
68
|
+
autoloader.ignore("#{config.root}/lib/generators")
|
69
|
+
autoloader.ignore("#{config.root}/lib/meta_eager_loader.rb")
|
70
|
+
autoloader.ignore("#{config.root}/lib/version.rb")
|
71
|
+
autoloader.ignore("#{config.root}/lib/rails_connector/core_extensions.rb")
|
72
|
+
autoloader.ignore("#{config.root}/lib/rails_connector/core_extensions/time.rb")
|
73
|
+
autoloader.ignore("#{config.root}/lib/rails_connector/errors.rb")
|
74
|
+
autoloader.ignore("#{config.root}/lib/rails_connector/fiona_date_time.rb")
|
75
|
+
autoloader.ignore("#{config.root}/lib/rails_connector/rack_middlewares.rb")
|
76
|
+
end
|
77
|
+
end
|
58
78
|
end
|
59
79
|
|
60
80
|
config.autoload_paths += paths["lib"].to_a
|
61
|
-
config.autoload_once_paths += paths["lib"].to_a
|
81
|
+
config.autoload_once_paths += paths["lib/rails_connector"].to_a
|
82
|
+
config.eager_load_paths += paths["lib/rails_connector"].to_a
|
62
83
|
|
63
|
-
|
84
|
+
initializer "middleware.config" do
|
85
|
+
RailsConnector.rack_middlewares.each { |middleware| config.app_middleware.use middleware }
|
86
|
+
end
|
64
87
|
end
|
65
88
|
end
|
File without changes
|
@@ -21,8 +21,8 @@ module RailsConnector
|
|
21
21
|
if !@obj_classes.fetch(name, nil).nil?
|
22
22
|
@obj_classes[name]
|
23
23
|
else
|
24
|
-
|
25
|
-
@obj_classes[name]
|
24
|
+
obj_class = RailsConnector::ObjClass.find_by_obj_class_name(name)
|
25
|
+
@obj_classes[name] = obj_class if obj_class
|
26
26
|
end
|
27
27
|
end
|
28
28
|
|
data/lib/version.rb
CHANGED
metadata
CHANGED
@@ -1,43 +1,55 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: infopark_fiona_connector
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 7.0.1.
|
4
|
+
version: 7.0.1.6.1.6.rc1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Infopark AG
|
8
|
-
autorequire:
|
8
|
+
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2022-08-24 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|
15
15
|
requirement: !ruby/object:Gem::Requirement
|
16
16
|
requirements:
|
17
|
-
- - "
|
17
|
+
- - ">="
|
18
|
+
- !ruby/object:Gem::Version
|
19
|
+
version: '5.2'
|
20
|
+
- - "<"
|
18
21
|
- !ruby/object:Gem::Version
|
19
|
-
version: '
|
22
|
+
version: '7.0'
|
20
23
|
type: :runtime
|
21
24
|
prerelease: false
|
22
25
|
version_requirements: !ruby/object:Gem::Requirement
|
23
26
|
requirements:
|
24
|
-
- - "
|
27
|
+
- - ">="
|
25
28
|
- !ruby/object:Gem::Version
|
26
|
-
version: '5.
|
29
|
+
version: '5.2'
|
30
|
+
- - "<"
|
31
|
+
- !ruby/object:Gem::Version
|
32
|
+
version: '7.0'
|
27
33
|
- !ruby/object:Gem::Dependency
|
28
34
|
name: activerecord
|
29
35
|
requirement: !ruby/object:Gem::Requirement
|
30
36
|
requirements:
|
31
|
-
- - "
|
37
|
+
- - ">="
|
38
|
+
- !ruby/object:Gem::Version
|
39
|
+
version: '5.2'
|
40
|
+
- - "<"
|
32
41
|
- !ruby/object:Gem::Version
|
33
|
-
version: '
|
42
|
+
version: '7.0'
|
34
43
|
type: :runtime
|
35
44
|
prerelease: false
|
36
45
|
version_requirements: !ruby/object:Gem::Requirement
|
37
46
|
requirements:
|
38
|
-
- - "
|
47
|
+
- - ">="
|
48
|
+
- !ruby/object:Gem::Version
|
49
|
+
version: '5.2'
|
50
|
+
- - "<"
|
39
51
|
- !ruby/object:Gem::Version
|
40
|
-
version: '
|
52
|
+
version: '7.0'
|
41
53
|
- !ruby/object:Gem::Dependency
|
42
54
|
name: rake
|
43
55
|
requirement: !ruby/object:Gem::Requirement
|
@@ -80,20 +92,6 @@ dependencies:
|
|
80
92
|
- - "~>"
|
81
93
|
- !ruby/object:Gem::Version
|
82
94
|
version: '0.7'
|
83
|
-
- !ruby/object:Gem::Dependency
|
84
|
-
name: jquery-rails
|
85
|
-
requirement: !ruby/object:Gem::Requirement
|
86
|
-
requirements:
|
87
|
-
- - "~>"
|
88
|
-
- !ruby/object:Gem::Version
|
89
|
-
version: '4.3'
|
90
|
-
type: :runtime
|
91
|
-
prerelease: false
|
92
|
-
version_requirements: !ruby/object:Gem::Requirement
|
93
|
-
requirements:
|
94
|
-
- - "~>"
|
95
|
-
- !ruby/object:Gem::Version
|
96
|
-
version: '4.3'
|
97
95
|
- !ruby/object:Gem::Dependency
|
98
96
|
name: mime-types
|
99
97
|
requirement: !ruby/object:Gem::Requirement
|
@@ -114,14 +112,14 @@ dependencies:
|
|
114
112
|
requirements:
|
115
113
|
- - "~>"
|
116
114
|
- !ruby/object:Gem::Version
|
117
|
-
version: '2.
|
115
|
+
version: '2.5'
|
118
116
|
type: :runtime
|
119
117
|
prerelease: false
|
120
118
|
version_requirements: !ruby/object:Gem::Requirement
|
121
119
|
requirements:
|
122
120
|
- - "~>"
|
123
121
|
- !ruby/object:Gem::Version
|
124
|
-
version: '2.
|
122
|
+
version: '2.5'
|
125
123
|
- !ruby/object:Gem::Dependency
|
126
124
|
name: rsolr
|
127
125
|
requirement: !ruby/object:Gem::Requirement
|
@@ -227,7 +225,7 @@ files:
|
|
227
225
|
- lib/rails_connector/default_search_request.rb
|
228
226
|
- lib/rails_connector/engine.rb
|
229
227
|
- lib/rails_connector/errors.rb
|
230
|
-
- lib/rails_connector/
|
228
|
+
- lib/rails_connector/fiona_date_time.rb
|
231
229
|
- lib/rails_connector/fiona_engine.rb
|
232
230
|
- lib/rails_connector/html_string.rb
|
233
231
|
- lib/rails_connector/job.rb
|
@@ -254,8 +252,9 @@ files:
|
|
254
252
|
homepage: http://www.infopark.de
|
255
253
|
licenses:
|
256
254
|
- LGPL-3.0
|
257
|
-
metadata:
|
258
|
-
|
255
|
+
metadata:
|
256
|
+
rubygems_mfa_required: 'true'
|
257
|
+
post_install_message:
|
259
258
|
rdoc_options: []
|
260
259
|
require_paths:
|
261
260
|
- lib
|
@@ -263,15 +262,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
263
262
|
requirements:
|
264
263
|
- - ">="
|
265
264
|
- !ruby/object:Gem::Version
|
266
|
-
version:
|
265
|
+
version: 2.6.0
|
267
266
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
268
267
|
requirements:
|
269
268
|
- - ">="
|
270
269
|
- !ruby/object:Gem::Version
|
271
270
|
version: 1.3.5
|
272
271
|
requirements: []
|
273
|
-
rubygems_version: 3.
|
274
|
-
signing_key:
|
272
|
+
rubygems_version: 3.3.7
|
273
|
+
signing_key:
|
275
274
|
specification_version: 4
|
276
275
|
summary: Infopark Fiona Connector
|
277
276
|
test_files: []
|