caboose-cms 0.4.1 → 0.4.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDYwMjExOGUxOTgxZGM1ZWI4ZDkxNTBmZTg2NzEyN2MwODRhMGU2MA==
+    ZWE5ZmYyYjlkZmJlNjI4NzYxMmFiODUyZWNjYWUyYmI3NTg1MDI4Yw==
   data.tar.gz: !binary |-
-    OWVkZDNiNDdmZGI5ZjZmMzEyZjE4MmM2NWNhZWM2NTc1MWM1YWZiNg==
+    Y2UzN2VjMDMxZTg1ZjQ1N2I3YzhhNjg4NDBhYWI5NmVmMGUxNmI1ZQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MTE1OTdkZTA4YTFkMDE5NWJmNDIxODUwZjM3ZDM4NDQ0ZTZjMWFlMmY1NTFi
-    Yjc2Y2ViNzY2MWQwZGNlMmM3YjA3NjEwZGQ5YmQ3MzUwMGJlM2Y3MTVhNzk0
-    OWIwODkwNmQzY2YzZjlhNzUzYTJiNTlhOWIxNTA1ZTZhMjdhMjA=
+    OTIwYmE3NmU1ZDA4NDkyODUwMTM3OTNlZWUzMDIwYTRkODE3ZWM4NDJlZGI0
+    YzJlOWQzZDVlNjk0MTM5ZDAyZGE1ZDgwYjIwM2NmN2U0ZmNjYjk1ODZlNGYy
+    NDY1NGQ0OGY5OGM4N2VkNzVmM2VlZWJhYjExNjJmYzA3NjE2OTQ=
   data.tar.gz: !binary |-
-    Yjg1YWUxMzNlYWFmMWYzYzdiYmIyN2NkZmEyYWE3YWM0MDk3NWViYjQwYzUx
-    MmE3ODA3N2Y0NDllMjEzYTgwZjNjMzQ2NzJjOWFmYWUyMTBhOThhNTNlYjc2
-    MzliN2RiM2UxYWM2NjBmNzFhNDA1ZGQ3MjQ0ZmVhNGQ4ODNhY2U=
+    NjJiOGMyZTIxYjI5MDY2MmQyNjVlOGZlOTk5MjYwY2Y4Y2UwNjY2YzYwNTA2
+    YTYyMDc3NDUyNzRmZjcwZGU0MGJiZjdhMmI0MmU3NDlmMzE1NDdjZDdjYjk2
+    NjJjYmE0MzBlM2FmYjNjOTRkMzU2NzcwYWQxZmU1ZTJhNmRmZjI=

data/app/models/caboose/schema.rb

@@ -246,13 +246,13 @@ class Caboose::Schema < Caboose::Utilities::Schema
       
     if !Caboose::BlockType.where(:name => 'heading').exists?
       bt = Caboose::BlockType.create(:name => 'heading', :description => 'Heading')
-      Caboose::FieldType.create(:block_type_id => bt.id, :name => 'text', :field_type => 'text', :nice_name => 'Text', :default => '', :width => 800, :fixed_placeholder => false)
-      Caboose::FieldType.create(:block_type_id => bt.id, :name => 'size', :field_type => 'text', :nice_name => 'Size', :default =>  1, :width => 800, :fixed_placeholder => false, :options => "1|2|3|4|5|6")
+      Caboose::BlockType.create(:parent_id => bt.id, :name => 'text', :field_type => 'text', :description => 'Text', :default => '', :width => 800, :fixed_placeholder => false)
+      Caboose::BlockType.create(:parent_id => bt.id, :name => 'size', :field_type => 'text', :description => 'Size', :default =>  1, :width => 800, :fixed_placeholder => false, :options => "1|2|3|4|5|6")
     end
     
     if !Caboose::BlockType.where(:name => 'richtext').exists?
       bt = Caboose::BlockType.create(:name => 'richtext', :description => 'Rich Text')
-      Caboose::FieldType.create(:block_type_id => bt.id, :name => 'text', :field_type => 'richtext', :nice_name => 'Text', :default => '', :width => 800, :height => 400, :fixed_placeholder => false)      
+      Caboose::BlockType.create(:parent_id => bt.id, :name => 'text', :field_type => 'richtext', :description => 'Text', :default => '', :width => 800, :height => 400, :fixed_placeholder => false)      
     end
     
     admin_user = nil

data/app/models/caboose/utilities/schema.rb

@@ -121,6 +121,7 @@ class Caboose::Utilities::Schema
     return if self.removed_columns.nil?
     c = ActiveRecord::Base.connection
     self.removed_columns.each do |model, columns|
+      next if !c.table_exists?(model.table_name)
       columns.each do |col|
         c.remove_column model.table_name, col if c.column_exists?(model.table_name, col)
       end

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.4.1'
+  VERSION = '0.4.2'
 end

metadata

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