caboose-cms 0.5.225 → 0.5.226

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzhiODE1NTkwZWI3NTQ3M2RiZjZkOTVlMDUzN2NlZDYwN2JjZjZmZA==
+    ZDk1Njg3ZjIwNTA4Y2YxNmI5NzI0NDYyYzVjNjEzYzkyYWNhNWI0Zg==
   data.tar.gz: !binary |-
-    NDNkZmY3YTRjZWRmZjlmMWQ0MDBkNDU2YmZhYjBlN2I2ZWU4ZmIwZA==
+    MzMwZTcyYjYwMjg1NzQyN2IxZjRiMGNkOTJiOGE3YWUwMDgyOGRmNw==
 SHA512:
   metadata.gz: !binary |-
-    ZTJhZmRkNGQzY2U1MzQ1ZmFjOTgxYzMxMjMxOTUyYWZjYjNmNGNkOGJkMGYy
-    N2VlNDQ0YjI3MDU1MWFkOWE0MDI5N2IzZDFhNjEzMWM0OTEzOGUwYWM2Yzkz
-    N2NmMzcwMmI4YmYyNTQ4ODBhOTYxYzY2ZmQzOWEzYmMyZDBiMjg=
+    ZmU5MzhiZGQ0ZmI0OWI4Y2Q4NGFmMTg1ODU3ZTNiNjJmMDAyNjhhMzVkMWIx
+    YTgxZTNmYWYxMzFlYzlkYTZmMDUyOTMzZmRiNjE4YTFkNjhhYmQ1NDc2MmE4
+    ZGZiZGFhMGY1NWJkNDU0Njk4NWVhNjc0ZmMyMzEyMmVhYTVjNWI=
   data.tar.gz: !binary |-
-    YjQwN2ViNjZlNjZlMTNkNjdjMDk5OTQyZjUxNGY1ZmQwYWU3NjYzNzc3Nzgx
-    YWIxODc5OWEwZWI2NWRkNTkwNTdmMzhmOTY3OTQ0NWJkM2Y0NzRlZWEyNjU0
-    NDc2MDVlZGExMzg5OTc5ODgzNTZhY2Y1MWUzNGVkYjg4NzMzOWM=
+    MWY3NzA0ZDA5ZmY2MWRiNjRkMTJmNTU0NGQ0ZTliZGI5MjQ5NGQzMWNmZDI2
+    YTQwYjQ5ODQwMTFlMGFhNDZhNzRiNDljNTZjYmM4ZTdiNzM4MTEwYzNlN2Yz
+    MDJlM2ZjMjdhOWVjNWRlNjAxNmVhNjY5ZDU4ZTc1N2IyN2YxNDQ=

data/app/models/caboose/block.rb

@@ -62,16 +62,16 @@ class Caboose::Block < ActiveRecord::Base
   def child_value(name)
     b = self.child(name)
     return nil if b.nil?
-    #if b.block_type.field_type == 'image'
-    #  return b.media.image if b.media
-    #  return b.image
-    #end
-    #if b.block_type.field_type == 'file'
-    #  return b.media.file if b.media
-    #  return b.file
-    #end    
-    return b.image if b.block_type.field_type == 'image'
-    return b.file  if b.block_type.field_type == 'file'
+    if b.block_type.field_type == 'image'
+      return b.media.image if b.media
+      return b.image
+    end
+    if b.block_type.field_type == 'file'
+      return b.media.file if b.media
+      return b.file
+    end    
+    #return b.image if b.block_type.field_type == 'image'
+    #return b.file  if b.block_type.field_type == 'file'
     return b.value        
   end
   
@@ -218,7 +218,7 @@ class Caboose::Block < ActiveRecord::Base
         "caboose/blocks/#{block.block_type.name}",                
         "caboose/blocks/#{block.block_type.field_type}"
       ]
-      Caboose.log(arr)
+      #Caboose.log(arr)
       str = self.render_helper(view, options2, block, full_name, arr, 0)
 
     end    

data/app/views/caboose/blocks/_image2.html.erb

@@ -1,9 +1,4 @@
 <%
-Caboose.log(block.id)
-image_src = block.child('image_src')
-Caboose.log(image_src)
-Caboose.log(image_src.media_id)
-
 img       = block.child_value('image_src')
 img_style = block.child_value('image_style')
 link      = block.child_value('link')
@@ -19,13 +14,6 @@ mr.downcase! if mr
 mb.downcase! if mb 
 ml.downcase! if ml 
 url = img ? img.url(img_style.downcase.to_sym) : nil
-url = nil
-
-if image_src && image_src.media  
-  url = image_src.media.image.url(img_style.downcase.to_sym)
-elsif img
-  url = img.url(img_style.downcase.to_sym)
-end
 
 img = nil
 alt = block.child_value('alt_text').blank? ? "" : block.child_value('alt_text')
@@ -62,7 +50,7 @@ if url && !url.include?('missing.png')
   end
 end 
 if editing && img.nil?
-  %><p id='block_<%= block.id %>'>TPlease upload an image.</p><%
+  %><p id='block_<%= block.id %>'>Please upload an image.</p><%
 else
   %><%= raw img %><%
 end

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.225'
+  VERSION = '0.5.226'
 end

data/lib/tasks/caboose.rake

@@ -4,8 +4,15 @@ namespace :caboose do
   
   desc "Migrate block images to media"
   task :migrate_block_images_to_media => :environment do
-    Caboose::Block.where("image_file_name is not null").reorder(:id).limit(1).all.each do |b|
-      b.migrate_media
+    Caboose::Block.where("image_file_name is not null and media_id is null").reorder(:id).all.each do |b|
+      b.delay.migrate_media
+    end
+  end
+  
+  desc "Migrate block files to media"
+  task :migrate_block_files_to_media => :environment do
+    Caboose::Block.where("file_file_name is not null and media_id is null").reorder(:id).all.each do |b|
+      b.delay.migrate_media
     end
   end
         

metadata

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