cmor_cms 0.0.39.pre → 0.0.40.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7c80c480fab0cb7b99b4d927dc088d1d42e2ea20371ee945016bb3766e4a029
-  data.tar.gz: e4ff4f8a6239cdf08d49c31690712b988bae5b7210ea9b4c84e5052806bdd580
+  metadata.gz: c14aea3d250b94a5c6a20ae11c0adc0d8404ec1d552809f203abf6596a437df5
+  data.tar.gz: 3a41881e403d72d8a11ccfd619e59ff803e0dd3eb46fd5ce4fe5b4d2feccf746
 SHA512:
-  metadata.gz: e25bd9852831f2393fd7c43469ebcff82070d395e4272fbb58ce9b8edeb28dfd2fdabb3b8d4c8bf55e7c685f75e58017102807a230e353306bdbe74d5c66107c
-  data.tar.gz: 6485931393621ab7f3418dba90c8ce6c8e8a8ba46b833480576e3f98e5b0d345fa8d3483e3b0bd3ae7901f1e03c0f957b1018c7ba84a8c3f6bcb437a5ae88ea6
+  metadata.gz: ea8e4e13c05f9ca30da20e7832946ff9c553bb66630cf57563a8fec6d820395fd9ec9e71145d75bed57236b3d022486fd944a5a41ffc50757eced1b16102b075
+  data.tar.gz: 2a9a4bd52710d2649aba11cecb535f8de9a798921b8b821c08f954464ecb414502d5057daefbce4ddf6208cb723dc193a4bd2f6ffa2adbfcd0737e339d681484

data/app/resolvers/cmor/cms/page_resolver.rb

@@ -1,5 +1,3 @@
-require 'cmor/cms/database_resolver'
-
 module Cmor
   module Cms
     class PageResolver < ::ActionView::Resolver

data/app/resolvers/cmor/cms/partial_resolver.rb

@@ -1,5 +1,3 @@
-require 'cmor/cms/database_resolver'
-
 module Cmor
   module Cms
     class PartialResolver < ::ActionView::Resolver

data/app/resolvers/cmor/cms/template_resolver.rb

@@ -1,5 +1,3 @@
-require 'cmor/cms/database_resolver'
-
 module Cmor
   module Cms
     class TemplateResolver < ::ActionView::Resolver

data/lib/cmor/cms/database_resolver.rb~

@@ -0,0 +1,121 @@
+module Cmor
+  module Cms
+    module DatabaseResolver
+      # Include hook for class methods
+      def self.included(base)
+        base.extend(ClassMethods)
+      end
+
+      # class methods go here
+      module ClassMethods
+      end
+
+      # instance methods go here
+      def find_templates(name, prefix, partial, details, outside_app_allowed = false)
+        return [] unless resolve(partial)
+
+        conditions = {
+          pathname: assert_slashs(prefix.to_s),
+          basename: normalize_basename(name),
+          locale: normalize_array(details[:locale]).first,
+          format: normalize_array(details[:formats]).first,
+          handler: normalize_array(details[:handlers])
+        }
+
+        format = conditions.delete(:format)
+        locale = conditions.delete(:locale)
+
+        query  = template_class.constantize.where(conditions)
+
+        # 2) Check for templates with the given format or format is nil
+        query = query.where(["format = ? OR format = '' OR format IS NULL", format])
+
+        # 3) Ensure templates with format come first
+        query = query.order('format DESC')
+
+        # 4) Check for templates with the given locale or locale is nil
+        query = query.where(["locale = ? OR locale = '' OR locale IS NULL", locale])
+
+        # 5) Ensure templates with locale come first
+        query = query.order('locale DESC')
+
+        # 6) Now trigger the query passing on conditions to initialization
+        query.map do |record|
+          initialize_template(record, details)
+        end
+      end
+
+      # Initialize an ActionView::Template object based on the record found.
+      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]
+
+          # Rails 6 passes an array of formats instead of a symbol
+          format = format.is_a?(Array) ? format.first : format.symbol
+
+          ::ActionView::Template.new(source, identifier, handler, format: format, virtual_path: virtual_path, layout: layout, locals: locals)
+        end
+      end
+
+      def assert_slashs(prefix)
+        output = prefix.dup
+        output << '/' unless output.end_with?('/')
+        output = '/' << output unless output.start_with?('/')
+        output
+      end
+
+      # Normalize arrays by converting all symbols to strings.
+      def normalize_array(array)
+        array.map(&:to_s)
+      end
+
+      def build_source
+        fail 'call to abstract method #build_source'
+      end
+
+      def normalize_basename(_basename)
+        fail 'call to abstract method #normalize_basename'
+      end
+
+      def resolve(_partial_flag)
+        fail 'call to abstract method #resolve'
+      end
+
+      def template_class
+        fail 'call to abstract method #template_class'
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cmor_cms
 version: !ruby/object:Gem::Version
-  version: 0.0.39.pre
+  version: 0.0.40.pre
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-30 00:00:00.000000000 Z
+date: 2019-11-04 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.39.pre
+        version: 0.0.40.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.39.pre
+        version: 0.0.40.pre
 - !ruby/object:Gem::Dependency
   name: cmor_core_frontend
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.39.pre
+        version: 0.0.40.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.39.pre
+        version: 0.0.40.pre
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -402,6 +402,7 @@ files:
 - app/models/cmor/cms/partial.rb
 - app/models/cmor/cms/template.rb
 - app/models/concerns/model/cmor/cms/navigation_item/properties_concern.rb
+- app/resolvers/cmor/cms/database_resolver.rb
 - app/resolvers/cmor/cms/page_resolver.rb
 - app/resolvers/cmor/cms/partial_resolver.rb
 - app/resolvers/cmor/cms/template_resolver.rb
@@ -437,7 +438,7 @@ files:
 - lib/cmor/cms/controller_extensions/page_resolver.rb
 - lib/cmor/cms/controller_extensions/partial_resolver.rb
 - lib/cmor/cms/controller_extensions/template_resolver.rb
-- lib/cmor/cms/database_resolver.rb
+- lib/cmor/cms/database_resolver.rb~
 - lib/cmor/cms/database_template.rb
 - lib/cmor/cms/engine.rb
 - lib/cmor/cms/version.rb