caboose-cms 0.2.94 → 0.2.95

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGUwMmFkNzY5NTVlYWJkYmNlMmUyZmQzMjc4NTk2NmFhN2Q0NTZjZA==
+    MTk4NzgwZDZiMDIyOGM5ZDhlMDY3YmMwYTE1MjIxZGQ0ZDA3ODA0NA==
   data.tar.gz: !binary |-
-    ZmNlNjg1OTgzOWMyYmZiMmFjNGNkY2I5MTllMzM4OGEyZmY3MmQwNA==
+    ODcwMTk0ZWZkOWUyNDRmOTM2YzRlYmY2MDYxMjA0YzE3ZDAxNzdhZA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NThiN2FlNjM5M2Q5YzIyOGFjN2RlZGM2Y2FlZjFkMTBiYzVmZTQ5NjY3Zjdm
-    YWYwYmMxYmFiMmIzNTdmNTkwY2ZkOGQ1MTk0ZWFiOGJjOTI0MjAyOGMwODkw
-    ZjU4MWQxZTA4MjYxMzUwYzMwYmJmOWQzZDNkMDU5ZDIzMmFkNGQ=
+    NWJkMGQ0ZjkyMTljM2NjZTA2M2MxYTgwYjRhNjZkYmNjMTk0MjEwOGY5Mzc1
+    ZGVhMzQ3NjRlNDhkZTQwMWMwMTI4ZmU4ZmFkZDE3OTg3MjQ4MjAyOTdmNjVi
+    NGEzMTQzNWY1MWNkY2U2NGFkYjM2ZGEyMjNkMTVjYzNiOGQ3Yjk=
   data.tar.gz: !binary |-
-    YmY4OGNkODZkZWRhOTIzODRkZmJhNWUxOWI2NGU3NDNhYWExMDRiMDRiNTVm
-    YmJmOWVhNjRjNjUyODg5M2UwNmJhMmUxYTI4NTMwOGIxZTEwY2U4Y2IwMzRm
-    NjdjNDc0MTk0OTQ3ZGJiZTIzYWRhZDU2M2I0MmE4NWE5ZjQwMjY=
+    NGQ1NDkxYzE4NTIzMDM1ZWMwYzU2YzFkZTZlMTc0NTJmYTU3NmI5NzE0YzNh
+    M2U3YTZiM2YwNzcwNTkyZTM4YzI2MmZlN2U3M2NiZDY3ZTNkODIxNzVjY2Iy
+    MjdkY2VkZDU3N2I5YjA5YTNmODI3OTcxMmUwNTA1YTRmMjQ3MDU=

data/app/models/caboose/page_bar_generator.rb

@@ -132,7 +132,13 @@ module Caboose
   	def get_vars()  
   	  vars = []
   	  @params.each do |k,v|
-  	    vars.push("#{k}=#{v}") if !v.nil? && v.length > 0 
+  	    if v.kind_of?(Array)  	      
+  	      v.each do |v2| 
+  	        vars.push("#{k}[]=#{v2}") if !v2.nil? && v2.length > 0
+  	      end
+  	    else  	      
+  	      vars.push("#{k}=#{v}") if !v.nil? && v.length > 0
+  	    end  	      	    
   	  end
   	  return URI.escape(vars.join('&'))
   	end

data/lib/caboose/engine.rb

@@ -1,7 +1,6 @@
 
 require 'tinymce-rails'
 require 'jquery-ui-rails'
-#require 'modeljs'
 require 'colorbox-rails'
 require 'paperclip'
 
@@ -49,29 +48,53 @@ module Caboose
     return obj.to_json
   end
   
-  def Caboose.create_schema(schema_file)
+  # Verifies (non-destructively) that the given schema exists in the database.
+  def Caboose.create_schema(schema)
     c = ActiveRecord::Base.connection
-    require schema_file    
-    @schema.each do |table, columns|
-      c.create_table table if !c.table_exists?(table)
-      columns.each do |col|
+    schema.each do |model, columns|
+      tbl = model.table_name
+      c.create_table tbl if !c.table_exists?(tbl)
+      columns.each do |col|        
         
         # Skip if the column exists with the proper data type
-        next if c.column_exists?(table, col[0], col[1])
+        next if c.column_exists?(tbl, col[0], col[1])
         
-        # If the column exists, but not with the correct data type, try to change it
-        if c.column_exists?(table, col[0])
+        # If the column doesn't exists, add it
+        if !c.column_exists?(tbl, col[0])
           if col.count > 2                      
-            c.change_column table, col[0], col[1], col[2]
+            c.add_column tbl, col[0], col[1], col[2]
           else          
-            c.change_column table, col[0], col[1] 
+            c.add_column tbl, col[0], col[1] 
           end
-        else                  
-          if col.count > 2                      
-            c.add_column table, col[0], col[1], col[2]
-          else          
-            c.add_column table, col[0], col[1] 
+          
+        # Column exists, but not with the correct data type, try to change it
+        else
+          
+          # Add a temp column
+          if col.count > 2
+            c.add_column tbl, "#{col[0]}_temp", col[1], col[2]
+          else
+            c.add_column tbl, "#{col[0]}_temp", col[1]
           end
+          
+          # Copy the old column and cast with correct data type to the new column
+          model.all.each do |m|            
+            m["#{col[0]}_temp"] = case col[1]
+              when :integer  then m[col[0]].to_i
+              when :string   then m[col[0]].to_s
+              when :text     then m[col[0]].to_s
+              when :numeric  then m[col[0]].to_f
+              when :datetime then DateTime.parse(m[col[0]])
+              when :boolean  then m[col[0]].to_i == 1
+              else nil
+              end
+            m.save
+          end
+          
+          # Remove the old column and rename the new one
+          c.remove_column tbl, col[0]
+          c.rename_column tbl, "#{col[0]}_temp", col[0]        
+
         end
       end
     end

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.2.94'
+  VERSION = '0.2.95'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.2.94
+  version: 0.2.95
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-27 00:00:00.000000000 Z
+date: 2013-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails