cmor_cms 0.0.10.pre → 0.0.11.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad661f037050fbc4992d493f42dae2b21a7f58d67defddb09758e988fdd539c9
-  data.tar.gz: 04e410c172ee71545f0e6407ab5887044f5f6a86be668503bfe20857e548e864
+  metadata.gz: 8ca13977d26511d881f55d50b0bcd94c915d8b7e641ea559c0f603fb36bc7f5b
+  data.tar.gz: 504434d6dcb3f5a3df260052c66ebe407a3702a83f49a511265d9420a6d66a43
 SHA512:
-  metadata.gz: fe5da5137240d26c9f84e5719fc37defca9a3cf02f7337f4ccfa30ba102c9926a1a31e15850fc4d93318bd63ec4b473f9a745d1fbe7a634b40767c493231c63f
-  data.tar.gz: 30c1accb8f3fc0a47eee92ba7e68a02c0e00ed759d10ef2c2c3b2d5c1c0b8cc63a2fbe0dfd519b48e9922e89c88e4f6aa6ca621af75a0b4d4714c4c0625d2ed5
+  metadata.gz: 63c0d7d8faf9f06da2b0999ca0b5be4a7838cffe3ec3460fab316c3175b7d7810fd2bfcfba21ee1a208ad074db37a063133b048865a98be739ca42f474566060
+  data.tar.gz: f1775d7a308c6e8aed0318c10ec4a903b3ff9c4fee457979887427a060b99944cbba665a46a2e5566664881a3a83970761c0b1b704f6942c5ec1cbbc9650bf7a

data/lib/cmor/cms/action_view/template_patch.rb

@@ -6,9 +6,16 @@ module ActionView
 
         alias_method :original_initialize, :initialize
 
-        def initialize(source, identifier, handler, details)
-          @layout = details[:layout] if details.key?(:layout)
-          original_initialize(source, identifier, handler, details)
+        if Rails.version < '6.0'
+          def initialize(source, identifier, handler, details)
+            @layout = details[:layout] if details.key?(:layout)
+            original_initialize(source, identifier, handler, details)
+          end
+        else
+          def initialize(source, identifier, handler, format: nil, variant: nil, locals: nil, virtual_path: nil, layout: layout)
+            @layout = layout
+            original_initialize(source, identifier, handler, format: format, variant: variant, locals: locals, virtual_path: virtual_path)
+          end
         end
       end
     end

data/lib/cmor/cms/database_resolver.rb

@@ -46,25 +46,44 @@ module Cmor
       end
 
       # Initialize an ActionView::Template object based on the record found.
-      def initialize_template(record, details)
-        source     = build_source(record)
-        identifier = "#{record.class} - #{record.id} - #{record.pathname}#{record.basename}"
-        handler    = ::ActionView::Template.registered_template_handler(record.handler)
-
-        # 5) Check for the record.format, if none is given, try the template
-        # handler format and fallback to the one given on conditions
-        format   = record.format && Mime[record.format]
-        format ||= handler.default_format if handler.respond_to?(:default_format)
-        format ||= details[:formats]
-        details = {
-          format: format,
-          updated_at: record.updated_at,
-          virtual_path: "#{record.pathname}#{record.basename}"
-        }
-        
-        details[:layout] = record.layout if record.respond_to?(:layout) && record.layout.present?
-
-        ::ActionView::Template.new(source, identifier, handler, details)
+      if Rails.version < '6.0'
+        def initialize_template(record, details)
+          source     = build_source(record)
+          identifier = "#{record.class} - #{record.id} - #{record.pathname}#{record.basename}"
+          handler    = ::ActionView::Template.registered_template_handler(record.handler)
+
+          # 5) Check for the record.format, if none is given, try the template
+          # handler format and fallback to the one given on conditions
+          format   = record.format && Mime[record.format]
+          format ||= handler.default_format if handler.respond_to?(:default_format)
+          format ||= details[:formats]
+          details = {
+            format: format,
+            updated_at: record.updated_at,
+            virtual_path: "#{record.pathname}#{record.basename}"
+          }
+
+          details[:layout] = record.layout if record.respond_to?(:layout) && record.layout.present?
+
+          ::ActionView::Template.new(source, identifier, handler, details)
+        end
+      else
+        def initialize_template(record, details)
+          source       = build_source(record)
+          identifier   = "#{record.class} - #{record.id} - #{record.pathname}#{record.basename}"
+          handler      = ::ActionView::Template.registered_template_handler(record.handler)
+          virtual_path = "#{record.pathname}#{record.basename}"
+          layout = record.layout if record.respond_to?(:layout) && record.layout.present?
+          locals       = []
+
+          # 5) Check for the record.format, if none is given, try the template
+          # handler format and fallback to the one given on conditions
+          format   = record.format && Mime[record.format]
+          format ||= handler.default_format if handler.respond_to?(:default_format)
+          format ||= details[:formats]
+
+          ::ActionView::Template.new(source, identifier, handler, format: format.symbol, virtual_path: virtual_path, layout: layout, locals: locals)
+        end
       end
 
       def assert_slashs(prefix)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cmor_cms
 version: !ruby/object:Gem::Version
-  version: 0.0.10.pre
+  version: 0.0.11.pre
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-02 00:00:00.000000000 Z
+date: 2019-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.10.pre
+        version: 0.0.11.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.10.pre
+        version: 0.0.11.pre
 - !ruby/object:Gem::Dependency
   name: cmor_core_frontend
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.10.pre
+        version: 0.0.11.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.10.pre
+        version: 0.0.11.pre
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement