caboose-cms 0.8.17 → 0.8.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13402536b1e5f9bcb3b178a2950b207f6d9bbdc0
-  data.tar.gz: 704e6565a250acc6ae7d2e9d9e66b241adc52dfb
+  metadata.gz: e396ee4af10a9a46ddb79d556859276bbe27612b
+  data.tar.gz: 5929d71bc68d4f9e75ba97cbba9d598012833fc5
 SHA512:
-  metadata.gz: 6e2aed02d6fc2a88bb431f800a65cc72a0309774a6cd3b5d4f168d3794acec29fda1d6ae3910581ba3ee333a6495f743e312f753e8b0b608993f32fee8cd5c49
-  data.tar.gz: 4df248e0e08fdcfd627cef7af31b316e1e064dc2daffc804ed9c269cac3de5d5e8f2a4d638ec64d86c3163a1738ae5957eaa576c9463bee2b2638581be63982a
+  metadata.gz: b22e850aecc4ac1dd4011f166bf93ca255c27aaefa396dea708318dcbec8cb2b990cc4d077ce2f4735ac5897a72648669d9edc0e87aba884d359eb694d86599e
+  data.tar.gz: 0c978d67e9e5a6504762ccc285059fdae462b8c406a8b308c12b0dd4e48eea7a6f421863d595c48361c409bf82b287bc9aaf5022253b9be86a15da594af9dd44

data/app/controllers/caboose/block_types_controller.rb

@@ -133,7 +133,7 @@ module Caboose
       # Trigger the page cache to be updated      
       query = ["update page_cache set refresh = true where page_id in (select distinct(page_id) from blocks where block_type_id = ?)", bt.id]
       ActiveRecord::Base.connection.execute(ActiveRecord::Base.send(:sanitize_sql_array, query))      
-      PageCacher.delay.refresh
+      PageCacher.delay(:queue => 'caboose_cache').refresh
     
       resp.success = save && bt.save
       render :json => resp

data/app/controllers/caboose/blocks_controller.rb

@@ -365,9 +365,9 @@ module Caboose
         if pc
           pc.refresh = true
           pc.save
-          PageCacher.delay.refresh
+          PageCacher.delay(:queue => 'caboose_cache').refresh
         else
-          PageCacher.delay.cache(b.page_id)
+          PageCacher.delay(:queue => 'caboose_cache').cache(b.page_id)
         end
       end
                 

data/app/controllers/caboose/cart_controller.rb

@@ -57,7 +57,7 @@ module Caboose
           :status     => 'pending'
         )
       end
-      GA.delay.event(@site.id, 'cart', 'add', "Product #{v.product.id}, Variant #{v.id}")
+      GA.delay(:queue => 'caboose_store').event(@site.id, 'cart', 'add', "Product #{v.product.id}, Variant #{v.id}")
       render :json => { 
         :success => li.save, 
         :errors => li.errors.full_messages,
@@ -146,7 +146,7 @@ module Caboose
         
         resp.success = true
         resp.invoice_total = @invoice.total
-        GA.delay.event(@site.id, 'giftcard', 'add', "Giftcard #{gc.id}")
+        GA.delay(:queue => 'caboose_store').event(@site.id, 'giftcard', 'add', "Giftcard #{gc.id}")
       end
       render :json => resp
     end

data/app/controllers/caboose/invoices_controller.rb

@@ -233,7 +233,7 @@ module Caboose
     def admin_send_for_authorization
       return if !user_is_allowed('invoices', 'edit')
       invoice = Invoice.find(params[:id])
-      invoice.delay.send_payment_authorization_email      
+      invoice.delay(:queue => 'caboose_store').send_payment_authorization_email      
       render :json => { :success => true }
     end
     

data/app/controllers/caboose/media_controller.rb

@@ -95,7 +95,7 @@ module Caboose
           when 'sort_order'   then m.sort_order   = value
           when 'image_url'    then
             m.processed = false
-            m.delay.download_image_from_url(value)
+            m.delay(:queue => 'caboose_media').download_image_from_url(value)
         end
       end
       

data/app/controllers/caboose/sns_controller.rb

@@ -30,7 +30,7 @@ module Caboose
                                                                       
                 m = Media.where(:media_category_id => media_category_id, :original_name => original_name, :name => name).first
                 m = Media.create(:media_category_id => media_category_id, :original_name => original_name, :name => name, :processed => false) if m.nil?                
-                m.delay.process
+                m.delay(:queue => 'caboose_media').process
       
               end
             end                  

data/app/controllers/caboose/variants_controller.rb

@@ -286,15 +286,15 @@ module Caboose
             
           when 'sale_price'
             v.sale_price = value            
-            v.product.delay(:run_at => 3.seconds.from_now).update_on_sale            
+            v.product.delay(:run_at => 3.seconds.from_now, :queue => 'caboose_store').update_on_sale            
           when 'date_sale_starts'
             v.date_sale_starts = ModelBinder.local_datetime_to_utc(value, @logged_in_user.timezone)                        
-            v.product.delay(:run_at => v.date_sale_starts).update_on_sale
-            v.product.delay(:run_at => 3.seconds.from_now).update_on_sale
+            v.product.delay(:run_at => v.date_sale_starts, :queue => 'caboose_store').update_on_sale
+            v.product.delay(:run_at => 3.seconds.from_now, :queue => 'caboose_store').update_on_sale
           when 'date_sale_ends'
             v.date_sale_ends = ModelBinder.local_datetime_to_utc(value, @logged_in_user.timezone)                        
-            v.product.delay(:run_at => v.date_sale_ends).update_on_sale  
-            v.product.delay(:run_at => 3.seconds.from_now).update_on_sale
+            v.product.delay(:run_at => v.date_sale_ends  , :queue => 'caboose_store').update_on_sale  
+            v.product.delay(:run_at => 3.seconds.from_now, :queue => 'caboose_store').update_on_sale
         end
       end
       resp.success = save && v.save
@@ -444,38 +444,38 @@ module Caboose
           when 'sale_price'
             variants.each_with_index do |v, i|              
               v.sale_price = value            
-              v.product.delay(:run_at => 3.seconds.from_now).update_on_sale if i == 0
+              v.product.delay(:run_at => 3.seconds.from_now, :queue => 'caboose_store').update_on_sale if i == 0
             end
           when 'date_sale_starts'
             variants.each_with_index do |v, i|
               v.date_sale_starts = ModelBinder.update_date(v.date_sale_starts, value, @logged_in_user.timezone)
               if i == 0
-                v.product.delay(:run_at => v.date_sale_starts).update_on_sale
-                v.product.delay(:run_at => 3.seconds.from_now).update_on_sale                
+                v.product.delay(:run_at => v.date_sale_starts, :queue => 'caboose_store').update_on_sale
+                v.product.delay(:run_at => 3.seconds.from_now, :queue => 'caboose_store').update_on_sale                
               end                                
             end
           when 'time_sale_starts'
             variants.each_with_index do |v, i|
               v.date_sale_starts = ModelBinder.update_time(v.date_sale_starts, value, @logged_in_user.timezone)                                    
               if i == 0
-                v.product.delay(:run_at => v.date_sale_starts).update_on_sale
-                v.product.delay(:run_at => 3.seconds.from_now).update_on_sale                
+                v.product.delay(:run_at => v.date_sale_starts, :queue => 'caboose_store').update_on_sale
+                v.product.delay(:run_at => 3.seconds.from_now, :queue => 'caboose_store').update_on_sale                
               end
             end            
           when 'date_sale_ends'
             variants.each_with_index do |v, i|
               v.date_sale_ends = ModelBinder.update_date(v.date_sale_ends, value, @logged_in_user.timezone)            
               if i == 0
-                v.product.delay(:run_at => v.date_sale_ends).update_on_sale
-                v.product.delay(:run_at => 3.seconds.from_now).update_on_sale                
+                v.product.delay(:run_at => v.date_sale_ends  , :queue => 'caboose_store').update_on_sale
+                v.product.delay(:run_at => 3.seconds.from_now, :queue => 'caboose_store').update_on_sale                
               end
             end            
           when 'time_sale_ends'
             variants.each_with_index do |v, i|
               v.date_sale_ends = ModelBinder.update_time(v.date_sale_ends, value, @logged_in_user.timezone)                                    
               if i == 0
-                v.product.delay(:run_at => v.date_sale_ends).update_on_sale
-                v.product.delay(:run_at => 3.seconds.from_now).update_on_sale                
+                v.product.delay(:run_at => v.date_sale_ends  , :queue => 'caboose_store').update_on_sale
+                v.product.delay(:run_at => 3.seconds.from_now, :queue => 'caboose_store').update_on_sale                
               end
             end
             

data/app/models/caboose/media.rb

@@ -183,8 +183,8 @@ class Caboose::Media < ActiveRecord::Base
       :file_updated_at    => self.file_updated_at    ,      
       :processed          => false
     )
-    m.delay.download_image_from_url(self.image.url(:original)) if self.image
-    m.delay.download_file_from_url(self.file.url) if self.file
+    m.delay(:queue => 'caboose_media').download_image_from_url(self.image.url(:original)) if self.image
+    m.delay(:queue => 'caboose_media').download_file_from_url(self.file.url) if self.file
     return m
   end
       

data/app/models/caboose/page_cacher.rb

@@ -4,14 +4,14 @@ module Caboose
     
     def self.refresh
       PageCache.where(:refresh => true).all.each do |pc|
-        self.delay.cache(pc.page_id)
+        self.delay(:queue => 'caboose_cache').cache(pc.page_id)
       end
       
       # Make sure all pages are cached
       query = ["select id from pages where id not in (select distinct(page_id) from page_cache)"]
       rows = ActiveRecord::Base.connection.execute(ActiveRecord::Base.send(:sanitize_sql_array, query))
       if rows
-        rows.each{ |row| self.delay.cache(row['id'].to_i) }
+        rows.each{ |row| self.delay(:queue => 'caboose_cache').cache(row['id'].to_i) }
       end
     end
     
@@ -19,7 +19,7 @@ module Caboose
       query = ["select id from pages order by id"]
       rows = ActiveRecord::Base.connection.execute(ActiveRecord::Base.send(:sanitize_sql_array, query))
       if rows
-        rows.each{ |row| self.delay.cache(row['id'].to_i) }
+        rows.each{ |row| self.delay(:queue => 'caboose_cache').cache(row['id'].to_i) }
       end            
     end
       

data/app/models/caboose/product.rb

@@ -218,7 +218,7 @@ module Caboose
     
     def Product.update_on_sale            
       Product.reorder(:id).all.each do |p|
-        p.delay.update_on_sale 
+        p.delay(:queue => 'caboose_store').update_on_sale 
       end
     end
 

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.8.17'
+  VERSION = '0.8.18'
 end

data/lib/tasks/caboose.rake

@@ -249,17 +249,17 @@ namespace :caboose do
   desc "Reprocess media images"
   task :reprocess_media_images => :environment do    
     Caboose::Media.where("image_file_name is not null").reorder(:id).all.each do |m|
-      m.delay.reprocess_image            
+      m.delay(:queue => 'caboose_media').reprocess_image            
     end
   end
   
   desc "Migrate block images and files to media"
   task :migrate_block_assets_to_media => :environment do
     Caboose::Block.where("image_file_name is not null and media_id is null").reorder(:id).all.each do |b|                
-      b.delay.migrate_media
+      b.delay(:queue => 'caboose_media').migrate_media
     end  
     Caboose::Block.where("file_file_name is not null and media_id is null").reorder(:id).all.each do |b|
-      b.delay.migrate_media
+      b.delay(:queue => 'caboose_media').migrate_media
     end
     Caboose::BlockType.where(:id => 19).update_all('name' => 'image2')    
     Caboose::Block.where(:block_type_id => 19).update_all('name' => 'image2')
@@ -267,12 +267,12 @@ namespace :caboose do
         
   desc "Update expired caches and cache pages that aren't cached"
   task :cache_pages => :environment do    
-    Caboose::PageCacher.delay.refresh    
+    Caboose::PageCacher.delay(:queue => 'caboose_cache').refresh    
   end
   
   desc "Cache all pages"
   task :cache_all_pages => :environment do    
-    Caboose::PageCacher.delay.cache_all    
+    Caboose::PageCacher.delay(:queue => 'caboose_cache').cache_all    
   end
   
   desc "Run rspec tests on Caboose"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.8.17
+  version: 0.8.18
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-12 00:00:00.000000000 Z
+date: 2016-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg