caboose-cms 0.7.9 → 0.7.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e6f3997789d5f79d8f6a9ca3cf6aae4659b0096
-  data.tar.gz: 015785dca3640c8f002b0da75b565936539e5cc2
+  metadata.gz: 9a70827123c9a2ab434f55b1a2d172d92f3b9443
+  data.tar.gz: ff1c55fab2918425ca9fd94b60f751002cff0514
 SHA512:
-  metadata.gz: fa51f2cc0c88e18d7e3d9b074e8883beffe4bb9a340c52d9dadf2413c9c8fee71489cf3f4a1909e63dcac49bb17041cfaa0a3d510a275420cadfbe2173b159df
-  data.tar.gz: 3165baf5b25f0c03bc07e673245be41b6e8ec1388acb4d81b8cc2a4135ef8b71fcf4728b8ffee0fbc7fb3648bccd627466be3496c6287c3f0300ab9f76528c16
+  metadata.gz: 2340fce950be8789cf970d01e630bdc226ab23e68bf3c68d14a596c1fec23065b716c14e87be0e256137e47c66dc53749924901f88ad79aea0256901d5707d2c
+  data.tar.gz: b9f9dd51c50f10986c27b0e1ff2c3550e8d8fc2a683b5018553cb2245a122c4032a9ed911f12ad5491261bb032e224ad10a82b027eb412a234a4e3fc7512a782

data/app/models/caboose/block.rb

@@ -71,10 +71,24 @@ class Caboose::Block < ActiveRecord::Base
       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.file  if b.block_type.field_type == 'file'        
     return b.value        
   end
   
+  def rendered_child_value(name, options)
+    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 options[:view].render(:inline => b.value, :locals => options)                    
+  end
+  
   def child(name)
     Caboose::Block.where("parent_id = ? and name = ?", self.id, name).first
   end

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.7.9'
+  VERSION = '0.7.10'
 end

metadata

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