cmor_cms 0.0.34.pre → 0.0.35.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec9ae452cd3208820882f7dd025778a12cc7a0623e84a4597d779fa1767a308e
-  data.tar.gz: c818033143773e226481cd737456baf3afcf086bcae4ef931998699e494bd2a9
+  metadata.gz: 2f0211356aaf3856c3067064a28efca3ce5b42681d86202d7b87d3a61a1c53be
+  data.tar.gz: aba0cd5392b9f020c581addc3cbdf3b87b36a9e6397d78de83f5dcb331f3ccd3
 SHA512:
-  metadata.gz: 63632f17031c47a9a7d01484d7c3a170b51c3ed2eb02d2506aeecb744bd4b2c725e68b99d1d9f0a6986795687ab00af6d5b8596236e06384a293cff82140ef86
-  data.tar.gz: fd2c704e09c6c6b10f01724d7e7cc713cde57e3d5b63884aaefe6d60d927889afb0c67571237ecadf3f0008172bcf003ee5111c4d0b14e15d798c404c6ec6449
+  metadata.gz: 8ea13988a8b4037474fbc83f7eac8330827005979926a50ef65fcbfa7b18e6c3ca587bd8ea4354aa1ad91e38f568b52d858ab0485eaaf6e650fc86fd7b466f62
+  data.tar.gz: fd1f0fda9df053743c4f5bac8fce89e464f3148a9009141cefe38115801c4d5546ebbf596393f7864724b880b81f400e8bc7ab5fe2f271ccdb6def66433cbd8b

data/app/controllers/cmor/cms/page_controller.rb

@@ -7,11 +7,14 @@ module Cmor
       def respond
         respond_to do |format|
           format.html { render template: params[:page] }
+          format.json do
+            render json: { content: render_to_string(template: params[:page], layout: false, formats: [:html]) }.to_json
+          end
+          format.xml do
+            # We don't support xml atm, but we want to handle xml requests by failing with a 404.
+            handle_missing_template
+          end
           format.txt  { render template: params[:page], layout: false, formats: [:text] }
-          # format.pdf do
-          #   output = render_to_string template: params[:page], formats: [:html, :pdf], layout: false
-          #   self.response_body = WickedPdf.new.pdf_from_string(output)
-          # end if Gem::Specification.find_all_by_name('wicked_pdf').any?
         end
       end
 
@@ -19,30 +22,39 @@ module Cmor
         extend ActiveSupport::Concern
 
         included do
-          # avoid error 500 on missing template
-          rescue_from ActionView::MissingTemplate do
-            if params[:page] == 'home'
-              render_fallback_page
+          rescue_from ActionView::MissingTemplate do |exception|
+            if exception.message.start_with?('Missing partial')
+              handle_missing_partial(exception)
             else
-              respond_to do |format|
-                format.html do
-                  render(file: "#{Rails.root}/public/404", formats: [:html],
-                        layout: false,
-                        status: 404
-                        )
-                end
-                format.xml  { head :not_found }
-                format.any  { head :not_found }
-              end
+              handle_missing_template(exception)
             end
           end
         end
 
         private
 
+        def handle_missing_partial(exception)
+          raise exception
+        end
+
+        def handle_missing_template(exception = nil)
+          if params[:page] == 'home'
+            render_fallback_page
+          else
+            respond_to do |format|
+              format.html { raise ActionController::RoutingError.new("No page matches [GET] \"/#{params[:page]}\"") }
+              format.xml  { head :not_found }
+              format.json { head :not_found }
+              format.any  { head :not_found }
+            end
+          end
+        end
+
+
         def render_fallback_page
           respond_to do |format|
             format.html { render :fallback }
+            format.json { render json: { content: render_to_string(:fallback, layout: false, formats: [:html]) }.to_json }
             format.txt  { render :fallback }
           end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cmor_cms
 version: !ruby/object:Gem::Version
-  version: 0.0.34.pre
+  version: 0.0.35.pre
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-08 00:00:00.000000000 Z
+date: 2019-08-09 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.34.pre
+        version: 0.0.35.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.34.pre
+        version: 0.0.35.pre
 - !ruby/object:Gem::Dependency
   name: cmor_core_frontend
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.34.pre
+        version: 0.0.35.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.34.pre
+        version: 0.0.35.pre
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement