caboose-cms 0.4.140 → 0.4.141

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjEzZWJmYzI2MDdlZTYxN2IwZDFmYmIwY2M2M2JkNmYwYjQ3MWYxNA==
+    M2ZlYzBkYzNmMzNmMDhkNWUzZGQ0NGM4NGFkYmEyNGFjYWEzNTM0Nw==
   data.tar.gz: !binary |-
-    MjQ1ZmY5MTM0NjQwMGE4ZGNjNTRmMTBhYmIwNmNkYzAwM2JkNDQyMA==
+    NmY0MjRiNGEwOTZkOWI1NDUwNGI2NTNiMmQxNTljNmZhYjAxZWQ4Mg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZjE2YmY0N2YyZDQ0NDRmYzU5ODIzMzE1ODZkNjdiMjVjOTllNDc0MmQ2OGIw
-    MjViMjQ5NjAxMWZiYTVhNmQyYTkwMmUzOTdjYjBkMzUzNmY3YmJlMjNlNTVm
-    NGI0M2U1OTgzYmE4ZjJiOTQxZWZiN2YzNzQxZjNmMjVjMmY2OTE=
+    ZTE2Yjc3ZTI5YjFhZDRiZTQ5MjU1OWUyYjI4NTZkOTNlYmEyZTczMmM0YWQ4
+    NzYyNDAzNWJkNzE4MGU2OWFiNmMwNDQ3MDQ1ODAwZTc2NzRlNzAxMTIwNzBj
+    MTZkMWRjNDY1NTk4YTQ0Yjg5ODAxYjQxZWU2N2M1NjhhZWIxZjY=
   data.tar.gz: !binary |-
-    OTBkMDZmODdjN2ZhODZmNzNiZTdiNDAzNzNiYTZiZmZhODM4NTQxNDg1MTRj
-    YTY5MWQwMzUwYTJjMjcxNzI5NWY5M2Y2M2RhNDUzZjI1NDc5NWIzNzVhODI0
-    NDRjYWVmMDQzOWFlMTEyNTY0MGJkYWE4MjFkZWNmOTI1NGU4MDI=
+    OTk4MDgyMDY5MTYyNjkwMWFkMDNiZmM2MTgzMjdkYjQ0MzUyNDQxOTFjMTNm
+    MTQ3ZGQwMjBhMjE2NDk3NTkwNGM0Y2Q4NzQ2MmQyZmU3ZjFhNDAwYjdjYzMw
+    ZTAxOWNiNzJiZjc5YmJlMGMyNWY0MDU2ZGE2ZDI2YWUwMTVlYjg=

data/app/controllers/caboose/pages_controller.rb

@@ -14,23 +14,20 @@ module Caboose
       # Find the page with an exact URI match 
       page = Page.page_with_uri(request.host_with_port, request.fullpath, false)
       
-      if (!page)
-        
-        # Make sure we're not under construction
-        d = Caboose::Domain.where(:domain => request.host_with_port).first        
-        if d.nil?
-          Caboose.log("Could not find domain for #{request.host_with_port}\nAdd this domain to the caboose site.")
-        elsif d.under_construction == true
-          if d.site.under_construction_html && d.site.under_construction_html.strip.length > 0 
-            render :text => d.site.under_construction_html
-          else 
-            render :file => 'caboose/application/under_construction', :layout => false
-          end
-          return
-        else
-          Caboose.log("domain id = #{d.id}")
+      # Make sure we're not under construction
+      d = Caboose::Domain.where(:domain => request.host_with_port).first        
+      if d.nil?
+        Caboose.log("Could not find domain for #{request.host_with_port}\nAdd this domain to the caboose site.")
+      elsif d.under_construction == true
+        if d.site.under_construction_html && d.site.under_construction_html.strip.length > 0 
+          render :text => d.site.under_construction_html
+        else 
+          render :file => 'caboose/application/under_construction', :layout => false
         end
-        
+        return      
+      end
+      
+      if !page
         asset
         return
       end

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.4.140'
+  VERSION = '0.4.141'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.4.140
+  version: 0.4.141
 platform: ruby
 authors:
 - William Barry