caboose-cms 0.5.176 → 0.5.177

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODY1NTkwODZhZWFhNDJlMDJkYWE1OGY5NTA4NDViMGM4NWU3OGJkZQ==
+    ODg4ZjY4YzRiMmJiMGE1MmVlMThjZThhZjhhNjEyNWY4OTMxMWM5Nw==
   data.tar.gz: !binary |-
-    YzE0M2EwOTJhYjdhYmZjZWM4NTYyZjdkMWJmMWNjYjdkYzNiMTc2ZQ==
+    ZTYyYTJjYzE4M2M3ZDhhYjA2NTg3OGNjZDU2ZTUxODMyYjgxZjYxYQ==
 SHA512:
   metadata.gz: !binary |-
-    NzVhYWExY2M0YzIxZDA0YWYyYzdjM2VmZGQ1ZjEzNmM4MjJkMTU1NGFlMDIz
-    ZDcwOWY2NzA5MWJlYzg2NDA3YjhhMTM2MTg1MjU1ODBiOWE0MmMxOWUyODgx
-    ZTM5ZDBlNzRjMmRkNDI2ODY0NmY3NzhkZDNmNWNhYzM3OWE0YzQ=
+    ODkyMDJjZGM1N2EzZmE1ZjE4MGE0ZWIxMGIzNmY2YWFlMTliZWYxMzZlNmRh
+    YjNjNmIwOTk5MmQ5NWVjNDc3MmQ0YTc5NzA5MzdjYTYwYjlmNmVmYmFiZDRl
+    ZDcwMTVkMWIzNTZlODc4YjEzY2ZjMGNmOGM4ZWNhNmI1YmYzOWI=
   data.tar.gz: !binary |-
-    MmU2M2JmMzI1OWZjYjFhYWU5NTY4NmEyNjEwNDZkZjcwNTA0OTg2MWFkYWVl
-    YmI5ZDdjZGE2YzRjZmVhMjAyZTAyMTkwOWE2M2UyNmRhM2JkY2IzNTY4ZmJj
-    YzM4MjdiYTdhYTM2YmQ0ZTk5ZmExZWIyZjg2Y2E5ZThjM2QzMjE=
+    NzM2YTNjMWEzNTYwM2Q2YjY0YmI1MjkyOTRkNzM1MGIzZDRkNDhiY2ZmYmQx
+    NTkwYjdkODhjMTQyYmJhNDVhZWIxMGViMzFkOGY0YzlhY2VlZmMxODY1NWI5
+    NWFkNDA0YjYxMjQ1N2E0ZDc2ZGVjZjM1NDZmMjU0NDM4YjQ3YjU=

data/app/controllers/caboose/pages_controller.rb

@@ -14,8 +14,8 @@ module Caboose
       # Find the page with an exact URI match 
       page = Page.page_with_uri(request.host_with_port, request.fullpath, false)            
       
-      # Make sure we're not under construction
-      d = Caboose::Domain.where(:domain => request.host_with_port).first        
+      # Make sure we're not under construction or on a forwarded domain
+      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
@@ -25,6 +25,17 @@ module Caboose
           render :file => 'caboose/application/under_construction', :layout => false
         end
         return
+      # See if we're on a forwarding domain
+      elsif !d.primary && d.forward_to_primary
+        pd = d.site.primary_domain
+        if pd
+          url = "#{request.protocol}#{pd.domain}"
+          if request.fullpath && request.fullpath.strip.length > 0 && request.fullpath.strip != '/'
+            url << request.fullpath
+          end
+          redirect_to url
+          return
+        end
       else
         #Caboose.log(request.inspect)        
       end

data/app/models/caboose/domain.rb

@@ -3,6 +3,6 @@ class Caboose::Domain < ActiveRecord::Base
   self.table_name = "domains"
        
   belongs_to :site, :class_name => 'Caboose::Site'        
-  attr_accessible :id, :site_id, :domain, :primary, :under_construction
+  attr_accessible :id, :site_id, :domain, :primary, :under_construction, :forward_to_primary
       
 end

data/app/models/caboose/schema.rb

@@ -269,7 +269,8 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :site_id            , :integer ],
         [ :domain             , :string  ],
         [ :primary            , :boolean, { :default => false }],
-        [ :under_construction , :boolean, { :default => false }]
+        [ :under_construction , :boolean, { :default => false }],
+        [ :forward_to_primary , :boolean, { :default => false }]
       ],
       Caboose::GiftCard => [
         [ :site_id         , :integer  ],        

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.176'
+  VERSION = '0.5.177'
 end

metadata

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