caboose-cms 0.7.28 → 0.7.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8de6384a797dde51a30ba1e13ecc3bf391bb3789
-  data.tar.gz: 80ceb0e6add350eafcf0a22925e95b2298f5b9c6
+  metadata.gz: d6a19ce084683f65c5a6cbae50ebb24dd39ae3fd
+  data.tar.gz: 9ca547dd829a14261d9cf4d815da60682b7e84ab
 SHA512:
-  metadata.gz: 0b1dccb8b8fd8d2f14bacfc85ac1ab675e5b1480857ddfb20738e630a37bc3b61757d219f1ef1d80eb0f1c8dede7f01eb17b1d8563f2545f8018d0a02e151cd9
-  data.tar.gz: fea142d2da122f86fdf31e386eb56f3ecceac08064cfcac72d9db7146ed4f3fbef636331f65ab4a2c92643bd6324163db1d764930491941943c66aaa59ec131e
+  metadata.gz: e1f99a0e6bcf457cf4d921625ec81d54214198148d9d3cd7c6bf5700d7b9679ad236049e123a5c15a1154571762eed176ce0adaffaa741b8a7877a8c3331ed47
+  data.tar.gz: b5bca74153fd3b5f8c8835ce830dfe48a58045e47e7b710961b9ea1431805121d50d65eb9d10e003c8a7736eb250fdd455293f6a0267669e5f2887ffaf3b7df5

data/app/assets/javascripts/caboose/checkout_payment.js

@@ -66,7 +66,7 @@ Caboose.Store.Modules.CheckoutPayment = (function() {
       if (total_is_correct == false)
       {
         $('#message').html("<p class='note error'>It looks like the order total has changed since this page has refreshed. Please submit your order again after this page refreshes.");
-        setTimeout(function() { window.location.reload(true); }, 3000);
+        setTimeout(function() { window.location.reload(true); }, 3000);                
       }
       else
       {

data/app/controllers/caboose/ab_options_controller.rb

@@ -2,14 +2,14 @@ module Caboose
   class AbOptionsController < ApplicationController
     layout 'caboose/admin'
 
-    # GET /admin/ab_variants/:variant_id/options
+    # @route GET /admin/ab_variants/:variant_id/options
     def admin_index
       return unless user_is_allowed_to 'view', 'ab_variants'
       v = AbVariant.find(params[:variant_id])
       render :json => v.ab_options
     end
 
-    # POST admin/ab-variants/:variant_id/options'
+    # @route POST admin/ab-variants/:variant_id/options'
     def admin_create
       return unless user_is_allowed_to 'edit','ab_variants'
       
@@ -26,7 +26,7 @@ module Caboose
       render :json => resp
     end
 
-    # PUT /admin/ab_options/:id
+    # @route PUT /admin/ab_options/:id
     def admin_update
       return unless user_is_allowed_to 'edit', 'ab_variants'
 
@@ -46,7 +46,7 @@ module Caboose
       render :json => resp
     end
 
-    # DELETE /admin/ab_options/:id
+    # @route DELETE /admin/ab_options/:id
     def admin_delete
       return unless user_is_allowed_to 'delete', 'ab_variants'      
       AbOption.find(params[:id]).destroy                  

data/app/controllers/caboose/ab_variants_controller.rb

@@ -6,7 +6,7 @@ module Caboose
       @page = Page.page_with_uri(request.host_with_port, '/admin')
     end
 
-    # GET /admin/ab_variants
+    # @route GET /admin/ab_variants
     def admin_index
       return unless user_is_allowed_to 'view', 'ab_variants'
 
@@ -19,19 +19,19 @@ module Caboose
       @variants = @gen.items
     end
 
-    # GET /admin/ab_variants/new
+    # @route GET /admin/ab_variants/new
     def admin_new
       return unless user_is_allowed_to 'add', 'ab_variants'
       @variant = AbVariant.new
     end
 
-    # GET /admin/ab_variants/:id
+    # @route GET /admin/ab_variants/:id
     def admin_edit
       return unless user_is_allowed_to 'edit', 'ab_variants'
       @variant = AbVariant.find(params[:id])
     end
 
-    # POST /admin/ab-variants
+    # @route POST /admin/ab-variants
     def admin_create
       return unless user_is_allowed_to 'edit', 'ab_variants'
 
@@ -53,7 +53,7 @@ module Caboose
       render json: resp
     end
 
-    # PUT /admin/ab_variants/:id
+    # @route PUT /admin/ab_variants/:id
     def admin_update
       return unless user_is_allowed_to 'edit', 'ab_variants'
 
@@ -76,7 +76,7 @@ module Caboose
       render :json => resp
     end
 
-    # DELETE /admin/ab_variants/:id
+    # @route DELETE /admin/ab_variants/:id
     def admin_destroy
       return unless user_is_allowed_to 'delete', 'ab_variants'      
       AbVariants.find(params[:id]).destroy

data/app/controllers/caboose/admin_controller.rb

@@ -2,7 +2,7 @@
 module Caboose
   class AdminController < ApplicationController
       
-    # GET /admin
+    # @route GET /admin
     def index
       return if !user_is_allowed('admin', 'view')
       #if logged_in?
@@ -12,7 +12,7 @@ module Caboose
       @return_url = params[:return_url].nil? ? '/admin/pages' : params[:return_url]
     end
     
-    # GET /station
+    # @route GET /station
     def station
       @user = logged_in_user
       render :layout => 'caboose/station'

data/app/controllers/caboose/billing_addresses_controller.rb

@@ -1,14 +1,14 @@
 module Caboose
   class BillingAddressesController < Caboose::ApplicationController
             
-    # GET /admin/orders/:order_id/billing-address/json
+    # @route GET /admin/orders/:order_id/billing-address/json
     def admin_json
       return if !user_is_allowed('orders', 'edit')    
       order = Order.find(params[:order_id])      
       render :json => order.billing_address      
     end
       
-    # PUT /admin/orders/:order_id/billing-address
+    # @route PUT /admin/orders/:order_id/billing-address
     def admin_update
       return if !user_is_allowed('orders', 'edit')
       
@@ -48,7 +48,7 @@ module Caboose
     
     #===========================================================================
     
-    # GET /my-account/orders/:order_id/billing-address/json
+    # @route GET /my-account/orders/:order_id/billing-address/json
     def my_account_json
       return if !logged_in?    
       order = Order.find(params[:order_id])      
@@ -59,7 +59,7 @@ module Caboose
       render :json => order.billing_address      
     end
     
-    # PUT /my-account/orders/:order_id/billing-address
+    # @route PUT /my-account/orders/:order_id/billing-address
     def my_account_update
       return if !logged_in?
       

data/app/controllers/caboose/block_type_categories_controller.rb

@@ -2,7 +2,7 @@
 module Caboose
   class BlockTypeCategoriesController < ApplicationController
     
-    # GET /admin/block-type-categories/tree-options
+    # @route GET /admin/block-type-categories/tree-options
     def admin_tree_options
       return unless user_is_allowed('pages', 'edit')
       render :json => BlockTypeCategory.tree

data/app/controllers/caboose/block_type_sources_controller.rb

@@ -5,27 +5,51 @@ module Caboose
     # Admin actions
     #===========================================================================
     
-    # GET /admin/block-type-sources
+    # @route GET /admin/block-type-sources
     def admin_index
       return if !user_is_allowed('blocktypesources', 'view')
       @block_type_sources = BlockTypeSource.reorder("priority, name").all
       render :layout => 'caboose/admin'      
     end
     
-    # GET /admin/block-type-sources/new    
+    # @route GET /admin/block-type-sources/new    
     def admin_new
       return unless user_is_allowed('blocktypesources', 'add')
       render :layout => 'caboose/admin'
     end
     
-    # GET /admin/block-type-sources/:id
+    # @route GET /admin/block-type-sources/:id/refresh
+    def admin_refresh      
+      return unless user_is_allowed('blocktypesources', 'edit')
+      
+      resp = StdClass.new
+
+      bts = BlockTypeSource.find(params[:id])           
+      if bts.refresh_summaries
+        resp.success = "Block types from the source have been refreshed successfully."
+      else
+        resp.error = "There was an error refreshing block types from the source."
+      end
+      render :json => resp      
+    end
+    
+    # @route GET /admin/block-type-sources/options
+    def admin_options
+      return unless user_is_allowed('blocktypesources', 'edit')      
+      options = BlockType.reorder(:name).all.collect do |bts| 
+        { 'value' => bts.id, 'text' => bts.name } 
+      end      
+      render :json => options
+    end
+    
+    # @route GET /admin/block-type-sources/:id
     def admin_edit
       return unless user_is_allowed('blocktypesources', 'edit')      
       @block_type_source = BlockTypeSource.find(params[:id])
       render :layout => 'caboose/admin'
     end
     
-    # POST /admin/block-type-sources
+    # @route POST /admin/block-type-sources
     def admin_create
       return unless user_is_allowed('blocktypesources', 'add')
 
@@ -44,7 +68,7 @@ module Caboose
       render :json => resp
     end
     
-    # PUT /admin/block-type-sources/:id
+    # @route PUT /admin/block-type-sources/:id
     def admin_update
       return unless user_is_allowed('blocktypesources', 'edit')
       
@@ -66,7 +90,7 @@ module Caboose
       render :json => resp
     end
     
-    # DELETE /admin/block-type-sources/:id
+    # @route DELETE /admin/block-type-sources/:id
     def admin_delete
       return unless user_is_allowed('blocktypesources', 'delete')                  
       BlockTypeSource.find(params[:id]).destroy            
@@ -75,30 +99,6 @@ module Caboose
       })
       render :json => resp
     end
-    
-    # GET /admin/block-type-sources/:id/refresh
-    def admin_refresh      
-      return unless user_is_allowed('blocktypesources', 'edit')
-      
-      resp = StdClass.new
-
-      bts = BlockTypeSource.find(params[:id])           
-      if bts.refresh_summaries
-        resp.success = "Block types from the source have been refreshed successfully."
-      else
-        resp.error = "There was an error refreshing block types from the source."
-      end
-      render :json => resp      
-    end
-    
-    # GET /admin/block-type-sources/options
-    def admin_options
-      return unless user_is_allowed('blocktypesources', 'edit')      
-      options = BlockType.reorder(:name).all.collect do |bts| 
-        { 'value' => bts.id, 'text' => bts.name } 
-      end      
-      render :json => options
-    end
 		
   end  
 end

data/app/controllers/caboose/block_type_store_controller.rb

@@ -2,7 +2,7 @@
 module Caboose
   class BlockTypeStoreController < ApplicationController
         
-    # GET /admin/block-types/store
+    # @route GET /admin/block-types/store
     def admin_index
       return unless user_is_allowed('blocktypestore', 'add')
       @pager = PageBarGenerator.new(params, {
@@ -20,14 +20,7 @@ module Caboose
     	render :layout => 'caboose/admin'
     end
     
-    # GET /admin/block-types/store/:block_type_summary_id
-    def admin_details
-      return unless user_is_allowed('blocktypestore', 'add')
-      @block_type_summary = BlockTypeSummary::find(params[:block_type_summary_id])
-      render :layout => 'caboose/admin'
-    end
-    
-    # GET /admin/block-types/store/:block_type_summary_id/download
+    # @route GET /admin/block-types/store/:block_type_summary_id/download
     def admin_download
       return unless user_is_allowed('blocktypestore', 'add')
 
@@ -37,6 +30,13 @@ module Caboose
       resp = StdClass.new('success' => 'The block type has been downloaded successfully.')
       render :json => resp
     end
-		
+    
+    # @route GET /admin/block-types/store/:block_type_summary_id
+    def admin_details
+      return unless user_is_allowed('blocktypestore', 'add')
+      @block_type_summary = BlockTypeSummary::find(params[:block_type_summary_id])
+      render :layout => 'caboose/admin'
+    end
+    
   end  
 end

data/app/controllers/caboose/block_types_controller.rb

@@ -6,14 +6,14 @@ module Caboose
     # Admin actions
     #===========================================================================
     
-    # GET /admin/block-types
+    # @route GET /admin/block-types
     def admin_index
       return if !user_is_allowed('pages', 'view')
       @block_types = BlockType.where("parent_id is null or parent_id = 0").reorder(:name).all
       render :layout => 'caboose/admin'      
     end
     
-    # GET /admin/block-types/json
+    # @route GET /admin/block-types/json
     def admin_json
       h = {        
         'name'              => '',
@@ -41,15 +41,15 @@ module Caboose
       }
     end
     
-    # GET /admin/block-types/:id/json
+    # @route GET /admin/block-types/:id/json
     def admin_json_single
       return if !user_is_allowed('pages', 'view')
       block_type = BlockType.find(params[:id])
       render :json => block_type.as_json(:include => :sites)      
     end
 
-    # GET /admin/block-types/new
-    # GET /admin/block-types/:id/new
+    # @route GET /admin/block-types/new
+    # @route GET /admin/block-types/:id/new
     def admin_new
       return unless user_is_allowed('pages', 'add')      
       @block_type = BlockType.new
@@ -57,21 +57,21 @@ module Caboose
       render :layout => 'caboose/admin'
     end
     
-    # GET /admin/block-types/:id
-    def admin_edit
+    # @route GET /admin/block-types/:id/icon
+    def admin_edit_icon
       return unless user_is_allowed('pages', 'edit')      
       @block_type = BlockType.find(params[:id])
-      render :layout => 'caboose/admin'
+      render :layout => 'caboose/modal'
     end
     
-    # GET /admin/block-types/:id/icon
-    def admin_edit_icon
+    # @route GET /admin/block-types/:id
+    def admin_edit
       return unless user_is_allowed('pages', 'edit')      
       @block_type = BlockType.find(params[:id])
-      render :layout => 'caboose/modal'
+      render :layout => 'caboose/admin'
     end
     
-    # POST /admin/block-types
+    # @route POST /admin/block-types
     def admin_create
       return unless user_is_allowed('pages', 'add')
 
@@ -94,7 +94,7 @@ module Caboose
       render :json => resp
     end
     
-    # PUT /admin/block-types/:id
+    # @route PUT /admin/block-types/:id
     def admin_update
       return unless user_is_allowed('pages', 'edit')
       
@@ -139,7 +139,7 @@ module Caboose
       render :json => resp
     end
     
-    # DELETE /admin/block-types/:id
+    # @route DELETE /admin/block-types/:id
     def admin_delete
       return unless user_is_allowed('pages', 'delete')                  
       BlockType.find(params[:id]).destroy            
@@ -148,68 +148,53 @@ module Caboose
       })
       render :json => resp
     end
-    
-    # GET /admin/block-types/field-type-options
+        
+    # @route_priority 1
+    # @route GET /admin/block-types/:field-options
+    # @route GET /admin/block-types/options
+    # @route GET /admin/block-types/:id/options
     def admin_field_type_options
-      return unless user_is_allowed('pages', 'edit')      
-      options = [ 
-        { 'value' => 'checkbox'           , 'text' => 'Checkbox'                     }, 
-        { 'value' => 'checkbox_multiple'  , 'text' => 'Checkbox (multiple)'          }, 
-        { 'value' => 'image'              , 'text' => 'Image'                        },
-        { 'value' => 'file'               , 'text' => 'File'                         },
-        { 'value' => 'richtext'           , 'text' => 'Rich Text'                    }, 
-        { 'value' => 'select'             , 'text' => 'Multiple choice (select box)' }, 
-        { 'value' => 'text'               , 'text' => 'Textbox'                      }, 
-        { 'value' => 'textarea'           , 'text' => 'Textarea'                     },
-        { 'value' => 'block'              , 'text' => 'Block'                        }
-      ]      
-      render :json => options
-    end
-    
-    # GET /admin/block-types/site-options
-    def admin_site_options
-      return unless user_is_allowed('pages', 'edit')
-      options = Site.reorder("description, name").all.collect do |s| 
-        { 
-          'value' => s.id, 
-          'text' => s.description && s.description.strip.length > 0 ? s.description : s.name
-        }
-      end                        
-      render :json => options
-    end
-    
-    # GET /admin/block-types/:id/options
-    def admin_value_options
       return unless user_is_allowed('pages', 'edit')
-      bt = BlockType.find(params[:id])            
+
       options = []
-      if bt.options_function
-        options = bt.render_options
-      elsif bt.options
-        options = bt.options.strip.split("\n").collect { |line| { 'value' => line, 'text' => line }}
+      case params[:field]
+        when nil
+          if params[:id]          
+            bt = BlockType.find(params[:id])            
+            options = []
+            if bt.options_function
+              options = bt.render_options
+            elsif bt.options
+              options = bt.options.strip.split("\n").collect { |line| { 'value' => line, 'text' => line }}
+            end
+          else                  
+            options = BlockType.where("parent_id is null").reorder(:name).all.collect do |bt| 
+              { 'value' => bt.id, 'text' => bt.description } 
+            end
+          end
+        when 'field-type'
+          options = [ 
+            { 'value' => 'checkbox'           , 'text' => 'Checkbox'                     }, 
+            { 'value' => 'checkbox_multiple'  , 'text' => 'Checkbox (multiple)'          }, 
+            { 'value' => 'image'              , 'text' => 'Image'                        },
+            { 'value' => 'file'               , 'text' => 'File'                         },
+            { 'value' => 'richtext'           , 'text' => 'Rich Text'                    }, 
+            { 'value' => 'select'             , 'text' => 'Multiple choice (select box)' }, 
+            { 'value' => 'text'               , 'text' => 'Textbox'                      }, 
+            { 'value' => 'textarea'           , 'text' => 'Textarea'                     },
+            { 'value' => 'block'              , 'text' => 'Block'                        }
+          ]
+        when 'site'      
+          options = Site.reorder("description, name").all.collect{ |s| { 'value' => s.id, 'text' => s.description && s.description.strip.length > 0 ? s.description : s.name }}
+        when 'tree'          
+          options = []            
+          BlockType.where("parent_id is null or parent_id = 0").reorder(:name).all.each do |bt|        
+            admin_tree_options_helper(options, bt, '')         
+          end
       end        
       render :json => options
     end
     
-    # GET /admin/block-types/options
-    def admin_options
-      return unless user_is_allowed('pages', 'edit')      
-      options = BlockType.where("parent_id is null").reorder(:name).all.collect do |bt| 
-        { 'value' => bt.id, 'text' => bt.description } 
-      end      
-      render :json => options
-    end
-    
-    # GET /admin/block-types/tree-options
-    def admin_tree_options
-      return unless user_is_allowed('pages', 'edit')
-      options = []            
-      BlockType.where("parent_id is null or parent_id = 0").reorder(:name).all.each do |bt|        
-        admin_tree_options_helper(options, bt, '')         
-      end      
-      render :json => options
-    end
-    
     def admin_tree_options_helper(options, bt, prefix)      
       options << { 'value' => bt.id, 'text' => "#{prefix}#{bt.description}" }
       bt.children.each do |bt2|
@@ -221,7 +206,7 @@ module Caboose
     # Store Actions
     #===========================================================================
     
-    # GET /admin/block-types/store
+    # @route GET /admin/block-types/store
     def admin_store_index
       return unless user_is_allowed('blocktypestore', 'add')
       @pager = PageBarGenerator.new(params, {
@@ -239,14 +224,7 @@ module Caboose
     	render :layout => 'caboose/admin'
     end
     
-    # GET /admin/block-types/store/:block_type_summary_id
-    def admin_store_details
-      return unless user_is_allowed('blocktypestore', 'add')
-      @block_type_summary = BlockTypeSummary::find(params[:block_type_summary_id])
-      render :layout => 'caboose/admin'
-    end
-    
-    # GET /admin/block-types/store/:block_type_summary_id/download
+    # @route GET /admin/block-types/store/:block_type_summary_id/download
     def admin_store_download
       return unless user_is_allowed('blocktypestore', 'add')
 
@@ -257,11 +235,18 @@ module Caboose
       render :json => resp
     end
     
+    # @route GET /admin/block-types/store/:block_type_summary_id
+    def admin_store_details
+      return unless user_is_allowed('blocktypestore', 'add')
+      @block_type_summary = BlockTypeSummary::find(params[:block_type_summary_id])
+      render :layout => 'caboose/admin'
+    end
+            
     #===========================================================================
     # Public Repo Actions
     #===========================================================================
     
-    # GET /caboose/block-types
+    # @route GET /caboose/block-types
     def api_block_type_list
       arr = BlockType.where("parent_id is null and share = ?", true).reorder(:name).all.collect do |bt|
         { 'name' => bt.name, 'description' => bt.description }
@@ -269,7 +254,7 @@ module Caboose
       render :json => arr      
     end
     
-    # GET /caboose/block-types/:name
+    # @route GET /caboose/block-types/:name
     def api_block_type
       bt = BlockType.where(:name => params[:name]).first
       render :json => { 'error' => 'Invalid block type.' } if bt.nil?            

data/app/controllers/caboose/blocks_controller.rb

@@ -18,8 +18,8 @@ module Caboose
     # Admin actions
     #===========================================================================
     
-    # GET /admin/pages/:page_id/blocks
-    # GET /admin/posts/:post_id/blocks
+    # @route GET /admin/pages/:page_id/blocks
+    # @route GET /admin/posts/:post_id/blocks
     def admin_index
       return if !user_is_allowed('pages', 'view')
       #h = params[:post_id] ? { :post_id => params[:post_id] } : { :page_id => params[:page_id] }
@@ -28,10 +28,10 @@ module Caboose
       render :json => @p.block      
     end
 
-    # GET /admin/pages/:page_id/blocks/:id/new
-    # GET /admin/pages/:page_id/blocks/new
-    # GET /admin/posts/:post_id/blocks/:id/new
-    # GET /admin/posts/:post_id/blocks/new
+    # @route GET /admin/pages/:page_id/blocks/:id/new
+    # @route GET /admin/pages/:page_id/blocks/new
+    # @route GET /admin/posts/:post_id/blocks/:id/new
+    # @route GET /admin/posts/:post_id/blocks/new
     def admin_new
       return unless user_is_allowed('pages', 'add')
 
@@ -67,18 +67,18 @@ module Caboose
       render :layout => 'caboose/modal'                
     end
     
-    # GET /admin/pages/:page_id/blocks/:id
-    # GET /admin/posts/:post_id/blocks/:id
+    # @route GET /admin/pages/:page_id/blocks/:id
+    # @route GET /admin/posts/:post_id/blocks/:id
     def admin_show
       return unless user_is_allowed('pages', 'edit')      
       block = Block.find(params[:id])
       render :json => block      
     end
     
-    # GET /admin/pages/:page_id/blocks/tree
-    # GET /admin/pages/:page_id/blocks/:id/tree
-    # GET /admin/posts/:post_id/blocks/tree
-    # GET /admin/posts/:post_id/blocks/:id/tree    
+    # @route GET /admin/pages/:page_id/blocks/tree
+    # @route GET /admin/pages/:page_id/blocks/:id/tree
+    # @route GET /admin/posts/:post_id/blocks/tree
+    # @route GET /admin/posts/:post_id/blocks/:id/tree    
     def admin_tree
       return unless user_is_allowed('pages', 'edit')      
       
@@ -103,8 +103,8 @@ module Caboose
       return arr
     end      
       
-    # GET /admin/pages/:page_id/blocks/:id/render
-    # GET /admin/posts/:post_id/blocks/:id/render
+    # @route GET /admin/pages/:page_id/blocks/:id/render
+    # @route GET /admin/posts/:post_id/blocks/:id/render
     def admin_render
       return unless user_is_allowed('pages', 'edit')      
       b = Block.find(params[:id])      
@@ -133,8 +133,8 @@ module Caboose
       render :json => html            
     end        
           
-    # GET /admin/pages/:page_id/blocks/render
-    # GET /admin/posts/:post_id/blocks/render
+    # @route GET /admin/pages/:page_id/blocks/render
+    # @route GET /admin/posts/:post_id/blocks/render
     def admin_render_all
       return unless user_is_allowed('pages', 'edit')            
       blocks = Block.where("#{page_or_post}_id = ? and parent_id is null", @p.id).reorder(:sort_order).collect do |b|        
@@ -163,8 +163,8 @@ module Caboose
       render :json => blocks
     end
     
-    # GET /admin/pages/:page_id/blocks/render-second-level
-    # GET /admin/posts/:post_id/blocks/render-second-level
+    # @route GET /admin/pages/:page_id/blocks/render-second-level
+    # @route GET /admin/posts/:post_id/blocks/render-second-level
     def admin_render_second_level
       return unless user_is_allowed('pages', 'edit')      
       view = ActionView::Base.new(ActionController::Base.view_paths)      
@@ -195,8 +195,8 @@ module Caboose
       render :json => blocks      
     end
     
-    # GET /admin/pages/:page_id/blocks/:id/edit
-    # GET /admin/posts/:post_id/blocks/:id/edit
+    # @route GET /admin/pages/:page_id/blocks/:id/edit
+    # @route GET /admin/posts/:post_id/blocks/:id/edit
     def admin_edit
       return unless user_is_allowed('pages', 'edit')
       @page = Page.find(params[:page_id]) if params[:page_id]

data/app/controllers/caboose/checkout_controller.rb

@@ -185,11 +185,22 @@ module Caboose
     # GET /checkout/total
     def verify_total
       total = 0.00
-      if logged_in?              
+      if logged_in?
         @order.calculate
         total = @order.total
       end
-      render :json => total
+      #render :json => total.to_f
+      ap @order
+      
+      render :json => {
+        :subtotal  => @order.calculate_subtotal.to_f  ,
+        :tax       => @order.calculate_tax.to_f       ,
+        :shipping  => @order.calculate_shipping.to_f  ,
+        :handling  => @order.calculate_handling.to_f  ,
+        :gift_wrap => @order.calculate_gift_wrap.to_f ,
+        :discount  => @order.calculate_discount.to_f  ,
+        :total     => @order.calculate_total.to_f             
+      }
     end
     
     # GET /checkout/address
@@ -356,10 +367,10 @@ module Caboose
         # Take funds from any gift cards that were used on the order
         order.take_gift_card_funds
         
-        # Send out emails        
-        OrdersMailer.configure_for_site(@site.id).customer_new_order(order).deliver
-        OrdersMailer.configure_for_site(@site.id).fulfillment_new_order(order).deliver        
-        
+        # Send out emails                
+        OrdersMailer.delay.configure_for_site(@site.id).customer_new_order(order).deliver
+        OrdersMailer.delay.configure_for_site(@site.id).fulfillment_new_order(order).deliver
+                
         # Emit order event
         Caboose.plugin_hook('order_authorized', order)        
       else

data/app/models/caboose/comment_routes.rb

@@ -2,63 +2,82 @@ module Caboose
   class CommentRoutes
   
     def CommentRoutes.parse_controllers    
-    
-      classes = []        
-      files = Dir.glob(Rails.root.join('app', 'controllers','*.rb'))
-      for file in files    
-        f = Rails.root.join('app', 'controllers', file)
-        f2 = File.open(f, "r")
-        
-        class_name = nil
-        class_priority = 20
-        route_priority = 20
-        uris = []
-        actions = []
-        f2.each_line do |line|      
-          line = line.strip        
-          if line =~ /^(.*?)class (.*?)Controller(.*?)$/
-            class_name = line.gsub(/^(.*?)class (.*?)Controller(.*?)$/, '\2').gsub(/([A-Z])/, '_\1').downcase
-            class_name[0] = '' if class_name[0] == '_'
-          elsif line =~ /# @class_route_priority \d/
-            class_priority = line.gsub(/# @class_route_priority (\d*?)$/, '\1').to_i
-          elsif line =~ /# @route_priority \d/
-            route_priority = line.gsub(/# @route_priority (\d*?)$/, '\1').to_i
-          elsif line.starts_with?('def ')
-            actions << [line.gsub('def ', ''), uris, route_priority]              
-            uris = []
-            route_priority = 20
-          elsif line =~ /# @route GET (.*?)/       then uris << "get    \"#{line.gsub(/# @route GET (.*?)/       , '\1')}\""          
-          elsif line =~ /# @route POST (.*?)/      then uris << "post   \"#{line.gsub(/# @route POST (.*?)/      , '\1')}\""          
-          elsif line =~ /# @route PUT (.*?)/       then uris << "put    \"#{line.gsub(/# @route PUT (.*?)/       , '\1')}\""          
-          elsif line =~ /# @route DELETE (.*?)/    then uris << "delete \"#{line.gsub(/# @route DELETE (.*?)/    , '\1')}\""
+          
+      classes = {'zzz_all_domains' => []}            
+      Rails.application.config.paths['app/controllers'].each do |controller_path|
+        files = Dir.glob(Rails.root.join(controller_path, '*.rb'))
+        for file in files    
+          f = Rails.root.join('app', 'controllers', file)
+          f2 = File.open(f, "r")
+                  
+          domains = []
+          class_name = nil
+          class_priority = 20
+          route_priority = 20
+          uris = []
+          actions = []
+          f2.each_line do |line|      
+            line = line.strip        
+            if line =~ /^(.*?)class (.*?)Controller(.*?)$/
+              class_name = line.gsub(/^(.*?)class (.*?)Controller(.*?)$/, '\2').gsub(/([A-Z])/, '_\1').downcase
+              class_name[0] = '' if class_name[0] == '_'
+            elsif line =~ /# @route_domain (.*?)$/            
+              domain = line.gsub(/# @route_domain (.*?)$/, '\1')
+              domains << domain if !domains.include?(domain)                        
+            elsif line =~ /# @class_route_priority \d/
+              class_priority = line.gsub(/# @class_route_priority (\d*?)$/, '\1').to_i
+            elsif line =~ /# @route_priority \d/
+              route_priority = line.gsub(/# @route_priority (\d*?)$/, '\1').to_i
+            elsif line.starts_with?('def ')
+              actions << [line.gsub('def ', ''), uris, route_priority]              
+              uris = []
+              route_priority = 20
+            elsif line =~ /# @route GET (.*?)/       then uris << "get    \"#{line.gsub(/# @route GET (.*?)/       , '\1')}\""          
+            elsif line =~ /# @route POST (.*?)/      then uris << "post   \"#{line.gsub(/# @route POST (.*?)/      , '\1')}\""          
+            elsif line =~ /# @route PUT (.*?)/       then uris << "put    \"#{line.gsub(/# @route PUT (.*?)/       , '\1')}\""          
+            elsif line =~ /# @route DELETE (.*?)/    then uris << "delete \"#{line.gsub(/# @route DELETE (.*?)/    , '\1')}\""
+            end
+          end
+          if domains.count > 0
+            domains.each do |domain|
+              classes[domain] = [] if classes[domain].nil?
+              classes[domain] << [class_name, actions, class_priority]
+            end
+          else                      
+            classes['zzz_all_domains'] << [class_name, actions, class_priority]
           end
-        end      
-        classes << [class_name, actions, class_priority]
+        end
       end
-
+           
       routes = []
-      classes.sort_by{ |arr| arr[2] }.each do |carr|
-        
-        class_name = carr[0]
-        actions = carr[1]
-        
-        # Get the longest URI so we can make routes that line up vertically
-        longest = ''
-        actions.each{ |action, uris| uris.each{ |uri| longest = uri if uri.length > longest.length }}
-        length = longest.length + 1
+      classes.sort_by{ |domain, domain_classes| domain }.to_h.each do |domain, domain_classes|
+                
+        routes << "constraints Caboose::DomainConstraint.new('#{domain}') do" if domain != 'zzz_all_domains'                
+        domain_classes.sort_by{ |arr| arr[2] }.each do |carr|
         
-        # Make the route line
-        actions.sort_by{ |arr| arr[2] }.each do |arr|
-          action = arr[0]
-          uris = arr[1]
-          uris.each do |uri|
-            #puts "#{uri.ljust(length, ' ')} => \"#{class_name}\##{action}\""
-            routes << "#{uri.ljust(length, ' ')} => \"#{class_name}\##{action}\"" 
+          class_name = carr[0]
+          actions = carr[1]
+          
+          # Get the longest URI so we can make routes that line up vertically
+          longest = ''
+          actions.each{ |action, uris| uris.each{ |uri| longest = uri if uri.length > longest.length }}
+          length = longest.length + 1
+          
+          # Make the route line
+          actions.sort_by{ |arr| arr[2] }.each do |arr|
+            action = arr[0]
+            uris = arr[1]
+            uris.each do |uri|
+              #puts "#{uri.ljust(length, ' ')} => \"#{class_name}\##{action}\""
+              routes << "#{uri.ljust(length, ' ')} => \"#{class_name}\##{action}\"" 
+            end
           end
+          puts ""          
         end
-        puts ""
+        routes << "end" if domain != 'zzz_all_domains'
       end      
-      return routes      
+      puts routes
+      return routes.join("\n")      
     end
     
   end

data/app/models/caboose/domain_constraint.rb

@@ -0,0 +1,9 @@
+class Caboose::DomainConstraint
+  def initialize(domain)
+    @domains = [domain].flatten
+  end
+
+  def matches?(request)
+    return @domains.include?(request.host)        
+  end
+end

data/lib/caboose/engine.rb

@@ -144,24 +144,14 @@ module Caboose
       g.helper false        
     end
     
+    #initializer 'caboose.site_mvc', :after => :finish_hook do |app|  
+    #  # Add the MVC files for each site    
+    #  Caboose::Site.reorder(:name).all.each do |site|      
+    #    Rails.application.config.paths['app/controllers'] << "sites/#{site.name}/controllers"
+    #    Rails.application.config.paths['app/models']      << "sites/#{site.name}/models"
+    #    Rails.application.config.paths['app/views']       << "sites/#{site.name}/views"
+    #  end
+    #end
+      
   end
 end
-    
-#initializer 'caboose_store.payment_processor', :after => :finish_hook do |app|
-#  case Caboose::payment_processor
-#    when 'authorize.net'
-#      Caboose::PaymentProcessor = Caboose::PaymentProcessors::Authorizenet
-#    when 'payscape'
-#      Caboose::PaymentProcessor = Caboose::PaymentProcessors::Payscape
-#  end
-#end
-#
-#initializer 'caboose_store.cart', :after => :finish_hook do |app|
-#  ActiveSupport.on_load(:action_controller) do
-#    include Caboose::BootStrapper
-#  end
-#  
-#  Caboose::User.class_eval do
-#    self.primary_key = :id
-#  end
-#end

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.7.28'
+  VERSION = '0.7.29'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.7.28
+  version: 0.7.29
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-08 00:00:00.000000000 Z
+date: 2015-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -791,6 +791,7 @@ files:
 - app/models/caboose/database_session.rb
 - app/models/caboose/discount.rb
 - app/models/caboose/domain.rb
+- app/models/caboose/domain_constraint.rb
 - app/models/caboose/font.rb
 - app/models/caboose/font_family.rb
 - app/models/caboose/font_variant.rb