caboose-cms 0.7.6 → 0.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 467cece0f88d960855d4ad26840903cae902f587
-  data.tar.gz: f7111b3f98be115978f625eaa801ad53d12d524a
+  metadata.gz: 8cabbe7518c75a074f2ce3c8dfc4cf4f9e1ed349
+  data.tar.gz: bf108c32cd8e7fb629f3d4fa046a2d9dcff9f8e8
 SHA512:
-  metadata.gz: cde7f1788bd57774d5378b215a9fd608f32b3178147f02f62c945f75048f6d33fae850a6312ba12989c93cba6b4ae41f0776e79afba79f142b41b13880c6b988
-  data.tar.gz: b7c8fc5902c3de794590a06467ac90152cf11a01c589da70fa9a2835cea10fd13ff556ad446e103ef07a14c36af90932c3a042a628ae9db84f74cbbf17809e9e
+  metadata.gz: 472eaae0630a52bf0ec2e2c90f4d242c4afa71d545f549c60a7e69ca1bb7c464d7a37fed88db71ec38d4e5012f6998ca76ae83ad2761bbe22f8ed141d3e19bbb
+  data.tar.gz: 4a17b18fe6b3a5e48bb0b81112f018bbc6a1db4c8cced97e863ccbd1c153c86b8980ea79df1033264b2803bb812015f07577c835872bdb817969e72ad66d1d68

data/app/controllers/caboose/application_controller.rb

@@ -8,15 +8,16 @@ module Caboose
     
     @find_page = true    
     
-    def before_before_action            
+    def before_before_action           
+      
       # Modify the built-in params array with URL params if necessary
       parse_url_params if Caboose.use_url_params
       
       @use_page_cache = !request.fullpath.starts_with?('/admin')
             
       # Get the site we're working with      
-      domain = Domain.where(:domain => request.host_with_port).first
-      @site = domain ? domain.site : nil
+      @domain = Domain.where(:domain => request.host_with_port).first
+      @site = @domain ? @domain.site : nil
       
       # Set the site in any mailers
       CabooseMailer.site = @site
@@ -52,7 +53,7 @@ module Caboose
       @logged_in_user = logged_in_user  
       
       # Initialize the card
-      init_cart if @site && @site.use_store && !domain.under_construction
+      init_cart if @site && @site.use_store && !@domain.under_construction
       
       before_action
     end

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.7.6'
+  VERSION = '0.7.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.7.7
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-13 00:00:00.000000000 Z
+date: 2015-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg