caboose-cms 0.3.51 → 0.3.52

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjExYWU5YWM2ZWUzZTIxODI3ZmE5Mzg4ZTcyZGEzNjQxMzE3MGRkZg==
+    MWQ1MzE3NDYzYTI1Mzg1Njg4ZTVkYWJiZjQ5MGNmNmNjZjg5ZWU0YQ==
   data.tar.gz: !binary |-
-    YThhZDViODBjMzMxYWZjNWExNTBlNTNiMjg0ZmFjYmQ1ZWQ5OGI5YQ==
+    MjMyYzUxYjI5Mjk1MjJiZWZlYTk0NzJjNWUzZWJkMjZjODA0ZTFlOQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NzkxNGZiYWYyYTlhZDhmMTAyNTdhY2M3NDhkODM5ZTFlN2Q0OTBkYjRiZjJm
-    MzM1MWI3MDVjMmQwZDIyYjk0ZWM1MTdmM2FiM2U3MDJmY2NmNWQ1NTVhNWNm
-    N2Y2ZGFjYzdhNWNkNzUyNWI2NDBkMWQyNGZlMzFkZjNmZjNhNGM=
+    NmNmZGRkNzVmNzkxZDVhNTJlYThiMzQyMDIxNGVmNmNkOThiNDg4YTNmMGFh
+    NjMyMzQ3MWI5MDg1YzdmMGFjNWI3OWU1YjkyOTRkMTNhOWI3ZTEzNDI5MDJi
+    Y2YwNDNkNDZhZGE0NzMxMjc4ODU3ZjIzYThkNGQwNjJiODljYjk=
   data.tar.gz: !binary |-
-    ZDgwNjM4ZjNjZDUzNGE5YmQyMmUzOTY3Zjc3OTk2YjliNDBhM2JjNGYxNmU4
-    YjhjZDk2NzY2MzEzMTY2NTUwMTQyNmIwYzBkZGU5MzMwY2YzMjJiY2MxZGUz
-    MjllMzAyNmRhYzRlMjI2MGZkNDExMzVkN2M3ODcxOGFjYmU5MGQ=
+    OGRlYzNlYjJlZGIxZmUwZjI2YzEwNWU1YWFhM2I3ZTc1NTAxODAzZTg2Y2Qy
+    NjA2MzI5MTI1NTZiMTQ3YTA0ZTUyZGI5ZDM5YmRiZjE5Y2FlNGI4YzM5ZjM2
+    ODNhYjcwYTQwMTg0ZWEzNDJiZDQyNDk3NjE4YTA2MDRkMjE4MGU=

data/app/controllers/caboose/page_block_field_values_controller.rb

@@ -15,7 +15,7 @@ module Caboose
       params.each do |k,v|
         case k
           when 'value'
-            fv.value = v        
+            fv.value = v                                
         end
       end      
                

data/app/models/caboose/page_bar_generator.rb

@@ -80,28 +80,27 @@ module Caboose
       if @options['sort']
         @options['sort'].split(',').each do |col|
           tbl_col = col.split('.')
-          if tbl_col && tbl_col.count > 1
-            @options['includes'].each do |field, arr|
-              associations << arr[0] if table_name_of_association(arr[0]) == tbl_col[0]                              
-            end
-          end
+          associations << association_for_table_name(tbl_col[0]) if tbl_col && tbl_col.count > 1          
         end
       end
       # See if any parameters are listed in a table_name.column_name format
       @params.each do |k,v|
         k.split('_concat_').each do |col,v2|        
           tbl_col = col.split('.')
-          if tbl_col && tbl_col.count > 1
-            @options['includes'].each do |field, arr|
-              associations << arr[0] if table_name_of_association(arr[0]) == tbl_col[0]                              
-            end
-          end
+          associations << association_for_table_name(tbl_col[0]) if tbl_col && tbl_col.count > 1
         end
       end
   		associations.uniq.each { |assoc| m = m.includes(assoc) }
   		return m
   	end
   	
+  	def association_for_table_name(table_name)
+  	  @options['includes'].each do |field, arr|
+  	    return arr[0] if table_name_of_association(arr[0]) == table_name                              
+      end
+      return false
+    end
+  	
   	def table_name_of_association(assoc)
       ap assoc
   	  return @options['model'].constantize.reflect_on_association(assoc.to_sym).class_name.constantize.table_name

data/app/models/caboose/page_block_field_value.rb

@@ -17,5 +17,23 @@ class Caboose::PageBlockFieldValue < ActiveRecord::Base
   #do_not_validate_attachment_file_type :image
     
   attr_accessible :id, :page_block_id, :page_block_field_id, :value
-    
+  
+  after_initialize do |fv|
+    # Do whatever we need to do to set the value to be correct for the field type we have.
+    # Most field types are fine with the raw value in the database                    
+    case fv.page_block_field.field_type       
+      when 'checkbox' then fv.value = (fv.value == 1 || fv.value == '1' || fv.value == true ? true : false)
+    end
+  end
+  
+  before_save :caste_value
+  def caste_value  
+    case self.page_block_field.field_type
+      when 'checkbox'
+        if self.value.nil? then self.value = false
+        else self.value = (self.value == 1 || self.value == '1' || self.value == true ? 1 : 0)
+        end
+    end
+  end
+
 end

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.3.51'
+  VERSION = '0.3.52'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.3.51
+  version: 0.3.52
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-05 00:00:00.000000000 Z
+date: 2014-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails