cmor_cms 0.0.10.pre → 0.0.11.pre
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/cmor/cms/action_view/template_patch.rb +10 -3
- data/lib/cmor/cms/database_resolver.rb +38 -19
- metadata +6 -6
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 8ca13977d26511d881f55d50b0bcd94c915d8b7e641ea559c0f603fb36bc7f5b
|
|
4
|
+
data.tar.gz: 504434d6dcb3f5a3df260052c66ebe407a3702a83f49a511265d9420a6d66a43
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 63c0d7d8faf9f06da2b0999ca0b5be4a7838cffe3ec3460fab316c3175b7d7810fd2bfcfba21ee1a208ad074db37a063133b048865a98be739ca42f474566060
|
|
7
|
+
data.tar.gz: f1775d7a308c6e8aed0318c10ec4a903b3ff9c4fee457979887427a060b99944cbba665a46a2e5566664881a3a83970761c0b1b704f6942c5ec1cbbc9650bf7a
|
|
@@ -6,9 +6,16 @@ module ActionView
|
|
|
6
6
|
|
|
7
7
|
alias_method :original_initialize, :initialize
|
|
8
8
|
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
9
|
+
if Rails.version < '6.0'
|
|
10
|
+
def initialize(source, identifier, handler, details)
|
|
11
|
+
@layout = details[:layout] if details.key?(:layout)
|
|
12
|
+
original_initialize(source, identifier, handler, details)
|
|
13
|
+
end
|
|
14
|
+
else
|
|
15
|
+
def initialize(source, identifier, handler, format: nil, variant: nil, locals: nil, virtual_path: nil, layout: layout)
|
|
16
|
+
@layout = layout
|
|
17
|
+
original_initialize(source, identifier, handler, format: format, variant: variant, locals: locals, virtual_path: virtual_path)
|
|
18
|
+
end
|
|
12
19
|
end
|
|
13
20
|
end
|
|
14
21
|
end
|
|
@@ -46,25 +46,44 @@ module Cmor
|
|
|
46
46
|
end
|
|
47
47
|
|
|
48
48
|
# Initialize an ActionView::Template object based on the record found.
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
49
|
+
if Rails.version < '6.0'
|
|
50
|
+
def initialize_template(record, details)
|
|
51
|
+
source = build_source(record)
|
|
52
|
+
identifier = "#{record.class} - #{record.id} - #{record.pathname}#{record.basename}"
|
|
53
|
+
handler = ::ActionView::Template.registered_template_handler(record.handler)
|
|
54
|
+
|
|
55
|
+
# 5) Check for the record.format, if none is given, try the template
|
|
56
|
+
# handler format and fallback to the one given on conditions
|
|
57
|
+
format = record.format && Mime[record.format]
|
|
58
|
+
format ||= handler.default_format if handler.respond_to?(:default_format)
|
|
59
|
+
format ||= details[:formats]
|
|
60
|
+
details = {
|
|
61
|
+
format: format,
|
|
62
|
+
updated_at: record.updated_at,
|
|
63
|
+
virtual_path: "#{record.pathname}#{record.basename}"
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
details[:layout] = record.layout if record.respond_to?(:layout) && record.layout.present?
|
|
67
|
+
|
|
68
|
+
::ActionView::Template.new(source, identifier, handler, details)
|
|
69
|
+
end
|
|
70
|
+
else
|
|
71
|
+
def initialize_template(record, details)
|
|
72
|
+
source = build_source(record)
|
|
73
|
+
identifier = "#{record.class} - #{record.id} - #{record.pathname}#{record.basename}"
|
|
74
|
+
handler = ::ActionView::Template.registered_template_handler(record.handler)
|
|
75
|
+
virtual_path = "#{record.pathname}#{record.basename}"
|
|
76
|
+
layout = record.layout if record.respond_to?(:layout) && record.layout.present?
|
|
77
|
+
locals = []
|
|
78
|
+
|
|
79
|
+
# 5) Check for the record.format, if none is given, try the template
|
|
80
|
+
# handler format and fallback to the one given on conditions
|
|
81
|
+
format = record.format && Mime[record.format]
|
|
82
|
+
format ||= handler.default_format if handler.respond_to?(:default_format)
|
|
83
|
+
format ||= details[:formats]
|
|
84
|
+
|
|
85
|
+
::ActionView::Template.new(source, identifier, handler, format: format.symbol, virtual_path: virtual_path, layout: layout, locals: locals)
|
|
86
|
+
end
|
|
68
87
|
end
|
|
69
88
|
|
|
70
89
|
def assert_slashs(prefix)
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: cmor_cms
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.0.
|
|
4
|
+
version: 0.0.11.pre
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Roberto Vasquez Angel
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2019-
|
|
11
|
+
date: 2019-06-12 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rails
|
|
@@ -30,28 +30,28 @@ dependencies:
|
|
|
30
30
|
requirements:
|
|
31
31
|
- - '='
|
|
32
32
|
- !ruby/object:Gem::Version
|
|
33
|
-
version: 0.0.
|
|
33
|
+
version: 0.0.11.pre
|
|
34
34
|
type: :runtime
|
|
35
35
|
prerelease: false
|
|
36
36
|
version_requirements: !ruby/object:Gem::Requirement
|
|
37
37
|
requirements:
|
|
38
38
|
- - '='
|
|
39
39
|
- !ruby/object:Gem::Version
|
|
40
|
-
version: 0.0.
|
|
40
|
+
version: 0.0.11.pre
|
|
41
41
|
- !ruby/object:Gem::Dependency
|
|
42
42
|
name: cmor_core_frontend
|
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
|
44
44
|
requirements:
|
|
45
45
|
- - '='
|
|
46
46
|
- !ruby/object:Gem::Version
|
|
47
|
-
version: 0.0.
|
|
47
|
+
version: 0.0.11.pre
|
|
48
48
|
type: :runtime
|
|
49
49
|
prerelease: false
|
|
50
50
|
version_requirements: !ruby/object:Gem::Requirement
|
|
51
51
|
requirements:
|
|
52
52
|
- - '='
|
|
53
53
|
- !ruby/object:Gem::Version
|
|
54
|
-
version: 0.0.
|
|
54
|
+
version: 0.0.11.pre
|
|
55
55
|
- !ruby/object:Gem::Dependency
|
|
56
56
|
name: sqlite3
|
|
57
57
|
requirement: !ruby/object:Gem::Requirement
|