caboose-cms 0.5.43 → 0.5.44

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTc1NWMyNjFjMGI0MTc3NmQ1ZGI5NDZjNTY1MWRjZDllOGM3NzAyYg==
+    ZmY3ZmMwOTIzYzI2ZmY1YmZiYmVmY2YyZWYyYTFhM2ZiNDg5ZWU5NQ==
   data.tar.gz: !binary |-
-    Mzc5OGM4ZmI2YTMyY2M3NmU5NjZlYjA0NTEwOTI3YzY0NmUxNDA1Yw==
+    MDY4YmQyYTFiNjY4ZjI3Njc3MGY0N2RjMGE3MTU2ZmQ3YzlhMWQ0Nw==
 SHA512:
   metadata.gz: !binary |-
-    Yjk5Y2FiZTI0MzVlYzc4MTExMmQyMmM3ZDNiNDFmMjUyYWI3YjdmZDg4NDll
-    NmFiODcyMTFiMDgwNDRjZWMwYzI3NThmN2E3MDM1N2E3Yzk3MDZiYWU5MjNl
-    NmNlZjRhYjNmYzdjZDI3ZThiYjRmMzkyNjY4MDMyYjZiOGU4ZjU=
+    NWU5YjNlNzU3YjRiYjNhYTdjNWY2MTQxZTcwMDY2NGZlM2NiNzg0Zjk4ZGUy
+    NDk1MTQ0YTYwMmRlNzM5ZTljYjBhODg4YWQyN2MxZjY4NmZmNmM5NjZlZDUw
+    MTA4ZGYzNWNhMGU1MmYyMTE5OGUzMmE1MzMzMDZhOTJhY2EwYjE=
   data.tar.gz: !binary |-
-    MDk0NDcyMzVkNDllNTk0YmViMTMwYTc4MmE0MzZlM2RhZDgwZDk4MTI1YTE0
-    MmFhYzg2OGU1NGRhMzEyYTBlOTlmMjRjZTU3MmFmOTk3ODBlNWVkMzc2YTEw
-    ODNkZmQ5NTFiYzliOWMzZGQwNjhjOGU4ZjljMDU0OWIyODYyNzI=
+    ZDJkMWFmYzhlZjY4MmU2MWM3NDU2OTUwMWU1NTg3ZGE1NzhmMjc3Y2I3Nzdh
+    MjYyZGI2ODlmMGE2ZDM5ZjFlNGZjNDE1YWMzOThmNTdkMDY5MmVjZmRlYmNm
+    MGUzMDkxNGRjMzFhZjg5YmU3NzIzMTc3NzU2M2JjODUwNGQyZmY=

data/app/models/caboose/block_cache.rb

@@ -27,6 +27,22 @@ module Caboose
       end
       return nil    
     end
+    
+    def children_where(h)
+      arr = []      
+      self.children.each do |b|
+        matches = true
+        h.each do |k,v|
+          if b.send(k) != v
+            matches = false
+            break
+          end
+        end
+        arr << b if matches
+      end
+      return nil if arr.count == 0
+      return arr
+    end
                                               
     #def render(block, options = nil)                    
     #  block = self.child(block) if block && block.is_a?(String)

data/app/models/caboose/page_cacher.rb

@@ -102,7 +102,8 @@ module Caboose
         f.gsub!(/block\.partial\((.*?),(.*?)\)/ , 'render :partial => \1')
         f.gsub!(/block\.render\((.*?),(.*?)\)/  , 'render_block_type(block, \1, page, view, controller_view_content, modal, empty_text, editing, css, js, csrf_meta_tags, csrf_meta_tags2, logged_in_user, site)')        
         f.gsub!(/\=\s*render_block_type\(/      , 'render_block_type(')
-        f.gsub!(/\=\s*raw render_block_type\(/  , 'render_block_type(')        
+        f.gsub!(/\=\s*raw render_block_type\(/  , 'render_block_type(')
+        f.gsub!(/block.children.where\(([^\)]*?)\)\.all/, 'block.children_where(\1)')                
                 
         #@render_functions[bt.id] = "<% def render_block_type_#{bt.id}(block, page, view, controller_view_content, modal, empty_text, editing, css, js, csrf_meta_tags, csrf_meta_tags2, logged_in_user, site) %>#{f}<% end %>"
           

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.43'
+  VERSION = '0.5.44'
 end

metadata

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