cmor_cms 0.0.38.pre → 0.0.39.pre

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/app/template_handlers/action_view/template/handlers/textile.rb +1 -1
  3. data/lib/cmor/cms/database_resolver.rb +4 -1
  4. metadata +6 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 0102b2821de84be71e03c6e61329574572c5d0123e2bca43f9851a0a80eb852f
4
- data.tar.gz: 4e91ab4311f1d5e082bfb7f701e2246442dd8caa23a67e7bc36b77d21cede67d
3
+ metadata.gz: b7c80c480fab0cb7b99b4d927dc088d1d42e2ea20371ee945016bb3766e4a029
4
+ data.tar.gz: e4ff4f8a6239cdf08d49c31690712b988bae5b7210ea9b4c84e5052806bdd580
5
5
  SHA512:
6
- metadata.gz: 57d4cfa888d9e0f9eeb82733037a0c6538f0d515ce7bccfa9780b8513a3b2db95c402e7eaf1666c51e2c358caa0388efde46ec293a713b294567dddfcb0d4d56
7
- data.tar.gz: 0f60ea379840ff91c744ae3ee863f88d901b165e069ff05a6b6ee3cf83f074ef489a3a5354d68dd736552f5a12ac91dddd60e3b33e2f4c7ba7eb5be725bb2692
6
+ metadata.gz: e25bd9852831f2393fd7c43469ebcff82070d395e4272fbb58ce9b8edeb28dfd2fdabb3b8d4c8bf55e7c685f75e58017102807a230e353306bdbe74d5c66107c
7
+ data.tar.gz: 6485931393621ab7f3418dba90c8ce6c8e8a8ba46b833480576e3f98e5b0d345fa8d3483e3b0bd3ae7901f1e03c0f957b1018c7ba84a8c3f6bcb437a5ae88ea6
data/app/template_handlers/action_view/template/handlers/textile.rb CHANGED
@@ -7,7 +7,7 @@ module ActionView::Template::Handlers
7
7
  @@erb_handler ||= ActionView::Template.registered_template_handler(:erb)
8
8
  end
9
9
 
10
- if Rails.version < '6.0.0.beta1'
10
+ if Rails.version < '6.0.0.beta1' && Rails.version < '6.0.0'
11
11
  def call(template)
12
12
  compiled_source = erb_handler.call(template)
13
13
  "RedCloth.new(begin;#{compiled_source};end).to_html.html_safe"
data/lib/cmor/cms/database_resolver.rb CHANGED
@@ -82,7 +82,10 @@ module Cmor
82
82
  format ||= handler.default_format if handler.respond_to?(:default_format)
83
83
  format ||= details[:formats]
84
84
 
85
- ::ActionView::Template.new(source, identifier, handler, format: format.symbol, virtual_path: virtual_path, layout: layout, locals: locals)
85
+ # Rails 6 passes an array of formats instead of a symbol
86
+ format = format.is_a?(Array) ? format.first : format.symbol
87
+
88
+ ::ActionView::Template.new(source, identifier, handler, format: format, virtual_path: virtual_path, layout: layout, locals: locals)
86
89
  end
87
90
  end
88
91
 
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.38.pre
4
+ version: 0.0.39.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-08-19 00:00:00.000000000 Z
11
+ date: 2019-10-30 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.38.pre
33
+ version: 0.0.39.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.38.pre
40
+ version: 0.0.39.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.38.pre
47
+ version: 0.0.39.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.38.pre
54
+ version: 0.0.39.pre
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: sqlite3
57
57
  requirement: !ruby/object:Gem::Requirement